Merge pull request #980 from StephenMcConnel/bug-18638
authorZoltan Varga <vargaz@gmail.com>
Fri, 5 Dec 2014 19:09:00 +0000 (14:09 -0500)
committerZoltan Varga <vargaz@gmail.com>
Fri, 5 Dec 2014 19:09:00 +0000 (14:09 -0500)
Fix bugs in sizing TableLayoutPanel (Xamarin bug 18638)

1764 files changed:
.gitignore
.gitmodules
CONTRIBUTING.md
Makefile.am
README.md
configure.ac
data/Makefile.am
eglib/configure.ac
eglib/src/glib.h
eglib/src/gspawn.c
eglib/winconfig.h
external/referencesource [new submodule]
man/mono.1
mcs/Makefile
mcs/build/Makefile
mcs/build/common/Consts.cs.in
mcs/build/common/SR.cs [new file with mode: 0644]
mcs/build/common/basic-profile-check.cs
mcs/build/platforms/darwin.make
mcs/build/platforms/linux.make
mcs/build/platforms/win32.make
mcs/build/profiles/basic.make
mcs/build/profiles/build.make
mcs/build/profiles/mobile.make
mcs/build/profiles/mobile_static.make
mcs/build/profiles/monodroid.make
mcs/build/profiles/monotouch.make
mcs/build/profiles/monotouch_runtime.make
mcs/build/profiles/net_2_0.make [deleted file]
mcs/build/profiles/net_3_5.make [deleted file]
mcs/build/profiles/net_4_0.make
mcs/build/profiles/net_4_5.make
mcs/build/profiles/xammac.make
mcs/build/profiles/xbuild_12.make
mcs/build/profiles/xbuild_14.make
mcs/class/Accessibility/Accessibility-net_2_0.csproj [deleted file]
mcs/class/Accessibility/Accessibility-net_4_0.csproj [deleted file]
mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_2_0.csproj [deleted file]
mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_0.csproj [deleted file]
mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_2_0.csproj [deleted file]
mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_0.csproj [deleted file]
mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib-net_2_0.csproj [deleted file]
mcs/class/Cscompmgd/Cscompmgd-net_2_0.csproj [deleted file]
mcs/class/Cscompmgd/Cscompmgd-net_4_0.csproj [deleted file]
mcs/class/Cscompmgd/Cscompmgd-tests-net_2_0.csproj [deleted file]
mcs/class/Cscompmgd/Cscompmgd-tests-net_4_0.csproj [deleted file]
mcs/class/CustomMarshalers/CustomMarshalers-net_2_0.csproj [deleted file]
mcs/class/CustomMarshalers/CustomMarshalers-net_4_0.csproj [deleted file]
mcs/class/I18N/CJK/I18N.CJK-net_2_0.csproj [deleted file]
mcs/class/I18N/CJK/I18N.CJK-net_4_0.csproj [deleted file]
mcs/class/I18N/CJK/I18N.CJK-tests-net_2_0.csproj [deleted file]
mcs/class/I18N/CJK/I18N.CJK-tests-net_4_0.csproj [deleted file]
mcs/class/I18N/Common/I18N-net_2_0.csproj [deleted file]
mcs/class/I18N/Common/I18N-net_4_0.csproj [deleted file]
mcs/class/I18N/MidEast/I18N.MidEast-net_2_0.csproj [deleted file]
mcs/class/I18N/MidEast/I18N.MidEast-net_4_0.csproj [deleted file]
mcs/class/I18N/MidEast/I18N.MidEast-tests-net_2_0.csproj [deleted file]
mcs/class/I18N/MidEast/I18N.MidEast-tests-net_4_0.csproj [deleted file]
mcs/class/I18N/Other/I18N.Other-net_2_0.csproj [deleted file]
mcs/class/I18N/Other/I18N.Other-net_4_0.csproj [deleted file]
mcs/class/I18N/Rare/I18N.Rare-net_2_0.csproj [deleted file]
mcs/class/I18N/Rare/I18N.Rare-net_4_0.csproj [deleted file]
mcs/class/I18N/West/I18N.West-net_2_0.csproj [deleted file]
mcs/class/I18N/West/I18N.West-net_4_0.csproj [deleted file]
mcs/class/I18N/West/I18N.West-tests-net_2_0.csproj [deleted file]
mcs/class/I18N/West/I18N.West-tests-net_4_0.csproj [deleted file]
mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_2_0.csproj [deleted file]
mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_0.csproj [deleted file]
mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_2_0.csproj [deleted file]
mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_0.csproj [deleted file]
mcs/class/Makefile
mcs/class/Managed.Windows.Forms/System.Windows.Forms-net_2_0.csproj [deleted file]
mcs/class/Managed.Windows.Forms/System.Windows.Forms-net_4_0.csproj [deleted file]
mcs/class/Managed.Windows.Forms/System.Windows.Forms-tests-net_2_0.csproj [deleted file]
mcs/class/Managed.Windows.Forms/System.Windows.Forms-tests-net_4_0.csproj [deleted file]
mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewRowCollection.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewTest.cs
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_2_0.csproj [deleted file]
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build/Microsoft.Build-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build/Microsoft.Build-tests-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectInstanceTest.cs
mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_0.csproj [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs
mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_2_0.csproj [deleted file]
mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_0.csproj [deleted file]
mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_0.csproj [deleted file]
mcs/class/Mono.C5/Mono.C5-net_2_0.csproj [deleted file]
mcs/class/Mono.C5/Mono.C5-net_4_0.csproj [deleted file]
mcs/class/Mono.C5/Mono.C5-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.C5/Mono.C5-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.CSharp/Mono.CSharp-net_2_0.csproj [deleted file]
mcs/class/Mono.CSharp/Mono.CSharp-net_4_0.csproj [deleted file]
mcs/class/Mono.CSharp/Mono.CSharp-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.CSharp/Mono.CSharp-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Cairo/Mono.Cairo-net_2_0.csproj [deleted file]
mcs/class/Mono.Cairo/Mono.Cairo-net_4_0.csproj [deleted file]
mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_2_0.csproj [deleted file]
mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_0.csproj [deleted file]
mcs/class/Mono.Cecil/Mono.Cecil-net_2_0.csproj [deleted file]
mcs/class/Mono.Cecil/Mono.Cecil-net_4_0.csproj [deleted file]
mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_0.csproj [deleted file]
mcs/class/Mono.CodeContracts/Mono.CodeContracts-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_2_0.csproj [deleted file]
mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_0.csproj [deleted file]
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_2_0.csproj [deleted file]
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_0.csproj [deleted file]
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_2_0.csproj [deleted file]
mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_0.csproj [deleted file]
mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_2_0.csproj [deleted file]
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_0.csproj [deleted file]
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/StackFrame.cs
mcs/class/Mono.Debugger.Soft/Test/dtest.cs
mcs/class/Mono.Http/Mono.Http-net_2_0.csproj [deleted file]
mcs/class/Mono.Http/Mono.Http-net_4_0.csproj [deleted file]
mcs/class/Mono.Management/Mono.Management-net_2_0.csproj [deleted file]
mcs/class/Mono.Management/Mono.Management-net_4_0.csproj [deleted file]
mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_2_0.csproj [deleted file]
mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_0.csproj [deleted file]
mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Messaging/Mono.Messaging-net_2_0.csproj [deleted file]
mcs/class/Mono.Messaging/Mono.Messaging-net_4_0.csproj [deleted file]
mcs/class/Mono.Messaging/Mono.Messaging-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Messaging/Mono.Messaging-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Options/Mono.Options-net_2_0.csproj [deleted file]
mcs/class/Mono.Options/Mono.Options-net_4_0.csproj [deleted file]
mcs/class/Mono.Options/Mono.Options-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Options/Mono.Options-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Parallel/Mono.Parallel-net_4_0.csproj [deleted file]
mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Posix/Mono.Posix-net_2_0.csproj [deleted file]
mcs/class/Mono.Posix/Mono.Posix-net_4_0.csproj [deleted file]
mcs/class/Mono.Posix/Mono.Posix-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Posix/Mono.Posix-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_2_0.csproj [deleted file]
mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_0.csproj [deleted file]
mcs/class/Mono.Security/Mono.Security-net_2_0.csproj [deleted file]
mcs/class/Mono.Security/Mono.Security-net_4_0.csproj [deleted file]
mcs/class/Mono.Security/Mono.Security-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.Security/Mono.Security-tests-net_4_0.csproj [deleted file]
mcs/class/Mono.Simd/Makefile
mcs/class/Mono.Simd/Mono.Simd-net_2_0.csproj [deleted file]
mcs/class/Mono.Simd/Mono.Simd-net_4_0.csproj [deleted file]
mcs/class/Mono.Tasklets/Mono.Tasklets-net_2_0.csproj [deleted file]
mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_0.csproj [deleted file]
mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_2_0.csproj [deleted file]
mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_0.csproj [deleted file]
mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_2_0.csproj [deleted file]
mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_0.csproj [deleted file]
mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_2_0.csproj [deleted file]
mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_4_0.csproj [deleted file]
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_2_0.csproj [deleted file]
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_0.csproj [deleted file]
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_2_0.csproj [deleted file]
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_4_0.csproj [deleted file]
mcs/class/Npgsql/Npgsql-net_2_0.csproj [deleted file]
mcs/class/Npgsql/Npgsql-net_4_0.csproj [deleted file]
mcs/class/Npgsql/Npgsql-tests-net_2_0.csproj [deleted file]
mcs/class/Npgsql/Npgsql-tests-net_4_0.csproj [deleted file]
mcs/class/PEAPI/PEAPI-net_2_0.csproj [deleted file]
mcs/class/PEAPI/PEAPI-net_4_0.csproj [deleted file]
mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_2_0.csproj [deleted file]
mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_0.csproj [deleted file]
mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_2_0.csproj [deleted file]
mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_0.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/.gitignore [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AggregateCatalog.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AggregateExportProvider.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ApplicationCatalog.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AtomicComposition.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CatalogExportProvider.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CatalogExtensions.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ComposablePartCatalogChangeEventArgs.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ComposablePartExportProvider.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionBatch.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionConstants.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionContainer.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionOptions.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionService.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/DirectoryCatalog.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ExportProvider.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ExportsChangeEventArgs.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/INotifyComposablePartCatalogChanged.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ImportEngine.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ScopingExtensions.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/TypeCatalog.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePart.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartCatalog.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartDefinition.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartException.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/Export.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ExportDefinition.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ExportedDelegate.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ICompositionElement.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ImportCardinality.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ImportDefinition.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.ReflectionModel/LazyMemberInfo.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.ReflectionModel/ReflectionModelServices.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/AttributedModelServices.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CatalogReflectionContextAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ChangeRejectedException.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionContractMismatchException.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionError.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionException.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CreationPolicy.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportFactory`1.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportFactory`2.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportLifetimeContext`1.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportMetadataAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ICompositionService.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/IPartImportsSatisfiedNotification.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportCardinalityMismatchException.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportManyAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportSource.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportingConstructorAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/InheritedExportAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/MetadataAttributeAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/MetadataViewImplementationAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartCreationPolicyAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartMetadataAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartNotDiscoverableAttribute.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/System/Lazy`2.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/index.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.Hosting.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.Primitives.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.ReflectionModel.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.xml [deleted file]
mcs/class/System.ComponentModel.Composition/Makefile [deleted file]
mcs/class/System.ComponentModel.Composition/README.txt [deleted file]
mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_0.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_5.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition.dll.sources [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/AssemblyInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/ComponentModelUnitTest.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/AssumesTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ConditionalWeakTableTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ReadOnlyDictionaryDebuggerProxyTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ReadOnlyDictionaryTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/WeakReferenceCollectionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/StringsTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AdvancedValueComposition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AggregateExportProviderTest.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AllowNonPublicCompositionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AttributedModelCompositionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AttributedModelDiscoveryTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/INotifyImportTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModelServicesTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CardinalityMismatchExceptionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComponentModelTestTypes.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComponentServicesTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartCatalogExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartExceptionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartExtensibilityTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerCollectionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerCycleTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerExtensibilityTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerImportTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorDebuggerProxyTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorIdTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionExceptionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionResultOfTTest.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionResultTest.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServiceExtensionsTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServiceProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServicesTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ConcreteComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ConstraintServicesTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ContractBasedImportDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ContractMismatchExceptionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/CompositionTraceIdTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/CompositionTraceSourceTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/DynamicMetadata.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Expectations.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportCollectionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportMetadataAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportProviderTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportableAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/CustomImportAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/CustomImportManyAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.DerivedComposablePartCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.DisposableComposablePartCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.FilteredComposablePartCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.MutableComposablePartCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.NoOverridesComposablePartCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.NonFilteringTypeCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ConstraintFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.DisposableCompositionContainer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.NoOverridesCompositionContainer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ElementFactory.CompositionElement.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ElementFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ErrorFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportDefinitionFactory.DerivedExportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportDefinitionFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.NoOverridesExportProvider.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.RecomposableExportProvider.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.DerivedContractBasedImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.DerivedImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.DerivedComposablePartDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.NoOverridesComposablePartDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.DisposableComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.NoOverridesComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ReflectionFactory.MockParameterInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ReflectionFactory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/GenerationServicesTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AggregateCatalogTest.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AssemblyCatalogDebuggerProxyTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CatalogExportProviderTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CompositionBatchTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CompositionTransactionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/DirectoryCatalogDebuggerProxyTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/ImportEngineTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/TypeCatalogTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportingComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportingConstructorAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/InitializationScopeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataAttributeAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataViewProviderTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MicroExport.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/PartCreationPolicyAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/PartMetadataAttributeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/ComposablePartCatalogDebuggerProxyTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/ComposablePartCatalogTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/CompositionElementDebuggerProxyTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/CompositionElementTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/SerializableCompositionElementTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/LazyMemberInfoTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberExportDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionParameterImportDefinitionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/SampleComponents.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/UnitTesting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/UnitTesting/ConstraintAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/AdaptingCollectionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/CatalogFilteringTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/CompositionContainerAttributedModelCycleTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/ConstructorInjectionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DelayLoadingTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DelegateCompositionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DiscoveryTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/ExportProviderEventTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/LifetimeTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/PartCreatorTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RecompositionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RejectionTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RequiredCreationPolicyTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/LazyOfTTMetadataTests.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/ReflectionItemAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/TestUtilities.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/AssemblyInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/EnumerableExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/Generic/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/Generic/DictionaryExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ConstraintParser.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceContext.TraceContextTraceListener.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceContext.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceEventDetails.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceId.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Hosting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Hosting/CompositionHostTestService.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ReflectionModel/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesEx.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/CompositionAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ElementAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ErrorId.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ExportsAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/DisposableObject.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/EnumExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Globalization/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Globalization/CurrentCultureContext.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/FileIO.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryDirectory.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryFile.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryFileCopier.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ReferenceTracker.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/SerializationTestServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/StrictFormatterConverter.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/TypeExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/EnumerableAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExceptionAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationCollectionOfI.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationCollectionOfIO.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationOfI.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationOfIO.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExtendedAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ReflectionAssert.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/RetryMode.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/TestServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/UnitTestFramework.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/AssemblyInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModel - SL.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModel.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModelSL.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Assumes.InternalErrorException.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Assumes.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/AttributeServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.CollectionOfObject.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ConditionalWeakTable.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/EnumerableCardinality.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionary.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionaryDebuggerProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/WeakReferenceCollection.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ContractServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/GenerationServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/LazyServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.Reader.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.Writer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ReflectionInvoke.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ReflectionServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Requires.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Runtime/Serialization/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Runtime/Serialization/SerializationServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/SilverlightReflectionInvoke.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/StringComparers.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/SilverlightAdditions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Strings.Designer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/Strings.resx [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/SuppressMessages.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/SuppressMessagesBaselined.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedExportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedModelDiscovery.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedPartCreationInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModelServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ChangeRejectedException.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionContractMismatchException.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionError.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionErrorDebuggerProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionErrorId.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionException.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionResult.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionResultOfT.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ConstraintServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ContractNameServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CreationPolicy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTrace.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceId.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceSource.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/SilverlightTraceWriter.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceSourceTraceWriter.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceWriter.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ErrorBuilder.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExceptionBuilder.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportCardinalityCheckResult.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportMetadataAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportServices.DisposableLazy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateExportProvider.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalogDebuggerProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicComposition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicCompositionExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogChangeProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogExport.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.PartCreatorExport.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogChangeEventArgs.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogCollection.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartExportProvider.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.SingleExportComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionConstants.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionContainer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionLock.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.GetExportOverrides.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportsChangeEventArgs.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/INotifyComposablePartCatalogChanged.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.EngineContext.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.PartManager.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.RecompositionManager.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/TypeCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/IAttributedImport.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ICompositionError.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ICompositionService.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/IPartImportsSatisfiedNotification.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportCardinalityMismatchException.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportManyAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportingConstructorAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/InheritedExportAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataAttributeAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreationPolicyAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfT.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfTTMetadata.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartLifetimeContextOfT.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartMetadataAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartNotDiscoverableAttribute.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalogDebuggerProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartException.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElement.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementDebuggerProxy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ContractBasedImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/Export.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportedDelegate.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ICompositionElement.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/IPartCreatorImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportCardinality.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/SerializableCompositionElement.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/DisposableReflectionComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ExportingMember.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/IReflectionPartCreationInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportType.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingItem.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingMember.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingParameter.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/LazyMemberInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorExportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorMemberImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorParameterImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePart.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionExtensions.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionField.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItem.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItemType.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMember.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberExportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMethod.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServices.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameter.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameterImportDefinition.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionProperty.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionType.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionWritableMember.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/Lazy.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/LazyOfTTMetadata.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/Tuple.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/AssemblyInfo.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Composition.Initialization.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Composition.InitializationSL.csproj [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.Reader.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.Writer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Requires.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Strings.Designer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Strings.resx [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/SuppressMessages.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/CompositionInitializer.AssemblyList.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/CompositionInitializer.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportFactoryOfT.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportFactoryOfTTMetadata.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportLifetimeContextOfT.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/.gitattributes [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/CompositionHost.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/DeploymentCatalog.cs [deleted file]
mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/Package.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/DataAnnotationsResources.cs [new file with mode: 0644]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_2_0.csproj [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_0.csproj [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_2_0.csproj [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_4_0.csproj [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ColumnAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ComplexTypeAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedOption.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/InversePropertyAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/NotMappedAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/TableAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.dll.sources
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypePropertyDescriptor.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociationAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ChangeLog [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CompareAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ConcurrencyCheckAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ControlParameters.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CreditCardAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CustomValidationAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataType.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataTypeAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayColumnAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayFormatAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EditableAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EmailAddressAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EnumDataTypeAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/FileExtensionsAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/FilterUIHintAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/IValidatableObject.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/KeyAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MaxLengthAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MetadataTypeAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MinLengthAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/PhoneAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RangeAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RegularExpressionAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RequiredAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ScaffoldColumnAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ScaffoldTableAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/StringLengthAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/TimestampAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/UIHintAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/UrlAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationAttribute.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationAttributeCollectionExtensions.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationContext.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationException.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationResult.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/Validator.cs [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/CreditCardAttributeTest.cs
mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs
mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EmailAddressAttributeTest.cs
mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs
mcs/class/System.ComponentModel.DataAnnotations/mobile_System.ComponentModel.DataAnnotations.dll.sources [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/mobile_static_System.ComponentModel.DataAnnotations.dll.sources [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations.dll.sources [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/monotouch_System.ComponentModel.DataAnnotations.dll.sources [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/net_4_0_System.ComponentModel.DataAnnotations.dll.sources [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/net_4_5_System.ComponentModel.DataAnnotations.dll.sources [deleted file]
mcs/class/System.ComponentModel.DataAnnotations/xammac_System.ComponentModel.DataAnnotations.dll.sources [deleted file]
mcs/class/System.Configuration.Install/System.Configuration.Install-net_2_0.csproj [deleted file]
mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_0.csproj [deleted file]
mcs/class/System.Configuration/System.Configuration-net_2_0.csproj [deleted file]
mcs/class/System.Configuration/System.Configuration-net_4_0.csproj [deleted file]
mcs/class/System.Configuration/System.Configuration-tests-net_2_0.csproj [deleted file]
mcs/class/System.Configuration/System.Configuration-tests-net_4_0.csproj [deleted file]
mcs/class/System.Core/Makefile
mcs/class/System.Core/ReferenceSources/SR.cs [new file with mode: 0644]
mcs/class/System.Core/ReferenceSources/Set.cs [new file with mode: 0644]
mcs/class/System.Core/System.Core-net_2_0.csproj [deleted file]
mcs/class/System.Core/System.Core-net_4_0.csproj [deleted file]
mcs/class/System.Core/System.Core-plaincore-net_2_0.csproj [deleted file]
mcs/class/System.Core/System.Core-plaincore-net_4_0.csproj [deleted file]
mcs/class/System.Core/System.Core-tests-net_2_0.csproj [deleted file]
mcs/class/System.Core/System.Core-tests-net_4_0.csproj [deleted file]
mcs/class/System.Core/System.Linq/Enumerable.cs
mcs/class/System.Core/System/TimeZoneInfo.Android.cs
mcs/class/System.Core/System/TimeZoneInfo.cs
mcs/class/System.Core/Test/System.Linq/EnumerableMoreTest.cs
mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs
mcs/class/System.Core/Test/System.Threading/ReaderWriterLockSlimTest.cs
mcs/class/System.Core/basic_System.Core.dll.sources
mcs/class/System.Core/mobile_common_System.Core.dll.sources
mcs/class/System.Core/net_4_0_System.Core.dll.sources
mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_2_0.csproj [deleted file]
mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_0.csproj [deleted file]
mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_2_0.csproj [deleted file]
mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_4_0.csproj [deleted file]
mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs [new file with mode: 0644]
mcs/class/System.Data.Entity/EntityRes.cs [new file with mode: 0644]
mcs/class/System.Data.Entity/EntityResCategoryAttribute.cs [new file with mode: 0644]
mcs/class/System.Data.Entity/EntityResDescriptionAttribute.cs [new file with mode: 0644]
mcs/class/System.Data.Entity/Error.cs [new file with mode: 0644]
mcs/class/System.Data.Entity/Makefile [new file with mode: 0644]
mcs/class/System.Data.Entity/Strings.cs [new file with mode: 0644]
mcs/class/System.Data.Entity/System.Data.Entity.dll.sources [new file with mode: 0644]
mcs/class/System.Data.Linq/Makefile
mcs/class/System.Data.Linq/System.Data.Linq-net_2_0.csproj [deleted file]
mcs/class/System.Data.Linq/System.Data.Linq-net_4_0.csproj [deleted file]
mcs/class/System.Data.Linq/System.Data.Linq-tests-net_2_0.csproj [deleted file]
mcs/class/System.Data.Linq/System.Data.Linq-tests-net_4_0.csproj [deleted file]
mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_2_0.csproj [deleted file]
mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_0.csproj [deleted file]
mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_2_0.csproj [deleted file]
mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_4_0.csproj [deleted file]
mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_2_0.csproj [deleted file]
mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_0.csproj [deleted file]
mcs/class/System.Data.Services/System.Data.Services-net_2_0.csproj [deleted file]
mcs/class/System.Data.Services/System.Data.Services-net_4_0.csproj [deleted file]
mcs/class/System.Data.Services/System.Data.Services-tests-net_2_0.csproj [deleted file]
mcs/class/System.Data.Services/System.Data.Services-tests-net_4_0.csproj [deleted file]
mcs/class/System.Data/Makefile
mcs/class/System.Data/System.Data-net_2_0.csproj [deleted file]
mcs/class/System.Data/System.Data-net_4_0.csproj [deleted file]
mcs/class/System.Data/System.Data-tests-net_2_0.csproj [deleted file]
mcs/class/System.Data/System.Data-tests-net_4_0.csproj [deleted file]
mcs/class/System.Data/System.Data.Common/DbEnumerator.cs
mcs/class/System.Design/System.Design-net_2_0.csproj [deleted file]
mcs/class/System.Design/System.Design-net_4_0.csproj [deleted file]
mcs/class/System.Design/System.Design-tests-net_2_0.csproj [deleted file]
mcs/class/System.Design/System.Design-tests-net_4_0.csproj [deleted file]
mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_2_0.csproj [deleted file]
mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_0.csproj [deleted file]
mcs/class/System.DirectoryServices/System.DirectoryServices-net_2_0.csproj [deleted file]
mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_0.csproj [deleted file]
mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_2_0.csproj [deleted file]
mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_4_0.csproj [deleted file]
mcs/class/System.Drawing.Design/System.Drawing.Design-net_2_0.csproj [deleted file]
mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_0.csproj [deleted file]
mcs/class/System.Drawing/System.Drawing-net_2_0.csproj [deleted file]
mcs/class/System.Drawing/System.Drawing-net_4_0.csproj [deleted file]
mcs/class/System.Drawing/System.Drawing-tests-net_2_0.csproj [deleted file]
mcs/class/System.Drawing/System.Drawing-tests-net_4_0.csproj [deleted file]
mcs/class/System.Dynamic/System.Dynamic-net_4_0.csproj [deleted file]
mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_2_0.csproj [deleted file]
mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_0.csproj [deleted file]
mcs/class/System.IO.Compression.FileSystem/ZipFile.cs
mcs/class/System.IdentityModel.Selectors/Makefile
mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_2_0.csproj [deleted file]
mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_0.csproj [deleted file]
mcs/class/System.IdentityModel/Makefile
mcs/class/System.IdentityModel/System.IdentityModel-net_2_0.csproj [deleted file]
mcs/class/System.IdentityModel/System.IdentityModel-net_4_0.csproj [deleted file]
mcs/class/System.IdentityModel/System.IdentityModel-tests-net_2_0.csproj [deleted file]
mcs/class/System.IdentityModel/System.IdentityModel-tests-net_4_0.csproj [deleted file]
mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_0.csproj [deleted file]
mcs/class/System.Json.Microsoft/System.Json.Microsoft-tests-net_4_0.csproj [deleted file]
mcs/class/System.Json/System.Json-net_2_0.csproj [deleted file]
mcs/class/System.Json/System.Json-net_4_0.csproj [deleted file]
mcs/class/System.Json/System.Json-tests-net_2_0.csproj [deleted file]
mcs/class/System.Json/System.Json-tests-net_4_0.csproj [deleted file]
mcs/class/System.Management/System.Management-net_2_0.csproj [deleted file]
mcs/class/System.Management/System.Management-net_4_0.csproj [deleted file]
mcs/class/System.Messaging/System.Messaging-net_2_0.csproj [deleted file]
mcs/class/System.Messaging/System.Messaging-net_4_0.csproj [deleted file]
mcs/class/System.Messaging/System.Messaging-tests-net_2_0.csproj [deleted file]
mcs/class/System.Messaging/System.Messaging-tests-net_4_0.csproj [deleted file]
mcs/class/System.Net.Http/System.Net.Http.Headers/ContentDispositionHeaderValue.cs
mcs/class/System.Net.Http/System.Net.Http.Headers/Lexer.cs
mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
mcs/class/System.Net.Http/System.Net.Http/HttpRequestMessage.cs
mcs/class/System.Net.Http/Test/System.Net.Http.Headers/ContentDispositionHeaderValueTest.cs
mcs/class/System.Net.Http/Test/System.Net.Http.Headers/NameValueHeaderValueTest.cs
mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
mcs/class/System.Net.Http/Test/System.Net.Http/HttpRequestMessageTest.cs
mcs/class/System.Net/System.Net-net_2_0.csproj [deleted file]
mcs/class/System.Net/System.Net-net_4_0.csproj [deleted file]
mcs/class/System.Numerics/System.Numerics-net_4_0.csproj [deleted file]
mcs/class/System.Numerics/System.Numerics-tests-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_0.csproj [deleted file]
mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Caching/System.Runtime.Caching-tests-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-tests-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_2_0.csproj [deleted file]
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_2_0.csproj [deleted file]
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_2_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_2_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_2_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_4_0.csproj [deleted file]
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs
mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractSerializerTest.cs
mcs/class/System.Security/Makefile
mcs/class/System.Security/System.Security-net_2_0.csproj [deleted file]
mcs/class/System.Security/System.Security-net_4_0.csproj [deleted file]
mcs/class/System.Security/System.Security-tests-net_2_0.csproj [deleted file]
mcs/class/System.Security/System.Security-tests-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_2_0.csproj [deleted file]
mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_2_0.csproj [deleted file]
mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel/System.ServiceModel-net_2_0.csproj [deleted file]
mcs/class/System.ServiceModel/System.ServiceModel-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_2_0.csproj [deleted file]
mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_0.csproj [deleted file]
mcs/class/System.ServiceModel/System.ServiceModel-tests-net_2_0.csproj [deleted file]
mcs/class/System.ServiceModel/System.ServiceModel-tests-net_4_0.csproj [deleted file]
mcs/class/System.ServiceProcess/System.ServiceProcess-net_2_0.csproj [deleted file]
mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_0.csproj [deleted file]
mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_2_0.csproj [deleted file]
mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_4_0.csproj [deleted file]
mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow/ExecutingMessageBoxBase.cs
mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow/MessageBox.cs
mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow/TargetCollection.cs
mcs/class/System.Threading.Tasks.Dataflow/Test/System.Threading.Tasks.Dataflow/BoundedCapacityTest.cs
mcs/class/System.Threading.Tasks.Dataflow/Test/System.Threading.Tasks.Dataflow/ExecutionBlocksTest.cs
mcs/class/System.Threading.Tasks.Dataflow/Test/System.Threading.Tasks.Dataflow/OptionsTest.cs
mcs/class/System.Transactions/System.Transactions-net_2_0.csproj [deleted file]
mcs/class/System.Transactions/System.Transactions-net_4_0.csproj [deleted file]
mcs/class/System.Transactions/System.Transactions-tests-net_2_0.csproj [deleted file]
mcs/class/System.Transactions/System.Transactions-tests-net_4_0.csproj [deleted file]
mcs/class/System.Web.Abstractions/Makefile
mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_2_0.csproj [deleted file]
mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_0.csproj [deleted file]
mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_2_0.csproj [deleted file]
mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_4_0.csproj [deleted file]
mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_2_0.csproj [deleted file]
mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_0.csproj [deleted file]
mcs/class/System.Web.DynamicData/Makefile
mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_2_0.csproj [deleted file]
mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_0.csproj [deleted file]
mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_2_0.csproj [deleted file]
mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_4_0.csproj [deleted file]
mcs/class/System.Web.DynamicData/Test/System.Web.DynamicData/FieldTemplateFactoryTest.cs
mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_2_0.csproj [deleted file]
mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_0.csproj [deleted file]
mcs/class/System.Web.Extensions.Design_1.0/System.Web.Extensions.Design_1.0-net_2_0.csproj [deleted file]
mcs/class/System.Web.Extensions/System.Web.Extensions-net_2_0.csproj [deleted file]
mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_0.csproj [deleted file]
mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_2_0.csproj [deleted file]
mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_4_0.csproj [deleted file]
mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewDataItem.cs
mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListViewItem.cs
mcs/class/System.Web.Extensions_1.0/System.Web.Extensions_1.0-net_2_0.csproj [deleted file]
mcs/class/System.Web.Mvc/.gitattributes [deleted file]
mcs/class/System.Web.Mvc/ChangeLog [deleted file]
mcs/class/System.Web.Mvc/GlobalSuppressions.cs [deleted file]
mcs/class/System.Web.Mvc/Makefile [deleted file]
mcs/class/System.Web.Mvc/Mvc [deleted file]
mcs/class/System.Web.Mvc/Properties/.gitattributes [deleted file]
mcs/class/System.Web.Mvc/Properties/AssemblyInfo.cs [deleted file]
mcs/class/System.Web.Mvc/Properties/ChangeLog [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc-net_2_0.csproj [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc.csproj [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc.dll.sources [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/.gitattributes [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AcceptVerbsAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionExecutedContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionExecutingContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionFilterAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodDispatcher.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodDispatcherCache.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelector.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelectorAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelectorCache.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionNameAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionNameSelectorAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ActionSelector.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/.gitattributes [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/AjaxExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/AjaxOptions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/InsertionMode.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxHelper.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxHelper`1.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxRequestExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryData.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryDataSerializer.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryToken.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryTokenSerializer.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AuthorizationContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/AuthorizeAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/BindAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/BuildManagerWrapper.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ContentResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Controller.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerActionInvoker.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerBase.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerBuilder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerDescriptorCache.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerTypeCache.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/CustomModelBinderAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultControllerFactory.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultViewLocationCache.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/DescriptorUtil.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/DictionaryHelpers.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/EmptyResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ExceptionContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FileContentResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FilePathResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FileResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FileStreamResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FilterAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FilterInfo.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FormCollection.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/FormMethod.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HandleErrorAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HandleErrorInfo.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/.gitattributes [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/FormExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/InputExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/LinkExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/MvcForm.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/RenderPartialExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/SelectExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/TextAreaExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Html/ValidationExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HtmlHelper.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HtmlHelper`1.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HttpAntiForgeryException.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HttpPostedFileBaseModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HttpUnauthorizedResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/HttpVerbs.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IActionFilter.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IActionInvoker.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IAuthorizationFilter.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IBuildManager.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IController.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IControllerFactory.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IExceptionFilter.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IResultFilter.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ITempDataProvider.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IView.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IViewDataContainer.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IViewEngine.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/IViewLocationCache.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/InputType.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/JavaScriptResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/JsonResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinderAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinderDictionary.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinders.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBindingContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelError.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelErrorCollection.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelState.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ModelStateDictionary.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/MultiSelectList.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/MvcHandler.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/MvcHttpHandler.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/MvcRouteHandler.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/NameValueCollectionExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/NonActionAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/NullViewLocationCache.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/OutputCacheAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ParameterBindingInfo.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ParameterDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/PartialViewResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/PathHelpers.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ReaderWriterCache`2.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/RedirectResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/RedirectToRouteResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedActionDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedControllerDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedParameterBindingInfo.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedParameterDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/.gitattributes [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/MvcResources.Designer.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/MvcResources.resx [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ResultExecutedContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ResultExecutingContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/RouteCollectionExtensions.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/RouteValuesHelpers.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/SelectList.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/SelectListItem.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/SessionStateTempDataProvider.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/TagBuilder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/TagRenderMode.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/TempDataDictionary.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/TypeHelpers.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/UrlHelper.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ValidateInputAttribute.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ValueProviderDictionary.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ValueProviderResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewContext.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewDataDictionary.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewDataDictionary`1.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngineCollection.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngineResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngines.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewMasterPage.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewMasterPage`1.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPage.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPageControlBuilder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPage`1.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewResult.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewResultBase.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewType.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewTypeControlBuilder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewTypeParserFilter.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControl.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControlControlBuilder.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControl`1.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/VirtualPathProviderViewEngine.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/WebFormView.cs [deleted file]
mcs/class/System.Web.Mvc/System.Web.Mvc/WebFormViewEngine.cs [deleted file]
mcs/class/System.Web.Mvc/license.htm [deleted file]
mcs/class/System.Web.Mvc2/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/ChangeLog [deleted file]
mcs/class/System.Web.Mvc2/GlobalSuppressions.cs [deleted file]
mcs/class/System.Web.Mvc2/Makefile [deleted file]
mcs/class/System.Web.Mvc2/Properties/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs [deleted file]
mcs/class/System.Web.Mvc2/Properties/ChangeLog [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc.csproj [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AcceptVerbsAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionExecutedContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionExecutingContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionFilterAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodDispatcher.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodDispatcherCache.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodSelector.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodSelectorAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionNameAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionNameSelectorAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionSelector.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/AjaxExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/AjaxOptions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/InsertionMode.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxHelper.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxHelper`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxRequestExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AntiForgeryData.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AntiForgeryDataSerializer.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaHelpers.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaRegistration.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaRegistrationContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AssociatedMetadataProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AssociatedValidatorProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ActionDescriptorCreator.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncActionDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncActionMethodSelector.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncControllerActionInvoker.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncManager.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncResultWrapper.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncUtil.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncVoid.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/BeginInvokeDelegate.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/EndInvokeDelegate.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/EndInvokeDelegate`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncActionInvoker.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncController.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncManagerContainer.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/OperationCounter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ReflectedAsyncActionDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ReflectedAsyncControllerDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SimpleAsyncResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SingleEntryGate.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SynchronizationContextUtil.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SynchronousOperationException.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/Trigger.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/TriggerListener.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AsyncController.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AsyncTimeoutAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AuthorizationContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/AuthorizeAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/BindAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/BuildManagerWrapper.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ByteArrayModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ChildActionOnlyAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ClientDataTypeModelValidatorProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ContentResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Controller.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerActionInvoker.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerBase.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerBuilder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerDescriptorCache.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerTypeCache.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/CustomModelBinderAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelMetadata.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelMetadataProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidator.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidatorProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidator`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DataErrorInfoModelValidatorProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultControllerFactory.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultViewLocationCache.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DescriptorUtil.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DictionaryHelpers.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DictionaryValueProvider`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/DynamicTypeGenerator.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyModelMetadataProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyModelValidatorProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Error.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExceptionContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionHelper.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/BinaryExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/CachedExpressionCompiler.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/CompiledExpressionDelegate`2.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ConditionalExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ConstantExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ExpressionParser.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/FastTrack`2.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/HashCodeCombiner.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/MemberExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/MethodCallExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ParameterExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ParserContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/UnaryExpressionFingerprint.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FieldValidationMetadata.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FileContentResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FilePathResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FileResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FileStreamResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FilterAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FilterInfo.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FormCollection.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FormContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FormMethod.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FormValueProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/FormValueProviderFactory.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HandleErrorAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HandleErrorInfo.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HiddenInputAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/ChildActionExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultDisplayTemplates.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultEditorTemplates.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DisplayExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DisplayTextExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/EditorExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/FormExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/InputExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/LabelExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/LinkExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/MvcForm.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/PartialExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/RenderPartialExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/SelectExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/TemplateHelpers.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/TextAreaExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/ValidationExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HtmlHelper.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HtmlHelper`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpAntiForgeryException.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpDeleteAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpFileCollectionValueProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpFileCollectionValueProviderFactory.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpGetAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpHandlerUtil.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPostAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPostedFileBaseModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPutAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpRequestExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpUnauthorizedResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpVerbs.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IActionFilter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IActionInvoker.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IAuthorizationFilter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IBuildManager.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IController.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IControllerFactory.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IExceptionFilter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IResultFilter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IRouteWithArea.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ITempDataProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IValueProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IView.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewDataContainer.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewEngine.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewLocationCache.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/InputType.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/JavaScriptResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/JsonRequestBehavior.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/JsonResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/LinqBinaryModelBinder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinderAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinderDictionary.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinders.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBindingContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRangeRule.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRegexRule.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRequiredRule.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRule.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationStringLengthRule.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelError.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelErrorCollection.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadata.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadataProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadataProviders.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelState.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelStateDictionary.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidationResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidator.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProviderCollection.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProviders.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/MultiSelectList.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHandler.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHtmlString.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHttpHandler.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcRouteHandler.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/NameValueCollectionExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/NameValueCollectionValueProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/NoAsyncTimeoutAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/NonActionAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/NullViewLocationCache.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/OutputCacheAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterBindingInfo.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterInfoUtil.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/PartialViewResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/PathHelpers.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/QueryStringValueProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/QueryStringValueProviderFactory.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RangeAttributeAdapter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ReaderWriterCache`2.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RedirectResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RedirectToRouteResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedActionDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedControllerDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedParameterBindingInfo.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedParameterDescriptor.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RegularExpressionAttributeAdapter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RequireHttpsAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RequiredAttributeAdapter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/.gitattributes [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/MvcResources.Designer.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/MvcResources.resx [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ResultExecutedContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ResultExecutingContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteCollectionExtensions.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteDataValueProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteDataValueProviderFactory.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteValuesHelpers.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/SelectList.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/SelectListItem.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/SessionStateTempDataProvider.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/StringLengthAttributeAdapter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TagBuilder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TagRenderMode.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TempDataDictionary.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TemplateInfo.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TryGetValueDelegate.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeCacheSerializer.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeCacheUtil.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeDescriptorHelper.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeHelpers.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/UrlHelper.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/UrlParameter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValidateInputAttribute.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderCollection.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderDictionary.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactories.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactory.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactoryCollection.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderUtil.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewContext.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataDictionary.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataDictionary`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataInfo.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngineCollection.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngineResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngines.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewMasterPage.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewMasterPage`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPage.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPageControlBuilder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPage`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewResult.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewResultBase.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTemplateUserControl.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTemplateUserControl`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewType.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTypeControlBuilder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTypeParserFilter.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControl.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControlControlBuilder.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControl`1.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/VirtualPathProviderViewEngine.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/WebFormView.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc/WebFormViewEngine.cs [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_2_0.csproj [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_4_0.csproj [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_4_5.csproj [deleted file]
mcs/class/System.Web.Mvc2/System.Web.Mvc2.dll.sources [deleted file]
mcs/class/System.Web.Mvc3/Mvc/Async/OperationCounter.cs
mcs/class/System.Web.Routing/Makefile
mcs/class/System.Web.Routing/System.Web.Routing-net_2_0.csproj [deleted file]
mcs/class/System.Web.Routing/System.Web.Routing-net_4_0.csproj [deleted file]
mcs/class/System.Web.Routing/System.Web.Routing-tests-net_2_0.csproj [deleted file]
mcs/class/System.Web.Routing/System.Web.Routing-tests-net_4_0.csproj [deleted file]
mcs/class/System.Web.Services/System.Web.Services-net_2_0.csproj [deleted file]
mcs/class/System.Web.Services/System.Web.Services-net_4_0.csproj [deleted file]
mcs/class/System.Web.Services/System.Web.Services-tests-net_2_0.csproj [deleted file]
mcs/class/System.Web.Services/System.Web.Services-tests-net_4_0.csproj [deleted file]
mcs/class/System.Web/Makefile
mcs/class/System.Web/System.Web-net_2_0.csproj [deleted file]
mcs/class/System.Web/System.Web-net_4_0.csproj [deleted file]
mcs/class/System.Web/System.Web-plainweb-net_2_0.csproj [deleted file]
mcs/class/System.Web/System.Web-plainweb-net_4_0.csproj [deleted file]
mcs/class/System.Web/System.Web-tests-net_2_0.csproj [deleted file]
mcs/class/System.Web/System.Web-tests-net_4_0.csproj [deleted file]
mcs/class/System.Web/UplevelHelperDefinitions.xml
mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_0.csproj [deleted file]
mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-tests-net_4_0.csproj [deleted file]
mcs/class/System.XML/System.Xml-bare-net_2_0.csproj [deleted file]
mcs/class/System.XML/System.Xml-bare-net_4_0.csproj [deleted file]
mcs/class/System.XML/System.Xml-net_2_0.csproj [deleted file]
mcs/class/System.XML/System.Xml-net_4_0.csproj [deleted file]
mcs/class/System.XML/System.Xml-tests-net_2_0.csproj [deleted file]
mcs/class/System.XML/System.Xml-tests-net_4_0.csproj [deleted file]
mcs/class/System.Xaml/System.Xaml-net_4_0.csproj [deleted file]
mcs/class/System.Xaml/System.Xaml-tests-net_4_0.csproj [deleted file]
mcs/class/System.Xml.Linq/System.Xml.Linq-net_2_0.csproj [deleted file]
mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_0.csproj [deleted file]
mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_2_0.csproj [deleted file]
mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_4_0.csproj [deleted file]
mcs/class/System/Makefile
mcs/class/System/SR.cs [new file with mode: 0644]
mcs/class/System/System-bare-net_2_0.csproj [deleted file]
mcs/class/System/System-bare-net_4_0.csproj [deleted file]
mcs/class/System/System-bare-net_4_5.csproj
mcs/class/System/System-net_2_0.csproj [deleted file]
mcs/class/System/System-net_4_0.csproj [deleted file]
mcs/class/System/System-net_4_5.csproj
mcs/class/System/System-secxml-net_2_0.csproj [deleted file]
mcs/class/System/System-secxml-net_4_0.csproj [deleted file]
mcs/class/System/System-secxml-net_4_5.csproj
mcs/class/System/System-tests-net_2_0.csproj [deleted file]
mcs/class/System/System-tests-net_4_0.csproj [deleted file]
mcs/class/System/System.Diagnostics/Process.cs
mcs/class/System/System.Diagnostics/ProcessStartInfo.cs
mcs/class/System/System.Net/WebClient.cs
mcs/class/System/System.Text.RegularExpressions/BaseMachine.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/CILCompiler.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/Capture.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/CaptureCollection.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/ChangeLog [deleted file]
mcs/class/System/System.Text.RegularExpressions/Group.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/GroupCollection.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/JvmReMachineFactory.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/Match.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/MatchCollection.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/MatchEvaluator.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/Regex.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RegexCompilationInfo.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RegexMatchTimeoutException.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RegexOptions.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RegexRunner.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RegexRunnerFactory.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RxCompiler.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RxInterpreter.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/RxOp.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/arch.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/cache.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/category.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/compiler.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/debug.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/gen-interp.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/interpreter.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/interval.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/notes.txt [deleted file]
mcs/class/System/System.Text.RegularExpressions/parser.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/quicksearch.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/replace.cs [deleted file]
mcs/class/System/System.Text.RegularExpressions/syntax.cs [deleted file]
mcs/class/System/System.dll.sources
mcs/class/System/System/UriParseComponents.cs
mcs/class/System/System_test.dll.sources
mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs
mcs/class/System/Test/System.Diagnostics/ProcessStartInfoTest.cs
mcs/class/System/Test/System.Net.WebSockets/ClientWebSocketTest.cs
mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs
mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs_Long.cs [new file with mode: 0644]
mcs/class/System/Test/System.Text.RegularExpressions/RegexTest.cs
mcs/class/System/Test/System/UriTest.cs
mcs/class/System/basic_System.dll.sources
mcs/class/System/mobile_System.dll.sources
mcs/class/SystemWebTestShim/SystemWebTestShim-net_2_0.csproj [deleted file]
mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_0.csproj [deleted file]
mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_0.csproj [deleted file]
mcs/class/WebMatrix.Data/WebMatrix.Data-tests-net_4_0.csproj [deleted file]
mcs/class/WindowsBase/WindowsBase-net_2_0.csproj [deleted file]
mcs/class/WindowsBase/WindowsBase-net_4_0.csproj [deleted file]
mcs/class/WindowsBase/WindowsBase-tests-net_2_0.csproj [deleted file]
mcs/class/WindowsBase/WindowsBase-tests-net_4_0.csproj [deleted file]
mcs/class/corlib/Makefile
mcs/class/corlib/ReferenceSources/Array.cs [new file with mode: 0644]
mcs/class/corlib/ReferenceSources/Environment.cs [new file with mode: 0644]
mcs/class/corlib/ReferenceSources/ExecutionContext.cs [new file with mode: 0644]
mcs/class/corlib/ReferenceSources/Helpers.cs [new file with mode: 0644]
mcs/class/corlib/System.Collections.Generic/List.cs
mcs/class/corlib/System.Diagnostics/StackFrame.cs
mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
mcs/class/corlib/System.Runtime.CompilerServices/AsyncTaskMethodBuilder.cs
mcs/class/corlib/System.Runtime.CompilerServices/AsyncTaskMethodBuilder_T.cs
mcs/class/corlib/System.Runtime.Remoting.Messaging/CallContext.cs
mcs/class/corlib/System.Threading.Tasks/CyclicDeque.cs
mcs/class/corlib/System.Threading.Tasks/Parallel.cs
mcs/class/corlib/System.Threading.Tasks/TaskContinuation.cs
mcs/class/corlib/System.Threading/ExecutionContext.cs
mcs/class/corlib/System.Threading/ExecutionContextSwitcher.cs [deleted file]
mcs/class/corlib/System.Threading/Monitor.cs
mcs/class/corlib/System.Threading/SemaphoreSlim.cs
mcs/class/corlib/System.Threading/Thread.cs
mcs/class/corlib/System.Threading/Timeout.cs
mcs/class/corlib/System.Threading/Volatile.cs
mcs/class/corlib/System/AppDomainSetup.cs
mcs/class/corlib/System/Environment.cs
mcs/class/corlib/System/Exception.cs
mcs/class/corlib/Test/System.Collections.Generic/ListTest.cs
mcs/class/corlib/Test/System.Reflection.Emit/DynamicMethodTest.cs
mcs/class/corlib/Test/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTest.cs [new file with mode: 0644]
mcs/class/corlib/Test/System.Threading.Tasks/ParallelTests.cs
mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
mcs/class/corlib/Test/System.Threading/ManualResetEventSlimTests.cs
mcs/class/corlib/Test/System/ArrayTest.cs
mcs/class/corlib/basic_corlib.dll.sources [new file with mode: 0644]
mcs/class/corlib/corlib-net_2_0.csproj [deleted file]
mcs/class/corlib/corlib-net_4_0.csproj [deleted file]
mcs/class/corlib/corlib-net_4_5.csproj
mcs/class/corlib/corlib-tests-net_2_0.csproj [deleted file]
mcs/class/corlib/corlib-tests-net_4_0.csproj [deleted file]
mcs/class/corlib/corlib.dll.sources
mcs/class/corlib/corlib_test.dll.sources
mcs/class/monodoc/monodoc-net_4_0.csproj [deleted file]
mcs/class/monodoc/monodoc-tests-net_4_0.csproj [deleted file]
mcs/errors/CS0165-51-lib.cs [new file with mode: 0644]
mcs/errors/CS1993-corlib.cs [new file with mode: 0644]
mcs/errors/Makefile
mcs/errors/cs0103-15.cs [new file with mode: 0644]
mcs/errors/cs0103-16.cs [new file with mode: 0644]
mcs/errors/cs0117-9.cs [new file with mode: 0644]
mcs/errors/cs0122-37.cs [new file with mode: 0644]
mcs/errors/cs0165-51.cs [new file with mode: 0644]
mcs/errors/cs0426-4.cs [deleted file]
mcs/errors/cs1001-9.cs [deleted file]
mcs/errors/cs1031-2.cs [new file with mode: 0644]
mcs/errors/cs1061-16.cs [new file with mode: 0644]
mcs/errors/cs1061-17.cs [new file with mode: 0644]
mcs/errors/cs1644-48.cs [new file with mode: 0644]
mcs/errors/cs1928-2.cs [deleted file]
mcs/errors/cs1928-3.cs [deleted file]
mcs/errors/cs1929-2.cs [new file with mode: 0644]
mcs/errors/cs1929-3.cs [new file with mode: 0644]
mcs/errors/cs1929.cs
mcs/errors/cs1993.cs
mcs/errors/cs7003-5.cs [new file with mode: 0644]
mcs/errors/cs7003-6.cs [new file with mode: 0644]
mcs/errors/cs7003-7.cs [new file with mode: 0644]
mcs/errors/cs7003-8.cs [new file with mode: 0644]
mcs/errors/cs7048.cs [new file with mode: 0644]
mcs/errors/cs8071-2.cs [deleted file]
mcs/errors/cs8071.cs [deleted file]
mcs/errors/cs8081-2.cs [new file with mode: 0644]
mcs/errors/cs8081.cs [new file with mode: 0644]
mcs/errors/cs8082.cs [new file with mode: 0644]
mcs/errors/cs8083.cs [new file with mode: 0644]
mcs/errors/cs8084-2.cs [new file with mode: 0644]
mcs/errors/cs8084.cs [new file with mode: 0644]
mcs/mcs/async.cs
mcs/mcs/attribute.cs
mcs/mcs/class.cs
mcs/mcs/complete.cs
mcs/mcs/constant.cs
mcs/mcs/context.cs
mcs/mcs/cs-parser.jay
mcs/mcs/cs-tokenizer.cs
mcs/mcs/decl.cs
mcs/mcs/delegate.cs
mcs/mcs/doc.cs
mcs/mcs/dynamic.cs
mcs/mcs/ecore.cs
mcs/mcs/expression.cs
mcs/mcs/field.cs
mcs/mcs/flowanalysis.cs
mcs/mcs/generic.cs
mcs/mcs/linq.cs
mcs/mcs/mcs-net_4_0.csproj [deleted file]
mcs/mcs/membercache.cs
mcs/mcs/namespace.cs
mcs/mcs/pending.cs
mcs/nunit24/ClientUtilities/util/Makefile
mcs/nunit24/ConsoleRunner/nunit-console/ConsoleUi.cs
mcs/nunit24/ConsoleRunner/nunit-console/Makefile
mcs/nunit24/NUnitCore/core/Makefile
mcs/nunit24/NUnitCore/interfaces/Makefile
mcs/nunit24/NUnitExtensions/core/Makefile
mcs/nunit24/NUnitExtensions/framework/Makefile
mcs/nunit24/NUnitFramework/framework/Makefile
mcs/nunit24/NUnitMocks/mocks/Makefile
mcs/tests/Makefile
mcs/tests/gtest-409.cs
mcs/tests/gtest-626.cs [new file with mode: 0644]
mcs/tests/gtest-627.cs [new file with mode: 0644]
mcs/tests/gtest-628.cs [new file with mode: 0644]
mcs/tests/gtest-named-06.cs [new file with mode: 0644]
mcs/tests/test-695.cs
mcs/tests/test-814.cs
mcs/tests/test-910.cs [new file with mode: 0644]
mcs/tests/test-async-76.cs [new file with mode: 0644]
mcs/tests/test-decl-expr-01.cs
mcs/tests/test-dictinit-03.cs [new file with mode: 0644]
mcs/tests/test-named-09.cs [new file with mode: 0644]
mcs/tests/test-nameof-02.cs
mcs/tests/test-nameof-05.cs [new file with mode: 0644]
mcs/tests/test-null-operator-05.cs
mcs/tests/test-pattern-06.cs
mcs/tests/ver-il-net_4_5.xml
mcs/tools/Makefile
mcs/tools/corcompare/mono-api-html/ApiChange.cs [new file with mode: 0644]
mcs/tools/corcompare/mono-api-html/ApiDiff.cs
mcs/tools/corcompare/mono-api-html/AssemblyComparer.cs
mcs/tools/corcompare/mono-api-html/ClassComparer.cs
mcs/tools/corcompare/mono-api-html/Comparer.cs
mcs/tools/corcompare/mono-api-html/ConstructorComparer.cs
mcs/tools/corcompare/mono-api-html/EventComparer.cs
mcs/tools/corcompare/mono-api-html/FieldComparer.cs
mcs/tools/corcompare/mono-api-html/Helpers.cs
mcs/tools/corcompare/mono-api-html/MemberComparer.cs
mcs/tools/corcompare/mono-api-html/NamespaceComparer.cs
mcs/tools/corcompare/mono-api-html/PropertyComparer.cs
mcs/tools/corcompare/mono-api-html/mono-api-html.csproj
mcs/tools/resgen/Makefile
mcs/tools/symbolicate/LocationProvider.cs [new file with mode: 0644]
mcs/tools/symbolicate/Makefile [new file with mode: 0644]
mcs/tools/symbolicate/symbolicate.cs [new file with mode: 0644]
mcs/tools/symbolicate/symbolicate.exe.sources [new file with mode: 0644]
mcs/tools/xbuild/xbuild_test.make
mono-core.spec.in
mono/arch/ppc/ppc-codegen.h
mono/arch/sparc/Makefile.am
mono/arch/sparc/tramp.c [deleted file]
mono/io-layer/handles.c
mono/metadata/Makefile.am
mono/metadata/appdomain.c
mono/metadata/class.c
mono/metadata/console-unix.c
mono/metadata/domain.c
mono/metadata/gc-internal.h
mono/metadata/gc.c
mono/metadata/icall.c
mono/metadata/marshal.c
mono/metadata/marshal.h
mono/metadata/mempool.c
mono/metadata/mono-debug-debugger.c [deleted file]
mono/metadata/mono-debug-debugger.h
mono/metadata/mono-debug.c
mono/metadata/mono-debug.h
mono/metadata/mono-perfcounters.c
mono/metadata/object-internals.h
mono/metadata/object.c
mono/metadata/remoting.c [new file with mode: 0644]
mono/metadata/remoting.h [new file with mode: 0644]
mono/metadata/sgen-alloc.c
mono/metadata/sgen-archdep.h
mono/metadata/sgen-cardtable.c
mono/metadata/sgen-conf.h
mono/metadata/sgen-copy-object.h
mono/metadata/sgen-debug.c
mono/metadata/sgen-descriptor.c
mono/metadata/sgen-descriptor.h
mono/metadata/sgen-fin-weak-hash.c
mono/metadata/sgen-gc.c
mono/metadata/sgen-gc.h
mono/metadata/sgen-gray.c
mono/metadata/sgen-gray.h
mono/metadata/sgen-hash-table.c
mono/metadata/sgen-los.c
mono/metadata/sgen-major-copy-object.h
mono/metadata/sgen-major-scan-object.h [deleted file]
mono/metadata/sgen-marksweep-drain-gray-stack.h [new file with mode: 0644]
mono/metadata/sgen-marksweep-scan-object-concurrent.h [new file with mode: 0644]
mono/metadata/sgen-marksweep.c
mono/metadata/sgen-minor-copy-object.h
mono/metadata/sgen-minor-scan-object.h
mono/metadata/sgen-os-posix.c
mono/metadata/sgen-pinning.c
mono/metadata/sgen-pointer-queue.c
mono/metadata/sgen-protocol.c
mono/metadata/sgen-protocol.h
mono/metadata/sgen-scan-object.h
mono/metadata/sgen-stw.c
mono/metadata/sgen-tagged-pointer.h
mono/metadata/sgen-workers.c
mono/metadata/threads.c
mono/mini/Makefile.am.in
mono/mini/aot-compiler.c
mono/mini/aot-runtime.c
mono/mini/cpu-amd64.md
mono/mini/cpu-arm.md
mono/mini/cpu-arm64.md
mono/mini/cpu-mips.md
mono/mini/cpu-ppc.md
mono/mini/cpu-ppc64.md
mono/mini/cpu-s390x.md
mono/mini/cpu-x86.md
mono/mini/debug-mini.c
mono/mini/debugger-agent.c
mono/mini/debugger-agent.h
mono/mini/driver.c
mono/mini/exceptions-ppc.c
mono/mini/exceptions-s390x.c
mono/mini/ir-emit.h
mono/mini/method-to-ir.c
mono/mini/mini-amd64.c
mono/mini/mini-amd64.h
mono/mini/mini-arm.c
mono/mini/mini-arm.h
mono/mini/mini-codegen.c
mono/mini/mini-exceptions.c
mono/mini/mini-gc.c
mono/mini/mini-ia64.h
mono/mini/mini-mips.c
mono/mini/mini-mips.h
mono/mini/mini-ops.h
mono/mini/mini-posix.c
mono/mini/mini-ppc.c
mono/mini/mini-ppc.h
mono/mini/mini-s390x.c
mono/mini/mini-s390x.h
mono/mini/mini-sparc.h
mono/mini/mini-unwind.h
mono/mini/mini-x86.c
mono/mini/mini-x86.h
mono/mini/mini.c
mono/mini/mini.h
mono/mini/seq-points.c [new file with mode: 0644]
mono/mini/seq-points.h [new file with mode: 0644]
mono/mini/ssa.c
mono/mini/tramp-arm.c
mono/mini/tramp-ppc.c
mono/profiler/Makefile.am
mono/profiler/proflog.c
mono/tests/assemblyresolve/Makefile.am
mono/tests/monitor-resurrection.cs
mono/utils/mach-support.c
mono/utils/mono-compiler.h
mono/utils/mono-counters.c
mono/utils/mono-dl.c
mono/utils/mono-dl.h
mono/utils/mono-io-portability.c
mono/utils/mono-linked-list-set.h
mono/utils/mono-mmap.c
mono/utils/mono-proclib.c
mono/utils/mono-proclib.h
mono/utils/mono-publib.h
mono/utils/mono-threads-mach.c
mono/utils/mono-threads-posix.c
mono/utils/mono-threads.c
mono/utils/mono-threads.h
mono/utils/strtod.c
msvc/eglib.vcxproj
msvc/genmdesc.vcxproj
msvc/libgc.vcxproj
msvc/libmono.vcxproj
msvc/libmonoruntime.vcxproj
msvc/mono.def
msvc/monoposixhelper.vcxproj
msvc/monosgen.def
msvc/winsetup.bat
runtime/Makefile.am
scripts/Makefile.am
scripts/dmcs.in
scripts/gmcs.in
tools/sgen/gcpausevis.py
tools/sgen/sgen-grep-binprot.c
winconfig.h

index ea48a9e7fb97074a8d4e78730d00394afbf64e44..55a955ec624e0e86ba27aba53940285245c10261 100644 (file)
@@ -69,6 +69,7 @@ config.status
 config.sub
 configure
 configure.scan
+cygconfig.h
 depcomp
 install-sh
 libtool
index 4dbffc0de0772efe0c91a3c1baf708decd7aeda8..f81b6c6dc718351485fe148349f9182a299bac38 100644 (file)
@@ -25,3 +25,6 @@
 [submodule "external/ikdasm"]
        path = external/ikdasm
        url = git://github.com/mono/ikdasm.git
+[submodule "external/referencesource"]
+       path = external/referencesource
+       url = git://github.com/mono/referencesource
index a04886ff4b0d0317bc1a2caa6d093c101ec5c83f..230a4505f08c0bbb000f5582184eee1e8111f0f9 100644 (file)
@@ -5,7 +5,7 @@ When contributing to the Mono project, please follow the [Mono Coding
 Guidelines][1].  We have been using a coding style for many years,
 please make your patches conform to these guidelines.
 
-[1] http://www.mono-project.com/community/contributing/coding-guidelines/
+[1]: http://www.mono-project.com/community/contributing/coding-guidelines/
 
 Etiquette
 =========
@@ -68,7 +68,7 @@ status of your pull request. If it succeeded and we like the changes,
 a maintainer will likely merge it. Otherwise, you can amend your pull
 request to fix build breakage and Jenkins will test it again.
 
-[2] http://jenkins.mono-project.com/
+[2]: http://jenkins.mono-project.com/
 
 # Inactivity
 
index c44c4b93c09690f1949a64b77994b52215b39cb4..8d2b691fa7bc0e2c4cd2a521b70044b18dd0a936 100644 (file)
@@ -8,7 +8,7 @@ if CROSS_COMPILING
 SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 else
 if ONLY_MONOTOUCH
 SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
@@ -19,7 +19,7 @@ else
 SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 endif
 endif
 endif
index b061956eee24f682e087c6d01b78bf1fad95dd74..bb5b98a76c729f95eac8d59f0771fd35543f991e 100644 (file)
--- a/README.md
+++ b/README.md
 Mono is a software platform designed to allow developers to easily create cross platform applications.
-Mono is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
+It is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
 
-[![Build Status](http://jenkins.mono-project.com/job/test-mono-mainline/badge/icon/)](http://jenkins.mono-project.com/job/test-mono-mainline/)
-
-1. [Installation](#compilation-and-installation)
+1. [Compilation and Installation](#compilation-and-installation)
 2. [Using Mono](#using-mono)
 3. [Directory Roadmap](#directory-roadmap)
-4. [Contributing to Mono] (#contributing-to-mono) 
-5. [Git submodules maintenance](#git-submodules-maintenance)
-6. [Reporting bugs](#reporting-bugs)
+4. [Contributing to Mono](#contributing-to-mono)
+5. [Reporting bugs](#reporting-bugs)
+6. [Configuration Options](#configuration-options)
+
+**Build Status**
+
+| debian-amd64 | debian-i386 | centos-s390x | windows-amd64 |
+|:------------:|:-----------:|:------------:|:-------------:|
+| [![debian-amd64](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon)](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/) | [![debian-i386](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon)](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/) | [![centos-s390x](http://jenkins.mono-project.com/job/test-mono-mainline/label=centos-s390x/badge/icon)](http://jenkins.mono-project.com/job/test-mono-mainline/label=centos-s390x/) | [![windows-amd64](https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true)](https://ci.appveyor.com/project/ajlennon/mono-817/branch/master) |
 
 Compilation and Installation
 ============================
 
-a. Build Requirements
+Building the Software
 ---------------------
 
-* On Itanium, you must obtain libunwind: http://www.hpl.hp.com/research/linux/libunwind/download.php4
-
-* On Solaris
-
- 1. Make sure that you used GNU tar to unpack this package, as
- Solaris tar will not unpack this correctly, and you will get strange errors.
+Please see our guides for building Mono on
+[Mac OS X](http://www.mono-project.com/docs/compiling-mono/mac/),
+[Linux](http://www.mono-project.com/docs/compiling-mono/linux/) and 
+[Windows](http://www.mono-project.com/docs/compiling-mono/windows/).
 
- 2. Make sure that you use the GNU toolchain to build the software.
+Note that building from Git assumes that you already have Mono installed,
+so please download and [install the latest Mono release](http://www.mono-project.com/download/)
+before trying to build from Git. This is required because the Mono build
+relies on a working Mono C# compiler to compile itself
+(also known as [bootstrapping](http://en.wikipedia.org/wiki/Bootstrapping_(compilers))).
 
- 3. Optional dependencies
+If you don't have a working Mono installation
+---------------------------------------------
 
-  * libgdiplus - Required for System.Drawing. This library in turn requires glib and pkg-config
+If you don't have a working Mono installation, you can try a slightly
+more risky approach: getting the latest version of the 'monolite' distribution,
+which contains just enough to run the 'mcs' compiler. You do this with:
 
-  * pkg-config - Available at: http://www.freedesktop.org/Software/pkgconfig
+    # Run the following line after ./autogen.sh
+    make get-monolite-latest
 
-  * glib 2.4 - Available at: http://www.gtk.org/
+This will download and place the files appropriately so that you can then
+just run:
 
-  * libzlib - This library and the development headers are required for compression
-file support in the 2.0 profile.
+    make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe
 
- 4. Mono is required to build Mono. Use a system package or monolite (explained further below)
- 5. If you have a system Mono (not monolite), you will need to read this: http://mono-project.com/Parallel_Mono_Environments#Setting_up_a_Build_Environment
+The build will then use the files downloaded by `make get-monolite-latest`.
 
-b. Building the Software
+Testing and Installation
 ------------------------
 
-If you obtained this package as an officially released tarball,
-this is very simple, use configure and make:
+You can run the mono and mcs test suites with the command: `make check`.
 
-`./configure --prefix=/usr/local ; make ; make install`
+Expect to find a few test suite failures. As a sanity check, you
+can compare the failures you got with [https://wrench.mono-project.com/Wrench/](https://wrench.mono-project.com/Wrench/)
+and [http://jenkins.mono-project.com/](http://jenkins.mono-project.com/).
 
-Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390,
-S/390x, AMD64, ARM and PowerPC systems.   
+You can now install mono with: `make install`
 
-If you obtained this as a snapshot, you will need an existing
-Mono installation.  To upgrade your installation, unpack both
-mono and mcs:
+You can verify your installation by using the mono-test-install
+script, it can diagnose some common problems with Mono's install.
+Failure to follow these steps may result in a broken installation. 
 
-       tar xzf mcs-XXXX.tar.gz
-       tar xzf mono-XXXX.tar.gz
-       mv mono-XXX mono
-       mv mcs-XXX mcs
-       cd mono
-       ./autogen.sh --prefix=/usr/local
-       make
+Using Mono
+==========
 
-The Mono build system is silent for most compilation commands.
-To enable a more verbose compile (for example, to pinpoint
-problems in your makefiles or your system) pass the V=1 flag to make, like this:
+Once you have installed the software, you can run a few programs:
 
-` make V=1`
+* `mono program.exe` runtime engine
 
+* `mcs program.cs` C# compiler 
 
-c. Building the software from GIT
----------------------------------
+* `monodis program.exe` CIL Disassembler
 
-If you are building the software from GIT, make sure that you
-have up-to-date mcs and mono sources:
+See the man pages for mono(1), mcs(1) and monodis(1) for further details.
 
- * If you are an anonymous user: `git clone git://github.com/mono/mono.git`
+Directory Roadmap
+=================
 
- * If you are a Mono contributor with read/write privileges: `git clone git@github.com:mono/mono.git`
+* `data/` - Configuration files installed as part of the Mono runtime.
 
-Then, go into the mono directory, and configure:
+* `docs/` - Technical documents about the Mono runtime.
 
-       cd mono
-       ./autogen.sh --prefix=/usr/local
-       make
+* `external/` - Git submodules for external libraries (Newtonsoft.Json, ikvm, etc).
 
-For people with non-standard installations of the auto* utils and of
-pkg-config (common on misconfigured OSX and windows boxes), you could get
-an error like this:
+* `man/` - Manual pages for the various Mono commands and programs.
 
-       ./configure: line 19176: syntax error near unexpected token 'PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
+* `mcs/` - The class libraries, compiler and tools
 
-This means that you need to set the ACLOCAL_FLAGS environment variable
-when invoking autogen.sh, like this: 
+  * `class/` - The class libraries (like System.*, Microsoft.Build, etc.)
 
-        ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/local
+  * `mcs/` - The Mono C# compiler written in C#
 
-where $acprefix is the prefix where aclocal has been installed.
-This will automatically go into the mcs/ tree and build the
-binaries there.
+  * `tools/` - Tools like gacutil, ikdasm, mdoc, etc.
 
-This assumes that you have a working mono installation, and that
-there's a C# compiler named 'mcs', and a corresponding IL
-runtime called 'mono'.  You can use two make variables
-EXTERNAL_MCS and EXTERNAL_RUNTIME to override these.  e.g., you
-can say:
+* `mono/` - The core of the Mono Runtime.
 
-       make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
+  * `arch/` - Architecture specific portions.
 
-If you don't have a working Mono installation
----------------------------------------------
+  * `cil/` - Common Intermediate Representation, XML
+definition of the CIL bytecodes.
 
-If you don't have a working Mono installation, an obvious choice
-is to install the latest released packages of 'mono' for your
-distribution and running `autogen.sh; make; make install` in the
-mono module directory.
+  * `dis/` - CIL executable Disassembler
 
-You can also try a slightly more risky approach: this may not work,
-so start from the released tarball as detailed above.
+  * `io-layer/` - The I/O layer and system abstraction for 
+emulating the .NET IO model.
 
-This works by first getting the latest version of the 'monolite'
-distribution, which contains just enough to run the 'mcs'
-compiler. You do this with:
+  * `metadata/` - The object system and metadata reader.
 
-       # Run the following line after ./autogen.sh
-       make get-monolite-latest
+  * `mini/` - The Just in Time Compiler.
 
-This will download and automatically gunzip and untar the
-tarball, and place the files appropriately so that you can then
-just run: `make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe`
+* `runtime/` - A directory that contains the Makefiles that link the
+mono/ and mcs/ build systems.
 
-That will use the files downloaded by 'make get-monolite-latest.
+* `samples/` -Some simple sample programs on uses of the Mono
+runtime as an embedded library.   
 
-Testing and Installation
-------------------------
+* `scripts/` - Scripts used to invoke Mono and the corresponding program.
 
-You can run *(part of)* the mono and mcs test suites with the command: `make check`.
-All tests should pass.  
+* `../olive/` - Incubation code from [Olive](https://github.com/mono/olive).
 
-If you want more *extensive* tests, including those that test the
-class libraries, you need to re-run 'configure' with the
-'--enable-nunit-tests' flag, and try: `make -k check`
+  * If the directory ../olive is present (as an
+independent checkout) from the Mono module, that
+directory is automatically configured to share the
+same prefix than this module gets.
 
-Expect to find a few test suite failures. As a sanity check, you
-can compare the failures you got with
+Contributing to Mono
+====================
 
-    https://wrench.mono-project.com/Wrench/
+Before submitting changes to Mono, please review the [contribution guidelines](http://www.mono-project.com/community/contributing/).
+Please pay particular attention to the [Important Rules](http://www.mono-project.com/community/contributing/#important-rules) section.
 
-You can now install mono with: `make install`
+Reporting bugs
+==============
 
-You can verify your installation by using the mono-test-install
-script, it can diagnose some common problems with Mono's install.
-Failure to follow these steps may result in a broken installation. 
+To submit bug reports, please use [Xamarin's Bugzilla](https://bugzilla.xamarin.com/)
 
-d. Configuration Options
-------------------------
+Please use the search facility to ensure the same bug hasn't already
+been submitted and follow our [guidelines](http://www.mono-project.com/community/bugs/make-a-good-bug-report/)
+on how to make a good bug report.
+
+Configuration Options
+=====================
 
 The following are the configuration options that someone
 building Mono might want to use:
@@ -164,17 +151,16 @@ building Mono might want to use:
 compilation of a Mono runtime with the SGen garbage collector.
 
   * On platforms that support it, after building Mono, you will have
-both a mono binary and a mono-sgen binary.  Mono uses Boehm, while
-mono-sgen uses the Simple Generational GC.
+both a `mono` binary and a `mono-sgen` binary. `mono` uses Boehm, while
+`mono-sgen` uses the Simple Generational GC.
 
-* `--with-gc=[boehm, included, sgen, none]` - Selects the default Boehm garbage
+* `--with-gc=[included, boehm,  none]` - Selects the default Boehm garbage
 collector engine to use.
 
   * *included*: (*slighty modified Boehm GC*)
-This is the default value, and its
-the most feature complete, it will allow Mono
-to use typed allocations and support the
-debugger.
+This is the default value for the Boehm GC, and it's 
+the most feature complete, it will allow Mono 
+to use typed allocations and support the debugger. 
 
   * *boehm*:
 This is used to use a system-install Boehm GC,
@@ -267,30 +253,6 @@ and runtime.
 
   * This defaults to `yes`.
 
-* `--with-moonlight=yes,no`
-
-  * Whether you want to generate the Silverlight/Moonlight
-libraries and toolchain in addition to the default
-(1.1 and 2.0 APIs).
-
-  * This will produce the `smcs` compiler which will reference
-the Silverlight modified assemblies (mscorlib.dll,
-System.dll, System.Code.dll and System.Xml.Core.dll) and turn
-on the LINQ extensions for the compiler.
-
-* `--with-moon-gc=boehm,sgen` - Select the GC to use for Moonlight.
-
-  * *boehm*:
-Selects the Boehm Garbage Collector, with the same flags
-as the regular Mono build. This is the default.
-
-  * *sgen*:
-Selects the new SGen Garbage Collector, which provides
-Generational GC support, using the same flags as the
-mono-sgen build.
-
-  * This defaults to `boehm`.
-
 * `--with-libgdiplus=installed,sibling,<path>` - Configure where Mono
 searches for libgdiplus when running System.Drawing tests.
 
@@ -298,7 +260,7 @@ searches for libgdiplus when running System.Drawing tests.
 library is available to Mono through the regular
 system setup.
 
-  * `sibling' can be used to specify that a libgdiplus
+  * `sibling` can be used to specify that a libgdiplus
 that resides as a sibling of this directory (mono)
 should be used.
 
@@ -405,13 +367,13 @@ for Mono.  The LLVM code generator and optimizer will be
 used instead of Mono's built-in code generator for both
 Just in Time and Ahead of Time compilations.
 
-  * See the http://www.mono-project.com/Mono_LLVM for the 
+  * See http://www.mono-project.com/docs/advanced/mono-llvm/ for the 
 full details and up-to-date information on this feature.
 
   * You will need to have an LLVM built that Mono can link
 against.
 
-  * The --enable-loadedllvm variant will make the LLVM backend
+  * The `--enable-loadedllvm` variant will make the LLVM backend
 into a runtime-loadable module instead of linking it directly
 into the main mono binary.
 
@@ -445,7 +407,6 @@ not done much testing with Mono.
 runtime that contains DTrace probes and can
 participate in the system profiling using DTrace.
 
-
 * `--disable-dev-random`
 
   * Mono uses /dev/random to obtain good random data for
@@ -464,85 +425,3 @@ http://code.google.com/p/nativeclient/
 
   * Currently this is used with Mono's AOT engine as
 Native Client does not support JIT engines yet.
-
-Using Mono
-==========
-
-Once you have installed the software, you can run a few programs:
-
-* `mono program.exe` runtime engine
-
-* `mcs program.cs` C# compiler 
-
-* `monodis program.exe` CIL Disassembler
-
-See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
-for further details.
-
-Directory Roadmap
-=================
-
-* `docs/` - Technical documents about the Mono runtime.
-
-* `data/` - Configuration files installed as part of the Mono runtime.
-
-* `mono/` - The core of the Mono Runtime.
-
-  * `metadata/` - The object system and metadata reader.
-
-  * `mini/` - The Just in Time Compiler.
-
-  * `dis/` - CIL executable Disassembler
-
-  * `io-layer/` - The I/O layer and system abstraction for 
-emulating the .NET IO model.
-
-  * `cil/` - Common Intermediate Representation, XML
-definition of the CIL bytecodes.
-
- * `arch/` - Architecture specific portions.
-
-* `man/` - Manual pages for the various Mono commands and programs.
-
-* `samples/` -Some simple sample programs on uses of the Mono
-runtime as an embedded library.   
-
-* `scripts/` - Scripts used to invoke Mono and the corresponding program.
-
-* `runtime/` - A directory that contains the Makefiles that link the
-mono/ and mcs/ build systems.
-
-* `../olive/`
-
-  * If the directory ../olive is present (as an
-independent checkout) from the Mono module, that
-directory is automatically configured to share the
-same prefix than this module gets.
-
-Contributing to Mono
-====================
-Before submitting changes to Mono, please review the contribution guidelines at http://mono-project.com/Contributing. Please pay particular attention to the [Important Rules](http://mono-project.com/Contributing#Important_Rules) section.
-
-
-Git submodules maintenance
-==========================
-
-Read documentation at http://mono-project.com/Git_Submodule_Maintenance
-
-Maintainer
-==========
-
-Mono is maintained by miguel@xamarin.com
-
-Reporting bugs
-==============
-
-To submit bug reports, please use Xamarin's Bugzilla:
-
-https://bugzilla.xamarin.com/
-
-Please use the search facility to ensure the same bug hasn't already
-been submitted and follow our guidelines on how to make a good bug
-report:
-
-http://mono-project.com/Bugs#How_to_make_a_good_bug_report
index 2bc3c0d08f50253386858ba297895eadfae6e96f..45838328adb21f6c631d32086d5562477d993d09 100644 (file)
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #AC_PREREQ([2.62])
 
-AC_INIT(mono, [3.12.1],
+AC_INIT(mono, [3.99.0],
         [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
 
 AC_CONFIG_SRCDIR([README.md])
@@ -2299,9 +2299,6 @@ fi
 
 AC_ARG_ENABLE(bcl-opt, [  --disable-bcl-opt    BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
 
-AC_ARG_ENABLE(nunit-tests, [  --enable-nunit-tests     Run the nunit tests of the class library on 'make check'])
-AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
-
 AC_MSG_CHECKING([if big-arrays are to be enabled])
 AC_ARG_ENABLE(big-arrays,  [  --enable-big-arrays      Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
 if test "x$enable_big_arrays" = "xyes" ; then
@@ -2799,7 +2796,18 @@ if test "x$host" != "x$target"; then
                # in mono-compiler.h            
                with_tls=pthread
                target_mach=no
-               ;;                      
+               ;;
+   aarch64*-linux-*)
+               TARGET=ARM64;
+               arch_target=arm64;
+               AC_DEFINE(TARGET_ARM64, 1, [...])
+               AC_DEFINE(TARGET_ANDROID, 1, [...])
+               CPPFLAGS="$CPPFLAGS"
+               # Can't use tls, since it depends on the runtime detection of tls offsets
+               # in mono-compiler.h
+               with_tls=pthread
+               target_mach=no
+               ;;
        aarch64-*)
                TARGET=ARM64
                ;;
@@ -3199,8 +3207,6 @@ case "x$libgc" in
                ;;
 esac
 
-AC_ARG_WITH(profile2,  [  --with-profile2=yes,no          If you want to install the 2.0/3.5 FX (defaults to yes)],            [], [with_profile2=yes])
-AC_ARG_WITH(profile4,  [  --with-profile4=yes,no          If you want to install the 4.0 FX (defaults to yes)],                [], [with_profile4=yes])
 AC_ARG_WITH(profile4_5,[  --with-profile4_5=yes,no        If you want to install the 4.5 FX (defaults to yes)],                [], [with_profile4_5=yes])
 AC_ARG_WITH(monodroid, [  --with-monodroid=yes,no         If you want to build the MonoDroid assemblies (defaults to no)],     [], [with_monodroid=no])
 AC_ARG_WITH(monotouch, [  --with-monotouch=yes,no,only    If you want to build the MonoTouch assemblies (defaults to no)],     [], [with_monotouch=no])
@@ -3235,7 +3241,7 @@ AC_ARG_WITH(mcs_docs,[  --with-mcs-docs=yes,no         If you want to build the
                DISABLE_MCS_DOCS=yes
        fi
 ])
-if test x$with_profile4 != xyes; then
+if test x$with_profile4_5 != xyes; then
        DISABLE_MCS_DOCS=yes
 fi
 
@@ -3275,8 +3281,6 @@ dnl Consistency settings
 dnl
 if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
    DISABLE_MCS_DOCS=yes
-   with_profile2=no
-   with_profile4=no
    with_profile4_5=no
    with_monodroid=no
    with_monotouch=no
@@ -3299,8 +3303,6 @@ AC_SUBST(OPROFILE_LIBS)
 
 libmono_ldflags="$libmono_ldflags $LIBS"
 
-AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes])
-AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
 AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
 AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
 AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
@@ -3683,10 +3685,7 @@ fi
         echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make
     fi
 
-       default_profile=net_2_0
-    if test -z "$INSTALL_4_0_TRUE"; then :
-               default_profile=net_4_0
-    fi
+       default_profile=net_4_5
     if test -z "$INSTALL_MONODROID_TRUE"; then :
                default_profile=monodroid
     fi
@@ -3744,8 +3743,6 @@ echo "
        LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
 
    Libraries:
-       .NET 2.0/3.5:  $with_profile2
-       .NET 4.0:      $with_profile4
        .NET 4.5:      $with_profile4_5
        MonoDroid:     $with_monodroid
        MonoTouch:     $with_monotouch
index daf6f38a79b0f46601558a19b3da7f1952152b62..73dbe78209bad2e8499b44fe57e22bce9b1c5cce 100644 (file)
@@ -1,8 +1,4 @@
-SUBDIRS = net_2_0
-
-if INSTALL_4_0
-SUBDIRS += net_4_0 net_4_5
-endif
+SUBDIRS = net_2_0 net_4_0 net_4_5
 
 monodir = $(sysconfdir)/mono
 
index 1ff6c42ff28d5247e052e7e68b34c72e9a43f8eb..5281419c00bcffd42155da17f705895cd7232e29 100644 (file)
@@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
+AC_CHECK_FUNCS(getrlimit)
 
 #
 # Mono currently supports 10.6, but strndup is not available prior to 10.7; avoiding
@@ -179,7 +180,7 @@ if test "x$have_iso_varargs" = "xyes"; then
 fi
 AC_SUBST(G_HAVE_ISO_VARARGS)
 
-AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
+AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h sys/resource.h)
 AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
 AC_SUBST(HAVE_ALLOCA_H)
 
index 533c84116c3a449c582103327a47e0b2b40fc3b6..d23e32a534c5428173f371e531ee61c8a4a82826 100644 (file)
@@ -176,7 +176,6 @@ typedef struct _GMemChunk GMemChunk;
 /*
  * Misc.
  */
-#define g_atexit(func) ((void) atexit (func))
 
 const gchar *    g_getenv(const gchar *variable);
 gboolean         g_setenv(const gchar *variable, const gchar *value, gboolean overwrite);
index 836e6f2aa9c6c551113692c2da65059b72e92a37..449a724be9d40b1482d2cd877f9a0eb5e13efc72 100644 (file)
 #include <sys/wait.h>
 #endif
 
+#ifdef HAVE_SYS_RESOURCE_H
+#  include <sys/resource.h>
+#endif
+
 #ifdef G_OS_WIN32
 #include <io.h>
 #include <winsock2.h>
@@ -213,6 +217,23 @@ write_all (int fd, const void *vbuf, size_t n)
        return nwritten;
 }
 
+#ifndef G_OS_WIN32
+static int
+g_getdtablesize (void)
+{
+#ifdef HAVE_GETRLIMIT
+       struct rlimit limit;
+       int res;
+
+       res = getrlimit (RLIMIT_NOFILE, &limit);
+       g_assert (res == 0);
+       return limit.rlim_cur;
+#else
+       return getdtablesize ();
+#endif
+}
+#endif
+
 gboolean
 g_spawn_command_line_sync (const gchar *command_line,
                                gchar **standard_output,
@@ -256,7 +277,7 @@ g_spawn_command_line_sync (const gchar *command_line,
                        close (stderr_pipe [0]);
                        dup2 (stderr_pipe [1], STDERR_FILENO);
                }
-               for (i = getdtablesize () - 1; i >= 3; i--)
+               for (i = g_getdtablesize () - 1; i >= 3; i--)
                        close (i);
 
                /* G_SPAWN_SEARCH_PATH is always enabled for g_spawn_command_line_sync */
@@ -417,7 +438,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
                        }
 
                        if ((flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN) != 0) {
-                               for (i = getdtablesize () - 1; i >= 3; i--)
+                               for (i = g_getdtablesize () - 1; i >= 3; i--)
                                        close (i);
                        }
 
index fdab3ddae63efbe05fcb1e812cb18facc35c9146..04e8d4075ce134087eb22387b8b0da242f4ab482 100755 (executable)
@@ -1,6 +1,10 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+#ifndef _MSC_VER
+#include "cygconfig.h"
+#else
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
@@ -74,3 +78,4 @@
 #define VERSION "0.1"
 
 #define HAVE_STRTOK_R 1
+#endif
diff --git a/external/referencesource b/external/referencesource
new file mode 160000 (submodule)
index 0000000..2616265
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 26162653439981f3c4db56685845196424572cac
index 784c078d3815302c80e86dfbf9fe73a2672e557f..8eaaed6343b6044f97551459cee8805c39fa9136 100644 (file)
@@ -119,6 +119,7 @@ If specified, forces the generated AOT files to be bound to the
 runtime version of the compiling Mono.   This will prevent the AOT
 files from being consumed by a different Mono runtime.
 .I full
+.Sp
 This is currently an experimental feature as it is not complete.
 This instructs Mono to precompile code that has historically not been
 precompiled with AOT.   
index 49423b4a15f23a7d4a49c4c410f24abce50cc57e..350756a661b4e62ef62de08651676f9dc6ad29a7 100644 (file)
@@ -6,14 +6,12 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
 
 basic_SUBDIRS := build jay mcs class
 build_SUBDIRS := build class mcs class/aot-compiler tools
-net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
 monodroid_SUBDIRS := build class
 monotouch_SUBDIRS := build class
 monotouch_runtime_SUBDIRS := build class
 xammac_SUBDIRS := build class
 mobile_SUBDIRS := build class
 mobile_static_SUBDIRS := build class
-net_3_5_SUBDIRS := build class tools/xbuild
 net_4_0_SUBDIRS := build class
 net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 xbuild_12_SUBDIRS := build class tools/xbuild
@@ -88,7 +86,7 @@ dir-check:
 
 # fun specialty targets
 
-PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12 xbuild_14
+PROFILES = net_4_5 net_4_0 xbuild_12 xbuild_14
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -109,16 +107,14 @@ profiles-do--run-test:
 _boot_ = all clean install
 $(_boot_:%=profile-do--xbuild_14--%):         profile-do--xbuild_14--%:         profile-do--net_4_5--%
 $(_boot_:%=profile-do--xbuild_12--%):         profile-do--xbuild_12--%:         profile-do--net_4_5--%
+$(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--net_4_5--%
 $(_boot_:%=profile-do--net_4_5--%):           profile-do--net_4_5--%:           profile-do--build--%
-$(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--build--%
-$(_boot_:%=profile-do--net_3_5--%):           profile-do--net_3_5--%:           profile-do--net_2_0--%
 $(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch_runtime--%):  profile-do--monotouch_runtime--%:  profile-do--build--%
 $(_boot_:%=profile-do--xammac--%):            profile-do--xammac--%:            profile-do--build--%
 $(_boot_:%=profile-do--mobile--%):            profile-do--mobile--%:         profile-do--build--%
 $(_boot_:%=profile-do--mobile_static--%):     profile-do--mobile_static--%:     profile-do--build--%
-$(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--build--%
 $(_boot_:%=profile-do--build--%):             profile-do--build--%:             profile-do--basic--%
 
 testcorlib:
index 34d857a65f552632e95a88665f9a35f7ce82bd8b..8ca1e7c7fa257ad5fd1c95d5afcf1c3566940838 100644 (file)
@@ -18,9 +18,7 @@ PLATFORMS = darwin linux win32
 PROFILES = \
        basic \
        build \
-       net_2_0 \
-       net_3_5 \
-       net_4_0 \
+       net_4_0 \
        net_4_5 \
        xbuild_12 \
        xbuild_14
@@ -29,7 +27,8 @@ COMMON_SRCS = \
        Consts.cs.in                    \
        Locale.cs                       \
        MonoTODOAttribute.cs \
-       basic-profile-check.cs
+       basic-profile-check.cs          \
+       SR.cs
 
 DISTFILES = \
        README.makefiles                \
index 5aa2f39908df44131d3c1caa31bb24491397bcfa..b17eeabc70349549c95337705a9b5f074cf2fcd3 100644 (file)
@@ -58,22 +58,11 @@ static class Consts
        public const string VsVersion = "0.0.0.0"; // Useless ?
        public const string VsFileVersion = "10.0.0.0"; // TODO:
 #elif NET_3_5
-       // Versions of .NET Framework 3.5 RTM
-       public const string FxVersion = "3.5.0.0";
-       public const string FxFileVersion = "3.5.21022.8";
-       
-       public const string VsVersion = "0.0.0.0"; // Useless ?
+       #error Profile NET_3_5 is not supported.
 #elif NET_3_0
-       public const string FxVersion = "3.0.0.0";
-       public const string VsVersion = "8.0.0.0";
-       public const string FxFileVersion = "3.0.4506.648";
-       public const string VsFileVersion = "6.0.6001.17014";
+       #error Profile NET_3_0 is not supported.
 #elif NET_2_0
-       // Versions of .NET Framework 2.0 RTM
-       public const string FxVersion = "2.0.0.0";
-       public const string VsVersion = "8.0.0.0";
-       public const string FxFileVersion = "2.0.50727.1433";
-       public const string VsFileVersion = "8.0.50727.1433";
+       #error Profile NET_2_0 is not supported.
 #elif NET_1_1
        #error Profile NET_1_1 is not supported.
 #elif NET_1_0
@@ -124,7 +113,5 @@ static class Consts
        public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #elif NET_2_1
        public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
-#elif NET_2_0
-       public const string AssemblySystem_Core = "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #endif
 }
diff --git a/mcs/build/common/SR.cs b/mcs/build/common/SR.cs
new file mode 100644 (file)
index 0000000..a4ac490
--- /dev/null
@@ -0,0 +1,43 @@
+using System.Globalization;
+
+static class AssemblyRef
+{
+       // FIXME
+       internal const string SystemConfiguration = "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+       internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+
+       public const string EcmaPublicKey = "b77a5c561934e089";
+       public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
+       public const string SystemWeb = Consts.AssemblySystem_Web;
+       public const string SystemWebExtensions =  "System.Web.Extensions, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35"; 
+}
+
+static partial class SR
+{
+       internal static string GetString(string name, params object[] args)
+       {
+               return GetString (CultureInfo.InvariantCulture, name, args);
+       }
+
+       internal static string GetString(CultureInfo culture, string name, params object[] args)
+       {
+               return string.Format (culture, name, args);
+       }
+
+       internal static string GetString(string name)
+       {
+               return name;
+       }
+
+       internal static string GetString(CultureInfo culture, string name)
+       {
+               return name;
+       }
+}
+
+namespace System.Runtime.CompilerServices
+{
+       class FriendAccessAllowed : Attribute
+       { }
+}
index 42d7adedfea4d725bbd13df3726652fee1a9c9c1..958d6af9c1774b8fe26450cc6b735b8f2e958fef 100644 (file)
@@ -1,3 +1,5 @@
+using System;
+
 class X {
        // Check installed compiler
        static void Generic<T> ()
@@ -20,6 +22,21 @@ class X {
                if (o == null)
                        return 1;
 
+               var consts = o.GetType ().Assembly.GetType ("Consts");
+               if (consts == null)
+                       return 2;
+
+               var field = consts.GetField ("MonoVersion");
+               if (field == null)
+                       return 3;
+
+               Version version;
+               if (!Version.TryParse (field.GetValue (null) as string, out version))
+                       return 4;
+
+               if (version < new Version (3, 2))
+                       return 5;
+
                return 0;
        }
 }
index de94a445eb8010b5c7def72cecae974938b19902..bfc73413391266a012d5977ab25d4adb902a7167 100644 (file)
@@ -9,7 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = mscorlib.dll
 PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac,
 
-EXTERNAL_MCS = gmcs
+EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = mbas
 EXTERNAL_RUNTIME = mono
 #ILDISASM = monodis
index a70984716ee4cec3601f5da77be4155d1f28a4cd..fd54351c47bf9d2deab761d1dd64c693afa522d9 100644 (file)
@@ -9,7 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = mscorlib.dll
 PLATFORM_TEST_HARNESS_EXCLUDES =
 
-EXTERNAL_MCS = gmcs
+EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = mbas
 EXTERNAL_RUNTIME = mono
 #ILDISASM = monodis
index 3a98d99a4a931a3bc2bcbeb55084abe4d949f880..d5df46e9da8bb1791901c2f8ab33dc5c01c2a41e 100644 (file)
@@ -9,7 +9,7 @@ PLATFORM_RUNTIME =
 PLATFORM_CORLIB = mscorlib.dll
 PLATFORM_TEST_HARNESS_EXCLUDES =
 
-EXTERNAL_MCS = gmcs
+EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = vbc.exe
 EXTERNAL_RUNTIME =
 
index 12f6c82cff2c8f05c225231d8d3769a19760335d..48dd39a7860db7a5d9b1fd52f95fb426acf173b4 100644 (file)
@@ -18,11 +18,11 @@ endif
 
 MCS = $(with_mono_path) $(INTERNAL_GMCS)
 
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:BOOTSTRAP_BASIC -nowarn:1699
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 NO_INSTALL = yes
-FRAMEWORK_VERSION = 2.0
+FRAMEWORK_VERSION = 4.0
 
 # Compiler all using same bootstrap compiler
 LIBRARY_COMPILE = $(BOOT_COMPILE)
@@ -65,7 +65,7 @@ do-profile-check: $(depsdir)/.stamp
                $(MAKE) -s do-profile-check-monolite ; \
            else \
                echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
-                echo "*** You need Mono version 2.10 or better installed to build MCS" 1>&2 ; \
+                echo "*** You need Mono version 3.2 or better installed to build MCS" 1>&2 ; \
                 echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
                exit 1; fi; fi
 
index b09a441a03fffa49ed8548963e5e41500fbc6553..b8ba1ce1146e473e0c51341e9ea9c4470d69b137 100644 (file)
@@ -13,10 +13,10 @@ profile-check:
        @:
 
 DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
 
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 NO_INSTALL = yes
 
-FRAMEWORK_VERSION = 4.0
+FRAMEWORK_VERSION = 4.5
index 117ac6051512b75ac1cbf8b82af38c9185e86339..75611d8cda4d649e058bd4b1b7b45d0e42eb5931 100644 (file)
@@ -22,6 +22,8 @@ PROFILE_MCS_FLAGS = \
        -d:NET_3_5 \
        -d:NET_4_0 \
        -d:NET_4_5 \
+       -d:MONO \
+       -d:DISABLE_CAS_USE \
        -nowarn:1699 \
        -nostdlib \
        -lib:$(topdir)/class/lib/$(PROFILE) \
index b789823519463da50495b379d55a7837c5c7e188..2fef29aa96fa90d710635c67579bc0d2dff22e9d 100644 (file)
@@ -20,6 +20,8 @@ PROFILE_MCS_FLAGS = \
        -d:NET_3_5 \
        -d:NET_4_0 \
        -d:NET_4_5 \
+       -d:MONO \
+       -d:DISABLE_CAS_USE \
        -d:MOBILE \
        -d:FULL_AOT_RUNTIME \
        -d:DISABLE_REMOTING \
index c14f61c6087ffe40bcc4dc05ea6eec4846d16d99..28698ca63d60e12ef05cb049a0a42d237871acc1 100644 (file)
@@ -20,6 +20,8 @@ PROFILE_MCS_FLAGS = \
        -d:NET_3_5 \
        -d:NET_4_0 \
        -d:NET_4_5 \
+       -d:MONO \
+       -d:DISABLE_CAS_USE \
        -d:MOBILE \
        -d:MOBILE_DYNAMIC \
        -d:MONODROID \
index 706463d748cd4c1021e2dd5b4bca32c4c99f4ae3..c60d9398ffa190805439342211e43aae899fa056 100644 (file)
@@ -21,6 +21,8 @@ PROFILE_MCS_FLAGS = \
        -d:NET_4_0 \
        -d:NET_4_5 \
        -d:MOBILE \
+       -d:MONO \
+       -d:DISABLE_CAS_USE \
        -d:MONOTOUCH \
        -d:DISABLE_REMOTING \
        -d:DISABLE_COM \
index f438e805f0d054115e869b8e7042725b92c83b2b..59c7df4c31cd4366c9a4f6d65807c6056643938c 100644 (file)
@@ -14,7 +14,7 @@ profile-check:
        @:
 
 DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -D:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE  -d:MOBILE -d:MONOTOUCH -D:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
 
 FRAMEWORK_VERSION = 2.1
 
diff --git a/mcs/build/profiles/net_2_0.make b/mcs/build/profiles/net_2_0.make
deleted file mode 100644 (file)
index e3be2c8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- makefile -*-
-
-BOOTSTRAP_PROFILE = build
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-
-# nuttzing!
-
-profile-check:
-       @:
-
-DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
-
-FRAMEWORK_VERSION = 2.0
-XBUILD_VERSION = 2.0
diff --git a/mcs/build/profiles/net_3_5.make b/mcs/build/profiles/net_3_5.make
deleted file mode 100644 (file)
index 9717689..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- makefile -*-
-
-BOOTSTRAP_PROFILE = build
-
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-
-# nuttzing!
-
-profile-check:
-       @:
-
-DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) -lib:$(topdir)/class/lib/net_2_0 $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
-
-FRAMEWORK_VERSION = 3.5
-XBUILD_VERSION = 3.5
-
-TEST_HARNESS = $(topdir)/class/lib/net_2_0/nunit-console.exe
-TEST_MONO_PATH = $(topdir)/class/lib/net_2_0
-
index 99782bd526a783bd31c1e88598150f2fcc09a979..032ed752a7ed1cdc5f6e36fd34eeb9b1ba7a373b 100644 (file)
@@ -1,17 +1,21 @@
 # -*- makefile -*-
 
 BOOTSTRAP_PROFILE = build
+TOOLS_PROFILE = net_4_5
 
 BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
 MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
 
+INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(TOOLS_PROFILE)/resgen.exe
+RESGEN = MONO_PATH="$(topdir)/class/lib/$(TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
+
 # nuttzing!
 
 profile-check:
        @:
 
 DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699,1635 -warn:1 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) --metadata-only
 
 FRAMEWORK_VERSION = 4.0
 XBUILD_VERSION = 4.0
@@ -19,4 +23,4 @@ XBUILD_VERSION = 4.0
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
 # Ignore tests on net_4_0 as the 4.0 IL code is never used for running (just for metadata), so it doesn't make sense to execute tests there
-NO_TEST = yes
+NO_TEST = yes
\ No newline at end of file
index ad921e705ea23954807e40962b2e6cef80d3875b..7c37b2c89d644fb8b025c8db6b6a4d8ed47d03a7 100644 (file)
@@ -11,7 +11,7 @@ profile-check:
        @:
 
 DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE  -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
 
 FRAMEWORK_VERSION = 4.5
 XBUILD_VERSION = 4.0
index d463a0fe943f580ecb05e81aaaf4d91ec6768853..3a91b7620e2960a986b6fd3eb54cf34335945190 100644 (file)
@@ -18,6 +18,8 @@ PROFILE_MCS_FLAGS = \
        -d:NET_3_5 \
        -d:NET_4_0 \
        -d:NET_4_5 \
+       -d:MONO \
+       -d:DISABLE_CAS_USE  \
        -d:MOBILE \
        -d:MOBILE_DYNAMIC \
        -d:XAMMAC \
index d3aff7e92e6645311ea9ba4b7d4b27ee8a8d98f0..4e0f9940dfeb23af2f1e773605a5e5abe7f804a7 100644 (file)
@@ -2,6 +2,6 @@
 
 include $(topdir)/build/profiles/net_4_5.make
 
-PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -lib:$(topdir)/class/lib/net_4_5
+PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -d:MONO -d:DISABLE_CAS_USE  -lib:$(topdir)/class/lib/net_4_5
 
 XBUILD_VERSION = 12.0
index cc55a1ded3b5907186e002bd6bc9bea9c132d1ff..eeff40826788f5c4bfac80a996cb07f5cb655e29 100644 (file)
@@ -2,6 +2,6 @@
 
 include $(topdir)/build/profiles/net_4_5.make
 
-PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -d:XBUILD_14 -lib:$(topdir)/class/lib/net_4_5
+PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -d:XBUILD_14 -d:MONO -d:DISABLE_CAS_USE  -lib:$(topdir)/class/lib/net_4_5
 
 XBUILD_VERSION = 14.0
diff --git a/mcs/class/Accessibility/Accessibility-net_2_0.csproj b/mcs/class/Accessibility/Accessibility-net_2_0.csproj
deleted file mode 100644 (file)
index af67d34..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{43A23ADA-35D9-4A48-BCE5-C21C081C6676}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Accessibility</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Accessibility\IAccessible.cs" />\r
-    <Compile Include="Accessibility\IAccessibleHandler.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Accessibility/Accessibility-net_4_0.csproj b/mcs/class/Accessibility/Accessibility-net_4_0.csproj
deleted file mode 100644 (file)
index ca19c09..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0978E130-1E7B-4627-A9CC-7489DB17BFF1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Accessibility</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Accessibility\IAccessible.cs" />\r
-    <Compile Include="Accessibility\IAccessibleHandler.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_2_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_2_0.csproj
deleted file mode 100644 (file)
index 7c10932..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2B2412A6-4397-4DA7-94A6-D1AFEBCFA563}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Commons.Xml.Relaxng</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\Misc.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />\r
-    <Compile Include="Commons.Xml\XmlDefaultReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/relaxng.rng">\r
-      <LogicalName>relaxng.rng</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_0.csproj
deleted file mode 100644 (file)
index 7b18712..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4381A633-26BF-430E-B03B-A83DC8146BF9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Commons.Xml.Relaxng</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\Misc.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />\r
-    <Compile Include="Commons.Xml\XmlDefaultReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/relaxng.rng">\r
-      <LogicalName>relaxng.rng</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_2_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 726cbf6..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0CCD9F77-53C4-4E1A-92C5-0A237C034C00}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Commons.Xml.Relaxng_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\NvdlValidatingReaderTests.cs" />\r
-    <Compile Include="Test\RdpPatternTests.cs" />\r
-    <Compile Include="Test\RelaxngDatatypeProviderTests.cs" />\r
-    <Compile Include="Test\RelaxngReaderTests.cs" />\r
-    <Compile Include="Test\RelaxngValidatingReaderTests.cs" />\r
-    <Compile Include="Test\RncTests.cs" />\r
-    <Compile Include="Test\XsdDatatypeTests.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_2_0.csproj">\r
-      <Project>{2B2412A6-4397-4DA7-94A6-D1AFEBCFA563}</Project>\r
-      <Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/relaxng.rng">\r
-      <LogicalName>relaxng.rng</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 91ba9f2..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{75496501-CA6D-4C97-952E-95DC6F77C523}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Commons.Xml.Relaxng_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\NvdlValidatingReaderTests.cs" />\r
-    <Compile Include="Test\RdpPatternTests.cs" />\r
-    <Compile Include="Test\RelaxngDatatypeProviderTests.cs" />\r
-    <Compile Include="Test\RelaxngReaderTests.cs" />\r
-    <Compile Include="Test\RelaxngValidatingReaderTests.cs" />\r
-    <Compile Include="Test\RncTests.cs" />\r
-    <Compile Include="Test\XsdDatatypeTests.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_0.csproj">\r
-      <Project>{4381A633-26BF-430E-B03B-A83DC8146BF9}</Project>\r
-      <Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/relaxng.rng">\r
-      <LogicalName>relaxng.rng</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib-net_2_0.csproj b/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib-net_2_0.csproj
deleted file mode 100644 (file)
index 14e8e98..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8F572B12-CBD2-48F8-8234-41A876C57364}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/compat/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\AssemblyInfo.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Checksums\Crc32.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Checksums\StrangeCrc.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipConstants.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipInputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipOutputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />\r
-    <Compile Include=".\ICSharpCode.SharpZipLib\ZipException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Cscompmgd/Cscompmgd-net_2_0.csproj b/mcs/class/Cscompmgd/Cscompmgd-net_2_0.csproj
deleted file mode 100644 (file)
index c828993..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C010783F-1EAC-480C-B1D4-A289426D3F8F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>cscompmgd</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\Compiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CompilerError.cs" />\r
-    <Compile Include="Microsoft.CSharp\ErrorLevel.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Cscompmgd/Cscompmgd-net_4_0.csproj b/mcs/class/Cscompmgd/Cscompmgd-net_4_0.csproj
deleted file mode 100644 (file)
index 0dc073f..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B26893EC-D295-40B7-8AE6-60B3D0F5CBA6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>cscompmgd</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\Compiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CompilerError.cs" />\r
-    <Compile Include="Microsoft.CSharp\ErrorLevel.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Cscompmgd/Cscompmgd-tests-net_2_0.csproj b/mcs/class/Cscompmgd/Cscompmgd-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 2ecba67..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B3E7EE0C-3AB6-4578-844E-FF72C5807953}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Cscompmgd-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Cscompmgd_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.CSharp\CompilerTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Cscompmgd\Cscompmgd-net_2_0.csproj">\r
-      <Project>{C010783F-1EAC-480C-B1D4-A289426D3F8F}</Project>\r
-      <Name>Cscompmgd\Cscompmgd-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Cscompmgd/Cscompmgd-tests-net_4_0.csproj b/mcs/class/Cscompmgd/Cscompmgd-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 2db269e..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0CD2EF3C-6E4A-4FC5-9D8C-B0CB5E4EE3BF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Cscompmgd-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Cscompmgd_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.CSharp\CompilerTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Cscompmgd\Cscompmgd-net_4_0.csproj">\r
-      <Project>{B26893EC-D295-40B7-8AE6-60B3D0F5CBA6}</Project>\r
-      <Name>Cscompmgd\Cscompmgd-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/CustomMarshalers/CustomMarshalers-net_2_0.csproj b/mcs/class/CustomMarshalers/CustomMarshalers-net_2_0.csproj
deleted file mode 100644 (file)
index 367270e..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{81062FC0-B86A-4707-9BC3-F67FDFB47AF4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>CustomMarshalers</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_0.csproj b/mcs/class/CustomMarshalers/CustomMarshalers-net_4_0.csproj
deleted file mode 100644 (file)
index dbc975d..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{73865D3C-DCFC-4C7A-8AB5-D8C3CA6DBB42}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>CustomMarshalers</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/CJK/I18N.CJK-net_2_0.csproj b/mcs/class/I18N/CJK/I18N.CJK-net_2_0.csproj
deleted file mode 100644 (file)
index 73a2654..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9C753AD5-56C6-46F8-976E-3AD3A4481626}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.CJK</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CodeTable.cs" />\r
-    <Compile Include="CP51932.cs" />\r
-    <Compile Include="CP932.cs" />\r
-    <Compile Include="CP936.cs" />\r
-    <Compile Include="CP949.cs" />\r
-    <Compile Include="CP950.cs" />\r
-    <Compile Include="DbcsConvert.cs" />\r
-    <Compile Include="DbcsEncoding.cs" />\r
-    <Compile Include="GB18030Encoding.cs" />\r
-    <Compile Include="GB18030Source.cs" />\r
-    <Compile Include="ISO2022JP.cs" />\r
-    <Compile Include="JISConvert.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="big5.table">\r
-      <LogicalName>big5.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb2312.table">\r
-      <LogicalName>gb2312.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="jis.table">\r
-      <LogicalName>jis.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="ks.table">\r
-      <LogicalName>ks.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb18030.table">\r
-      <LogicalName>gb18030.table</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/CJK/I18N.CJK-net_4_0.csproj b/mcs/class/I18N/CJK/I18N.CJK-net_4_0.csproj
deleted file mode 100644 (file)
index 9b59c9e..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{500EF496-DB58-4EB4-B123-BC09DACE2012}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.CJK</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CodeTable.cs" />\r
-    <Compile Include="CP51932.cs" />\r
-    <Compile Include="CP932.cs" />\r
-    <Compile Include="CP936.cs" />\r
-    <Compile Include="CP949.cs" />\r
-    <Compile Include="CP950.cs" />\r
-    <Compile Include="DbcsConvert.cs" />\r
-    <Compile Include="DbcsEncoding.cs" />\r
-    <Compile Include="GB18030Encoding.cs" />\r
-    <Compile Include="GB18030Source.cs" />\r
-    <Compile Include="ISO2022JP.cs" />\r
-    <Compile Include="JISConvert.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="big5.table">\r
-      <LogicalName>big5.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb2312.table">\r
-      <LogicalName>gb2312.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="jis.table">\r
-      <LogicalName>jis.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="ks.table">\r
-      <LogicalName>ks.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb18030.table">\r
-      <LogicalName>gb18030.table</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/CJK/I18N.CJK-tests-net_2_0.csproj b/mcs/class/I18N/CJK/I18N.CJK-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 2f53e58..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{53F4354D-AEFA-4AB8-AF76-89012BB8FEB3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.CJK-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.CJK_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.CJK.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\CJK\I18N.CJK-net_2_0.csproj">\r
-      <Project>{9C753AD5-56C6-46F8-976E-3AD3A4481626}</Project>\r
-      <Name>CJK\I18N.CJK-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="big5.table">\r
-      <LogicalName>big5.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb2312.table">\r
-      <LogicalName>gb2312.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="jis.table">\r
-      <LogicalName>jis.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="ks.table">\r
-      <LogicalName>ks.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb18030.table">\r
-      <LogicalName>gb18030.table</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/CJK/I18N.CJK-tests-net_4_0.csproj b/mcs/class/I18N/CJK/I18N.CJK-tests-net_4_0.csproj
deleted file mode 100644 (file)
index fafecaf..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7D404BC0-DF57-4817-8F9A-A6B91AE6EAE6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.CJK-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.CJK_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.CJK.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\CJK\I18N.CJK-net_4_0.csproj">\r
-      <Project>{500EF496-DB58-4EB4-B123-BC09DACE2012}</Project>\r
-      <Name>CJK\I18N.CJK-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="big5.table">\r
-      <LogicalName>big5.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb2312.table">\r
-      <LogicalName>gb2312.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="jis.table">\r
-      <LogicalName>jis.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="ks.table">\r
-      <LogicalName>ks.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb18030.table">\r
-      <LogicalName>gb18030.table</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/Common/I18N-net_2_0.csproj b/mcs/class/I18N/Common/I18N-net_2_0.csproj
deleted file mode 100644 (file)
index 4c71f89..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ByteEncoding.cs" />\r
-    <Compile Include="ByteSafeEncoding.cs" />\r
-    <Compile Include="Handlers.cs" />\r
-    <Compile Include="Manager.cs" />\r
-    <Compile Include="MonoEncoding.cs" />\r
-    <Compile Include="MonoSafeEncoding.cs" />\r
-    <Compile Include="Strings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/Common/I18N-net_4_0.csproj b/mcs/class/I18N/Common/I18N-net_4_0.csproj
deleted file mode 100644 (file)
index c346251..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ByteEncoding.cs" />\r
-    <Compile Include="ByteSafeEncoding.cs" />\r
-    <Compile Include="Handlers.cs" />\r
-    <Compile Include="Manager.cs" />\r
-    <Compile Include="MonoEncoding.cs" />\r
-    <Compile Include="MonoSafeEncoding.cs" />\r
-    <Compile Include="Strings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/MidEast/I18N.MidEast-net_2_0.csproj b/mcs/class/I18N/MidEast/I18N.MidEast-net_2_0.csproj
deleted file mode 100644 (file)
index f02ffb3..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{81E84AE7-FF9C-499B-9CA1-02E438C233C6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.MidEast</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1254.cs" />\r
-    <Compile Include="CP1255.cs" />\r
-    <Compile Include="CP1256.cs" />\r
-    <Compile Include="CP28596.cs" />\r
-    <Compile Include="CP28598.cs" />\r
-    <Compile Include="CP28599.cs" />\r
-    <Compile Include="CP38598.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/MidEast/I18N.MidEast-net_4_0.csproj b/mcs/class/I18N/MidEast/I18N.MidEast-net_4_0.csproj
deleted file mode 100644 (file)
index 6c332f3..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BF6B8C9E-ADAA-4682-BA1D-F01EAE06BA6F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.MidEast</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1254.cs" />\r
-    <Compile Include="CP1255.cs" />\r
-    <Compile Include="CP1256.cs" />\r
-    <Compile Include="CP28596.cs" />\r
-    <Compile Include="CP28598.cs" />\r
-    <Compile Include="CP28599.cs" />\r
-    <Compile Include="CP38598.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/MidEast/I18N.MidEast-tests-net_2_0.csproj b/mcs/class/I18N/MidEast/I18N.MidEast-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 1a204a2..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6BC73CD0-ADAF-461D-B190-F1458D439314}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.MidEast-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.MidEast_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.MidEast.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\MidEast\I18N.MidEast-net_2_0.csproj">\r
-      <Project>{81E84AE7-FF9C-499B-9CA1-02E438C233C6}</Project>\r
-      <Name>MidEast\I18N.MidEast-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/MidEast/I18N.MidEast-tests-net_4_0.csproj b/mcs/class/I18N/MidEast/I18N.MidEast-tests-net_4_0.csproj
deleted file mode 100644 (file)
index cbeabf9..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{476F5ACC-F7DF-4EA1-8566-E97D4C839E04}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.MidEast-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.MidEast_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.MidEast.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\MidEast\I18N.MidEast-net_4_0.csproj">\r
-      <Project>{BF6B8C9E-ADAA-4682-BA1D-F01EAE06BA6F}</Project>\r
-      <Name>MidEast\I18N.MidEast-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/Other/I18N.Other-net_2_0.csproj b/mcs/class/I18N/Other/I18N.Other-net_2_0.csproj
deleted file mode 100644 (file)
index 1886f5c..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F77F18AA-4F63-456F-8FC4-6A2DFD8F9D54}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.Other</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1251.cs" />\r
-    <Compile Include="CP1257.cs" />\r
-    <Compile Include="CP1258.cs" />\r
-    <Compile Include="CP20866.cs" />\r
-    <Compile Include="CP21866.cs" />\r
-    <Compile Include="CP28594.cs" />\r
-    <Compile Include="CP28595.cs" />\r
-    <Compile Include="CP57002.cs" />\r
-    <Compile Include="CP874.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/Other/I18N.Other-net_4_0.csproj b/mcs/class/I18N/Other/I18N.Other-net_4_0.csproj
deleted file mode 100644 (file)
index e8f9a8e..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CC8BF0F1-8799-4639-AFAF-83A89F73E8B9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.Other</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1251.cs" />\r
-    <Compile Include="CP1257.cs" />\r
-    <Compile Include="CP1258.cs" />\r
-    <Compile Include="CP20866.cs" />\r
-    <Compile Include="CP21866.cs" />\r
-    <Compile Include="CP28594.cs" />\r
-    <Compile Include="CP28595.cs" />\r
-    <Compile Include="CP57002.cs" />\r
-    <Compile Include="CP874.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/Rare/I18N.Rare-net_2_0.csproj b/mcs/class/I18N/Rare/I18N.Rare-net_2_0.csproj
deleted file mode 100644 (file)
index 0ba3a61..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{83015125-AD39-4160-B723-677CB4F1EF3D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.Rare</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1026.cs" />\r
-    <Compile Include="CP1047.cs" />\r
-    <Compile Include="CP1140.cs" />\r
-    <Compile Include="CP1141.cs" />\r
-    <Compile Include="CP1142.cs" />\r
-    <Compile Include="CP1143.cs" />\r
-    <Compile Include="CP1144.cs" />\r
-    <Compile Include="CP1145.cs" />\r
-    <Compile Include="CP1146.cs" />\r
-    <Compile Include="CP1147.cs" />\r
-    <Compile Include="CP1148.cs" />\r
-    <Compile Include="CP1149.cs" />\r
-    <Compile Include="CP20273.cs" />\r
-    <Compile Include="CP20277.cs" />\r
-    <Compile Include="CP20278.cs" />\r
-    <Compile Include="CP20280.cs" />\r
-    <Compile Include="CP20284.cs" />\r
-    <Compile Include="CP20285.cs" />\r
-    <Compile Include="CP20290.cs" />\r
-    <Compile Include="CP20297.cs" />\r
-    <Compile Include="CP20420.cs" />\r
-    <Compile Include="CP20424.cs" />\r
-    <Compile Include="CP20871.cs" />\r
-    <Compile Include="CP21025.cs" />\r
-    <Compile Include="CP37.cs" />\r
-    <Compile Include="CP500.cs" />\r
-    <Compile Include="CP708.cs" />\r
-    <Compile Include="CP852.cs" />\r
-    <Compile Include="CP855.cs" />\r
-    <Compile Include="CP857.cs" />\r
-    <Compile Include="CP858.cs" />\r
-    <Compile Include="CP862.cs" />\r
-    <Compile Include="CP864.cs" />\r
-    <Compile Include="CP866.cs" />\r
-    <Compile Include="CP869.cs" />\r
-    <Compile Include="CP870.cs" />\r
-    <Compile Include="CP875.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/Rare/I18N.Rare-net_4_0.csproj b/mcs/class/I18N/Rare/I18N.Rare-net_4_0.csproj
deleted file mode 100644 (file)
index 62866c1..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{94F03A2C-5E8D-4FEC-B936-BCF99F97C2DF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.Rare</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1026.cs" />\r
-    <Compile Include="CP1047.cs" />\r
-    <Compile Include="CP1140.cs" />\r
-    <Compile Include="CP1141.cs" />\r
-    <Compile Include="CP1142.cs" />\r
-    <Compile Include="CP1143.cs" />\r
-    <Compile Include="CP1144.cs" />\r
-    <Compile Include="CP1145.cs" />\r
-    <Compile Include="CP1146.cs" />\r
-    <Compile Include="CP1147.cs" />\r
-    <Compile Include="CP1148.cs" />\r
-    <Compile Include="CP1149.cs" />\r
-    <Compile Include="CP20273.cs" />\r
-    <Compile Include="CP20277.cs" />\r
-    <Compile Include="CP20278.cs" />\r
-    <Compile Include="CP20280.cs" />\r
-    <Compile Include="CP20284.cs" />\r
-    <Compile Include="CP20285.cs" />\r
-    <Compile Include="CP20290.cs" />\r
-    <Compile Include="CP20297.cs" />\r
-    <Compile Include="CP20420.cs" />\r
-    <Compile Include="CP20424.cs" />\r
-    <Compile Include="CP20871.cs" />\r
-    <Compile Include="CP21025.cs" />\r
-    <Compile Include="CP37.cs" />\r
-    <Compile Include="CP500.cs" />\r
-    <Compile Include="CP708.cs" />\r
-    <Compile Include="CP852.cs" />\r
-    <Compile Include="CP855.cs" />\r
-    <Compile Include="CP857.cs" />\r
-    <Compile Include="CP858.cs" />\r
-    <Compile Include="CP862.cs" />\r
-    <Compile Include="CP864.cs" />\r
-    <Compile Include="CP866.cs" />\r
-    <Compile Include="CP869.cs" />\r
-    <Compile Include="CP870.cs" />\r
-    <Compile Include="CP875.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/West/I18N.West-net_2_0.csproj b/mcs/class/I18N/West/I18N.West-net_2_0.csproj
deleted file mode 100644 (file)
index f877f6d..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AA988ADC-FBBB-4168-B8E4-83B6C6D543EC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.West</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP10000.cs" />\r
-    <Compile Include="CP10079.cs" />\r
-    <Compile Include="CP1250.cs" />\r
-    <Compile Include="CP1252.cs" />\r
-    <Compile Include="CP1253.cs" />\r
-    <Compile Include="CP28592.cs" />\r
-    <Compile Include="CP28593.cs" />\r
-    <Compile Include="CP28597.cs" />\r
-    <Compile Include="CP28605.cs" />\r
-    <Compile Include="CP437.cs" />\r
-    <Compile Include="CP850.cs" />\r
-    <Compile Include="CP860.cs" />\r
-    <Compile Include="CP861.cs" />\r
-    <Compile Include="CP863.cs" />\r
-    <Compile Include="CP865.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/West/I18N.West-net_4_0.csproj b/mcs/class/I18N/West/I18N.West-net_4_0.csproj
deleted file mode 100644 (file)
index cab90b7..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{455087AC-2DB8-46F3-A9CA-35732C90D233}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.West</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP10000.cs" />\r
-    <Compile Include="CP10079.cs" />\r
-    <Compile Include="CP1250.cs" />\r
-    <Compile Include="CP1252.cs" />\r
-    <Compile Include="CP1253.cs" />\r
-    <Compile Include="CP28592.cs" />\r
-    <Compile Include="CP28593.cs" />\r
-    <Compile Include="CP28597.cs" />\r
-    <Compile Include="CP28605.cs" />\r
-    <Compile Include="CP437.cs" />\r
-    <Compile Include="CP850.cs" />\r
-    <Compile Include="CP860.cs" />\r
-    <Compile Include="CP861.cs" />\r
-    <Compile Include="CP863.cs" />\r
-    <Compile Include="CP865.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/West/I18N.West-tests-net_2_0.csproj b/mcs/class/I18N/West/I18N.West-tests-net_2_0.csproj
deleted file mode 100644 (file)
index d0558bc..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C1E0F01D-878A-4343-A283-8864D7D8956E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.West-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.West_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.West.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">\r
-      <Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>\r
-      <Name>Common\I18N-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\West\I18N.West-net_2_0.csproj">\r
-      <Project>{AA988ADC-FBBB-4168-B8E4-83B6C6D543EC}</Project>\r
-      <Name>West\I18N.West-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/I18N/West/I18N.West-tests-net_4_0.csproj b/mcs/class/I18N/West/I18N.West-tests-net_4_0.csproj
deleted file mode 100644 (file)
index f04c576..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{73503F84-B247-40EB-B6BA-58CFEE72F735}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.West-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.West_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.West.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">\r
-      <Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>\r
-      <Name>Common\I18N-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\West\I18N.West-net_4_0.csproj">\r
-      <Project>{455087AC-2DB8-46F3-A9CA-35732C90D233}</Project>\r
-      <Name>West\I18N.West-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_2_0.csproj b/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_2_0.csproj
deleted file mode 100644 (file)
index ee2f07a..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{47BD9179-658F-4881-85D3-4883B11BCE12}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>IBM.Data.DB2</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Command.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Error.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Type.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_0.csproj b/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_0.csproj
deleted file mode 100644 (file)
index 33e5944..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4D194635-F673-40DD-811D-EB0B84F0B44B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>IBM.Data.DB2</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Command.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Error.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Type.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_2_0.csproj b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_2_0.csproj
deleted file mode 100644 (file)
index bd79d3c..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9E123979-3457-435B-A081-8432EEBA134A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Exception.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\CRC32.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\StrangeCRC.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\FileSystemScanner.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\INameTransform.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\NameFilter.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\PathFilter.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Encryption\PkzipClassic.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GZIPConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GZipException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GzipInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GzipOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Main.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\SharpZipBaseException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\FastZip.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_0.csproj b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_0.csproj
deleted file mode 100644 (file)
index 193ce3c..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D7EC98B8-2158-4304-9E84-D19D50CE16E8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Exception.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\CRC32.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\StrangeCRC.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\FileSystemScanner.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\INameTransform.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\NameFilter.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\PathFilter.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Encryption\PkzipClassic.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GZIPConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GZipException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GzipInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GzipOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Main.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\SharpZipBaseException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\FastZip.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 33a7dd8ae7b7a2d59603a2d910453e9721d629e0..cb71bb3c36c29cdb5ff70c2da6878825fcc5c4d1 100644 (file)
@@ -83,7 +83,6 @@ net_2_0_dirs := \
        System.Web.Extensions           \
        System.Web.Extensions.Design    \
        System.Web.DynamicData          \
-       System.Web.Mvc2                 \
        Mono.C5                         \
        Mono.Management                 \
        Mono.Options                    \
@@ -102,7 +101,6 @@ net_2_0_only_dirs := \
        System.ServiceModel.Web         \
        System.Data.Services.Client     \
        System.Data.Services            \
-       System.Web.Mvc \
 
 pcl_facade_dirs := Facades
 
@@ -192,11 +190,9 @@ net_4_0_dirs := \
        System.Data.Services.Client     \
        System.Data.Services \
        System.Json.Microsoft \
+       System.Data.Entity \
        monodoc
 
-net_4_0_only_dirs := \
-       System.ComponentModel.Composition
-
 net_4_5_dirs := \
        System.Threading.Tasks.Dataflow \
        System.ComponentModel.Composition.4.5 \
@@ -231,22 +227,20 @@ xbuild_4_0_dirs := \
        $(xbuild_2_0_dirs)      \
        Microsoft.Build
 
-net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
 monodroid_SUBDIRS := $(monodroid_dirs)
 monotouch_SUBDIRS := $(monotouch_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_static_dirs)
 mobile_SUBDIRS := $(mobile_dynamic_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
-net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
-net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
+net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(xbuild_4_0_dirs)
 net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
+SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_0_dirs) $(net_4_5_dirs)
 
 DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
 
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms-net_2_0.csproj b/mcs/class/Managed.Windows.Forms/System.Windows.Forms-net_2_0.csproj
deleted file mode 100644 (file)
index 2144ea5..0000000
+++ /dev/null
@@ -1,1193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\Locale.cs" />\r
-    <Compile Include="System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\ApplicationHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\ControlHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Dnd.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Enums.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\EventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\EventHandlerBase.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\HIObjectHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\IEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\KeyboardHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\MouseHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Pasteboard.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Structs.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\WindowHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentEditorForm.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentEditorPage.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\EventsTab.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IUIService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IWindowsFormsEditorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\PropertyTab.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailability.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailabilityAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WindowsFormsComponentEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Internal\Accessor.cs" />\r
-    <Compile Include="System.Windows.Forms.Internal\DebugHelper.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\ArrangedElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\DefaultLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\FlowLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\LayoutEngine.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\TableLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\TableLayoutSettingsTypeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.PropertyGridInternal\PropertiesTab.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Charcode.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Charset.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\CharsetFlags.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\CharsetType.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\ClassDelegate.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Color.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\DestinationDelegate.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Font.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\KeysInit.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\KeyStruct.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Major.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Minor.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Picture.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\RTF.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\RTFException.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StandardCharCode.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StandardCharName.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Style.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StyleElement.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StyleType.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\TextMap.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\TokenClass.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\ButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\CheckBoxPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\LabelPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\LinkLabelPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\RadioButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\TabControlPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\ToolStripPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElements.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElementsDefault.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElementsVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\CheckBoxPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\RadioButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\TabControlPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\ToolStripPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BackgroundType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BooleanProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BorderType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\CheckBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ColorProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ComboBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ContentAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EdgeEffects.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\Edges.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EdgeStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EnumProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FilenameProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FillType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FontProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GlyphFontSizingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GlyphType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GroupBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GtkPlus.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HitTestCode.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HitTestOptions.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HorizontalAlign.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IconEffect.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ImageOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ImageSelectType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IntegerProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\MarginProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\OffsetType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\PointProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\PushButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\RadioButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarArrowButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarSizeBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\SizingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\StringProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TabItemState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetrics.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetricsCharacterSet.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetricsPitchAndFamilyValues.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextShadowType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ThemeSizeType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ToolBarState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TrackBarThumbState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TrueSizeScalingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\UXTheme.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VerticalAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleElement.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleInformation.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesEngine.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesGtkPlus.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesNative.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleState.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\AlertCheck.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\ConfirmCheck.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\Generic.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\Prompt.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleEvents.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleNavigation.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleObject.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleRole.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleSelection.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleStates.cs" />\r
-    <Compile Include="System.Windows.Forms\AmbientProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\AnchorStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\Appearance.cs" />\r
-    <Compile Include="System.Windows.Forms\Application.cs" />\r
-    <Compile Include="System.Windows.Forms\ApplicationContext.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrangeDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrangeStartingPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrowDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\AsyncMethodData.cs" />\r
-    <Compile Include="System.Windows.Forms\AsyncMethodResult.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteSource.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteStringCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoScaleMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoValidate.cs" />\r
-    <Compile Include="System.Windows.Forms\AxHost.cs" />\r
-    <Compile Include="System.Windows.Forms\BaseCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\BatteryChargeStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\Binding.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteContext.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteState.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingContext.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerBase.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerDataErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerDataErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingMemberInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingNavigator.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingSource.cs" />\r
-    <Compile Include="System.Windows.Forms\BootMode.cs" />\r
-    <Compile Include="System.Windows.Forms\Border3DSide.cs" />\r
-    <Compile Include="System.Windows.Forms\Border3DStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\BorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\BoundsSpecified.cs" />\r
-    <Compile Include="System.Windows.Forms\Button.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonBase.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms\CacheVirtualItemsEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\CacheVirtualItemsEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\CaptionButton.cs" />\r
-    <Compile Include="System.Windows.Forms\CategoryGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\CharacterCasing.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckBox.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckedListBox.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckState.cs" />\r
-    <Compile Include="System.Windows.Forms\Clipboard.cs" />\r
-    <Compile Include="System.Windows.Forms\CloseReason.cs" />\r
-    <Compile Include="System.Windows.Forms\ColorDepth.cs" />\r
-    <Compile Include="System.Windows.Forms\ColorDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeader.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderAutoResizeStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnReorderedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnReorderedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBoxStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\CommonDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ComponentModel.cs" />\r
-    <Compile Include="System.Windows.Forms\ContainerControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ContentsResizedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ContentsResizedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ContextMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\ContextMenuStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\Control.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlBindingsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlPaint.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlUpdateMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ConvertEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ConvertEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\CreateParams.cs" />\r
-    <Compile Include="System.Windows.Forms\CurrencyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms\CursorConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\Cursors.cs" />\r
-    <Compile Include="System.Windows.Forms\DataFormats.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGrid.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridBoolColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridColumnStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridLineStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridParentRowsLabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridPreferredColumnWidthTypeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTableStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTextBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridView.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAdvancedBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAdvancedCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeRowMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeRowsMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBand.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBindingCompleteEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBindingCompleteEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewButtonCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewButtonColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellErrorTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellErrorTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellFormattingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellFormattingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellMouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellMouseEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellPaintingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellPaintingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellParsingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellParsingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleContentChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleContentChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleScopes.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellToolTipTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellToolTipTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValidatingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValidatingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValueEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValueEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCheckBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCheckBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewClipboardCopyMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnHeadersHeightSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnSortMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewContentAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorContexts.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewElement.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewElementStates.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHeaderBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHitTestType.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageCellLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewLinkCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewLinkColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewPaintParts.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRow.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowDividerDoubleClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowDividerDoubleClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowErrorTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowErrorTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeadersWidthSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoPushedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoPushedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPostPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPostPaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedRowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSortCompareEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSortCompareEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTopLeftHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTriState.cs" />\r
-    <Compile Include="System.Windows.Forms\DataObject.cs" />\r
-    <Compile Include="System.Windows.Forms\DataSourceUpdateMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DateBoldEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DateBoldEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DateRangeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DateRangeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DateTimePicker.cs" />\r
-    <Compile Include="System.Windows.Forms\DateTimePickerFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\Day.cs" />\r
-    <Compile Include="System.Windows.Forms\DialogResult.cs" />\r
-    <Compile Include="System.Windows.Forms\DockingAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\DockingBehavior.cs" />\r
-    <Compile Include="System.Windows.Forms\DockStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DomainUpDown.cs" />\r
-    <Compile Include="System.Windows.Forms\DragAction.cs" />\r
-    <Compile Include="System.Windows.Forms\DragDropEffects.cs" />\r
-    <Compile Include="System.Windows.Forms\DragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemState.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewColumnHeaderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewColumnHeaderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewSubItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewSubItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawToolTipEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawToolTipEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawTreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawTreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorBlinkStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorIconAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\FeatureSupport.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialogCustomPlace.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialogCustomPlacesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\FixedPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\FixedSizeTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\FlatButtonAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\FlatStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowLayoutPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowLayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\FolderBrowserDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\FontDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\Form.cs" />\r
-    <Compile Include="System.Windows.Forms\FormBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\FormCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\FormStartPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\FormWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\FormWindowState.cs" />\r
-    <Compile Include="System.Windows.Forms\FrameStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\GetChildAtPointSkip.cs" />\r
-    <Compile Include="System.Windows.Forms\GiveFeedbackEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\GiveFeedbackEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\GridColumnStylesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItem.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItemCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItemType.cs" />\r
-    <Compile Include="System.Windows.Forms\GridTablesFactory.cs" />\r
-    <Compile Include="System.Windows.Forms\GridTableStylesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GroupBox.cs" />\r
-    <Compile Include="System.Windows.Forms\GroupBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\HandledMouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\Help.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpNavigator.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\HorizontalAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\HScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\HScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlDocument.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElement.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementInsertionOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlHistory.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlWindow.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlWindowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\Hwnd.cs" />\r
-    <Compile Include="System.Windows.Forms\IBindableComponent.cs" />\r
-    <Compile Include="System.Windows.Forms\IBounds.cs" />\r
-    <Compile Include="System.Windows.Forms\IButtonControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ICommandExecutor.cs" />\r
-    <Compile Include="System.Windows.Forms\IComponentEditorPageSite.cs" />\r
-    <Compile Include="System.Windows.Forms\IContainerControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ICurrencyManagerProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridColumnStyleEditingNotificationService.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridEditingService.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridViewEditingCell.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridViewEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataObject.cs" />\r
-    <Compile Include="System.Windows.Forms\IDropTarget.cs" />\r
-    <Compile Include="System.Windows.Forms\IFeatureSupport.cs" />\r
-    <Compile Include="System.Windows.Forms\IFileReaderService.cs" />\r
-    <Compile Include="System.Windows.Forms\IKeyFilter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageIndexConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageKeyConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageList.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageListConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageListStreamer.cs" />\r
-    <Compile Include="System.Windows.Forms\ImeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\IMessageFilter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImplicitHScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ImplicitVScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguage.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\InsertKeyMode.cs" />\r
-    <Compile Include="System.Windows.Forms\InternalWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\InvalidateEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InvalidateEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\IRootGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemActivation.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemBoundsPortion.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemDragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemDragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\IToolStripData.cs" />\r
-    <Compile Include="System.Windows.Forms\IWin32Window.cs" />\r
-    <Compile Include="System.Windows.Forms\IWindowTarget.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyboardLayouts.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyPressEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyPressEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Keys.cs" />\r
-    <Compile Include="System.Windows.Forms\KeysConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\Label.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\LeftRightAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\Line.cs" />\r
-    <Compile Include="System.Windows.Forms\LineTag.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkArea.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkBehavior.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabelLinkClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabelLinkClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkState.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBindingConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBindingHelper.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControlConvertEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControlConvertEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListView.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewGroup.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewGroupCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewHitTestInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewHitTestLocations.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewInsertionMark.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemMouseHoverEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemMouseHoverEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemSelectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemSelectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemStates.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MainMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskedTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskInputRejectedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskInputRejectedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiClient.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiControlStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\MeasureItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MeasureItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Menu.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuAPI.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuItem.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuMerge.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\MergeAction.cs" />\r
-    <Compile Include="System.Windows.Forms\Message.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBox.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxButtons.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxDefaultButton.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxOptions.cs" />\r
-    <Compile Include="System.Windows.Forms\MethodInvoker.cs" />\r
-    <Compile Include="System.Windows.Forms\Mime.cs" />\r
-    <Compile Include="System.Windows.Forms\MimeIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\MonthCalendar.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseButtons.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MWFCategoryAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\MWFDescriptionAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\NativeWindow.cs" />\r
-    <Compile Include="System.Windows.Forms\NavigateEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\NavigateEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\NodeLabelEditEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\NodeLabelEditEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\NotifyIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDown.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDownAcceleration.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDownAccelerationCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\OpacityConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\OpenFileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\OpenTreeNodeEnumerator.cs" />\r
-    <Compile Include="System.Windows.Forms\Orientation.cs" />\r
-    <Compile Include="System.Windows.Forms\OSFeature.cs" />\r
-    <Compile Include="System.Windows.Forms\OwnerDrawPropertyBag.cs" />\r
-    <Compile Include="System.Windows.Forms\Padding.cs" />\r
-    <Compile Include="System.Windows.Forms\PaddingConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\PageSetupDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Panel.cs" />\r
-    <Compile Include="System.Windows.Forms\PictureBox.cs" />\r
-    <Compile Include="System.Windows.Forms\PictureBoxSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\PopupEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PopupEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerLineStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerState.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\PreProcessControlState.cs" />\r
-    <Compile Include="System.Windows.Forms\PreviewKeyDownEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PreviewKeyDownEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintControllerWithStatusDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintPreviewControl.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintPreviewDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ProfessionalColors.cs" />\r
-    <Compile Include="System.Windows.Forms\ProfessionalColorTable.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBarStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGrid.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridCommands.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridView.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertySort.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyTabChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyTabChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyValueChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyValueChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryAccessibilityHelpEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryAccessibilityHelpEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryContinueDragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryContinueDragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QuestionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QuestionEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\RadioButton.cs" />\r
-    <Compile Include="System.Windows.Forms\RadioButtonRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedCurrencyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedImageListAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedPropertyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\RetrieveVirtualItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\RetrieveVirtualItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxFinds.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxLanguageOptions.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxScrollBars.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxSelectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxSelectionTypes.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxStreamType.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxWordPunctuations.cs" />\r
-    <Compile Include="System.Windows.Forms\RightToLeft.cs" />\r
-    <Compile Include="System.Windows.Forms\RootGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\RowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\SaveFileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\Screen.cs" />\r
-    <Compile Include="System.Windows.Forms\ScreenOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollableControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBars.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventType.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchDirectionHint.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchForVirtualItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchForVirtualItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SecurityIDType.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectedGridItemChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectedGridItemChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionRange.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionRangeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\SendKeys.cs" />\r
-    <Compile Include="System.Windows.Forms\Shortcut.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeGrip.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeGripStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeType.cs" />\r
-    <Compile Include="System.Windows.Forms\SortOrder.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitContainer.cs" />\r
-    <Compile Include="System.Windows.Forms\Splitter.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBar.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarDrawItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarDrawItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelAutoSize.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\StructFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\SystemInformation.cs" />\r
-    <Compile Include="System.Windows.Forms\SystemParameter.cs" />\r
-    <Compile Include="System.Windows.Forms\TabAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\TabAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControl.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlAction.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TabDrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutColumnStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutControlCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelCellPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelGrowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutRowStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TabPage.cs" />\r
-    <Compile Include="System.Windows.Forms\TabRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TabSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxBase.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxTextRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TextControl.cs" />\r
-    <Compile Include="System.Windows.Forms\TextDataFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\TextFormatFlags.cs" />\r
-    <Compile Include="System.Windows.Forms\TextImageRelation.cs" />\r
-    <Compile Include="System.Windows.Forms\TextRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\Theme.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeEngine.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeWin32Classic.cs" />\r
-    <Compile Include="System.Windows.Forms\ThreadExceptionDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\TickStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\Timer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarTextAlign.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripArrowRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripArrowRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripComboBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContainer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanelRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanelRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripControlHost.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDown.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownCloseReason.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownItemAccessibleObject.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventType.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageScaling.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemOverflow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemPlacement.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemTextRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemTextRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripLayoutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripManager.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripManagerRenderMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripMenuItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripOverflow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripOverflowButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripProfessionalRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripProgressBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparator.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSplitButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSplitStackLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripStatusLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripStatusLabelBorderSides.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSystemRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripTextDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolTip.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolTipIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\TrackBar.cs" />\r
-    <Compile Include="System.Windows.Forms\TrackBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNode.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseHoverEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseHoverEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeStates.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeView.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewAction.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewDrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewHitTestInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewHitTestLocations.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewImageIndexConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewImageKeyConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TypeValidationEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TypeValidationEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UICues.cs" />\r
-    <Compile Include="System.Windows.Forms\UICuesEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\UICuesEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UnhandledExceptionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownBase.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UserControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ValidationConstraints.cs" />\r
-    <Compile Include="System.Windows.Forms\View.cs" />\r
-    <Compile Include="System.Windows.Forms\VScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\VScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowser.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserBase.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserDocumentCompletedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserDocumentCompletedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserEncryptionLevel.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserReadyState.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserRefreshOption.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserSiteBase.cs" />\r
-    <Compile Include="System.Windows.Forms\Win32DnD.cs" />\r
-    <Compile Include="System.Windows.Forms\WindowsFormsSection.cs" />\r
-    <Compile Include="System.Windows.Forms\WindowsFormsSynchronizationContext.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Clipboard.cs" />\r
-    <Compile Include="System.Windows.Forms\X11DesktopColors.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Dnd.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Keyboard.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Structs.cs" />\r
-    <Compile Include="System.Windows.Forms\XEventQueue.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUI.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUICarbon.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIDriver.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIStructs.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIWin32.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIX11.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_2_0.csproj">\r
-      <Project>{43A23ADA-35D9-4A48-BCE5-C21C081C6676}</Project>\r
-      <Name>Accessibility\Accessibility-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.WebBrowser\Mono.WebBrowser-net_2_0.csproj">\r
-      <Project>{F46C8C89-6CD0-432D-8BEF-C962DB694CDB}</Project>\r
-      <Name>Mono.WebBrowser\Mono.WebBrowser-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SplitterNS.cur">\r
-      <LogicalName>System.Windows.Forms.SplitterNS.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SplitterWE.cur">\r
-      <LogicalName>System.Windows.Forms.SplitterWE.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/NESW.cur">\r
-      <LogicalName>System.Windows.Forms.NESW.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/NWSE.cur">\r
-      <LogicalName>System.Windows.Forms.NWSE.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDNo.cur">\r
-      <LogicalName>System.Windows.Forms.DnDNo.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDCopy.cur">\r
-      <LogicalName>System.Windows.Forms.DnDCopy.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDLink.cur">\r
-      <LogicalName>System.Windows.Forms.DnDLink.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDMove.cur">\r
-      <LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/keyboards.resources">\r
-      <LogicalName>keyboards.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_computer.png">\r
-      <LogicalName>16_computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_computer.png">\r
-      <LogicalName>32_computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.png">\r
-      <LogicalName>computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_document-open.png">\r
-      <LogicalName>16_document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_document-open.png">\r
-      <LogicalName>32_document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/document-open.png">\r
-      <LogicalName>document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_folder.png">\r
-      <LogicalName>16_folder.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder-new.png">\r
-      <LogicalName>folder-new.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.png">\r
-      <LogicalName>folder.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_folder-remote.png">\r
-      <LogicalName>16_folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_folder-remote.png">\r
-      <LogicalName>32_folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder-remote.png">\r
-      <LogicalName>folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/go-previous.png">\r
-      <LogicalName>go-previous.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/go-top.png">\r
-      <LogicalName>go-top.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/22_page-magnifier.png">\r
-      <LogicalName>22_page-magnifier.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/preferences-system-windows.png">\r
-      <LogicalName>preferences-system-windows.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_printer.png">\r
-      <LogicalName>16_printer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_printer.png">\r
-      <LogicalName>32_printer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/text-x-generic.png">\r
-      <LogicalName>text-x-generic.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_user-desktop.png">\r
-      <LogicalName>16_user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_user-desktop.png">\r
-      <LogicalName>32_user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/user-desktop.png">\r
-      <LogicalName>user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_user-home.png">\r
-      <LogicalName>16_user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_user-home.png">\r
-      <LogicalName>32_user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/user-home.png">\r
-      <LogicalName>user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-error.png">\r
-      <LogicalName>16_dialog-error.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-information.png">\r
-      <LogicalName>16_dialog-information.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-warning.png">\r
-      <LogicalName>16_dialog-warning.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/1-up.png">\r
-      <LogicalName>1-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/2-up.png">\r
-      <LogicalName>2-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/3-up.png">\r
-      <LogicalName>3-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/4-up.png">\r
-      <LogicalName>4-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/6-up.png">\r
-      <LogicalName>6-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_delete.png">\r
-      <LogicalName>nav_delete.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_end.png">\r
-      <LogicalName>nav_end.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_first.png">\r
-      <LogicalName>nav_first.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_next.png">\r
-      <LogicalName>nav_next.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_plus.png">\r
-      <LogicalName>nav_plus.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_previous.png">\r
-      <LogicalName>nav_previous.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/image-missing.png">\r
-      <LogicalName>image-missing.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/image-x-generic.png">\r
-      <LogicalName>image-x-generic.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-alphabetical.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-alphabetical.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-categorized.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-categorized.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-propertypages.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-propertypages.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/EventsTab.bmp">\r
-      <LogicalName>System.Windows.Forms.Design.EventsTab.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/PropertiesTab.bmp">\r
-      <LogicalName>System.Windows.Forms.PropertyGridInternal.PropertiesTab.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/mono.ico">\r
-      <LogicalName>mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/errorProvider.ico">\r
-      <LogicalName>errorProvider.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms-net_4_0.csproj b/mcs/class/Managed.Windows.Forms/System.Windows.Forms-net_4_0.csproj
deleted file mode 100644 (file)
index c6f4ce5..0000000
+++ /dev/null
@@ -1,1193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\Locale.cs" />\r
-    <Compile Include="System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\ApplicationHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\ControlHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Dnd.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Enums.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\EventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\EventHandlerBase.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\HIObjectHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\IEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\KeyboardHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\MouseHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Pasteboard.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Structs.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\WindowHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentEditorForm.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentEditorPage.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\EventsTab.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IUIService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IWindowsFormsEditorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\PropertyTab.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailability.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailabilityAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WindowsFormsComponentEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Internal\Accessor.cs" />\r
-    <Compile Include="System.Windows.Forms.Internal\DebugHelper.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\ArrangedElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\DefaultLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\FlowLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\LayoutEngine.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\TableLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\TableLayoutSettingsTypeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.PropertyGridInternal\PropertiesTab.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Charcode.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Charset.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\CharsetFlags.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\CharsetType.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\ClassDelegate.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Color.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\DestinationDelegate.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Font.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\KeysInit.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\KeyStruct.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Major.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Minor.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Picture.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\RTF.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\RTFException.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StandardCharCode.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StandardCharName.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Style.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StyleElement.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StyleType.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\TextMap.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\TokenClass.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\ButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\CheckBoxPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\LabelPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\LinkLabelPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\RadioButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\TabControlPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\ToolStripPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElements.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElementsDefault.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElementsVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\CheckBoxPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\RadioButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\TabControlPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\ToolStripPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BackgroundType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BooleanProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BorderType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\CheckBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ColorProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ComboBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ContentAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EdgeEffects.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\Edges.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EdgeStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EnumProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FilenameProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FillType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FontProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GlyphFontSizingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GlyphType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GroupBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GtkPlus.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HitTestCode.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HitTestOptions.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HorizontalAlign.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IconEffect.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ImageOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ImageSelectType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IntegerProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\MarginProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\OffsetType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\PointProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\PushButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\RadioButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarArrowButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarSizeBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\SizingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\StringProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TabItemState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetrics.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetricsCharacterSet.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetricsPitchAndFamilyValues.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextShadowType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ThemeSizeType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ToolBarState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TrackBarThumbState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TrueSizeScalingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\UXTheme.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VerticalAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleElement.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleInformation.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesEngine.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesGtkPlus.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesNative.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleState.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\AlertCheck.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\ConfirmCheck.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\Generic.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\Prompt.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleEvents.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleNavigation.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleObject.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleRole.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleSelection.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleStates.cs" />\r
-    <Compile Include="System.Windows.Forms\AmbientProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\AnchorStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\Appearance.cs" />\r
-    <Compile Include="System.Windows.Forms\Application.cs" />\r
-    <Compile Include="System.Windows.Forms\ApplicationContext.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrangeDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrangeStartingPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrowDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\AsyncMethodData.cs" />\r
-    <Compile Include="System.Windows.Forms\AsyncMethodResult.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteSource.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteStringCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoScaleMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoValidate.cs" />\r
-    <Compile Include="System.Windows.Forms\AxHost.cs" />\r
-    <Compile Include="System.Windows.Forms\BaseCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\BatteryChargeStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\Binding.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteContext.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteState.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingContext.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerBase.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerDataErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerDataErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingMemberInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingNavigator.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingSource.cs" />\r
-    <Compile Include="System.Windows.Forms\BootMode.cs" />\r
-    <Compile Include="System.Windows.Forms\Border3DSide.cs" />\r
-    <Compile Include="System.Windows.Forms\Border3DStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\BorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\BoundsSpecified.cs" />\r
-    <Compile Include="System.Windows.Forms\Button.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonBase.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms\CacheVirtualItemsEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\CacheVirtualItemsEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\CaptionButton.cs" />\r
-    <Compile Include="System.Windows.Forms\CategoryGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\CharacterCasing.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckBox.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckedListBox.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckState.cs" />\r
-    <Compile Include="System.Windows.Forms\Clipboard.cs" />\r
-    <Compile Include="System.Windows.Forms\CloseReason.cs" />\r
-    <Compile Include="System.Windows.Forms\ColorDepth.cs" />\r
-    <Compile Include="System.Windows.Forms\ColorDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeader.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderAutoResizeStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnReorderedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnReorderedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBoxStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\CommonDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ComponentModel.cs" />\r
-    <Compile Include="System.Windows.Forms\ContainerControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ContentsResizedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ContentsResizedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ContextMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\ContextMenuStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\Control.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlBindingsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlPaint.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlUpdateMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ConvertEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ConvertEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\CreateParams.cs" />\r
-    <Compile Include="System.Windows.Forms\CurrencyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms\CursorConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\Cursors.cs" />\r
-    <Compile Include="System.Windows.Forms\DataFormats.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGrid.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridBoolColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridColumnStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridLineStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridParentRowsLabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridPreferredColumnWidthTypeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTableStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTextBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridView.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAdvancedBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAdvancedCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeRowMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeRowsMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBand.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBindingCompleteEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBindingCompleteEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewButtonCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewButtonColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellErrorTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellErrorTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellFormattingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellFormattingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellMouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellMouseEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellPaintingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellPaintingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellParsingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellParsingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleContentChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleContentChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleScopes.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellToolTipTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellToolTipTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValidatingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValidatingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValueEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValueEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCheckBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCheckBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewClipboardCopyMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnHeadersHeightSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnSortMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewContentAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorContexts.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewElement.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewElementStates.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHeaderBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHitTestType.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageCellLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewLinkCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewLinkColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewPaintParts.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRow.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowDividerDoubleClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowDividerDoubleClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowErrorTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowErrorTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeadersWidthSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoPushedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoPushedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPostPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPostPaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedRowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSortCompareEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSortCompareEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTopLeftHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTriState.cs" />\r
-    <Compile Include="System.Windows.Forms\DataObject.cs" />\r
-    <Compile Include="System.Windows.Forms\DataSourceUpdateMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DateBoldEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DateBoldEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DateRangeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DateRangeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DateTimePicker.cs" />\r
-    <Compile Include="System.Windows.Forms\DateTimePickerFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\Day.cs" />\r
-    <Compile Include="System.Windows.Forms\DialogResult.cs" />\r
-    <Compile Include="System.Windows.Forms\DockingAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\DockingBehavior.cs" />\r
-    <Compile Include="System.Windows.Forms\DockStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DomainUpDown.cs" />\r
-    <Compile Include="System.Windows.Forms\DragAction.cs" />\r
-    <Compile Include="System.Windows.Forms\DragDropEffects.cs" />\r
-    <Compile Include="System.Windows.Forms\DragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemState.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewColumnHeaderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewColumnHeaderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewSubItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewSubItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawToolTipEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawToolTipEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawTreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawTreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorBlinkStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorIconAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\FeatureSupport.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialogCustomPlace.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialogCustomPlacesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\FixedPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\FixedSizeTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\FlatButtonAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\FlatStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowLayoutPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowLayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\FolderBrowserDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\FontDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\Form.cs" />\r
-    <Compile Include="System.Windows.Forms\FormBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\FormCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\FormStartPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\FormWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\FormWindowState.cs" />\r
-    <Compile Include="System.Windows.Forms\FrameStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\GetChildAtPointSkip.cs" />\r
-    <Compile Include="System.Windows.Forms\GiveFeedbackEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\GiveFeedbackEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\GridColumnStylesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItem.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItemCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItemType.cs" />\r
-    <Compile Include="System.Windows.Forms\GridTablesFactory.cs" />\r
-    <Compile Include="System.Windows.Forms\GridTableStylesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GroupBox.cs" />\r
-    <Compile Include="System.Windows.Forms\GroupBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\HandledMouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\Help.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpNavigator.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\HorizontalAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\HScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\HScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlDocument.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElement.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementInsertionOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlHistory.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlWindow.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlWindowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\Hwnd.cs" />\r
-    <Compile Include="System.Windows.Forms\IBindableComponent.cs" />\r
-    <Compile Include="System.Windows.Forms\IBounds.cs" />\r
-    <Compile Include="System.Windows.Forms\IButtonControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ICommandExecutor.cs" />\r
-    <Compile Include="System.Windows.Forms\IComponentEditorPageSite.cs" />\r
-    <Compile Include="System.Windows.Forms\IContainerControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ICurrencyManagerProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridColumnStyleEditingNotificationService.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridEditingService.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridViewEditingCell.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridViewEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataObject.cs" />\r
-    <Compile Include="System.Windows.Forms\IDropTarget.cs" />\r
-    <Compile Include="System.Windows.Forms\IFeatureSupport.cs" />\r
-    <Compile Include="System.Windows.Forms\IFileReaderService.cs" />\r
-    <Compile Include="System.Windows.Forms\IKeyFilter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageIndexConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageKeyConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageList.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageListConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageListStreamer.cs" />\r
-    <Compile Include="System.Windows.Forms\ImeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\IMessageFilter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImplicitHScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ImplicitVScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguage.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\InsertKeyMode.cs" />\r
-    <Compile Include="System.Windows.Forms\InternalWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\InvalidateEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InvalidateEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\IRootGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemActivation.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemBoundsPortion.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemDragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemDragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\IToolStripData.cs" />\r
-    <Compile Include="System.Windows.Forms\IWin32Window.cs" />\r
-    <Compile Include="System.Windows.Forms\IWindowTarget.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyboardLayouts.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyPressEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyPressEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Keys.cs" />\r
-    <Compile Include="System.Windows.Forms\KeysConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\Label.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\LeftRightAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\Line.cs" />\r
-    <Compile Include="System.Windows.Forms\LineTag.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkArea.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkBehavior.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabelLinkClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabelLinkClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkState.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBindingConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBindingHelper.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControlConvertEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControlConvertEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListView.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewGroup.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewGroupCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewHitTestInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewHitTestLocations.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewInsertionMark.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemMouseHoverEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemMouseHoverEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemSelectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemSelectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemStates.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MainMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskedTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskInputRejectedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskInputRejectedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiClient.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiControlStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\MeasureItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MeasureItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Menu.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuAPI.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuItem.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuMerge.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\MergeAction.cs" />\r
-    <Compile Include="System.Windows.Forms\Message.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBox.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxButtons.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxDefaultButton.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxOptions.cs" />\r
-    <Compile Include="System.Windows.Forms\MethodInvoker.cs" />\r
-    <Compile Include="System.Windows.Forms\Mime.cs" />\r
-    <Compile Include="System.Windows.Forms\MimeIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\MonthCalendar.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseButtons.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MWFCategoryAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\MWFDescriptionAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\NativeWindow.cs" />\r
-    <Compile Include="System.Windows.Forms\NavigateEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\NavigateEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\NodeLabelEditEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\NodeLabelEditEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\NotifyIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDown.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDownAcceleration.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDownAccelerationCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\OpacityConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\OpenFileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\OpenTreeNodeEnumerator.cs" />\r
-    <Compile Include="System.Windows.Forms\Orientation.cs" />\r
-    <Compile Include="System.Windows.Forms\OSFeature.cs" />\r
-    <Compile Include="System.Windows.Forms\OwnerDrawPropertyBag.cs" />\r
-    <Compile Include="System.Windows.Forms\Padding.cs" />\r
-    <Compile Include="System.Windows.Forms\PaddingConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\PageSetupDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Panel.cs" />\r
-    <Compile Include="System.Windows.Forms\PictureBox.cs" />\r
-    <Compile Include="System.Windows.Forms\PictureBoxSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\PopupEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PopupEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerLineStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerState.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\PreProcessControlState.cs" />\r
-    <Compile Include="System.Windows.Forms\PreviewKeyDownEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PreviewKeyDownEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintControllerWithStatusDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintPreviewControl.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintPreviewDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ProfessionalColors.cs" />\r
-    <Compile Include="System.Windows.Forms\ProfessionalColorTable.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBarStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGrid.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridCommands.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridView.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertySort.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyTabChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyTabChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyValueChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyValueChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryAccessibilityHelpEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryAccessibilityHelpEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryContinueDragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryContinueDragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QuestionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QuestionEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\RadioButton.cs" />\r
-    <Compile Include="System.Windows.Forms\RadioButtonRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedCurrencyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedImageListAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedPropertyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\RetrieveVirtualItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\RetrieveVirtualItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxFinds.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxLanguageOptions.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxScrollBars.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxSelectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxSelectionTypes.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxStreamType.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxWordPunctuations.cs" />\r
-    <Compile Include="System.Windows.Forms\RightToLeft.cs" />\r
-    <Compile Include="System.Windows.Forms\RootGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\RowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\SaveFileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\Screen.cs" />\r
-    <Compile Include="System.Windows.Forms\ScreenOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollableControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBars.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventType.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchDirectionHint.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchForVirtualItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchForVirtualItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SecurityIDType.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectedGridItemChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectedGridItemChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionRange.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionRangeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\SendKeys.cs" />\r
-    <Compile Include="System.Windows.Forms\Shortcut.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeGrip.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeGripStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeType.cs" />\r
-    <Compile Include="System.Windows.Forms\SortOrder.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitContainer.cs" />\r
-    <Compile Include="System.Windows.Forms\Splitter.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBar.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarDrawItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarDrawItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelAutoSize.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\StructFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\SystemInformation.cs" />\r
-    <Compile Include="System.Windows.Forms\SystemParameter.cs" />\r
-    <Compile Include="System.Windows.Forms\TabAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\TabAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControl.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlAction.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TabDrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutColumnStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutControlCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelCellPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelGrowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutRowStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TabPage.cs" />\r
-    <Compile Include="System.Windows.Forms\TabRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TabSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxBase.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxTextRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TextControl.cs" />\r
-    <Compile Include="System.Windows.Forms\TextDataFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\TextFormatFlags.cs" />\r
-    <Compile Include="System.Windows.Forms\TextImageRelation.cs" />\r
-    <Compile Include="System.Windows.Forms\TextRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\Theme.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeEngine.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeWin32Classic.cs" />\r
-    <Compile Include="System.Windows.Forms\ThreadExceptionDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\TickStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\Timer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarTextAlign.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripArrowRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripArrowRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripComboBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContainer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanelRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanelRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripControlHost.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDown.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownCloseReason.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownItemAccessibleObject.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventType.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageScaling.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemOverflow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemPlacement.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemTextRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemTextRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripLayoutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripManager.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripManagerRenderMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripMenuItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripOverflow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripOverflowButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripProfessionalRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripProgressBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparator.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSplitButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSplitStackLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripStatusLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripStatusLabelBorderSides.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSystemRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripTextDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolTip.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolTipIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\TrackBar.cs" />\r
-    <Compile Include="System.Windows.Forms\TrackBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNode.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseHoverEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseHoverEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeStates.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeView.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewAction.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewDrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewHitTestInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewHitTestLocations.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewImageIndexConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewImageKeyConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TypeValidationEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TypeValidationEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UICues.cs" />\r
-    <Compile Include="System.Windows.Forms\UICuesEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\UICuesEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UnhandledExceptionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownBase.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UserControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ValidationConstraints.cs" />\r
-    <Compile Include="System.Windows.Forms\View.cs" />\r
-    <Compile Include="System.Windows.Forms\VScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\VScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowser.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserBase.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserDocumentCompletedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserDocumentCompletedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserEncryptionLevel.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserReadyState.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserRefreshOption.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserSiteBase.cs" />\r
-    <Compile Include="System.Windows.Forms\Win32DnD.cs" />\r
-    <Compile Include="System.Windows.Forms\WindowsFormsSection.cs" />\r
-    <Compile Include="System.Windows.Forms\WindowsFormsSynchronizationContext.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Clipboard.cs" />\r
-    <Compile Include="System.Windows.Forms\X11DesktopColors.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Dnd.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Keyboard.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Structs.cs" />\r
-    <Compile Include="System.Windows.Forms\XEventQueue.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUI.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUICarbon.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIDriver.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIStructs.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIWin32.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIX11.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_4_0.csproj">\r
-      <Project>{0978E130-1E7B-4627-A9CC-7489DB17BFF1}</Project>\r
-      <Name>Accessibility\Accessibility-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.WebBrowser\Mono.WebBrowser-net_4_0.csproj">\r
-      <Project>{7CF0E3C1-B971-4B78-8145-976EF6F5287B}</Project>\r
-      <Name>Mono.WebBrowser\Mono.WebBrowser-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SplitterNS.cur">\r
-      <LogicalName>System.Windows.Forms.SplitterNS.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SplitterWE.cur">\r
-      <LogicalName>System.Windows.Forms.SplitterWE.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/NESW.cur">\r
-      <LogicalName>System.Windows.Forms.NESW.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/NWSE.cur">\r
-      <LogicalName>System.Windows.Forms.NWSE.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDNo.cur">\r
-      <LogicalName>System.Windows.Forms.DnDNo.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDCopy.cur">\r
-      <LogicalName>System.Windows.Forms.DnDCopy.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDLink.cur">\r
-      <LogicalName>System.Windows.Forms.DnDLink.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDMove.cur">\r
-      <LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/keyboards.resources">\r
-      <LogicalName>keyboards.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_computer.png">\r
-      <LogicalName>16_computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_computer.png">\r
-      <LogicalName>32_computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.png">\r
-      <LogicalName>computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_document-open.png">\r
-      <LogicalName>16_document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_document-open.png">\r
-      <LogicalName>32_document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/document-open.png">\r
-      <LogicalName>document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_folder.png">\r
-      <LogicalName>16_folder.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder-new.png">\r
-      <LogicalName>folder-new.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.png">\r
-      <LogicalName>folder.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_folder-remote.png">\r
-      <LogicalName>16_folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_folder-remote.png">\r
-      <LogicalName>32_folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder-remote.png">\r
-      <LogicalName>folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/go-previous.png">\r
-      <LogicalName>go-previous.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/go-top.png">\r
-      <LogicalName>go-top.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/22_page-magnifier.png">\r
-      <LogicalName>22_page-magnifier.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/preferences-system-windows.png">\r
-      <LogicalName>preferences-system-windows.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_printer.png">\r
-      <LogicalName>16_printer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_printer.png">\r
-      <LogicalName>32_printer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/text-x-generic.png">\r
-      <LogicalName>text-x-generic.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_user-desktop.png">\r
-      <LogicalName>16_user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_user-desktop.png">\r
-      <LogicalName>32_user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/user-desktop.png">\r
-      <LogicalName>user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_user-home.png">\r
-      <LogicalName>16_user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_user-home.png">\r
-      <LogicalName>32_user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/user-home.png">\r
-      <LogicalName>user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-error.png">\r
-      <LogicalName>16_dialog-error.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-information.png">\r
-      <LogicalName>16_dialog-information.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-warning.png">\r
-      <LogicalName>16_dialog-warning.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/1-up.png">\r
-      <LogicalName>1-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/2-up.png">\r
-      <LogicalName>2-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/3-up.png">\r
-      <LogicalName>3-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/4-up.png">\r
-      <LogicalName>4-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/6-up.png">\r
-      <LogicalName>6-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_delete.png">\r
-      <LogicalName>nav_delete.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_end.png">\r
-      <LogicalName>nav_end.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_first.png">\r
-      <LogicalName>nav_first.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_next.png">\r
-      <LogicalName>nav_next.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_plus.png">\r
-      <LogicalName>nav_plus.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_previous.png">\r
-      <LogicalName>nav_previous.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/image-missing.png">\r
-      <LogicalName>image-missing.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/image-x-generic.png">\r
-      <LogicalName>image-x-generic.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-alphabetical.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-alphabetical.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-categorized.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-categorized.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-propertypages.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-propertypages.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/EventsTab.bmp">\r
-      <LogicalName>System.Windows.Forms.Design.EventsTab.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/PropertiesTab.bmp">\r
-      <LogicalName>System.Windows.Forms.PropertyGridInternal.PropertiesTab.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/mono.ico">\r
-      <LogicalName>mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/errorProvider.ico">\r
-      <LogicalName>errorProvider.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms-tests-net_2_0.csproj b/mcs/class/Managed.Windows.Forms/System.Windows.Forms-tests-net_2_0.csproj
deleted file mode 100644 (file)
index e55d961..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4A3A8DC3-F8A2-47E9-96F5-1C8F7E4C3D77}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <OutputPath>bin\Debug\System.Windows.Forms-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Test\System.Resources\CompatTest.cs" />\r
-    <Compile Include="Test\System.Resources\CultureTest.cs" />\r
-    <Compile Include="Test\System.Resources\HelperClasses_ITRS.cs" />\r
-    <Compile Include="Test\System.Resources\HelperClasses_Resources.cs" />\r
-    <Compile Include="Test\System.Resources\ResourcesTestHelper.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeAliasTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeByteArrayTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeSerialisedGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeSerializedGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeWriteBehavior.cs" />\r
-    <Compile Include="Test\System.Resources\ResXFileRefTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />\r
-    <Compile Include="Test\System.Resources\WriterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingContextTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingManagerBaseTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingMemberInfoTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingNavigatorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingsCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ButtonBaseTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckedListBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckedListBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ClipboardTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnClickEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ComboBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\Common.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CommonDialogsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ContainerControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ContextMenuTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlBindingsCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlBindingsConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlLogger.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlLogger2.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlPaintTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CursorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataBindingTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridColumnStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTableStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTextBoxColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewAdvancedBorderStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewBandTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewButtonCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCheckBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewClipboardHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewClipboardTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewComboBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCommon.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewDataBindingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewElementTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewImageCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataObjectTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DateTimePickerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DefaultLayoutTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DragEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ErrorProviderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\EventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\EventLogger.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FlowPanelTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FocusTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FolderBrowserDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GridColumnStylesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GridTableStylesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GroupBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\HelpProviderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\HScrollPropertiesTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageKeyConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageListStreamerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageListTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\InputLanguageTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\KeyEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\KeysConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkAreaTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBindingHelperTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MaskedTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MdiFormHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MdiFormTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MessageTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MonthCalendarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\NotifyIconTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\NumericUpDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaddingConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaddingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaintEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PictureBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PrintDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ProgressBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PropertyGridTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PropertyManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RichTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RowStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SaveFileDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ScrollableControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ScrollBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SelectionRangeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SendKeysTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SplitContainerTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SplitterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusBarPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SystemInformationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TabControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TableLayoutTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TestHelper.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TestImageIndexConverter.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TimerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolBarButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripComboBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripContainerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripContentPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripControlHostTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripDropDownItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripDropDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripMenuItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripOverflowButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripOverflowTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripProgressBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripSeparatorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripStatusLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolTipTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TrackBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeNodeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeNodeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewEventsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\UpDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\UserControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\VScrollPropertiesTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_2_0.csproj">\r
-      <Project>{43A23ADA-35D9-4A48-BCE5-C21C081C6676}</Project>\r
-      <Name>Accessibility\Accessibility-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/resources/a.cur">\r
-      <LogicalName>a.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/32x32.ico">\r
-      <LogicalName>32x32.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms-tests-net_4_0.csproj b/mcs/class/Managed.Windows.Forms/System.Windows.Forms-tests-net_4_0.csproj
deleted file mode 100644 (file)
index d82a113..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D2C4D760-69DE-45C3-B255-DFF26EC4A99B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <OutputPath>bin\Debug\System.Windows.Forms-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Test\System.Resources\CompatTest.cs" />\r
-    <Compile Include="Test\System.Resources\CultureTest.cs" />\r
-    <Compile Include="Test\System.Resources\HelperClasses_ITRS.cs" />\r
-    <Compile Include="Test\System.Resources\HelperClasses_Resources.cs" />\r
-    <Compile Include="Test\System.Resources\ResourcesTestHelper.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeAliasTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeByteArrayTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeSerialisedGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeSerializedGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeWriteBehavior.cs" />\r
-    <Compile Include="Test\System.Resources\ResXFileRefTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />\r
-    <Compile Include="Test\System.Resources\WriterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingContextTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingManagerBaseTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingMemberInfoTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingNavigatorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingsCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ButtonBaseTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckedListBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckedListBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ClipboardTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnClickEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ComboBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\Common.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CommonDialogsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ContainerControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ContextMenuTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlBindingsCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlBindingsConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlLogger.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlLogger2.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlPaintTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CursorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataBindingTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridColumnStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTableStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTextBoxColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewAdvancedBorderStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewBandTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewButtonCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCheckBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewClipboardHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewClipboardTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewComboBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCommon.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewDataBindingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewElementTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewImageCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataObjectTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DateTimePickerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DefaultLayoutTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DragEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ErrorProviderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\EventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\EventLogger.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FlowPanelTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FocusTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FolderBrowserDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GridColumnStylesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GridTableStylesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GroupBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\HelpProviderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\HScrollPropertiesTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageKeyConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageListStreamerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageListTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\InputLanguageTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\KeyEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\KeysConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkAreaTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBindingHelperTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MaskedTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MdiFormHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MdiFormTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MessageTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MonthCalendarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\NotifyIconTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\NumericUpDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaddingConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaddingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaintEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PictureBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PrintDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ProgressBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PropertyGridTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PropertyManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RichTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RowStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SaveFileDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ScrollableControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ScrollBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SelectionRangeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SendKeysTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SplitContainerTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SplitterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusBarPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SystemInformationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TabControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TableLayoutTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TestHelper.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TestImageIndexConverter.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TimerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolBarButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripComboBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripContainerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripContentPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripControlHostTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripDropDownItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripDropDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripMenuItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripOverflowButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripOverflowTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripProgressBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripSeparatorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripStatusLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolTipTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TrackBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeNodeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeNodeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewEventsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\UpDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\UserControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\VScrollPropertiesTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_4_0.csproj">\r
-      <Project>{0978E130-1E7B-4627-A9CC-7489DB17BFF1}</Project>\r
-      <Name>Accessibility\Accessibility-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/resources/a.cur">\r
-      <LogicalName>a.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/32x32.ico">\r
-      <LogicalName>32x32.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 393d5cba9aebfd3d0da99fd14f52067b5b2f70e6..3ce4ab7b5741a9728bb3e05cf1ee6e332633f94e 100644 (file)
@@ -5133,7 +5133,17 @@ namespace System.Windows.Forms {
                                        SetSelectedRowCore (rowIndex, false);
                        }
 
-                       if (Rows.Count - e.RowCount <= 0) {
+                       int RowsLeft = Rows.Count - e.RowCount;
+                       if (RowsLeft < 0)
+                               RowsLeft = 0;
+
+                       if (first_row_index > RowsLeft - 1)
+                               first_row_index = RowsLeft - 1;
+
+                       if (first_row_index < 0)
+                               first_row_index = 0;
+
+                       if (RowsLeft == 0) {
                                MoveCurrentCell (-1, -1, true, false, false, true);
                                hover_cell = null;
                        } else if (Columns.Count == 0) {
@@ -5141,8 +5151,8 @@ namespace System.Windows.Forms {
                                hover_cell = null;
                        } else if (currentCell != null && currentCell.RowIndex == e.RowIndex) {
                                int nextRowIndex = e.RowIndex;
-                               if (nextRowIndex >= Rows.Count - e.RowCount)
-                                       nextRowIndex = Rows.Count - 1 - e.RowCount;
+                               if (nextRowIndex >= RowsLeft)
+                                       nextRowIndex = RowsLeft - 1;
                                MoveCurrentCell (currentCell != null ? currentCell.ColumnIndex : 0, nextRowIndex, 
                                                 true, false, false, true);
                                if (hover_cell != null && hover_cell.RowIndex >= e.RowIndex)
index 8261f1f87562ca1964c1110362ff798af0a9224e..24aa28797bae7e2a4c5f49760fe3469c2161e9e8 100644 (file)
@@ -261,14 +261,14 @@ namespace System.Windows.Forms
 
                        for (int i = 0; i < total; i++) {
                                DataGridViewRow row = (DataGridViewRow)list[0];
-                               
+                               row.SetIndex(0);
+
                                // We can exit because the NewRow is always last
                                if (row.IsNewRow)
                                        break;
 
                                row.SetDataGridView (null);
                                list.Remove (row);
-                               ReIndex ();
                        }
 
                        DataGridView.OnRowsPostRemovedInternal (new DataGridViewRowsRemovedEventArgs (0, total));
index 3af4684710ade1ef9420d2e56c7319fc0e32c4cd..51e8b0d587e52438d6ff186c75aa0d7b25db24aa 100644 (file)
@@ -1031,6 +1031,7 @@ namespace System.Windows.Forms
 
                                virtual_list_size = value;
                                if (virtual_mode) {
+                                       focused_item_index = -1;
                                        selected_indices.Reset ();
                                        Redraw (true);
                                }
@@ -2668,6 +2669,11 @@ namespace System.Windows.Forms
                                                        owner.UpdateMultiSelection (clicked_item.DisplayIndex, reselect);
                                        } else {
                                                clicked_item.Selected = true;
+                                               // Side-effects to setting Selected can possibly result in ItemsMouseUp() being called
+                                               // and clicked_item being set to null.  (See Xamarin bug 23591.)  In such a case, assume
+                                               // that there's nothing more we can do here.
+                                               if (clicked_item == null)
+                                                       return;
                                        }
 
                                        if (owner.VirtualMode && changed) {
index 26edaf80995a6925f7a1a87323ebabe359610479..7180bd30969bac68db84f1f82b21a8fa6da2a14a 100644 (file)
@@ -545,8 +545,11 @@ namespace System.Windows.Forms
                                var textHeight = excess_height >= 0 ? totalArea.Height - final_image_rect.Height : textSize.Height;
                                final_text_rect = new Rectangle (AlignInRectangle (totalArea, textSize, textAlign).Left, final_image_rect.Bottom + element_spacing, textSize.Width, textHeight);
                                
-                               if (final_text_rect.Bottom > totalArea.Bottom)
-                                       final_text_rect.Y = totalArea.Top;
+                               if (final_text_rect.Bottom > totalArea.Bottom) {
+                                       final_text_rect.Y -= (final_text_rect.Bottom - totalArea.Bottom);
+                                       if (final_text_rect.Y < totalArea.Top)
+                                               final_text_rect.Y = totalArea.Top;
+                               }
                        }
 
                        if (displayEllipsis) {
index 30c0d89f5fb40633ee7a05e3dc555e6408b74e67..6cfe4b2ecf896bf96db3ad83bf96b18291ead7de 100644 (file)
@@ -1145,13 +1145,7 @@ namespace System.Windows.Forms
                                if (tsi.Enabled && tsi.Visible && !string.IsNullOrEmpty (tsi.Text) && Control.IsMnemonic (charCode, tsi.Text))
                                        return tsi.ProcessMnemonic (charCode);
 
-                       string code = Char.ToUpper (charCode).ToString ();
-                       
-                       // If any item's text starts with our letter, it gets the message
-                       if ((Control.ModifierKeys & Keys.Alt) != 0 || this is ToolStripDropDownMenu)
-                               foreach (ToolStripItem tsi in this.Items)
-                                       if (tsi.Enabled && tsi.Visible && !string.IsNullOrEmpty (tsi.Text) && tsi.Text.ToUpper ().StartsWith (code) && !(tsi is ToolStripControlHost))
-                                               return tsi.ProcessMnemonic (charCode);
+                       // Do not try to match any further here.  See Xamarin bug 23532.
 
                        return base.ProcessMnemonic (charCode);
                }
index 666bd7a6fecc52a679e6f7c0b43dc86512b32f24..e973b2b923217e51104d7ecea4808522a4f37bf9 100644 (file)
@@ -2569,6 +2569,42 @@ namespace MonoTests.System.Windows.Forms
                                Assert.AreEqual (30, dgv.Rows [0].MinimumHeight);
                        }
                }
+
+               [Test] // Xamarin bug #24372
+               public void Bug24372_first_row_index ()
+               {
+                       Form form = new Form ();
+                       DataGridView24372 dgv = new DataGridView24372 ();
+                       dgv.Parent = form;
+                       dgv.ColumnCount = 1;
+                       dgv.RowCount = 100;
+                       dgv.CurrentCell = dgv[0,50];
+                       dgv.Focus ();
+                       form.Show ();
+
+                       dgv.Rows.Clear ();
+                       form.Refresh ();
+                       Application.DoEvents ();
+
+                       if (dgv.HasException)
+                               Assert.Fail("#A1");
+
+                       form.Dispose ();
+               }
+
+               class DataGridView24372 : DataGridView
+               {
+                       public bool HasException { get; private set; }
+                       protected override void OnPaint (PaintEventArgs e)
+                       {
+                               HasException = false;
+                               try {
+                                       base.OnPaint(e);
+                               } catch (ArgumentOutOfRangeException ex) {
+                                       HasException = true;
+                               }
+                       }
+               }
        }
        
        [TestFixture]
index ec3ddd731b08faca1c252a5973bff5327a7902b7..ea0d322b3a652a3b8103a025fe8eb9f58869c79e 100644 (file)
@@ -561,7 +561,12 @@ namespace Microsoft.Build.BuildEngine {
                                // This is used as the fall back version if the
                                // project can't find a version to use
                                return String.IsNullOrEmpty (defaultToolsVersion)
-                                               ? "4.0"
+                                               ?
+#if NET_4_0                                            
+                                                "4.0"
+#else
+                                               "2.0"
+#endif                                         
                                                : defaultToolsVersion;
                        }
                        set {
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_2_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_2_0.csproj
deleted file mode 100644 (file)
index c0b32ab..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6A56A8BD-4228-4865-8112-9D31C6829638}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Engine</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItemGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskPropertyGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\IBuildTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">\r
-      <Project>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0.csproj">\r
-      <Project>{A777C6B7-7DAA-48DC-BAEF-FD21967A3384}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_0.csproj
deleted file mode 100644 (file)
index 02437dd..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4E55B240-B470-43B4-ABDA-8C03E7B1BF8E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Engine</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItemGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskPropertyGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\IBuildTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{7A96CB43-304B-417C-AAB3-C096E48DAE70}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">\r
-      <Project>{98DC1B90-280C-4A1B-A834-9D5143840323}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_2_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_2_0.csproj
deleted file mode 100644 (file)
index d08f9a6..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{750EAC81-53A4-41F4-9713-16B07578B170}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Engine_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />\r
-    <Compile Include="Test\various\Build.cs" />\r
-    <Compile Include="Test\various\Conditions.cs" />\r
-    <Compile Include="Test\various\DefaultTasks.cs" />\r
-    <Compile Include="Test\various\EvaluationOrder.cs" />\r
-    <Compile Include="Test\various\Items.cs" />\r
-    <Compile Include="Test\various\ProjectElement.cs" />\r
-    <Compile Include="Test\various\Properties.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0.csproj">\r
-      <Project>{6A56A8BD-4228-4865-8112-9D31C6829638}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">\r
-      <Project>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0.csproj">\r
-      <Project>{A777C6B7-7DAA-48DC-BAEF-FD21967A3384}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_0.csproj
deleted file mode 100644 (file)
index dec70cc..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{610DE398-8F0E-4857-A600-17773B98E457}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Engine_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />\r
-    <Compile Include="Test\various\Build.cs" />\r
-    <Compile Include="Test\various\Conditions.cs" />\r
-    <Compile Include="Test\various\DefaultTasks.cs" />\r
-    <Compile Include="Test\various\EvaluationOrder.cs" />\r
-    <Compile Include="Test\various\Items.cs" />\r
-    <Compile Include="Test\various\ProjectElement.cs" />\r
-    <Compile Include="Test\various\Properties.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D\r
-  </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0.csproj">\r
-      <Project>{9B0AC297-CB85-43C1-8C18-12997CF1B78D}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{1D4BCF4D-31D1-4F92-A2B2-D9E41A640649}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">\r
-      <Project>{A20F004B-16AC-44DE-A14E-2C2B5E9F72BE}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{51720A26-B4D9-4B84-8CB5-9CBA57477FBB}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_2_0.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_2_0.csproj
deleted file mode 100644 (file)
index 1dfa4fa..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Framework</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\AnyEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEngineResult.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildErrorEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildErrorEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEventContext.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildMessageEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildMessageEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStatusEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStatusEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildWarningEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildWarningEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\CustomBuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\CustomBuildEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ExternalProjectFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ExternalProjectStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine3.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine4.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ICancelableTask.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IEventRedirector.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IEventSource.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IForwardingLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ILogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\INodeLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITask.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskFactory.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskFactory2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskHost.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskItem2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LazyFormattedBuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoadInSeparateAppDomainAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoggerVerbosity.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\MessageImportance.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\OutputAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\RegisteredTaskObjectLifetime.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\RequiredAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskCommandLineEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskPropertyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskStartedEventHandler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_0.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_0.csproj
deleted file mode 100644 (file)
index e0e3fc5..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7A96CB43-304B-417C-AAB3-C096E48DAE70}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Framework</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\AnyEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEngineResult.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildErrorEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildErrorEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEventContext.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildMessageEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildMessageEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStatusEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStatusEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildWarningEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildWarningEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\CustomBuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\CustomBuildEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ExternalProjectFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ExternalProjectStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine3.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine4.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ICancelableTask.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IEventRedirector.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IEventSource.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IForwardingLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ILogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\INodeLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITask.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskFactory.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskFactory2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskHost.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskItem2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LazyFormattedBuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoadInSeparateAppDomainAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoggerVerbosity.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\MessageImportance.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\OutputAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\RegisteredTaskObjectLifetime.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\RequiredAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskCommandLineEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskPropertyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskStartedEventHandler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_2_0.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_2_0.csproj
deleted file mode 100644 (file)
index a3322ae..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F8559E0C-7D86-40C4-B481-5B71DC1DBE8F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Framework-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Framework_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildErrorEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildEventContextTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildMessageEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildWarningEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\LoggerExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ProjectFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ProjectStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TargetFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TargetStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskCommandLineEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskStartedEventArgsTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">\r
-      <Project>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_4_0.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 7c6585f..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1ADD07F3-3897-4865-888E-BD37F1B55EBD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Framework-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Framework_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildErrorEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildEventContextTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildMessageEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildWarningEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\LoggerExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ProjectFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ProjectStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TargetFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TargetStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskCommandLineEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskStartedEventArgsTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{7A96CB43-304B-417C-AAB3-C096E48DAE70}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_2_0.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_2_0.csproj
deleted file mode 100644 (file)
index 9bee01e..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9EF938FF-4761-414A-B1BA-0A9645CAA14A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Tasks</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BootstrapperBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildMessageSeverity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildResults.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ComponentsLocation.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBootstrapperBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildResults.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProduct.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductBuilderCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\Product.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductBuilderCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ApplicationIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ApplicationManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReferenceCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReferenceType.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\BaseReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ComClass.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\DeployManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\FileReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\FileReferenceCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\Manifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ManifestReader.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ManifestWriter.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessageCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessageType.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ProxyStub.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\SecurityUtilities.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\TrustInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\TypeLib.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\UpdateMode.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\UpdateUnit.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\WindowClass.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\ICscHostObject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\ICscHostObject4.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\IVbcHostObject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AL.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AppDomainIsolatedTaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AspNetCompiler.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssemblyResolver.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CommandLineBuilderExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Copy.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateCSharpManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateItem.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateProperty.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateTemporaryVCProject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateVisualBasicManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Csc.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Delete.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Error.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Exec.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ExtractedClassName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FindAppConfigFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FindUnderPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FormatUrl.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FormatVersion.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateApplicationManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateBootstrapper.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateDeploymentManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateManifestBase.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateResource.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateTrustInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetAssemblyIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetFrameworkPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\LC.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Message.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RemoveDuplicates.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveAssemblyReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolvedReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveManifestFiles.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveProjectBase.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\SGen.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\SignFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\TaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\TaskLoggingHelperExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ToolTaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Touch.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\UnregisterAssembly.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\UpdateManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Vbc.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\VCBuild.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Warning.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceReader.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceReader.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0.csproj">\r
-      <Project>{A777C6B7-7DAA-48DC-BAEF-FD21967A3384}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">\r
-      <Project>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0.csproj">\r
-      <Project>{6A56A8BD-4228-4865-8112-9D31C6829638}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_2_0.csproj">\r
-      <Project>{8C54606D-305D-45B0-9932-380FE021BEFE}</Project>\r
-      <Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_0.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_0.csproj
deleted file mode 100644 (file)
index 945fdf7..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5832CC3F-D152-43B4-AE8B-E922F8024171}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Tasks.v4.0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BootstrapperBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildMessageSeverity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildResults.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ComponentsLocation.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBootstrapperBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildResults.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProduct.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductBuilderCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\Product.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductBuilderCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ApplicationIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ApplicationManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReferenceCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReferenceType.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\BaseReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ComClass.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\DeployManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\FileReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\FileReferenceCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\Manifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ManifestReader.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ManifestWriter.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessageCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessageType.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ProxyStub.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\SecurityUtilities.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\TrustInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\TypeLib.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\UpdateMode.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\UpdateUnit.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\WindowClass.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\ICscHostObject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\ICscHostObject4.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\IVbcHostObject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AL.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AppDomainIsolatedTaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AspNetCompiler.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssemblyResolver.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CommandLineBuilderExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Copy.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateCSharpManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateItem.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateProperty.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateTemporaryVCProject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateVisualBasicManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Csc.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Delete.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Error.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Exec.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ExtractedClassName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FindAppConfigFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FindUnderPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FormatUrl.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FormatVersion.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateApplicationManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateBootstrapper.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateDeploymentManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateManifestBase.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateResource.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateTrustInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetAssemblyIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetFrameworkPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\LC.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Message.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RemoveDuplicates.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveAssemblyReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolvedReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveManifestFiles.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveProjectBase.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\SGen.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\SignFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\TaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\TaskLoggingHelperExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ToolTaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Touch.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\UnregisterAssembly.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\UpdateManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Vbc.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\VCBuild.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Warning.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceReader.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceReader.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">\r
-      <Project>{98DC1B90-280C-4A1B-A834-9D5143840323}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{7A96CB43-304B-417C-AAB3-C096E48DAE70}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0.csproj">\r
-      <Project>{4E55B240-B470-43B4-ABDA-8C03E7B1BF8E}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_0.csproj">\r
-      <Project>{B8993C2D-04FD-4738-91ED-060E29A5FBD4}</Project>\r
-      <Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_2_0.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_2_0.csproj
deleted file mode 100644 (file)
index dd207b0..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DEC22ED1-001B-4849-8F68-105493B5CBE3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Tasks-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Tasks_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\Microsoft.Build.Engine\Test\Microsoft.Build.BuildEngine\Consts.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ALTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignCultureTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignProjectConfigurationTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignTargetPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CombinePathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CopyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateCSharpManifestResourceNameTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreatePropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateVisualBasicManifestResourceNameTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CscTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\DeleteTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ErrorTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\FindAppConfigFileTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkSdkPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\LCTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\MakeDirTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ManagedCompilerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\MessageTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\RemoveDirTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\RemoveDuplicatesTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ResolveAssemblyReferenceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TaskBatchingTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TestEngine.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\WarningTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\WriteLinesToFileTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Tasks\Microsoft.Build.Tasks-net_2_0.csproj">\r
-      <Project>{9EF938FF-4761-414A-B1BA-0A9645CAA14A}</Project>\r
-      <Name>Microsoft.Build.Tasks\Microsoft.Build.Tasks-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0.csproj">\r
-      <Project>{6A56A8BD-4228-4865-8112-9D31C6829638}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">\r
-      <Project>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_2_0.csproj">\r
-      <Project>{8C54606D-305D-45B0-9932-380FE021BEFE}</Project>\r
-      <Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0.csproj">\r
-      <Project>{A777C6B7-7DAA-48DC-BAEF-FD21967A3384}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_4_0.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_4_0.csproj
deleted file mode 100644 (file)
index f843f41..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E3E93786-14F7-41DE-AFBB-20912C970ED8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Tasks-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Tasks_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\Microsoft.Build.Engine\Test\Microsoft.Build.BuildEngine\Consts.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ALTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignCultureTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignProjectConfigurationTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignTargetPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CombinePathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CopyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateCSharpManifestResourceNameTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreatePropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateVisualBasicManifestResourceNameTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CscTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\DeleteTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ErrorTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\FindAppConfigFileTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkSdkPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\LCTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\MakeDirTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ManagedCompilerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\MessageTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\RemoveDirTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\RemoveDuplicatesTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ResolveAssemblyReferenceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TaskBatchingTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TestEngine.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\WarningTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\WriteLinesToFileTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D\r
-  </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Tasks\Microsoft.Build.Tasks-net_4_0.csproj">\r
-      <Project>{0F2C25D7-DF2E-4F4B-85D8-7EFC4DCD3B0C}</Project>\r
-      <Name>Microsoft.Build.Tasks\Microsoft.Build.Tasks-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0.csproj">\r
-      <Project>{9B0AC297-CB85-43C1-8C18-12997CF1B78D}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{1D4BCF4D-31D1-4F92-A2B2-D9E41A640649}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">\r
-      <Project>{A20F004B-16AC-44DE-A14E-2C2B5E9F72BE}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{D121EB80-19C6-4313-9BBE-6F66556CE8B7}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>
index 272a6f0056aea2ee50a659a4e0e817ab3af01b9b..6e969a0d766adeb19192b6e7099d0bf74f129b38 100644 (file)
@@ -319,7 +319,7 @@ namespace MonoTests.Microsoft.Build.Tasks {
                        Assert.AreEqual (FileAttributes.ReadOnly, File.GetAttributes (target_file), "A1");
                        
                        string documentString = @"
-                               <Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"" ToolsVersion=""3.5"">
+                               <Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"" ToolsVersion=""4.0"">
                                        <PropertyGroup><DestFile>" + target_file + @"</DestFile></PropertyGroup>
                                        <ItemGroup>
                                                <SFiles Include='" + file_path + @"'><Md>1</Md></SFiles>
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_2_0.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_2_0.csproj
deleted file mode 100644 (file)
index 27ff84c..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A777C6B7-7DAA-48DC-BAEF-FD21967A3384}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Utilities</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\System\System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\AppDomainIsolatedTask.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\CommandLineBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\HostObjectInitializationStatus.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\IAsyncOperation.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\IProcessAsyncOperation.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\Logger.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ProcessService.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ProcessWrapper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TargetDotNetFrameworkVersion.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\Task.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TaskLoggingHelper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ToolLocationHelper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ToolTask.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\MonoLocationHelper.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">\r
-      <Project>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_0.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_0.csproj
deleted file mode 100644 (file)
index 264dc23..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{98DC1B90-280C-4A1B-A834-9D5143840323}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Utilities.v4.0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\System\System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\AppDomainIsolatedTask.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\CommandLineBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\HostObjectInitializationStatus.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\IAsyncOperation.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\IProcessAsyncOperation.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\Logger.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ProcessService.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ProcessWrapper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TargetDotNetFrameworkVersion.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\Task.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TaskLoggingHelper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ToolLocationHelper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ToolTask.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\MonoLocationHelper.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{7A96CB43-304B-417C-AAB3-C096E48DAE70}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_2_0.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 0b497e4..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C6AD8AA6-5A1A-4430-99E0-CAB47FB7844B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Utilities-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Utilities_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.Build.Utilities\CommandLineBuilderTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\LoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\TaskItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\TaskLoggingHelperTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\ToolTaskTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0.csproj">\r
-      <Project>{A777C6B7-7DAA-48DC-BAEF-FD21967A3384}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="./../../class/lib/net_2_0/Microsoft.Build.Engine.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>./../../class/lib/net_2_0/Microsoft.Build.Engine.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">\r
-      <Project>{9F21C5DF-2ED4-43F7-8716-192B1C2EC185}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_4_0.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 75bb369..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{52AF96F7-968E-4D90-AD5F-A5F2B7E187AE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Utilities-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Utilities_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.Build.Utilities\CommandLineBuilderTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\LoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\TaskItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\TaskLoggingHelperTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D\r
-  </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">\r
-      <Project>{A20F004B-16AC-44DE-A14E-2C2B5E9F72BE}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{1D4BCF4D-31D1-4F92-A2B2-D9E41A640649}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{8260E24F-1471-4320-AB5B-7CC7B68521E3}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_0.csproj b/mcs/class/Microsoft.Build/Microsoft.Build-net_4_0.csproj
deleted file mode 100644 (file)
index 499f9ad..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{99FAA9FF-3AE6-468C-9E46-839749A59EC5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\ColorResetter.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\ColorSetter.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\ConsoleLogger.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\EventSource.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\FileLogger.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\WriteHandler.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities\TargetDotNetFrameworkVersion.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities\TaskItem.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities\ToolLocationHelper.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ElementLocation.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectChooseElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectCommentElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectElementContainer.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectExtensionsElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectImportElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectImportGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemDefinitionElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemDefinitionGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectMetadataElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectOnErrorElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectOtherwiseElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectOutputElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectPropertyElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectPropertyGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectRootElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectTargetElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectTaskElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectUsingTaskBodyElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectUsingTaskElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectUsingTaskParameterElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectWhenElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\UsingTaskParameterGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\Project.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectCollectionChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectCollectionChangedState.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectItem.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectItemDefinition.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectLoadSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectMetadata.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectProperty.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectXmlChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ResolvedImport.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\SubToolset.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\Toolset.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ToolsetDefinitionLocations.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\BuildAbortedException.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\InternalLoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\InvalidProjectFileException.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\InvalidToolsetDefinitionException.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildManager.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildParameters.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildRequestData.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildRequestDataFlags.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildResult.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildResultCode.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildSubmission.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildSubmissionCompleteCallback.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\HostServices.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ITargetResult.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\NodeAffinity.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\NodeEngineShutdownReason.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\OutOfProcNode.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemDefinitionInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemGroupTaskInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemGroupTaskItemInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemGroupTaskMetadataInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectMetadataInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectOnErrorInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectPropertyGroupTaskInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectPropertyGroupTaskPropertyInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectPropertyInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTargetInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTargetInstanceChild.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskInstanceChild.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskOutputItemInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskOutputPropertyInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\TargetResult.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\TargetResultCode.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildEngine4.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildNodeManager.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildTaskDatabase.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildTaskFactory.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\CollectionFromEnumerable.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionConstructs.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionEvaluator.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionParserManual.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionTokenizer.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\FilteredEnumerable.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ProjectTaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ReverseEnumerable.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\WindowsCompatibilityExtensions.cs" />\r
-    <Compile Include="Microsoft.Build.Logging\ConfigurableForwardingLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Logging\ForwardingLoggerRecord.cs" />\r
-    <Compile Include="Microsoft.Build.Logging\LoggerDescription.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0.csproj">\r
-      <Project>{4E55B240-B470-43B4-ABDA-8C03E7B1BF8E}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{7A96CB43-304B-417C-AAB3-C096E48DAE70}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build-tests-net_4_0.csproj b/mcs/class/Microsoft.Build/Microsoft.Build-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 5fba28e..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FF9A5982-D153-498D-BEF1-8CF18CD5796C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\FunctionalTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Construction\ProjectItemElementTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Construction\ProjectRootElementTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectItemDefinitionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectPropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ResolvedImportTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ToolsetTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildManagerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildParametersTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildRequestDataTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildSubmissionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\ProjectInstanceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\ProjectMetadataInstanceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\ProjectTargetInstanceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Internal\CollectionFromEnumerableTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Internal\ExpressionParserTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Logging\ConsoleLoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Logging\LoggerDescriptionTest.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build\Microsoft.Build-net_4_0.csproj">\r
-      <Project>{99FAA9FF-3AE6-468C-9E46-839749A59EC5}</Project>\r
-      <Name>Microsoft.Build\Microsoft.Build-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0.csproj">\r
-      <Project>{4E55B240-B470-43B4-ABDA-8C03E7B1BF8E}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">\r
-      <Project>{7A96CB43-304B-417C-AAB3-C096E48DAE70}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">\r
-      <Project>{98DC1B90-280C-4A1B-A834-9D5143840323}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 11343933971adf05106698d5efd0ed573954fb52..60ccbe37bde67cffc80d065984522b6351688169 100644 (file)
@@ -251,12 +251,6 @@ namespace Microsoft.Build.Evaluation
                //FIXME: should also support config file, depending on ToolsetLocations
                void LoadDefaultToolsets ()
                {
-                       AddToolset (new Toolset ("2.0",
-                               ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20), this, null));
-                       AddToolset (new Toolset ("3.0",
-                               ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version30), this, null));
-                       AddToolset (new Toolset ("3.5",
-                               ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35), this, null));
 #if NET_4_0
                        AddToolset (new Toolset ("4.0",
                                ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40), this, null));
@@ -267,7 +261,16 @@ namespace Microsoft.Build.Evaluation
 #if XBUILD_14
                        AddToolset (new Toolset ("14.0", ToolLocationHelper.GetPathToBuildTools ("14.0"), this, null));
 #endif
-                       default_tools_version = toolsets.First ().ToolsVersion;
+
+                       // We don't support these anymore
+                       AddToolset (new Toolset ("2.0",
+                               ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20), this, null));
+                       AddToolset (new Toolset ("3.0",
+                               ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version30), this, null));
+                       AddToolset (new Toolset ("3.5",
+                               ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35), this, null));
+
+                       default_tools_version = toolsets [0].ToolsVersion;
                }
                
                [MonoTODO ("not verified at all")]
index 4e23c2a7a5ac8d0c72e58af4fda1c7d53312bb9b..c4fe2401bd518d2415c83ba4f94848dea8d15a86 100644 (file)
@@ -66,7 +66,7 @@ namespace MonoTests.Microsoft.Build.Execution
                        var prop = proj.Properties.First (p => p.Name=="P");
                        Assert.AreEqual ("valid", prop.EvaluatedValue, "#2");
                        Assert.IsNotNull (proj.GetProperty ("MSBuildProjectDirectory"), "#3");
-                       Assert.AreEqual ("2.0", proj.ToolsVersion, "#4");
+                       Assert.AreEqual ("4.0", proj.ToolsVersion, "#4");
                }
                
                [Test]
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_0.csproj b/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_0.csproj
deleted file mode 100644 (file)
index c663aa7..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9ACDCB1D-5099-4091-A426-DBBA9B0976C2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.CSharp</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\Binder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpArgumentInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpArgumentInfoFlags.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinaryOperationBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinderFlags.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpConvertBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpGetIndexBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpGetMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeConstructorBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpIsEventBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpSetIndexBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpSetMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpUnaryOperationBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\DynamicContext.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\ErrorPrinter.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\Extensions.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderContext.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderException.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderInternalCompilerException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.CSharp\Mono.CSharp-net_4_0.csproj">\r
-      <Project>{7F51AF6B-0658-41D2-9165-D9700122D4C9}</Project>\r
-      <Name>Mono.CSharp\Mono.CSharp-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index bcb6e3c0b0e43044d7ab974d8915d3a5c8b10c7c..e2b38dbfcd673f5d19ea9346f4a820fb232f1a1a 100644 (file)
@@ -111,7 +111,7 @@ namespace Microsoft.CSharp.RuntimeBinder
                        throw new NotImplementedException ();
                }
 
-               public Compiler.ExtensionMethodCandidates LookupExtensionMethod (Compiler.TypeSpec extensionType, string name, int arity)
+               public Compiler.ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                {
                        // No extension method lookup in this context
                        return null;
diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_2_0.csproj b/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_2_0.csproj
deleted file mode 100644 (file)
index f9a2afa..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9BFFAB87-980B-4074-963C-1542F2E0F2FE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.VisualC</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.VisualC\DebugInfoInPDBAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\DecoratedNameAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsConstModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsCXXReferenceModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsLongModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsSignedModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsVolatileModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\MiscellaneousBitsAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\NeedsCopyConstructorModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\NoSignSpecifiedModifier.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_0.csproj b/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_0.csproj
deleted file mode 100644 (file)
index 0a1f1c5..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0EB544A0-2EAA-466C-84E5-054E5F635AD9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.VisualC</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.VisualC\DebugInfoInPDBAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\DecoratedNameAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsConstModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsCXXReferenceModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsLongModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsSignedModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsVolatileModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\MiscellaneousBitsAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\NeedsCopyConstructorModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\NoSignSpecifiedModifier.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_0.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_0.csproj
deleted file mode 100644 (file)
index e700a18..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{31114AEC-054F-44C3-B493-DD0815A5090F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Web.Infrastructure</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicModuleHelper\DynamicModuleUtility.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicValidationHelper\LazyWebROCollection.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicValidationHelper\ValidationUtility.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure\HttpContextHelper.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure\InfrastructureHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.C5/Mono.C5-net_2_0.csproj b/mcs/class/Mono.C5/Mono.C5-net_2_0.csproj
deleted file mode 100644 (file)
index d25fc4a..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C54C9EFB-5E3B-43D6-94C9-DD3A66EDA8DA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.C5</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="C5\arrays\ArrayList.cs" />\r
-    <Compile Include="C5\arrays\CircularQueue.cs" />\r
-    <Compile Include="C5\arrays\HashedArrayList.cs" />\r
-    <Compile Include="C5\arrays\SortedArray.cs" />\r
-    <Compile Include="C5\AssemblyInfo.cs" />\r
-    <Compile Include="C5\Attributes.cs" />\r
-    <Compile Include="C5\Builtin.cs" />\r
-    <Compile Include="C5\Collections.cs" />\r
-    <Compile Include="C5\Comparer.cs" />\r
-    <Compile Include="C5\Delegates.cs" />\r
-    <Compile Include="C5\Dictionaries.cs" />\r
-    <Compile Include="C5\Enums.cs" />\r
-    <Compile Include="C5\Events.cs" />\r
-    <Compile Include="C5\Exceptions.cs" />\r
-    <Compile Include="C5\Formatting.cs" />\r
-    <Compile Include="C5\Hashers.cs" />\r
-    <Compile Include="C5\hashing\HashBag.cs" />\r
-    <Compile Include="C5\hashing\HashDictionary.cs" />\r
-    <Compile Include="C5\hashing\HashTable.cs" />\r
-    <Compile Include="C5\heaps\IntervalHeap.cs" />\r
-    <Compile Include="C5\Interfaces.cs" />\r
-    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />\r
-    <Compile Include="C5\linkedlists\LinkedList.cs" />\r
-    <Compile Include="C5\MappedEnumerators.cs" />\r
-    <Compile Include="C5\Random.cs" />\r
-    <Compile Include="C5\Records.cs" />\r
-    <Compile Include="C5\Sorting.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeBag.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeSet.cs" />\r
-    <Compile Include="C5\ViewSupport.cs" />\r
-    <Compile Include="C5\WrappedArray.cs" />\r
-    <Compile Include="C5\Wrappers.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.C5/Mono.C5-net_4_0.csproj b/mcs/class/Mono.C5/Mono.C5-net_4_0.csproj
deleted file mode 100644 (file)
index f3941fb..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FF7548C2-DDB5-4E31-B2B3-BCF20B8CC4CB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.C5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="C5\arrays\ArrayList.cs" />\r
-    <Compile Include="C5\arrays\CircularQueue.cs" />\r
-    <Compile Include="C5\arrays\HashedArrayList.cs" />\r
-    <Compile Include="C5\arrays\SortedArray.cs" />\r
-    <Compile Include="C5\AssemblyInfo.cs" />\r
-    <Compile Include="C5\Attributes.cs" />\r
-    <Compile Include="C5\Builtin.cs" />\r
-    <Compile Include="C5\Collections.cs" />\r
-    <Compile Include="C5\Comparer.cs" />\r
-    <Compile Include="C5\Delegates.cs" />\r
-    <Compile Include="C5\Dictionaries.cs" />\r
-    <Compile Include="C5\Enums.cs" />\r
-    <Compile Include="C5\Events.cs" />\r
-    <Compile Include="C5\Exceptions.cs" />\r
-    <Compile Include="C5\Formatting.cs" />\r
-    <Compile Include="C5\Hashers.cs" />\r
-    <Compile Include="C5\hashing\HashBag.cs" />\r
-    <Compile Include="C5\hashing\HashDictionary.cs" />\r
-    <Compile Include="C5\hashing\HashTable.cs" />\r
-    <Compile Include="C5\heaps\IntervalHeap.cs" />\r
-    <Compile Include="C5\Interfaces.cs" />\r
-    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />\r
-    <Compile Include="C5\linkedlists\LinkedList.cs" />\r
-    <Compile Include="C5\MappedEnumerators.cs" />\r
-    <Compile Include="C5\Random.cs" />\r
-    <Compile Include="C5\Records.cs" />\r
-    <Compile Include="C5\Sorting.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeBag.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeSet.cs" />\r
-    <Compile Include="C5\ViewSupport.cs" />\r
-    <Compile Include="C5\WrappedArray.cs" />\r
-    <Compile Include="C5\Wrappers.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.C5/Mono.C5-tests-net_2_0.csproj b/mcs/class/Mono.C5/Mono.C5-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 49f9f7b..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E698BCE2-5238-4E29-A859-406C99A83E28}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.C5-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.C5_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\arrays\ArrayListTest.cs" />\r
-    <Compile Include="Test\arrays\CircularQueueTest.cs" />\r
-    <Compile Include="Test\arrays\HashedArrayListTest.cs" />\r
-    <Compile Include="Test\arrays\SortedArrayTests.cs" />\r
-    <Compile Include="Test\AssemblyInfo.cs" />\r
-    <Compile Include="Test\BasesTest.cs" />\r
-    <Compile Include="Test\hashing\HashBagTests.cs" />\r
-    <Compile Include="Test\hashing\HashDictionaryTests.cs" />\r
-    <Compile Include="Test\hashing\HashTableTests.cs" />\r
-    <Compile Include="Test\heaps\HeapTests.cs" />\r
-    <Compile Include="Test\InterfacesTest.cs" />\r
-    <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />\r
-    <Compile Include="Test\linkedlists\LinkedListTest.cs" />\r
-    <Compile Include="Test\Records.cs" />\r
-    <Compile Include="Test\Sorting.cs" />\r
-    <Compile Include="Test\SupportClasses.cs" />\r
-    <Compile Include="Test\templates\Clone.cs" />\r
-    <Compile Include="Test\templates\Events.cs" />\r
-    <Compile Include="Test\templates\GenericCollectionTester.cs" />\r
-    <Compile Include="Test\templates\List.cs" />\r
-    <Compile Include="Test\trees\Bag.cs" />\r
-    <Compile Include="Test\trees\Dictionary.cs" />\r
-    <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />\r
-    <Compile Include="Test\WrappersTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.C5\Mono.C5-net_2_0.csproj">\r
-      <Project>{C54C9EFB-5E3B-43D6-94C9-DD3A66EDA8DA}</Project>\r
-      <Name>Mono.C5\Mono.C5-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.C5/Mono.C5-tests-net_4_0.csproj b/mcs/class/Mono.C5/Mono.C5-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 527e666..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0DE538B3-2404-4686-AD32-6BDD84A91549}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.C5-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.C5_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\arrays\ArrayListTest.cs" />\r
-    <Compile Include="Test\arrays\CircularQueueTest.cs" />\r
-    <Compile Include="Test\arrays\HashedArrayListTest.cs" />\r
-    <Compile Include="Test\arrays\SortedArrayTests.cs" />\r
-    <Compile Include="Test\AssemblyInfo.cs" />\r
-    <Compile Include="Test\BasesTest.cs" />\r
-    <Compile Include="Test\hashing\HashBagTests.cs" />\r
-    <Compile Include="Test\hashing\HashDictionaryTests.cs" />\r
-    <Compile Include="Test\hashing\HashTableTests.cs" />\r
-    <Compile Include="Test\heaps\HeapTests.cs" />\r
-    <Compile Include="Test\InterfacesTest.cs" />\r
-    <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />\r
-    <Compile Include="Test\linkedlists\LinkedListTest.cs" />\r
-    <Compile Include="Test\Records.cs" />\r
-    <Compile Include="Test\Sorting.cs" />\r
-    <Compile Include="Test\SupportClasses.cs" />\r
-    <Compile Include="Test\templates\Clone.cs" />\r
-    <Compile Include="Test\templates\Events.cs" />\r
-    <Compile Include="Test\templates\GenericCollectionTester.cs" />\r
-    <Compile Include="Test\templates\List.cs" />\r
-    <Compile Include="Test\trees\Bag.cs" />\r
-    <Compile Include="Test\trees\Dictionary.cs" />\r
-    <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />\r
-    <Compile Include="Test\WrappersTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.C5\Mono.C5-net_4_0.csproj">\r
-      <Project>{FF7548C2-DDB5-4E31-B2B3-BCF20B8CC4CB}</Project>\r
-      <Name>Mono.C5\Mono.C5-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_2_0.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_2_0.csproj
deleted file mode 100644 (file)
index ed18eec..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CA9B3BCC-D6B6-4FE5-B90E-106D88030B7D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CSharp</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />\r
-    <Compile Include="..\..\class\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\..\mcs\anonymous.cs" />\r
-    <Compile Include="..\..\mcs\argument.cs" />\r
-    <Compile Include="..\..\mcs\assembly.cs" />\r
-    <Compile Include="..\..\mcs\assign.cs" />\r
-    <Compile Include="..\..\mcs\async.cs" />\r
-    <Compile Include="..\..\mcs\attribute.cs" />\r
-    <Compile Include="..\..\mcs\cfold.cs" />\r
-    <Compile Include="..\..\mcs\class.cs" />\r
-    <Compile Include="..\..\mcs\codegen.cs" />\r
-    <Compile Include="..\..\mcs\complete.cs" />\r
-    <Compile Include="..\..\mcs\const.cs" />\r
-    <Compile Include="..\..\mcs\constant.cs" />\r
-    <Compile Include="..\..\mcs\context.cs" />\r
-    <Compile Include="..\..\mcs\convert.cs" />\r
-    <Compile Include="..\..\mcs\cs-parser.cs" />\r
-    <Compile Include="..\..\mcs\cs-tokenizer.cs" />\r
-    <Compile Include="..\..\mcs\decl.cs" />\r
-    <Compile Include="..\..\mcs\delegate.cs" />\r
-    <Compile Include="..\..\mcs\doc.cs" />\r
-    <Compile Include="..\..\mcs\driver.cs" />\r
-    <Compile Include="..\..\mcs\dynamic.cs" />\r
-    <Compile Include="..\..\mcs\ecore.cs" />\r
-    <Compile Include="..\..\mcs\enum.cs" />\r
-    <Compile Include="..\..\mcs\eval.cs" />\r
-    <Compile Include="..\..\mcs\expression.cs" />\r
-    <Compile Include="..\..\mcs\field.cs" />\r
-    <Compile Include="..\..\mcs\flowanalysis.cs" />\r
-    <Compile Include="..\..\mcs\generic.cs" />\r
-    <Compile Include="..\..\mcs\import.cs" />\r
-    <Compile Include="..\..\mcs\iterators.cs" />\r
-    <Compile Include="..\..\mcs\lambda.cs" />\r
-    <Compile Include="..\..\mcs\linq.cs" />\r
-    <Compile Include="..\..\mcs\literal.cs" />\r
-    <Compile Include="..\..\mcs\location.cs" />\r
-    <Compile Include="..\..\mcs\membercache.cs" />\r
-    <Compile Include="..\..\mcs\method.cs" />\r
-    <Compile Include="..\..\mcs\modifiers.cs" />\r
-    <Compile Include="..\..\mcs\module.cs" />\r
-    <Compile Include="..\..\mcs\namespace.cs" />\r
-    <Compile Include="..\..\mcs\nullable.cs" />\r
-    <Compile Include="..\..\mcs\parameter.cs" />\r
-    <Compile Include="..\..\mcs\pending.cs" />\r
-    <Compile Include="..\..\mcs\property.cs" />\r
-    <Compile Include="..\..\mcs\reflection.cs" />\r
-    <Compile Include="..\..\mcs\report.cs" />\r
-    <Compile Include="..\..\mcs\settings.cs" />\r
-    <Compile Include="..\..\mcs\statement.cs" />\r
-    <Compile Include="..\..\mcs\support.cs" />\r
-    <Compile Include="..\..\mcs\typemanager.cs" />\r
-    <Compile Include="..\..\mcs\typespec.cs" />\r
-    <Compile Include="..\..\mcs\visit.cs" />\r
-    <Compile Include="..\..\tools\monop\outline.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_0.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_0.csproj
deleted file mode 100644 (file)
index ac2a948..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7F51AF6B-0658-41D2-9165-D9700122D4C9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CSharp</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />\r
-    <Compile Include="..\..\class\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\..\mcs\anonymous.cs" />\r
-    <Compile Include="..\..\mcs\argument.cs" />\r
-    <Compile Include="..\..\mcs\assembly.cs" />\r
-    <Compile Include="..\..\mcs\assign.cs" />\r
-    <Compile Include="..\..\mcs\async.cs" />\r
-    <Compile Include="..\..\mcs\attribute.cs" />\r
-    <Compile Include="..\..\mcs\cfold.cs" />\r
-    <Compile Include="..\..\mcs\class.cs" />\r
-    <Compile Include="..\..\mcs\codegen.cs" />\r
-    <Compile Include="..\..\mcs\complete.cs" />\r
-    <Compile Include="..\..\mcs\const.cs" />\r
-    <Compile Include="..\..\mcs\constant.cs" />\r
-    <Compile Include="..\..\mcs\context.cs" />\r
-    <Compile Include="..\..\mcs\convert.cs" />\r
-    <Compile Include="..\..\mcs\cs-parser.cs" />\r
-    <Compile Include="..\..\mcs\cs-tokenizer.cs" />\r
-    <Compile Include="..\..\mcs\decl.cs" />\r
-    <Compile Include="..\..\mcs\delegate.cs" />\r
-    <Compile Include="..\..\mcs\doc.cs" />\r
-    <Compile Include="..\..\mcs\driver.cs" />\r
-    <Compile Include="..\..\mcs\dynamic.cs" />\r
-    <Compile Include="..\..\mcs\ecore.cs" />\r
-    <Compile Include="..\..\mcs\enum.cs" />\r
-    <Compile Include="..\..\mcs\eval.cs" />\r
-    <Compile Include="..\..\mcs\expression.cs" />\r
-    <Compile Include="..\..\mcs\field.cs" />\r
-    <Compile Include="..\..\mcs\flowanalysis.cs" />\r
-    <Compile Include="..\..\mcs\generic.cs" />\r
-    <Compile Include="..\..\mcs\import.cs" />\r
-    <Compile Include="..\..\mcs\iterators.cs" />\r
-    <Compile Include="..\..\mcs\lambda.cs" />\r
-    <Compile Include="..\..\mcs\linq.cs" />\r
-    <Compile Include="..\..\mcs\literal.cs" />\r
-    <Compile Include="..\..\mcs\location.cs" />\r
-    <Compile Include="..\..\mcs\membercache.cs" />\r
-    <Compile Include="..\..\mcs\method.cs" />\r
-    <Compile Include="..\..\mcs\modifiers.cs" />\r
-    <Compile Include="..\..\mcs\module.cs" />\r
-    <Compile Include="..\..\mcs\namespace.cs" />\r
-    <Compile Include="..\..\mcs\nullable.cs" />\r
-    <Compile Include="..\..\mcs\parameter.cs" />\r
-    <Compile Include="..\..\mcs\pending.cs" />\r
-    <Compile Include="..\..\mcs\property.cs" />\r
-    <Compile Include="..\..\mcs\reflection.cs" />\r
-    <Compile Include="..\..\mcs\report.cs" />\r
-    <Compile Include="..\..\mcs\settings.cs" />\r
-    <Compile Include="..\..\mcs\statement.cs" />\r
-    <Compile Include="..\..\mcs\support.cs" />\r
-    <Compile Include="..\..\mcs\typemanager.cs" />\r
-    <Compile Include="..\..\mcs\typespec.cs" />\r
-    <Compile Include="..\..\mcs\visit.cs" />\r
-    <Compile Include="..\..\tools\monop\outline.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-tests-net_2_0.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 769eaaa..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{02C4293A-4B99-4E94-9C69-09207A6A457D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.CSharp-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CSharp_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AssertReportPrinter.cs" />\r
-    <Compile Include="Test\Evaluator\BuildinCommands.cs" />\r
-    <Compile Include="Test\Evaluator\CompletionTest.cs" />\r
-    <Compile Include="Test\Evaluator\EvaluatorFixture.cs" />\r
-    <Compile Include="Test\Evaluator\EvaluatorTest.cs" />\r
-    <Compile Include="Test\Evaluator\ExpressionsTest.cs" />\r
-    <Compile Include="Test\Evaluator\TypesTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.CSharp\Mono.CSharp-net_2_0.csproj">\r
-      <Project>{CA9B3BCC-D6B6-4FE5-B90E-106D88030B7D}</Project>\r
-      <Name>Mono.CSharp\Mono.CSharp-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-tests-net_4_0.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-tests-net_4_0.csproj
deleted file mode 100644 (file)
index c9c5a06..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{84804E34-5070-45EE-80DD-6D25338C89FA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.CSharp-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CSharp_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AssertReportPrinter.cs" />\r
-    <Compile Include="Test\Evaluator\BuildinCommands.cs" />\r
-    <Compile Include="Test\Evaluator\CompletionTest.cs" />\r
-    <Compile Include="Test\Evaluator\EvaluatorFixture.cs" />\r
-    <Compile Include="Test\Evaluator\EvaluatorTest.cs" />\r
-    <Compile Include="Test\Evaluator\ExpressionsTest.cs" />\r
-    <Compile Include="Test\Evaluator\TypesTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.CSharp\Mono.CSharp-net_4_0.csproj">\r
-      <Project>{7F51AF6B-0658-41D2-9165-D9700122D4C9}</Project>\r
-      <Name>Mono.CSharp\Mono.CSharp-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Cairo/Mono.Cairo-net_2_0.csproj b/mcs/class/Mono.Cairo/Mono.Cairo-net_2_0.csproj
deleted file mode 100644 (file)
index f408f45..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{07DF935D-130B-4185-9DE2-027042BA1E35}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cairo</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Cairo\Antialias.cs" />\r
-    <Compile Include=".\Mono.Cairo\Cairo.cs" />\r
-    <Compile Include=".\Mono.Cairo\CairoDebug.cs" />\r
-    <Compile Include=".\Mono.Cairo\Color.cs" />\r
-    <Compile Include=".\Mono.Cairo\Content.cs" />\r
-    <Compile Include=".\Mono.Cairo\Context.cs" />\r
-    <Compile Include=".\Mono.Cairo\DirectFBSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Distance.cs" />\r
-    <Compile Include=".\Mono.Cairo\Extend.cs" />\r
-    <Compile Include=".\Mono.Cairo\FillRule.cs" />\r
-    <Compile Include=".\Mono.Cairo\Filter.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontExtents.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontFace.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontOptions.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontSlant.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontType.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontWeight.cs" />\r
-    <Compile Include=".\Mono.Cairo\Format.cs" />\r
-    <Compile Include=".\Mono.Cairo\GlitzSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Glyph.cs" />\r
-    <Compile Include=".\Mono.Cairo\Gradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\HintMetrics.cs" />\r
-    <Compile Include=".\Mono.Cairo\HintStyle.cs" />\r
-    <Compile Include=".\Mono.Cairo\ImageSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\LinearGradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\LineCap.cs" />\r
-    <Compile Include=".\Mono.Cairo\LineJoin.cs" />\r
-    <Compile Include=".\Mono.Cairo\Matrix.cs" />\r
-    <Compile Include=".\Mono.Cairo\NativeMethods.cs" />\r
-    <Compile Include=".\Mono.Cairo\Operator.cs" />\r
-    <Compile Include=".\Mono.Cairo\Path.cs" />\r
-    <Compile Include=".\Mono.Cairo\Pattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\PatternType.cs" />\r
-    <Compile Include=".\Mono.Cairo\PdfSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Point.cs" />\r
-    <Compile Include=".\Mono.Cairo\PointD.cs" />\r
-    <Compile Include=".\Mono.Cairo\PSSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\RadialGradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\Rectangle.cs" />\r
-    <Compile Include=".\Mono.Cairo\Region.cs" />\r
-    <Compile Include=".\Mono.Cairo\ScaledFont.cs" />\r
-    <Compile Include=".\Mono.Cairo\SolidPattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\Status.cs" />\r
-    <Compile Include=".\Mono.Cairo\SubpixelOrder.cs" />\r
-    <Compile Include=".\Mono.Cairo\Surface.cs" />\r
-    <Compile Include=".\Mono.Cairo\SurfacePattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\SurfaceType.cs" />\r
-    <Compile Include=".\Mono.Cairo\SvgSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\SvgVersion.cs" />\r
-    <Compile Include=".\Mono.Cairo\TextExtents.cs" />\r
-    <Compile Include=".\Mono.Cairo\Win32Surface.cs" />\r
-    <Compile Include=".\Mono.Cairo\XcbSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\XlibSurface.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Cairo/Mono.Cairo-net_4_0.csproj b/mcs/class/Mono.Cairo/Mono.Cairo-net_4_0.csproj
deleted file mode 100644 (file)
index 0c33147..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4616F5BD-3EDB-4503-89D5-CF9A1C0E00EF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cairo</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Cairo\Antialias.cs" />\r
-    <Compile Include=".\Mono.Cairo\Cairo.cs" />\r
-    <Compile Include=".\Mono.Cairo\CairoDebug.cs" />\r
-    <Compile Include=".\Mono.Cairo\Color.cs" />\r
-    <Compile Include=".\Mono.Cairo\Content.cs" />\r
-    <Compile Include=".\Mono.Cairo\Context.cs" />\r
-    <Compile Include=".\Mono.Cairo\DirectFBSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Distance.cs" />\r
-    <Compile Include=".\Mono.Cairo\Extend.cs" />\r
-    <Compile Include=".\Mono.Cairo\FillRule.cs" />\r
-    <Compile Include=".\Mono.Cairo\Filter.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontExtents.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontFace.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontOptions.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontSlant.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontType.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontWeight.cs" />\r
-    <Compile Include=".\Mono.Cairo\Format.cs" />\r
-    <Compile Include=".\Mono.Cairo\GlitzSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Glyph.cs" />\r
-    <Compile Include=".\Mono.Cairo\Gradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\HintMetrics.cs" />\r
-    <Compile Include=".\Mono.Cairo\HintStyle.cs" />\r
-    <Compile Include=".\Mono.Cairo\ImageSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\LinearGradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\LineCap.cs" />\r
-    <Compile Include=".\Mono.Cairo\LineJoin.cs" />\r
-    <Compile Include=".\Mono.Cairo\Matrix.cs" />\r
-    <Compile Include=".\Mono.Cairo\NativeMethods.cs" />\r
-    <Compile Include=".\Mono.Cairo\Operator.cs" />\r
-    <Compile Include=".\Mono.Cairo\Path.cs" />\r
-    <Compile Include=".\Mono.Cairo\Pattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\PatternType.cs" />\r
-    <Compile Include=".\Mono.Cairo\PdfSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Point.cs" />\r
-    <Compile Include=".\Mono.Cairo\PointD.cs" />\r
-    <Compile Include=".\Mono.Cairo\PSSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\RadialGradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\Rectangle.cs" />\r
-    <Compile Include=".\Mono.Cairo\Region.cs" />\r
-    <Compile Include=".\Mono.Cairo\ScaledFont.cs" />\r
-    <Compile Include=".\Mono.Cairo\SolidPattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\Status.cs" />\r
-    <Compile Include=".\Mono.Cairo\SubpixelOrder.cs" />\r
-    <Compile Include=".\Mono.Cairo\Surface.cs" />\r
-    <Compile Include=".\Mono.Cairo\SurfacePattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\SurfaceType.cs" />\r
-    <Compile Include=".\Mono.Cairo\SvgSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\SvgVersion.cs" />\r
-    <Compile Include=".\Mono.Cairo\TextExtents.cs" />\r
-    <Compile Include=".\Mono.Cairo\Win32Surface.cs" />\r
-    <Compile Include=".\Mono.Cairo\XcbSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\XlibSurface.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_2_0.csproj b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_2_0.csproj
deleted file mode 100644 (file)
index 955d459..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7230E9AE-C6D4-402A-91CF-C164148CDD21}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Cecil.Mdb-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cecil.Mdb</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;CECIL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;CECIL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D\r
-  </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{EB7444A6-C3E6-4224-BDB0-63CA3B4F2B87}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{79F25FD7-0D76-4526-AF39-1A648649A827}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil-net_2_0.csproj">\r
-      <Project>{2F1D61B7-0586-4587-8ECE-926A065F6276}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>
diff --git a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_0.csproj b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_0.csproj
deleted file mode 100644 (file)
index 11cabb5..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5F3D2BE6-A096-4504-AA3E-307B0A819E85}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Cecil.Mdb-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cecil.Mdb</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CECIL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CECIL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D\r
-  </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{8260E24F-1471-4320-AB5B-7CC7B68521E3}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil-net_4_0.csproj">\r
-      <Project>{1FA0877C-43C9-44C7-9682-0C3F826BEA3E}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>
diff --git a/mcs/class/Mono.Cecil/Mono.Cecil-net_2_0.csproj b/mcs/class/Mono.Cecil/Mono.Cecil-net_2_0.csproj
deleted file mode 100644 (file)
index b0331b6..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EED155FA-9877-4A62-889B-365D5DED03DB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cecil</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Code.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Document.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ExceptionHandler.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ILProcessor.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Instruction.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\MethodBody.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCode.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCodes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\SequencePoint.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Symbols.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\BlobHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Buffers.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\CodedIndex.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\ElementType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\GuidHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Heap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\MetadataToken.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Row.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\StringHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TableHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TokenType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\UserStringHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Utilities.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBuffer.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBufferEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\DataDirectory.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Image.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Section.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\TextMap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ArrayType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyFlags.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyHashAlgorithm.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyLinkedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyNameDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyNameReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\BaseAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\CallSite.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\CustomAttribute.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\DefaultAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EmbeddedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ExportedType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FileAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FunctionPointerType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericInstanceMethod.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericInstanceType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericParameter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericParameterAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IConstantProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ICustomAttributeProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IGenericInstance.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IGenericParameterProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMarshalInfoProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMemberDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMetadataScope.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMetadataTokenProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMethodSignature.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Import.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\LinkedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ManifestResourceAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MarshalInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MemberDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MemberReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MetadataResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MetadataSystem.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodCallingConvention.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodImplAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodReturnType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodSemanticsAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodSpecification.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Modifiers.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleKind.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\NativeType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PinnedType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PointerType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ReferenceType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Resource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\SecurityDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\SentinelType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TargetRuntime.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeParser.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSpecification.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSystem.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\VariantType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\Collection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\ReadOnlyCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoService.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Actions.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Empty.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Funcs.cs" />\r
-    <Compile Include="..\..\..\external\cecil\System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Cecil/Mono.Cecil-net_4_0.csproj b/mcs/class/Mono.Cecil/Mono.Cecil-net_4_0.csproj
deleted file mode 100644 (file)
index 7472652..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CFE79CC1-F050-42A8-BBB2-012A10DC095B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cecil</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Code.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Document.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ExceptionHandler.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ILProcessor.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Instruction.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\MethodBody.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCode.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCodes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\SequencePoint.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Symbols.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\BlobHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Buffers.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\CodedIndex.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\ElementType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\GuidHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Heap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\MetadataToken.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Row.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\StringHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TableHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TokenType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\UserStringHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Utilities.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBuffer.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBufferEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\DataDirectory.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Image.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Section.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\TextMap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ArrayType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyFlags.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyHashAlgorithm.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyLinkedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyNameDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyNameReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\BaseAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\CallSite.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\CustomAttribute.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\DefaultAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EmbeddedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ExportedType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FileAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FunctionPointerType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericInstanceMethod.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericInstanceType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericParameter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericParameterAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IConstantProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ICustomAttributeProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IGenericInstance.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IGenericParameterProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMarshalInfoProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMemberDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMetadataScope.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMetadataTokenProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMethodSignature.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Import.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\LinkedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ManifestResourceAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MarshalInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MemberDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MemberReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MetadataResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MetadataSystem.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodCallingConvention.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodImplAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodReturnType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodSemanticsAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodSpecification.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Modifiers.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleKind.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\NativeType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PinnedType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PointerType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ReferenceType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Resource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\SecurityDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\SentinelType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TargetRuntime.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeParser.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSpecification.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSystem.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\VariantType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\Collection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\ReadOnlyCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoService.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Actions.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Empty.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Funcs.cs" />\r
-    <Compile Include="..\..\..\external\cecil\System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_0.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_0.csproj
deleted file mode 100644 (file)
index 981026d..0000000
+++ /dev/null
@@ -1,456 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>true</NoStdLib>\r
-\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace></RootNamespace>\r
-    <AssemblyName>Mono.CodeContracts</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\AssemblyRef.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ConditionTextExtractor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ContractRequiresInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ContractsRuntime.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\Decompile.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ExprGen.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\MethodInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\PerformRewrite.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\Rewriter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\RewriterOptions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\RewriterResults.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\TransformContractsVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprAdd.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOpArithmetic.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOpComparison.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOp.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBox.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCall.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCompareEqual.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCompareGreaterThan.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCompareLessThan.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprConv.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\Expr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprLoadArg.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprLoadConstant.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprNop.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprReturn.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprSub.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\Sn.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\CompileVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\ExprVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\InstructionExtentVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\SourcePositionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\AnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicAnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicMethodDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\CodeContractsAnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IBasicAnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IBasicMethodDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodAnalysisFixPoint.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodResult.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\FullExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\IFullExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\QueryVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsBinaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsInst.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsNull.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsUnaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForSizeOf.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForUnderlyingVariable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForValueOf.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForVariable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForVariablesIn.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\BinaryExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\ConstExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\Expr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\IsInstExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\NullExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\SizeOfExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\UnaryExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\AnalysisDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\AssumeDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExprDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionAnalysisFacade.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionDecoderAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionPrinterFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ILDecoderAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ValueAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\AccessPathFilter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\IVisibilityCheck.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\MethodCallPathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\ParameterPathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElementBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement`1.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElementKind.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\AbstractDomainUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EdgeUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EliminateEdgeUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EqualityPair.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EqualityUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\IMergeInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\MergeInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\MultiEdge.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\MultiEdgeUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\SymGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\SymGraphTerm.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\Update.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\AbstractType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\AnalysisDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\Domain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\FunctionsTable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\HeapAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\IAbstractDomainForEGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\IConstantInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ISymGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\LabeledSymbol.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\MethodWrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ParameterWrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\StackToSymbolicAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymbolicValue.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymFunction.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymValue.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\TypeCache.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\Wrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\Analysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\NonNullDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\ExpressionAssertDischarger.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\ExpressionAssumeDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\NonNullAnalysisFacade.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AbstractInterpretationException.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysers.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericValueAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.ConstantEvaluator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericNumericalAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionEncoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedVariable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Counter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisInterval.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalAssumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstToIntervalEvaluator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalEnvironment.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\EvaluateExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ExpressionType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\GetThresholdVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IExpressionEncoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IIntervalEnvironment.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContextBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalEnvironment.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalInference.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalRationalAssumerBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalRationalContextBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeFalseVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeTrueVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumerBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\LongToIntegerConstantEvaluator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\EvaluateArithmeticWithOverflow.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ExpressionOperator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ExpressionViaStringComparer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstantEvaluatorVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\GenericExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\GenericTypeExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IEnvironmentDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Interval.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalEnvironmentBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Monomial.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ObjectExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Polynomial.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Rational.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeFalseVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeTrueVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\RationalThreshold.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Threshold.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\TresholdDB.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ValueExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\APCMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\SequenceGenerator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackDepthFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackDepthProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackInfo`1.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\CodeLayer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\CodeLayerFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\ICodeLayer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IExpressionContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IExpressionContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\ILPrinter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IMethodContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IMethodContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IStackContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IStackContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\PrinterFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\CodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\DefaultNodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IAggregateVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ICodeConsumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IExpressionILVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IILVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ILVisitorBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IMethodCodeConsumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISymbolicExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISyntheticILVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeInspector.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ValueCodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\ArrayTypeNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\AssemblyNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\AssignmentStatement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryOperator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Block.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BlockExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BodyParser.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Branch.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\CatchFilter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Class.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Construct.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\CoreSystemTypes.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\EndFinally.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Ensures.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\ExceptionHandler.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Expression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\ExpressionStatement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\FaultHandler.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Field.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Literal.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Local.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Member.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MemberBinding.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Method.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodCall.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContract.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContractElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Module.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\NaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Node.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\NodeType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\OperatorExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Parameter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Property.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Reference.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Requires.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Return.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Statement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\This.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\TypeNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryOperator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Variable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractExtractor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractNodes.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\GatherLocals.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\HelperMethods.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\RepresentationForAttribute.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\AssumeBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\BlockBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\BlockWithLabels.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\CatchFilterEntryBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\EnsuresBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\EntryBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\EntryExitBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\LabelAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\MethodCallBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\NewObjCallBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\BlockBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\BlockStartGatherer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\EnsuresFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\RequiresFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SimpleSubroutineBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SubroutineBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SubroutineFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SubroutineWithHandlersBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\EnsuresSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\FaultFinallySubroutineBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\FaultSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\FinallySubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\MethodContractSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\MethodSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\OldScanStateMachine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\OldValueSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\RequiresSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SimpleSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SubroutineBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SubroutineFacade.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SubroutineWithHandlers.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\APC.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\APCDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\CFGBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\ContractFilteredCFG.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\ControlFlowGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\Edge.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeTag.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeTagExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\ICFG.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IConstantInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IHandlerFilter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IMethodInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IStackInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\RemoveBranchDelegator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\Subroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\SubroutineKind.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\DataFlowAnalysisBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\EdgeBasedWidening.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\EdgeConverter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\ForwardAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\ForwardDataFlowAnalysisBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\IAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\IFixPointInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\IWidenStrategy.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\Joiner.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\StepWidening.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\BranchNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\EmptyNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\LeafNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\PatriciaTrieNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\AbstractWorkList.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\BooleanExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DecoratorHelper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DepthFirst.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DoubleDictionary.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DoubleImmutableMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Dummy.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\EdgeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\GraphWrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableIntMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableSet.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IIndexable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntKeyMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSet.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSetExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Indexable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IPropertyCollection.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IWorkList.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Sequence.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\SequenceExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Optional.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Pair.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\PriorityQueue.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\TypedKey.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\PropertyCollection.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\VisitStatus.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\WorkList.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Extensions\Extensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\AbstractDomainExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\EnvironmentDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\FlatDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\IAbstractDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\SetDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\CodeContractDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\CodeProviderImpl.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\ICodeProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IContractProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IILDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IMetaDataProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IMethodCodeProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\MetaDataProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\AssertionFinder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\BasicFacts.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\BoxedExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\BoxedExpressionExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\ComposedFactQuery.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\ConstantPropagationFactQuery.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\IFactBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\IFactQuery.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\SimpleLogicInference.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\CheckResults.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\CheckOptions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\Checker.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\DebugOptions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\ProofOutcome.cs" />    \r
-  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent></PreBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>mscorlib.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="System">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System</HintPath>\r
-    </Reference>\r
-    <Reference Include="System.Core">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Core</HintPath>\r
-    </Reference>\r
-    <Reference Include="Mono.Cecil.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>Mono.Cecil.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Mono.Cecil.Mdb.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>Mono.Cecil.Mdb.dll</HintPath>\r
-    </Reference>\r
-\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-\r
-</Project>\r
diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-tests-net_4_0.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts-tests-net_4_0.csproj
deleted file mode 100644 (file)
index a4c2559..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>.\</OutputPath>\r
-    <NoStdLib>true</NoStdLib>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace></RootNamespace>\r
-    <AssemblyName>Mono.CodeContracts_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-   <Compile Include="Test\RewriteAndLoad.cs" />
-   <Compile Include="Test\TestCCRewrite.cs" />
-\r
-  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent></PreBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-        <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_4_0/Mono.CodeContracts.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_0/Mono.CodeContracts.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  \r
-</Project>\r
-
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_2_0.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_2_0.csproj
deleted file mode 100644 (file)
index 981bb19..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D59758D7-08DC-4645-A96A-0EBE93F281A6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CompilerServices.SymbolWriter</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="MonoSymbolFile.cs" />\r
-    <Compile Include="MonoSymbolTable.cs" />\r
-    <Compile Include="MonoSymbolWriter.cs" />\r
-    <Compile Include="SourceMethodBuilder.cs" />\r
-    <Compile Include="SymbolWriterImpl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_0.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_0.csproj
deleted file mode 100644 (file)
index d38884f..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{918B2C1D-3B25-4076-9B44-F96B43AA923F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CompilerServices.SymbolWriter</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="MonoSymbolFile.cs" />\r
-    <Compile Include="MonoSymbolTable.cs" />\r
-    <Compile Include="MonoSymbolWriter.cs" />\r
-    <Compile Include="SourceMethodBuilder.cs" />\r
-    <Compile Include="SymbolWriterImpl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_2_0.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_2_0.csproj
deleted file mode 100644 (file)
index 789777a..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7B3F5668-ED1F-48EB-9897-E6BE6A1C8CB3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Sqlite</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\LINQ\SQLiteConnection_Linq.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\LINQ\SQLiteFactory_Linq.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\MonoPInvokeCallbackAttribute.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLite3.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLite3_UTF16.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteBase.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteCommand.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteCommandBuilder.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnection.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnectionPool.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnectionStringBuilder.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConvert.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataAdapter.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataReader.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SqliteDataSourceEnumerator.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteEnlistment.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteException.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFactory.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFunction.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFunctionAttribute.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteKeyReader.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteMetaDataCollectionNames.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteParameter.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteParameterCollection.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteStatement.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteTransaction.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SR.Designer.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\UnsafeNativeMethods.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SR.resources">\r
-      <LogicalName>SR.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteCommand.bmp">\r
-      <LogicalName>SQLiteCommand.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteConnection.bmp">\r
-      <LogicalName>SQLiteConnection.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteDataAdapter.bmp">\r
-      <LogicalName>SQLiteDataAdapter.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_0.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_0.csproj
deleted file mode 100644 (file)
index 69f9a4c..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{74084B98-6858-4133-998C-E594D367D8F1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Sqlite</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\LINQ\SQLiteConnection_Linq.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\LINQ\SQLiteFactory_Linq.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\MonoPInvokeCallbackAttribute.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLite3.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLite3_UTF16.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteBase.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteCommand.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteCommandBuilder.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnection.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnectionPool.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnectionStringBuilder.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConvert.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataAdapter.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataReader.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SqliteDataSourceEnumerator.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteEnlistment.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteException.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFactory.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFunction.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFunctionAttribute.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteKeyReader.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteMetaDataCollectionNames.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteParameter.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteParameterCollection.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteStatement.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteTransaction.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SR.Designer.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\UnsafeNativeMethods.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SR.resources">\r
-      <LogicalName>SR.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteCommand.bmp">\r
-      <LogicalName>SQLiteCommand.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteConnection.bmp">\r
-      <LogicalName>SQLiteConnection.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteDataAdapter.bmp">\r
-      <LogicalName>SQLiteDataAdapter.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_2_0.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 3c93773..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{082EFA10-D1AE-41EA-8CDD-7D881109D97A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Data.Sqlite-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Sqlite_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\SqliteCommandUnitTests.cs" />\r
-    <Compile Include="Test\SqliteConnectionTest.cs" />\r
-    <Compile Include="Test\SqliteDataAdapterUnitTests.cs" />\r
-    <Compile Include="Test\SqliteDataReaderTest.cs" />\r
-    <Compile Include="Test\SqliteExceptionUnitTests.cs" />\r
-    <Compile Include="Test\SqliteFunctionTests.cs" />\r
-    <Compile Include="Test\SqliteParameterUnitTests.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0.csproj">\r
-      <Project>{7B3F5668-ED1F-48EB-9897-E6BE6A1C8CB3}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SR.resources">\r
-      <LogicalName>SR.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteCommand.bmp">\r
-      <LogicalName>SQLiteCommand.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteConnection.bmp">\r
-      <LogicalName>SQLiteConnection.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteDataAdapter.bmp">\r
-      <LogicalName>SQLiteDataAdapter.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_4_0.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 8aba4f2..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{539D0731-5739-4568-917A-D689EBB043B4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Data.Sqlite-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Sqlite_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\SqliteCommandUnitTests.cs" />\r
-    <Compile Include="Test\SqliteConnectionTest.cs" />\r
-    <Compile Include="Test\SqliteDataAdapterUnitTests.cs" />\r
-    <Compile Include="Test\SqliteDataReaderTest.cs" />\r
-    <Compile Include="Test\SqliteExceptionUnitTests.cs" />\r
-    <Compile Include="Test\SqliteFunctionTests.cs" />\r
-    <Compile Include="Test\SqliteParameterUnitTests.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0.csproj">\r
-      <Project>{74084B98-6858-4133-998C-E594D367D8F1}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SR.resources">\r
-      <LogicalName>SR.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteCommand.bmp">\r
-      <LogicalName>SQLiteCommand.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteConnection.bmp">\r
-      <LogicalName>SQLiteConnection.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteDataAdapter.bmp">\r
-      <LogicalName>SQLiteDataAdapter.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_2_0.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_2_0.csproj
deleted file mode 100644 (file)
index b092598..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C21CB6AB-7059-4FA5-A23C-84EA0B854BB7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Tds</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds42.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds50.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds70.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds80.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsAsyncResult.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsAsyncState.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsBigDecimal.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsBulkCopy.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsCollation.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsColumnStatus.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsColumnType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsComm.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsConnectionParameters.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsConnectionPool.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataColumn.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataColumnCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataRow.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsEnvPacketSubType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalError.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorMessageEventArgs.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorMessageEventHandler.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalException.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalInfoMessageEventArgs.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalInfoMessageEventHandler.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsPacketSubType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsPacketType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsRpcProcId.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsTimeoutException.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsVersion.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsMetaParameter.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsMetaParameterCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsParameterDirection.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_0.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_0.csproj
deleted file mode 100644 (file)
index 85bb512..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6ECC0DBC-E614-4ABD-811F-0DE92E8314EA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Tds</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds42.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds50.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds70.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds80.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsAsyncResult.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsAsyncState.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsBigDecimal.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsBulkCopy.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsCollation.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsColumnStatus.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsColumnType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsComm.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsConnectionParameters.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsConnectionPool.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataColumn.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataColumnCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataRow.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsEnvPacketSubType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalError.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorMessageEventArgs.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorMessageEventHandler.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalException.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalInfoMessageEventArgs.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalInfoMessageEventHandler.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsPacketSubType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsPacketType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsRpcProcId.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsTimeoutException.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsVersion.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsMetaParameter.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsMetaParameterCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsParameterDirection.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_2_0.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_2_0.csproj
deleted file mode 100644 (file)
index afd72be..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B248ADC8-9309-4844-90C0-6377AC3467D4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Data.Tds-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Tds_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\bug-4786.cs" />\r
-    <Compile Include="Test\ConnLifetime.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_2_0.csproj">\r
-      <Project>{C21CB6AB-7059-4FA5-A23C-84EA0B854BB7}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Net.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Net.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_4_0.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_4_0.csproj
deleted file mode 100644 (file)
index eb3d797..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F1D7B09F-B70E-4B01-B74F-1E79F6D8F47E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Data.Tds-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Tds_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\bug-4786.cs" />\r
-    <Compile Include="Test\ConnLifetime.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_4_0.csproj">\r
-      <Project>{6ECC0DBC-E614-4ABD-811F-0DE92E8314EA}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Net\System.Net-net_2_0.csproj">\r
-      <Project>{ED90CD4E-E958-4E14-B0E4-425CFA3BF661}</Project>\r
-      <Name>System.Net\System.Net-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_2_0.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_2_0.csproj
deleted file mode 100644 (file)
index c53b28e..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{08AD7FD1-889B-4ADC-8AAA-05459828C75F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Debugger.Soft</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AbsentInformationException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainCreateEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainUnloadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ArrayMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyLoadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyLoadEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyUnloadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\BreakpointEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\BreakpointEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Connection.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeDataMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeNamedArgumentMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeTypedArgumentMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\DataConverter.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EnumMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Event.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventQueueImpl.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventSet.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventType.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ExceptionEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ExceptionEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\FieldInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\IInvokeAsyncResult.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILExceptionHandler.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILInstruction.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILInterpreter.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\IMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InterfaceMappingMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvalidStackFrameException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvocationException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvokeOptions.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ITargetProcess.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\LocalVariable.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Location.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodBodyMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodEntryEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodEntryEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodExitEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodExitEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Mirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ModuleMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ObjectCollectedException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ObjectMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ParameterInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PointerValue.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PrimitiveValue.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PropertyInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StackFrame.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StepEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StepEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StringMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StructMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\SuspendPolicy.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadDeathEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadStartEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeLoadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeLoadEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\UserBreakEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\UserLogEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Value.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDeathEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDisconnectedException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDisconnectEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMMismatchException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMStartEvent.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil-net_2_0.csproj">\r
-      <Project>{EED155FA-9877-4A62-889B-365D5DED03DB}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_0.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_0.csproj
deleted file mode 100644 (file)
index 20ac8ce..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{30117DA1-A570-4400-88B5-CBC0EF7CCC96}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Debugger.Soft</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AbsentInformationException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainCreateEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainUnloadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ArrayMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyLoadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyLoadEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyUnloadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\BreakpointEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\BreakpointEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Connection.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeDataMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeNamedArgumentMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeTypedArgumentMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\DataConverter.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EnumMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Event.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventQueueImpl.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventSet.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventType.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ExceptionEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ExceptionEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\FieldInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\IInvokeAsyncResult.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILExceptionHandler.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILInstruction.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILInterpreter.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\IMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InterfaceMappingMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvalidStackFrameException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvocationException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvokeOptions.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ITargetProcess.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\LocalVariable.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Location.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodBodyMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodEntryEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodEntryEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodExitEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodExitEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Mirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ModuleMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ObjectCollectedException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ObjectMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ParameterInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PointerValue.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PrimitiveValue.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PropertyInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StackFrame.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StepEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StepEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StringMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StructMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\SuspendPolicy.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadDeathEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadStartEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeLoadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeLoadEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\UserBreakEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\UserLogEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Value.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDeathEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDisconnectedException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDisconnectEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMMismatchException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMStartEvent.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil-net_4_0.csproj">\r
-      <Project>{CFE79CC1-F050-42A8-BBB2-012A10DC095B}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_2_0.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_2_0.csproj
deleted file mode 100644 (file)
index de8b73f..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3C5E6859-9346-4FE8-AD24-2D00753DEDE4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Debugger.Soft-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Debugger.Soft_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\dtest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Debugger.Soft\Mono.Debugger.Soft-net_2_0.csproj">\r
-      <Project>{08AD7FD1-889B-4ADC-8AAA-05459828C75F}</Project>\r
-      <Name>Mono.Debugger.Soft\Mono.Debugger.Soft-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil-net_2_0.csproj">\r
-      <Project>{EED155FA-9877-4A62-889B-365D5DED03DB}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_4_0.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 71cf512..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1B2FA57B-B4D8-4CF8-B291-02CAD401ECAD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Debugger.Soft-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Debugger.Soft_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\dtest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Debugger.Soft\Mono.Debugger.Soft-net_4_0.csproj">\r
-      <Project>{30117DA1-A570-4400-88B5-CBC0EF7CCC96}</Project>\r
-      <Name>Mono.Debugger.Soft\Mono.Debugger.Soft-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil-net_4_0.csproj">\r
-      <Project>{CFE79CC1-F050-42A8-BBB2-012A10DC095B}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index a54315f175e5f4fc2f49ffb2f070c027bcc2d4a1..753f3910f83d9bd9e76a67093f4f790dd87b986e 100644 (file)
@@ -417,7 +417,7 @@ namespace Mono.Debugger.Soft
                 * with newer runtimes, and vice versa.
                 */
                internal const int MAJOR_VERSION = 2;
-               internal const int MINOR_VERSION = 37;
+               internal const int MINOR_VERSION = 38;
 
                enum WPSuspendPolicy {
                        NONE = 0,
@@ -585,7 +585,8 @@ namespace Mono.Debugger.Soft
                enum CmdStackFrame {
                        GET_VALUES = 1,
                        GET_THIS = 2,
-                       SET_VALUES = 3
+                       SET_VALUES = 3,
+                       GET_DOMAIN = 4,
                }
 
                enum CmdArrayRef {
@@ -2378,6 +2379,10 @@ namespace Mono.Debugger.Soft
                        SendReceive (CommandSet.STACK_FRAME, (int)CmdStackFrame.SET_VALUES, new PacketWriter ().WriteId (thread_id).WriteId (id).WriteInt (len).WriteInts (pos).WriteValues (values));
                }
 
+               internal long StackFrame_GetDomain (long thread_id, long id) {
+                       return SendReceive (CommandSet.STACK_FRAME, (int)CmdStackFrame.GET_DOMAIN, new PacketWriter ().WriteId (thread_id).WriteId (id)).ReadId ();
+               }
+
                /*
                 * ARRAYS
                 */
index 7a6a34fa539c93bf6d58758def7f70f34bf88c50..8549a93700afaf54b7b1e67d4e40a93a842729f5 100644 (file)
@@ -7,6 +7,7 @@ namespace Mono.Debugger.Soft
        public class StackFrame : Mirror
        {
                ThreadMirror thread;
+               AppDomainMirror domain;
                MethodMirror method;
                int il_offset;
                Location location;
@@ -32,6 +33,16 @@ namespace Mono.Debugger.Soft
                        }
                }
 
+               public AppDomainMirror Domain {
+                       get {
+                               vm.CheckProtocolVersion (2, 38);
+                               if (domain == null)
+                                       domain = vm.GetDomain (vm.conn.StackFrame_GetDomain (thread.Id, Id));
+
+                               return domain;
+                       }
+               }
+
                public MethodMirror Method {
                        get {
                                return method;
index df4fbcc664872601920c32151eaa134ffafa9461..d7aaacd3383596d24cc0c4a8e385f717fcadaa6c 100644 (file)
@@ -2869,8 +2869,10 @@ public class DebuggerTests
 
                var frames = e.Thread.GetFrames ();
                Assert.AreEqual ("invoke_in_domain", frames [0].Method.Name);
+               Assert.AreEqual (domain, frames [0].Domain);
                Assert.AreEqual ("invoke", frames [1].Method.Name);
                Assert.AreEqual ("domains", frames [2].Method.Name);
+               Assert.AreEqual (vm.RootDomain, frames [2].Domain);
 
                // Test breakpoints on already JITted methods in other domains
                m = entry_point.DeclaringType.GetMethod ("invoke_in_domain_2");
diff --git a/mcs/class/Mono.Http/Mono.Http-net_2_0.csproj b/mcs/class/Mono.Http/Mono.Http-net_2_0.csproj
deleted file mode 100644 (file)
index 40fcb94..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7323A289-ABB8-4556-A9D5-8994223523B5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Http</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Http.Configuration\AcceptEncodingConfig.cs" />\r
-    <Compile Include="Mono.Http.Configuration\AcceptEncodingSectionHandler.cs" />\r
-    <Compile Include="Mono.Http.Modules\AcceptEncodingModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\AuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\BasicAuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\DigestAuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http\GZipWebRequest.cs" />\r
-    <Compile Include="Mono.Http\GZipWebRequestCreator.cs" />\r
-    <Compile Include="Mono.Http\GZipWebResponse.cs" />\r
-    <Compile Include="Mono.Http\GZipWriteFilter.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_2_0.csproj">\r
-      <Project>{9E123979-3457-435B-A081-8432EEBA134A}</Project>\r
-      <Name>ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Http/Mono.Http-net_4_0.csproj b/mcs/class/Mono.Http/Mono.Http-net_4_0.csproj
deleted file mode 100644 (file)
index 03e7cf7..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8058482B-59D1-43C3-BCD8-B9CD97F25AE3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Http</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Http.Configuration\AcceptEncodingConfig.cs" />\r
-    <Compile Include="Mono.Http.Configuration\AcceptEncodingSectionHandler.cs" />\r
-    <Compile Include="Mono.Http.Modules\AcceptEncodingModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\AuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\BasicAuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\DigestAuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http\GZipWebRequest.cs" />\r
-    <Compile Include="Mono.Http\GZipWebRequestCreator.cs" />\r
-    <Compile Include="Mono.Http\GZipWebResponse.cs" />\r
-    <Compile Include="Mono.Http\GZipWriteFilter.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_4_0.csproj">\r
-      <Project>{D7EC98B8-2158-4304-9E84-D19D50CE16E8}</Project>\r
-      <Name>ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Management/Mono.Management-net_2_0.csproj b/mcs/class/Mono.Management/Mono.Management-net_2_0.csproj
deleted file mode 100644 (file)
index f1c6fe2..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BF4F4B81-6779-40D0-85B9-2FD9ED8DFF63}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Management</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Attach\VirtualMachine.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Management/Mono.Management-net_4_0.csproj b/mcs/class/Mono.Management/Mono.Management-net_4_0.csproj
deleted file mode 100644 (file)
index 778873e..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EF47FFCA-F3A6-4D13-B821-A17A9CC00E5A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Management</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Attach\VirtualMachine.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_2_0.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_2_0.csproj
deleted file mode 100644 (file)
index 827b2eb..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D7F14FD3-CE00-4000-813C-9D34D42FE887}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging.RabbitMQ</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\IMessagingContext.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessageFactory.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContext.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContextPool.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageEnumerator.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueueTransaction.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessagingProvider.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_2_0.csproj">\r
-      <Project>{DB0FD42E-2BF8-4E67-B707-901AC35FCB9A}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_2_0.csproj">\r
-      <Project>{2220FC2B-F933-49D2-B1A4-A6241F486B88}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\RabbitMQ.Client\src\client\RabbitMQ.Client-net_2_0.csproj">\r
-      <Project>{962E924C-777A-42E1-B7AC-823BFA34D22C}</Project>\r
-      <Name>client\RabbitMQ.Client-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_0.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_0.csproj
deleted file mode 100644 (file)
index 4291457..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EC559825-D111-40A5-B815-D4F669A6564A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging.RabbitMQ</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\IMessagingContext.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessageFactory.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContext.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContextPool.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageEnumerator.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueueTransaction.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessagingProvider.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_0.csproj">\r
-      <Project>{5854BF27-FC35-44F5-BE59-580900694E32}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_0.csproj">\r
-      <Project>{DD379954-9A73-4B1D-B314-D8EF1D4C5EB7}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\RabbitMQ.Client\src\client\RabbitMQ.Client-net_4_0.csproj">\r
-      <Project>{E06EB369-D458-4373-ABA7-CE156714DE4F}</Project>\r
-      <Name>client\RabbitMQ.Client-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_2_0.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_2_0.csproj
deleted file mode 100644 (file)
index b90bc4f..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CC2D1BF7-1070-41B3-B316-85EA0B2E7E9E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Messaging.RabbitMQ-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging.RabbitMQ_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\BinaryMessageFormatterTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\FailuresTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageBaseTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageEnumeratorExceptionTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessagingContextPoolTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\RabbitMQMessagingProviderTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\TestUtils.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\XmlMessageFormatterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ-net_2_0.csproj">\r
-      <Project>{D7F14FD3-CE00-4000-813C-9D34D42FE887}</Project>\r
-      <Name>Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_2_0.csproj">\r
-      <Project>{DB0FD42E-2BF8-4E67-B707-901AC35FCB9A}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_2_0.csproj">\r
-      <Project>{2220FC2B-F933-49D2-B1A4-A6241F486B88}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\RabbitMQ.Client\src\client\RabbitMQ.Client-net_2_0.csproj">\r
-      <Project>{962E924C-777A-42E1-B7AC-823BFA34D22C}</Project>\r
-      <Name>client\RabbitMQ.Client-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_4_0.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 641cd79..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{69E3B31F-30F1-4C97-9C0B-EF791BF6D9A5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Messaging.RabbitMQ-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging.RabbitMQ_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\BinaryMessageFormatterTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\FailuresTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageBaseTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageEnumeratorExceptionTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessagingContextPoolTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\RabbitMQMessagingProviderTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\TestUtils.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\XmlMessageFormatterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ-net_4_0.csproj">\r
-      <Project>{EC559825-D111-40A5-B815-D4F669A6564A}</Project>\r
-      <Name>Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_0.csproj">\r
-      <Project>{5854BF27-FC35-44F5-BE59-580900694E32}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_0.csproj">\r
-      <Project>{DD379954-9A73-4B1D-B314-D8EF1D4C5EB7}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\RabbitMQ.Client\src\client\RabbitMQ.Client-net_4_0.csproj">\r
-      <Project>{E06EB369-D458-4373-ABA7-CE156714DE4F}</Project>\r
-      <Name>client\RabbitMQ.Client-net_4_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging/Mono.Messaging-net_2_0.csproj b/mcs/class/Mono.Messaging/Mono.Messaging-net_2_0.csproj
deleted file mode 100644 (file)
index b27257c..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2220FC2B-F933-49D2-B1A4-A6241F486B88}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Messaging\AcknowledgeTypes.cs" />\r
-    <Compile Include=".\Mono.Messaging\Acknowledgment.cs" />\r
-    <Compile Include=".\Mono.Messaging\CompletedEventArgs.cs" />\r
-    <Compile Include=".\Mono.Messaging\CompletedEventHandler.cs" />\r
-    <Compile Include=".\Mono.Messaging\ConcurrentLinkedQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging\ConnectionException.cs" />\r
-    <Compile Include=".\Mono.Messaging\CryptographicProviderType.cs" />\r
-    <Compile Include=".\Mono.Messaging\EncryptionAlgorithm.cs" />\r
-    <Compile Include=".\Mono.Messaging\EncryptionRequired.cs" />\r
-    <Compile Include=".\Mono.Messaging\HashAlgorithm.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessage.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageEnumerator.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageQueueTransaction.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessagingProvider.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageBase.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessagePriority.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueBase.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionStatus.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionType.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageType.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageUnavailableException.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessagingProviderLocator.cs" />\r
-    <Compile Include=".\Mono.Messaging\MonoMessagingException.cs" />\r
-    <Compile Include=".\Mono.Messaging\QueueReference.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging/Mono.Messaging-net_4_0.csproj b/mcs/class/Mono.Messaging/Mono.Messaging-net_4_0.csproj
deleted file mode 100644 (file)
index 9d4e0c1..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DD379954-9A73-4B1D-B314-D8EF1D4C5EB7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Messaging\AcknowledgeTypes.cs" />\r
-    <Compile Include=".\Mono.Messaging\Acknowledgment.cs" />\r
-    <Compile Include=".\Mono.Messaging\CompletedEventArgs.cs" />\r
-    <Compile Include=".\Mono.Messaging\CompletedEventHandler.cs" />\r
-    <Compile Include=".\Mono.Messaging\ConcurrentLinkedQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging\ConnectionException.cs" />\r
-    <Compile Include=".\Mono.Messaging\CryptographicProviderType.cs" />\r
-    <Compile Include=".\Mono.Messaging\EncryptionAlgorithm.cs" />\r
-    <Compile Include=".\Mono.Messaging\EncryptionRequired.cs" />\r
-    <Compile Include=".\Mono.Messaging\HashAlgorithm.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessage.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageEnumerator.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageQueueTransaction.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessagingProvider.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageBase.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessagePriority.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueBase.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionStatus.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionType.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageType.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageUnavailableException.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessagingProviderLocator.cs" />\r
-    <Compile Include=".\Mono.Messaging\MonoMessagingException.cs" />\r
-    <Compile Include=".\Mono.Messaging\QueueReference.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging/Mono.Messaging-tests-net_2_0.csproj b/mcs/class/Mono.Messaging/Mono.Messaging-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 80c2a9e..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{62E7C77F-D5EF-4761-8C20-571CC01C8202}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Messaging-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Messaging\ConcurrentLinkedQueueTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging\QueueReferenceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_2_0.csproj">\r
-      <Project>{2220FC2B-F933-49D2-B1A4-A6241F486B88}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Messaging.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Messaging.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Messaging/Mono.Messaging-tests-net_4_0.csproj b/mcs/class/Mono.Messaging/Mono.Messaging-tests-net_4_0.csproj
deleted file mode 100644 (file)
index f601663..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B7589A5F-C173-45C5-96CC-C82162D783CC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Messaging-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Messaging\ConcurrentLinkedQueueTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging\QueueReferenceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_0.csproj">\r
-      <Project>{DD379954-9A73-4B1D-B314-D8EF1D4C5EB7}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_2_0.csproj">\r
-      <Project>{DB0FD42E-2BF8-4E67-B707-901AC35FCB9A}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Options/Mono.Options-net_2_0.csproj b/mcs/class/Mono.Options/Mono.Options-net_2_0.csproj
deleted file mode 100644 (file)
index b1d9190..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{91B954C8-077B-49DD-BA35-AD8BAE7A79CD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Options</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Options\Options.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Options/Mono.Options-net_4_0.csproj b/mcs/class/Mono.Options/Mono.Options-net_4_0.csproj
deleted file mode 100644 (file)
index c168c2f..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E945A161-D20B-46FF-AC8D-6D1647A21197}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Options</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Options\Options.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Options/Mono.Options-tests-net_2_0.csproj b/mcs/class/Mono.Options/Mono.Options-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 4e7699d..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E1915F81-F06D-4A4F-AA38-BB1BA8200B91}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Options-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Options_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Options\BaseRocksFixture.cs" />\r
-    <Compile Include="Test\Mono.Options\CollectionContract.cs" />\r
-    <Compile Include="Test\Mono.Options\ListContract.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionContextTest.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionSetTest.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionTest.cs" />\r
-    <Compile Include="Test\Mono.Options\Utils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Options\Mono.Options-net_2_0.csproj">\r
-      <Project>{91B954C8-077B-49DD-BA35-AD8BAE7A79CD}</Project>\r
-      <Name>Mono.Options\Mono.Options-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Options/Mono.Options-tests-net_4_0.csproj b/mcs/class/Mono.Options/Mono.Options-tests-net_4_0.csproj
deleted file mode 100644 (file)
index bf70525..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6005A0F1-D347-4299-82C5-3197D07E3104}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Options-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Options_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Options\BaseRocksFixture.cs" />\r
-    <Compile Include="Test\Mono.Options\CollectionContract.cs" />\r
-    <Compile Include="Test\Mono.Options\ListContract.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionContextTest.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionSetTest.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionTest.cs" />\r
-    <Compile Include="Test\Mono.Options\Utils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Options\Mono.Options-net_4_0.csproj">\r
-      <Project>{E945A161-D20B-46FF-AC8D-6D1647A21197}</Project>\r
-      <Name>Mono.Options\Mono.Options-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_0.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_0.csproj
deleted file mode 100644 (file)
index ea5494f..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{56844AC8-547D-4C9D-A90A-5753ACA81619}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Parallel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_MONO_PARALLEL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_MONO_PARALLEL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\corlib\System.Collections.Concurrent\ConcurrentOrderedList.cs" />\r
-    <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />\r
-    <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />\r
-    <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />\r
-    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />\r
-    <Compile Include="Mono.Threading\CSnzi.cs" />\r
-    <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />\r
-    <Compile Include="Mono.Threading\Snzi.cs" />\r
-    <Compile Include="Mono.Threading\SpinLockWrapper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_0.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 28b7af7..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A6FB8E72-C8BD-427D-8096-9E04EB219611}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Parallel-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Parallel_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\Mono.Collections.Concurrent\ConcurrentSkipListTests.cs" />\r
-    <Compile Include="Test\Mono.Threading\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\Mono.Threading\SnziTests.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Parallel\Mono.Parallel-net_4_0.csproj">\r
-      <Project>{56844AC8-547D-4C9D-A90A-5753ACA81619}</Project>\r
-      <Name>Mono.Parallel\Mono.Parallel-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Posix/Mono.Posix-net_2_0.csproj b/mcs/class/Mono.Posix/Mono.Posix-net_2_0.csproj
deleted file mode 100644 (file)
index fb08807..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Posix</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Posix\Catalog.cs" />\r
-    <Compile Include=".\Mono.Posix\PeerCred.cs" />\r
-    <Compile Include=".\Mono.Posix\Syscall.cs" />\r
-    <Compile Include=".\Mono.Posix\UnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryCore.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixConnectionPool.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixMessageIO.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerTransportSink.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\CdeclFunction.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\FileNameMarshaler.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\MapAttribute.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.generated.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\RealTimeSignum.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\Stdlib.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\Syscall.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\TypeAttributes.cs" />\r
-    <Compile Include=".\Mono.Unix\AbstractUnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Unix\Catalog.cs" />\r
-    <Compile Include=".\Mono.Unix\FileAccessPattern.cs" />\r
-    <Compile Include=".\Mono.Unix\FileAccessPermissions.cs" />\r
-    <Compile Include=".\Mono.Unix\FileHandleOperations.cs" />\r
-    <Compile Include=".\Mono.Unix\FileSpecialAttributes.cs" />\r
-    <Compile Include=".\Mono.Unix\FileTypes.cs" />\r
-    <Compile Include=".\Mono.Unix\PeerCred.cs" />\r
-    <Compile Include=".\Mono.Unix\StdioFileStream.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixClient.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixDirectoryInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixDriveInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEncoding.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEnvironment.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixFileInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixFileSystemInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixGroupInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixIOException.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixListener.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixMarshal.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixPath.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixPipes.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixProcess.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixSignal.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixStream.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixSymbolicLinkInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixUserInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Posix/Mono.Posix-net_4_0.csproj b/mcs/class/Mono.Posix/Mono.Posix-net_4_0.csproj
deleted file mode 100644 (file)
index 73caab3..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Posix</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Posix\Catalog.cs" />\r
-    <Compile Include=".\Mono.Posix\PeerCred.cs" />\r
-    <Compile Include=".\Mono.Posix\Syscall.cs" />\r
-    <Compile Include=".\Mono.Posix\UnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryCore.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixConnectionPool.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixMessageIO.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerTransportSink.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\CdeclFunction.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\FileNameMarshaler.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\MapAttribute.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.generated.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\RealTimeSignum.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\Stdlib.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\Syscall.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\TypeAttributes.cs" />\r
-    <Compile Include=".\Mono.Unix\AbstractUnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Unix\Catalog.cs" />\r
-    <Compile Include=".\Mono.Unix\FileAccessPattern.cs" />\r
-    <Compile Include=".\Mono.Unix\FileAccessPermissions.cs" />\r
-    <Compile Include=".\Mono.Unix\FileHandleOperations.cs" />\r
-    <Compile Include=".\Mono.Unix\FileSpecialAttributes.cs" />\r
-    <Compile Include=".\Mono.Unix\FileTypes.cs" />\r
-    <Compile Include=".\Mono.Unix\PeerCred.cs" />\r
-    <Compile Include=".\Mono.Unix\StdioFileStream.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixClient.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixDirectoryInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixDriveInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEncoding.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEnvironment.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixFileInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixFileSystemInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixGroupInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixIOException.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixListener.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixMarshal.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixPath.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixPipes.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixProcess.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixSignal.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixStream.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixSymbolicLinkInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixUserInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Posix/Mono.Posix-tests-net_2_0.csproj b/mcs/class/Mono.Posix/Mono.Posix-tests-net_2_0.csproj
deleted file mode 100644 (file)
index ccbe2be..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CC6C32E1-55ED-469E-82B1-C60DA038FBE6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Posix-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Posix_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Unix.Native\RealTimeSignumTests.cs" />\r
-    <Compile Include="Test\Mono.Unix.Native\StdlibTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\ReadlinkTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\StdioFileStreamTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixEncodingTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixGroupTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixMarshalTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixPathTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixSignalTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixUserTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Posix/Mono.Posix-tests-net_4_0.csproj b/mcs/class/Mono.Posix/Mono.Posix-tests-net_4_0.csproj
deleted file mode 100644 (file)
index ea71a4c..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{89913586-15DA-4305-8E1F-58A0F350C865}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Posix-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Posix_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Unix.Native\RealTimeSignumTests.cs" />\r
-    <Compile Include="Test\Mono.Unix.Native\StdlibTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\ReadlinkTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\StdioFileStreamTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixEncodingTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixGroupTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixMarshalTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixPathTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixSignalTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixUserTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_2_0.csproj b/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_2_0.csproj
deleted file mode 100644 (file)
index 94ca7da..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5A61BC1B-CF0D-450F-A114-02A4C863B71F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security.Win32</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiContext.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiHash.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiRandomNumberGenerator.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CryptoAPI.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD2CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD4CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\RNGCryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\SHA1CryptoServiceProvider.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_0.csproj b/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_0.csproj
deleted file mode 100644 (file)
index e9a6f6b..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{54BD833F-C0CF-4192-9083-56F6CD3814DD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security.Win32</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiContext.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiHash.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiRandomNumberGenerator.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CryptoAPI.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD2CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD4CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\RNGCryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\SHA1CryptoServiceProvider.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Security/Mono.Security-net_2_0.csproj b/mcs/class/Mono.Security/Mono.Security-net_2_0.csproj
deleted file mode 100644 (file)
index 935f3dc..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{57CFE851-81AC-4269-B24A-965A53D87248}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />\r
-    <Compile Include=".\Mono.Math.Prime\ConfidenceFactor.cs" />\r
-    <Compile Include=".\Mono.Math.Prime\PrimalityTests.cs" />\r
-    <Compile Include=".\Mono.Math\BigInteger.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeBase.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeFormatter.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\PrivateKey.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\SoftwarePublisherCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\ARC4Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\CryptoTools.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DHKeyGeneration.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DHParameters.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellman.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellmanManaged.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\KeyPairPersistence.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD2Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD4Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\PKCS1.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\PKCS8.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\RC4.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\RSAManaged.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SHA224.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SHA224Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SymmetricTransform.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmAuthLevel.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\CertificatePoliciesExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\CRLDistributionPointsExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\ExtendedKeyUsageExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\GeneralNames.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\PrivateKeyUsagePeriodExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509\PKCS12.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X501Name.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Builder.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Certificate.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CertificateBuilder.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CertificateCollection.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Chain.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509ChainStatusFlags.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CRL.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Extension.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Extensions.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Store.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509StoreManager.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Stores.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X520Attributes.cs" />\r
-    <Compile Include=".\Mono.Security\ASN1.cs" />\r
-    <Compile Include=".\Mono.Security\ASN1Convert.cs" />\r
-    <Compile Include=".\Mono.Security\BitConverterLE.cs" />\r
-    <Compile Include=".\Mono.Security\PKCS7.cs" />\r
-    <Compile Include=".\Mono.Security\StrongName.cs" />\r
-    <Compile Include=".\Mono.Xml\MiniParser.cs" />\r
-    <Compile Include=".\Mono.Xml\SecurityParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Security/Mono.Security-net_4_0.csproj b/mcs/class/Mono.Security/Mono.Security-net_4_0.csproj
deleted file mode 100644 (file)
index 065c206..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />\r
-    <Compile Include=".\Mono.Math.Prime\ConfidenceFactor.cs" />\r
-    <Compile Include=".\Mono.Math.Prime\PrimalityTests.cs" />\r
-    <Compile Include=".\Mono.Math\BigInteger.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeBase.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeFormatter.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\PrivateKey.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\SoftwarePublisherCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\ARC4Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\CryptoTools.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DHKeyGeneration.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DHParameters.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellman.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellmanManaged.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\KeyPairPersistence.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD2Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD4Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\PKCS1.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\PKCS8.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\RC4.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\RSAManaged.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SHA224.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SHA224Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SymmetricTransform.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmAuthLevel.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\CertificatePoliciesExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\CRLDistributionPointsExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\ExtendedKeyUsageExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\GeneralNames.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\PrivateKeyUsagePeriodExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509\PKCS12.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X501Name.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Builder.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Certificate.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CertificateBuilder.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CertificateCollection.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Chain.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509ChainStatusFlags.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CRL.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Extension.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Extensions.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Store.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509StoreManager.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Stores.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X520Attributes.cs" />\r
-    <Compile Include=".\Mono.Security\ASN1.cs" />\r
-    <Compile Include=".\Mono.Security\ASN1Convert.cs" />\r
-    <Compile Include=".\Mono.Security\BitConverterLE.cs" />\r
-    <Compile Include=".\Mono.Security\PKCS7.cs" />\r
-    <Compile Include=".\Mono.Security\StrongName.cs" />\r
-    <Compile Include=".\Mono.Xml\MiniParser.cs" />\r
-    <Compile Include=".\Mono.Xml\SecurityParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Security/Mono.Security-tests-net_2_0.csproj b/mcs/class/Mono.Security/Mono.Security-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 3da8463..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1FE45C8C-1411-4C7E-BBF4-6C2F816239BE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Security-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Math\ArithmeticBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BigIntegerSetTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BigIntegerTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BitwiseTest.cs" />\r
-    <Compile Include="Test\Mono.Math\GcdBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\ModInverseBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\ModRingTest.cs" />\r
-    <Compile Include="Test\Mono.Math\PrimeGenerationTest.cs" />\r
-    <Compile Include="Test\Mono.Math\PrimeTestingTest.cs" />\r
-    <Compile Include="Test\Mono.Math\SearchGeneratorTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\AuthenticodeDeformatterTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\PrivateKeyTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\SoftwarePublisherCertificateTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\ARC4ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\CryptoConvertTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\DiffieHellmanManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\KeyPairPersistenceTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD2ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD2Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD4ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD4Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\PKCS1Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\PKCS8Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\RSAManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\SHA224ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\SHA224Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\ChallengeResponseTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\MessageBaseTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type1MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type2MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type3MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\BasicConstraintsExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\ExtendedKeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\KeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectAltNameExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\PKCS12Test.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X501NameTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X509CertificateTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X509CrlTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X520AttributesTest.cs" />\r
-    <Compile Include="Test\Mono.Security\ASN1ConvertTest.cs" />\r
-    <Compile Include="Test\Mono.Security\PKCS7Test.cs" />\r
-    <Compile Include="Test\Mono.Security\StrongNameTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Security/Mono.Security-tests-net_4_0.csproj b/mcs/class/Mono.Security/Mono.Security-tests-net_4_0.csproj
deleted file mode 100644 (file)
index fa6828b..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A6B7ED7F-8A76-4D58-9345-14A9B74C91E8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Security-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Math\ArithmeticBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BigIntegerSetTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BigIntegerTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BitwiseTest.cs" />\r
-    <Compile Include="Test\Mono.Math\GcdBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\ModInverseBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\ModRingTest.cs" />\r
-    <Compile Include="Test\Mono.Math\PrimeGenerationTest.cs" />\r
-    <Compile Include="Test\Mono.Math\PrimeTestingTest.cs" />\r
-    <Compile Include="Test\Mono.Math\SearchGeneratorTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\AuthenticodeDeformatterTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\PrivateKeyTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\SoftwarePublisherCertificateTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\ARC4ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\CryptoConvertTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\DiffieHellmanManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\KeyPairPersistenceTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD2ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD2Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD4ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD4Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\PKCS1Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\PKCS8Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\RSAManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\SHA224ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\SHA224Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\ChallengeResponseTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\MessageBaseTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type1MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type2MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type3MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\BasicConstraintsExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\ExtendedKeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\KeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectAltNameExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\PKCS12Test.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X501NameTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X509CertificateTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X509CrlTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X520AttributesTest.cs" />\r
-    <Compile Include="Test\Mono.Security\ASN1ConvertTest.cs" />\r
-    <Compile Include="Test\Mono.Security\PKCS7Test.cs" />\r
-    <Compile Include="Test\Mono.Security\StrongNameTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 3341fdabacd53672119bc4e5c79f5a5a48a6eae4..04dc927a0f3ea1f620bf9aba4b6adb8c76e9bfa5 100644 (file)
@@ -10,7 +10,7 @@ NO_TEST = yes
 
 
 # This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-Mono.Simd.dll
 NO_INSTALL = yes
diff --git a/mcs/class/Mono.Simd/Mono.Simd-net_2_0.csproj b/mcs/class/Mono.Simd/Mono.Simd-net_2_0.csproj
deleted file mode 100644 (file)
index 87ddb67..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2DE3C48F-6194-476B-99D9-B990C261EFF8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Simd</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />\r
-    <Compile Include="Mono.Simd\AccelMode.cs" />\r
-    <Compile Include="Mono.Simd\ArrayExtensions.cs" />\r
-    <Compile Include="Mono.Simd\SimdRuntime.cs" />\r
-    <Compile Include="Mono.Simd\Vector16b.cs" />\r
-    <Compile Include="Mono.Simd\Vector16sb.cs" />\r
-    <Compile Include="Mono.Simd\Vector2d.cs" />\r
-    <Compile Include="Mono.Simd\Vector2l.cs" />\r
-    <Compile Include="Mono.Simd\Vector2ul.cs" />\r
-    <Compile Include="Mono.Simd\Vector4f.cs" />\r
-    <Compile Include="Mono.Simd\Vector4i.cs" />\r
-    <Compile Include="Mono.Simd\Vector4ui.cs" />\r
-    <Compile Include="Mono.Simd\Vector8s.cs" />\r
-    <Compile Include="Mono.Simd\Vector8us.cs" />\r
-    <Compile Include="Mono.Simd\VectorOperations.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Simd/Mono.Simd-net_4_0.csproj b/mcs/class/Mono.Simd/Mono.Simd-net_4_0.csproj
deleted file mode 100644 (file)
index 8ea6fe7..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CEECA2D3-21F6-4A61-85B4-FA78AF6499E0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Simd</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />\r
-    <Compile Include="Mono.Simd\AccelMode.cs" />\r
-    <Compile Include="Mono.Simd\ArrayExtensions.cs" />\r
-    <Compile Include="Mono.Simd\SimdRuntime.cs" />\r
-    <Compile Include="Mono.Simd\Vector16b.cs" />\r
-    <Compile Include="Mono.Simd\Vector16sb.cs" />\r
-    <Compile Include="Mono.Simd\Vector2d.cs" />\r
-    <Compile Include="Mono.Simd\Vector2l.cs" />\r
-    <Compile Include="Mono.Simd\Vector2ul.cs" />\r
-    <Compile Include="Mono.Simd\Vector4f.cs" />\r
-    <Compile Include="Mono.Simd\Vector4i.cs" />\r
-    <Compile Include="Mono.Simd\Vector4ui.cs" />\r
-    <Compile Include="Mono.Simd\Vector8s.cs" />\r
-    <Compile Include="Mono.Simd\Vector8us.cs" />\r
-    <Compile Include="Mono.Simd\VectorOperations.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_2_0.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets-net_2_0.csproj
deleted file mode 100644 (file)
index c9c1560..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D329F40E-D458-4164-BAA4-196644F8E73C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Tasklets</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Tasklets\Continuation.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_0.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_0.csproj
deleted file mode 100644 (file)
index 6509a44..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6E14C0A3-9119-4C8A-94D9-3C49FA255841}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Tasklets</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Tasklets\Continuation.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_2_0.csproj b/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_2_0.csproj
deleted file mode 100644 (file)
index 2611d1a..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F46C8C89-6CD0-432D-8BEF-C962DB694CDB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.WebBrowser</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Mozilla\AsciiString.cs" />\r
-    <Compile Include="Mono.Mozilla\Base.cs" />\r
-    <Compile Include="Mono.Mozilla\Callback.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Attribute.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\AttributeCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\ContentListener.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Document.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DocumentEncoder.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DocumentType.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DOMImplementation.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DOMObject.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Element.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\EventListener.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\History.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\HTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\HTMLElementCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\NamedNodeMap.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Navigation.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Node.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\NodeList.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Stream.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Stylesheet.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\StylesheetList.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Window.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\WindowCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\DocumentEncoderFlags.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\NodeType.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsIReadSegmentFun.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsITimerCallbackDelegate.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsIWriteSegmentFun.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\Options.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibilityService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessible.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRelation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRetrieval.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessNode.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIArray.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsICancelable.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIChannel.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIClassInfo.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocCharset.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoder.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoderNodeFixup.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMAbstractView.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMAttr.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMBarProp.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCDATASection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCharacterData.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMComment.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCounter.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSPrimitiveValue.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRule.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRuleList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleDeclaration.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleSheet.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSValue.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentFragment.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentStyle.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentType.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentView.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMImplementation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMStringList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEntityReference.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEventListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEventTarget.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLBodyElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLStyleElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMKeyEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMMediaList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMMouseEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNamedNodeMap.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNode.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNodeList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSHTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMProcessingInstruction.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRect.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRGBColor.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheet.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheetList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMText.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMUIEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMViewCSS.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindow.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindowCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIErrorService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIFile.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIHistoryEntry.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIInputStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIInterfaceRequestor.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIIOService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsILoadGroup.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIObserver.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIOutputStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPersistentProperties.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPrefBranch.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPrefService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIProperties.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIProtocolHandler.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIRequest.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIRequestObserver.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISelection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIServiceManager.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISHistory.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISHistoryListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISimpleEnumerator.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIStreamListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsITimer.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsITimerCallback.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIURI.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIURIContentListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWeakReference.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowser.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChrome.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChromeFocus.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserFocus.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserPersist.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebNavigation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebProgress.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebProgressListener.cs" />\r
-    <Compile Include="Mono.Mozilla\UniString.cs" />\r
-    <Compile Include="Mono.Mozilla\WebBrowser.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\EventArgs.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\EventHandlers.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IAttribute.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IAttributeCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDocument.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDocumentType.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDOMImplementation.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IElement.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IElementCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IHistory.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IMediaList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INamedNodeMap.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INavigation.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INode.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INodeList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IStylesheet.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IStylesheetList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IWindow.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IWindowCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\Exception.cs" />\r
-    <Compile Include="Mono.WebBrowser\IWebBrowser.cs" />\r
-    <Compile Include="Mono.WebBrowser\Manager.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_0.csproj b/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_0.csproj
deleted file mode 100644 (file)
index c26839a..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7CF0E3C1-B971-4B78-8145-976EF6F5287B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.WebBrowser</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Mozilla\AsciiString.cs" />\r
-    <Compile Include="Mono.Mozilla\Base.cs" />\r
-    <Compile Include="Mono.Mozilla\Callback.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Attribute.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\AttributeCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\ContentListener.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Document.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DocumentEncoder.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DocumentType.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DOMImplementation.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DOMObject.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Element.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\EventListener.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\History.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\HTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\HTMLElementCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\NamedNodeMap.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Navigation.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Node.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\NodeList.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Stream.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Stylesheet.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\StylesheetList.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Window.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\WindowCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\DocumentEncoderFlags.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\NodeType.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsIReadSegmentFun.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsITimerCallbackDelegate.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsIWriteSegmentFun.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\Options.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibilityService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessible.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRelation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRetrieval.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessNode.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIArray.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsICancelable.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIChannel.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIClassInfo.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocCharset.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoder.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoderNodeFixup.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMAbstractView.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMAttr.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMBarProp.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCDATASection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCharacterData.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMComment.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCounter.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSPrimitiveValue.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRule.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRuleList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleDeclaration.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleSheet.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSValue.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentFragment.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentStyle.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentType.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentView.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMImplementation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMStringList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEntityReference.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEventListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEventTarget.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLBodyElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLStyleElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMKeyEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMMediaList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMMouseEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNamedNodeMap.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNode.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNodeList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSHTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMProcessingInstruction.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRect.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRGBColor.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheet.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheetList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMText.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMUIEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMViewCSS.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindow.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindowCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIErrorService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIFile.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIHistoryEntry.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIInputStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIInterfaceRequestor.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIIOService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsILoadGroup.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIObserver.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIOutputStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPersistentProperties.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPrefBranch.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPrefService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIProperties.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIProtocolHandler.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIRequest.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIRequestObserver.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISelection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIServiceManager.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISHistory.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISHistoryListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISimpleEnumerator.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIStreamListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsITimer.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsITimerCallback.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIURI.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIURIContentListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWeakReference.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowser.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChrome.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChromeFocus.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserFocus.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserPersist.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebNavigation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebProgress.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebProgressListener.cs" />\r
-    <Compile Include="Mono.Mozilla\UniString.cs" />\r
-    <Compile Include="Mono.Mozilla\WebBrowser.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\EventArgs.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\EventHandlers.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IAttribute.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IAttributeCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDocument.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDocumentType.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDOMImplementation.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IElement.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IElementCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IHistory.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IMediaList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INamedNodeMap.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INavigation.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INode.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INodeList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IStylesheet.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IStylesheetList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IWindow.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IWindowCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\Exception.cs" />\r
-    <Compile Include="Mono.WebBrowser\IWebBrowser.cs" />\r
-    <Compile Include="Mono.WebBrowser\Manager.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_2_0.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_2_0.csproj
deleted file mode 100644 (file)
index 5678ab0..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8C54606D-305D-45B0-9932-380FE021BEFE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.XBuild.Tasks</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks\LibraryPcFileCache.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks\PcFileCache.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_0.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_0.csproj
deleted file mode 100644 (file)
index 240d897..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B8993C2D-04FD-4738-91ED-060E29A5FBD4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.XBuild.Tasks</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks\LibraryPcFileCache.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks\PcFileCache.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_2_0.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 91af433..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FBD61913-57C0-46E2-98D6-230F1953E28F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.XBuild.Tasks-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.XBuild.Tasks_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.XBuild.Tasks\PcFileCacheTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_2_0.csproj">\r
-      <Project>{8C54606D-305D-45B0-9932-380FE021BEFE}</Project>\r
-      <Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_4_0.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 0e005df..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0C851F1F-CF06-4440-8E69-F33FBF07D605}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.XBuild.Tasks-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <AssemblyName>Mono.XBuild.Tasks_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.XBuild.Tasks\PcFileCacheTest.cs" />\r
-  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib">\r
-      <HintPath>..\lib\net_4_0\mscorlib.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="System.Core">\r
-      <HintPath>..\lib\net_4_0\System.Core.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="nunit.framework">\r
-      <HintPath>..\lib\net_4_0\nunit.framework.dll</HintPath>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="Mono.XBuild.Tasks-net_4_0.csproj">\r
-      <Project>{F7F03F9B-6E7A-43BD-993A-7F197A440150}</Project>\r
-      <Name>Mono.XBuild.Tasks-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-</Project>\r
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_2_0.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_2_0.csproj
deleted file mode 100644 (file)
index c806cfc..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{30C57C43-3A84-4E9F-A889-53CAE3C634C4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Novell.Directory.Ldap</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Boolean.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Choice.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Decoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Encoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Enumerated.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Identifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Integer.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Length.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Null.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Numeric.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Object.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1OctetString.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Sequence.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1SequenceOf.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Set.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1SetOf.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Structured.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Tagged.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\LBERDecoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\LBEREncoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapEntryChangeControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapPersistSearchControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortKey.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapVirtualListControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapVirtualListResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\BaseEdirEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\BinderyObjectEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ChangeAddressEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ConnectionStateEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugParameter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DSETimeStamp.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\EntryEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\GeneralDSEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ModuleStateEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\NetworkAddressEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ReferralAddress.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\SecurityEquivalenceEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ValueEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventSpecifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\MonitorEventRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\MonitorEventResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\BaseEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\DirectoryEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\DirectoryExceptionEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\PSearchEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\SearchReferralEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\SearchResultEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\AbortPartitionOperationRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\AddReplicaRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\BackupRestoreConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ChangeReplicaTypeRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetBindDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetBindDNResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetEffectivePrivilegesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetEffectivePrivilegesResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicaInfoRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicaInfoResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicationFilterRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicationFilterResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapBackupRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapBackupResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapRestoreRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ListReplicasRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ListReplicasResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\MergePartitionsRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\NamingContextConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionEntryCountRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionEntryCountResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionSyncRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ReceiveAllUpdatesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RefreshLdapServerRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RemoveOrphanPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RemoveReplicaRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ReplicationConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SchemaSyncRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SendAllUpdatesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SetReplicationFilterRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SplitOrphanPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SplitPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\TriggerBackgroundProcessRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAbandonRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAddRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAddResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAssertionValue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeDescription.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeDescriptionList.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeList.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeTypeAndValues.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeValue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeValueAssertion.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAuthenticationChoice.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcBindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcBindResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcCompareRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcCompareResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcControls.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcDelRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcDelResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcExtendedRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcExtendedResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcFilter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapMessage.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapOID.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapResult.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapString.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapSuperDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMatchingRuleAssertion.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMatchingRuleId.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMessageID.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyDNResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcReferral.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcRelativeLdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSaslCredentials.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultDone.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultEntry.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultReference.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSubstringFilter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcUnbindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ArrayEnumeration.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\AttributeQualifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\Base64.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\BindProperties.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\CharacterTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\DN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\EnumeratedIterator.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ExceptionMessages.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ExtResponseFactory.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\IntermediateResponseFactory.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ReferralInfo.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ResourcesHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RespControlVector.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RespExtensionSet.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ResultCodeMessages.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\SchemaParser.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\SchemaTokenCreator.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\TokenTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\AssemblyInfo.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\AuthenticationTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\Connection.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\InterThreadException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAbandonRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAddRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttribute.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttributeSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttributeSet.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAuthHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAuthProvider.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapBindHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapBindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapCompareAttrNames.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapCompareRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapConnection.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapConstraints.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDeleteRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDITContentRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDITStructureRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDSConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapEntry.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedOperation.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapLocalException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMatchingRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMatchingRuleUseSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMessage.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMessageQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModification.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModifyDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModifyRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapNameFormSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapObjectClassSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapReferralException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapReferralHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapResponseQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSchemaElement.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchConstraints.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResult.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResultReference.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResults.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSyntaxSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUnbindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUnsolicitedNotificationListener.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUrl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\Message.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\MessageAgent.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\MessageVector.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\SupportClass.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources">\r
-      <LogicalName>ResultCodeMessages.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_0.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_0.csproj
deleted file mode 100644 (file)
index 20f659f..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D6DA2E60-D81F-42EC-991E-ED2FFBD5094D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Novell.Directory.Ldap</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Boolean.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Choice.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Decoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Encoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Enumerated.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Identifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Integer.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Length.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Null.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Numeric.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Object.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1OctetString.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Sequence.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1SequenceOf.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Set.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1SetOf.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Structured.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Tagged.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\LBERDecoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\LBEREncoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapEntryChangeControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapPersistSearchControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortKey.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapVirtualListControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapVirtualListResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\BaseEdirEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\BinderyObjectEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ChangeAddressEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ConnectionStateEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugParameter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DSETimeStamp.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\EntryEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\GeneralDSEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ModuleStateEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\NetworkAddressEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ReferralAddress.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\SecurityEquivalenceEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ValueEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventSpecifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\MonitorEventRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\MonitorEventResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\BaseEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\DirectoryEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\DirectoryExceptionEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\PSearchEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\SearchReferralEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\SearchResultEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\AbortPartitionOperationRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\AddReplicaRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\BackupRestoreConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ChangeReplicaTypeRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetBindDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetBindDNResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetEffectivePrivilegesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetEffectivePrivilegesResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicaInfoRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicaInfoResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicationFilterRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicationFilterResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapBackupRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapBackupResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapRestoreRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ListReplicasRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ListReplicasResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\MergePartitionsRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\NamingContextConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionEntryCountRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionEntryCountResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionSyncRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ReceiveAllUpdatesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RefreshLdapServerRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RemoveOrphanPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RemoveReplicaRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ReplicationConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SchemaSyncRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SendAllUpdatesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SetReplicationFilterRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SplitOrphanPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SplitPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\TriggerBackgroundProcessRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAbandonRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAddRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAddResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAssertionValue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeDescription.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeDescriptionList.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeList.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeTypeAndValues.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeValue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeValueAssertion.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAuthenticationChoice.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcBindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcBindResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcCompareRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcCompareResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcControls.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcDelRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcDelResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcExtendedRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcExtendedResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcFilter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapMessage.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapOID.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapResult.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapString.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapSuperDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMatchingRuleAssertion.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMatchingRuleId.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMessageID.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyDNResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcReferral.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcRelativeLdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSaslCredentials.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultDone.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultEntry.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultReference.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSubstringFilter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcUnbindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ArrayEnumeration.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\AttributeQualifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\Base64.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\BindProperties.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\CharacterTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\DN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\EnumeratedIterator.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ExceptionMessages.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ExtResponseFactory.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\IntermediateResponseFactory.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ReferralInfo.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ResourcesHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RespControlVector.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RespExtensionSet.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ResultCodeMessages.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\SchemaParser.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\SchemaTokenCreator.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\TokenTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\AssemblyInfo.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\AuthenticationTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\Connection.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\InterThreadException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAbandonRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAddRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttribute.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttributeSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttributeSet.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAuthHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAuthProvider.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapBindHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapBindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapCompareAttrNames.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapCompareRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapConnection.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapConstraints.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDeleteRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDITContentRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDITStructureRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDSConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapEntry.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedOperation.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapLocalException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMatchingRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMatchingRuleUseSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMessage.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMessageQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModification.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModifyDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModifyRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapNameFormSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapObjectClassSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapReferralException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapReferralHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapResponseQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSchemaElement.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchConstraints.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResult.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResultReference.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResults.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSyntaxSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUnbindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUnsolicitedNotificationListener.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUrl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\Message.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\MessageAgent.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\MessageVector.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\SupportClass.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources">\r
-      <LogicalName>ResultCodeMessages.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_2_0.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 5cccc52..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C0155A06-C828-42B0-96FC-A2F306B4CBD4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Novell.Directory.Ldap-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Novell.Directory.Ldap_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\bug-436775_Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_2_0.csproj">\r
-      <Project>{30C57C43-3A84-4E9F-A889-53CAE3C634C4}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_4_0.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 51d82c4..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D61C0DEC-AF59-44ED-BECE-DB9EAB391962}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Novell.Directory.Ldap-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Novell.Directory.Ldap_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\bug-436775_Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_0.csproj">\r
-      <Project>{D6DA2E60-D81F-42EC-991E-ED2FFBD5094D}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Npgsql/Npgsql-net_2_0.csproj b/mcs/class/Npgsql/Npgsql-net_2_0.csproj
deleted file mode 100644 (file)
index 8316277..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{13268A15-2B77-416C-B815-B0AF1848580E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Npgsql</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Npgsql\AssemblyInfo.cs" />\r
-    <Compile Include="Npgsql\HashAlgorithm.cs" />\r
-    <Compile Include="Npgsql\MD5.cs" />\r
-    <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />\r
-    <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />\r
-    <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />\r
-    <Compile Include="Npgsql\NpgsqlBind.cs" />\r
-    <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />\r
-    <Compile Include="Npgsql\NpgsqlClosedState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlCommand.cs" />\r
-    <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectedState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnection.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectionString.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnector.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />\r
-    <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />\r
-    <Compile Include="Npgsql\NpgsqlDataReader.cs" />\r
-    <Compile Include="Npgsql\NpgsqlDescribe.cs" />\r
-    <Compile Include="Npgsql\NpgsqlError.cs" />\r
-    <Compile Include="Npgsql\NpgsqlEventLog.cs" />\r
-    <Compile Include="Npgsql\NpgsqlException.cs" />\r
-    <Compile Include="Npgsql\NpgsqlExecute.cs" />\r
-    <Compile Include="Npgsql\NpgsqlFactory.cs" />\r
-    <Compile Include="Npgsql\NpgsqlFlush.cs" />\r
-    <Compile Include="Npgsql\NpgsqlMediator.cs" />\r
-    <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />\r
-    <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParameter.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParse.cs" />\r
-    <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />\r
-    <Compile Include="Npgsql\NpgsqlQuery.cs" />\r
-    <Compile Include="Npgsql\NpgsqlReadyState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlResultSet.cs" />\r
-    <Compile Include="Npgsql\NpgsqlRow.cs" />\r
-    <Compile Include="Npgsql\NpgsqlRowDescription.cs" />\r
-    <Compile Include="Npgsql\NpgsqlSchema.cs" />\r
-    <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />\r
-    <Compile Include="Npgsql\NpgsqlStartupState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlSync.cs" />\r
-    <Compile Include="Npgsql\NpgsqlTransaction.cs" />\r
-    <Compile Include="Npgsql\PGUtil.cs" />\r
-    <Compile Include="NpgsqlTypes\FastPath.cs" />\r
-    <Compile Include="NpgsqlTypes\FastPathArg.cs" />\r
-    <Compile Include="NpgsqlTypes\LargeObject.cs" />\r
-    <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">\r
-      <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">\r
-      <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">\r
-      <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">\r
-      <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">\r
-      <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">\r
-      <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">\r
-      <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">\r
-      <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">\r
-      <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">\r
-      <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">\r
-      <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">\r
-      <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/PGUtil.resources">\r
-      <LogicalName>Npgsql.PGUtil.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">\r
-      <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">\r
-      <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Npgsql/Npgsql-net_4_0.csproj b/mcs/class/Npgsql/Npgsql-net_4_0.csproj
deleted file mode 100644 (file)
index 3ea1cea..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{65DBA42E-7B72-4718-9DC5-468A2EEEE55E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Npgsql</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Npgsql\AssemblyInfo.cs" />\r
-    <Compile Include="Npgsql\HashAlgorithm.cs" />\r
-    <Compile Include="Npgsql\MD5.cs" />\r
-    <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />\r
-    <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />\r
-    <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />\r
-    <Compile Include="Npgsql\NpgsqlBind.cs" />\r
-    <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />\r
-    <Compile Include="Npgsql\NpgsqlClosedState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlCommand.cs" />\r
-    <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectedState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnection.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectionString.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnector.cs" />\r
-    <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />\r
-    <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />\r
-    <Compile Include="Npgsql\NpgsqlDataReader.cs" />\r
-    <Compile Include="Npgsql\NpgsqlDescribe.cs" />\r
-    <Compile Include="Npgsql\NpgsqlError.cs" />\r
-    <Compile Include="Npgsql\NpgsqlEventLog.cs" />\r
-    <Compile Include="Npgsql\NpgsqlException.cs" />\r
-    <Compile Include="Npgsql\NpgsqlExecute.cs" />\r
-    <Compile Include="Npgsql\NpgsqlFactory.cs" />\r
-    <Compile Include="Npgsql\NpgsqlFlush.cs" />\r
-    <Compile Include="Npgsql\NpgsqlMediator.cs" />\r
-    <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />\r
-    <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParameter.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />\r
-    <Compile Include="Npgsql\NpgsqlParse.cs" />\r
-    <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />\r
-    <Compile Include="Npgsql\NpgsqlQuery.cs" />\r
-    <Compile Include="Npgsql\NpgsqlReadyState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlResultSet.cs" />\r
-    <Compile Include="Npgsql\NpgsqlRow.cs" />\r
-    <Compile Include="Npgsql\NpgsqlRowDescription.cs" />\r
-    <Compile Include="Npgsql\NpgsqlSchema.cs" />\r
-    <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />\r
-    <Compile Include="Npgsql\NpgsqlStartupState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlState.cs" />\r
-    <Compile Include="Npgsql\NpgsqlSync.cs" />\r
-    <Compile Include="Npgsql\NpgsqlTransaction.cs" />\r
-    <Compile Include="Npgsql\PGUtil.cs" />\r
-    <Compile Include="NpgsqlTypes\FastPath.cs" />\r
-    <Compile Include="NpgsqlTypes\FastPathArg.cs" />\r
-    <Compile Include="NpgsqlTypes\LargeObject.cs" />\r
-    <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />\r
-    <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">\r
-      <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">\r
-      <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">\r
-      <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">\r
-      <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">\r
-      <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">\r
-      <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">\r
-      <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">\r
-      <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">\r
-      <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">\r
-      <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">\r
-      <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">\r
-      <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/PGUtil.resources">\r
-      <LogicalName>Npgsql.PGUtil.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">\r
-      <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">\r
-      <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Npgsql/Npgsql-tests-net_2_0.csproj b/mcs/class/Npgsql/Npgsql-tests-net_2_0.csproj
deleted file mode 100644 (file)
index fbb242e..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2B752480-031B-4781-91D0-0250D4B9F372}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Npgsql-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Npgsql_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\CommandTests.cs" />\r
-    <Compile Include="Test\ConnectionTests.cs" />\r
-    <Compile Include="Test\DataAdapterTests.cs" />\r
-    <Compile Include="Test\DataReaderTests.cs" />\r
-    <Compile Include="Test\TestConfiguration.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Npgsql\Npgsql-net_2_0.csproj">\r
-      <Project>{13268A15-2B77-416C-B815-B0AF1848580E}</Project>\r
-      <Name>Npgsql\Npgsql-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/Npgsql/Npgsql-tests-net_4_0.csproj b/mcs/class/Npgsql/Npgsql-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 77f5f9c..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E2EB45EC-208E-4A71-9A13-368BA39E888B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Npgsql-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Npgsql_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\CommandTests.cs" />\r
-    <Compile Include="Test\ConnectionTests.cs" />\r
-    <Compile Include="Test\DataAdapterTests.cs" />\r
-    <Compile Include="Test\DataReaderTests.cs" />\r
-    <Compile Include="Test\TestConfiguration.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Npgsql\Npgsql-net_4_0.csproj">\r
-      <Project>{65DBA42E-7B72-4718-9DC5-468A2EEEE55E}</Project>\r
-      <Name>Npgsql\Npgsql-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/PEAPI/PEAPI-net_2_0.csproj b/mcs/class/PEAPI/PEAPI-net_2_0.csproj
deleted file mode 100644 (file)
index 22a4588..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{49C972D3-309D-4B4E-AEB7-01030E473870}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>PEAPI</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Code.cs" />\r
-    <Compile Include="Metadata.cs" />\r
-    <Compile Include="PEAPI.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/PEAPI/PEAPI-net_4_0.csproj b/mcs/class/PEAPI/PEAPI-net_4_0.csproj
deleted file mode 100644 (file)
index 0acd533..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1EE472E0-5E7F-484A-A5DC-D88E13210743}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>PEAPI</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Code.cs" />\r
-    <Compile Include="Metadata.cs" />\r
-    <Compile Include="PEAPI.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_2_0.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_2_0.csproj
deleted file mode 100644 (file)
index 002f0f5..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B0FB491D-9EEC-47DC-B7D0-1D6B58F726AC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>RabbitMQ.Client.Apigen</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\client\api\AmqpTimestamp.cs" />\r
-    <Compile Include="..\client\api\IBasicConsumer.cs" />\r
-    <Compile Include="..\client\api\IBasicProperties.cs" />\r
-    <Compile Include="..\client\api\IContentHeader.cs" />\r
-    <Compile Include="..\client\api\IFileProperties.cs" />\r
-    <Compile Include="..\client\api\IModel.cs" />\r
-    <Compile Include="..\client\api\IStreamProperties.cs" />\r
-    <Compile Include="..\client\api\PublicationAddress.cs" />\r
-    <Compile Include="..\client\api\ShutdownEventArgs.cs" />\r
-    <Compile Include="..\client\api\ShutdownInitiator.cs" />\r
-    <Compile Include="..\client\events\BasicReturnEventArgs.cs" />\r
-    <Compile Include="..\client\events\BasicReturnEventHandler.cs" />\r
-    <Compile Include="..\client\events\CallbackExceptionEventArgs.cs" />\r
-    <Compile Include="..\client\events\CallbackExceptionEventHandler.cs" />\r
-    <Compile Include="..\client\events\ModelShutdownEventHandler.cs" />\r
-    <Compile Include="AmqpClass.cs" />\r
-    <Compile Include="AmqpEntity.cs" />\r
-    <Compile Include="AmqpField.cs" />\r
-    <Compile Include="AmqpMethod.cs" />\r
-    <Compile Include="Apigen.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_0.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_0.csproj
deleted file mode 100644 (file)
index 31e6200..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DE8E8510-953B-4927-9923-633C33F18043}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>RabbitMQ.Client.Apigen</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\client\api\AmqpTimestamp.cs" />\r
-    <Compile Include="..\client\api\IBasicConsumer.cs" />\r
-    <Compile Include="..\client\api\IBasicProperties.cs" />\r
-    <Compile Include="..\client\api\IContentHeader.cs" />\r
-    <Compile Include="..\client\api\IFileProperties.cs" />\r
-    <Compile Include="..\client\api\IModel.cs" />\r
-    <Compile Include="..\client\api\IStreamProperties.cs" />\r
-    <Compile Include="..\client\api\PublicationAddress.cs" />\r
-    <Compile Include="..\client\api\ShutdownEventArgs.cs" />\r
-    <Compile Include="..\client\api\ShutdownInitiator.cs" />\r
-    <Compile Include="..\client\events\BasicReturnEventArgs.cs" />\r
-    <Compile Include="..\client\events\BasicReturnEventHandler.cs" />\r
-    <Compile Include="..\client\events\CallbackExceptionEventArgs.cs" />\r
-    <Compile Include="..\client\events\CallbackExceptionEventHandler.cs" />\r
-    <Compile Include="..\client\events\ModelShutdownEventHandler.cs" />\r
-    <Compile Include="AmqpClass.cs" />\r
-    <Compile Include="AmqpEntity.cs" />\r
-    <Compile Include="AmqpField.cs" />\r
-    <Compile Include="AmqpMethod.cs" />\r
-    <Compile Include="Apigen.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_2_0.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_2_0.csproj
deleted file mode 100644 (file)
index 099fd16..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{962E924C-777A-42E1-B7AC-823BFA34D22C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>RabbitMQ.Client</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\docs\specs\net_2_0-api-0-8.cs" />\r
-    <Compile Include="..\..\docs\specs\net_2_0-api-0-9.cs" />\r
-    <Compile Include="..\..\docs\specs\net_2_0-api-qpid-0-8.cs" />\r
-    <Compile Include="..\util\BlockingCell.cs" />\r
-    <Compile Include="..\util\DebugUtil.cs" />\r
-    <Compile Include="..\util\Either.cs" />\r
-    <Compile Include="..\util\IntAllocator.cs" />\r
-    <Compile Include="..\util\NetworkBinaryReader.cs" />\r
-    <Compile Include="..\util\NetworkBinaryWriter.cs" />\r
-    <Compile Include="..\util\Semaphore.cs" />\r
-    <Compile Include="..\util\SharedQueue.cs" />\r
-    <Compile Include="..\util\XmlUtil.cs" />\r
-    <Compile Include=".\api\AmqpTcpEndpoint.cs" />\r
-    <Compile Include=".\api\AmqpTimestamp.cs" />\r
-    <Compile Include=".\api\AmqpVersion.cs" />\r
-    <Compile Include=".\api\BinaryTableValue.cs" />\r
-    <Compile Include=".\api\ConnectionFactory.cs" />\r
-    <Compile Include=".\api\DefaultBasicConsumer.cs" />\r
-    <Compile Include=".\api\ExchangeType.cs" />\r
-    <Compile Include=".\api\IBasicConsumer.cs" />\r
-    <Compile Include=".\api\IBasicProperties.cs" />\r
-    <Compile Include=".\api\IConnection.cs" />\r
-    <Compile Include=".\api\IContentHeader.cs" />\r
-    <Compile Include=".\api\IFileProperties.cs" />\r
-    <Compile Include=".\api\IMethod.cs" />\r
-    <Compile Include=".\api\IModel.cs" />\r
-    <Compile Include=".\api\IProtocol.cs" />\r
-    <Compile Include=".\api\IStreamProperties.cs" />\r
-    <Compile Include=".\api\Protocols.cs" />\r
-    <Compile Include=".\api\PublicationAddress.cs" />\r
-    <Compile Include=".\api\QueueingBasicConsumer.cs" />\r
-    <Compile Include=".\api\ShutdownEventArgs.cs" />\r
-    <Compile Include=".\api\ShutdownInitiator.cs" />\r
-    <Compile Include=".\api\ShutdownReportEntry.cs" />\r
-    <Compile Include=".\api\SslHelper.cs" />\r
-    <Compile Include=".\api\SslOption.cs" />\r
-    <Compile Include=".\AssemblyInfo.cs" />\r
-    <Compile Include=".\content\BasicMessageBuilder.cs" />\r
-    <Compile Include=".\content\BasicMessageReader.cs" />\r
-    <Compile Include=".\content\BytesMessageBuilder.cs" />\r
-    <Compile Include=".\content\BytesMessageReader.cs" />\r
-    <Compile Include=".\content\BytesWireFormatting.cs" />\r
-    <Compile Include=".\content\IBytesMessageBuilder.cs" />\r
-    <Compile Include=".\content\IBytesMessageReader.cs" />\r
-    <Compile Include=".\content\IMapMessageBuilder.cs" />\r
-    <Compile Include=".\content\IMapMessageReader.cs" />\r
-    <Compile Include=".\content\IMessageBuilder.cs" />\r
-    <Compile Include=".\content\IMessageReader.cs" />\r
-    <Compile Include=".\content\IStreamMessageBuilder.cs" />\r
-    <Compile Include=".\content\IStreamMessageReader.cs" />\r
-    <Compile Include=".\content\MapMessageBuilder.cs" />\r
-    <Compile Include=".\content\MapMessageReader.cs" />\r
-    <Compile Include=".\content\MapWireFormatting.cs" />\r
-    <Compile Include=".\content\PrimitiveParser.cs" />\r
-    <Compile Include=".\content\StreamMessageBuilder.cs" />\r
-    <Compile Include=".\content\StreamMessageReader.cs" />\r
-    <Compile Include=".\content\StreamWireFormatting.cs" />\r
-    <Compile Include=".\events\BasicDeliverEventArgs.cs" />\r
-    <Compile Include=".\events\BasicDeliverEventHandler.cs" />\r
-    <Compile Include=".\events\BasicReturnEventArgs.cs" />\r
-    <Compile Include=".\events\BasicReturnEventHandler.cs" />\r
-    <Compile Include=".\events\CallbackExceptionEventArgs.cs" />\r
-    <Compile Include=".\events\CallbackExceptionEventHandler.cs" />\r
-    <Compile Include=".\events\ConnectionShutdownEventHandler.cs" />\r
-    <Compile Include=".\events\ConsumerEventArgs.cs" />\r
-    <Compile Include=".\events\ConsumerEventHandler.cs" />\r
-    <Compile Include=".\events\ConsumerShutdownEventHandler.cs" />\r
-    <Compile Include=".\events\EventingBasicConsumer.cs" />\r
-    <Compile Include=".\events\ModelShutdownEventHandler.cs" />\r
-    <Compile Include=".\exceptions\AlreadyClosedException.cs" />\r
-    <Compile Include=".\exceptions\BrokerUnreachableException.cs" />\r
-    <Compile Include=".\exceptions\ChannelAllocationException.cs" />\r
-    <Compile Include=".\exceptions\OperationInterruptedException.cs" />\r
-    <Compile Include=".\exceptions\PacketNotRecognizedException.cs" />\r
-    <Compile Include=".\exceptions\PossibleAuthenticationFailureException.cs" />\r
-    <Compile Include=".\exceptions\ProtocolVersionMismatchException.cs" />\r
-    <Compile Include=".\exceptions\UnexpectedMethodException.cs" />\r
-    <Compile Include=".\exceptions\UnsupportedMethodException.cs" />\r
-    <Compile Include=".\exceptions\UnsupportedMethodFieldException.cs" />\r
-    <Compile Include=".\exceptions\WireFormattingException.cs" />\r
-    <Compile Include=".\impl\AbstractProtocolBase.cs" />\r
-    <Compile Include=".\impl\BasicProperties.cs" />\r
-    <Compile Include=".\impl\ChannelErrorException.cs" />\r
-    <Compile Include=".\impl\Command.cs" />\r
-    <Compile Include=".\impl\CommandAssembler.cs" />\r
-    <Compile Include=".\impl\ConnectionBase.cs" />\r
-    <Compile Include=".\impl\ConnectionStartDetails.cs" />\r
-    <Compile Include=".\impl\ContentHeaderBase.cs" />\r
-    <Compile Include=".\impl\ContentHeaderPropertyReader.cs" />\r
-    <Compile Include=".\impl\ContentHeaderPropertyWriter.cs" />\r
-    <Compile Include=".\impl\FileProperties.cs" />\r
-    <Compile Include=".\impl\Frame.cs" />\r
-    <Compile Include=".\impl\HardProtocolException.cs" />\r
-    <Compile Include=".\impl\IFrameHandler.cs" />\r
-    <Compile Include=".\impl\IRpcContinuation.cs" />\r
-    <Compile Include=".\impl\ISession.cs" />\r
-    <Compile Include=".\impl\MainSession.cs" />\r
-    <Compile Include=".\impl\MalformedFrameException.cs" />\r
-    <Compile Include=".\impl\MethodArgumentReader.cs" />\r
-    <Compile Include=".\impl\MethodArgumentWriter.cs" />\r
-    <Compile Include=".\impl\MethodBase.cs" />\r
-    <Compile Include=".\impl\ModelBase.cs" />\r
-    <Compile Include=".\impl\ProtocolException.cs" />\r
-    <Compile Include=".\impl\QuiescingSession.cs" />\r
-    <Compile Include=".\impl\RedirectException.cs" />\r
-    <Compile Include=".\impl\RpcContinuationQueue.cs" />\r
-    <Compile Include=".\impl\Session.cs" />\r
-    <Compile Include=".\impl\SessionBase.cs" />\r
-    <Compile Include=".\impl\SessionManager.cs" />\r
-    <Compile Include=".\impl\ShutdownContinuation.cs" />\r
-    <Compile Include=".\impl\SimpleBlockingRpcContinuation.cs" />\r
-    <Compile Include=".\impl\SocketFrameHandler_0_9.cs" />\r
-    <Compile Include=".\impl\SoftProtocolException.cs" />\r
-    <Compile Include=".\impl\StreamProperties.cs" />\r
-    <Compile Include=".\impl\SyntaxError.cs" />\r
-    <Compile Include=".\impl\UnexpectedFrameException.cs" />\r
-    <Compile Include=".\impl\UnknownClassOrMethodException.cs" />\r
-    <Compile Include=".\impl\v0_8\Connection.cs" />\r
-    <Compile Include=".\impl\v0_8\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\v0_8qpid\Connection.cs" />\r
-    <Compile Include=".\impl\v0_8qpid\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\v0_9\Connection.cs" />\r
-    <Compile Include=".\impl\v0_9\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\WireFormatting.cs" />\r
-    <Compile Include=".\messagepatterns\SimpleRpcClient.cs" />\r
-    <Compile Include=".\messagepatterns\SimpleRpcServer.cs" />\r
-    <Compile Include=".\messagepatterns\Subscription.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_0.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_0.csproj
deleted file mode 100644 (file)
index 39e666b..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E06EB369-D458-4373-ABA7-CE156714DE4F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>RabbitMQ.Client</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\docs\specs\net_4_0-api-0-8.cs" />\r
-    <Compile Include="..\..\docs\specs\net_4_0-api-0-9.cs" />\r
-    <Compile Include="..\..\docs\specs\net_4_0-api-qpid-0-8.cs" />\r
-    <Compile Include="..\util\BlockingCell.cs" />\r
-    <Compile Include="..\util\DebugUtil.cs" />\r
-    <Compile Include="..\util\Either.cs" />\r
-    <Compile Include="..\util\IntAllocator.cs" />\r
-    <Compile Include="..\util\NetworkBinaryReader.cs" />\r
-    <Compile Include="..\util\NetworkBinaryWriter.cs" />\r
-    <Compile Include="..\util\Semaphore.cs" />\r
-    <Compile Include="..\util\SharedQueue.cs" />\r
-    <Compile Include="..\util\XmlUtil.cs" />\r
-    <Compile Include=".\api\AmqpTcpEndpoint.cs" />\r
-    <Compile Include=".\api\AmqpTimestamp.cs" />\r
-    <Compile Include=".\api\AmqpVersion.cs" />\r
-    <Compile Include=".\api\BinaryTableValue.cs" />\r
-    <Compile Include=".\api\ConnectionFactory.cs" />\r
-    <Compile Include=".\api\DefaultBasicConsumer.cs" />\r
-    <Compile Include=".\api\ExchangeType.cs" />\r
-    <Compile Include=".\api\IBasicConsumer.cs" />\r
-    <Compile Include=".\api\IBasicProperties.cs" />\r
-    <Compile Include=".\api\IConnection.cs" />\r
-    <Compile Include=".\api\IContentHeader.cs" />\r
-    <Compile Include=".\api\IFileProperties.cs" />\r
-    <Compile Include=".\api\IMethod.cs" />\r
-    <Compile Include=".\api\IModel.cs" />\r
-    <Compile Include=".\api\IProtocol.cs" />\r
-    <Compile Include=".\api\IStreamProperties.cs" />\r
-    <Compile Include=".\api\Protocols.cs" />\r
-    <Compile Include=".\api\PublicationAddress.cs" />\r
-    <Compile Include=".\api\QueueingBasicConsumer.cs" />\r
-    <Compile Include=".\api\ShutdownEventArgs.cs" />\r
-    <Compile Include=".\api\ShutdownInitiator.cs" />\r
-    <Compile Include=".\api\ShutdownReportEntry.cs" />\r
-    <Compile Include=".\api\SslHelper.cs" />\r
-    <Compile Include=".\api\SslOption.cs" />\r
-    <Compile Include=".\AssemblyInfo.cs" />\r
-    <Compile Include=".\content\BasicMessageBuilder.cs" />\r
-    <Compile Include=".\content\BasicMessageReader.cs" />\r
-    <Compile Include=".\content\BytesMessageBuilder.cs" />\r
-    <Compile Include=".\content\BytesMessageReader.cs" />\r
-    <Compile Include=".\content\BytesWireFormatting.cs" />\r
-    <Compile Include=".\content\IBytesMessageBuilder.cs" />\r
-    <Compile Include=".\content\IBytesMessageReader.cs" />\r
-    <Compile Include=".\content\IMapMessageBuilder.cs" />\r
-    <Compile Include=".\content\IMapMessageReader.cs" />\r
-    <Compile Include=".\content\IMessageBuilder.cs" />\r
-    <Compile Include=".\content\IMessageReader.cs" />\r
-    <Compile Include=".\content\IStreamMessageBuilder.cs" />\r
-    <Compile Include=".\content\IStreamMessageReader.cs" />\r
-    <Compile Include=".\content\MapMessageBuilder.cs" />\r
-    <Compile Include=".\content\MapMessageReader.cs" />\r
-    <Compile Include=".\content\MapWireFormatting.cs" />\r
-    <Compile Include=".\content\PrimitiveParser.cs" />\r
-    <Compile Include=".\content\StreamMessageBuilder.cs" />\r
-    <Compile Include=".\content\StreamMessageReader.cs" />\r
-    <Compile Include=".\content\StreamWireFormatting.cs" />\r
-    <Compile Include=".\events\BasicDeliverEventArgs.cs" />\r
-    <Compile Include=".\events\BasicDeliverEventHandler.cs" />\r
-    <Compile Include=".\events\BasicReturnEventArgs.cs" />\r
-    <Compile Include=".\events\BasicReturnEventHandler.cs" />\r
-    <Compile Include=".\events\CallbackExceptionEventArgs.cs" />\r
-    <Compile Include=".\events\CallbackExceptionEventHandler.cs" />\r
-    <Compile Include=".\events\ConnectionShutdownEventHandler.cs" />\r
-    <Compile Include=".\events\ConsumerEventArgs.cs" />\r
-    <Compile Include=".\events\ConsumerEventHandler.cs" />\r
-    <Compile Include=".\events\ConsumerShutdownEventHandler.cs" />\r
-    <Compile Include=".\events\EventingBasicConsumer.cs" />\r
-    <Compile Include=".\events\ModelShutdownEventHandler.cs" />\r
-    <Compile Include=".\exceptions\AlreadyClosedException.cs" />\r
-    <Compile Include=".\exceptions\BrokerUnreachableException.cs" />\r
-    <Compile Include=".\exceptions\ChannelAllocationException.cs" />\r
-    <Compile Include=".\exceptions\OperationInterruptedException.cs" />\r
-    <Compile Include=".\exceptions\PacketNotRecognizedException.cs" />\r
-    <Compile Include=".\exceptions\PossibleAuthenticationFailureException.cs" />\r
-    <Compile Include=".\exceptions\ProtocolVersionMismatchException.cs" />\r
-    <Compile Include=".\exceptions\UnexpectedMethodException.cs" />\r
-    <Compile Include=".\exceptions\UnsupportedMethodException.cs" />\r
-    <Compile Include=".\exceptions\UnsupportedMethodFieldException.cs" />\r
-    <Compile Include=".\exceptions\WireFormattingException.cs" />\r
-    <Compile Include=".\impl\AbstractProtocolBase.cs" />\r
-    <Compile Include=".\impl\BasicProperties.cs" />\r
-    <Compile Include=".\impl\ChannelErrorException.cs" />\r
-    <Compile Include=".\impl\Command.cs" />\r
-    <Compile Include=".\impl\CommandAssembler.cs" />\r
-    <Compile Include=".\impl\ConnectionBase.cs" />\r
-    <Compile Include=".\impl\ConnectionStartDetails.cs" />\r
-    <Compile Include=".\impl\ContentHeaderBase.cs" />\r
-    <Compile Include=".\impl\ContentHeaderPropertyReader.cs" />\r
-    <Compile Include=".\impl\ContentHeaderPropertyWriter.cs" />\r
-    <Compile Include=".\impl\FileProperties.cs" />\r
-    <Compile Include=".\impl\Frame.cs" />\r
-    <Compile Include=".\impl\HardProtocolException.cs" />\r
-    <Compile Include=".\impl\IFrameHandler.cs" />\r
-    <Compile Include=".\impl\IRpcContinuation.cs" />\r
-    <Compile Include=".\impl\ISession.cs" />\r
-    <Compile Include=".\impl\MainSession.cs" />\r
-    <Compile Include=".\impl\MalformedFrameException.cs" />\r
-    <Compile Include=".\impl\MethodArgumentReader.cs" />\r
-    <Compile Include=".\impl\MethodArgumentWriter.cs" />\r
-    <Compile Include=".\impl\MethodBase.cs" />\r
-    <Compile Include=".\impl\ModelBase.cs" />\r
-    <Compile Include=".\impl\ProtocolException.cs" />\r
-    <Compile Include=".\impl\QuiescingSession.cs" />\r
-    <Compile Include=".\impl\RedirectException.cs" />\r
-    <Compile Include=".\impl\RpcContinuationQueue.cs" />\r
-    <Compile Include=".\impl\Session.cs" />\r
-    <Compile Include=".\impl\SessionBase.cs" />\r
-    <Compile Include=".\impl\SessionManager.cs" />\r
-    <Compile Include=".\impl\ShutdownContinuation.cs" />\r
-    <Compile Include=".\impl\SimpleBlockingRpcContinuation.cs" />\r
-    <Compile Include=".\impl\SocketFrameHandler_0_9.cs" />\r
-    <Compile Include=".\impl\SoftProtocolException.cs" />\r
-    <Compile Include=".\impl\StreamProperties.cs" />\r
-    <Compile Include=".\impl\SyntaxError.cs" />\r
-    <Compile Include=".\impl\UnexpectedFrameException.cs" />\r
-    <Compile Include=".\impl\UnknownClassOrMethodException.cs" />\r
-    <Compile Include=".\impl\v0_8\Connection.cs" />\r
-    <Compile Include=".\impl\v0_8\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\v0_8qpid\Connection.cs" />\r
-    <Compile Include=".\impl\v0_8qpid\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\v0_9\Connection.cs" />\r
-    <Compile Include=".\impl\v0_9\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\WireFormatting.cs" />\r
-    <Compile Include=".\messagepatterns\SimpleRpcClient.cs" />\r
-    <Compile Include=".\messagepatterns\SimpleRpcServer.cs" />\r
-    <Compile Include=".\messagepatterns\Subscription.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ComponentModel.Composition/.gitignore b/mcs/class/System.ComponentModel.Composition/.gitignore
deleted file mode 100644 (file)
index 270df4c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-*.resources
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AggregateCatalog.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AggregateCatalog.xml
deleted file mode 100644 (file)
index 7c9a15c..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="AggregateCatalog" FullName="System.ComponentModel.Composition.Hosting.AggregateCatalog">
-  <TypeSignature Language="C#" Value="public class AggregateCatalog : System.ComponentModel.Composition.Primitives.ComposablePartCatalog, System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit AggregateCatalog extends System.ComponentModel.Composition.Primitives.ComposablePartCatalog implements class System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>A catalog that combines the elements of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> objects. </para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AggregateCatalog ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AggregateCatalog (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartCatalog&gt; catalogs);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartCatalog&gt; catalogs) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalogs" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartCatalog&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> class with the specified catalogs.</para>
-        </summary>
-        <param name="catalogs">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> or null to create an empty <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" />. </param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AggregateCatalog (System.ComponentModel.Composition.Primitives.ComposablePartCatalog[] catalogs);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog[] catalogs) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalogs" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> class with the specified catalogs.</para>
-        </summary>
-        <param name="catalogs">
-          <attribution license="cc4" from="Microsoft" modified="false" />A array of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" />.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Catalogs">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.ICollection&lt;System.ComponentModel.Composition.Primitives.ComposablePartCatalog&gt; Catalogs { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.ICollection`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartCatalog&gt; Catalogs" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.ICollection&lt;System.ComponentModel.Composition.Primitives.ComposablePartCatalog&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the underlying catalogs of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Changed">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the contents of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> object have changed.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Changing">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the contents of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> object are changing.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateCatalog" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerable&lt;Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.Tuple`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the export definitions that match the constraint expressed by the specified definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of <see cref="T:System.Tuple`2" /> containing the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects and their associated <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects for objects that match the constraint specified by <paramref name="definition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects to be returned.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanged (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanged(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.AggregateCatalog.Changed" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />A <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" /> object that contains the event data. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanging">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanging (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanging(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.AggregateCatalog.Changing" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />A <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" /> object that contains the event data. </param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AggregateExportProvider.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AggregateExportProvider.xml
deleted file mode 100644 (file)
index 35d9737..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="AggregateExportProvider" FullName="System.ComponentModel.Composition.Hosting.AggregateExportProvider">
-  <TypeSignature Language="C#" Value="public class AggregateExportProvider : System.ComponentModel.Composition.Hosting.ExportProvider, IDisposable" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit AggregateExportProvider extends System.ComponentModel.Composition.Hosting.ExportProvider implements class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Hosting.ExportProvider</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Retrieves exports provided by a collection of <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> objects.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AggregateExportProvider (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.ExportProvider&gt; providers);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Hosting.ExportProvider&gt; providers) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="providers" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.ExportProvider&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> class consults the providers in the order in which they have been specified when it calls <see cref="M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)" />. </para>
-          <para>The <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> does not take ownership of the specified providers. That is, it tries to dispose of any of the providers when it is disposed.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> class.</para>
-        </summary>
-        <param name="providers">
-          <attribution license="cc4" from="Microsoft" modified="false" />The prioritized list of export providers. The providers are consulted in the order in which they are supplied.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AggregateExportProvider (System.ComponentModel.Composition.Hosting.ExportProvider[] providers);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Hosting.ExportProvider[] providers) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="providers" Type="System.ComponentModel.Composition.Hosting.ExportProvider[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> class consults the providers in the order in which they have been specified when it calls <see cref="M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)" />. </para>
-          <para>The <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> does not take ownership of the specified providers.  That is, it tries to dispose of any of the providers when it is disposed.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> class.</para>
-        </summary>
-        <param name="providers">
-          <attribution license="cc4" from="Microsoft" modified="false" />The prioritized list of export providers.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> class. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected virtual void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> class and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportsCore">
-      <MemberSignature Language="C#" Value="protected override System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Implementers should not treat cardinality-related mismatches as errors and are not expected to throw exceptions in those cases.</para>
-          <para>For example, if the import requests exactly one export and the provider has either no matching exports or more than one, the method should return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection of <see cref="T:System.ComponentModel.Composition.Primitives.Export" />.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exports that match the conditions of the specified import.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection that contains all the exports that match the specified condition.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to be returned.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The transactional container for the composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Providers">
-      <MemberSignature Language="C#" Value="public System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Hosting.ExportProvider&gt; Providers { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.ObjectModel.ReadOnlyCollection`1&lt;class System.ComponentModel.Composition.Hosting.ExportProvider&gt; Providers" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Hosting.ExportProvider&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection that contains the providers that the <see cref="T:System.ComponentModel.Composition.Hosting.AggregateExportProvider" /> object aggregates.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ApplicationCatalog.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ApplicationCatalog.xml
deleted file mode 100644 (file)
index b984c29..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ApplicationCatalog" FullName="System.ComponentModel.Composition.Hosting.ApplicationCatalog">
-  <TypeSignature Language="C#" Value="public class ApplicationCatalog : System.ComponentModel.Composition.Primitives.ComposablePartCatalog, System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ApplicationCatalog extends System.ComponentModel.Composition.Primitives.ComposablePartCatalog implements class System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Primitives.ICompositionElement</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Discovers attributed parts in the dynamic link library (DLL) and EXE files in an application's directory and path.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ApplicationCatalog ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ApplicationCatalog" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ApplicationCatalog (System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ApplicationCatalog" /> class by using the specified source for parts.</para>
-        </summary>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ApplicationCatalog (System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ApplicationCatalog" /> class by using the specified reflection context.</para>
-        </summary>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The reflection context.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ApplicationCatalog (System.Reflection.ReflectionContext reflectionContext, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Reflection.ReflectionContext reflectionContext, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ApplicationCatalog" /> class by using the specified reflection context and source for parts.</para>
-        </summary>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The reflection context.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the collection.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the collection.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerable&lt;Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.Tuple`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the export definitions that match the constraint expressed by the specified import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of objects that contain the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects and their associated <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects that match the specified constraint.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects to be returned.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName">
-      <MemberSignature Language="C#" Value="string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.ApplicationCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the display name of the application catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.Origin">
-      <MemberSignature Language="C#" Value="System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ICompositionElement</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.ApplicationCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition element from which the application catalog originated.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Retrieves a string representation of the application catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A string representation of the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml
deleted file mode 100644 (file)
index 935a63d..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="AssemblyCatalog" FullName="System.ComponentModel.Composition.Hosting.AssemblyCatalog">
-  <TypeSignature Language="C#" Value="public class AssemblyCatalog : System.ComponentModel.Composition.Primitives.ComposablePartCatalog, System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit AssemblyCatalog extends System.ComponentModel.Composition.Primitives.ComposablePartCatalog implements class System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Primitives.ICompositionElement</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.Hosting.AssemblyCatalogDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>An <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> is used to parse all the parts present in a specified assembly. The target assembly can be indicated either by object reference or by path.</para>
-      <para>This type is thread safe.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Discovers attributed parts in a managed code assembly.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (System.Reflection.Assembly assembly);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Reflection.Assembly assembly) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="assembly" Type="System.Reflection.Assembly" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified assembly.</para>
-        </summary>
-        <param name="assembly">
-          <attribution license="cc4" from="Microsoft" modified="false" />The assembly that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (string codeBase);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string codeBase) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="codeBase" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The assembly referenced by <paramref name="codeBase" /> is loaded into the load context.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified code base.</para>
-        </summary>
-        <param name="codeBase">
-          <attribution license="cc4" from="Microsoft" modified="false" />A string that specifies the code base of the assembly (that is, the path to the assembly file) that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (System.Reflection.Assembly assembly, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Reflection.Assembly assembly, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="assembly" Type="System.Reflection.Assembly" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified assembly.</para>
-        </summary>
-        <param name="assembly">
-          <attribution license="cc4" from="Microsoft" modified="false" />The assembly that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the sources of parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (System.Reflection.Assembly assembly, System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Reflection.Assembly assembly, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="assembly" Type="System.Reflection.Assembly" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified assembly and reflection context.</para>
-        </summary>
-        <param name="assembly">
-          <attribution license="cc4" from="Microsoft" modified="false" />The assembly that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used by the catalog to interpret types.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (string codeBase, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string codeBase, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="codeBase" Type="System.String" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified code base.</para>
-        </summary>
-        <param name="codeBase">
-          <attribution license="cc4" from="Microsoft" modified="false" />A string that specifies the code base of the assembly (that is, the path to the assembly file) that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the sources of parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (string codeBase, System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string codeBase, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="codeBase" Type="System.String" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified code base and reflection context.</para>
-        </summary>
-        <param name="codeBase">
-          <attribution license="cc4" from="Microsoft" modified="false" />A string that specifies the code base of the assembly (that is, the path to the assembly file) that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used by the catalog to interpret types.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (System.Reflection.Assembly assembly, System.Reflection.ReflectionContext reflectionContext, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Reflection.Assembly assembly, class System.Reflection.ReflectionContext reflectionContext, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="assembly" Type="System.Reflection.Assembly" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified assembly and reflection context.</para>
-        </summary>
-        <param name="assembly">
-          <attribution license="cc4" from="Microsoft" modified="false" />The assembly that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used by the catalog to interpret types.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the sources of parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AssemblyCatalog (string codeBase, System.Reflection.ReflectionContext reflectionContext, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string codeBase, class System.Reflection.ReflectionContext reflectionContext, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="codeBase" Type="System.String" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified code base and reflection context.</para>
-        </summary>
-        <param name="codeBase">
-          <attribution license="cc4" from="Microsoft" modified="false" />A string that specifies the code base of the assembly (that is, the path to the assembly file) that contains the attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used by the catalog to interpret types.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the sources of parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Assembly">
-      <MemberSignature Language="C#" Value="public System.Reflection.Assembly Assembly { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Reflection.Assembly Assembly" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Reflection.Assembly</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the assembly whose attributed types are contained in the assembly catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerable&lt;Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.Tuple`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of exports that match the conditions specified by the import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of exports that match the conditions specified by <paramref name="definition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />Conditions that specify which exports to match.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName">
-      <MemberSignature Language="C#" Value="string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the display name of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.Origin">
-      <MemberSignature Language="C#" Value="System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ICompositionElement</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition element that this element originated from.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a string representation of the assembly catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A representation of the assembly catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AtomicComposition.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/AtomicComposition.xml
deleted file mode 100644 (file)
index 1542a5e..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="AtomicComposition" FullName="System.ComponentModel.Composition.Hosting.AtomicComposition">
-  <TypeSignature Language="C#" Value="public class AtomicComposition : IDisposable" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit AtomicComposition extends System.Object implements class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents a single composition operation for transactional composition.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AtomicComposition ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> class. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AtomicComposition (System.ComponentModel.Composition.Hosting.AtomicComposition outerAtomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Hosting.AtomicComposition outerAtomicComposition) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="outerAtomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> class with the specified parent <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" />.</para>
-        </summary>
-        <param name="outerAtomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The parent of this composition operation.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AddCompleteAction">
-      <MemberSignature Language="C#" Value="public void AddCompleteAction (Action completeAction);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void AddCompleteAction(class System.Action completeAction) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="completeAction" Type="System.Action" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Adds an action to be executed when the overall composition operation completes successfully.</para>
-        </summary>
-        <param name="completeAction">
-          <attribution license="cc4" from="Microsoft" modified="false" />The action to be executed.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AddRevertAction">
-      <MemberSignature Language="C#" Value="public void AddRevertAction (Action revertAction);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void AddRevertAction(class System.Action revertAction) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="revertAction" Type="System.Action" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Adds an action to be executed if the overall composition operation fails.</para>
-        </summary>
-        <param name="revertAction">
-          <attribution license="cc4" from="Microsoft" modified="false" />The action to be executed.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Complete">
-      <MemberSignature Language="C#" Value="public void Complete ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Complete() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>If this <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> is nested, completion actions will not be executed until the parent composition operation has also completed.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Marks this composition operation as complete.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> class, and mark this composition operation as failed.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected virtual void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.AtomicComposition" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="SetValue">
-      <MemberSignature Language="C#" Value="public void SetValue (object key, object value);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void SetValue(object key, object value) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="key" Type="System.Object" />
-        <Parameter Name="value" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Saves a key-value pair in the transaction to track tentative state.</para>
-        </summary>
-        <param name="key">
-          <attribution license="cc4" from="Microsoft" modified="false" />The key to save.</param>
-        <param name="value">
-          <attribution license="cc4" from="Microsoft" modified="false" />The value to save.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="TryGetValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public bool TryGetValue&lt;T&gt; (object key, out T value);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool TryGetValue&lt;T&gt;(object key, !!T value) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="key" Type="System.Object" />
-        <Parameter Name="value" Type="T&amp;" RefType="out" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <param name="key">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="TryGetValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public bool TryGetValue&lt;T&gt; (object key, bool localAtomicCompositionOnly, out T value);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool TryGetValue&lt;T&gt;(object key, bool localAtomicCompositionOnly, !!T value) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="key" Type="System.Object" />
-        <Parameter Name="localAtomicCompositionOnly" Type="System.Boolean" />
-        <Parameter Name="value" Type="T&amp;" RefType="out" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <param name="key">To be added.</param>
-        <param name="localAtomicCompositionOnly">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CatalogExportProvider.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CatalogExportProvider.xml
deleted file mode 100644 (file)
index 2243cfd..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CatalogExportProvider" FullName="System.ComponentModel.Composition.Hosting.CatalogExportProvider">
-  <TypeSignature Language="C#" Value="public class CatalogExportProvider : System.ComponentModel.Composition.Hosting.ExportProvider, IDisposable" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit CatalogExportProvider extends System.ComponentModel.Composition.Hosting.ExportProvider implements class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Hosting.ExportProvider</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Retrieves exports from a catalog.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CatalogExportProvider (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> class with the specified catalog.</para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The catalog that the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> uses to produce <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CatalogExportProvider (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, bool isThreadSafe);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, bool isThreadSafe) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="isThreadSafe" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> class with the specified catalog and optional thread-safe mode. </para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The catalog that the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> uses to produce <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</param>
-        <param name="isThreadSafe">
-          <attribution license="cc4" from="Microsoft" modified="false" />true if this object must be thread-safe; otherwise, false.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CatalogExportProvider (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, valuetype System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="compositionOptions" Type="System.ComponentModel.Composition.Hosting.CompositionOptions" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> class with the specified catalog and composition options.</para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The catalog that the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> uses to produce <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</param>
-        <param name="compositionOptions">
-          <attribution license="cc4" from="Microsoft" modified="false" />Options that determine the behavior of this provider.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Catalog">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Primitives.ComposablePartCatalog Catalog { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ComposablePartCatalog Catalog" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the catalog that is used to provide exports.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected virtual void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportsCore">
-      <MemberSignature Language="C#" Value="protected override System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Implementers should not treat cardinality-related mismatches as errors and should not throw exceptions for cardinality-related mismatches. For example, if the import requests exactly one export and the provider has either no matching exports or more than one, the <see cref="M:System.ComponentModel.Composition.Hosting.CatalogExportProvider.GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)" /> method should return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection of <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns all exports that match the conditions of the specified import.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection that contains all the exports that match the specified condition.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to be returned.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition transaction to use, or null to disable transactional composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="SourceProvider">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.ExportProvider SourceProvider { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Hosting.ExportProvider SourceProvider" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.ExportProvider</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>You must set this property before you access any methods on the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> object.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets the export provider that provides access to additional exports.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CatalogExtensions.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CatalogExtensions.xml
deleted file mode 100644 (file)
index 2d56d3d..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CatalogExtensions" FullName="System.ComponentModel.Composition.Hosting.CatalogExtensions">
-  <TypeSignature Language="C#" Value="public static class CatalogExtensions" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit CatalogExtensions extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides extension methods for constructing composition services.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="CreateCompositionService">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Hosting.CompositionService CreateCompositionService (this System.ComponentModel.Composition.Primitives.ComposablePartCatalog composablePartCatalog);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Hosting.CompositionService CreateCompositionService(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog composablePartCatalog) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.CompositionService</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="composablePartCatalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" RefType="this" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a new composition service by using the specified catalog as a source for exports.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A new composition service.</para>
-        </returns>
-        <param name="composablePartCatalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The catalog that will provide exports.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ComposablePartCatalogChangeEventArgs.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ComposablePartCatalogChangeEventArgs.xml
deleted file mode 100644 (file)
index a14855a..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ComposablePartCatalogChangeEventArgs" FullName="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs">
-  <TypeSignature Language="C#" Value="public class ComposablePartCatalogChangeEventArgs : EventArgs" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ComposablePartCatalogChangeEventArgs extends System.EventArgs" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.EventArgs</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides data for the <see cref="E:System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged.Changed" /> event.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartCatalogChangeEventArgs (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; addedDefinitions, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; removedDefinitions, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; addedDefinitions, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; removedDefinitions, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="addedDefinitions" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;" />
-        <Parameter Name="removedDefinitions" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" /> class with the specified changes.</para>
-        </summary>
-        <param name="addedDefinitions">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part definitions that were added to the catalog.</param>
-        <param name="removedDefinitions">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part definitions that were removed from the catalog.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition transaction to use, or null to disable transactional composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AddedDefinitions">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; AddedDefinitions { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; AddedDefinitions" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of definitions added to the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> in this change.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="AtomicComposition">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.AtomicComposition</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition transaction for this change.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="RemovedDefinitions">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; RemovedDefinitions { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; RemovedDefinitions" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of definitions removed from the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> in this change.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ComposablePartExportProvider.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ComposablePartExportProvider.xml
deleted file mode 100644 (file)
index 1f7ee3e..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ComposablePartExportProvider" FullName="System.ComponentModel.Composition.Hosting.ComposablePartExportProvider">
-  <TypeSignature Language="C#" Value="public class ComposablePartExportProvider : System.ComponentModel.Composition.Hosting.ExportProvider, IDisposable" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ComposablePartExportProvider extends System.ComponentModel.Composition.Hosting.ExportProvider implements class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Hosting.ExportProvider</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Retrieves exports from a part.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartExportProvider ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartExportProvider (bool isThreadSafe);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(bool isThreadSafe) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="isThreadSafe" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> class, optionally in thread-safe mode. </para>
-        </summary>
-        <param name="isThreadSafe">
-          <attribution license="cc4" from="Microsoft" modified="false" />true if the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> object must be thread-safe; otherwise, false.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartExportProvider (System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="compositionOptions" Type="System.ComponentModel.Composition.Hosting.CompositionOptions" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> class with the specified composition options.</para>
-        </summary>
-        <param name="compositionOptions">
-          <attribution license="cc4" from="Microsoft" modified="false" />Options that specify the behavior of this provider.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Compose">
-      <MemberSignature Language="C#" Value="public void Compose (System.ComponentModel.Composition.Hosting.CompositionBatch batch);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Compose(class System.ComponentModel.Composition.Hosting.CompositionBatch batch) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Executes composition on the specified batch.</para>
-        </summary>
-        <param name="batch">
-          <attribution license="cc4" from="Microsoft" modified="false" />The batch to execute composition on.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected virtual void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportsCore">
-      <MemberSignature Language="C#" Value="protected override System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Implementers should not treat cardinality-related mismatches as errors and should not throw exceptions for cardinality-related mismatches. For example, if the import requests exactly one export and the provider has no matching exports or more than one, the <see cref="M:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)" /> method should return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection of <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of all exports in this provider that match the conditions of the specified import.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of all exports in this provider that match the specified conditions.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> that defines the conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> to get.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition transaction to use, or null to disable transactional composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="SourceProvider">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.ExportProvider SourceProvider { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Hosting.ExportProvider SourceProvider" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.ExportProvider</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This property must be set before accessing any methods on the <see cref="T:System.ComponentModel.Composition.Hosting.ComposablePartExportProvider" />.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets the export provider that provides access to additional <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionBatch.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionBatch.xml
deleted file mode 100644 (file)
index fd79315..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionBatch" FullName="System.ComponentModel.Composition.Hosting.CompositionBatch">
-  <TypeSignature Language="C#" Value="public class CompositionBatch" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit CompositionBatch extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents a set of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects which will be added or removed from the container in a single transactional composition.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionBatch ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionBatch (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt; partsToAdd, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt; partsToRemove);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePart&gt; partsToAdd, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePart&gt; partsToRemove) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="partsToAdd" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt;" />
-        <Parameter Name="partsToRemove" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> class with the specified parts for addition and removal.</para>
-        </summary>
-        <param name="partsToAdd">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects to add.</param>
-        <param name="partsToRemove">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects to remove.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AddExport">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Primitives.ComposablePart AddExport (System.ComponentModel.Composition.Primitives.Export export);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.ComponentModel.Composition.Primitives.ComposablePart AddExport(class System.ComponentModel.Composition.Primitives.Export export) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="export" Type="System.ComponentModel.Composition.Primitives.Export" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Adds the specified export to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The part added.</para>
-        </returns>
-        <param name="export">
-          <attribution license="cc4" from="Microsoft" modified="false" />The export to add to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AddPart">
-      <MemberSignature Language="C#" Value="public void AddPart (System.ComponentModel.Composition.Primitives.ComposablePart part);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void AddPart(class System.ComponentModel.Composition.Primitives.ComposablePart part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Adds the specified part to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> object.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to add.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="PartsToAdd">
-      <MemberSignature Language="C#" Value="public System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt; PartsToAdd { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.ObjectModel.ReadOnlyCollection`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePart&gt; PartsToAdd" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the collection of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects to be added.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="PartsToRemove">
-      <MemberSignature Language="C#" Value="public System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt; PartsToRemove { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.ObjectModel.ReadOnlyCollection`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePart&gt; PartsToRemove" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Primitives.ComposablePart&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the collection of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects to be removed.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="RemovePart">
-      <MemberSignature Language="C#" Value="public void RemovePart (System.ComponentModel.Composition.Primitives.ComposablePart part);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void RemovePart(class System.ComponentModel.Composition.Primitives.ComposablePart part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Puts the specified part on the list of parts to remove.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to be removed.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionConstants.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionConstants.xml
deleted file mode 100644 (file)
index 6df3b0e..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionConstants" FullName="System.ComponentModel.Composition.Hosting.CompositionConstants">
-  <TypeSignature Language="C#" Value="public static class CompositionConstants" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit CompositionConstants extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Do not create metadata by using any of the keys in this class, except to deliberately interact with the composition system. Other uses will cause unpredictable behavior.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Contains static metadata keys used by the composition system.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="ExportTypeIdentityMetadataName">
-      <MemberSignature Language="C#" Value="public const string ExportTypeIdentityMetadataName;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string ExportTypeIdentityMetadataName" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies the metadata key created by the composition system to mark a part with a unique identifier.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="GenericContractMetadataName">
-      <MemberSignature Language="C#" Value="public const string GenericContractMetadataName;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string GenericContractMetadataName" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies the metadata key created by the composition system to mark a generic contract.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="GenericParametersMetadataName">
-      <MemberSignature Language="C#" Value="public const string GenericParametersMetadataName;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string GenericParametersMetadataName" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies the metadata key created by the composition system to mark generic parameters.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ImportSourceMetadataName">
-      <MemberSignature Language="C#" Value="public const string ImportSourceMetadataName;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string ImportSourceMetadataName" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies the metadata key created by the composition system to mark an import source.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="IsGenericPartMetadataName">
-      <MemberSignature Language="C#" Value="public const string IsGenericPartMetadataName;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string IsGenericPartMetadataName" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies the metadata key created by the composition system to mark an IsGenericPart method.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="PartCreationPolicyMetadataName">
-      <MemberSignature Language="C#" Value="public const string PartCreationPolicyMetadataName;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string PartCreationPolicyMetadataName" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies the metadata key created by the composition system to mark a part with a creation policy.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionContainer.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionContainer.xml
deleted file mode 100644 (file)
index b1879b7..0000000
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionContainer" FullName="System.ComponentModel.Composition.Hosting.CompositionContainer">
-  <TypeSignature Language="C#" Value="public class CompositionContainer : System.ComponentModel.Composition.Hosting.ExportProvider, IDisposable, System.ComponentModel.Composition.ICompositionService" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit CompositionContainer extends System.ComponentModel.Composition.Hosting.ExportProvider implements class System.ComponentModel.Composition.ICompositionService, class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Hosting.ExportProvider</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.ICompositionService</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>A <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object serves two major purposes in an application. First, it keeps track of which parts are available for composition and what their dependencies are, and performs composition whenever the set of available parts changes. Second, it provides the methods by which the application gets instances of composed parts or fills the dependencies of a composable part.</para>
-      <para>Parts can be made available to the container either directly or through the <see cref="P:System.ComponentModel.Composition.Hosting.CompositionContainer.Catalog" /> property. All the parts discoverable in this <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> are available to the container to fulfill imports, along with any parts added directly.</para>
-      <para>The <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.Compose(System.ComponentModel.Composition.Hosting.CompositionBatch)" /> method allows instantiated parts to be added to an existing container. Assuming composition is successful, these parts will have their imports filled with parts retrieved from the container, and their exports will be available to other parts. Imports marked as recomposable will be registered for recomposition.</para>
-      <para>The <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.SatisfyImportsOnce(System.ComponentModel.Composition.Primitives.ComposablePart)" /> method allows a part to have its imports filled without being added to the container. If the composition is successful, the part's imports will be filled, but the part's exports will not be available to other parts and no imports will be registered for recomposition.</para>
-      <para>
-        <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> objects should always be disposed. When the <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.Dispose" /> method is called, the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object also disposes all the parts that it has created.</para>
-      <para>A <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object that can be accessed from multiple threads must be constructed with the <paramref name="isThreadSafe" /> parameter set to true, using the <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.#ctor(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Boolean,System.ComponentModel.Composition.Hosting.ExportProvider[])" /> constructor. Performance will be slightly slower when <paramref name="isThreadSafe" /> is true, so we recommend that you set this parameter to false in single-threaded scenarios. The default is false.</para>
-      <block subset="none" type="note">
-        <para>A <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> should never import itself, or a part that has a reference to it. Such a reference could allow an untrusted part to gain access all the parts in the container.</para>
-      </block>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Manages the composition of parts.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContainer ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContainer (System.ComponentModel.Composition.Hosting.ExportProvider[] providers);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Hosting.ExportProvider[] providers) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="providers" Type="System.ComponentModel.Composition.Hosting.ExportProvider[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class with the specified export providers.</para>
-        </summary>
-        <param name="providers">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> objects that provide the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects, or null to set <see cref="P:System.ComponentModel.Composition.Hosting.CompositionContainer.Providers" /> to an empty <see cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContainer (System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions, System.ComponentModel.Composition.Hosting.ExportProvider[] providers);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions, class System.ComponentModel.Composition.Hosting.ExportProvider[] providers) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="compositionOptions" Type="System.ComponentModel.Composition.Hosting.CompositionOptions" />
-        <Parameter Name="providers" Type="System.ComponentModel.Composition.Hosting.ExportProvider[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class with the specified export providers and options.</para>
-        </summary>
-        <param name="compositionOptions">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that specifies the behavior of this container.</param>
-        <param name="providers">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> objects that provide the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects, or null to set <see cref="P:System.ComponentModel.Composition.Hosting.CompositionContainer.Providers" /> to an empty <see cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContainer (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, System.ComponentModel.Composition.Hosting.ExportProvider[] providers);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, class System.ComponentModel.Composition.Hosting.ExportProvider[] providers) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="providers" Type="System.ComponentModel.Composition.Hosting.ExportProvider[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class with the specified catalog and export providers.</para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />A catalog that provides <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />.</param>
-        <param name="providers">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> objects that provide the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects, or null to set <see cref="P:System.ComponentModel.Composition.Hosting.CompositionContainer.Providers" /> to an empty <see cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContainer (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, bool isThreadSafe, System.ComponentModel.Composition.Hosting.ExportProvider[] providers);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, bool isThreadSafe, class System.ComponentModel.Composition.Hosting.ExportProvider[] providers) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="isThreadSafe" Type="System.Boolean" />
-        <Parameter Name="providers" Type="System.ComponentModel.Composition.Hosting.ExportProvider[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object that can be accessed from multiple threads must set the <paramref name="isThreadSafe" /> parameter to true. Performance will be slightly slower when <paramref name="isThreadSafe" /> is true, so we recommend that you set this parameter to false in single-threaded scenarios. The default is false.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class with the specified catalog, thread-safe mode, and export providers. </para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />A catalog that provides <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />.</param>
-        <param name="isThreadSafe">
-          <attribution license="cc4" from="Microsoft" modified="false" />true if this <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object must be thread-safe; otherwise, false.</param>
-        <param name="providers">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> objects that provide the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects, or null to set the <see cref="P:System.ComponentModel.Composition.Hosting.CompositionContainer.Providers" /> property to an empty <see cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContainer (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions, System.ComponentModel.Composition.Hosting.ExportProvider[] providers);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, valuetype System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions, class System.ComponentModel.Composition.Hosting.ExportProvider[] providers) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="compositionOptions" Type="System.ComponentModel.Composition.Hosting.CompositionOptions" />
-        <Parameter Name="providers" Type="System.ComponentModel.Composition.Hosting.ExportProvider[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class with the specified catalog, options, and export providers.</para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />A catalog that provides <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />.</param>
-        <param name="compositionOptions">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that specifies options that affect the behavior of the container.</param>
-        <param name="providers">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> objects that provide the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects, or null to set <see cref="P:System.ComponentModel.Composition.Hosting.CompositionContainer.Providers" /> to an empty <see cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Catalog">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Primitives.ComposablePartCatalog Catalog { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ComposablePartCatalog Catalog" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> that provides the container access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Compose">
-      <MemberSignature Language="C#" Value="public void Compose (System.ComponentModel.Composition.Hosting.CompositionBatch batch);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Compose(class System.ComponentModel.Composition.Hosting.CompositionBatch batch) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This method is the primary way of directly adding or removing parts from the container. The <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> will always maintain a stable, composed state. Therefore, calling <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.Compose(System.ComponentModel.Composition.Hosting.CompositionBatch)" /> with an empty <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> is never necessary to start composition. Instead, call the <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.Compose(System.ComponentModel.Composition.Hosting.CompositionBatch)" /> method whenever you need to make changes to the parts available to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />.</para>
-          <para>The <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> can contain both parts to be added and parts to be removed.  Recomposition will take place only once for each call to <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.Compose(System.ComponentModel.Composition.Hosting.CompositionBatch)" />.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Adds or removes the parts in the specified <see cref="T:System.ComponentModel.Composition.Hosting.CompositionBatch" /> from the container and executes composition.</para>
-        </summary>
-        <param name="batch">
-          <attribution license="cc4" from="Microsoft" modified="false" />Changes to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> to include during the composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected virtual void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportsCore">
-      <MemberSignature Language="C#" Value="protected override System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Implementations should not treat cardinality-related mismatches as errors and should not throw exceptions for cardinality-related mismatches. For example, if the import requests exactly one export and the provider has either no matching exports or more than one, the <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)" /> method should return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection of <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a collection of all exports that match the conditions in the specified <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of all the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects in this <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object that match the conditions specified by <paramref name="definition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object that defines the conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to get.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition transaction to use, or null to disable transactional composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Providers">
-      <MemberSignature Language="C#" Value="public System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Hosting.ExportProvider&gt; Providers { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.ObjectModel.ReadOnlyCollection`1&lt;class System.ComponentModel.Composition.Hosting.ExportProvider&gt; Providers" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.Hosting.ExportProvider&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the export providers that provide the container access to additional <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> objects.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ReleaseExport">
-      <MemberSignature Language="C#" Value="public void ReleaseExport (System.ComponentModel.Composition.Primitives.Export export);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ReleaseExport(class System.ComponentModel.Composition.Primitives.Export export) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="export" Type="System.ComponentModel.Composition.Primitives.Export" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The behavior of this method may vary depending on the implementation of the <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> that produced the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> instance. As a rule, non-shared exports should be detached from the container.</para>
-          <para>For example, the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> will only release an <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> if it comes from a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> that was constructed under a <see cref="F:System.ComponentModel.Composition.CreationPolicy.NonShared" /> context. Release in this context means walking the dependency chain of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects, detaching references from the container and calling Dispose on the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects as needed. If the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> was constructed under a <see cref="F:System.ComponentModel.Composition.CreationPolicy.Shared" /> context the <see cref="T:System.ComponentModel.Composition.Hosting.CatalogExportProvider" /> will do nothing, as the specified <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> may being used by other requestors. Those will only be detached when the container is itself disposed.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the specified <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object from the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />. </para>
-        </summary>
-        <param name="export">
-          <attribution license="cc4" from="Microsoft" modified="false" />The <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> that needs to be released.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ReleaseExport&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public void ReleaseExport&lt;T&gt; (Lazy&lt;T&gt; export);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ReleaseExport&lt;T&gt;(class System.Lazy`1&lt;!!T&gt; export) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="export" Type="System.Lazy&lt;T&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Removes the specified export from composition and releases its resources if possible.</para>
-        </summary>
-        <param name="export">
-          <attribution license="cc4" from="Microsoft" modified="false" />An indirect reference to the export to remove.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the export.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="ReleaseExports">
-      <MemberSignature Language="C#" Value="public void ReleaseExports (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; exports);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ReleaseExports(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; exports) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="exports" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The behavior of this method may vary depending on the context in which the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> was constructed. For more information, see the <see cref="M:System.ComponentModel.Composition.Hosting.CompositionContainer.ReleaseExport(System.ComponentModel.Composition.Primitives.Export)" /> method.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases a set of <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects from the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />. </para>
-        </summary>
-        <param name="exports">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to be released.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ReleaseExports&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public void ReleaseExports&lt;T&gt; (System.Collections.Generic.IEnumerable&lt;Lazy&lt;T&gt;&gt; exports);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ReleaseExports&lt;T&gt;(class System.Collections.Generic.IEnumerable`1&lt;class System.Lazy`1&lt;!!T&gt;&gt; exports) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="exports" Type="System.Collections.Generic.IEnumerable&lt;System.Lazy&lt;T&gt;&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Removes a collection of exports from composition and releases their resources if possible.</para>
-        </summary>
-        <param name="exports">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of indirect references to the exports to be removed.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the exports.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="ReleaseExports&lt;T,TMetadataView&gt;">
-      <MemberSignature Language="C#" Value="public void ReleaseExports&lt;T,TMetadataView&gt; (System.Collections.Generic.IEnumerable&lt;Lazy&lt;T,TMetadataView&gt;&gt; exports);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ReleaseExports&lt;T, TMetadataView&gt;(class System.Collections.Generic.IEnumerable`1&lt;class System.Lazy`2&lt;!!T, !!TMetadataView&gt;&gt; exports) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-        <TypeParameter Name="TMetadataView" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="exports" Type="System.Collections.Generic.IEnumerable&lt;System.Lazy&lt;T,TMetadataView&gt;&gt;" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <typeparam name="TMetadataView">To be added.</typeparam>
-        <param name="exports">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="SatisfyImportsOnce">
-      <MemberSignature Language="C#" Value="public void SatisfyImportsOnce (System.ComponentModel.Composition.Primitives.ComposablePart part);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void SatisfyImportsOnce(class System.ComponentModel.Composition.Primitives.ComposablePart part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Satisfies the imports of the specified <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object without registering it for recomposition.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to satisfy the imports of.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionOptions.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionOptions.xml
deleted file mode 100644 (file)
index 21b808a..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionOptions" FullName="System.ComponentModel.Composition.Hosting.CompositionOptions">
-  <TypeSignature Language="C#" Value="public enum CompositionOptions" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed CompositionOptions extends System.Enum" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Flags</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Defines options for export providers.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="Default">
-      <MemberSignature Language="C#" Value="Default" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.Hosting.CompositionOptions Default = int32(0)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.CompositionOptions</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>No options are defined.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="DisableSilentRejection">
-      <MemberSignature Language="C#" Value="DisableSilentRejection" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.Hosting.CompositionOptions DisableSilentRejection = int32(1)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.CompositionOptions</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Silent rejection is disabled, so all rejections will result in errors.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ExportCompositionService">
-      <MemberSignature Language="C#" Value="ExportCompositionService" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.Hosting.CompositionOptions ExportCompositionService = int32(4)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.CompositionOptions</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This provider is an export composition service.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="IsThreadSafe">
-      <MemberSignature Language="C#" Value="IsThreadSafe" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.Hosting.CompositionOptions IsThreadSafe = int32(2)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.CompositionOptions</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This provider should be thread-safe.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml
deleted file mode 100644 (file)
index dffd288..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionScopeDefinition" FullName="System.ComponentModel.Composition.Hosting.CompositionScopeDefinition">
-  <TypeSignature Language="C#" Value="public class CompositionScopeDefinition : System.ComponentModel.Composition.Primitives.ComposablePartCatalog, System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit CompositionScopeDefinition extends System.ComponentModel.Composition.Primitives.ComposablePartCatalog implements class System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.Hosting.CompositionScopeDefinitionDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents a node in a tree of scoped catalogs, reflecting an underlying catalog and its child scopes.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CompositionScopeDefinition ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionScopeDefinition (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt; children);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt; children) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="children" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition" /> class with the specified underlying catalog and children.</para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The underlying catalog for this catalog.</param>
-        <param name="children">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of the child scopes of this catalog.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionScopeDefinition (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt; children, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; publicSurface);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt; children, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; publicSurface) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="children" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt;" />
-        <Parameter Name="publicSurface" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition" /> class with the specified underlying catalog, children, and public surface.</para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The underlying catalog for this catalog.</param>
-        <param name="children">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of the child scopes of this catalog.</param>
-        <param name="publicSurface">
-          <attribution license="cc4" from="Microsoft" modified="false" />The public surface for this catalog.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Changed">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the underlying catalog has changed, if that catalog supports notifications.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Changing">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the underlying catalog is changing, if that catalog supports notifications.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Children">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt; Children { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt; Children" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Hosting.CompositionScopeDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the child scopes of this catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This method is called only by the public Dispose() and Finalize() methods; do not call this method directly.When you implement the dispose pattern, the Boolean parameter of the Dispose(Boolean) method should be used as follows:</para>
-          <list type="bullet">
-            <item>
-              <para>The Dispose() method of the current object should call Dispose(Boolean) with the Boolean parameter set to true to release both managed and unmanaged resources.</para>
-            </item>
-            <item>
-              <para>The Finalize() method of the current object should call Dispose(Boolean) with the Boolean parameter set to false to release only unmanaged resources.</para>
-            </item>
-          </list>
-          <para>For more information, see <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Called by the Dispose() and Finalize() methods to release the managed and unmanaged resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition" /> class.</para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release managed and unmanaged resources; false to release only unmanaged resources.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerable&lt;Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.Tuple`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of exports that match the conditions specified by the import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of exports that match the specified conditions.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />Conditions that specify which exports to match.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanged (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanged(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition.Changed" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />Contains data for the <see cref="E:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition.Changed" /> event.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanging">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanging (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanging(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition.Changing" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />Contains data for the <see cref="E:System.ComponentModel.Composition.Hosting.CompositionScopeDefinition.Changing" /> event.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="PublicSurface">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; PublicSurface { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; PublicSurface" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of parts visible to the parent scope of this catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionService.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/CompositionService.xml
deleted file mode 100644 (file)
index a490bd4..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionService" FullName="System.ComponentModel.Composition.Hosting.CompositionService">
-  <TypeSignature Language="C#" Value="public class CompositionService : IDisposable, System.ComponentModel.Composition.ICompositionService" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit CompositionService extends System.Object implements class System.ComponentModel.Composition.ICompositionService, class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.ICompositionService</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides methods to satisfy imports on an existing part instance.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="SatisfyImportsOnce">
-      <MemberSignature Language="C#" Value="public void SatisfyImportsOnce (System.ComponentModel.Composition.Primitives.ComposablePart part);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void SatisfyImportsOnce(class System.ComponentModel.Composition.Primitives.ComposablePart part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Composes the specified part, with recomposition and validation disabled.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to compose.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/DirectoryCatalog.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/DirectoryCatalog.xml
deleted file mode 100644 (file)
index 610a5c3..0000000
+++ /dev/null
@@ -1,556 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="DirectoryCatalog" FullName="System.ComponentModel.Composition.Hosting.DirectoryCatalog">
-  <TypeSignature Language="C#" Value="public class DirectoryCatalog : System.ComponentModel.Composition.Primitives.ComposablePartCatalog, System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged, System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit DirectoryCatalog extends System.ComponentModel.Composition.Primitives.ComposablePartCatalog implements class System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged, class System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Primitives.ICompositionElement</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.Hosting.DirectoryCatalog/DirectoryCatalogDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>You can use a <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> object to parse the contents of a designated directory. Any attributed parts contained in dynamic link library (DLL) files are extracted and made available through the catalog.To restrict parsing to specific DLLs, you can specify a search pattern by using the same syntax as the <see cref="M:System.IO.Directory.GetFiles(System.String,System.String)" /> method.</para>
-      <block subset="none" type="note">
-        <para>The designated directory should not allow access to non-administrators. For example, using a folder that contains temporary Internet files could create vulnerabilities in your application.</para>
-      </block>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Discovers attributed parts in the assemblies in a specified directory.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects based on all the DLL files in the specified directory path.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects based on all the DLL files in the specified directory path with the specified source for parts.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path, System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects based on all the DLL files in the specified directory path, in the specified reflection context.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used to create parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path, string searchPattern);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path, string searchPattern) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-        <Parameter Name="searchPattern" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects that match a specified search pattern in the specified directory path.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-        <param name="searchPattern">
-          <attribution license="cc4" from="Microsoft" modified="false" />The search string. The format of the string should be the same as specified for the <see cref="M:System.IO.Directory.GetFiles(System.String,System.String)" /> method.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path, System.Reflection.ReflectionContext reflectionContext, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path, class System.Reflection.ReflectionContext reflectionContext, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by  using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects based on all the DLL files in the specified directory path, in the specified reflection context.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used to create parts.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path, string searchPattern, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path, string searchPattern, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-        <Parameter Name="searchPattern" Type="System.String" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects based on the specified search pattern in the specified directory path with the specified source for parts.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-        <param name="searchPattern">
-          <attribution license="cc4" from="Microsoft" modified="false" />The search string. The format of the string should be the same as specified for the <see cref="M:System.IO.Directory.GetFiles(System.String,System.String)" /> method.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path, string searchPattern, System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path, string searchPattern, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-        <Parameter Name="searchPattern" Type="System.String" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects based on the specified search pattern in the specified directory path, using the specified reflection context.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-        <param name="searchPattern">
-          <attribution license="cc4" from="Microsoft" modified="false" />The search string. The format of the string should be the same as specified for the <see cref="M:System.IO.Directory.GetFiles(System.String,System.String)" /> method.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used to create parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DirectoryCatalog (string path, string searchPattern, System.Reflection.ReflectionContext reflectionContext, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path, string searchPattern, class System.Reflection.ReflectionContext reflectionContext, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="path" Type="System.String" />
-        <Parameter Name="searchPattern" Type="System.String" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> class by using <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects based on the specified search pattern in the specified directory path, using the specified reflection context.</para>
-        </summary>
-        <param name="path">
-          <attribution license="cc4" from="Microsoft" modified="false" />The path to the directory to scan for assemblies to add to the catalog.</param>
-        <param name="searchPattern">
-          <attribution license="cc4" from="Microsoft" modified="false" />The search string. The format of the string should be the same as specified for the <see cref="M:System.IO.Directory.GetFiles(System.String,System.String)" /> method.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used to create parts.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Changed">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the contents of the catalog has changed.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Changing">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the catalog is changing.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="FullPath">
-      <MemberSignature Language="C#" Value="public string FullPath { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string FullPath" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the translated absolute path observed by the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerable&lt;Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.Tuple`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the export definitions that match the constraint expressed by the specified import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of objects that contain the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects and their associated <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects that match the constraint specified by <paramref name="definition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects to be returned.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="LoadedFiles">
-      <MemberSignature Language="C#" Value="public System.Collections.ObjectModel.ReadOnlyCollection&lt;string&gt; LoadedFiles { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.ObjectModel.ReadOnlyCollection`1&lt;string&gt; LoadedFiles" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.ObjectModel.ReadOnlyCollection&lt;System.String&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the collection of files currently loaded in the catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanged (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanged(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.DirectoryCatalog.Changed" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object  that contains the event data. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanging">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanging (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanging(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.DirectoryCatalog.Changing" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object  that contains the event data.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Path">
-      <MemberSignature Language="C#" Value="public string Path { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string Path" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the path observed by the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Refresh">
-      <MemberSignature Language="C#" Value="public void Refresh ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Refresh() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>If files were added to the directory, they are also added to the catalog. If files were removed from the directory, they are also removed from the catalog. For files that have been removed, the assembly cannot be unloaded from the process, so <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects for those files will be removed only from the catalog.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Refreshes the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects with the latest files in the directory that match the search pattern. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="SearchPattern">
-      <MemberSignature Language="C#" Value="public string SearchPattern { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string SearchPattern" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the search pattern that is passed into the constructor of the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName">
-      <MemberSignature Language="C#" Value="string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the display name of the directory catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.Origin">
-      <MemberSignature Language="C#" Value="System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ICompositionElement</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.DirectoryCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition element from which the directory catalog originated.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a string representation of the directory catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A string representation of the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ExportProvider.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ExportProvider.xml
deleted file mode 100644 (file)
index 77778f5..0000000
+++ /dev/null
@@ -1,761 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportProvider" FullName="System.ComponentModel.Composition.Hosting.ExportProvider">
-  <TypeSignature Language="C#" Value="public abstract class ExportProvider" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract beforefieldinit ExportProvider extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Retrieves exports which match a specified <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> object.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ExportProvider ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ExportsChanged">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs&gt; ExportsChanged;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs&gt; ExportsChanged" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the exports in the <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> change.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ExportsChanging">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs&gt; ExportsChanging;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs&gt; ExportsChanging" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the provided exports are changing.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExport&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public Lazy&lt;T&gt; GetExport&lt;T&gt; ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Lazy`1&lt;!!T&gt; GetExport&lt;T&gt;() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Lazy&lt;T&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns the export with the contract name derived from the specified type parameter. If there is not exactly one matching export, an exception is thrown.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The export with the contract name derived from the specified type parameter.</para>
-        </returns>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`1" /> object to return. The contract name is also derived from this type parameter.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExport&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public Lazy&lt;T&gt; GetExport&lt;T&gt; (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Lazy`1&lt;!!T&gt; GetExport&lt;T&gt;(string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Lazy&lt;T&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns the export with the specified contract name. If there is not exactly one matching export, an exception is thrown.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The export with the specified contract name.</para>
-        </returns>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.Lazy`1" /> object to return, or null or an empty string ("") to use the default contract name.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`1" /> object to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExport&lt;T,TMetadataView&gt;">
-      <MemberSignature Language="C#" Value="public Lazy&lt;T,TMetadataView&gt; GetExport&lt;T,TMetadataView&gt; ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Lazy`2&lt;!!T, !!TMetadataView&gt; GetExport&lt;T, TMetadataView&gt;() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Lazy&lt;T,TMetadataView&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-        <TypeParameter Name="TMetadataView" />
-      </TypeParameters>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns the export with the contract name derived from the specified type parameter. If there is not exactly one matching export, an exception is thrown.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>System.Lazy`2</para>
-        </returns>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`2" /> object to return. The contract name is also derived from this type parameter.</typeparam>
-        <typeparam name="TMetadataView">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the metadata view of the <see cref="T:System.Lazy`2" /> object to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExport&lt;T,TMetadataView&gt;">
-      <MemberSignature Language="C#" Value="public Lazy&lt;T,TMetadataView&gt; GetExport&lt;T,TMetadataView&gt; (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Lazy`2&lt;!!T, !!TMetadataView&gt; GetExport&lt;T, TMetadataView&gt;(string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Lazy&lt;T,TMetadataView&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-        <TypeParameter Name="TMetadataView" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns the export with the specified contract name. If there is not exactly one matching export, an exception is thrown.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The export with the specified contract name.</para>
-        </returns>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.Lazy`2" /> object to return, or null or an empty string ("") to use the default contract name.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`2" /> object to return.</typeparam>
-        <typeparam name="TMetadataView">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the metadata view of the <see cref="T:System.Lazy`2" /> object to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public T GetExportedValue&lt;T&gt; ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance !!T GetExportedValue&lt;T&gt;() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>T</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns the exported object with the contract name derived from the specified type parameter. If there is not exactly one matching exported object, an exception is thrown.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported object with the contract name derived from the specified type parameter.</para>
-        </returns>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the exported object to return. The contract name is also derived from this type parameter.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public T GetExportedValue&lt;T&gt; (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance !!T GetExportedValue&lt;T&gt;(string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>T</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns the exported object with the specified contract name. If there is not exactly one matching exported object, an exception is thrown.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported object with the specified contract name.</para>
-        </returns>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the exported object to return, or null or an empty string ("") to use the default contract name.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the exported object to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValueOrDefault&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public T GetExportedValueOrDefault&lt;T&gt; ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance !!T GetExportedValueOrDefault&lt;T&gt;() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>T</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>If the exported object is not found, this method returns the appropriate default value for <paramref name="T" />; for example, zero for integer types, false for Boolean types, and null for reference types.</para>
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exported object with the contract name derived from the specified type parameter or the default value for the specified type, or throws an exception if there is more than one matching exported object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported object with the contract name derived from <paramref name="T" />, if found; otherwise, the default value for <paramref name="T" />.</para>
-        </returns>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the exported object to return. The contract name is also derived from this type parameter.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValueOrDefault&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public T GetExportedValueOrDefault&lt;T&gt; (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance !!T GetExportedValueOrDefault&lt;T&gt;(string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>T</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>If the exported object is not found, this method returns the appropriate default value for <paramref name="T" />; for example, zero for integer types, false for Boolean types, and null for reference types.</para>
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exported object with the specified contract name or the default value for the specified type, or throws an exception if there is more than one matching exported object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported object with the specified contract name, if found; otherwise, the default value for <paramref name="T" />.</para>
-        </returns>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the exported object to return, or null or an empty string ("") to use the default contract name.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the exported object to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValues&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;T&gt; GetExportedValues&lt;T&gt; ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;!!T&gt; GetExportedValues&lt;T&gt;() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;T&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exported objects with the contract name derived from the specified type parameter.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported objects with the contract name derived from the specified type parameter, if found; otherwise, an empty <see cref="T:System.Collections.ObjectModel.Collection`1" /> object.</para>
-        </returns>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the exported object to return. The contract name is also derived from this type parameter.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValues&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;T&gt; GetExportedValues&lt;T&gt; (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;!!T&gt; GetExportedValues&lt;T&gt;(string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;T&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exported objects with the specified contract name.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported objects with the specified contract name, if found; otherwise, an empty <see cref="T:System.Collections.ObjectModel.Collection`1" /> object.</para>
-        </returns>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the exported objects to return; or null or an empty string ("") to use the default contract name.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the exported object to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all exports that match the conditions of the specified import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of all the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects matching the condition specified by <paramref name="definition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object that defines the conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to get.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all exports that match the conditions of the specified import definition and composition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of all the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects matching the condition specified by <paramref name="definition" /> and <paramref name="atomicComposition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object that defines the conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to get.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The transactional container for the composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Lazy&lt;object,object&gt;&gt; GetExports (Type type, Type metadataViewType, string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;class System.Lazy`2&lt;object, object&gt;&gt; GetExports(class System.Type type, class System.Type metadataViewType, string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Lazy&lt;System.Object,System.Object&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="type" Type="System.Type" />
-        <Parameter Name="metadataViewType" Type="System.Type" />
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="type" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exports with the specified contract name.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of all the <see cref="T:System.Lazy`2" /> objects for the contract matching <paramref name="contractName" />.</para>
-        </returns>
-        <param name="type">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`2" /> objects to return.</param>
-        <param name="metadataViewType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the metadata view of the <see cref="T:System.Lazy`2" /> objects to return.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.Lazy`2" /> object to return, or null or an empty string ("") to use the default contract name.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Lazy&lt;T&gt;&gt; GetExports&lt;T&gt; ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;class System.Lazy`1&lt;!!T&gt;&gt; GetExports&lt;T&gt;() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Lazy&lt;T&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exports with the contract name derived from the specified type parameter.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The <see cref="T:System.Lazy`1" /> objects with the contract name derived from <paramref name="T" />, if found; otherwise, an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> object.</para>
-        </returns>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`1" /> objects to return. The contract name is also derived from this type parameter.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Lazy&lt;T&gt;&gt; GetExports&lt;T&gt; (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;class System.Lazy`1&lt;!!T&gt;&gt; GetExports&lt;T&gt;(string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Lazy&lt;T&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exports with the specified contract name.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The <see cref="T:System.Lazy`1" /> objects with the specified contract name, if found; otherwise, an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> object.</para>
-        </returns>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.Lazy`1" /> objects to return, or null or an empty string ("") to use the default contract name.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`1" /> objects to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports&lt;T,TMetadataView&gt;">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Lazy&lt;T,TMetadataView&gt;&gt; GetExports&lt;T,TMetadataView&gt; ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;class System.Lazy`2&lt;!!T, !!TMetadataView&gt;&gt; GetExports&lt;T, TMetadataView&gt;() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Lazy&lt;T,TMetadataView&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-        <TypeParameter Name="TMetadataView" />
-      </TypeParameters>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exports with the contract name derived from the specified type parameter.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The <see cref="T:System.Lazy`2" /> objects with the contract name derived from <paramref name="T" />, if found; otherwise, an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> object.</para>
-        </returns>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`2" /> objects to return. The contract name is also derived from this type parameter.</typeparam>
-        <typeparam name="TMetadataView">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the metadata view of the <see cref="T:System.Lazy`2" /> objects to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports&lt;T,TMetadataView&gt;">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Lazy&lt;T,TMetadataView&gt;&gt; GetExports&lt;T,TMetadataView&gt; (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.IEnumerable`1&lt;class System.Lazy`2&lt;!!T, !!TMetadataView&gt;&gt; GetExports&lt;T, TMetadataView&gt;(string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Lazy&lt;T,TMetadataView&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-        <TypeParameter Name="TMetadataView" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="T" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exports with the specified contract name.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The <see cref="T:System.Lazy`2" /> objects with the specified contract name if found; otherwise, an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> object.</para>
-        </returns>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.Lazy`2" /> objects to return, or null or an empty string ("") to use the default contract name.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type parameter of the <see cref="T:System.Lazy`2" /> objects to return. The contract name is also derived from this type parameter.</typeparam>
-        <typeparam name="TMetadataView">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the metadata view of the <see cref="T:System.Lazy`2" /> objects to return.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportsCore">
-      <MemberSignature Language="C#" Value="protected abstract System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; GetExportsCore(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this method should not treat cardinality-related mismatches as errors, and should not throw exceptions in those cases. For example, if <see cref="P:System.ComponentModel.Composition.Primitives.ImportDefinition.Cardinality" /> is <see cref="F:System.ComponentModel.Composition.Primitives.ImportCardinality.ExactlyOne" /> and there are zero <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects that match the conditions of the specified <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" />, an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection should be returned.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets all the exports that match the constraint defined by the specified definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection that contains all the exports that match the specified condition.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object that defines the conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects to return.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The transactional container for the composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnExportsChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnExportsChanged (System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnExportsChanged(class System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.ExportProvider.ExportsChanged" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />An <see cref="T:System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs" /> that contains the event data.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnExportsChanging">
-      <MemberSignature Language="C#" Value="protected virtual void OnExportsChanging (System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnExportsChanging(class System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.ExportProvider.ExportsChanging" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />An <see cref="T:System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs" /> that contains the event data.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="TryGetExports">
-      <MemberSignature Language="C#" Value="public bool TryGetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition, out System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; exports);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool TryGetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; exports) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-        <Parameter Name="exports" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;&amp;" RefType="out" />
-      </Parameters>
-      <Docs>
-        <param name="definition">To be added.</param>
-        <param name="atomicComposition">To be added.</param>
-        <param name="exports">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ExportsChangeEventArgs.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ExportsChangeEventArgs.xml
deleted file mode 100644 (file)
index dfa725e..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportsChangeEventArgs" FullName="System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs">
-  <TypeSignature Language="C#" Value="public class ExportsChangeEventArgs : EventArgs" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ExportsChangeEventArgs extends System.EventArgs" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.EventArgs</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides data for the <see cref="E:System.ComponentModel.Composition.Hosting.ExportProvider.ExportsChanging" /> and <see cref="E:System.ComponentModel.Composition.Hosting.ExportProvider.ExportsChanged" /> event. </para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportsChangeEventArgs (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; addedExports, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; removedExports, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; addedExports, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; removedExports, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="addedExports" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;" />
-        <Parameter Name="removedExports" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs" /> class. </para>
-        </summary>
-        <param name="addedExports">
-          <attribution license="cc4" from="Microsoft" modified="false" />The events that were added.</param>
-        <param name="removedExports">
-          <attribution license="cc4" from="Microsoft" modified="false" />The events that were removed.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition transaction that contains the change.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AddedExports">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; AddedExports { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; AddedExports" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exports that were added in this change.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="AtomicComposition">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.AtomicComposition</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition transaction of the change, if any.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ChangedContractNames">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;string&gt; ChangedContractNames { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;string&gt; ChangedContractNames" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.String&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract names that were altered in the change.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="RemovedExports">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; RemovedExports { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; RemovedExports" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exports that were removed in the change.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml
deleted file mode 100644 (file)
index c152fc4..0000000
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="FilteredCatalog" FullName="System.ComponentModel.Composition.Hosting.FilteredCatalog">
-  <TypeSignature Language="C#" Value="public class FilteredCatalog : System.ComponentModel.Composition.Primitives.ComposablePartCatalog, System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit FilteredCatalog extends System.ComponentModel.Composition.Primitives.ComposablePartCatalog implements class System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents a catalog after a filter function is applied to it.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FilteredCatalog (System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, Func&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,bool&gt; filter);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, bool&gt; filter) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-        <Parameter Name="filter" Type="System.Func&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.FilteredCatalog" /> class with the specified underlying catalog and filter.</para>
-        </summary>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The underlying catalog.</param>
-        <param name="filter">
-          <attribution license="cc4" from="Microsoft" modified="false" />The function to filter parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Changed">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the underlying catalog has changed.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Changing">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when the underlying catalog is changing.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Complement">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.FilteredCatalog Complement { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Hosting.FilteredCatalog Complement" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.FilteredCatalog</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a catalog that contains parts that are present in the underlying catalog but that were filtered out by the filter function.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This method is called only by the public Dispose() and Finalize() methods; do not call this method directly.When you implement the dispose pattern, the Boolean parameter of the Dispose(Boolean) method should be used as follows:</para>
-          <list type="bullet">
-            <item>
-              <para>The Dispose() method of the current object should call Dispose(Boolean) with the Boolean parameter set to true to release both managed and unmanaged resources.</para>
-            </item>
-            <item>
-              <para>The Finalize() method of the current object should call Dispose(Boolean) with the Boolean parameter set to false to release only unmanaged resources.</para>
-            </item>
-          </list>
-          <para>For more information, see <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Called by the Dispose() and Finalize() methods to release the managed and unmanaged resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.FilteredCatalog" /> class.</para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release managed and unmanaged resources; false to release only unmanaged resources.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerable&lt;Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.Tuple`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exported parts from this catalog that match the specified import.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of matching parts.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import to match.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="IncludeDependencies">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependencies ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependencies() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.FilteredCatalog</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a new <see cref="T:System.ComponentModel.Composition.Hosting.FilteredCatalog" /> object that contains all the parts from this catalog and all their dependencies.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The new catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="IncludeDependencies">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependencies (Func&lt;System.ComponentModel.Composition.Primitives.ImportDefinition,bool&gt; importFilter);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependencies(class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ImportDefinition, bool&gt; importFilter) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.FilteredCatalog</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importFilter" Type="System.Func&lt;System.ComponentModel.Composition.Primitives.ImportDefinition,System.Boolean&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a new <see cref="T:System.ComponentModel.Composition.Hosting.FilteredCatalog" /> object that contains all the parts from this catalog and all dependencies that can be reached through imports that match the specified filter.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The new catalog.</para>
-        </returns>
-        <param name="importFilter">
-          <attribution license="cc4" from="Microsoft" modified="false" />The filter for imports.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="IncludeDependents">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependents ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependents() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.FilteredCatalog</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a new <see cref="T:System.ComponentModel.Composition.Hosting.FilteredCatalog" /> object that contains all the parts from this catalog and all their dependents.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The new catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="IncludeDependents">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependents (Func&lt;System.ComponentModel.Composition.Primitives.ImportDefinition,bool&gt; importFilter);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.ComponentModel.Composition.Hosting.FilteredCatalog IncludeDependents(class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ImportDefinition, bool&gt; importFilter) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.FilteredCatalog</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importFilter" Type="System.Func&lt;System.ComponentModel.Composition.Primitives.ImportDefinition,System.Boolean&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a new <see cref="T:System.ComponentModel.Composition.Hosting.FilteredCatalog" /> object that contains all the parts from this catalog and all dependents that can be reached through imports that match the specified filter.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The new catalog.</para>
-        </returns>
-        <param name="importFilter">
-          <attribution license="cc4" from="Microsoft" modified="false" />The filter for imports.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanged (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanged(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.FilteredCatalog.Changed" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />Provides data for the event.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="OnChanging">
-      <MemberSignature Language="C#" Value="protected virtual void OnChanging (System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnChanging(class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs e) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="e" Type="System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Raises the <see cref="E:System.ComponentModel.Composition.Hosting.FilteredCatalog.Changing" /> event.</para>
-        </summary>
-        <param name="e">
-          <attribution license="cc4" from="Microsoft" modified="false" />Provides data for the event.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/INotifyComposablePartCatalogChanged.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/INotifyComposablePartCatalogChanged.xml
deleted file mode 100644 (file)
index 566aa4b..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="INotifyComposablePartCatalogChanged" FullName="System.ComponentModel.Composition.Hosting.INotifyComposablePartCatalogChanged">
-  <TypeSignature Language="C#" Value="public interface INotifyComposablePartCatalogChanged" />
-  <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract INotifyComposablePartCatalogChanged" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides notifications when a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> changes.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="Changed">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changed" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> has changed.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Changing">
-      <MemberSignature Language="C#" Value="public event EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt; Changing" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Occurs when a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> is changing.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ImportEngine.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ImportEngine.xml
deleted file mode 100644 (file)
index fb30567..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportEngine" FullName="System.ComponentModel.Composition.Hosting.ImportEngine">
-  <TypeSignature Language="C#" Value="public class ImportEngine : IDisposable, System.ComponentModel.Composition.ICompositionService" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ImportEngine extends System.Object implements class System.ComponentModel.Composition.ICompositionService, class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.ICompositionService</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>This class is used internally by <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />. You should generally not use it unless you are authoring a container.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Performs composition for containers.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportEngine (System.ComponentModel.Composition.Hosting.ExportProvider sourceProvider);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Hosting.ExportProvider sourceProvider) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="sourceProvider" Type="System.ComponentModel.Composition.Hosting.ExportProvider" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> class. </para>
-        </summary>
-        <param name="sourceProvider">
-          <attribution license="cc4" from="Microsoft" modified="false" />The <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> that provides the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportEngine (System.ComponentModel.Composition.Hosting.ExportProvider sourceProvider, bool isThreadSafe);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Hosting.ExportProvider sourceProvider, bool isThreadSafe) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="sourceProvider" Type="System.ComponentModel.Composition.Hosting.ExportProvider" />
-        <Parameter Name="isThreadSafe" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> class, optionally in thread-safe mode.</para>
-        </summary>
-        <param name="sourceProvider">
-          <attribution license="cc4" from="Microsoft" modified="false" />The <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> that provides the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</param>
-        <param name="isThreadSafe">
-          <attribution license="cc4" from="Microsoft" modified="false" />true if thread safety is required; otherwise, false.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportEngine (System.ComponentModel.Composition.Hosting.ExportProvider sourceProvider, System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Hosting.ExportProvider sourceProvider, valuetype System.ComponentModel.Composition.Hosting.CompositionOptions compositionOptions) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="sourceProvider" Type="System.ComponentModel.Composition.Hosting.ExportProvider" />
-        <Parameter Name="compositionOptions" Type="System.ComponentModel.Composition.Hosting.CompositionOptions" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> class with the specified options.</para>
-        </summary>
-        <param name="sourceProvider">
-          <attribution license="cc4" from="Microsoft" modified="false" />The <see cref="T:System.ComponentModel.Composition.Hosting.ExportProvider" /> that provides the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> access to <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects.</param>
-        <param name="compositionOptions">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that specifies options that affect the behavior of the engine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected virtual void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.ImportEngine" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="PreviewImports">
-      <MemberSignature Language="C#" Value="public void PreviewImports (System.ComponentModel.Composition.Primitives.ComposablePart part, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void PreviewImports(class System.ComponentModel.Composition.Primitives.ComposablePart part, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Previews all the required imports for the specified part to make sure that they can be satisfied, without actually setting them.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to preview the imports of.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition transaction to use, or null for no composition transaction.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ReleaseImports">
-      <MemberSignature Language="C#" Value="public void ReleaseImports (System.ComponentModel.Composition.Primitives.ComposablePart part, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ReleaseImports(class System.ComponentModel.Composition.Primitives.ComposablePart part, class System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-        <Parameter Name="atomicComposition" Type="System.ComponentModel.Composition.Hosting.AtomicComposition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all the exports used to satisfy the imports of the specified part.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to release the imports of.</param>
-        <param name="atomicComposition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition transaction to use, or null for no composition transaction.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="SatisfyImports">
-      <MemberSignature Language="C#" Value="public void SatisfyImports (System.ComponentModel.Composition.Primitives.ComposablePart part);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void SatisfyImports(class System.ComponentModel.Composition.Primitives.ComposablePart part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Satisfies the imports of the specified part.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to satisfy the imports of.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="SatisfyImportsOnce">
-      <MemberSignature Language="C#" Value="public void SatisfyImportsOnce (System.ComponentModel.Composition.Primitives.ComposablePart part);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void SatisfyImportsOnce(class System.ComponentModel.Composition.Primitives.ComposablePart part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Satisfies the imports of the specified part without registering them for recomposition.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to satisfy the imports of.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ScopingExtensions.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/ScopingExtensions.xml
deleted file mode 100644 (file)
index 2a3cdbe..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ScopingExtensions" FullName="System.ComponentModel.Composition.Hosting.ScopingExtensions">
-  <TypeSignature Language="C#" Value="public static class ScopingExtensions" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit ScopingExtensions extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Defines static convenience methods for scoping.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="ContainsPartMetadata&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static bool ContainsPartMetadata&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key, T value);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool ContainsPartMetadata&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key, !!T value) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="key" Type="System.String" />
-        <Parameter Name="value" Type="T" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <param name="part">To be added.</param>
-        <param name="key">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ContainsPartMetadataWithKey">
-      <MemberSignature Language="C#" Value="public static bool ContainsPartMetadataWithKey (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool ContainsPartMetadataWithKey(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="key" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a value that indicates whether the specified part contains metadata that has the specified key.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> contains metadata that has the specified key; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="key">
-          <attribution license="cc4" from="Microsoft" modified="false" />The metadata key.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Exports">
-      <MemberSignature Language="C#" Value="public static bool Exports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Exports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a value that indicates whether the specified part exports the specified contract.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> exports the specified contract; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The name of the contract.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Filter">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Hosting.FilteredCatalog Filter (this System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, Func&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,bool&gt; filter);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Hosting.FilteredCatalog Filter(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, bool&gt; filter) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Hosting.FilteredCatalog</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" RefType="this" />
-        <Parameter Name="filter" Type="System.Func&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Filters the specified catalog with the specified filter function.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A new catalog filtered by using the specified filter.</para>
-        </returns>
-        <param name="catalog">
-          <attribution license="cc4" from="Microsoft" modified="false" />The catalog to filter.</param>
-        <param name="filter">
-          <attribution license="cc4" from="Microsoft" modified="false" />The filter function.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Imports">
-      <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Determines whether the specified part imports the specified contract.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> imports the specified contract; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The name of the contract.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Imports">
-      <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName, System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="importCardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Determines whether the specified part imports the specified contract with the specified cardinality.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> imports a contract that has the specified name and cardinality; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The name of the contract.</param>
-        <param name="importCardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The cardinality of the contract.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/TypeCatalog.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Hosting/TypeCatalog.xml
deleted file mode 100644 (file)
index a41e0f9..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="TypeCatalog" FullName="System.ComponentModel.Composition.Hosting.TypeCatalog">
-  <TypeSignature Language="C#" Value="public class TypeCatalog : System.ComponentModel.Composition.Primitives.ComposablePartCatalog, System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit TypeCatalog extends System.ComponentModel.Composition.Primitives.ComposablePartCatalog implements class System.ComponentModel.Composition.Primitives.ICompositionElement" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ComposablePartCatalog</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.Primitives.ICompositionElement</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.Primitives.ComposablePartCatalogDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>This class is thread safe.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Discovers attributed parts from a collection of types.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public TypeCatalog (System.Collections.Generic.IEnumerable&lt;Type&gt; types);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.Type&gt; types) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="types" Type="System.Collections.Generic.IEnumerable&lt;System.Type&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> class with the specified types.</para>
-        </summary>
-        <param name="types">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public TypeCatalog (Type[] types);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Type[] types) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="types" Type="System.Type[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> class with the specified types.</para>
-        </summary>
-        <param name="types">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public TypeCatalog (System.Collections.Generic.IEnumerable&lt;Type&gt; types, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.Type&gt; types, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="types" Type="System.Collections.Generic.IEnumerable&lt;System.Type&gt;" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> class with the specified types and source for parts.</para>
-        </summary>
-        <param name="types">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> object.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />An element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public TypeCatalog (System.Collections.Generic.IEnumerable&lt;Type&gt; types, System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.Type&gt; types, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="types" Type="System.Collections.Generic.IEnumerable&lt;System.Type&gt;" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> class with the specified types in the specified reflection context.</para>
-        </summary>
-        <param name="types">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> object.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used to interpret the types.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public TypeCatalog (System.Collections.Generic.IEnumerable&lt;Type&gt; types, System.Reflection.ReflectionContext reflectionContext, System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.Type&gt; types, class System.Reflection.ReflectionContext reflectionContext, class System.ComponentModel.Composition.Primitives.ICompositionElement definitionOrigin) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="types" Type="System.Collections.Generic.IEnumerable&lt;System.Type&gt;" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-        <Parameter Name="definitionOrigin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> class with the specified types in the specified reflection context and source for parts.</para>
-        </summary>
-        <param name="types">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of attributed <see cref="T:System.Type" /> objects to add to the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> object.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The context used to interpret the types.</param>
-        <param name="definitionOrigin">
-          <attribution license="cc4" from="Microsoft" modified="false" />An element used by diagnostics to identify the source for parts.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName">
-      <MemberSignature Language="C#" Value="string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string System.ComponentModel.Composition.Primitives.ICompositionElement.DisplayName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the display name of the type catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.Primitives.ICompositionElement.Origin">
-      <MemberSignature Language="C#" Value="System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ICompositionElement System.ComponentModel.Composition.Primitives.ICompositionElement.Origin" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ICompositionElement</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Hosting.TypeCatalog" /> instance is cast to an <see cref="T:System.ComponentModel.Composition.Primitives.ICompositionElement" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition element from which the type catalog originated.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a string representation of the type catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A string representation of the type catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePart.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePart.xml
deleted file mode 100644 (file)
index 5ff46c2..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ComposablePart" FullName="System.ComponentModel.Composition.Primitives.ComposablePart">
-  <TypeSignature Language="C#" Value="public abstract class ComposablePart" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract beforefieldinit ComposablePart extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Defines the abstract base class for composable parts, which import objects and produce exported objects.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ComposablePart ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Activate">
-      <MemberSignature Language="C#" Value="public virtual void Activate ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Activate() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Once this method is called, no further imports can be set unless a call is made to Deactivate.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Called when all the imports of the part have been set, and exports can be retrieved.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ExportDefinitions">
-      <MemberSignature Language="C#" Value="public abstract System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; ExportDefinitions { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; ExportDefinitions" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object was created from a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> object, this property should return the result of <see cref="P:System.ComponentModel.Composition.Primitives.ComposablePartDefinition.ExportDefinitions" />.</para>
-          <para>Overrides of this property should never return null. If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> does not have exports, return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects that describe the exported objects provided by the part.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValue">
-      <MemberSignature Language="C#" Value="public abstract object GetExportedValue (System.ComponentModel.Composition.Primitives.ExportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance object GetExportedValue(class System.ComponentModel.Composition.Primitives.ExportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Object</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ExportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exported object described by the specified <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported object described by <paramref name="definition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects from the <see cref="P:System.ComponentModel.Composition.Primitives.ComposablePart.ExportDefinitions" /> property that describes the exported object to return.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ImportDefinitions">
-      <MemberSignature Language="C#" Value="public abstract System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ImportDefinition&gt; ImportDefinitions { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ImportDefinition&gt; ImportDefinitions" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ImportDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object was created from a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> object, this property should return the result of <see cref="P:System.ComponentModel.Composition.Primitives.ComposablePartDefinition.ImportDefinitions" />.</para>
-          <para>Overrides of this property should never return null. If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> does not have imports, return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of the <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> objects that describe the imported objects required by the part.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Metadata">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IDictionary&lt;string,object&gt; Metadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IDictionary`2&lt;string, object&gt; Metadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object was created from a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> object, this property should return the result of <see cref="P:System.ComponentModel.Composition.Primitives.ComposablePartDefinition.Metadata" />.</para>
-          <para>Overrides of this property should return a read-only <see cref="T:System.Collections.Generic.IDictionary`2" /> object with a case-sensitive, non-linguistic comparer, such as <see cref="P:System.StringComparer.Ordinal" />, and should never return null. If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> does not contain metadata, return an empty <see cref="T:System.Collections.Generic.IDictionary`2" /> instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="SetImport">
-      <MemberSignature Language="C#" Value="public abstract void SetImport (System.ComponentModel.Composition.Primitives.ImportDefinition definition, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt; exports);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void SetImport(class System.ComponentModel.Composition.Primitives.ImportDefinition definition, class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.Export&gt; exports) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-        <Parameter Name="exports" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.Export&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Sets the import described by the specified <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> object to be satisfied by the specified exports.</para>
-        </summary>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the objects from the <see cref="P:System.ComponentModel.Composition.Primitives.ComposablePart.ImportDefinitions" /> property that specifies the import to be set.</param>
-        <param name="exports">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects of which to set the import described by <paramref name="definition" />.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartCatalog.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartCatalog.xml
deleted file mode 100644 (file)
index f127d93..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ComposablePartCatalog" FullName="System.ComponentModel.Composition.Primitives.ComposablePartCatalog">
-  <TypeSignature Language="C#" Value="public abstract class ComposablePartCatalog : IDisposable, System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract beforefieldinit ComposablePartCatalog extends System.Object implements class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;, class System.Collections.IEnumerable, class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.Primitives.ComposablePartCatalogDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>This type is thread safe.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents the abstract base class for composable part catalogs, which collect and return <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ComposablePartCatalog ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> was occupying.</para>
-          <para>For more information, see <format type="text/html"><a href="A17B0066-71C2-4BA4-9822-8E19332FC213">Cleaning Up Unmanaged Resources</a></format> and <format type="text/html"><a href="eb4e1af0-3b48-4fbc-ad4e-fc2f64138bf9">Implementing a Dispose Method</a></format>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="protected virtual void Dispose (bool disposing);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void Dispose(bool disposing) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="disposing" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases the unmanaged resources used by the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> and optionally releases the managed resources. </para>
-        </summary>
-        <param name="disposing">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to release both managed and unmanaged resources; false to release only unmanaged resources. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetEnumerator">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.Collections.Generic.IEnumerator`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerator&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExports">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IEnumerable&lt;Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports (System.ComponentModel.Composition.Primitives.ImportDefinition definition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.Collections.Generic.IEnumerable`1&lt;class System.Tuple`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; GetExports(class System.ComponentModel.Composition.Primitives.ImportDefinition definition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Tuple&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this method should never return null. If no <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> matches the conditions defined by <paramref name="definition" />, return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> object.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a list of export definitions that match the constraint defined by the specified <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A collection of <see cref="T:System.Tuple`2" /> containing the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects and their associated <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> objects for objects that match the constraint specified by <paramref name="definition" />.</para>
-        </returns>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The conditions of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects to be returned.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Parts">
-      <MemberSignature Language="C#" Value="public virtual System.Linq.IQueryable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; Parts { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Linq.IQueryable`1&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt; Parts" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Attributes>
-        <Attribute>
-          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
-        </Attribute>
-      </Attributes>
-      <ReturnValue>
-        <ReturnType>System.Linq.IQueryable&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should never return null.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the part definitions that are contained in the catalog.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.Collections.IEnumerable.GetEnumerator">
-      <MemberSignature Language="C#" Value="System.Collections.IEnumerator IEnumerable.GetEnumerator ();" />
-      <MemberSignature Language="ILAsm" Value=".method hidebysig newslot virtual instance class System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.IEnumerator</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This member is an explicit interface member implementation. It can be used only when the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" /> instance is cast to an <see cref="T:System.Collections.IEnumerable" /> interface.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns an enumerator that iterates through the catalog.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An enumerator that can be used to iterate through the catalog.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartDefinition.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartDefinition.xml
deleted file mode 100644 (file)
index 97b9ceb..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ComposablePartDefinition" FullName="System.ComponentModel.Composition.Primitives.ComposablePartDefinition">
-  <TypeSignature Language="C#" Value="public abstract class ComposablePartDefinition" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract beforefieldinit ComposablePartDefinition extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Defines an abstract base class for composable part definitions, which describe and enable the creation of <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ComposablePartDefinition ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="CreatePart">
-      <MemberSignature Language="C#" Value="public abstract System.ComponentModel.Composition.Primitives.ComposablePart CreatePart ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.ComponentModel.Composition.Primitives.ComposablePart CreatePart() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Derived types that override this method should return a new instance of a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object every time that the method is invoked and should never return null.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a new instance of a part that the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> describes.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The created part.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="ExportDefinitions">
-      <MemberSignature Language="C#" Value="public abstract System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt; ExportDefinitions { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt; ExportDefinitions" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should never return null. If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects created by the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> do not provide exported objects, return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> objects that describe the objects exported by the part defined by this <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ImportDefinitions">
-      <MemberSignature Language="C#" Value="public abstract System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ImportDefinition&gt; ImportDefinitions { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ImportDefinition&gt; ImportDefinitions" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ImportDefinition&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should never return null. If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> objects created by the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> do not have imports, return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> objects that describe the imports required by the part defined by this <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Metadata">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IDictionary&lt;string,object&gt; Metadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IDictionary`2&lt;string, object&gt; Metadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should return a read-only <see cref="T:System.Collections.Generic.IDictionary`2" /> object with a case-sensitive, non-linguistic comparer, such as <see cref="P:System.StringComparer.Ordinal" />, and should never return null. If the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> does not contain metadata, return an empty <see cref="T:System.Collections.Generic.IDictionary`2" /> object instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a collection of the metadata for this <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartException.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ComposablePartException.xml
deleted file mode 100644 (file)
index e0924e9..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ComposablePartException" FullName="System.ComponentModel.Composition.Primitives.ComposablePartException">
-  <TypeSignature Language="C#" Value="public class ComposablePartException : Exception" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi serializable beforefieldinit ComposablePartException extends System.Exception" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Exception</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerDisplay("{Message}")</AttributeName>
-    </Attribute>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.Primitives.ComposablePartExceptionDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>The exception that is thrown when an error occurs when calling methods on a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartException ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartException (string message);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" /> class with the specified error message.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.Exception.Message" /> property to its default value.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ComposablePartException (System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor(class System.Runtime.Serialization.SerializationInfo info, valuetype System.Runtime.Serialization.StreamingContext context) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Attributes>
-        <Attribute>
-          <AttributeName>System.Security.SecuritySafeCritical</AttributeName>
-        </Attribute>
-      </Attributes>
-      <Parameters>
-        <Parameter Name="info" Type="System.Runtime.Serialization.SerializationInfo" />
-        <Parameter Name="context" Type="System.Runtime.Serialization.StreamingContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" /> class with the specified serialization data.</para>
-        </summary>
-        <param name="info">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that holds the serialized object data for the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />.</param>
-        <param name="context">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that contains contextual information about the source or destination.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartException (string message, System.ComponentModel.Composition.Primitives.ICompositionElement element);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.ComponentModel.Composition.Primitives.ICompositionElement element) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="element" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" /> class with the specified error message and the composition element that is the cause of the exception.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.Exception.Message" /> property to its default value.</param>
-        <param name="element">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition element that is the cause of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.ComponentModel.Composition.Primitives.ComposablePartException.Element" /> property to null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartException (string message, Exception innerException);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.Exception innerException) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="innerException" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" /> class with the specified error message and the exception that is the cause of this exception.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.Exception.Message" /> property to its default value.</param>
-        <param name="innerException">
-          <attribution license="cc4" from="Microsoft" modified="false" />The exception that is the underlying cause of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.Exception.InnerException" /> property to null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ComposablePartException (string message, System.ComponentModel.Composition.Primitives.ICompositionElement element, Exception innerException);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.ComponentModel.Composition.Primitives.ICompositionElement element, class System.Exception innerException) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="element" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-        <Parameter Name="innerException" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" /> class with the specified error message, and the composition element and exception that are the cause of this exception.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.Exception.Message" /> property to its default value.</param>
-        <param name="element">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition element that is the cause of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.ComponentModel.Composition.Primitives.ComposablePartException.Element" /> property to null.</param>
-        <param name="innerException">
-          <attribution license="cc4" from="Microsoft" modified="false" />The exception that is the underlying cause of the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />, or null to set the <see cref="P:System.Exception.InnerException" /> property to null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Element">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Primitives.ICompositionElement Element { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ICompositionElement Element" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ICompositionElement</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition element that is the cause of the exception.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="GetObjectData">
-      <MemberSignature Language="C#" Value="public override void GetObjectData (System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance void GetObjectData(class System.Runtime.Serialization.SerializationInfo info, valuetype System.Runtime.Serialization.StreamingContext context) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Attributes>
-        <Attribute>
-          <AttributeName>System.Security.SecurityCritical</AttributeName>
-        </Attribute>
-      </Attributes>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="info" Type="System.Runtime.Serialization.SerializationInfo" />
-        <Parameter Name="context" Type="System.Runtime.Serialization.StreamingContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the serialization data for the exception.</para>
-        </summary>
-        <param name="info">
-          <attribution license="cc4" from="Microsoft" modified="false" />After calling the method, contains serialized object data about the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartException" />.</param>
-        <param name="context">
-          <attribution license="cc4" from="Microsoft" modified="false" />After calling the method, contains contextual information about the source or destination.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml
deleted file mode 100644 (file)
index 10b6e3e..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ContractBasedImportDefinition" FullName="System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition">
-  <TypeSignature Language="C#" Value="public class ContractBasedImportDefinition : System.ComponentModel.Composition.Primitives.ImportDefinition" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ContractBasedImportDefinition extends System.ComponentModel.Composition.Primitives.ImportDefinition" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.Primitives.ImportDefinition</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents an import that is required by a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object and that can specify both a contract name and metadata.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ContractBasedImportDefinition ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ContractBasedImportDefinition (string contractName, string requiredTypeIdentity, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; requiredMetadata, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite, System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, string requiredTypeIdentity, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; requiredMetadata, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite, valuetype System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="requiredTypeIdentity" Type="System.String" />
-        <Parameter Name="requiredMetadata" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="isRecomposable" Type="System.Boolean" />
-        <Parameter Name="isPrerequisite" Type="System.Boolean" />
-        <Parameter Name="requiredCreationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition" /> class with the specified contract name, required type identity, required metadata, cardinality, and creation policy, and indicates whether the import definition is recomposable or a prerequisite.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object required by the import definition.</param>
-        <param name="requiredTypeIdentity">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type identity of the export type expected. Use the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetTypeIdentity(System.Type)" /> method to generate a type identity for a given type. If no specific type is required, use null.</param>
-        <param name="requiredMetadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of key/value pairs that contain the metadata names and types required by the import definition; or null to set the <see cref="P:System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.RequiredMetadata" /> property to an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that indicates the cardinality of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects required by the import definition.</param>
-        <param name="isRecomposable">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition can be satisfied multiple times throughout the lifetime of a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" />; otherwise, false.</param>
-        <param name="isPrerequisite">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition is required to be satisfied before a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> can start producing exported objects; otherwise, false.</param>
-        <param name="requiredCreationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />A value that indicates that the importer requires a specific creation policy for the exports used to satisfy this import. If no specific creation policy is needed, the default is <see cref="F:System.ComponentModel.Composition.CreationPolicy.Any" />.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ContractBasedImportDefinition (string contractName, string requiredTypeIdentity, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; requiredMetadata, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite, System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, System.Collections.Generic.IDictionary&lt;string,object&gt; metadata);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, string requiredTypeIdentity, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; requiredMetadata, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite, valuetype System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="requiredTypeIdentity" Type="System.String" />
-        <Parameter Name="requiredMetadata" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="isRecomposable" Type="System.Boolean" />
-        <Parameter Name="isPrerequisite" Type="System.Boolean" />
-        <Parameter Name="requiredCreationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition" /> class with the specified contract name, required type identity, required and optional metadata, cardinality, and creation policy, and indicates whether the import definition is recomposable or a prerequisite.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object required by the import definition.</param>
-        <param name="requiredTypeIdentity">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type identity of the export type expected. Use the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetTypeIdentity(System.Type)" /> method to generate a type identity for a given type. If no specific type is required, use null.</param>
-        <param name="requiredMetadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of key/value pairs that contain the metadata names and types required by the import definition; or null to set the <see cref="P:System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.RequiredMetadata" /> property to an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that indicates the cardinality of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects required by the import definition.</param>
-        <param name="isRecomposable">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition can be satisfied multiple times throughout the lifetime of a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" />; otherwise, false.</param>
-        <param name="isPrerequisite">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition is required to be satisfied before a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> can start producing exported objects; otherwise, false.</param>
-        <param name="requiredCreationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />A value that indicates that the importer requires a specific creation policy for the exports used to satisfy this import. If no specific creation policy is needed, the default is <see cref="F:System.ComponentModel.Composition.CreationPolicy.Any" />.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The metadata associated with this import.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Constraint">
-      <MemberSignature Language="C#" Value="public override System.Linq.Expressions.Expression&lt;Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,bool&gt;&gt; Constraint { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Linq.Expressions.Expression`1&lt;class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition, bool&gt;&gt; Constraint" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Linq.Expressions.Expression&lt;System.Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets an expression that defines conditions that must be matched to satisfy the import described by this import definition.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="IsConstraintSatisfiedBy">
-      <MemberSignature Language="C#" Value="public override bool IsConstraintSatisfiedBy (System.ComponentModel.Composition.Primitives.ExportDefinition exportDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool IsConstraintSatisfiedBy(class System.ComponentModel.Composition.Primitives.ExportDefinition exportDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="exportDefinition" Type="System.ComponentModel.Composition.Primitives.ExportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a value indicating whether the constraint represented by this object is satisfied by the export represented by the given export definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the constraint is satisfied; otherwise, false.</para>
-        </returns>
-        <param name="exportDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The export definition to test.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="RequiredCreationPolicy">
-      <MemberSignature Language="C#" Value="public virtual System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that indicates that the importer requires a specific <see cref="T:System.ComponentModel.Composition.CreationPolicy" /> for the exports used to satisfy this import. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="RequiredMetadata">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; RequiredMetadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; RequiredMetadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should never return null or return an <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection that contains an element that is null. If the definition does not contain required metadata, return an empty <see cref="T:System.Collections.Generic.IEnumerable`1" /> collection instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata names of the export required by the import definition.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="RequiredTypeIdentity">
-      <MemberSignature Language="C#" Value="public virtual string RequiredTypeIdentity { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string RequiredTypeIdentity" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the expected type of the export that matches this <see cref="T:System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition" />.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns <see cref="T:System.String" />.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/Export.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/Export.xml
deleted file mode 100644 (file)
index b76750e..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="Export" FullName="System.ComponentModel.Composition.Primitives.Export">
-  <TypeSignature Language="C#" Value="public class Export" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit Export extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents an export, which is a type that consists of a delay-created exported object and the metadata that describes that object.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Export ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Derived types that call this constructor must override the <see cref="P:System.ComponentModel.Composition.Primitives.Export.Definition" /> property and the <see cref="M:System.ComponentModel.Composition.Primitives.Export.GetExportedValueCore" /> method.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Export (System.ComponentModel.Composition.Primitives.ExportDefinition definition, Func&lt;object&gt; exportedValueGetter);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.ComponentModel.Composition.Primitives.ExportDefinition definition, class System.Func`1&lt;object&gt; exportedValueGetter) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="definition" Type="System.ComponentModel.Composition.Primitives.ExportDefinition" />
-        <Parameter Name="exportedValueGetter" Type="System.Func&lt;System.Object&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> class with the specified export definition and exported object getter.</para>
-        </summary>
-        <param name="definition">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that describes the contract that the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object satisfies.</param>
-        <param name="exportedValueGetter">
-          <attribution license="cc4" from="Microsoft" modified="false" />A method that is called to create the exported object of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" />. This delays the creation of the object until the <see cref="P:System.ComponentModel.Composition.Primitives.Export.Value" /> property is called. </param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Export (string contractName, Func&lt;object&gt; exportedValueGetter);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, class System.Func`1&lt;object&gt; exportedValueGetter) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="exportedValueGetter" Type="System.Func&lt;System.Object&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> class with the specified contract name and exported value getter.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object.</param>
-        <param name="exportedValueGetter">
-          <attribution license="cc4" from="Microsoft" modified="false" />A method that is called to create the exported object of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" />. This delays the creation of the object until the <see cref="P:System.ComponentModel.Composition.Primitives.Export.Value" /> method is called.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Export (string contractName, System.Collections.Generic.IDictionary&lt;string,object&gt; metadata, Func&lt;object&gt; exportedValueGetter);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata, class System.Func`1&lt;object&gt; exportedValueGetter) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-        <Parameter Name="exportedValueGetter" Type="System.Func&lt;System.Object&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> class with the specified contract name, metadata, and exported value getter.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The metadata of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object or null to set the <see cref="P:System.ComponentModel.Composition.Primitives.Export.Metadata" /> property to an empty, read-only <see cref="T:System.Collections.Generic.IDictionary`2" /> object.</param>
-        <param name="exportedValueGetter">
-          <attribution license="cc4" from="Microsoft" modified="false" />A method that is called to create the exported object of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" />. This delays the creation of the object until the <see cref="P:System.ComponentModel.Composition.Primitives.Export.Value" /> method is called.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Definition">
-      <MemberSignature Language="C#" Value="public virtual System.ComponentModel.Composition.Primitives.ExportDefinition Definition { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ExportDefinition Definition" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ExportDefinition</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should never return null.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the definition that describes the contract that the export satisfies.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportedValueCore">
-      <MemberSignature Language="C#" Value="protected virtual object GetExportedValueCore ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance object GetExportedValueCore() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Object</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns the exported object the export provides.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The exported object the export provides.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="Metadata">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IDictionary&lt;string,object&gt; Metadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IDictionary`2&lt;string, object&gt; Metadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This property returns the value of <see cref="P:System.ComponentModel.Composition.Primitives.ExportDefinition.Metadata" /> of the <see cref="P:System.ComponentModel.Composition.Primitives.Export.Definition" /> property.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata for the export.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Value">
-      <MemberSignature Language="C#" Value="public object Value { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance object Value" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Object</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Provides the object this export represents.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ExportDefinition.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ExportDefinition.xml
deleted file mode 100644 (file)
index 33b735e..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportDefinition" FullName="System.ComponentModel.Composition.Primitives.ExportDefinition">
-  <TypeSignature Language="C#" Value="public class ExportDefinition" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ExportDefinition extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Describes the contract that a particular <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object satisfies.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ExportDefinition ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Derived types that call this constructor must override the <see cref="P:System.ComponentModel.Composition.Primitives.ExportDefinition.ContractName" /> property and optionally, the <see cref="P:System.ComponentModel.Composition.Primitives.ExportDefinition.Metadata" /> property. By default, <see cref="P:System.ComponentModel.Composition.Primitives.ExportDefinition.Metadata" /> returns an empty, read-only dictionary.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportDefinition (string contractName, System.Collections.Generic.IDictionary&lt;string,object&gt; metadata);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> class with the specified contract name and metadata.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> object.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The metadata of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> or null to set the <see cref="P:System.ComponentModel.Composition.Primitives.ExportDefinition.Metadata" /> property to an empty, read-only <see cref="T:System.Collections.Generic.IDictionary`2" /> object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractName">
-      <MemberSignature Language="C#" Value="public virtual string ContractName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string ContractName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should never return null or an empty string ("").</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract name.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Metadata">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IDictionary&lt;string,object&gt; Metadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IDictionary`2&lt;string, object&gt; Metadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should return a read-only <see cref="T:System.Collections.Generic.IDictionary`2" /> object with a case-sensitive, non-linguistic comparer, such as <see cref="P:System.StringComparer.Ordinal" />, and should never return null.</para>
-          <para>If the <see cref="T:System.ComponentModel.Composition.Primitives.ExportDefinition" /> does not contain metadata, return an empty <see cref="T:System.Collections.Generic.IDictionary`2" /> instead.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract metadata.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a string representation of the export definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A string representation of the export definition.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ExportedDelegate.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ExportedDelegate.xml
deleted file mode 100644 (file)
index 3438672..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportedDelegate" FullName="System.ComponentModel.Composition.Primitives.ExportedDelegate">
-  <TypeSignature Language="C#" Value="public class ExportedDelegate" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ExportedDelegate extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents a function exported by a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" />.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ExportedDelegate ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportedDelegate" /> class. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportedDelegate (object instance, System.Reflection.MethodInfo method);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(object instance, class System.Reflection.MethodInfo method) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="instance" Type="System.Object" />
-        <Parameter Name="method" Type="System.Reflection.MethodInfo" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ExportedDelegate" /> class for the specified part and method. </para>
-        </summary>
-        <param name="instance">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part exporting the method.</param>
-        <param name="method">
-          <attribution license="cc4" from="Microsoft" modified="false" />The method to be exported.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateDelegate">
-      <MemberSignature Language="C#" Value="public virtual Delegate CreateDelegate (Type delegateType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.Delegate CreateDelegate(class System.Type delegateType) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Delegate</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="delegateType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a delegate of the specified type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A delegate of the specified type, or null if no such delegate can be created.</para>
-        </returns>
-        <param name="delegateType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the delegate to return.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ICompositionElement.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ICompositionElement.xml
deleted file mode 100644 (file)
index 957386e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ICompositionElement" FullName="System.ComponentModel.Composition.Primitives.ICompositionElement">
-  <TypeSignature Language="C#" Value="public interface ICompositionElement" />
-  <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract ICompositionElement" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents an element that participates in composition.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="DisplayName">
-      <MemberSignature Language="C#" Value="public string DisplayName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string DisplayName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Implementers of this property should never return null or an empty string ("").</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the display name of the composition element.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Origin">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Primitives.ICompositionElement Origin { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ICompositionElement Origin" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ICompositionElement</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition element from which the current composition element originated.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ImportCardinality.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ImportCardinality.xml
deleted file mode 100644 (file)
index 87bd4da..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportCardinality" FullName="System.ComponentModel.Composition.Primitives.ImportCardinality">
-  <TypeSignature Language="C#" Value="public enum ImportCardinality" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed ImportCardinality extends System.Enum" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Indicates the cardinality of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects required by an <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" />.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="ExactlyOne">
-      <MemberSignature Language="C#" Value="ExactlyOne" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.Primitives.ImportCardinality ExactlyOne = int32(1)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ImportCardinality</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Exactly one <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> object is required by the <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" />.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ZeroOrMore">
-      <MemberSignature Language="C#" Value="ZeroOrMore" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.Primitives.ImportCardinality ZeroOrMore = int32(2)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ImportCardinality</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Zero or more <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects are required by the <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" />.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ZeroOrOne">
-      <MemberSignature Language="C#" Value="ZeroOrOne" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.Primitives.ImportCardinality ZeroOrOne = int32(0)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ImportCardinality</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Zero or one <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects are required by the <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" />.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ImportDefinition.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.Primitives/ImportDefinition.xml
deleted file mode 100644 (file)
index f34b992..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportDefinition" FullName="System.ComponentModel.Composition.Primitives.ImportDefinition">
-  <TypeSignature Language="C#" Value="public class ImportDefinition" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ImportDefinition extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents an import that is required by a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ImportDefinition ();" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Derived types that call this constructor must override the <see cref="P:System.ComponentModel.Composition.Primitives.ImportDefinition.Constraint" /> property, and optionally, the <see cref="P:System.ComponentModel.Composition.Primitives.ImportDefinition.Cardinality" />, <see cref="P:System.ComponentModel.Composition.Primitives.ImportDefinition.IsPrerequisite" /> and <see cref="P:System.ComponentModel.Composition.Primitives.ImportDefinition.IsRecomposable" /> properties.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportDefinition (System.Linq.Expressions.Expression&lt;Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,bool&gt;&gt; constraint, string contractName, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Linq.Expressions.Expression`1&lt;class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition, bool&gt;&gt; constraint, string contractName, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="constraint" Type="System.Linq.Expressions.Expression&lt;System.Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean&gt;&gt;" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="isRecomposable" Type="System.Boolean" />
-        <Parameter Name="isPrerequisite" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> class with the specified constraint, contract name, and cardinality, and indicates whether the import definition is recomposable or a prerequisite.</para>
-        </summary>
-        <param name="constraint">
-          <attribution license="cc4" from="Microsoft" modified="false" />An expression that contains a <see cref="T:System.Func`2" /> object that defines the conditions an <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> must match to satisfy the import definition.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that indicates the cardinality of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects required by the import definition.</param>
-        <param name="isRecomposable">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition can be satisfied multiple times throughout the lifetime of a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object; otherwise, false.</param>
-        <param name="isPrerequisite">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition must be satisfied before a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> can start producing exported objects; otherwise, false.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportDefinition (System.Linq.Expressions.Expression&lt;Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,bool&gt;&gt; constraint, string contractName, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite, System.Collections.Generic.IDictionary&lt;string,object&gt; metadata);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Linq.Expressions.Expression`1&lt;class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition, bool&gt;&gt; constraint, string contractName, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite, class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="constraint" Type="System.Linq.Expressions.Expression&lt;System.Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean&gt;&gt;" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="isRecomposable" Type="System.Boolean" />
-        <Parameter Name="isPrerequisite" Type="System.Boolean" />
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Primitives.ImportDefinition" /> class with the specified constraint, contract name, cardinality, and metadata, and indicates whether the import definition is recomposable or a prerequisite.</para>
-        </summary>
-        <param name="constraint">
-          <attribution license="cc4" from="Microsoft" modified="false" />An expression that contains a <see cref="T:System.Func`2" /> object that defines the conditions an <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> must match to satisfy the import definition.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that indicates the cardinality of the <see cref="T:System.ComponentModel.Composition.Primitives.Export" /> objects required by the import definition.</param>
-        <param name="isRecomposable">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition can be satisfied multiple times throughout the lifetime of a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> object; otherwise, false.</param>
-        <param name="isPrerequisite">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to specify that the import definition must be satisfied before a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> can start producing exported objects; otherwise, false.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The metadata associated with the import.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Cardinality">
-      <MemberSignature Language="C#" Value="public virtual System.ComponentModel.Composition.Primitives.ImportCardinality Cardinality { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.Primitives.ImportCardinality Cardinality" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ImportCardinality</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the cardinality of the exports required by the import definition.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Constraint">
-      <MemberSignature Language="C#" Value="public virtual System.Linq.Expressions.Expression&lt;Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,bool&gt;&gt; Constraint { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Linq.Expressions.Expression`1&lt;class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition, bool&gt;&gt; Constraint" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Linq.Expressions.Expression&lt;System.Func&lt;System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean&gt;&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Overrides of this property should never return null.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets an expression that defines conditions that the import must satisfy to match the import definition.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractName">
-      <MemberSignature Language="C#" Value="public virtual string ContractName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string ContractName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the name of the contract.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="IsConstraintSatisfiedBy">
-      <MemberSignature Language="C#" Value="public virtual bool IsConstraintSatisfiedBy (System.ComponentModel.Composition.Primitives.ExportDefinition exportDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance bool IsConstraintSatisfiedBy(class System.ComponentModel.Composition.Primitives.ExportDefinition exportDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="exportDefinition" Type="System.ComponentModel.Composition.Primitives.ExportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a value that indicates whether the export represented by the specified definition satisfies the constraints of this import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the constraints are satisfied; otherwise, false.</para>
-        </returns>
-        <param name="exportDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The export definition to test.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="IsPrerequisite">
-      <MemberSignature Language="C#" Value="public virtual bool IsPrerequisite { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance bool IsPrerequisite" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a value that indicates whether the import definition must be satisfied before a part can start producing exported objects.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="IsRecomposable">
-      <MemberSignature Language="C#" Value="public virtual bool IsRecomposable { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance bool IsRecomposable" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a value that indicates whether the import definition can be satisfied multiple times.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Metadata">
-      <MemberSignature Language="C#" Value="public virtual System.Collections.Generic.IDictionary&lt;string,object&gt; Metadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IDictionary`2&lt;string, object&gt; Metadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This property should never return null. Imports with no metadata should return an empty <see cref="T:System.Collections.Generic.IDictionary`2" /> collection.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata associated with this import.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a string representation of the import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A string representation of the import definition.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.ReflectionModel/LazyMemberInfo.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.ReflectionModel/LazyMemberInfo.xml
deleted file mode 100644 (file)
index a940751..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="LazyMemberInfo" FullName="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo">
-  <TypeSignature Language="C#" Value="public struct LazyMemberInfo" />
-  <TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit LazyMemberInfo extends System.ValueType" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents a <see cref="T:System.Reflection.MemberInfo" /> object that does not load assemblies or create objects until requested.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public LazyMemberInfo (System.Reflection.MemberInfo member);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Reflection.MemberInfo member) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="member" Type="System.Reflection.MemberInfo" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" /> class, representing the specified member.</para>
-        </summary>
-        <param name="member">
-          <attribution license="cc4" from="Microsoft" modified="false" />The member to represent.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public LazyMemberInfo (System.Reflection.MemberTypes memberType, Func&lt;System.Reflection.MemberInfo[]&gt; accessorsCreator);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype System.Reflection.MemberTypes memberType, class System.Func`1&lt;class System.Reflection.MemberInfo[]&gt; accessorsCreator) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="memberType" Type="System.Reflection.MemberTypes" />
-        <Parameter Name="accessorsCreator" Type="System.Func&lt;System.Reflection.MemberInfo[]&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" /> class for a member of the specified type with the specified accessors.</para>
-        </summary>
-        <param name="memberType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the represented member.</param>
-        <param name="accessorsCreator">
-          <attribution license="cc4" from="Microsoft" modified="false" />A function whose return value is a collection of the accessors for the represented member.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public LazyMemberInfo (System.Reflection.MemberTypes memberType, System.Reflection.MemberInfo[] accessors);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype System.Reflection.MemberTypes memberType, class System.Reflection.MemberInfo[] accessors) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="memberType" Type="System.Reflection.MemberTypes" />
-        <Parameter Name="accessors" Type="System.Reflection.MemberInfo[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" /> class for a member of the specified type with the specified accessors.</para>
-        </summary>
-        <param name="memberType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the represented member.</param>
-        <param name="accessors">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of the accessors for the represented member.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Equals">
-      <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="obj" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-        <param name="obj">
-          <attribution license="cc4" from="Microsoft" modified="false" />The other object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetAccessors">
-      <MemberSignature Language="C#" Value="public System.Reflection.MemberInfo[] GetAccessors ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Reflection.MemberInfo[] GetAccessors() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Reflection.MemberInfo[]</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets an array of the accessors for the represented member.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An array of the accessors for the represented member.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="GetHashCode">
-      <MemberSignature Language="C#" Value="public override int GetHashCode ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance int32 GetHashCode() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="MemberType">
-      <MemberSignature Language="C#" Value="public System.Reflection.MemberTypes MemberType { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.Reflection.MemberTypes MemberType" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Reflection.MemberTypes</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the type of the represented member.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="op_Equality">
-      <MemberSignature Language="C#" Value="public static bool op_Equality (System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo left, System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo right);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Equality(valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo left, valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo right) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="left" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-        <Parameter Name="right" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Determines whether the two specified <see cref="T:System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" /> objects are equal.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the objects are equal; otherwise, false.</para>
-        </returns>
-        <param name="left">
-          <attribution license="cc4" from="Microsoft" modified="false" />The first object to test.</param>
-        <param name="right">
-          <attribution license="cc4" from="Microsoft" modified="false" />The second object to test.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="op_Inequality">
-      <MemberSignature Language="C#" Value="public static bool op_Inequality (System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo left, System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo right);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Inequality(valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo left, valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo right) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="left" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-        <Parameter Name="right" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Determines whether the two specified <see cref="T:System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" /> objects are not equal.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the objects are equal; otherwise, false.</para>
-        </returns>
-        <param name="left">
-          <attribution license="cc4" from="Microsoft" modified="false" />The first object to test.</param>
-        <param name="right">
-          <attribution license="cc4" from="Microsoft" modified="false" />The second object to test.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.ReflectionModel/ReflectionModelServices.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition.ReflectionModel/ReflectionModelServices.xml
deleted file mode 100644 (file)
index 47c235f..0000000
+++ /dev/null
@@ -1,595 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ReflectionModelServices" FullName="System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices">
-  <TypeSignature Language="C#" Value="public static class ReflectionModelServices" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit ReflectionModelServices extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides extension methods to create and retrieve reflection-based parts.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="CreateExportDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ExportDefinition CreateExportDefinition (System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo exportingMember, string contractName, Lazy&lt;System.Collections.Generic.IDictionary&lt;string,object&gt;&gt; metadata, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ExportDefinition CreateExportDefinition(valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo exportingMember, string contractName, class System.Lazy`1&lt;class System.Collections.Generic.IDictionary`2&lt;string, object&gt;&gt; metadata, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ExportDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="exportingMember" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="metadata" Type="System.Lazy&lt;System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;&gt;" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an export definition from the specified member, with the specified contract name, metadata, and origin.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An export definition created from the specified parameters.</para>
-        </returns>
-        <param name="exportingMember">
-          <attribution license="cc4" from="Microsoft" modified="false" />The member to export.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name to use for the export.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The metadata for the export.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object that the export originates from.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateImportDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition (Lazy&lt;System.Reflection.ParameterInfo&gt; parameter, string contractName, string requiredTypeIdentity, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; requiredMetadata, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition(class System.Lazy`1&lt;class System.Reflection.ParameterInfo&gt; parameter, string contractName, string requiredTypeIdentity, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; requiredMetadata, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, valuetype System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="parameter" Type="System.Lazy&lt;System.Reflection.ParameterInfo&gt;" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="requiredTypeIdentity" Type="System.String" />
-        <Parameter Name="requiredMetadata" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="requiredCreationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an import definition for the specified parameter by using the specified contract name, type identity, import metadata, cardinality, and creation policy.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An import definition created from the specified parameters.</para>
-        </returns>
-        <param name="parameter">
-          <attribution license="cc4" from="Microsoft" modified="false" />The parameter to import.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name to use for the import.</param>
-        <param name="requiredTypeIdentity">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required type identity for the import.</param>
-        <param name="requiredMetadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required metadata for the import.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The cardinality of the import.</param>
-        <param name="requiredCreationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that specifies the import's creation policy.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object to import into.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateImportDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition (System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo importingMember, string contractName, string requiredTypeIdentity, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; requiredMetadata, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition(valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo importingMember, string contractName, string requiredTypeIdentity, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; requiredMetadata, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, valuetype System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importingMember" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="requiredTypeIdentity" Type="System.String" />
-        <Parameter Name="requiredMetadata" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="isRecomposable" Type="System.Boolean" />
-        <Parameter Name="requiredCreationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an import definition for the specified member by using the specified contract name, type identity, import metadata, cardinality, recomposition policy, and creation policy.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An import definition created from the specified parameters.</para>
-        </returns>
-        <param name="importingMember">
-          <attribution license="cc4" from="Microsoft" modified="false" />The member to import into.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name to use for the import.</param>
-        <param name="requiredTypeIdentity">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required type identity for the import.</param>
-        <param name="requiredMetadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required metadata for the import.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The cardinality of the import.</param>
-        <param name="isRecomposable">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to indicate that the import is recomposable; otherwise, false.</param>
-        <param name="requiredCreationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that specifies the import's creation policy.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object to import into.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateImportDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition (Lazy&lt;System.Reflection.ParameterInfo&gt; parameter, string contractName, string requiredTypeIdentity, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; requiredMetadata, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, System.Collections.Generic.IDictionary&lt;string,object&gt; metadata, bool isExportFactory, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition(class System.Lazy`1&lt;class System.Reflection.ParameterInfo&gt; parameter, string contractName, string requiredTypeIdentity, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; requiredMetadata, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, valuetype System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata, bool isExportFactory, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="parameter" Type="System.Lazy&lt;System.Reflection.ParameterInfo&gt;" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="requiredTypeIdentity" Type="System.String" />
-        <Parameter Name="requiredMetadata" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="requiredCreationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-        <Parameter Name="isExportFactory" Type="System.Boolean" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an import definition for the specified parameter by using the specified contract name, type identity, import and contract metadata, cardinality, and creation policy.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An import definition created from the specified parameters.</para>
-        </returns>
-        <param name="parameter">
-          <attribution license="cc4" from="Microsoft" modified="false" />The parameter to import.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name to use for the import.</param>
-        <param name="requiredTypeIdentity">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required type identity for the import.</param>
-        <param name="requiredMetadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required metadata for the import.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The cardinality of the import.</param>
-        <param name="requiredCreationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that specifies the import's creation policy.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract metadata</param>
-        <param name="isExportFactory">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to indicate that the import represents an <see cref="T:System.ComponentModel.Composition.ExportFactory`1" />; otherwise, false.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object to import into.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateImportDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition (System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo importingMember, string contractName, string requiredTypeIdentity, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; requiredMetadata, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, System.Collections.Generic.IDictionary&lt;string,object&gt; metadata, bool isExportFactory, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition(valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo importingMember, string contractName, string requiredTypeIdentity, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; requiredMetadata, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, valuetype System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata, bool isExportFactory, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importingMember" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="requiredTypeIdentity" Type="System.String" />
-        <Parameter Name="requiredMetadata" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="isRecomposable" Type="System.Boolean" />
-        <Parameter Name="requiredCreationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-        <Parameter Name="isExportFactory" Type="System.Boolean" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an import definition for the specified member by using the specified contract name, type identity, import and contract metadata, cardinality, recomposition policy, and creation policy.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An import definition created from the specified parameters.</para>
-        </returns>
-        <param name="importingMember">
-          <attribution license="cc4" from="Microsoft" modified="false" />The member to import into.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name to use for the import.</param>
-        <param name="requiredTypeIdentity">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required type identity for the import.</param>
-        <param name="requiredMetadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required metadata for the import.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The cardinality of the import.</param>
-        <param name="isRecomposable">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to indicate that the import is recomposable; otherwise, false.</param>
-        <param name="requiredCreationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that specifies the import's creation policy.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract metadata.</param>
-        <param name="isExportFactory">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to indicate that the import represents an <see cref="T:System.ComponentModel.Composition.ExportFactory`1" />; otherwise, false.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object to import into.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateImportDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition (System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo importingMember, string contractName, string requiredTypeIdentity, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;string,Type&gt;&gt; requiredMetadata, System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPreRequisite, System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, System.Collections.Generic.IDictionary&lt;string,object&gt; metadata, bool isExportFactory, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition CreateImportDefinition(valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo importingMember, string contractName, string requiredTypeIdentity, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;string, class System.Type&gt;&gt; requiredMetadata, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality cardinality, bool isRecomposable, bool isPreRequisite, valuetype System.ComponentModel.Composition.CreationPolicy requiredCreationPolicy, class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata, bool isExportFactory, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importingMember" Type="System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="requiredTypeIdentity" Type="System.String" />
-        <Parameter Name="requiredMetadata" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;System.String,System.Type&gt;&gt;" />
-        <Parameter Name="cardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        <Parameter Name="isRecomposable" Type="System.Boolean" />
-        <Parameter Name="isPreRequisite" Type="System.Boolean" />
-        <Parameter Name="requiredCreationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-        <Parameter Name="isExportFactory" Type="System.Boolean" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an import definition for the specified member by using the specified contract name, type identity, import and contract metadata, cardinality, recomposition policy, and creation policy.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An import definition created from the specified parameters.</para>
-        </returns>
-        <param name="importingMember">
-          <attribution license="cc4" from="Microsoft" modified="false" />The member to import into.</param>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name to use for the import.</param>
-        <param name="requiredTypeIdentity">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required type identity for the import.</param>
-        <param name="requiredMetadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The required metadata for the import.</param>
-        <param name="cardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The cardinality of the import.</param>
-        <param name="isRecomposable">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to indicate that the import is recomposable; otherwise, false.</param>
-        <param name="isPreRequisite">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to indicate that the import is a prerequisite; otherwise, false.</param>
-        <param name="requiredCreationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />One of the enumeration values that specifies the import's creation policy.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract metadata.</param>
-        <param name="isExportFactory">
-          <attribution license="cc4" from="Microsoft" modified="false" />true to indicate that the import represents an <see cref="T:System.ComponentModel.Composition.ExportFactory`1" />; otherwise, false.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object to import into.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreatePartDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePartDefinition CreatePartDefinition (Lazy&lt;Type&gt; partType, bool isDisposalRequired, Lazy&lt;System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ImportDefinition&gt;&gt; imports, Lazy&lt;System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; exports, Lazy&lt;System.Collections.Generic.IDictionary&lt;string,object&gt;&gt; metadata, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePartDefinition CreatePartDefinition(class System.Lazy`1&lt;class System.Type&gt; partType, bool isDisposalRequired, class System.Lazy`1&lt;class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ImportDefinition&gt;&gt; imports, class System.Lazy`1&lt;class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt; exports, class System.Lazy`1&lt;class System.Collections.Generic.IDictionary`2&lt;string, object&gt;&gt; metadata, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePartDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="partType" Type="System.Lazy&lt;System.Type&gt;" />
-        <Parameter Name="isDisposalRequired" Type="System.Boolean" />
-        <Parameter Name="imports" Type="System.Lazy&lt;System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ImportDefinition&gt;&gt;" />
-        <Parameter Name="exports" Type="System.Lazy&lt;System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.Primitives.ExportDefinition&gt;&gt;" />
-        <Parameter Name="metadata" Type="System.Lazy&lt;System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;&gt;" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a part definition with the specified part type, imports, exports, metadata, and origin.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A part definition created from the specified parameters.</para>
-        </returns>
-        <param name="partType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the part.</param>
-        <param name="isDisposalRequired">
-          <attribution license="cc4" from="Microsoft" modified="false" />true if the part requires disposal; otherwise, false.</param>
-        <param name="imports">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of the part's imports.</param>
-        <param name="exports">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of the part's exports.</param>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part's metadata.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part's origin.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportFactoryProductImportDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition GetExportFactoryProductImportDefinition (System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition GetExportFactoryProductImportDefinition(class System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importDefinition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a representation of an import definition as an export factory product.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The representation of the import definition.</para>
-        </returns>
-        <param name="importDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import definition to represent.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetExportingMember">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo GetExportingMember (System.ComponentModel.Composition.Primitives.ExportDefinition exportDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo GetExportingMember(class System.ComponentModel.Composition.Primitives.ExportDefinition exportDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="exportDefinition" Type="System.ComponentModel.Composition.Primitives.ExportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exporting member from a specified export definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The member specified in the export definition.</para>
-        </returns>
-        <param name="exportDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The export definition to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetImportingMember">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo GetImportingMember (System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo GetImportingMember(class System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importDefinition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the importing member from a specified import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The member specified in the import definition.</para>
-        </returns>
-        <param name="importDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import definition to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetImportingParameter">
-      <MemberSignature Language="C#" Value="public static Lazy&lt;System.Reflection.ParameterInfo&gt; GetImportingParameter (System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Lazy`1&lt;class System.Reflection.ParameterInfo&gt; GetImportingParameter(class System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Lazy&lt;System.Reflection.ParameterInfo&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importDefinition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the importing parameter from a specified import definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The parameter specified in the import definition.</para>
-        </returns>
-        <param name="importDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import definition to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetPartType">
-      <MemberSignature Language="C#" Value="public static Lazy&lt;Type&gt; GetPartType (System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Lazy`1&lt;class System.Type&gt; GetPartType(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Lazy&lt;System.Type&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="partDefinition" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the type of a part from a specified part definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The type of the defined part.</para>
-        </returns>
-        <param name="partDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part definition to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="IsDisposalRequired">
-      <MemberSignature Language="C#" Value="public static bool IsDisposalRequired (System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsDisposalRequired(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="partDefinition" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Determines whether the specified part requires disposal.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the part requires disposal; otherwise, false.</para>
-        </returns>
-        <param name="partDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="IsExportFactoryImportDefinition">
-      <MemberSignature Language="C#" Value="public static bool IsExportFactoryImportDefinition (System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsExportFactoryImportDefinition(class System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importDefinition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Indicates whether a specified import definition represents an export factory (<see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> or <see cref="T:System.ComponentModel.Composition.ExportFactory`2" /> object).</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the specified import definition represents an export factory; otherwise, false.</para>
-        </returns>
-        <param name="importDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import definition to check.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="IsImportingParameter">
-      <MemberSignature Language="C#" Value="public static bool IsImportingParameter (System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsImportingParameter(class System.ComponentModel.Composition.Primitives.ImportDefinition importDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="importDefinition" Type="System.ComponentModel.Composition.Primitives.ImportDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Determines whether an import definition represents a member or a parameter.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the import definition represents a parameter; otherwise, false.</para>
-        </returns>
-        <param name="importDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import definition to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="TryMakeGenericPartDefinition">
-      <MemberSignature Language="C#" Value="public static bool TryMakeGenericPartDefinition (System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition, System.Collections.Generic.IEnumerable&lt;Type&gt; genericParameters, out System.ComponentModel.Composition.Primitives.ComposablePartDefinition specialization);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool TryMakeGenericPartDefinition(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition, class System.Collections.Generic.IEnumerable`1&lt;class System.Type&gt; genericParameters, class System.ComponentModel.Composition.Primitives.ComposablePartDefinition specialization) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="partDefinition" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-        <Parameter Name="genericParameters" Type="System.Collections.Generic.IEnumerable&lt;System.Type&gt;" />
-        <Parameter Name="specialization" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition&amp;" RefType="out" />
-      </Parameters>
-      <Docs>
-        <param name="partDefinition">To be added.</param>
-        <param name="genericParameters">To be added.</param>
-        <param name="specialization">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/AttributedModelServices.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/AttributedModelServices.xml
deleted file mode 100644 (file)
index d83a1c4..0000000
+++ /dev/null
@@ -1,711 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="AttributedModelServices" FullName="System.ComponentModel.Composition.AttributedModelServices">
-  <TypeSignature Language="C#" Value="public static class AttributedModelServices" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit AttributedModelServices extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Contains helper methods for using the MEF attributed programming model with composition.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="AddExportedValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionBatch batch, T exportedValue);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionBatch batch, !!T exportedValue) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" RefType="this" />
-        <Parameter Name="exportedValue" Type="T" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <param name="batch">To be added.</param>
-        <param name="exportedValue">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="AddExportedValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionBatch batch, string contractName, T exportedValue);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionBatch batch, string contractName, !!T exportedValue) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" RefType="this" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="exportedValue" Type="T" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <param name="batch">To be added.</param>
-        <param name="contractName">To be added.</param>
-        <param name="exportedValue">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="AddPart">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart AddPart (this System.ComponentModel.Composition.Hosting.CompositionBatch batch, object attributedPart);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart AddPart(class System.ComponentModel.Composition.Hosting.CompositionBatch batch, object attributedPart) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" RefType="this" />
-        <Parameter Name="attributedPart" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a composable part from the specified attributed object, and adds it to the specified composition batch.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The new part.</para>
-        </returns>
-        <param name="batch">
-          <attribution license="cc4" from="Microsoft" modified="false" />The batch to add to.</param>
-        <param name="attributedPart">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object to add.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ComposeExportedValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static void ComposeExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionContainer container, T exportedValue);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ComposeExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionContainer container, !!T exportedValue) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="container" Type="System.ComponentModel.Composition.Hosting.CompositionContainer" RefType="this" />
-        <Parameter Name="exportedValue" Type="T" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <param name="container">To be added.</param>
-        <param name="exportedValue">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ComposeExportedValue&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static void ComposeExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionContainer container, string contractName, T exportedValue);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ComposeExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionContainer container, string contractName, !!T exportedValue) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="container" Type="System.ComponentModel.Composition.Hosting.CompositionContainer" RefType="this" />
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="exportedValue" Type="T" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">To be added.</typeparam>
-        <param name="container">To be added.</param>
-        <param name="contractName">To be added.</param>
-        <param name="exportedValue">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ComposeParts">
-      <MemberSignature Language="C#" Value="public static void ComposeParts (this System.ComponentModel.Composition.Hosting.CompositionContainer container, object[] attributedParts);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ComposeParts(class System.ComponentModel.Composition.Hosting.CompositionContainer container, object[] attributedParts) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="container" Type="System.ComponentModel.Composition.Hosting.CompositionContainer" RefType="this" />
-        <Parameter Name="attributedParts" Type="System.Object[]">
-          <Attributes>
-            <Attribute>
-              <AttributeName>System.ParamArray</AttributeName>
-            </Attribute>
-          </Attributes>
-        </Parameter>
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates composable parts from an array of attributed objects and composes them in the specified composition container.</para>
-        </summary>
-        <param name="container">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition container to perform composition in.</param>
-        <param name="attributedParts">
-          <attribution license="cc4" from="Microsoft" modified="false" />An array of attributed objects to compose.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreatePart">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart CreatePart (object attributedPart);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart CreatePart(object attributedPart) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="attributedPart" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a composable part from the specified attributed object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The created part.</para>
-        </returns>
-        <param name="attributedPart">
-          <attribution license="cc4" from="Microsoft" modified="false" />The attributed object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreatePart">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart CreatePart (System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition, object attributedPart);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart CreatePart(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition partDefinition, object attributedPart) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="partDefinition" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-        <Parameter Name="attributedPart" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a composable part from the specified attributed object, using the specified part definition.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The created part.</para>
-        </returns>
-        <param name="partDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The definition of the new part.</param>
-        <param name="attributedPart">
-          <attribution license="cc4" from="Microsoft" modified="false" />The attributed object.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreatePart">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart CreatePart (object attributedPart, System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart CreatePart(object attributedPart, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="attributedPart" Type="System.Object" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a composable part from the specified attributed object, using the specified reflection context.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The created part.</para>
-        </returns>
-        <param name="attributedPart">
-          <attribution license="cc4" from="Microsoft" modified="false" />The attributed object.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The reflection context for the part.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreatePartDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePartDefinition CreatePartDefinition (Type type, System.ComponentModel.Composition.Primitives.ICompositionElement origin);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePartDefinition CreatePartDefinition(class System.Type type, class System.ComponentModel.Composition.Primitives.ICompositionElement origin) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePartDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="type" Type="System.Type" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a part definition with the specified type and origin.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The new part definition.</para>
-        </returns>
-        <param name="type">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the definition.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The origin of the definition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreatePartDefinition">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePartDefinition CreatePartDefinition (Type type, System.ComponentModel.Composition.Primitives.ICompositionElement origin, bool ensureIsDiscoverable);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePartDefinition CreatePartDefinition(class System.Type type, class System.ComponentModel.Composition.Primitives.ICompositionElement origin, bool ensureIsDiscoverable) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePartDefinition</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="type" Type="System.Type" />
-        <Parameter Name="origin" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-        <Parameter Name="ensureIsDiscoverable" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates a part definition with the specified type and origin.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The new part definition.</para>
-        </returns>
-        <param name="type">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the definition.</param>
-        <param name="origin">
-          <attribution license="cc4" from="Microsoft" modified="false" />The origin of the definition.</param>
-        <param name="ensureIsDiscoverable">
-          <attribution license="cc4" from="Microsoft" modified="false" />A value indicating whether or not the new definition should be discoverable.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Exports">
-      <MemberSignature Language="C#" Value="public static bool Exports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Exports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, class System.Type contractType) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a value that indicates whether the specified part contains an export that matches the specified contract type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> contains an export definition that matches <paramref name="contractType" />; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract type.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Exports&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static bool Exports&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Exports&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a value that indicates whether the specified part contains an export that matches the specified contract type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> contains an export definition of type <paramref name="T" />; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract type.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetContractName">
-      <MemberSignature Language="C#" Value="public static string GetContractName (Type type);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig string GetContractName(class System.Type type) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="type" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a canonical contract name for the specified type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A contract name created from the specified type.</para>
-        </returns>
-        <param name="type">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type to use.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetMetadataView&lt;TMetadataView&gt;">
-      <MemberSignature Language="C#" Value="public static TMetadataView GetMetadataView&lt;TMetadataView&gt; (System.Collections.Generic.IDictionary&lt;string,object&gt; metadata);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig !!TMetadataView GetMetadataView&lt;TMetadataView&gt;(class System.Collections.Generic.IDictionary`2&lt;string, object&gt; metadata) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>TMetadataView</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="TMetadataView" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="metadata" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a metadata view object from a dictionary of loose metadata.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A metadata view containing the specified metadata.</para>
-        </returns>
-        <param name="metadata">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of loose metadata.</param>
-        <typeparam name="TMetadataView">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the metadata view object to get.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="GetTypeIdentity">
-      <MemberSignature Language="C#" Value="public static string GetTypeIdentity (System.Reflection.MethodInfo method);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig string GetTypeIdentity(class System.Reflection.MethodInfo method) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="method" Type="System.Reflection.MethodInfo" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the unique identifier for the specified method.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The unique identifier for the method.</para>
-        </returns>
-        <param name="method">
-          <attribution license="cc4" from="Microsoft" modified="false" />The method to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="GetTypeIdentity">
-      <MemberSignature Language="C#" Value="public static string GetTypeIdentity (Type type);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig string GetTypeIdentity(class System.Type type) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="type" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the unique identifier for the specified type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The unique identifier for the type.</para>
-        </returns>
-        <param name="type">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type to examine.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Imports">
-      <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, class System.Type contractType) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a value that indicates whether the specified part contains an import that matches the specified contract type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> contains an import definition that matches <paramref name="contractType" />; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract type.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Imports">
-      <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, Type contractType, System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, class System.Type contractType, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="contractType" Type="System.Type" />
-        <Parameter Name="importCardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a value that indicates whether the specified part contains an import that matches the specified contract type and import cardinality.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> contains an import definition that matches <paramref name="contractType" /> and <paramref name="importCardinality" />; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract type.</param>
-        <param name="importCardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import cardinality.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Imports&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static bool Imports&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a value that indicates whether the specified part contains an import that matches the specified contract type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> contains an import definition of type <paramref name="T" />; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract type.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="Imports&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static bool Imports&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T" />
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        <Parameter Name="importCardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a value that indicates whether the specified part contains an import that matches the specified contract type and import cardinality.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if <paramref name="part" /> contains an import definition of type <paramref name="T" /> that has the specified import cardinality; otherwise, false.</para>
-        </returns>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to search.</param>
-        <param name="importCardinality">
-          <attribution license="cc4" from="Microsoft" modified="false" />The import cardinality.</param>
-        <typeparam name="T">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract type.</typeparam>
-      </Docs>
-    </Member>
-    <Member MemberName="SatisfyImportsOnce">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce (this System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce(class System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="compositionService" Type="System.ComponentModel.Composition.ICompositionService" RefType="this" />
-        <Parameter Name="attributedPart" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Unlike ordinary composition, parts composed with this method are not guaranteed to remain valid if the catalog behind <paramref name="compositionService" /> changes.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Composes the specified part by using the specified composition service, with recomposition disabled.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The composed part.</para>
-        </returns>
-        <param name="compositionService">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition service to use.</param>
-        <param name="attributedPart">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to compose.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="SatisfyImportsOnce">
-      <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce (this System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart, System.Reflection.ReflectionContext reflectionContext);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce(class System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="compositionService" Type="System.ComponentModel.Composition.ICompositionService" RefType="this" />
-        <Parameter Name="attributedPart" Type="System.Object" />
-        <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Composes the specified part by using the specified composition service, with recomposition disabled and using the specified reflection context.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The composed part.</para>
-        </returns>
-        <param name="compositionService">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition service to use.</param>
-        <param name="attributedPart">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to compose.</param>
-        <param name="reflectionContext">
-          <attribution license="cc4" from="Microsoft" modified="false" />The reflection context for the part.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CatalogReflectionContextAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CatalogReflectionContextAttribute.xml
deleted file mode 100644 (file)
index e4500e9..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CatalogReflectionContextAttribute" FullName="System.ComponentModel.Composition.CatalogReflectionContextAttribute">
-  <TypeSignature Language="C#" Value="public class CatalogReflectionContextAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit CatalogReflectionContextAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Assembly, AllowMultiple=false, Inherited=true)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>When applied to a <see cref="T:System.Reflection.Assembly" /> object, enables an <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> object to discover custom <see cref="T:System.Reflection.ReflectionContext" /> objects.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CatalogReflectionContextAttribute (Type reflectionContextType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Type reflectionContextType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="reflectionContextType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.Hosting.AssemblyCatalog" /> class with the specified <see cref="T:System.Reflection.ReflectionContext" /> type.</para>
-        </summary>
-        <param name="reflectionContextType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the reflection context.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateReflectionContext">
-      <MemberSignature Language="C#" Value="public System.Reflection.ReflectionContext CreateReflectionContext ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Reflection.ReflectionContext CreateReflectionContext() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Reflection.ReflectionContext</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an instance of the custom <see cref="T:System.Reflection.ReflectionContext" /> object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An instance of the custom reflection context.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ChangeRejectedException.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ChangeRejectedException.xml
deleted file mode 100644 (file)
index 9f8ca2a..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ChangeRejectedException" FullName="System.ComponentModel.Composition.ChangeRejectedException">
-  <TypeSignature Language="C#" Value="public class ChangeRejectedException : System.ComponentModel.Composition.CompositionException" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi serializable beforefieldinit ChangeRejectedException extends System.ComponentModel.Composition.CompositionException" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.CompositionException</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>An exception that indicates whether a part has been rejected during composition.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ChangeRejectedException ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This constructor initializes the <see cref="P:System.Exception.Message" /> property of the new instance to a system-supplied message that describes the error, such as "DefaultMessageDisplayedByParameterlessCtorWriterMustSupply" This message takes into account the current system culture.</para>
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.InsufficientMemoryException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null.</para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The localized error message string. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ChangeRejectedException" /> class with a system-supplied message that describes the error.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ChangeRejectedException (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.CompositionError&gt; errors);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.CompositionError&gt; errors) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="errors" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.CompositionError&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ChangeRejectedException" /> class with a list of composition errors. </para>
-        </summary>
-        <param name="errors">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of errors that occurred during composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ChangeRejectedException (string message);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.ComponentModel.Composition.ChangeRejectedException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null.</para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The error message string specified in <paramref name="message" />. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ChangeRejectedException" /> class with a specified message that describes the error.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />The message that describes the exception. The caller of this constructor is required to ensure that this string has been localized for the current system culture.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ChangeRejectedException (string message, Exception innerException);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.Exception innerException) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="innerException" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An exception that is thrown as a direct result of a previous exception should include a reference to the previous exception in the <see cref="P:System.Exception.InnerException" /> property. The <see cref="P:System.Exception.InnerException" /> property returns the same value that is passed to the constructor, or null if the <see cref="P:System.Exception.InnerException" /> property does not supply the inner exception value to the constructor.</para>
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.ComponentModel.Composition.ChangeRejectedException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null. </para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The error message string specified in <paramref name="message" />. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ChangeRejectedException" /> class with a specified error message and a reference to the inner exception that is the cause of this exception.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />The message that describes the exception. The caller of this constructor is required to ensure that this string has been localized for the current system culture. </param>
-        <param name="innerException">
-          <attribution license="cc4" from="Microsoft" modified="false" />The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception. </param>
-      </Docs>
-    </Member>
-    <Member MemberName="Message">
-      <MemberSignature Language="C#" Value="public override string Message { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string Message" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets the message associated with the component rejection.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionContractMismatchException.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionContractMismatchException.xml
deleted file mode 100644 (file)
index 6631272..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionContractMismatchException" FullName="System.ComponentModel.Composition.CompositionContractMismatchException">
-  <TypeSignature Language="C#" Value="public class CompositionContractMismatchException : Exception" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi serializable beforefieldinit CompositionContractMismatchException extends System.Exception" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Exception</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>The exception that is thrown when the underlying exported value or metadata of a <see cref="T:System.Lazy`1" /> or <see cref="T:System.Lazy`2" /> object cannot be cast to T or TMetadataView, respectively.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContractMismatchException ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This constructor initializes the <see cref="P:System.Exception.Message" /> property of the new instance to a system-supplied message that describes the error, such as "DefaultMessageDisplayedByParameterlessCtorWriterMustSupply". This message takes into account the current system culture.</para>
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.InsufficientMemoryException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null.</para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The localized error message string. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionContractMismatchException" /> class with a system-supplied message that describes the error.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContractMismatchException (string message);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.ComponentModel.Composition.CompositionContractMismatchException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null.</para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The error message string specified in <paramref name="message" />. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionContractMismatchException" /> class with a specified message that describes the error.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />The message that describes the exception. The caller of this constructor is required to ensure that this string has been localized for the current system culture.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CompositionContractMismatchException (System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor(class System.Runtime.Serialization.SerializationInfo info, valuetype System.Runtime.Serialization.StreamingContext context) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Attributes>
-        <Attribute>
-          <AttributeName>System.Security.SecuritySafeCritical</AttributeName>
-        </Attribute>
-      </Attributes>
-      <Parameters>
-        <Parameter Name="info" Type="System.Runtime.Serialization.SerializationInfo" />
-        <Parameter Name="context" Type="System.Runtime.Serialization.StreamingContext" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This constructor is called during deserialization to reconstitute the exception object transmitted over a stream. For more information, see <format type="text/html"><a href="832ac524-21bc-419a-a27b-ca8bfc45840f">XML and Soap Serialization</a></format>.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionContractMismatchException" /> class with serialized data.</para>
-        </summary>
-        <param name="info">
-          <attribution license="cc4" from="Microsoft" modified="false" />The object that holds the serialized object data. </param>
-        <param name="context">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contextual information about the source or destination. </param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionContractMismatchException (string message, Exception innerException);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.Exception innerException) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="innerException" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An exception that is thrown as a direct result of a previous exception should include a reference to the previous exception in the <see cref="P:System.Exception.InnerException" /> property. The <see cref="P:System.Exception.InnerException" /> property returns the same value that is passed into the constructor, or null if the <see cref="P:System.Exception.InnerException" /> property does not supply the inner exception value to the constructor.</para>
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.ComponentModel.Composition.CompositionContractMismatchException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null. </para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The error message string specified in <paramref name="message" />. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionContractMismatchException" /> class with a specified error message and a reference to the inner exception that is the cause of this exception.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />The message that describes the exception. The caller of this constructor is required to ensure that this string has been localized for the current system culture. </param>
-        <param name="innerException">
-          <attribution license="cc4" from="Microsoft" modified="false" />The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception. </param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionError.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionError.xml
deleted file mode 100644 (file)
index 24e67be..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionError" FullName="System.ComponentModel.Composition.CompositionError">
-  <TypeSignature Language="C#" Value="public class CompositionError" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi serializable beforefieldinit CompositionError extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.CompositionErrorDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents an error that occurred during composition.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionError (string message);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> class with the specified error message.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Description" /> property to an empty string ("").</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionError (string message, System.ComponentModel.Composition.Primitives.ICompositionElement element);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.ComponentModel.Composition.Primitives.ICompositionElement element) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="element" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> class with the specified error message and the composition element that is the cause of the composition error.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Description" /> property to an empty string ("").</param>
-        <param name="element">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition element that is the cause of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Element" /> property to null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionError (string message, Exception exception);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.Exception exception) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="exception" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> class with the specified error message and the exception that is the cause of the composition error.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Description" /> property to an empty string ("").</param>
-        <param name="exception">
-          <attribution license="cc4" from="Microsoft" modified="false" />The <see cref="P:System.ComponentModel.Composition.CompositionError.Exception" /> that is the underlying cause of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Exception" /> property to null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionError (string message, System.ComponentModel.Composition.Primitives.ICompositionElement element, Exception exception);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.ComponentModel.Composition.Primitives.ICompositionElement element, class System.Exception exception) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="element" Type="System.ComponentModel.Composition.Primitives.ICompositionElement" />
-        <Parameter Name="exception" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> class with the specified error message, and the composition element and exception that are the cause of the composition error.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Description" /> property to an empty string ("").</param>
-        <param name="element">
-          <attribution license="cc4" from="Microsoft" modified="false" />The composition element that is the cause of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Element" /> property to null.</param>
-        <param name="exception">
-          <attribution license="cc4" from="Microsoft" modified="false" />The <see cref="P:System.ComponentModel.Composition.CompositionError.Exception" /> that is the underlying cause of the <see cref="T:System.ComponentModel.Composition.CompositionError" /> or null to set the <see cref="P:System.ComponentModel.Composition.CompositionError.Exception" /> property to null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Description">
-      <MemberSignature Language="C#" Value="public string Description { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string Description" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a description of the composition error.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Element">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.Primitives.ICompositionElement Element { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.ComponentModel.Composition.Primitives.ICompositionElement Element" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ICompositionElement</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the composition element that is the cause of the error.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Exception">
-      <MemberSignature Language="C#" Value="public Exception Exception { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Exception Exception" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Exception</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exception that is the underlying cause of the composition error.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ToString">
-      <MemberSignature Language="C#" Value="public override string ToString ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Returns a string representation of the composition error.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A string that contains the <see cref="P:System.ComponentModel.Composition.CompositionError.Description" /> property.</para>
-        </returns>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionException.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CompositionException.xml
deleted file mode 100644 (file)
index 80af009..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CompositionException" FullName="System.ComponentModel.Composition.CompositionException">
-  <TypeSignature Language="C#" Value="public class CompositionException : Exception" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi serializable beforefieldinit CompositionException extends System.Exception" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Exception</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerDisplay("{Message}")</AttributeName>
-    </Attribute>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.CompositionExceptionDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Represents the exception that is thrown when one or more errors occur during composition in a <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionException ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionException" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionException (System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.CompositionError&gt; errors);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Collections.Generic.IEnumerable`1&lt;class System.ComponentModel.Composition.CompositionError&gt; errors) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="errors" Type="System.Collections.Generic.IEnumerable&lt;System.ComponentModel.Composition.CompositionError&gt;" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionException" /> class with the specified collection of composition errors.</para>
-        </summary>
-        <param name="errors">
-          <attribution license="cc4" from="Microsoft" modified="false" />A collection of <see cref="T:System.ComponentModel.Composition.CompositionError" /> objects that represent problems during composition.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionException (string message);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionException" /> class with the specified error message.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.CompositionException" /> or null to set the <see cref="P:System.Exception.Message" /> property to its default value.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public CompositionException (string message, Exception innerException);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.Exception innerException) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="innerException" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.CompositionException" /> class with the specified error message and the exception that is the cause of this exception.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.CompositionException" /> or null to set the <see cref="P:System.Exception.Message" /> property to its default value.</param>
-        <param name="innerException">
-          <attribution license="cc4" from="Microsoft" modified="false" />The exception that is the underlying cause of the <see cref="T:System.ComponentModel.Composition.CompositionException" /> or null to set the <see cref="P:System.Exception.InnerException" /> property to null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Errors">
-      <MemberSignature Language="C#" Value="public System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.CompositionError&gt; Errors { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.ObjectModel.ReadOnlyCollection`1&lt;class System.ComponentModel.Composition.CompositionError&gt; Errors" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.ObjectModel.ReadOnlyCollection&lt;System.ComponentModel.Composition.CompositionError&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a collection of <see cref="T:System.ComponentModel.Composition.CompositionError" /> objects that describe the errors associated with the <see cref="T:System.ComponentModel.Composition.CompositionException" />.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Message">
-      <MemberSignature Language="C#" Value="public override string Message { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string Message" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets a message that describes the exception.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CreationPolicy.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/CreationPolicy.xml
deleted file mode 100644 (file)
index dc41e32..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="CreationPolicy" FullName="System.ComponentModel.Composition.CreationPolicy">
-  <TypeSignature Language="C#" Value="public enum CreationPolicy" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed CreationPolicy extends System.Enum" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>In the course of composition, the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> needs instances of the objects described by exports in order to fill imports. If a one export is used to fill multiple imports, there are two possible behaviors. Either a single instance of the exported object is created, and a reference to the same object is given to every importer, or a separate instance of the exported object is created for each importer. </para>
-      <para>Which behavior occurs depends on the <see cref="P:System.ComponentModel.Composition.PartCreationPolicyAttribute.CreationPolicy" /> property of the <see cref="T:System.ComponentModel.Composition.PartCreationPolicyAttribute" /> attached to the export and the <see cref="P:System.ComponentModel.Composition.ImportAttribute.RequiredCreationPolicy" /> of the <see cref="T:System.ComponentModel.Composition.ImportAttribute" />. Both of which will contain a value from the <see cref="T:System.ComponentModel.Composition.CreationPolicy" /> enumeration. If the policies are incompatible, that export will not be considered a match for the given import. The following table summarizes the interaction of these two properties.</para>
-      <list type="table">
-        <listheader>
-          <item>
-            <term>
-              <para>
-                <see cref="P:System.ComponentModel.Composition.ImportAttribute.RequiredCreationPolicy" />
-              </para>
-            </term>
-            <description>
-              <para>Export's <see cref="P:System.ComponentModel.Composition.PartCreationPolicyAttribute.CreationPolicy" /> specifies <see cref="F:System.ComponentModel.Composition.CreationPolicy.Any" /> or none specified.</para>
-            </description>
-            <description>
-              <para>Export's <see cref="P:System.ComponentModel.Composition.PartCreationPolicyAttribute.CreationPolicy" /> specifies <see cref="F:System.ComponentModel.Composition.CreationPolicy.Shared" /></para>
-            </description>
-            <description>
-              <para>Export's <see cref="P:System.ComponentModel.Composition.PartCreationPolicyAttribute.CreationPolicy" /> specifies <see cref="F:System.ComponentModel.Composition.CreationPolicy.NonShared" /></para>
-            </description>
-          </item>
-        </listheader>
-        <item>
-          <term>
-            <para>
-              <see cref="F:System.ComponentModel.Composition.CreationPolicy.Any" />
-            </para>
-          </term>
-          <description>
-            <para>A single, shared instance of the exported object will be created.</para>
-          </description>
-          <description>
-            <para>A single, shared instance of the exported object will be created.</para>
-          </description>
-          <description>
-            <para>A new instance of the exported object will be created for each importer.</para>
-          </description>
-        </item>
-        <item>
-          <term>
-            <para>
-              <see cref="F:System.ComponentModel.Composition.CreationPolicy.Shared" />
-            </para>
-          </term>
-          <description>
-            <para>A single, shared instance of the exported object will be created.</para>
-          </description>
-          <description>
-            <para>A single, shared instance of the exported object will be created.</para>
-          </description>
-          <description>
-            <para>The export will not be considered a match for the import.</para>
-          </description>
-        </item>
-        <item>
-          <term>
-            <para>
-              <see cref="F:System.ComponentModel.Composition.CreationPolicy.NonShared" />
-            </para>
-          </term>
-          <description>
-            <para>A new instance of the exported object will be created for each importer.</para>
-          </description>
-          <description>
-            <para>The export will not be considered a match for the import.</para>
-          </description>
-          <description>
-            <para>A new instance of the exported object will be created for each importer.</para>
-          </description>
-        </item>
-      </list>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies when and how a part will be instantiated.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="Any">
-      <MemberSignature Language="C#" Value="Any" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.CreationPolicy Any = int32(0)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies that the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> will use the most appropriate <see cref="T:System.ComponentModel.Composition.CreationPolicy" /> for the part given the current context. This is the default <see cref="T:System.ComponentModel.Composition.CreationPolicy" />. By default, <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> will use <see cref="F:System.ComponentModel.Composition.CreationPolicy.Shared" />, unless the <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> or importer requests <see cref="F:System.ComponentModel.Composition.CreationPolicy.NonShared" />.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="NewScope">
-      <MemberSignature Language="C#" Value="NewScope" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.CreationPolicy NewScope = int32(3)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>To be added.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="NonShared">
-      <MemberSignature Language="C#" Value="NonShared" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.CreationPolicy NonShared = int32(2)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies that a new non-shared instance of the associated <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> will be created by the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> for every requestor.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Shared">
-      <MemberSignature Language="C#" Value="Shared" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.CreationPolicy Shared = int32(1)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Specifies that a single shared instance of the associated <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePart" /> will be created by the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> and shared by all requestors.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportAttribute.xml
deleted file mode 100644 (file)
index f11134e..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportAttribute" FullName="System.ComponentModel.Composition.ExportAttribute">
-  <TypeSignature Language="C#" Value="public class ExportAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ExportAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Method | System.AttributeTargets.Property | System.AttributeTargets.Field | System.AttributeTargets.All, AllowMultiple=true, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>In the Attributed Programming Model, the <see cref="T:System.ComponentModel.Composition.ExportAttribute" /> declares that a part exports, or provides to the composition container, an object that fulfills a particular contract. During composition, parts with imports that have matching contracts will have those dependencies filled by the exported object.</para>
-      <para>The <see cref="T:System.ComponentModel.Composition.ExportAttribute" /> can decorate either an entire class, or a property, field, or method of a class. If the entire class is decorated, an instance of the class is the exported object. If a member of a class is decorated, the exported object will be the value of the decorated member.</para>
-      <para>Whether or not a contract matches is determined primarily by the contract name and the contract type. For more information, see <see cref="T:System.ComponentModel.Composition.ImportAttribute" />.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies that a type, property, field, or method provides a particular export.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportAttribute ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property or field type, or on the type that is marked with this attribute. </para>
-          <para>Methods marked with this attribute must specify a contract name or a type by using either <see cref="M:System.ComponentModel.Composition.ExportAttribute.#ctor(System.String)" /> or <see cref="M:System.ComponentModel.Composition.ExportAttribute.#ctor(System.Type)" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-          <para> </para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ExportAttribute" /> class, exporting the type or member marked with this attribute under the default contract name.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportAttribute (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property or field type, or on the type that this is marked with this attribute. </para>
-          <para>Methods marked with this attribute must specify a contract name or a type by using either <see cref="M:System.ComponentModel.Composition.ExportAttribute.#ctor(System.String)" /> or <see cref="M:System.ComponentModel.Composition.ExportAttribute.#ctor(System.Type)" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ExportAttribute" /> class, exporting the type or member marked with this attribute under the specified contract name.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name that is used to export the type or member marked with this attribute, or null or an empty string ("") to use the default contract name.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportAttribute (Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="contractType" />.</para>
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property or field type, or on the type that is marked with this attribute. </para>
-          <para>Methods marked with this attribute must specify a contract name or a type by using either <see cref="M:System.ComponentModel.Composition.ExportAttribute.#ctor(System.String)" /> or <see cref="M:System.ComponentModel.Composition.ExportAttribute.#ctor(System.Type)" />.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ExportAttribute" /> class, exporting the type or member marked with this attribute under a contract name derived from the specified type.</para>
-        </summary>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />A type from which to derive the contract name that is used to export the type or member marked with this attribute, or null to use the default contract name.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportAttribute (string contractName, Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ExportAttribute" /> class, exporting the specified type under the specified contract name.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name that is used to export the type or member marked with this attribute, or null or an empty string ("") to use the default contract name.</param>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type to export.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractName">
-      <MemberSignature Language="C#" Value="public string ContractName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string ContractName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract name that is used to export the type or member marked with this attribute.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractType">
-      <MemberSignature Language="C#" Value="public Type ContractType { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Type ContractType" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Type</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract type that is exported by the member that this attribute is attached to.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportFactory`1.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportFactory`1.xml
deleted file mode 100644 (file)
index 1b2b95e..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportFactory&lt;T&gt;" FullName="System.ComponentModel.Composition.ExportFactory&lt;T&gt;">
-  <TypeSignature Language="C#" Value="public class ExportFactory&lt;T&gt;" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ExportFactory`1&lt;T&gt; extends System.Object" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <TypeParameters>
-    <TypeParameter Name="T" />
-  </TypeParameters>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <typeparam name="T">To be added.</typeparam>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>When you refer indirectly to a part by using a <see cref="T:System.Lazy`1" /> object, the <see cref="P:System.Lazy`1.Value" /> property always returns a reference to the same object. In some circumstances, you might want each reference to result in the creation of a new object. <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> is designed for those scenarios.</para>
-      <para>
-        <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> can be used in a similar fashion to <see cref="T:System.Lazy`1" /> when creating attributed parts. That is, an import contract that is defined on <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> with a generic parameter of <paramref name="T" /> will match an export that is defined on <paramref name="T" />. For example, the follow export and import match:</para>
-      <code>[Export]
-public String myData = "Example Data.";
-
-[Import]
-public ExportFactory&lt;String&gt; theData { get; set; }</code>
-      <code>&lt;Export()&gt;
-Public myData As String = "Example Data."
-
-&lt;Import()&gt;
-Public Property theData As ExportFactory(Of String)</code>
-      <para>The <see cref="M:System.ComponentModel.Composition.ExportFactory`1.CreateExport" /> method returns an <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> object, which has two pieces. The <see cref="P:System.ComponentModel.Composition.ExportLifetimeContext`1.Value" /> property provides access to the created part. Calling the <see cref="M:System.ComponentModel.Composition.ExportLifetimeContext`1.Dispose" /> method of the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> object cleans up the created part and all of its dependencies, thereby allowing the part's lifetime to be managed without reference to the container that created it.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>A factory that creates new instances of a part that provides the specified export.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportFactory (Func&lt;Tuple&lt;T,Action&gt;&gt; exportLifetimeContextCreator);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Func`1&lt;class System.Tuple`2&lt;!T, class System.Action&gt;&gt; exportLifetimeContextCreator) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="exportLifetimeContextCreator" Type="System.Func&lt;System.Tuple&lt;T,System.Action&gt;&gt;" />
-      </Parameters>
-      <Docs>
-        <param name="exportLifetimeContextCreator">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateExport">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.ExportLifetimeContext&lt;T&gt; CreateExport ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.ComponentModel.Composition.ExportLifetimeContext`1&lt;!T&gt; CreateExport() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ExportLifetimeContext&lt;T&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Creates an instance of the factory's export type.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>A valid instance of the factory's exported type.</para>
-        </returns>
-      </Docs>
-    </Member>
-    <Member MemberName="OnFilterScopedCatalog">
-      <MemberSignature Language="C#" Value="protected virtual bool OnFilterScopedCatalog (System.ComponentModel.Composition.Primitives.ComposablePartDefinition composablePartDefinition);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance bool OnFilterScopedCatalog(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition composablePartDefinition) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="composablePartDefinition" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>When overridden in a derived class, filters part definitions in the scope of the <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> object.</para>
-        </summary>
-        <returns>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>true if the part definition should be included in the scope; otherwise, false.</para>
-        </returns>
-        <param name="composablePartDefinition">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part definition to filter.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportFactory`2.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportFactory`2.xml
deleted file mode 100644 (file)
index aef9986..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportFactory&lt;T,TMetadata&gt;" FullName="System.ComponentModel.Composition.ExportFactory&lt;T,TMetadata&gt;">
-  <TypeSignature Language="C#" Value="public class ExportFactory&lt;T,TMetadata&gt; : System.ComponentModel.Composition.ExportFactory&lt;T&gt;" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ExportFactory`2&lt;T, TMetadata&gt; extends System.ComponentModel.Composition.ExportFactory`1&lt;!T&gt;" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <TypeParameters>
-    <TypeParameter Name="T" />
-    <TypeParameter Name="TMetadata" />
-  </TypeParameters>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.ExportFactory&lt;T&gt;</BaseTypeName>
-    <BaseTypeArguments>
-      <BaseTypeArgument TypeParamName="T">T</BaseTypeArgument>
-    </BaseTypeArguments>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <typeparam name="T">To be added.</typeparam>
-    <typeparam name="TMetadata">To be added.</typeparam>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>
-        <see cref="T:System.ComponentModel.Composition.ExportFactory`2" /> extends <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> to include a metadata object, in much the same way that <see cref="T:System.Lazy`2" /> extends <see cref="T:System.Lazy`1" />. For more information, see <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> and <see cref="T:System.Lazy`1" />.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>A factory that creates new instances of a part that provides the specified export, with attached metadata.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportFactory (Func&lt;Tuple&lt;T,Action&gt;&gt; exportLifetimeContextCreator, TMetadata metadata);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Func`1&lt;class System.Tuple`2&lt;!T, class System.Action&gt;&gt; exportLifetimeContextCreator, !TMetadata metadata) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="exportLifetimeContextCreator" Type="System.Func&lt;System.Tuple&lt;T,System.Action&gt;&gt;" />
-        <Parameter Name="metadata" Type="TMetadata" />
-      </Parameters>
-      <Docs>
-        <param name="exportLifetimeContextCreator">To be added.</param>
-        <param name="metadata">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Metadata">
-      <MemberSignature Language="C#" Value="public TMetadata Metadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance !TMetadata Metadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>TMetadata</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata to be attached to the created parts.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportLifetimeContext`1.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportLifetimeContext`1.xml
deleted file mode 100644 (file)
index 18f8acb..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportLifetimeContext&lt;T&gt;" FullName="System.ComponentModel.Composition.ExportLifetimeContext&lt;T&gt;">
-  <TypeSignature Language="C#" Value="public sealed class ExportLifetimeContext&lt;T&gt; : IDisposable" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit ExportLifetimeContext`1&lt;T&gt; extends System.Object implements class System.IDisposable" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <TypeParameters>
-    <TypeParameter Name="T" />
-  </TypeParameters>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Docs>
-    <typeparam name="T">To be added.</typeparam>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Holds an exported value created by an <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> object and a reference to a method to release that object.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportLifetimeContext (T value, Action disposeAction);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(!T value, class System.Action disposeAction) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="value" Type="T" />
-        <Parameter Name="disposeAction" Type="System.Action" />
-      </Parameters>
-      <Docs>
-        <param name="value">To be added.</param>
-        <param name="disposeAction">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public void Dispose ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void Dispose() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Calling the Dispose method of a <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> object calls the referenced method to release its associated export.</para>
-          <para>Call Dispose when you are finished using the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" />. The Dispose method leaves the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> in an unusable state. After calling Dispose, you must release all references to the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> so the garbage collector can reclaim the memory that the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> was occupying.</para>
-          <para>For more information, see <see cref="http://go.microsoft.com/fwlink/?LinkId=187455">Cleaning Up Unmanaged Resources</see> and <see cref="http://go.microsoft.com/fwlink/?LinkId=187456">Implementing a Dispose Method</see>.</para>
-          <block subset="none" type="note">
-            <para>Always call Dispose before you release your last reference to the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" />. Otherwise, the resources it is using will not be freed until the garbage collector calls the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> object's Finalize method.</para>
-          </block>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Releases all resources used by the current instance of the <see cref="T:System.ComponentModel.Composition.ExportLifetimeContext`1" /> class, including its associated export.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Value">
-      <MemberSignature Language="C#" Value="public T Value { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance !T Value" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>T</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the exported value of a <see cref="T:System.ComponentModel.Composition.ExportFactory`1" /> object.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportMetadataAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ExportMetadataAttribute.xml
deleted file mode 100644 (file)
index 04d61fa..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ExportMetadataAttribute" FullName="System.ComponentModel.Composition.ExportMetadataAttribute">
-  <TypeSignature Language="C#" Value="public sealed class ExportMetadataAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit ExportMetadataAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Method | System.AttributeTargets.Property | System.AttributeTargets.Field | System.AttributeTargets.Interface | System.AttributeTargets.All, AllowMultiple=true, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies metadata for a type, property, field, or method marked with the <see cref="T:System.ComponentModel.Composition.ExportAttribute" />.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ExportMetadataAttribute (string name, object value);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string name, object value) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="name" Type="System.String" />
-        <Parameter Name="value" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ExportMetadataAttribute" /> with the specified name and metadata value.</para>
-        </summary>
-        <param name="name">
-          <attribution license="cc4" from="Microsoft" modified="false" />A string that contains the name of the metadata value, or null to set the <see cref="P:System.ComponentModel.Composition.ExportMetadataAttribute.Name" /> property to an empty string ("").</param>
-        <param name="value">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that contains the metadata value. This can be null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="IsMultiple">
-      <MemberSignature Language="C#" Value="public bool IsMultiple { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance bool IsMultiple" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that indicates whether this item is marked with this attribute more than once.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Name">
-      <MemberSignature Language="C#" Value="public string Name { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string Name" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the name of the metadata value.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Value">
-      <MemberSignature Language="C#" Value="public object Value { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance object Value" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Object</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata value.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ICompositionService.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ICompositionService.xml
deleted file mode 100644 (file)
index 11a30f0..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ICompositionService" FullName="System.ComponentModel.Composition.ICompositionService">
-  <TypeSignature Language="C#" Value="public interface ICompositionService" />
-  <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract ICompositionService" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides methods to satisfy imports on an existing part instance.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="SatisfyImportsOnce">
-      <MemberSignature Language="C#" Value="public void SatisfyImportsOnce (System.ComponentModel.Composition.Primitives.ComposablePart part);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void SatisfyImportsOnce(class System.ComponentModel.Composition.Primitives.ComposablePart part) cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePart" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Composes the specified part, with recomposition and validation disabled.</para>
-        </summary>
-        <param name="part">
-          <attribution license="cc4" from="Microsoft" modified="false" />The part to compose.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/IPartImportsSatisfiedNotification.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/IPartImportsSatisfiedNotification.xml
deleted file mode 100644 (file)
index 1ebcd6f..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="IPartImportsSatisfiedNotification" FullName="System.ComponentModel.Composition.IPartImportsSatisfiedNotification">
-  <TypeSignature Language="C#" Value="public interface IPartImportsSatisfiedNotification" />
-  <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract IPartImportsSatisfiedNotification" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Interfaces />
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Notifies a part when its imports have been satisfied.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="OnImportsSatisfied">
-      <MemberSignature Language="C#" Value="public void OnImportsSatisfied ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void OnImportsSatisfied() cil managed" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Called when a part's imports have been satisfied and it is safe to use.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportAttribute.xml
deleted file mode 100644 (file)
index 3a4830a..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportAttribute" FullName="System.ComponentModel.Composition.ImportAttribute">
-  <TypeSignature Language="C#" Value="public class ImportAttribute : Attribute, System.ComponentModel.Composition.IAttributedImport" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ImportAttribute extends System.Attribute implements class System.ComponentModel.Composition.IAttributedImport" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.IAttributedImport</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Field | System.AttributeTargets.Parameter | System.AttributeTargets.All, AllowMultiple=false, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>In the Attributed Programming Model, the <see cref="T:System.ComponentModel.Composition.ImportAttribute" /> is used to declare the imports, or dependencies, of a given part. It can decorate a property, a field, or a method. During composition, a part's imports will be filled by the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object to which that part belongs, by using the exports provided to that <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object.</para>
-      <para>Whether an import matches a given export is determined primarily by comparing the contract name and the contract type. Ordinarily, you do not have to specify either of these when using the import attribute in code, and they will be automatically inferred from the type of the decorated member. If the import must match an export of a different type (for example, a subclass of the type of the decorated member, or an interface implemented by that member), then the contract type must be explicitly specified. The contract name can also be explicitly specified, for example to distinguish between multiple contracts with the same type, but it is usually better to do this through metadata. For more information about metadata, see <see cref="T:System.ComponentModel.Composition.PartMetadataAttribute" />.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies that a property, field, or parameter value should be provided by the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />.object</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportAttribute ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property, field, or parameter type that this is marked with this attribute.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportAttribute" /> class, importing the export with the default contract name.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportAttribute (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property, field, or parameter type that is marked with this attribute.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportAttribute" /> class, importing the export with the specified contract name.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the export to import, or null or an empty string ("") to use the default contract name.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportAttribute (Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="contractType" />.</para>
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property, field, or parameter type that is marked with this attribute.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportAttribute" /> class, importing the export with the contract name derived from the specified type.</para>
-        </summary>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type to derive the contract name of the export from, or null to use the default contract name.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportAttribute (string contractName, Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportAttribute" /> class, importing the export with the specified contract name and type.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the export to import, or null or an empty string ("") to use the default contract name.</param>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the export to import.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AllowDefault">
-      <MemberSignature Language="C#" Value="public bool AllowDefault { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance bool AllowDefault" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default value of the type of a property, field, or parameter is null for reference types and zero for numeric value types. For other value types, the default value will be each field of the value type initialized to zero if the field is a value type, or null if the field is a reference type.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that indicates whether the property, field, or parameter will be set to its type's default value when an export with the contract name is not present in the container.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="AllowRecomposition">
-      <MemberSignature Language="C#" Value="public bool AllowRecomposition { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance bool AllowRecomposition" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that indicates whether the property or field will be recomposed when exports with a matching contract have changed in the container.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractName">
-      <MemberSignature Language="C#" Value="public string ContractName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string ContractName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract name of the export to import.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractType">
-      <MemberSignature Language="C#" Value="public Type ContractType { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Type ContractType" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Type</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the type of the export to import.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="RequiredCreationPolicy">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that indicates that the importer requires a specific <see cref="T:System.ComponentModel.Composition.CreationPolicy" /> for the exports used to satisfy this import. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Source">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.ImportSource Source { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.ImportSource Source" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ImportSource</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that specifies the scopes from which this import may be satisfied.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.IAttributedImport.Cardinality">
-      <MemberSignature Language="C#" Value="System.ComponentModel.Composition.Primitives.ImportCardinality System.ComponentModel.Composition.IAttributedImport.Cardinality { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.Primitives.ImportCardinality System.ComponentModel.Composition.IAttributedImport.Cardinality" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ImportCardinality</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportCardinalityMismatchException.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportCardinalityMismatchException.xml
deleted file mode 100644 (file)
index 53331fd..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportCardinalityMismatchException" FullName="System.ComponentModel.Composition.ImportCardinalityMismatchException">
-  <TypeSignature Language="C#" Value="public class ImportCardinalityMismatchException : Exception" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi serializable beforefieldinit ImportCardinalityMismatchException extends System.Exception" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Exception</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerDisplay("{Message}")</AttributeName>
-    </Attribute>
-    <Attribute>
-      <AttributeName>System.Diagnostics.DebuggerTypeProxy(typeof(System.ComponentModel.Composition.ImportCardinalityMismatchExceptionDebuggerProxy))</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>The exception that is thrown when the cardinality of an import is not compatible with the cardinality of the matching exports.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportCardinalityMismatchException ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This constructor initializes the <see cref="P:System.Exception.Message" /> property of the new instance to a system-supplied message that describes the error, such as "DefaultMessageDisplayedByParameterlessCtorWriterMustSupply". This message takes into account the current system culture.</para>
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.InsufficientMemoryException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null.</para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The localized error message string. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" /> class with a system-supplied message that describes the error.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportCardinalityMismatchException (string message);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null.</para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The error message string specified in <paramref name="message" />. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" /> class with a specified message that describes the error.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />A message that describes the <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" />, or null to set the <see cref="P:System.Exception.Message" /> property to its default value. </param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ImportCardinalityMismatchException (System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig specialname rtspecialname instance void .ctor(class System.Runtime.Serialization.SerializationInfo info, valuetype System.Runtime.Serialization.StreamingContext context) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Attributes>
-        <Attribute>
-          <AttributeName>System.Security.SecuritySafeCritical</AttributeName>
-        </Attribute>
-      </Attributes>
-      <Parameters>
-        <Parameter Name="info" Type="System.Runtime.Serialization.SerializationInfo" />
-        <Parameter Name="context" Type="System.Runtime.Serialization.StreamingContext" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>This constructor is called during deserialization to reconstitute the exception object transmitted over a stream. For more information, see <format type="text/html"><a href="832AC524-21BC-419A-A27B-CA8BFC45840F">XML and SOAP Serialization</a></format>.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" /> class with serialized data.</para>
-        </summary>
-        <param name="info">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that holds the serialized object data about the <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" />. </param>
-        <param name="context">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that contains contextual information about the source or destination. </param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportCardinalityMismatchException (string message, Exception innerException);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string message, class System.Exception innerException) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-        <Parameter Name="innerException" Type="System.Exception" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>An exception that is thrown as a direct result of a previous exception should include a reference to the previous exception in the <see cref="P:System.Exception.InnerException" /> property. The <see cref="P:System.Exception.InnerException" /> property returns the same value that is passed into the constructor, or null if the <see cref="P:System.Exception.InnerException" /> property does not supply the inner exception value to the constructor.</para>
-          <para>The following table shows the initial property values for an instance of <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" />.</para>
-          <list type="table">
-            <listheader>
-              <item>
-                <term>
-                  <para>Property </para>
-                </term>
-                <description>
-                  <para>Value </para>
-                </description>
-              </item>
-            </listheader>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.InnerException" />
-                </para>
-              </term>
-              <description>
-                <para>null. </para>
-              </description>
-            </item>
-            <item>
-              <term>
-                <para>
-                  <see cref="P:System.Exception.Message" />
-                </para>
-              </term>
-              <description>
-                <para>The error message string specified in <paramref name="message" />. </para>
-              </description>
-            </item>
-          </list>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportCardinalityMismatchException" /> class with a specified error message and a reference to the inner exception that is the cause of this exception.</para>
-        </summary>
-        <param name="message">
-          <attribution license="cc4" from="Microsoft" modified="false" />The message that describes the exception. The caller of this constructor is required to ensure that this string has been localized for the current system culture. </param>
-        <param name="innerException">
-          <attribution license="cc4" from="Microsoft" modified="false" />The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception. </param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportManyAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportManyAttribute.xml
deleted file mode 100644 (file)
index d94d1cf..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportManyAttribute" FullName="System.ComponentModel.Composition.ImportManyAttribute">
-  <TypeSignature Language="C#" Value="public class ImportManyAttribute : Attribute, System.ComponentModel.Composition.IAttributedImport" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ImportManyAttribute extends System.Attribute implements class System.ComponentModel.Composition.IAttributedImport" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ComponentModel.Composition.IAttributedImport</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Field | System.AttributeTargets.Parameter | System.AttributeTargets.All, AllowMultiple=false, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies that a property, field, or parameter should be populated with all matching exports by the <see cref="T:System.ComponentModel.Composition.Hosting.CompositionContainer" /> object.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportManyAttribute ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the type of the property, field, or parameter that is marked with this attribute.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportManyAttribute" /> class, importing the set of exports with the default contract name.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportManyAttribute (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property, field, or parameter type that is marked with this attribute.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportManyAttribute" /> class, importing the set of exports with the specified contract name.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the exports to import, or null or an empty string ("") to use the default contract name.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportManyAttribute (Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>The contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on <paramref name="contractType" />.</para>
-          <para>The default contract name is the result of calling the <see cref="M:System.ComponentModel.Composition.AttributedModelServices.GetContractName(System.Type)" /> method on the property, field, or parameter type that is marked with this attribute.</para>
-          <para>The contract name is compared by using the <see cref="P:System.StringComparer.Ordinal" /> property to perform a case-sensitive, non-linguistic comparison.</para>
-        </remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportManyAttribute" /> class, importing the set of exports with the contract name derived from the specified type.</para>
-        </summary>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type to derive the contract name of the exports to import, or null to use the default contract name.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportManyAttribute (string contractName, Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportManyAttribute" /> class, importing the set of exports with the specified contract name and contract type.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The contract name of the exports to import, or null or an empty string ("") to use the default contract name.</param>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the export to import.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="AllowRecomposition">
-      <MemberSignature Language="C#" Value="public bool AllowRecomposition { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance bool AllowRecomposition" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value indicating whether the decorated property or field will be recomposed when exports that provide the matching contract change.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractName">
-      <MemberSignature Language="C#" Value="public string ContractName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string ContractName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract name of the exports to import.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ContractType">
-      <MemberSignature Language="C#" Value="public Type ContractType { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Type ContractType" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Type</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the contract type of the export to import.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="RequiredCreationPolicy">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that indicates that the importer requires a specific <see cref="T:System.ComponentModel.Composition.CreationPolicy" /> for the exports used to satisfy this import. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Source">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.ImportSource Source { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.ImportSource Source" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ImportSource</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that specifies the scopes from which this import may be satisfied.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="System.ComponentModel.Composition.IAttributedImport.Cardinality">
-      <MemberSignature Language="C#" Value="System.ComponentModel.Composition.Primitives.ImportCardinality System.ComponentModel.Composition.IAttributedImport.Cardinality { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.Primitives.ImportCardinality System.ComponentModel.Composition.IAttributedImport.Cardinality" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.Primitives.ImportCardinality</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportSource.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportSource.xml
deleted file mode 100644 (file)
index 40e240e..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportSource" FullName="System.ComponentModel.Composition.ImportSource">
-  <TypeSignature Language="C#" Value="public enum ImportSource" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed ImportSource extends System.Enum" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies values that indicate how the MEF composition engine searches for imports.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName="Any">
-      <MemberSignature Language="C#" Value="Any" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.ImportSource Any = int32(0)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ImportSource</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Imports may be satisfied from the current scope or any ancestor scope.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Local">
-      <MemberSignature Language="C#" Value="Local" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.ImportSource Local = int32(1)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ImportSource</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Imports may be satisfied only from the current scope.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="NonLocal">
-      <MemberSignature Language="C#" Value="NonLocal" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.ComponentModel.Composition.ImportSource NonLocal = int32(2)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.ImportSource</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Imports may be satisfied only from an ancestor scope.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportingConstructorAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/ImportingConstructorAttribute.xml
deleted file mode 100644 (file)
index 196be1b..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="ImportingConstructorAttribute" FullName="System.ComponentModel.Composition.ImportingConstructorAttribute">
-  <TypeSignature Language="C#" Value="public class ImportingConstructorAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ImportingConstructorAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Constructor, AllowMultiple=false, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>By default, only a parameter-less constructor will be used to construct an attributed part. Use <see cref="T:System.ComponentModel.Composition.ImportingConstructorAttribute" /> to indicate that a specific constructor should be used instead. Parameters to the decorated constructor will be treated as imports.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies which constructor should be used when creating a part.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ImportingConstructorAttribute ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.ImportingConstructorAttribute" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/InheritedExportAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/InheritedExportAttribute.xml
deleted file mode 100644 (file)
index f95dc31..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="InheritedExportAttribute" FullName="System.ComponentModel.Composition.InheritedExportAttribute">
-  <TypeSignature Language="C#" Value="public class InheritedExportAttribute : System.ComponentModel.Composition.ExportAttribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit InheritedExportAttribute extends System.ComponentModel.Composition.ExportAttribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.ComponentModel.Composition.ExportAttribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Interface | System.AttributeTargets.All, AllowMultiple=true, Inherited=true)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies that a type provides a particular export, and that subclasses of that type will also provide that export.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public InheritedExportAttribute ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.InheritedExportAttribute" /> class. </para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public InheritedExportAttribute (string contractName);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.InheritedExportAttribute" /> class with the specified contract name.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The name of the contract.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public InheritedExportAttribute (Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.InheritedExportAttribute" /> class with the specified contract type.</para>
-        </summary>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the contract.</param>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public InheritedExportAttribute (string contractName, Type contractType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string contractName, class System.Type contractType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="contractName" Type="System.String" />
-        <Parameter Name="contractType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.InheritedExportAttribute" /> class with the specified contract name and type.</para>
-        </summary>
-        <param name="contractName">
-          <attribution license="cc4" from="Microsoft" modified="false" />The name of the contract.</param>
-        <param name="contractType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the contract.</param>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/MetadataAttributeAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/MetadataAttributeAttribute.xml
deleted file mode 100644 (file)
index 50f7733..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="MetadataAttributeAttribute" FullName="System.ComponentModel.Composition.MetadataAttributeAttribute">
-  <TypeSignature Language="C#" Value="public sealed class MetadataAttributeAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit MetadataAttributeAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies that a custom attribute’s properties provide metadata for exports applied to the same type, property, field, or method.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public MetadataAttributeAttribute ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.MetadataAttributeAttribute" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/MetadataViewImplementationAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/MetadataViewImplementationAttribute.xml
deleted file mode 100644 (file)
index 0effc6c..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="MetadataViewImplementationAttribute" FullName="System.ComponentModel.Composition.MetadataViewImplementationAttribute">
-  <TypeSignature Language="C#" Value="public sealed class MetadataViewImplementationAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit MetadataViewImplementationAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Interface, AllowMultiple=false, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>By default, metadata views are created using generated types. Use this attribute to specify that a metadata view should use an existing type.</para>
-    </remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies the type used to implement a metadata view.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public MetadataViewImplementationAttribute (Type implementationType);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Type implementationType) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="implementationType" Type="System.Type" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.MetadataViewImplementationAttribute" /> class.</para>
-        </summary>
-        <param name="implementationType">
-          <attribution license="cc4" from="Microsoft" modified="false" />The type of the metadata view.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="ImplementationType">
-      <MemberSignature Language="C#" Value="public Type ImplementationType { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Type ImplementationType" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Type</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the type of the metadata view.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartCreationPolicyAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartCreationPolicyAttribute.xml
deleted file mode 100644 (file)
index e5885de..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="PartCreationPolicyAttribute" FullName="System.ComponentModel.Composition.PartCreationPolicyAttribute">
-  <TypeSignature Language="C#" Value="public sealed class PartCreationPolicyAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit PartCreationPolicyAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple=false, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies the <see cref="P:System.ComponentModel.Composition.PartCreationPolicyAttribute.CreationPolicy" /> for a part.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PartCreationPolicyAttribute (System.ComponentModel.Composition.CreationPolicy creationPolicy);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype System.ComponentModel.Composition.CreationPolicy creationPolicy) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="creationPolicy" Type="System.ComponentModel.Composition.CreationPolicy" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.PartCreationPolicyAttribute" /> class with the specified creation policy.</para>
-        </summary>
-        <param name="creationPolicy">
-          <attribution license="cc4" from="Microsoft" modified="false" />The creation policy to use.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="CreationPolicy">
-      <MemberSignature Language="C#" Value="public System.ComponentModel.Composition.CreationPolicy CreationPolicy { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype System.ComponentModel.Composition.CreationPolicy CreationPolicy" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.ComponentModel.Composition.CreationPolicy</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets or sets a value that indicates the creation policy of the attributed part.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartMetadataAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartMetadataAttribute.xml
deleted file mode 100644 (file)
index f953761..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="PartMetadataAttribute" FullName="System.ComponentModel.Composition.PartMetadataAttribute">
-  <TypeSignature Language="C#" Value="public sealed class PartMetadataAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit PartMetadataAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple=true, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies metadata for a part.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PartMetadataAttribute (string name, object value);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string name, object value) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="name" Type="System.String" />
-        <Parameter Name="value" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.PartMetadataAttribute" /> class with the specified name and metadata value.</para>
-        </summary>
-        <param name="name">
-          <attribution license="cc4" from="Microsoft" modified="false" />A string that contains the name of the metadata value or null to use an empty string ("").</param>
-        <param name="value">
-          <attribution license="cc4" from="Microsoft" modified="false" />An object that contains the metadata value. This can be null.</param>
-      </Docs>
-    </Member>
-    <Member MemberName="Name">
-      <MemberSignature Language="C#" Value="public string Name { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string Name" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the name of the metadata value.</para>
-        </summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Value">
-      <MemberSignature Language="C#" Value="public object Value { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance object Value" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Object</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata value.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartNotDiscoverableAttribute.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System.ComponentModel.Composition/PartNotDiscoverableAttribute.xml
deleted file mode 100644 (file)
index 05106c2..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="PartNotDiscoverableAttribute" FullName="System.ComponentModel.Composition.PartNotDiscoverableAttribute">
-  <TypeSignature Language="C#" Value="public sealed class PartNotDiscoverableAttribute : Attribute" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit PartNotDiscoverableAttribute extends System.Attribute" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Attribute</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple=false, Inherited=false)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Specifies that this type’s exports won’t be included in a <see cref="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PartNotDiscoverableAttribute ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters />
-      <Docs>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Initializes a new instance of the <see cref="T:System.ComponentModel.Composition.PartNotDiscoverableAttribute" /> class.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/System/Lazy`2.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/System/Lazy`2.xml
deleted file mode 100644 (file)
index 021848f..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Type Name="Lazy&lt;T,TMetadata&gt;" FullName="System.Lazy&lt;T,TMetadata&gt;">
-  <TypeSignature Language="C#" Value="public class Lazy&lt;T,TMetadata&gt; : Lazy&lt;T&gt;" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi serializable beforefieldinit Lazy`2&lt;T, TMetadata&gt; extends System.Lazy`1&lt;!T&gt;" />
-  <AssemblyInfo>
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <TypeParameters>
-    <TypeParameter Name="T" />
-    <TypeParameter Name="TMetadata" />
-  </TypeParameters>
-  <Base>
-    <BaseTypeName>System.Lazy&lt;T&gt;</BaseTypeName>
-    <BaseTypeArguments>
-      <BaseTypeArgument TypeParamName="!0">T</BaseTypeArgument>
-    </BaseTypeArguments>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <typeparam name="T">To be added.</typeparam>
-    <typeparam name="TMetadata">To be added.</typeparam>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>Provides a lazy indirect reference to an object and its associated metadata for use by the Managed Extensibility Framework.</para>
-    </summary>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Lazy (TMetadata metadata);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(!TMetadata metadata) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="metadata" Type="TMetadata" />
-      </Parameters>
-      <Docs>
-        <param name="metadata">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Lazy (Func&lt;T&gt; valueFactory, TMetadata metadata);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Func`1&lt;!T&gt; valueFactory, !TMetadata metadata) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="valueFactory" Type="System.Func&lt;T&gt;" />
-        <Parameter Name="metadata" Type="TMetadata" />
-      </Parameters>
-      <Docs>
-        <param name="valueFactory">To be added.</param>
-        <param name="metadata">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Lazy (TMetadata metadata, bool isThreadSafe);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(!TMetadata metadata, bool isThreadSafe) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="metadata" Type="TMetadata" />
-        <Parameter Name="isThreadSafe" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <param name="metadata">To be added.</param>
-        <param name="isThreadSafe">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Lazy (TMetadata metadata, System.Threading.LazyThreadSafetyMode mode);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(!TMetadata metadata, valuetype System.Threading.LazyThreadSafetyMode mode) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="metadata" Type="TMetadata" />
-        <Parameter Name="mode" Type="System.Threading.LazyThreadSafetyMode" />
-      </Parameters>
-      <Docs>
-        <param name="metadata">To be added.</param>
-        <param name="mode">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Lazy (Func&lt;T&gt; valueFactory, TMetadata metadata, bool isThreadSafe);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Func`1&lt;!T&gt; valueFactory, !TMetadata metadata, bool isThreadSafe) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="valueFactory" Type="System.Func&lt;T&gt;" />
-        <Parameter Name="metadata" Type="TMetadata" />
-        <Parameter Name="isThreadSafe" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <param name="valueFactory">To be added.</param>
-        <param name="metadata">To be added.</param>
-        <param name="isThreadSafe">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Lazy (Func&lt;T&gt; valueFactory, TMetadata metadata, System.Threading.LazyThreadSafetyMode mode);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class System.Func`1&lt;!T&gt; valueFactory, !TMetadata metadata, valuetype System.Threading.LazyThreadSafetyMode mode) cil managed" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="valueFactory" Type="System.Func&lt;T&gt;" />
-        <Parameter Name="metadata" Type="TMetadata" />
-        <Parameter Name="mode" Type="System.Threading.LazyThreadSafetyMode" />
-      </Parameters>
-      <Docs>
-        <param name="valueFactory">To be added.</param>
-        <param name="metadata">To be added.</param>
-        <param name="mode">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Metadata">
-      <MemberSignature Language="C#" Value="public TMetadata Metadata { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance !TMetadata Metadata" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>4.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>TMetadata</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-        <summary>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>Gets the metadata associated with the referenced object.</para>
-        </summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/index.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/index.xml
deleted file mode 100644 (file)
index 30ef37e..0000000
+++ /dev/null
@@ -1,663 +0,0 @@
-<Overview>
-  <Assemblies>
-    <Assembly Name="System.ComponentModel.Composition" Version="4.0.0.0">
-      <AssemblyPublicKey>[00 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 ]</AssemblyPublicKey>
-      <Attributes>
-        <Attribute>
-          <AttributeName>System.CLSCompliant(true)</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyCompany("Mono development team")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyCopyright("(c) Microsoft Corporation. All rights reserved.")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyDefaultAlias("System.ComponentModel.Composition.dll")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyDescription("System.ComponentModel.Composition.dll")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyFileVersion("4.0.30319.17020")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("4.0.30319.17020")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyProduct("Mono Common Language Infrastructure")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyTitle("System.ComponentModel.Composition.dll")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Resources.NeutralResourcesLanguage("en-US")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Resources.SatelliteContractVersion("4.0.0.0")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.InteropServices.ComVisible(false)</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Security.AllowPartiallyTrustedCallers</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Security.SecurityCritical</AttributeName>
-        </Attribute>
-      </Attributes>
-    </Assembly>
-  </Assemblies>
-  <Remarks>To be added.</Remarks>
-  <Copyright>To be added.</Copyright>
-  <Types>
-    <Namespace Name="System">
-      <Type Name="Lazy`2" DisplayName="Lazy&lt;T,TMetadata&gt;" Kind="Class" />
-    </Namespace>
-    <Namespace Name="System.ComponentModel.Composition">
-      <Type Name="AttributedModelServices" Kind="Class" />
-      <Type Name="CatalogReflectionContextAttribute" Kind="Class" />
-      <Type Name="ChangeRejectedException" Kind="Class" />
-      <Type Name="CompositionContractMismatchException" Kind="Class" />
-      <Type Name="CompositionError" Kind="Class" />
-      <Type Name="CompositionException" Kind="Class" />
-      <Type Name="CreationPolicy" Kind="Enumeration" />
-      <Type Name="ExportAttribute" Kind="Class" />
-      <Type Name="ExportFactory`1" DisplayName="ExportFactory&lt;T&gt;" Kind="Class" />
-      <Type Name="ExportFactory`2" DisplayName="ExportFactory&lt;T,TMetadata&gt;" Kind="Class" />
-      <Type Name="ExportLifetimeContext`1" DisplayName="ExportLifetimeContext&lt;T&gt;" Kind="Class" />
-      <Type Name="ExportMetadataAttribute" Kind="Class" />
-      <Type Name="ICompositionService" Kind="Interface" />
-      <Type Name="ImportAttribute" Kind="Class" />
-      <Type Name="ImportCardinalityMismatchException" Kind="Class" />
-      <Type Name="ImportingConstructorAttribute" Kind="Class" />
-      <Type Name="ImportManyAttribute" Kind="Class" />
-      <Type Name="ImportSource" Kind="Enumeration" />
-      <Type Name="InheritedExportAttribute" Kind="Class" />
-      <Type Name="IPartImportsSatisfiedNotification" Kind="Interface" />
-      <Type Name="MetadataAttributeAttribute" Kind="Class" />
-      <Type Name="MetadataViewImplementationAttribute" Kind="Class" />
-      <Type Name="PartCreationPolicyAttribute" Kind="Class" />
-      <Type Name="PartMetadataAttribute" Kind="Class" />
-      <Type Name="PartNotDiscoverableAttribute" Kind="Class" />
-    </Namespace>
-    <Namespace Name="System.ComponentModel.Composition.Hosting">
-      <Type Name="AggregateCatalog" Kind="Class" />
-      <Type Name="AggregateExportProvider" Kind="Class" />
-      <Type Name="ApplicationCatalog" Kind="Class" />
-      <Type Name="AssemblyCatalog" Kind="Class" />
-      <Type Name="AtomicComposition" Kind="Class" />
-      <Type Name="CatalogExportProvider" Kind="Class" />
-      <Type Name="CatalogExtensions" Kind="Class" />
-      <Type Name="ComposablePartCatalogChangeEventArgs" Kind="Class" />
-      <Type Name="ComposablePartExportProvider" Kind="Class" />
-      <Type Name="CompositionBatch" Kind="Class" />
-      <Type Name="CompositionConstants" Kind="Class" />
-      <Type Name="CompositionContainer" Kind="Class" />
-      <Type Name="CompositionOptions" Kind="Enumeration" />
-      <Type Name="CompositionScopeDefinition" Kind="Class" />
-      <Type Name="CompositionService" Kind="Class" />
-      <Type Name="DirectoryCatalog" Kind="Class" />
-      <Type Name="ExportProvider" Kind="Class" />
-      <Type Name="ExportsChangeEventArgs" Kind="Class" />
-      <Type Name="FilteredCatalog" Kind="Class" />
-      <Type Name="ImportEngine" Kind="Class" />
-      <Type Name="INotifyComposablePartCatalogChanged" Kind="Interface" />
-      <Type Name="ScopingExtensions" Kind="Class" />
-      <Type Name="TypeCatalog" Kind="Class" />
-    </Namespace>
-    <Namespace Name="System.ComponentModel.Composition.Primitives">
-      <Type Name="ComposablePart" Kind="Class" />
-      <Type Name="ComposablePartCatalog" Kind="Class" />
-      <Type Name="ComposablePartDefinition" Kind="Class" />
-      <Type Name="ComposablePartException" Kind="Class" />
-      <Type Name="ContractBasedImportDefinition" Kind="Class" />
-      <Type Name="Export" Kind="Class" />
-      <Type Name="ExportDefinition" Kind="Class" />
-      <Type Name="ExportedDelegate" Kind="Class" />
-      <Type Name="ICompositionElement" Kind="Interface" />
-      <Type Name="ImportCardinality" Kind="Enumeration" />
-      <Type Name="ImportDefinition" Kind="Class" />
-    </Namespace>
-    <Namespace Name="System.ComponentModel.Composition.ReflectionModel">
-      <Type Name="LazyMemberInfo" Kind="Structure" />
-      <Type Name="ReflectionModelServices" Kind="Class" />
-    </Namespace>
-  </Types>
-  <Title>System.ComponentModel.Composition</Title>
-  <ExtensionMethods>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Hosting.CompositionBatch" />
-      </Targets>
-      <Member MemberName="AddExportedValue&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionBatch batch, T exportedValue);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionBatch batch, !!T exportedValue) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" RefType="this" />
-          <Parameter Name="exportedValue" Type="T" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="batch">To be added.</param>
-          <param name="exportedValue">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.AddExportedValue``1(System.ComponentModel.Composition.Hosting.CompositionBatch,``0)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Hosting.CompositionBatch" />
-      </Targets>
-      <Member MemberName="AddExportedValue&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionBatch batch, string contractName, T exportedValue);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart AddExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionBatch batch, string contractName, !!T exportedValue) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" RefType="this" />
-          <Parameter Name="contractName" Type="System.String" />
-          <Parameter Name="exportedValue" Type="T" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="batch">To be added.</param>
-          <param name="contractName">To be added.</param>
-          <param name="exportedValue">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.AddExportedValue``1(System.ComponentModel.Composition.Hosting.CompositionBatch,System.String,``0)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Hosting.CompositionBatch" />
-      </Targets>
-      <Member MemberName="AddPart">
-        <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart AddPart (this System.ComponentModel.Composition.Hosting.CompositionBatch batch, object attributedPart);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart AddPart(class System.ComponentModel.Composition.Hosting.CompositionBatch batch, object attributedPart) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="batch" Type="System.ComponentModel.Composition.Hosting.CompositionBatch" RefType="this" />
-          <Parameter Name="attributedPart" Type="System.Object" />
-        </Parameters>
-        <Docs>
-          <param name="batch">To be added.</param>
-          <param name="attributedPart">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.AddPart(System.ComponentModel.Composition.Hosting.CompositionBatch,System.Object)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />
-      </Targets>
-      <Member MemberName="ComposeExportedValue&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static void ComposeExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionContainer container, T exportedValue);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ComposeExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionContainer container, !!T exportedValue) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Void</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="container" Type="System.ComponentModel.Composition.Hosting.CompositionContainer" RefType="this" />
-          <Parameter Name="exportedValue" Type="T" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="container">To be added.</param>
-          <param name="exportedValue">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.ComposeExportedValue``1(System.ComponentModel.Composition.Hosting.CompositionContainer,``0)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />
-      </Targets>
-      <Member MemberName="ComposeExportedValue&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static void ComposeExportedValue&lt;T&gt; (this System.ComponentModel.Composition.Hosting.CompositionContainer container, string contractName, T exportedValue);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ComposeExportedValue&lt;T&gt;(class System.ComponentModel.Composition.Hosting.CompositionContainer container, string contractName, !!T exportedValue) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Void</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="container" Type="System.ComponentModel.Composition.Hosting.CompositionContainer" RefType="this" />
-          <Parameter Name="contractName" Type="System.String" />
-          <Parameter Name="exportedValue" Type="T" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="container">To be added.</param>
-          <param name="contractName">To be added.</param>
-          <param name="exportedValue">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.ComposeExportedValue``1(System.ComponentModel.Composition.Hosting.CompositionContainer,System.String,``0)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Hosting.CompositionContainer" />
-      </Targets>
-      <Member MemberName="ComposeParts">
-        <MemberSignature Language="C#" Value="public static void ComposeParts (this System.ComponentModel.Composition.Hosting.CompositionContainer container, object[] attributedParts);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ComposeParts(class System.ComponentModel.Composition.Hosting.CompositionContainer container, object[] attributedParts) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Void</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="container" Type="System.ComponentModel.Composition.Hosting.CompositionContainer" RefType="this" />
-          <Parameter Name="attributedParts" Type="System.Object[]">
-            <Attributes>
-              <Attribute>
-                <AttributeName>System.ParamArray</AttributeName>
-              </Attribute>
-            </Attributes>
-          </Parameter>
-        </Parameters>
-        <Docs>
-          <param name="container">To be added.</param>
-          <param name="attributedParts">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.ComposeParts(System.ComponentModel.Composition.Hosting.CompositionContainer,System.Object[])" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Exports">
-        <MemberSignature Language="C#" Value="public static bool Exports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, Type contractType);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Exports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, class System.Type contractType) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="contractType" Type="System.Type" />
-        </Parameters>
-        <Docs>
-          <param name="part">To be added.</param>
-          <param name="contractType">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.Exports(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Type)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Exports&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static bool Exports&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Exports&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="part">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.Exports``1(System.ComponentModel.Composition.Primitives.ComposablePartDefinition)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Imports">
-        <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, Type contractType);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, class System.Type contractType) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="contractType" Type="System.Type" />
-        </Parameters>
-        <Docs>
-          <param name="part">To be added.</param>
-          <param name="contractType">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.Imports(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Type)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Imports">
-        <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, Type contractType, System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, class System.Type contractType, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="contractType" Type="System.Type" />
-          <Parameter Name="importCardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        </Parameters>
-        <Docs>
-          <param name="part">To be added.</param>
-          <param name="contractType">To be added.</param>
-          <param name="importCardinality">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.Imports(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Type,System.ComponentModel.Composition.Primitives.ImportCardinality)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Imports&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static bool Imports&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="part">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.Imports``1(System.ComponentModel.Composition.Primitives.ComposablePartDefinition)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Imports&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static bool Imports&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="importCardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="part">To be added.</param>
-          <param name="importCardinality">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.Imports``1(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Primitives.ImportCardinality)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.ICompositionService" />
-      </Targets>
-      <Member MemberName="SatisfyImportsOnce">
-        <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce (this System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce(class System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="compositionService" Type="System.ComponentModel.Composition.ICompositionService" RefType="this" />
-          <Parameter Name="attributedPart" Type="System.Object" />
-        </Parameters>
-        <Docs>
-          <param name="compositionService">To be added.</param>
-          <param name="attributedPart">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.SatisfyImportsOnce(System.ComponentModel.Composition.ICompositionService,System.Object)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.ICompositionService" />
-      </Targets>
-      <Member MemberName="SatisfyImportsOnce">
-        <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce (this System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart, System.Reflection.ReflectionContext reflectionContext);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Primitives.ComposablePart SatisfyImportsOnce(class System.ComponentModel.Composition.ICompositionService compositionService, object attributedPart, class System.Reflection.ReflectionContext reflectionContext) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.ComponentModel.Composition.Primitives.ComposablePart</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="compositionService" Type="System.ComponentModel.Composition.ICompositionService" RefType="this" />
-          <Parameter Name="attributedPart" Type="System.Object" />
-          <Parameter Name="reflectionContext" Type="System.Reflection.ReflectionContext" />
-        </Parameters>
-        <Docs>
-          <param name="compositionService">To be added.</param>
-          <param name="attributedPart">To be added.</param>
-          <param name="reflectionContext">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.AttributedModelServices" Member="M:System.ComponentModel.Composition.AttributedModelServices.SatisfyImportsOnce(System.ComponentModel.Composition.ICompositionService,System.Object,System.Reflection.ReflectionContext)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-      </Targets>
-      <Member MemberName="CreateCompositionService">
-        <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Hosting.CompositionService CreateCompositionService (this System.ComponentModel.Composition.Primitives.ComposablePartCatalog composablePartCatalog);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Hosting.CompositionService CreateCompositionService(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog composablePartCatalog) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.ComponentModel.Composition.Hosting.CompositionService</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="composablePartCatalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" RefType="this" />
-        </Parameters>
-        <Docs>
-          <param name="composablePartCatalog">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.Hosting.CatalogExtensions" Member="M:System.ComponentModel.Composition.Hosting.CatalogExtensions.CreateCompositionService(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="ContainsPartMetadata&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static bool ContainsPartMetadata&lt;T&gt; (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key, T value);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool ContainsPartMetadata&lt;T&gt;(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key, !!T value) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T" />
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="key" Type="System.String" />
-          <Parameter Name="value" Type="T" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">To be added.</typeparam>
-          <param name="part">To be added.</param>
-          <param name="key">To be added.</param>
-          <param name="value">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.Hosting.ScopingExtensions" Member="M:System.ComponentModel.Composition.Hosting.ScopingExtensions.ContainsPartMetadata``1(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String,``0)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="ContainsPartMetadataWithKey">
-        <MemberSignature Language="C#" Value="public static bool ContainsPartMetadataWithKey (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool ContainsPartMetadataWithKey(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string key) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="key" Type="System.String" />
-        </Parameters>
-        <Docs>
-          <param name="part">To be added.</param>
-          <param name="key">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.Hosting.ScopingExtensions" Member="M:System.ComponentModel.Composition.Hosting.ScopingExtensions.ContainsPartMetadataWithKey(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Exports">
-        <MemberSignature Language="C#" Value="public static bool Exports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Exports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="contractName" Type="System.String" />
-        </Parameters>
-        <Docs>
-          <param name="part">To be added.</param>
-          <param name="contractName">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.Hosting.ScopingExtensions" Member="M:System.ComponentModel.Composition.Hosting.ScopingExtensions.Exports(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartCatalog" />
-      </Targets>
-      <Member MemberName="Filter">
-        <MemberSignature Language="C#" Value="public static System.ComponentModel.Composition.Hosting.FilteredCatalog Filter (this System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, Func&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,bool&gt; filter);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.ComponentModel.Composition.Hosting.FilteredCatalog Filter(class System.ComponentModel.Composition.Primitives.ComposablePartCatalog catalog, class System.Func`2&lt;class System.ComponentModel.Composition.Primitives.ComposablePartDefinition, bool&gt; filter) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.ComponentModel.Composition.Hosting.FilteredCatalog</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="catalog" Type="System.ComponentModel.Composition.Primitives.ComposablePartCatalog" RefType="this" />
-          <Parameter Name="filter" Type="System.Func&lt;System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean&gt;" />
-        </Parameters>
-        <Docs>
-          <param name="catalog">To be added.</param>
-          <param name="filter">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.Hosting.ScopingExtensions" Member="M:System.ComponentModel.Composition.Hosting.ScopingExtensions.Filter(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Func{System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean})" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Imports">
-        <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="contractName" Type="System.String" />
-        </Parameters>
-        <Docs>
-          <param name="part">To be added.</param>
-          <param name="contractName">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.Hosting.ScopingExtensions" Member="M:System.ComponentModel.Composition.Hosting.ScopingExtensions.Imports(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="T:System.ComponentModel.Composition.Primitives.ComposablePartDefinition" />
-      </Targets>
-      <Member MemberName="Imports">
-        <MemberSignature Language="C#" Value="public static bool Imports (this System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName, System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Imports(class System.ComponentModel.Composition.Primitives.ComposablePartDefinition part, string contractName, valuetype System.ComponentModel.Composition.Primitives.ImportCardinality importCardinality) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <Parameters>
-          <Parameter Name="part" Type="System.ComponentModel.Composition.Primitives.ComposablePartDefinition" RefType="this" />
-          <Parameter Name="contractName" Type="System.String" />
-          <Parameter Name="importCardinality" Type="System.ComponentModel.Composition.Primitives.ImportCardinality" />
-        </Parameters>
-        <Docs>
-          <param name="part">To be added.</param>
-          <param name="contractName">To be added.</param>
-          <param name="importCardinality">To be added.</param>
-          <summary>To be added.</summary>
-        </Docs>
-        <Link Type="System.ComponentModel.Composition.Hosting.ScopingExtensions" Member="M:System.ComponentModel.Composition.Hosting.ScopingExtensions.Imports(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality)" />
-      </Member>
-    </ExtensionMethod>
-  </ExtensionMethods>
-</Overview>
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.Hosting.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.Hosting.xml
deleted file mode 100644 (file)
index ac31a36..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Namespace Name="System.ComponentModel.Composition.Hosting">
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>The <see cref="N:System.ComponentModel.Composition.Hosting" /> namespace provides Managed Extensibility Framework (MEF) types that are useful to developers of extensible applications, or hosts.</para>
-    </summary>
-  </Docs>
-</Namespace>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.Primitives.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.Primitives.xml
deleted file mode 100644 (file)
index 2e8881f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Namespace Name="System.ComponentModel.Composition.Primitives">
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>This namespace provides the primitive types underlying the MEF programming model.</para>
-    </summary>
-  </Docs>
-</Namespace>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.ReflectionModel.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.ReflectionModel.xml
deleted file mode 100644 (file)
index f1f7cad..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Namespace Name="System.ComponentModel.Composition.ReflectionModel">
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>The <see cref="N:System.ComponentModel.Composition.ReflectionModel" /> namespace provides Managed Extensibility Framework (MEF) types for developers who use a reflection-based programming model.</para>
-    </summary>
-  </Docs>
-</Namespace>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.ComponentModel.Composition.xml
deleted file mode 100644 (file)
index 84d912d..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Namespace Name="System.ComponentModel.Composition">
-  <Docs>
-    <remarks>To be added.</remarks>
-    <summary>
-      <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>This namespace provides classes that constitute the core of the Managed Extensibility Framework, or MEF.</para>
-    </summary>
-  </Docs>
-</Namespace>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.xml b/mcs/class/System.ComponentModel.Composition/Documentation/en/ns-System.xml
deleted file mode 100644 (file)
index c969274..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<Namespace Name="System">
-  <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Namespace>
diff --git a/mcs/class/System.ComponentModel.Composition/Makefile b/mcs/class/System.ComponentModel.Composition/Makefile
deleted file mode 100644 (file)
index a039de6..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-thisdir = class/System.ComponentModel.Composition
-SUBDIRS = 
-include ../../build/rules.make
-
-LIBRARY = System.ComponentModel.Composition.dll
-LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll -d:CLR40 -resource:$(STRING_MESSAGES)
-
-STRING_MESSAGES = Microsoft.Internal.Strings.resources
-
-CLEAN_FILES += $(STRING_MESSAGES)
-
-EXTRA_DISTFILES = \
-       src/ComponentModel/Strings.resx
-       
-VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.ComponentModel.Composition.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
-include ../../build/library.make
-
-$(the_lib): $(STRING_MESSAGES)
-
-$(STRING_MESSAGES): src/ComponentModel/Strings.resx
-       $(RESGEN) $< $@
diff --git a/mcs/class/System.ComponentModel.Composition/README.txt b/mcs/class/System.ComponentModel.Composition/README.txt
deleted file mode 100644 (file)
index ece387d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-This directory contains an import of Microsoft's Mananged Extensibility Preview 9
-as downloaded from:
-
-       http://mef.codeplex.com/
-
-The version integrated on this release is:
-
-       http://mef.codeplex.com/releases/view/40606
-
-Only the source code and test suite has been integrated
-
-On top of it, we applied r160608 that needs to be re-applied after
-an up-stream update. It fixes MEF on case sensitive file systems.
diff --git a/mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_0.csproj b/mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_0.csproj
deleted file mode 100644 (file)
index 7ad9e43..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3F374DB1-80D5-4BC4-8B86-B08AB5214C8B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CLR40</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CLR40</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="src\ComponentModel\AssemblyInfo.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.InternalErrorException.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\AttributeServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\ConditionalWeakTable.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\EnumerableCardinality.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\ReadOnlyDictionary.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\ReadOnlyDictionaryDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\WeakReferenceCollection.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ContractServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\GenerationServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\LazyServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionInvoke.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Runtime\Serialization\SerializationServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\SilverlightReflectionInvoke.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\StringComparers.cs" />\r
-    <Compile Include="src\ComponentModel\SilverlightAdditions.cs" />\r
-    <Compile Include="src\ComponentModel\Strings.Designer.cs" />\r
-    <Compile Include="src\ComponentModel\SuppressMessages.cs" />\r
-    <Compile Include="src\ComponentModel\SuppressMessagesBaselined.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModelServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ChangeRejectedException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionContractMismatchException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionError.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionErrorDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionErrorId.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionResult.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionResultOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ConstraintServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ContractNameServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CreationPolicy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTrace.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTraceId.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTraceSource.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\SilverlightTraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\TraceSourceTraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\TraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ErrorBuilder.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExceptionBuilder.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportCardinalityCheckResult.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportMetadataAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AssemblyCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AtomicComposition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionLock.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IAttributedImport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ICompositionError.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ICompositionService.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportManyAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\InheritedExportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewGenerator.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartCreationPolicyAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartCreatorOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartCreatorOfTTMetadata.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartLifetimeContextOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartMetadataAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartNotDiscoverableAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElementExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ContractBasedImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\Export.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorParameterImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionField.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionItem.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionItemType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMethod.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionModelServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionParameter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionProperty.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\Lazy.cs" />\r
-    <Compile Include="src\ComponentModel\System\LazyOfTTMetadata.cs" />\r
-    <Compile Include="src\ComponentModel\System\Tuple.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Microsoft.Internal.Strings.resources">\r
-      <LogicalName>Microsoft.Internal.Strings.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_5.csproj b/mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_5.csproj
deleted file mode 100644 (file)
index 9b6a721..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{51392CAD-5DCF-443F-8ECF-C9113DF3B91A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CLR40;USE_ECMA_KEY;FEATURE_REFLECTIONCONTEXT;FEATURE_REFLECTIONFILEIO;FEATURE_SERIALIZATION;FEATURE_SLIMLOCK</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CLR40;USE_ECMA_KEY;FEATURE_REFLECTIONCONTEXT;FEATURE_REFLECTIONFILEIO;FEATURE_SERIALIZATION;FEATURE_SLIMLOCK</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="src\ComponentModel\AssemblyInfo.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.InternalErrorException.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\AttributeServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\ConditionalWeakTable.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\EnumerableCardinality.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\ReadOnlyDictionary.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\ReadOnlyDictionaryDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\WeakReferenceCollection.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ContractServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\GenerationServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\LazyServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionInvoke.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Runtime\Serialization\SerializationServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\SilverlightReflectionInvoke.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\StringComparers.cs" />\r
-    <Compile Include="src\ComponentModel\SilverlightAdditions.cs" />\r
-    <Compile Include="src\ComponentModel\Strings.Designer.cs" />\r
-    <Compile Include="src\ComponentModel\SuppressMessages.cs" />\r
-    <Compile Include="src\ComponentModel\SuppressMessagesBaselined.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModelServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ChangeRejectedException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionContractMismatchException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionError.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionErrorDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionErrorId.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionResult.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionResultOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ConstraintServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ContractNameServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CreationPolicy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTrace.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTraceId.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTraceSource.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\SilverlightTraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\TraceSourceTraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\TraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ErrorBuilder.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExceptionBuilder.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportCardinalityCheckResult.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportMetadataAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AssemblyCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AtomicComposition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionLock.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IAttributedImport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ICompositionError.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ICompositionService.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportManyAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\InheritedExportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewGenerator.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartCreationPolicyAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartCreatorOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartCreatorOfTTMetadata.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartLifetimeContextOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartMetadataAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartNotDiscoverableAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElementExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ContractBasedImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\Export.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorParameterImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionField.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionItem.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionItemType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMethod.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionModelServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionParameter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionProperty.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\Lazy.cs" />\r
-    <Compile Include="src\ComponentModel\System\LazyOfTTMetadata.cs" />\r
-    <Compile Include="src\ComponentModel\System\Tuple.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Microsoft.Internal.Strings.resources">\r
-      <LogicalName>Microsoft.Internal.Strings.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition.dll.sources b/mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition.dll.sources
deleted file mode 100644 (file)
index b70c9d6..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-../../build/common/Consts.cs
-src/ComponentModel/SuppressMessages.cs
-src/ComponentModel/SilverlightAdditions.cs
-src/ComponentModel/SuppressMessagesBaselined.cs
-src/ComponentModel/AssemblyInfo.cs
-src/ComponentModel/Microsoft/Internal/Runtime/Serialization/SerializationServices.cs
-src/ComponentModel/Microsoft/Internal/GenerationServices.cs
-src/ComponentModel/Microsoft/Internal/Lock.cs
-src/ComponentModel/Microsoft/Internal/Requires.cs
-src/ComponentModel/Microsoft/Internal/SilverlightReflectionInvoke.cs
-src/ComponentModel/Microsoft/Internal/Assumes.InternalErrorException.cs
-src/ComponentModel/Microsoft/Internal/ContractServices.cs
-src/ComponentModel/Microsoft/Internal/LazyServices.cs
-src/ComponentModel/Microsoft/Internal/Assumes.cs
-src/ComponentModel/Microsoft/Internal/ReflectionServices.cs
-src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.cs
-src/ComponentModel/Microsoft/Internal/Collections/ConditionalWeakTable.cs
-src/ComponentModel/Microsoft/Internal/Collections/EnumerableCardinality.cs
-src/ComponentModel/Microsoft/Internal/Collections/WeakReferenceCollection.cs
-src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionaryDebuggerProxy.cs
-src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionary.cs
-src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.CollectionOfObject.cs
-src/ComponentModel/Microsoft/Internal/StringComparers.cs
-src/ComponentModel/Microsoft/Internal/ReflectionInvoke.cs
-src/ComponentModel/Microsoft/Internal/Lock.Reader.cs
-src/ComponentModel/Microsoft/Internal/Lock.Writer.cs
-src/ComponentModel/Microsoft/Internal/AttributeServices.cs
-src/ComponentModel/System/Lazy.cs
-src/ComponentModel/System/LazyOfTTMetadata.cs
-src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs
-src/ComponentModel/System/ComponentModel/Composition/ErrorBuilder.cs
-src/ComponentModel/System/ComponentModel/Composition/ExportServices.DisposableLazy.cs
-src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs
-src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfTTMetadata.cs
-src/ComponentModel/System/ComponentModel/Composition/PartLifetimeContextOfT.cs
-src/ComponentModel/System/ComponentModel/Composition/ImportManyAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/IAttributedImport.cs
-src/ComponentModel/System/ComponentModel/Composition/IPartImportsSatisfiedNotification.cs
-src/ComponentModel/System/ComponentModel/Composition/MetadataAttributeAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/ContractNameServices.cs
-src/ComponentModel/System/ComponentModel/Composition/CompositionResultOfT.cs
-src/ComponentModel/System/ComponentModel/Composition/PartNotDiscoverableAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/ExportMetadataAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/CompositionErrorDebuggerProxy.cs
-src/ComponentModel/System/ComponentModel/Composition/ConstraintServices.cs
-src/ComponentModel/System/ComponentModel/Composition/ExportAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/CreationPolicy.cs
-src/ComponentModel/System/ComponentModel/Composition/ImportingConstructorAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedPartCreationInfo.cs
-src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedModelDiscovery.cs
-src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedExportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/PartMetadataAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/CompositionErrorId.cs
-src/ComponentModel/System/ComponentModel/Composition/MetadataServices.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionField.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorMemberImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePart.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionExtensions.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMember.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorExportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingParameter.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMethod.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorParameterImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServices.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingMember.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionWritableMember.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameter.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItemType.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingItem.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ExportingMember.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameterImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/LazyMemberInfo.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberExportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportType.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionType.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItem.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/IReflectionPartCreationInfo.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/DisposableReflectionComposablePart.cs
-src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionProperty.cs
-src/ComponentModel/System/ComponentModel/Composition/InheritedExportAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportCardinality.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportedDelegate.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartException.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementExtensions.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePart.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalogDebuggerProxy.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementDebuggerProxy.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalog.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ICompositionElement.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/SerializableCompositionElement.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ContractBasedImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/Export.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElement.cs
-src/ComponentModel/System/ComponentModel/Composition/Primitives/IPartCreatorImportDefinition.cs
-src/ComponentModel/System/ComponentModel/Composition/ICompositionError.cs
-src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceWriter.cs
-src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceSource.cs
-src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTrace.cs
-src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceSourceTraceWriter.cs
-src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceId.cs
-src/ComponentModel/System/ComponentModel/Composition/Diagnostics/SilverlightTraceWriter.cs
-src/ComponentModel/System/ComponentModel/Composition/ExceptionBuilder.cs
-src/ComponentModel/System/ComponentModel/Composition/CompositionResult.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogCollection.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/TypeCatalog.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogChangeProxy.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicComposition.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogExport.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/INotifyComposablePartCatalogChanged.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionConstants.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.GetExportOverrides.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateCatalog.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.EngineContext.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicCompositionExtensions.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportsChangeEventArgs.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogChangeEventArgs.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionContainer.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.RecompositionManager.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartExportProvider.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionLock.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalogDebuggerProxy.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.PartCreatorExport.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateExportProvider.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.PartManager.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.SingleExportComposablePart.cs
-src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionServices.cs
-src/ComponentModel/System/ComponentModel/Composition/ChangeRejectedException.cs
-src/ComponentModel/System/ComponentModel/Composition/CompositionContractMismatchException.cs
-src/ComponentModel/System/ComponentModel/Composition/CompositionError.cs
-src/ComponentModel/System/ComponentModel/Composition/ICompositionService.cs
-src/ComponentModel/System/ComponentModel/Composition/ExportServices.cs
-src/ComponentModel/System/ComponentModel/Composition/AttributedModelServices.cs
-src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfT.cs
-src/ComponentModel/System/ComponentModel/Composition/PartCreationPolicyAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/ExportCardinalityCheckResult.cs
-src/ComponentModel/System/ComponentModel/Composition/ImportAttribute.cs
-src/ComponentModel/System/ComponentModel/Composition/ImportCardinalityMismatchException.cs
-src/ComponentModel/System/ComponentModel/Composition/CompositionException.cs
-src/ComponentModel/System/Tuple.cs
-src/ComponentModel/Strings.Designer.cs
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/.gitattributes
deleted file mode 100644 (file)
index c538ba3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/AssemblyInfo.cs -crlf
-/StringsTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/AssemblyInfo.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/AssemblyInfo.cs
deleted file mode 100644 (file)
index 80dfc55..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-[assembly: System.CLSCompliant(true)]\r
-[assembly: System.Reflection.AssemblyTitle("System.ComponentModel.Composition.UnitTests")]\r
-[assembly: System.Reflection.AssemblyCopyright("(c) Microsoft Corporation. All rights reserved.")]\r
-[assembly: System.Reflection.AssemblyVersion("2010.02.11")]\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/ComponentModelUnitTest.csproj b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/ComponentModelUnitTest.csproj
deleted file mode 100644 (file)
index 2a60f5d..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">\r
-    <CodeAnalysisRuleSet>Migrated rules for ComponentModelUnitTest.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules />\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <OutputPath>..\..\bin</OutputPath>\r
-    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>\r
-    <NoWarn>1570;1572;1573;1591;1699</NoWarn>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{82EFB8F9-4130-4275-A26A-9F4C748C1FFB}</ProjectGuid>\r
-    <ProjectClrTypes>FULLCLR;SILVERLIGHT</ProjectClrTypes>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition.UnitTests</AssemblyName>\r
-    <FileAlignment>512</FileAlignment>\r
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>\r
-    <NoWarn>;1699;1570;1572;1573;1591;0414</NoWarn>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <FileUpgradeFlags>\r
-    </FileUpgradeFlags>\r
-    <UpgradeBackupLocation>\r
-    </UpgradeBackupLocation>\r
-    <OldToolsVersion>dogfood</OldToolsVersion>\r
-    <PublishUrl>publish\</PublishUrl>\r
-    <Install>true</Install>\r
-    <InstallFrom>Disk</InstallFrom>\r
-    <UpdateEnabled>false</UpdateEnabled>\r
-    <UpdateMode>Foreground</UpdateMode>\r
-    <UpdateInterval>7</UpdateInterval>\r
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
-    <UpdatePeriodically>false</UpdatePeriodically>\r
-    <UpdateRequired>false</UpdateRequired>\r
-    <MapFileExtensions>true</MapFileExtensions>\r
-    <ApplicationRevision>0</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
-    <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <UseApplicationTrust>false</UseApplicationTrust>\r
-    <BootstrapperEnabled>true</BootstrapperEnabled>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <NoStdLib>true</NoStdLib>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="mscorlib" />\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="WindowsBase" />\r
-    <ProjectReference Include="..\..\src\ComponentModel\ComponentModel.csproj">\r
-      <Project>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</Project>\r
-      <Name>ComponentModel</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\UnitTestFramework\UnitTestFramework.csproj">\r
-      <Project>{35FBE8A0-D87E-4991-B3FC-2A77807DEC85}</Project>\r
-      <Name>UnitTestFramework</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ConditionalWeakTableTests.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\WeakReferenceCollectionTests.cs" />\r
-    <Compile Include="StringsTests.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionaryDebuggerProxyTests.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionaryTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedModelDiscoveryTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionServiceExtensionsTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AdvancedValueComposition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AllowNonPublicCompositionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedModelCompositionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\INotifyImportTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ComposablePartCatalogExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ComposablePartExceptionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ComposablePartExtensibilityTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ComposablePartDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContainerExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceIdTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceSourceTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Extensibility\CustomImportManyAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Extensibility\CustomImportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\CatalogFactory.NonFilteringTypeCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\CatalogFactory.MutableComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngineTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorIdTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResultTest.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionServiceProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ConcreteComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ConstraintServicesTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ContractMismatchExceptionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CardinalityMismatchExceptionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorTests.cs" />\r
-    <Compile Include="Microsoft\Internal\AssumesTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionExceptionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResultOfTTest.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AggregateExportProviderTest.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Expectations.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportProviderTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\CatalogFactory.FilteredComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\CatalogFactory.DerivedComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ReflectionFactory.MockParameterInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ReflectionFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ElementFactory.CompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ElementFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ErrorFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ExportProviderFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ExportProviderFactory.RecomposableExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ExportProviderFactory.NoOverridesExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateCatalogTest.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxyTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalogTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProviderTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatchTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionTransactionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalogTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalogDebuggerProxyTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\TypeCatalogTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModelServicesTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataViewProviderTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContainerCycleTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ContractBasedImportDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\CatalogFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ConstraintFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\CatalogFactory.DisposableComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\CatalogFactory.NoOverridesComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ContainerFactory.DisposableCompositionContainer.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ContainerFactory.NoOverridesCompositionContainer.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\PartDefinitionFactory.DerivedComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\PartDefinitionFactory.NoOverridesComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\PartFactory.NoOverridesComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ExportDefinitionFactory.DerivedExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ImportDefinitionFactory.DerivedImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ImportDefinitionFactory.DerivedContractBasedImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\PartFactory.DisposableComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\PartDefinitionFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartCreationPolicyAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartMetadataAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorDebuggerProxyTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxyTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalogTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxyTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\SerializableCompositionElementTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\LazyMemberInfoTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionModelServicesTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\UnitTesting\ConstraintAssert.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ExportDefinitionFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ImportDefinitionFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportDefinitionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportingConstructorAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ContainerFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\ExportFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Factories\PartFactory.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\GenerationServicesTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportingComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MicroExport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportCollectionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataAttributeAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportMetadataAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContainerCollectionTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContainerExtensibilityTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContainerImportTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContainerTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionServicesTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ComposablePartTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ComponentModelTestTypes.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ComponentServicesTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportableAttributeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\InitializationScopeTests.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataTests.cs" />\r
-    <Compile Include="System\Integration\AdaptingCollectionTests.cs" />\r
-    <Compile Include="System\Integration\DelayLoadingTests.cs" />\r
-    <Compile Include="System\Integration\ExportProviderEventTests.cs" />\r
-    <Compile Include="System\Integration\DelegateCompositionTests.cs" />\r
-    <Compile Include="System\Integration\DiscoveryTests.cs" />\r
-    <Compile Include="System\Integration\RejectionTests.cs" />\r
-    <Compile Include="System\Integration\RequiredCreationPolicyTests.cs" />\r
-    <Compile Include="System\Integration\LifetimeTests.cs" />\r
-    <Compile Include="System\LazyOfTTMetadataTests.cs" />\r
-    <Compile Include="System\UnitTesting\ReflectionItemAssert.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\SampleComponents.cs" />\r
-    <Compile Include="System\Integration\CatalogFilteringTests.cs" />\r
-    <Compile Include="System\Integration\CompositionContainerAttributedModelCycleTests.cs" />\r
-    <Compile Include="System\Integration\ConstructorInjectionTests.cs" />\r
-    <Compile Include="System\Integration\RecompositionTests.cs" />\r
-    <Compile Include="System\UnitTesting\TestUtilities.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup Condition="'$(IsSilverLight)' != 'true'">\r
-    <Compile Include="System\ComponentModel\Composition\DynamicMetadata.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">\r
-      <Visible>False</Visible>\r
-      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
-      <Visible>False</Visible>\r
-      <ProductName>Windows Installer 3.1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />\r
-</Project>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/.gitattributes
deleted file mode 100644 (file)
index 6562b26..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/AssumesTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/AssumesTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/AssumesTests.cs
deleted file mode 100644 (file)
index 6286722..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Collections.Generic;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-#if !SILVERLIGHT\r
-using System.Runtime.Serialization;\r
-#endif\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    [TestClass]\r
-    public class AssumesTests\r
-    {\r
-        [TestMethod]\r
-        public void NotNullOfT_NullAsValueArgument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string>((string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2_NullAsValue1Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string>((string)null, "Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2_NullAsValue2Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string>("Value", (string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2_NullAsValue1ArgumentAndValue2Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string>((string)null, (string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2T3_NullAsValue1Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string, string>((string)null, "Value", "Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2T3_NullAsValue2Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string, string>("Value", (string)null, "Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2T3_NullAsValue3Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string, string>("Value", "Value", (string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2T3_NullAsValue1ArgumentAndValue2Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string, string>((string)null, (string)null, "Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2T3_NullAsValue1ArgumentAnd3_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string, string>((string)null, "Value", (string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2T3_NullAsValue2ArgumentAndValue3Argument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNull<string, string, string>("Value", (string)null, (string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT_ValueAsValueArgument_ShouldNotThrow()\r
-        {\r
-            Assumes.NotNull<string>("Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2_ValueAsValue1ArgumentAndValue2Argument_ShouldNotThrow()\r
-        {\r
-            Assumes.NotNull<string, string>("Value", "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOfT1T2T3_ValueAsValue1ArgumentAndValue2ArgumentAndValue3Argument_ShouldNotThrow()\r
-        {\r
-            Assumes.NotNull<string, string, string>("Value", "Value", "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NullOfT_NullAsValueArgument_ShouldNotThrow()\r
-        {\r
-            Assumes.Null<string>((string)null);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NullOfT_ValueAsValueArgument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.Null<string>("Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOrEmpty_NullAsValueArgument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNullOrEmpty((string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOrEmpty_EmptyAsValueArgument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotNullOrEmpty("");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotNullOrEmpty_ValueAsValueArgument_ShouldNotThrow()\r
-        {\r
-            var expectations = new List<string>();\r
-            expectations.Add(" ");\r
-            expectations.Add("  ");\r
-            expectations.Add("   ");\r
-            expectations.Add("Value");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                Assumes.NotNullOrEmpty(e);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsTrue1_FalseAsConditionArgument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.IsTrue(false);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsTrue2_FalseAsConditionArgument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.IsTrue(false, "Message");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsTrue1_TrueAsConditionArgument_ShouldNotThrow()\r
-        {\r
-            Assumes.IsTrue(true);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsTrue2_TrueAsConditionArgument_ShouldNotThrow()\r
-        {\r
-            Assumes.IsTrue(true, "Message");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsFalse1_TrueAsConditionArgument_ShouldThrowInternalErrorException()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.IsFalse(true);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsFalse1_FalseAsConditionArgument_ShouldNotThrow()\r
-        {\r
-            Assumes.IsFalse(false);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NotReachable_ShouldAlwaysThrow()\r
-        {\r
-            Throws(() =>\r
-            {\r
-                Assumes.NotReachable<object>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Fail_ShouldThrowInternalErrorException()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-            \r
-            foreach (var e in expectations)\r
-            {\r
-                Throws(() =>\r
-                {\r
-                    Assumes.Fail(e);\r
-                });\r
-            }\r
-        }\r
-\r
-        private static void Throws(Action action)\r
-        {\r
-            try\r
-            {\r
-                action();\r
-                Assert.Fail();\r
-            }\r
-            catch (Exception ex)\r
-            {\r
-                Type exceptionType = ex.GetType();\r
-\r
-                // The exception should not be a \r
-                // publicily catchable exception\r
-                Assert.IsFalse(exceptionType.IsVisible);\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void Message_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateInternalErrorException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                Assert.AreEqual(exception.Message, result.Message);\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        private static Exception CreateInternalErrorException()\r
-        {\r
-            return CreateInternalErrorException((string)null);\r
-        }\r
-\r
-        private static Exception CreateInternalErrorException(string message)\r
-        {\r
-            Exception exception = null;\r
-\r
-            try\r
-            {\r
-                Assumes.Fail(message);\r
-            }\r
-            catch (Exception ex)\r
-            {\r
-                exception = ex;\r
-            }\r
-\r
-            Assert.IsNotNull(exception);\r
-            return exception;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/.gitattributes
deleted file mode 100644 (file)
index 1496b70..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/ConditionalWeakTableTests.cs -crlf
-/ReadOnlyDictionaryDebuggerProxyTests.cs -crlf
-/ReadOnlyDictionaryTests.cs -crlf
-/WeakReferenceCollectionTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ConditionalWeakTableTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ConditionalWeakTableTests.cs
deleted file mode 100644 (file)
index 66e5234..0000000
+++ /dev/null
@@ -1,226 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Runtime.CompilerServices;\r
-using System.Text;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    [TestClass]\r
-    public class ConditionalWeakTableTests\r
-    {\r
-        [TestMethod]\r
-        public void Add_KeyShouldBeCollected()\r
-        {\r
-            var obj = new object();\r
-            var cwt = new ConditionalWeakTable<object, object>();\r
-\r
-            cwt.Add(obj, new object());\r
-\r
-            var wr = new WeakReference(obj);\r
-\r
-            obj = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsNull(wr.Target, "Key should be collected now!");\r
-\r
-            GC.KeepAlive(cwt);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Add_KeyHeld_ValueShouldNotBeCollected()\r
-        {\r
-            var obj = new object();\r
-            var str = new StringBuilder();\r
-            var cwt = new ConditionalWeakTable<object, StringBuilder>();\r
-\r
-            var wrKey = new WeakReference(obj);\r
-            var wrValue = new WeakReference(str);\r
-\r
-            cwt.Add(obj, str);\r
-\r
-            str = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            // Should still have both references\r
-            Assert.IsNotNull(wrKey.Target, "Key should NOT be collected yet!");\r
-            Assert.IsNotNull(wrValue.Target, "Value should NOT be collected yet!");\r
-\r
-            GC.KeepAlive(obj);\r
-            GC.KeepAlive(cwt);\r
-        }\r
-\r
-#if CLR40\r
-        [TestMethod]\r
-        public void Add_KeyCollected_ValueShouldBeCollected()\r
-        {\r
-            var obj = new object();\r
-            var str = new StringBuilder();\r
-            var cwt = new ConditionalWeakTable<object, StringBuilder>();\r
-\r
-            cwt.Add(obj, str);\r
-\r
-            var wrKey = new WeakReference(obj);\r
-            var wrValue = new WeakReference(str);\r
-            str = null;\r
-            obj = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsNull(wrKey.Target, "Key should be collected now!");\r
-            Assert.IsNull(wrValue.Target, "Value should be collected now!");\r
-\r
-            GC.KeepAlive(cwt);\r
-        }\r
-#endif\r
-\r
-        [TestMethod]\r
-        public void Remove_ValidKey_ShouldReturnTrue()\r
-        {\r
-            var obj = new object();\r
-            var obj2 = new object();\r
-            var cwt = new ConditionalWeakTable<object, object>();\r
-\r
-            cwt.Add(obj, obj2);\r
-\r
-            Assert.IsTrue(cwt.Remove(obj));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Remove_InvalidKey_ShouldReturnTrue()\r
-        {\r
-            var obj = new object();\r
-            var obj2 = new object();\r
-            var cwt = new ConditionalWeakTable<object, object>();\r
-\r
-            cwt.Add(obj, obj2);\r
-\r
-            Assert.IsFalse(cwt.Remove(obj2));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryGetValue_ValidKey_ShouldReturnTrueAndValue()\r
-        {\r
-            var obj = new object();\r
-            var obj2 = new object();\r
-            var cwt = new ConditionalWeakTable<object, object>();\r
-\r
-            cwt.Add(obj, obj2);\r
-\r
-            object obj3;\r
-            Assert.IsTrue(cwt.TryGetValue(obj, out obj3), "Should find a value with the key!");\r
-            Assert.AreEqual(obj2, obj3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryGetValue_InvalidKey_ShouldReturnFalseAndNull()\r
-        {\r
-            var obj = new object();\r
-            var obj2 = new object();\r
-            var cwt = new ConditionalWeakTable<object, object>();\r
-\r
-            cwt.Add(obj, obj2);\r
-\r
-            object obj3;\r
-            Assert.IsFalse(cwt.TryGetValue(obj2, out obj3), "Should NOT find a value with the key!");\r
-            Assert.IsNull(obj3); \r
-        }\r
-\r
-#if !CLR40\r
-        [TestMethod]\r
-        public void Add_KeyValueSame_KeyShouldNotBeCollected()\r
-        {\r
-            // Dev10:556089 - This test demonstrations a bug in our implementation\r
-            // of ConditionalWeakTable which needs CLR 4 support to fix so once\r
-            // we switch to the CLR 4 version of ConditionalWeakTable this should go away.\r
-\r
-            var obj = new object();\r
-            var cwt = new ConditionalWeakTable<object, object>();\r
-\r
-            cwt.Add(obj, obj);\r
-\r
-            var wrKey = new WeakReference(obj);\r
-            obj = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsNotNull(wrKey.Target, "Key should NOT be collected yet!");\r
-\r
-            // Apply pressure to ensure they still don't go away.\r
-            ApplyMemoryPressureOnConditionalWeakTable(cwt);\r
-\r
-            Assert.IsNotNull(wrKey.Target, "Key should NOT be collected yet!");\r
-\r
-            GC.KeepAlive(cwt);\r
-        }\r
-\r
-        public class ObjectHolder\r
-        {\r
-            public object Obj { get; set; }\r
-            public ObjectHolder() { }\r
-            public ObjectHolder(object obj)\r
-            {\r
-                Obj = obj;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Add_ValueReferencesKey_KeyAndValueShouldNotBeCollected()\r
-        {\r
-            // Dev10:556089 - This test demonstrations a bug in our implementation\r
-            // of ConditionalWeakTable which needs CLR 4 support to fix so once\r
-            // we switch to the CLR 4 version of ConditionalWeakTable this should go away.\r
-\r
-            var obj = new object();\r
-            var holder = new ObjectHolder(obj);\r
-            var cwt = new ConditionalWeakTable<object, ObjectHolder>();\r
-\r
-            cwt.Add(obj, holder);\r
-\r
-            var wrKey = new WeakReference(obj);\r
-            var wrValue = new WeakReference(holder);\r
-            holder = null;\r
-            obj = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsNotNull(wrKey.Target, "Key should NOT be collected yet!");\r
-            Assert.IsNotNull(wrValue.Target, "Value should NOT be collected now!");\r
-\r
-            // Apply pressure to ensure they still don't go away.\r
-            ApplyMemoryPressureOnConditionalWeakTable(cwt);\r
-\r
-            Assert.IsNotNull(wrKey.Target, "Key should NOT be collected yet!");\r
-            Assert.IsNotNull(wrValue.Target, "Value should NOT be collected now!");\r
-\r
-            GC.KeepAlive(cwt);\r
-        }\r
-\r
-        private void ApplyMemoryPressureOnConditionalWeakTable<T,V>(ConditionalWeakTable<T,V> table)\r
-            where T : class, new()\r
-            where V : class, new()\r
-        {\r
-            // Adding 100 items should do it.\r
-            for (int i = 0; i < 100; i++)\r
-            {\r
-                table.Add(new T(), new V());\r
-            }\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-        }\r
-#endif //!CLR40\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ReadOnlyDictionaryDebuggerProxyTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ReadOnlyDictionaryDebuggerProxyTests.cs
deleted file mode 100644 (file)
index d0068e2..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    [TestClass]\r
-    public class ReadOnlyDictionaryDebuggerProxyTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsDictionaryArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("dictionary", () =>\r
-            {\r
-                new ReadOnlyDictionaryDebuggerProxy<string, object>((ReadOnlyDictionary<string, object>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_EmptyDictionaryAsDictionaryArgument_ShouldSetItemsPropertyToEmptyEnumerable()\r
-        {\r
-            var dictionary = CreateReadOnlyDictionary<string, object>();\r
-\r
-            var proxy = new ReadOnlyDictionaryDebuggerProxy<string, object>(dictionary);\r
-\r
-            EnumerableAssert.IsEmpty(proxy.Items);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsDictionaryArgument_ShouldSetItemsProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadata();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var proxy = new ReadOnlyDictionaryDebuggerProxy<string, object>(CreateReadOnlyDictionary(e));\r
-\r
-                EnumerableAssert.AreEqual(e, proxy.Items);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Items_ShouldNotCacheUnderlyingItems()\r
-        {\r
-            var dictionary = new Dictionary<string, object>();\r
-            dictionary.Add("Name", "Value");\r
-\r
-            var proxy = new ReadOnlyDictionaryDebuggerProxy<string, object>(CreateReadOnlyDictionary(dictionary));\r
-\r
-            EnumerableAssert.AreEqual(dictionary, proxy.Items);\r
-\r
-            dictionary.Add("AnotherName", "Value");\r
-\r
-            EnumerableAssert.AreEqual(dictionary, proxy.Items);\r
-\r
-            dictionary.Add("AndAnotherName", "Value");\r
-\r
-            EnumerableAssert.AreEqual(dictionary, proxy.Items);\r
-        }\r
-\r
-        private static ReadOnlyDictionary<TKey, TValue> CreateReadOnlyDictionary<TKey, TValue>()\r
-        {\r
-            return CreateReadOnlyDictionary<TKey, TValue>(null);\r
-        }\r
-\r
-        private static ReadOnlyDictionary<TKey, TValue> CreateReadOnlyDictionary<TKey, TValue>(IDictionary<TKey, TValue> dictionary)\r
-        {\r
-            return new ReadOnlyDictionary<TKey, TValue>(dictionary);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ReadOnlyDictionaryTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/ReadOnlyDictionaryTests.cs
deleted file mode 100644 (file)
index bad8b19..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    [TestClass]\r
-    public class ReadOnlyDictionaryTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsDictionaryArgument_ShouldCreateEmptyDictionary()\r
-        {\r
-            var dictionary = new ReadOnlyDictionary<string, object>(null);\r
-\r
-            EnumerableAssert.IsEmpty(dictionary);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_WritableDictionaryAsDictionaryArgument_ShouldPopulateCollection()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = new ReadOnlyDictionary<string, object>(dictionary);\r
-\r
-            EnumerableAssert.AreEqual(dictionary, readOnlyDictionary);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Add1_ShouldThrowNotSupported()\r
-        {\r
-            var dictionary = GetReadOnlyDictionaryWithData();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                dictionary.Add(new KeyValuePair<string, object>("Key", "Value"));\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Add2_ShouldThrowNotSupported()\r
-        {\r
-            var dictionary = GetReadOnlyDictionaryWithData();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                dictionary.Add("Key", "Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Clear_ShouldThrowNotSupported()\r
-        {\r
-            var dictionary = GetReadOnlyDictionaryWithData();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                dictionary.Clear();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Remove1_ShouldThrowNotSupported()\r
-        {\r
-            var dictionary = GetReadOnlyDictionaryWithData();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                dictionary.Remove("Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Remove2_ShouldThrowNotSupported()\r
-        {\r
-            var dictionary = GetReadOnlyDictionaryWithData();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                dictionary.Remove(new KeyValuePair<string, object>("Key", "Value"));\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ItemSet_ShouldThrowNotSupported()\r
-        {\r
-            var dictionary = GetReadOnlyDictionaryWithData();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                dictionary["Key"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Keys_ShouldReturnWrappedDictionaryKeys()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-\r
-            EnumerableAssert.AreEqual(readOnlyDictionary.Keys, dictionary.Keys);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Values_ShouldReturnWrappedDictionaryValues()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-\r
-            EnumerableAssert.AreEqual(readOnlyDictionary.Values, readOnlyDictionary.Values);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsReadOnly_ShouldAlwaysBeTrue()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-            \r
-            Assert.IsFalse(dictionary.IsReadOnly);\r
-            Assert.IsTrue(readOnlyDictionary.IsReadOnly);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Count_ShouldReturnWrappedDictionaryCount()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-\r
-            Assert.AreEqual(dictionary.Count, readOnlyDictionary.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ContainsKey()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-\r
-            Assert.IsTrue(readOnlyDictionary.ContainsKey("Key1"));\r
-            Assert.IsFalse(readOnlyDictionary.ContainsKey("InvalidKey"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Contains()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-\r
-            Assert.IsTrue(readOnlyDictionary.Contains(new KeyValuePair<string,object>("Key1", "Value1")));\r
-            Assert.IsFalse(readOnlyDictionary.Contains(new KeyValuePair<string,object>("InvalidKey", "Value1")));\r
-            Assert.IsFalse(readOnlyDictionary.Contains(new KeyValuePair<string,object>("Key1", "InvalidValue")));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CopyTo()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-            KeyValuePair<string, object>[] destination = new KeyValuePair<string, object> [readOnlyDictionary.Count];\r
-            readOnlyDictionary.CopyTo(destination, 0);\r
-            EnumerableAssert.AreEqual(readOnlyDictionary, destination);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetEnumerator()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-            IEnumerable<KeyValuePair<string, object>> genericEnumerable = readOnlyDictionary;\r
-            EnumerableAssert.AreEqual(genericEnumerable, dictionary);\r
-            IEnumerable weakEnumerable = (IEnumerable)readOnlyDictionary;\r
-            EnumerableAssert.AreEqual(weakEnumerable, dictionary);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Item()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-            Assert.AreEqual("Value1", readOnlyDictionary["Key1"], "Expecting to read wrapped value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryGetValue()\r
-        {\r
-            var dictionary = GetWritableDictionaryWithData();\r
-            var readOnlyDictionary = GetReadOnlyDictionary(dictionary);\r
-            object result;\r
-            bool ret = readOnlyDictionary.TryGetValue("Key1", out result);\r
-            Assert.IsTrue(ret, "Expecting TryGetExportedValue to return true for wrapped key");\r
-            Assert.AreEqual("Value1", result, "Expecting TryGetExportedValue to return wrapped value");\r
-        }\r
-\r
-        private static IDictionary<String, object> GetReadOnlyDictionaryWithData()\r
-        {\r
-            return GetReadOnlyDictionary(GetWritableDictionaryWithData());\r
-        }\r
-\r
-        private static IDictionary<TKey, TValue> GetReadOnlyDictionary<TKey, TValue>(IDictionary<TKey, TValue> dictionary)\r
-        {\r
-            return new ReadOnlyDictionary<TKey, TValue>(dictionary);\r
-        }\r
-\r
-        private static IDictionary<String, object> GetWritableDictionaryWithData()\r
-        {\r
-            IDictionary<String, object> dictionary = new Dictionary<String, object>();\r
-            dictionary.Add("Key1", "Value1");\r
-            dictionary.Add("Key2", 42);\r
-            return dictionary;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/WeakReferenceCollectionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/Microsoft/Internal/Collections/WeakReferenceCollectionTests.cs
deleted file mode 100644 (file)
index 2c65224..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    [TestClass]\r
-    public class WeakReferenceCollectionTests\r
-    {\r
-        [TestMethod]\r
-        public void Add_ObjectShouldGetCollected()\r
-        {\r
-            var obj = new object();\r
-            var wrc = new WeakReferenceCollection<object>();\r
-\r
-            wrc.Add(obj);\r
-\r
-            var wr = new WeakReference(obj);\r
-            obj = null;\r
-\r
-            Assert.IsNotNull(wr.Target, "Object should NOT have been collected yet!");\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsNull(wr.Target, "Object should have been collected!");\r
-\r
-            GC.KeepAlive(wrc);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Remove_ObjectShouldGetRemoved()\r
-        {\r
-            var obj = new object();\r
-            var wrc = new WeakReferenceCollection<object>();\r
-\r
-            wrc.Add(obj);\r
-\r
-            Assert.AreEqual(1, wrc.AliveItemsToList().Count, "Should have 1 item!");\r
-            \r
-            wrc.Remove(obj);\r
-\r
-            Assert.AreEqual(0, wrc.AliveItemsToList().Count, "Should have 0 item!");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AliveItemsToList_ShouldReturnAllItems()\r
-        {\r
-            var list = new object[] {new object(), new object(), new object()};\r
-            var wrc = new WeakReferenceCollection<object>();\r
-\r
-            foreach (object obj in list)\r
-            {\r
-                wrc.Add(obj);\r
-            }\r
-\r
-            Assert.AreEqual(list.Length, wrc.AliveItemsToList().Count, "Should have same number of items!");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AliveItemsToList_ShouldReturnAllAliveItems()\r
-        {\r
-            var list = new object[] { new object(), new object(), new object() };\r
-            var wrc = new WeakReferenceCollection<object>();\r
-\r
-            var obj1 = new object();\r
-            wrc.Add(obj1);\r
-\r
-            foreach (object obj in list)\r
-            {\r
-                wrc.Add(obj);\r
-            }\r
-\r
-            var obj2 = new object();\r
-            wrc.Add(obj2);\r
-\r
-            Assert.AreEqual(list.Length + 2, wrc.AliveItemsToList().Count, "Should have same number of items!");\r
-\r
-            obj1 = obj2 = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            var aliveItems = wrc.AliveItemsToList();\r
-            Assert.AreEqual(list.Length, aliveItems.Count, "Should have 2 less items!");\r
-\r
-            Assert.AreEqual(list[0], aliveItems[0]);\r
-            Assert.AreEqual(list[1], aliveItems[1]);\r
-            Assert.AreEqual(list[2], aliveItems[2]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AliveItemsToList_ShouldReturnEmpty()\r
-        {\r
-            var wrc = new WeakReferenceCollection<object>();\r
-            Assert.AreEqual(0, wrc.AliveItemsToList().Count, "Should have 0 items!");\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/StringsTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/StringsTests.cs
deleted file mode 100644 (file)
index aec6ad2..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-using System.Globalization;\r
-\r
-namespace System\r
-{\r
-    [TestClass]\r
-    public class StringsTests\r
-    {\r
-        [TestMethod]\r
-        public void PropertiesAreInsyncWithResources()\r
-        {\r
-            var properties = GetStringProperties();\r
-\r
-            Assert.IsTrue(properties.Length > 0, "Expected to find at least one string property in Strings.cs.");\r
-\r
-            foreach (PropertyInfo property in properties)\r
-            {\r
-                object value = property.GetValue(null, (object[])null);\r
-\r
-                Assert.IsNotNull(value, "Property '{0}' does not have an associated string in Strings.resx.", property.Name);\r
-            }\r
-        }\r
-\r
-        private static PropertyInfo[] GetStringProperties()\r
-        {\r
-            PropertyInfo[] properties = typeof(Strings).GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);\r
-\r
-            return properties.Where(property => \r
-            {\r
-                return !CanIgnore(property);\r
-\r
-            }).ToArray();\r
-        }\r
-\r
-        private static bool CanIgnore(PropertyInfo property)\r
-        {\r
-            switch (property.Name)\r
-            {\r
-                case "Culture":\r
-                case "ResourceManager":\r
-                    return true;\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-        [TestMethod]\r
-        public void LocalizedResourcesArePickedUpBasedOnThreadCulture()\r
-        {\r
-            // verify each property against an en-US resource manager\r
-            bool wasVerified = false;\r
-            bool areLocalizedCLRResourcesAvailable = AreLocalizedCLRResourcesAvailable();\r
-            foreach (var stringsPropInfo in GetStringProperties())\r
-            {\r
-                string referenceValue = String.Empty;\r
-                PerformOnEnUsThread(() =>\r
-                {\r
-                    referenceValue = (string)stringsPropInfo.GetValue(null, (object[])null);\r
-                });\r
-                string actualValue = (string)stringsPropInfo.GetValue(null, (object[])null);\r
-\r
-                // determine if LangPacks are installed for the the CurrentUICulture. If not, default to english\r
-                if (areLocalizedCLRResourcesAvailable)\r
-                {\r
-                    Assert.AreNotEqual(referenceValue, actualValue, "Failed to pick up localized resources for UI culture '{0}'", Thread.CurrentThread.CurrentUICulture.Name);\r
-                }\r
-                else\r
-                {\r
-                    Assert.AreEqual(referenceValue, actualValue);\r
-                }\r
-\r
-                wasVerified = true;\r
-            }\r
-\r
-            Assert.IsTrue(wasVerified);\r
-        }\r
-\r
-\r
-        private bool AreLocalizedCLRResourcesAvailable()\r
-        {\r
-            if (Thread.CurrentThread.CurrentUICulture.LCID == 1033) // en-US\r
-            {\r
-                return false;\r
-            }\r
-\r
-            object regValue = Microsoft.Win32.Registry.GetValue(\r
-                GetRegPath(),\r
-                "Install",\r
-                0);\r
-\r
-            return (regValue != null) && ((int)regValue == 1);\r
-        }\r
-\r
-        private string GetRegPath()\r
-        {\r
-            var path = String.Format(\r
-                @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP\v{0}\Client\{1}",\r
-                typeof(string).Assembly.GetName().Version.Major,\r
-                Thread.CurrentThread.CurrentUICulture.LCID);\r
-\r
-            return path;\r
-        }\r
-        \r
-        private static void PerformOnEnUsThread(Action action)\r
-        {\r
-            Thread enUsThread = new Thread(new ThreadStart(action));\r
-            enUsThread.CurrentUICulture = new CultureInfo("en-US");\r
-            enUsThread.Start();\r
-            enUsThread.Join();\r
-        }\r
-#endif\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/.gitattributes
deleted file mode 100644 (file)
index 92b4baf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/LazyOfTTMetadataTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/.gitattributes
deleted file mode 100644 (file)
index f8ca560..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/AdvancedValueComposition.cs -crlf
-/AggregateExportProviderTest.cs -crlf
-/AttributedModelServicesTests.cs -crlf
-/CardinalityMismatchExceptionTests.cs -crlf
-/ComponentModelTestTypes.cs -crlf
-/ComponentServicesTests.cs -crlf
-/ComposablePartCatalogExtensions.cs -crlf
-/ComposablePartDefinitionTests.cs -crlf
-/ComposablePartExceptionTests.cs -crlf
-/ComposablePartExtensibilityTests.cs -crlf
-/ComposablePartTests.cs -crlf
-/CompositionContainerCollectionTests.cs -crlf
-/CompositionContainerExtensibilityTests.cs -crlf
-/CompositionContainerExtensions.cs -crlf
-/CompositionContainerImportTests.cs -crlf
-/CompositionContainerTests.cs -crlf
-/CompositionErrorDebuggerProxyTests.cs -crlf
-/CompositionErrorIdTests.cs -crlf
-/CompositionErrorTests.cs -crlf
-/CompositionExceptionTests.cs -crlf
-/CompositionResultOfTTest.cs -crlf
-/CompositionResultTest.cs -crlf
-/CompositionServiceExtensionsTests.cs -crlf
-/CompositionServiceProxy.cs -crlf
-/CompositionServicesTests.cs -crlf
-/ConcreteComposablePart.cs -crlf
-/ConstraintServicesTests.cs -crlf
-/ContractBasedImportDefinitionTests.cs -crlf
-/ContractMismatchExceptionTests.cs -crlf
-/DynamicMetadata.cs -crlf
-/Expectations.cs -crlf
-/ExportAttributeTests.cs -crlf
-/ExportCollectionTests.cs -crlf
-/ExportDefinitionTests.cs -crlf
-/ExportMetadataAttributeTests.cs -crlf
-/ExportProviderTests.cs -crlf
-/ExportTests.cs -crlf
-/ExportableAttributeTests.cs -crlf
-/GenerationServicesTests.cs -crlf
-/ImportAttributeTests.cs -crlf
-/ImportDefinitionTests.cs -crlf
-/ImportingComposablePart.cs -crlf
-/ImportingConstructorAttributeTests.cs -crlf
-/InitializationScopeTests.cs -crlf
-/MetadataAttributeAttributeTests.cs -crlf
-/MetadataTests.cs -crlf
-/MetadataViewProviderTests.cs -crlf
-/MicroExport.cs -crlf
-/PartCreationPolicyAttributeTests.cs -crlf
-/PartMetadataAttributeTests.cs -crlf
-/SampleComponents.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AdvancedValueComposition.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AdvancedValueComposition.cs
deleted file mode 100644 (file)
index b46d755..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class AdvancedValueComposition\r
-    {\r
-        [TestMethod]\r
-        public void RepeatedContainerUse()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            TrivialExporter e = new TrivialExporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(e);\r
-            container.Compose(batch);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddPart(new TrivialImporter());\r
-            container.Compose(batch);\r
-\r
-            Assert.IsTrue(e.done, "Initialization of importer should have set the done flag on E");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FunctionsFieldsAndProperties()\r
-        {\r
-            Consumer c;\r
-            var container = ContainerFactory.Create();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new RealAddProvider());\r
-            batch.AddPart(c = new Consumer());\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(3, c.op(c.a, c.b), "1 + 2 == 3");\r
-        }\r
-        [TestMethod]\r
-        public void FunctionsFieldsAndProperties2()\r
-        {\r
-            Consumer c;\r
-            var container = ContainerFactory.Create();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new SubtractProvider());\r
-            batch.AddPart(c = new Consumer());\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(-1, c.op(c.a, c.b), "1 - 2 == -1");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FunctionsFieldsAndProperties2_WithCatalog()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-\r
-            ConsumerOfMultiple c = new ConsumerOfMultiple();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(c);\r
-            container.Compose(batch);\r
-\r
-            foreach (var export in c.opInfo)\r
-            {\r
-                if ((string)export.Metadata["Var1"] == "add")\r
-                {\r
-                    Assert.AreEqual(3, export.Value(1, 2), "1 + 2 == 3");\r
-                }\r
-                else if ((string)export.Metadata["Var1"] == "sub")\r
-                {\r
-                    Assert.AreEqual(-1, export.Value(1, 2), "1 - 2 == -1");\r
-                }\r
-                else\r
-                {\r
-                    Assert.Fail("Unexpected value");\r
-                }\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-               // Silverlight doesn't support strongly typed metadata\r
-        [TestMethod]\r
-        public void FunctionsFieldsAndProperties2_StronglyTypedMetadata()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-\r
-            var exports = container.GetExports<Func<int, int, int>, IExportableTest>("Add");\r
-\r
-            foreach (var export in exports)\r
-            {\r
-                if (export.Metadata.Var1 == "add")\r
-                {\r
-                    Assert.AreEqual(3, export.Value(1, 2), "1 + 2 == 3");\r
-                }\r
-                else if (export.Metadata.Var1 == "sub")\r
-                {\r
-                    Assert.AreEqual(-1, export.Value(1, 2), "1 - 2 == -1");\r
-                }\r
-                else\r
-                {\r
-                    Assert.Fail("Unexpected value");\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InAdditionToCatalogTest()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            \r
-            IDictionary<string, object> multMetadata = new Dictionary<string, object>();\r
-            multMetadata["Var1"]= "mult";\r
-            multMetadata[CompositionConstants.ExportTypeIdentityMetadataName] = AttributedModelServices.GetTypeIdentity(typeof(Func<int, int, int>));\r
-            var basicValue = ExportFactory.Create("Add", multMetadata, (() => (Func<int, int, int>)delegate(int a, int b) { return a * b; }));\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExport(basicValue);\r
-            container.Compose(batch);\r
-\r
-            var exports = container.GetExports<Func<int, int, int>, IExportableTest>("Add");\r
-\r
-            Assert.AreEqual(3, exports.Count(), "There should be 3 entries for 'Add'");\r
-\r
-            foreach (var export in exports)\r
-            {\r
-                if (export.Metadata.Var1 == "mult")\r
-                {\r
-                    Assert.AreEqual(2, export.Value(1, 2), "1 * 2 == 2");\r
-                }\r
-                else if (export.Metadata.Var1 == "add")\r
-                {\r
-                    Assert.AreEqual(3, export.Value(1, 2), "1 + 2 == 3");\r
-                }\r
-                else if (export.Metadata.Var1 == "sub")\r
-                {\r
-                    Assert.AreEqual(-1, export.Value(1, 2), "1 - 2 == -1");\r
-                }\r
-                else\r
-                {\r
-                    Assert.Fail("Unexpected value");\r
-                }\r
-            }\r
-        }\r
-        \r
-        [TestMethod]\r
-        public void CollectionMetadataPropertyTest()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            var export = container.GetExport<ComponentWithCollectionProperty, ICollectionOfStrings>();\r
-\r
-            Assert.IsNotNull(export.Metadata, "Should have metadata");\r
-            Assert.IsNotNull(export.Metadata.Values, "MetadataView should have collection of values");\r
-            Assert.AreEqual(export.Metadata.Values.Count(), 3, "Should have 3 elements");\r
-            Assert.AreEqual(export.Metadata.Values.First(), "One", "First should be 'One'");\r
-            Assert.AreEqual(export.Metadata.Values.Skip(1).First(), "two", "First should be 'two'");\r
-            Assert.AreEqual(export.Metadata.Values.Skip(2).First(), "3", "First should be '3'");\r
-        }\r
-#endif //!SIVLERLIGHT\r
-\r
-        [TestMethod]\r
-        public void ImportExportSansNameTest()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-\r
-                       UnnamedImportAndExport unnamed = container.GetExportedValue<UnnamedImportAndExport>();\r
-            Assert.IsNotNull(unnamed, "Should have found UnnamedImportAndExport component");\r
-            Assert.IsNotNull(unnamed.ImportedValue, "Component's unnamed import should have been fulfilled");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MultipleInstantiationOfStaticCatalogItem()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            var unnamedVI = container.GetExport<StaticExport, object>();\r
-\r
-            StaticExport first = unnamedVI.Value;\r
-            StaticExport second = unnamedVI.Value;\r
-\r
-            Assert.IsNotNull(first, "Should have created an instance");\r
-            Assert.IsNotNull(second, "Should have created a second instance");\r
-            Assert.IsTrue(object.ReferenceEquals(first, second), "Instances should be the same");\r
-\r
-            var exports = container.GetExports<StaticExport, object>();\r
-\r
-            Assert.AreEqual(1, exports.Count(), "There should still only be one exported value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MultipleInstantiationOfNonStaticCatalogItem()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            var export1 = container.GetExport<NonStaticExport, object>();\r
-            var export2 = container.GetExport<NonStaticExport, object>();\r
-\r
-            NonStaticExport first = export1.Value;\r
-            NonStaticExport second = export2.Value;\r
-\r
-            Assert.IsNotNull(first, "Should have created an instance");\r
-            Assert.IsNotNull(second, "Should have created a second instance");\r
-            Assert.IsFalse(object.ReferenceEquals(first, second), "Instances should be different");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportIntoUntypedExportTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("untyped", 42);\r
-\r
-            var u = new UntypedExportImporter();\r
-            var rb = AttributedModelServices.CreatePart(u);\r
-\r
-            batch.AddPart(rb);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, u.Export.Value);\r
-\r
-            var us = new UntypedExportsImporter();\r
-            batch = new CompositionBatch();\r
-            batch.AddExportedValue("untyped", 19);\r
-            batch.RemovePart(rb);\r
-            batch.AddPart(us);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsNotNull(us.Exports, "Should have an enumeration");\r
-            Assert.AreEqual(2, us.Exports.Count(), "Should have 2 values");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportIntoDerivationOfExportException()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("derived", typeof(DerivedExport), 42);\r
-            var d = new DerivedExportImporter();\r
-            batch.AddPart(d);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport, RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportIntoDerivationOfExportsException()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("derived", typeof(DerivedExport), 42);\r
-            var d = new DerivedExportsImporter();\r
-            batch.AddPart(d);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport, \r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport, RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });            \r
-        }\r
-    }    \r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AggregateExportProviderTest.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AggregateExportProviderTest.cs
deleted file mode 100644 (file)
index 464e82a..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Threading;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class AggregateExportProviderTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_NullAsProvidersArgument_ShouldSetProvidersPropertyToEmpty()\r
-        {\r
-            var provider = new AggregateExportProvider((ExportProvider[])null);\r
-\r
-            EnumerableAssert.IsEmpty(provider.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsProvidersArgument_ShouldSetProvidersPropertyToEmpty()\r
-        {\r
-            var provider = new AggregateExportProvider((IEnumerable<ExportProvider>)null);\r
-\r
-            EnumerableAssert.IsEmpty(provider.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_EmptyArrayAsProvidersArgument_ShouldSetProvidersPropertyToEmpty()\r
-        {\r
-            var provider = new AggregateExportProvider(new ExportProvider[0]);\r
-\r
-            EnumerableAssert.IsEmpty(provider.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyArrayAsProvidersArgument_ShouldSetProvidersPropertyToEmpty()\r
-        {\r
-            var provider = new AggregateExportProvider((IEnumerable<ExportProvider>)new ExportProvider[0]);\r
-\r
-            EnumerableAssert.IsEmpty(provider.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyEnumerableAsProvidersArgument_ShouldSetProvidersPropertyToEmpty()\r
-        {\r
-            var provider = new AggregateExportProvider(Enumerable.Empty<ExportProvider>());\r
-\r
-            EnumerableAssert.IsEmpty(provider.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ArrayAsProvidersArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var providers = new ExportProvider[] { ExportProviderFactory.Create() };\r
-            var provider = new AggregateExportProvider(providers);\r
-\r
-            providers[0] = null;\r
-\r
-            Assert.IsNotNull(provider.Providers[0]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ArrayAsProvidersArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var providers = new ExportProvider[] { ExportProviderFactory.Create() };\r
-            var provider = new AggregateExportProvider((IEnumerable<ExportProvider>)providers);\r
-\r
-            providers[0] = null;\r
-\r
-            Assert.IsNotNull(provider.Providers[0]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Providers_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var provider = CreateAggregateExportProvider();\r
-            provider.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(provider, () =>\r
-            {\r
-                var providers = provider.Providers;\r
-            });\r
-        }\r
-\r
-        private AggregateExportProvider CreateAggregateExportProvider()\r
-        {\r
-            return new AggregateExportProvider(Enumerable.Empty<ExportProvider>());\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/.gitattributes
deleted file mode 100644 (file)
index 3e0ba3a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/AllowNonPublicCompositionTests.cs -crlf
-/AttributedModelCompositionTests.cs -crlf
-/AttributedModelDiscoveryTests.cs -crlf
-/INotifyImportTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AllowNonPublicCompositionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AllowNonPublicCompositionTests.cs
deleted file mode 100644 (file)
index 0771d89..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-#if !SILVERLIGHT\r
-\r
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class AllowNonPublicCompositionTests\r
-    {\r
-        [TestMethod]\r
-        public void PublicFromPublic()\r
-        {\r
-            var container = ContainerFactory.Create(); \r
-            CompositionBatch batch = new CompositionBatch();\r
-            var importer = new AllPublicImportOnly();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(new AllPublicExportOnly() { ExportA = 5, ExportB = 10 });\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(5, importer.ImportA);\r
-            Assert.AreEqual(10, importer.ImportB);\r
-        }\r
-        [TestMethod]\r
-        public void PublicToSelf()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var importer = new AllPublic() { ExportA = 5, ExportB = 10 };\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(5, importer.ImportA);\r
-            Assert.AreEqual(10, importer.ImportB);\r
-        }\r
-        [TestMethod]\r
-        public void PublicFromPrivate()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var importer = new AllPublicImportOnly();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(new AllPrivateExportOnly(5, 10));\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(5, importer.ImportA);\r
-            Assert.AreEqual(10, importer.ImportB);\r
-        }\r
-        [TestMethod]\r
-        public void PrivateFromPublic()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var importer = new AllPrivateImportOnly();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(new AllPublicExportOnly() { ExportA = 5, ExportB = 10 });\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(5, importer.PublicImportA);\r
-            Assert.AreEqual(10, importer.PublicImportB);\r
-        }\r
-        [TestMethod]\r
-        public void PrivateToSelf()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var importer = new AllPrivate(5, 10);\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(5, importer.PublicImportA);\r
-            Assert.AreEqual(10, importer.PublicImportB);\r
-        }\r
-        [TestMethod]\r
-        public void PrivateData()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var importer = new PrivateDataImportExport(5);\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(5, importer.X);\r
-        }\r
-        [TestMethod]\r
-        public void TestPublicImportsExpectingPublicExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<PublicImportsExpectingPublicExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestInternalImportsExpectingPublicExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<InternalImportsExpectingPublicExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestPublicImportsExpectingInternalExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<PublicImportsExpectingInternalExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestInternalImportsExpectingInternalExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<InternalImportsExpectingInternalExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestPublicImportsExpectingProtectedExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<PublicImportsExpectingProtectedExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestInternalImportsExpectingProtectedExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<InternalImportsExpectingProtectedExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestPublicImportsExpectingProtectedInternalExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<PublicImportsExpectingProtectedInternalExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestInternalImportsExpectingProtectedInternalExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<InternalImportsExpectingProtectedInternalExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestPublicImportsExpectingPrivateExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<PublicImportsExpectingPrivateExports>().VerifyIsBound();\r
-        }\r
-        [TestMethod]\r
-        public void TestInternalImportsExpectingPrivateExportsFromCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            container.GetExportedValue<InternalImportsExpectingPrivateExports>().VerifyIsBound();\r
-        }\r
-    }\r
-\r
-    public interface IData { int X { get; set; } }\r
-\r
-    public class PrivateDataImportExportWithContract\r
-    {\r
-        public PrivateDataImportExportWithContract(int x)\r
-        {\r
-            Out = new PrivateDataType() { X = x };\r
-        }\r
-        public int X { get { return In.X; } }\r
-        [Export("a")]\r
-        PrivateDataType Out { get; set; }\r
-        [Import("a")]\r
-        IData In { get; set; }\r
-    }\r
-\r
-    public class PrivateDataImportExport\r
-    {\r
-        public PrivateDataImportExport(int x)\r
-        {\r
-            Out = new PrivateDataType() { X = x };\r
-        }\r
-        public int X { get { return In.X; } }\r
-        [Export]\r
-        PrivateDataType Out { get; set; }\r
-        [Import]\r
-        PrivateDataType In { get; set; }\r
-    }\r
-\r
-    class PrivateDataType\r
-    {\r
-        public int X { get; set; }\r
-    }\r
-\r
-    public class AllPrivateNoAttribute\r
-    {\r
-        public AllPrivateNoAttribute(int exportA, int exportB) { ExportA = exportA; ExportB = exportB; }\r
-\r
-        public int PublicImportA { get { return ImportA; } }\r
-        public int PublicImportB { get { return ImportB; } }\r
-\r
-        [Import("a")]\r
-        int ImportA { get; set; }\r
-        [Import("b")]\r
-        int ImportB { get; set; }\r
-        [Export("a")]\r
-        int ExportA { get; set; }\r
-        [Export("b")]\r
-        int ExportB { get; set; }\r
-    }\r
-    public class AllPrivateNoAttributeImportOnly\r
-    {\r
-        public int PublicImportA { get { return ImportA; } }\r
-        public int PublicImportB { get { return ImportB; } }\r
-\r
-        [Import("a")]\r
-        int ImportA { get; set; }\r
-        [Import("b")]\r
-        int ImportB { get; set; }\r
-    }\r
-\r
-    public class AllPrivate\r
-    {\r
-        public AllPrivate(int exportA, int exportB) { ExportA = exportA; ExportB = exportB; }\r
-\r
-        public int PublicImportA { get { return ImportA; } }\r
-        public int PublicImportB { get { return ImportB; } }\r
-\r
-        [Import("a")]\r
-        int ImportA { get; set; }\r
-        [Import("b")]\r
-        int ImportB { get; set; }\r
-        [Export("a")]\r
-        int ExportA { get; set; }\r
-        [Export("b")]\r
-        int ExportB { get; set; }\r
-    }\r
-\r
-    public class AllPrivateImportOnly\r
-    {\r
-        public int PublicImportA { get { return ImportA; } }\r
-        public int PublicImportB { get { return ImportB; } }\r
-\r
-        [Import("a")]\r
-        int ImportA { get; set; }\r
-        [Import("b")]\r
-        int ImportB { get; set; }\r
-    }\r
-\r
-    public class AllPrivateExportOnly\r
-    {\r
-        public AllPrivateExportOnly(int exportA, int exportB) { ExportA = exportA; ExportB = exportB; }\r
-\r
-        [Export("a")]\r
-        int ExportA { get; set; }\r
-        [Export("b")]\r
-        int ExportB { get; set; }\r
-    }\r
-\r
-    public class AllPublic\r
-    {\r
-        [Import("a")]\r
-        public int ImportA { get; set; }\r
-        [Import("b")]\r
-        public int ImportB { get; set; }\r
-        [Export("a")]\r
-        public int ExportA { get; set; }\r
-        [Export("b")]\r
-        public int ExportB { get; set; }\r
-    }\r
-    public class AllPublicImportOnly\r
-    {\r
-        [Import("a")]\r
-        public int ImportA { get; set; }\r
-        [Import("b")]\r
-        public int ImportB { get; set; }\r
-    }\r
-    public class AllPublicExportOnly\r
-    {\r
-        [Export("a")]\r
-        public int ExportA { get; set; }\r
-        [Export("b")]\r
-        public int ExportB { get; set; }\r
-    }\r
-}\r
-\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AttributedModelCompositionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AttributedModelCompositionTests.cs
deleted file mode 100644 (file)
index 4a6adca..0000000
+++ /dev/null
@@ -1,465 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.ComponentModel.Composition.Factories;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.AttributedModel\r
-{\r
-    [TestClass]\r
-    public class AttributedModelCompositionTests\r
-    {\r
-        [TestMethod]\r
-        public void PartContainingOnlyStaticExports_ShouldNotCauseInstanceToBeCreated()\r
-        {  \r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(HasOnlyStaticExports));\r
-            \r
-            Assert.AreEqual("Field", container.GetExportedValue<string>("Field"));\r
-            Assert.AreEqual("Property", container.GetExportedValue<string>("Property"));\r
-            Assert.IsNotNull("Method", container.GetExportedValue<Func<string>>("Method")());\r
-\r
-            Assert.IsFalse(HasOnlyStaticExports.InstanceCreated);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportOnAbstractBase_DoesNotReturnNull()\r
-        {   // 499393 - Classes inheriting from an exported \r
-            // abstract class are exported as 'null'\r
-\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var definition = PartDefinitionFactory.CreateAttributed(typeof(Derived));\r
-            batch.AddPart(definition.CreatePart());\r
-            container.Compose(batch);\r
-\r
-            Assert.IsNotNull(container.GetExportedValueOrDefault<Base>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReadOnlyFieldImport_ShouldThrowComposition()\r
-        {\r
-            var importer = PartFactory.CreateAttributed(new ReadOnlyPropertyImport());\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("readonly", "new value");\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotActivate,\r
-                                          ErrorId.ReflectionModel_ImportNotWritable,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReadOnlyPropertyImport_ShouldThrowComposition()\r
-        {\r
-            var importer = PartFactory.CreateAttributed(new ReadOnlyPropertyImport());\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("readonly", "new value");\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotActivate,\r
-                                          ErrorId.ReflectionModel_ImportNotWritable, RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteOnlyPropertyExport_ShouldThrowComposition()\r
-        {\r
-            var importer = PartFactory.CreateAttributed(new WriteOnlyPropertyExport());\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, ErrorId.ReflectionModel_ExportNotReadable, () =>\r
-            {\r
-                container.GetExportedValue<string>("writeonly");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromInt32ToDateTime()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("DateTime", typeof(DateTime), 42);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromInt16ToInt32()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Int32", typeof(Int32), (short)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                              ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                              RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromInt32ToInt16()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Int16", typeof(Int16), (int)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromInt32ToUInt32()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("UInt32", typeof(UInt32), (int)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromUInt32ToInt32()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Int32", typeof(Int32), (uint)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromInt32ToInt64()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Int64", typeof(Int64), (int)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromSingleToDouble()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Double", typeof(Double), (float)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromDoubleToSingle()\r
-        {\r
-            var container = ContainerFactory.Create(); \r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Single", typeof(Single), (double)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromSingleToInt32()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Int32", typeof(Int32), (float)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueMismatchFromInt32ToSingle()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ImportValueTypes());\r
-            batch.AddExportedValue("Single", typeof(Single), (int)10);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MemberExports()\r
-        {\r
-            var exporter = PartFactory.CreateAttributed(new ObjectWithMemberExports());\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            var filedExports = container.GetExports<int>("field");\r
-            ExportsAssert.AreEqual(filedExports, 1, 5);\r
-\r
-            var readonlyExports = container.GetExports<int>("readonly");\r
-            ExportsAssert.AreEqual(readonlyExports, 2, 6);\r
-\r
-            var propertyExports = container.GetExports<int>("property");\r
-            ExportsAssert.AreEqual(propertyExports, 3, 7);\r
-\r
-            var methodExports = container.GetExportedValues<Func<int, int>>("func").Select(f => f(0));\r
-            EnumerableAssert.AreEqual(methodExports, 4, 8);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestExportedValueCachesValue()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var exporter = new ExportsMutableProperty();\r
-            exporter.Property = "Value1";\r
-\r
-            container.ComposeParts(exporter);\r
-\r
-            Assert.AreEqual("Value1", container.GetExportedValue<string>("Property"));\r
-\r
-            exporter.Property = "Value2";\r
-\r
-            //  Exported value should have been cached and so it shouldn't change\r
-            Assert.AreEqual("Value1", container.GetExportedValue<string>("Property"));\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(739354)]\r
-        [Ignore]\r
-        public void TestExportedValueCachesNullValue()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var exporter = new ExportsMutableProperty();\r
-            exporter.Property = null;\r
-\r
-            container.ComposeParts(exporter);\r
-\r
-            Assert.IsNull(container.GetExportedValue<string>("Property"));\r
-\r
-            exporter.Property = "Value1";\r
-\r
-            //  Exported value should have been cached and so it shouldn't change\r
-            Assert.IsNull(container.GetExportedValue<string>("Property"));\r
-        }\r
-\r
-        public class ExportsMutableProperty\r
-        {\r
-            [Export("Property")]\r
-            public string Property { get; set; }\r
-        }\r
-\r
-        public class ReadOnlyFieldImport\r
-        {\r
-            [Import("readonly")]\r
-            public readonly string Value = "Value";\r
-        }\r
-\r
-        public class ReadOnlyPropertyImport\r
-        {\r
-            [Import("readonly")]\r
-            public string Value\r
-            {\r
-                get { return "Value"; }\r
-            }\r
-        }\r
-\r
-        public class WriteOnlyPropertyExport\r
-        {\r
-            [Export("writeonly")]\r
-            public string Value\r
-            {\r
-                set { }\r
-            }\r
-        }\r
-\r
-        public class ObjectWithMemberExports\r
-        {\r
-            [Export("field")]\r
-            public static int staticField = 1;\r
-\r
-            [Export("readonly")]\r
-            public static readonly int staticReadonly = 2;\r
-\r
-            [Export("property")]\r
-            public static int StaticProperty { get { return 3; } }\r
-\r
-            [Export("func")]\r
-            public static int StaticMethod(int arg1) { return 4; }\r
-\r
-            [Export("field")]\r
-            public int instanceField = 5;\r
-\r
-            [Export("readonly")]\r
-            public readonly int instanceReadonly = 6;\r
-\r
-            [Export("property")]\r
-            public int InstanceProperty { get { return 7; } }\r
-\r
-            [Export("func")]\r
-            public int InstanceMethod(int arg1) { return 8; }\r
-        }\r
-\r
-        public class HasOnlyStaticExports\r
-        {\r
-            public static bool InstanceCreated;\r
-\r
-            public HasOnlyStaticExports()\r
-            {\r
-                InstanceCreated = true;\r
-            }\r
-\r
-            [Export("Field")]\r
-            public static string Field = "Field";\r
-\r
-            [Export("Property")]\r
-            public static string Property\r
-            {\r
-                get { return "Property"; }\r
-            }\r
-\r
-            [Export("Method")]\r
-            public static string Method()\r
-            {\r
-                return "Method";\r
-            }\r
-        }\r
-\r
-        [InheritedExport(typeof(Base))]\r
-        public abstract class Base\r
-        {\r
-        }\r
-\r
-        [Export(typeof(Derived))]\r
-        public class Derived : Base\r
-        {\r
-        }\r
-\r
-        public class ImportValueTypes\r
-        {\r
-            [Import("Int16", AllowDefault = true)]\r
-            public short Int16\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("Int32", AllowDefault = true)]\r
-            public int Int32\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("UInt32", AllowDefault = true)]\r
-            [CLSCompliant(false)]\r
-            public uint UInt32\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("Int64", AllowDefault = true)]\r
-            public long Int64\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("Single", AllowDefault = true)]\r
-            public float Single\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("Double", AllowDefault = true)]\r
-            public double Double\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("DateTime", AllowDefault = true)]\r
-            public DateTime DateTime\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AttributedModelDiscoveryTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/AttributedModelDiscoveryTests.cs
deleted file mode 100644 (file)
index 15a2146..0000000
+++ /dev/null
@@ -1,345 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.AttributedModel\r
-{\r
-    [TestClass]\r
-    public class AttributedModelDiscoveryTests\r
-    {\r
-        [TestMethod]\r
-        public void CreatePartDefinition_TypeWithExports_ShouldHaveMultipleExports()\r
-        {\r
-            var definition = CreateDefinition(typeof(PublicComponentWithPublicExports));\r
-            EnumerableAssert.AreEqual(definition.ExportDefinitions.Select(e => e.ContractName), "PublicField", "PublicProperty", "PublicDelegate");\r
-        }\r
-\r
-        public abstract class BaseClassWithPropertyExports\r
-        {\r
-            [Export("MyPropBase")]\r
-            public virtual int MyProp { get; set; }\r
-        }\r
-\r
-        public class DerivedClassWithInheritedPropertyExports : BaseClassWithPropertyExports\r
-        {\r
-            public override int MyProp { get; set; }\r
-        }\r
-\r
-        [WorkItem(551341)]\r
-        [TestMethod]\r
-        public void ShowIssueWithVirtualPropertiesInReflectionAPI()\r
-        {\r
-            PropertyInfo propInfo = typeof(BaseClassWithPropertyExports).GetProperty("MyProp");\r
-\r
-            // pi.GetCustomAttributes does not find the inherited attributes\r
-            var c1 = propInfo.GetCustomAttributes(true);\r
-\r
-            // Attribute.GetCustomAttributes does find the inherited attributes\r
-            var c2 = Attribute.GetCustomAttributes(propInfo, true);\r
-\r
-            // This seems like it should be a bug in the reflection API's... \r
-            Assert.AreNotEqual(c1, c2);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_TypeWithImports_ShouldHaveMultipleImports()\r
-        {\r
-            var definition = CreateDefinition(typeof(PublicImportsExpectingPublicExports));\r
-            EnumerableAssert.AreEqual(definition.ImportDefinitions.Cast<ContractBasedImportDefinition>()\r
-                                                           .Select(i => i.ContractName), "PublicField", "PublicProperty", "PublicDelegate", "PublicIGetString");\r
-        }\r
-\r
-        public class AnyImplicitExport\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_AnyType_ShouldHaveMetadataWithAnyImplicitCreationPolicy()\r
-        {\r
-            var definition = CreateDefinition(typeof(AnyImplicitExport));\r
-\r
-            Assert.AreEqual(CreationPolicy.Any, definition.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-        [PartCreationPolicy(CreationPolicy.Any)]\r
-        public class AnyExport\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_AnyType_ShouldHaveMetadataWithAnyCreationPolicy()\r
-        {\r
-            var definition = CreateDefinition(typeof(AnyExport));\r
-\r
-            Assert.AreEqual(CreationPolicy.Any, definition.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class SharedExport\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_SharedType_ShouldHaveMetadataWithSharedCreationPolicy()\r
-        {\r
-            var definition = CreateDefinition(typeof(SharedExport));\r
-\r
-            Assert.AreEqual(CreationPolicy.Shared, definition.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedExport\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NonSharedType_ShouldHaveMetadataWithNonSharedCreationPolicy()\r
-        {\r
-            var definition = CreateDefinition(typeof(NonSharedExport));\r
-\r
-            Assert.AreEqual(CreationPolicy.NonShared, definition.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-        [PartMetadata(CompositionConstants.PartCreationPolicyMetadataName, CreationPolicy.NonShared)]\r
-        [PartMetadata("ShouldNotBeIgnored", "Value")]\r
-        public class PartWithIgnoredMetadata\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_SharedTypeMarkedWithNonSharedMetadata_ShouldHaveMetadatWithSharedCreationPolicy()\r
-        {\r
-            // Type should just contain all the default settings of Shared\r
-            var definition = CreateDefinition(typeof(PartWithIgnoredMetadata));\r
-\r
-            // CompositionConstants.PartCreationPolicyMetadataName should be ignored\r
-            Assert.AreNotEqual(CreationPolicy.NonShared, definition.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName));\r
-\r
-            // Key ShouldNotBeIgnored should actully be in the dictionary\r
-            Assert.AreEqual("Value", definition.Metadata["ShouldNotBeIgnored"]);\r
-        }\r
-\r
-        [PartMetadata("BaseOnlyName", 1)]\r
-        [PartMetadata("OverrideName", 2)]\r
-        public class BasePartWithMetdata\r
-        {\r
-\r
-        }\r
-\r
-        [PartMetadata("DerivedOnlyName", 3)]\r
-        [PartMetadata("OverrideName", 4)]\r
-        public class DerivedPartWithMetadata : BasePartWithMetdata\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_InheritedPartMetadata_ShouldNotContainPartMetadataFromBase()\r
-        {\r
-            var definition = CreateDefinition(typeof(DerivedPartWithMetadata));\r
-\r
-            Assert.IsFalse(definition.Metadata.ContainsKey("BaseOnlyName"), "Should not inherit part metadata from base.");\r
-            Assert.AreEqual(3, definition.Metadata["DerivedOnlyName"]);\r
-            Assert.AreEqual(4, definition.Metadata["OverrideName"]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NoMarkedOrDefaultConstructorAsPartTypeArgument_ShouldSetConstructorToNull()\r
-        {\r
-            var definition = CreateDefinition(typeof(ClassWithNoMarkedOrDefaultConstructor));\r
-\r
-            Assert.IsNull(definition.GetConstructor());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_MultipleMarkedConstructorsAsPartTypeArgument_ShouldSetConstructors()\r
-        {\r
-            var definition = CreateDefinition(typeof(ClassWithMultipleMarkedConstructors));\r
-\r
-            Assert.IsNull(definition.GetConstructor());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_OneMarkedConstructorsAsPartTypeArgument_ShouldSetConstructorToMarked()\r
-        {\r
-            var definition = CreateDefinition(typeof(SimpleConstructorInjectedObject));\r
-\r
-            ConstructorInfo constructor = definition.GetConstructor();\r
-            Assert.IsNotNull(constructor);\r
-            Assert.AreEqual(typeof(SimpleConstructorInjectedObject).GetConstructors()[0], constructor);\r
-            Assert.AreEqual(constructor.GetParameters().Length, definition.ImportDefinitions.OfType<ReflectionParameterImportDefinition>().Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_OneDefaultConstructorAsPartTypeArgument_ShouldSetConstructorToDefault()\r
-        {\r
-            var definition = CreateDefinition(typeof(PublicComponentWithPublicExports));\r
-\r
-            ConstructorInfo constructor = definition.GetConstructor();\r
-            Assert.IsNotNull(constructor);\r
-\r
-            EnumerableAssert.IsEmpty(constructor.GetParameters());\r
-            EnumerableAssert.IsEmpty(definition.ImportDefinitions.OfType<ReflectionParameterImportDefinition>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_OneMarkedAndOneDefaultConstructorsAsPartTypeArgument_ShouldSetConstructorToMarked()\r
-        {\r
-            var definition = CreateDefinition(typeof(ClassWithOneMarkedAndOneDefaultConstructor));\r
-            var marked = typeof(ClassWithOneMarkedAndOneDefaultConstructor).GetConstructors()[0];\r
-            Assert.IsTrue(marked.IsDefined(typeof(ImportingConstructorAttribute), false));\r
-\r
-            ConstructorInfo constructor = definition.GetConstructor();\r
-            Assert.IsNotNull(constructor);\r
-\r
-            Assert.AreEqual(marked, constructor);\r
-            Assert.AreEqual(marked.GetParameters().Length, definition.ImportDefinitions.OfType<ReflectionParameterImportDefinition>().Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NoConstructorBecauseStatic_ShouldHaveNullConstructor()\r
-        {\r
-            var definition = CreateDefinition(typeof(StaticExportClass));\r
-\r
-            ConstructorInfo constructor = definition.GetConstructor();\r
-            Assert.IsNull(constructor);\r
-\r
-            EnumerableAssert.IsEmpty(definition.ImportDefinitions.OfType<ReflectionParameterImportDefinition>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_TwoZeroParameterConstructors_ShouldPickNonStaticOne()\r
-        {\r
-            var definition = CreateDefinition(typeof(ClassWithTwoZeroParameterConstructors));\r
-\r
-            ConstructorInfo constructor = definition.GetConstructor();\r
-            Assert.IsNotNull(constructor);\r
-            Assert.IsFalse(constructor.IsStatic);\r
-\r
-            EnumerableAssert.IsEmpty(definition.ImportDefinitions.OfType<ReflectionParameterImportDefinition>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsDiscoverable()\r
-        {\r
-            var expectations = new ExpectationCollection<Type, bool>();\r
-            expectations.Add(typeof(ClassWithTwoZeroParameterConstructors), true);\r
-            expectations.Add(typeof(SimpleConstructorInjectedObject), true);\r
-            expectations.Add(typeof(StaticExportClass), true);\r
-            expectations.Add(typeof(PublicComponentWithPublicExports), true);\r
-            expectations.Add(typeof(ClassWithMultipleMarkedConstructors), true);\r
-            expectations.Add(typeof(ClassWithNoMarkedOrDefaultConstructor), true);\r
-            expectations.Add(typeof(ClassWhichOnlyHasDefaultConstructor), false);\r
-            expectations.Add(typeof(ClassWithOnlyHasImportingConstructorButInherits), true);\r
-            expectations.Add(typeof(ClassWithOnlyHasMultipleImportingConstructorButInherits), true);\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = AttributedModelDiscovery.CreatePartDefinitionIfDiscoverable(e.Input, (ICompositionElement)null);\r
-\r
-                bool result = (definition != null);\r
-\r
-                Assert.AreEqual(e.Output, result);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_EnsureIsDiscoverable()\r
-        {\r
-            var expectations = new ExpectationCollection<Type, bool>();\r
-            expectations.Add(typeof(ClassWithTwoZeroParameterConstructors), true);\r
-            expectations.Add(typeof(SimpleConstructorInjectedObject), true);\r
-            expectations.Add(typeof(StaticExportClass), true);\r
-            expectations.Add(typeof(PublicComponentWithPublicExports), true);\r
-            expectations.Add(typeof(ClassWithMultipleMarkedConstructors), true);\r
-            expectations.Add(typeof(ClassWithNoMarkedOrDefaultConstructor), true);\r
-            expectations.Add(typeof(ClassWhichOnlyHasDefaultConstructor), false);\r
-            expectations.Add(typeof(ClassWithOnlyHasImportingConstructorButInherits), true);\r
-            expectations.Add(typeof(ClassWithOnlyHasMultipleImportingConstructorButInherits), true);\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = AttributedModelServices.CreatePartDefinition(e.Input, null, true);\r
-\r
-                bool result = (definition != null);\r
-\r
-                Assert.AreEqual(e.Output, result);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NotEnsureIsDiscoverable()\r
-        {\r
-            var expectations = new ExpectationCollection<Type, bool>();\r
-            expectations.Add(typeof(ClassWithTwoZeroParameterConstructors), true);\r
-            expectations.Add(typeof(SimpleConstructorInjectedObject), true);\r
-            expectations.Add(typeof(StaticExportClass), true);\r
-            expectations.Add(typeof(PublicComponentWithPublicExports), true);\r
-            expectations.Add(typeof(ClassWithMultipleMarkedConstructors), true);\r
-            expectations.Add(typeof(ClassWithNoMarkedOrDefaultConstructor), true);\r
-            expectations.Add(typeof(ClassWhichOnlyHasDefaultConstructor), false);\r
-            expectations.Add(typeof(ClassWithOnlyHasImportingConstructorButInherits), true);\r
-            expectations.Add(typeof(ClassWithOnlyHasMultipleImportingConstructorButInherits), true);\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = AttributedModelServices.CreatePartDefinition(e.Input, null, false);\r
-                Assert.IsNotNull(definition);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePart_ObjectInstance_ShouldProduceSharedPart()\r
-        {\r
-            var part = AttributedModelServices.CreatePart(typeof(MyExport));\r
-\r
-            Assert.AreEqual(CreationPolicy.Shared, part.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-\r
-        private ReflectionComposablePartDefinition CreateDefinition(Type type)\r
-        {\r
-            var definition = AttributedModelDiscovery.CreatePartDefinition(type, null, false, ElementFactory.Create());\r
-\r
-            Assert.AreEqual(type, definition.GetPartType());\r
-\r
-            return definition;\r
-        }\r
-\r
-        [InheritedExport]\r
-        [InheritedExport]\r
-        [InheritedExport]\r
-        [Export]\r
-        [InheritedExport]\r
-        [InheritedExport]\r
-        [InheritedExport]\r
-        public class DuplicateMixedExporter1\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(710352)]\r
-        public void MixedDuplicateExports_ShouldOnlyCollapseInheritedExport()\r
-        {\r
-            var def = AttributedModelServices.CreatePartDefinition(typeof(DuplicateMixedExporter1), null);\r
-            Assert.AreEqual(2, def.ExportDefinitions.Count(), "Should have 1 from the Export and only 1 collapsed InhertedExport");\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/INotifyImportTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModel/INotifyImportTests.cs
deleted file mode 100644 (file)
index 4e08d0f..0000000
+++ /dev/null
@@ -1,608 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.AttributedModel\r
-{\r
-    [TestClass()]\r
-    public class INotifyImportTests\r
-    {\r
-        [Export(typeof(PartWithoutImports))]\r
-        public class PartWithoutImports : IPartImportsSatisfiedNotification\r
-        {\r
-            public bool ImportsSatisfiedInvoked { get; private set; }\r
-            public void OnImportsSatisfied()\r
-            {\r
-                this.ImportsSatisfiedInvoked = true;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportsSatisfiedOnComponentWithoutImports()\r
-        {\r
-            CompositionContainer container = ContainerFactory.CreateWithAttributedCatalog(typeof(PartWithoutImports));\r
-\r
-            PartWithoutImports partWithoutImports = container.GetExportedValue<PartWithoutImports>();\r
-            Assert.IsNotNull(partWithoutImports);\r
-\r
-            Assert.IsTrue(partWithoutImports.ImportsSatisfiedInvoked);\r
-\r
-        }\r
-\r
-        [TestMethod()]\r
-        public void ImportCompletedTest()\r
-        {\r
-            var container = ContainerFactory.Create(); \r
-            CompositionBatch batch = new CompositionBatch();\r
-            var entrypoint = new UpperCaseStringComponent();\r
-\r
-            batch.AddParts(new LowerCaseString("abc"), entrypoint);\r
-            container.Compose(batch);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddParts(new object());\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(entrypoint.LowerCaseStrings.Count, 1);\r
-            Assert.AreEqual(entrypoint.ImportCompletedCallCount, 1);\r
-            Assert.AreEqual(entrypoint.UpperCaseStrings.Count, 1);\r
-            Assert.AreEqual(entrypoint.LowerCaseStrings[0].Value.String, "abc");\r
-            Assert.AreEqual(entrypoint.UpperCaseStrings[0], "ABC");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCompletedWithRecomposing()\r
-        {\r
-            var container = ContainerFactory.Create(); \r
-            CompositionBatch batch = new CompositionBatch();\r
-            var entrypoint = new UpperCaseStringComponent();\r
-\r
-            batch.AddParts(new LowerCaseString("abc"), entrypoint);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(entrypoint.LowerCaseStrings.Count, 1);\r
-            Assert.AreEqual(entrypoint.ImportCompletedCallCount, 1);\r
-            Assert.AreEqual(entrypoint.UpperCaseStrings.Count, 1);\r
-            Assert.AreEqual(entrypoint.LowerCaseStrings[0].Value.String, "abc");\r
-            Assert.AreEqual(entrypoint.UpperCaseStrings[0], "ABC");\r
-\r
-            // Add another component to verify recomposing\r
-            batch = new CompositionBatch();\r
-            batch.AddParts(new LowerCaseString("def"));\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(entrypoint.LowerCaseStrings.Count, 2);\r
-            Assert.AreEqual(entrypoint.ImportCompletedCallCount, 2);\r
-            Assert.AreEqual(entrypoint.UpperCaseStrings.Count, 2);\r
-            Assert.AreEqual(entrypoint.LowerCaseStrings[1].Value.String, "def");\r
-            Assert.AreEqual(entrypoint.UpperCaseStrings[1], "DEF");\r
-\r
-            // Verify that adding a random component doesn't cause\r
-            // the OnImportsSatisfied to be called again.\r
-            batch = new CompositionBatch();\r
-            batch.AddParts(new object());\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(entrypoint.LowerCaseStrings.Count, 2);\r
-            Assert.AreEqual(entrypoint.ImportCompletedCallCount, 2);\r
-            Assert.AreEqual(entrypoint.UpperCaseStrings.Count, 2);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(700940)]\r
-        public void ImportCompletedUsingSatisfyImportsOnce()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var entrypoint = new UpperCaseStringComponent();\r
-            var entrypointPart = AttributedModelServices.CreatePart(entrypoint);\r
-\r
-            batch.AddParts(new LowerCaseString("abc"));\r
-            container.Compose(batch);\r
-            container.SatisfyImportsOnce(entrypointPart);\r
-            \r
-            Assert.AreEqual(1, entrypoint.LowerCaseStrings.Count);\r
-            Assert.AreEqual(1, entrypoint.ImportCompletedCallCount);\r
-            Assert.AreEqual(1, entrypoint.UpperCaseStrings.Count);\r
-            Assert.AreEqual("abc", entrypoint.LowerCaseStrings[0].Value.String);\r
-            Assert.AreEqual("ABC", entrypoint.UpperCaseStrings[0]);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddParts(new object());\r
-            container.Compose(batch);\r
-            container.SatisfyImportsOnce(entrypointPart);\r
-\r
-            Assert.AreEqual(1, entrypoint.LowerCaseStrings.Count);\r
-            Assert.AreEqual(1, entrypoint.ImportCompletedCallCount);\r
-            Assert.AreEqual(1, entrypoint.UpperCaseStrings.Count);\r
-            Assert.AreEqual("abc", entrypoint.LowerCaseStrings[0].Value.String);\r
-            Assert.AreEqual("ABC", entrypoint.UpperCaseStrings[0]);\r
-            \r
-            batch.AddParts(new LowerCaseString("def"));\r
-            container.Compose(batch);\r
-            container.SatisfyImportsOnce(entrypointPart);\r
-            \r
-            Assert.AreEqual(2, entrypoint.LowerCaseStrings.Count);\r
-            Assert.AreEqual(2, entrypoint.ImportCompletedCallCount);\r
-            Assert.AreEqual(2, entrypoint.UpperCaseStrings.Count);\r
-            Assert.AreEqual("abc", entrypoint.LowerCaseStrings[0].Value.String);\r
-            Assert.AreEqual("ABC", entrypoint.UpperCaseStrings[0]);\r
-            Assert.AreEqual("def", entrypoint.LowerCaseStrings[1].Value.String);\r
-            Assert.AreEqual("DEF", entrypoint.UpperCaseStrings[1]);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(654513)]\r
-        public void ImportCompletedCalledAfterAllImportsAreFullyComposed()\r
-        {\r
-            int importSatisfationCount = 0;\r
-            var importer1 = new MyEventDrivenFullComposedNotifyImporter1();\r
-            var importer2 = new MyEventDrivenFullComposedNotifyImporter2();\r
-\r
-            Action<object, EventArgs> verificationAction = (object sender, EventArgs e) =>\r
-            {\r
-                Assert.IsTrue(importer1.AreAllImportsFullyComposed);\r
-                Assert.IsTrue(importer2.AreAllImportsFullyComposed);\r
-                ++importSatisfationCount;\r
-            };\r
-\r
-            importer1.ImportsSatisfied += new EventHandler(verificationAction);\r
-            importer2.ImportsSatisfied += new EventHandler(verificationAction);\r
-\r
-            // importer1 added first\r
-            var batch = new CompositionBatch();\r
-            batch.AddParts(importer1, importer2);\r
-\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeExportedValue<ICompositionService>(container);\r
-            container.Compose(batch);\r
-            Assert.AreEqual(2, importSatisfationCount);\r
-\r
-            // importer2 added first\r
-            importSatisfationCount = 0;\r
-            batch = new CompositionBatch();\r
-            batch.AddParts(importer2, importer1);\r
-\r
-            container = ContainerFactory.Create();\r
-            container.ComposeExportedValue<ICompositionService>(container);\r
-            container.Compose(batch);\r
-            Assert.AreEqual(2, importSatisfationCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCompletedAddPartAndBindComponent()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(new CallbackImportNotify(delegate\r
-            {\r
-                batch = new CompositionBatch();\r
-                batch.AddPart(new object());\r
-                container.Compose(batch);\r
-            }));\r
-\r
-            container.Compose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCompletedChildNeedsParentContainer()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var parent = new CompositionContainer(cat);\r
-\r
-            CompositionBatch parentBatch = new CompositionBatch();\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-            CompositionBatch child2Batch = new CompositionBatch();\r
-\r
-            parentBatch.AddExportedValue<ICompositionService>(parent);\r
-            parent.Compose(parentBatch);\r
-            var child = new CompositionContainer(parent);\r
-            var child2 = new CompositionContainer(parent);\r
-            \r
-            var parentImporter = new MyNotifyImportImporter(parent);\r
-            var childImporter = new MyNotifyImportImporter(child);\r
-            var child2Importer = new MyNotifyImportImporter(child2);\r
-\r
-            parentBatch = new CompositionBatch();\r
-            parentBatch.AddPart(parentImporter);\r
-            childBatch.AddPart(childImporter);\r
-            child2Batch.AddPart(child2Importer);\r
-\r
-            parent.Compose(parentBatch);\r
-            child.Compose(childBatch);\r
-            child2.Compose(child2Batch);\r
-            \r
-\r
-            Assert.AreEqual(1, parentImporter.ImportCompletedCallCount);\r
-            Assert.AreEqual(1, childImporter.ImportCompletedCallCount);\r
-            Assert.AreEqual(1, child2Importer.ImportCompletedCallCount);\r
-\r
-            MyNotifyImportExporter parentExporter = parent.GetExportedValue<MyNotifyImportExporter>("MyNotifyImportExporter");\r
-            Assert.AreEqual(1, parentExporter.ImportCompletedCallCount);\r
-\r
-            MyNotifyImportExporter childExporter = child.GetExportedValue<MyNotifyImportExporter>("MyNotifyImportExporter");\r
-            Assert.AreEqual(1, childExporter.ImportCompletedCallCount);\r
-\r
-            MyNotifyImportExporter child2Exporter = child2.GetExportedValue<MyNotifyImportExporter>("MyNotifyImportExporter");\r
-            Assert.AreEqual(1, child2Exporter.ImportCompletedCallCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCompletedChildDoesnotNeedParentContainer()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var parent = new CompositionContainer(cat);\r
-\r
-            CompositionBatch parentBatch = new CompositionBatch();\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-\r
-            parentBatch.AddExportedValue<ICompositionService>(parent);\r
-            parent.Compose(parentBatch);\r
-\r
-            var child = new CompositionContainer(parent);\r
-\r
-            var parentImporter = new MyNotifyImportImporter(parent);\r
-            var childImporter = new MyNotifyImportImporter(child);\r
-\r
-            parentBatch = new CompositionBatch();\r
-            parentBatch.AddPart(parentImporter);\r
-\r
-            childBatch.AddParts(childImporter, new MyNotifyImportExporter());\r
-\r
-            child.Compose(childBatch);\r
-\r
-            Assert.AreEqual(0, parentImporter.ImportCompletedCallCount);\r
-            Assert.AreEqual(1, childImporter.ImportCompletedCallCount);\r
-\r
-            // Parent will become bound at this point.\r
-            MyNotifyImportExporter parentExporter = parent.GetExportedValue<MyNotifyImportExporter>("MyNotifyImportExporter");\r
-            parent.Compose(parentBatch);\r
-            Assert.AreEqual(1, parentImporter.ImportCompletedCallCount);\r
-            Assert.AreEqual(1, parentExporter.ImportCompletedCallCount);\r
-\r
-            MyNotifyImportExporter childExporter = child.GetExportedValue<MyNotifyImportExporter>("MyNotifyImportExporter");\r
-            Assert.AreEqual(1, childExporter.ImportCompletedCallCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCompletedBindChildIndirectlyThroughParentContainerBind()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var parent = new CompositionContainer(cat);\r
-\r
-            CompositionBatch parentBatch = new CompositionBatch();\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-\r
-            parentBatch.AddExportedValue<ICompositionService>(parent);\r
-            parent.Compose(parentBatch);\r
-            var child = new CompositionContainer(parent);\r
-\r
-            var parentImporter = new MyNotifyImportImporter(parent);\r
-            var childImporter = new MyNotifyImportImporter(child);\r
-\r
-            parentBatch = new CompositionBatch();\r
-            parentBatch.AddPart(parentImporter);\r
-            childBatch.AddParts(childImporter, new MyNotifyImportExporter());\r
-\r
-            parent.Compose(parentBatch);\r
-            child.Compose(childBatch);\r
-\r
-            Assert.AreEqual(1, parentImporter.ImportCompletedCallCount);\r
-            Assert.AreEqual(1, childImporter.ImportCompletedCallCount);\r
-\r
-            MyNotifyImportExporter parentExporter = parent.GetExportedValue<MyNotifyImportExporter>("MyNotifyImportExporter");\r
-            Assert.AreEqual(1, parentExporter.ImportCompletedCallCount);\r
-\r
-            MyNotifyImportExporter childExporter = child.GetExportedValue<MyNotifyImportExporter>("MyNotifyImportExporter");\r
-            Assert.AreEqual(1, childExporter.ImportCompletedCallCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCompletedGetExportedValueLazy()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            CompositionContainer container = new CompositionContainer(cat);\r
-\r
-            NotifyImportExportee.InstanceCount = 0;\r
-            NotifyImportExportsLazy notifyee = container.GetExportedValue<NotifyImportExportsLazy>("NotifyImportExportsLazy");\r
-            Assert.IsNotNull(notifyee, "Expecting bound type");\r
-            Assert.IsNotNull(notifyee.Imports, "Expecting Imports to be populated");\r
-            Assert.IsTrue(notifyee.NeedRefresh, "Expecting import to put class in pending state");\r
-            Assert.AreEqual(3, notifyee.Imports.Count, "Expecting 3 Exports before filtering");\r
-            Assert.AreEqual(0, NotifyImportExportee.InstanceCount, "Not instance expected before pull");\r
-            Assert.AreEqual(0, notifyee.realImports.Count, "Expecting collection to be empty before pull");\r
-            Assert.AreEqual(2, notifyee.RealImports.Count, "Expecting 2 real values after pull");\r
-            Assert.AreEqual(1, notifyee.RealImports[0].Id, "Expecting distinct activated instance");\r
-            Assert.AreEqual(3, notifyee.RealImports[1].Id, "Expecting distinct  activated instance");\r
-            Assert.AreEqual(2, NotifyImportExportee.InstanceCount, "2 instances expected after pull");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCompletedGetExportedValueEager()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            CompositionContainer container = new CompositionContainer(cat);\r
-\r
-            NotifyImportExportee.InstanceCount = 0;\r
-            var notifyee = container.GetExportedValue<NotifyImportExportsEager>("NotifyImportExportsEager");\r
-            Assert.IsNotNull(notifyee, "Expecting bound type");\r
-            Assert.IsNotNull(notifyee.Imports, "Expecting Imports to be populated");\r
-            Assert.AreEqual(3, notifyee.Imports.Count, "Expecting 3 Exports before filtering");\r
-            Assert.AreEqual(2, NotifyImportExportee.InstanceCount, "Expecting concrete instances already pulled");\r
-            Assert.AreEqual(2, notifyee.realImports.Count, "Expecting collection to be populated");\r
-            Assert.AreEqual(2, notifyee.RealImports.Count, "Expecting 2 real values after import");\r
-            Assert.AreEqual(1, notifyee.RealImports[0].Id, "Expecting distinct activated instance");\r
-            Assert.AreEqual(3, notifyee.RealImports[1].Id, "Expecting distinct activated instance");\r
-            Assert.AreEqual(2, NotifyImportExportee.InstanceCount, "Expecting no more instances after read");\r
-        }\r
-    }\r
-\r
-    public class NotifyImportExportee\r
-    {\r
-        public NotifyImportExportee(int id)\r
-        {\r
-            Id = id;\r
-            InstanceCount++;\r
-        }\r
-\r
-        public int Id { get; set; }\r
-\r
-        public static int InstanceCount { get; set; }\r
-    }\r
-\r
-    public class NotifyImportExporter\r
-    {\r
-\r
-        public NotifyImportExporter()\r
-        {\r
-        }\r
-\r
-        [Export()]\r
-        [ExportMetadata("Filter", false)]\r
-        public NotifyImportExportee Export1\r
-        {\r
-            get\r
-            {\r
-                return new NotifyImportExportee(1);\r
-            }\r
-        }\r
-\r
-        [Export()]\r
-        [ExportMetadata("Filter", true)]\r
-        public NotifyImportExportee Export2\r
-        {\r
-            get\r
-            {\r
-                return new NotifyImportExportee(2);\r
-            }\r
-        }\r
-\r
-        [Export()]\r
-        [ExportMetadata("Filter", false)]\r
-        public NotifyImportExportee Export3\r
-        {\r
-            get\r
-            {\r
-                return new NotifyImportExportee(3);\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-    [Export("NotifyImportExportsLazy")]\r
-    public class NotifyImportExportsLazy : IPartImportsSatisfiedNotification\r
-    {\r
-        public NotifyImportExportsLazy()\r
-        {\r
-            NeedRefresh = false;\r
-        }\r
-\r
-        [ImportMany(typeof(NotifyImportExportee))]\r
-        public Collection<Lazy<NotifyImportExportee, IDictionary<string, object>>> Imports { get; set; }\r
-\r
-        public bool NeedRefresh { get; set; }\r
-\r
-        public void OnImportsSatisfied()\r
-        {\r
-            NeedRefresh = true;\r
-        }\r
-\r
-        internal Collection<NotifyImportExportee> realImports = new Collection<NotifyImportExportee>();\r
-\r
-        public Collection<NotifyImportExportee> RealImports\r
-        {\r
-            get \r
-            {\r
-                if (NeedRefresh)\r
-                {\r
-                    realImports.Clear();\r
-                    foreach (var import in Imports)\r
-                    {\r
-                        if (!((bool)import.Metadata["Filter"]))\r
-                        {\r
-                            realImports.Add(import.Value);\r
-                        }\r
-                    }\r
-                    NeedRefresh = false;\r
-                }\r
-                return realImports;\r
-            }\r
-        }\r
-    }\r
-\r
-    [Export("NotifyImportExportsEager")]\r
-    public class NotifyImportExportsEager : IPartImportsSatisfiedNotification\r
-    {\r
-        public NotifyImportExportsEager()\r
-        {\r
-        }\r
-\r
-        [ImportMany]\r
-        public Collection<Lazy<NotifyImportExportee, IDictionary<string, object>>> Imports { get; set; }\r
-\r
-        public void OnImportsSatisfied()\r
-        {\r
-            realImports.Clear();\r
-            foreach (var import in Imports)\r
-            {\r
-                if (!((bool)import.Metadata["Filter"]))\r
-                {\r
-                    realImports.Add(import.Value);\r
-                }\r
-            }\r
-        }\r
-\r
-        internal Collection<NotifyImportExportee> realImports = new Collection<NotifyImportExportee>();\r
-\r
-        public Collection<NotifyImportExportee> RealImports\r
-        {\r
-            get\r
-            {\r
-                return realImports;\r
-            }\r
-        }\r
-    }\r
-\r
-    public class MyEventDrivenNotifyImporter : IPartImportsSatisfiedNotification\r
-    {\r
-        [Import]\r
-        public ICompositionService ImportSomethingSoIGetImportCompletedCalled { get; set; }\r
-\r
-        public event EventHandler ImportsSatisfied;\r
-\r
-        public void OnImportsSatisfied()\r
-        {\r
-            if (this.ImportsSatisfied != null)\r
-            {\r
-                this.ImportsSatisfied(this, new EventArgs());\r
-            }\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class MyEventDrivenFullComposedNotifyImporter1 : MyEventDrivenNotifyImporter\r
-    {\r
-        [Import]\r
-        public MyEventDrivenFullComposedNotifyImporter2 FullyComposedImport { get; set; }\r
-\r
-        public bool AreAllImportsSet\r
-        {\r
-            get\r
-            {\r
-                return (this.ImportSomethingSoIGetImportCompletedCalled != null)\r
-                    && (this.FullyComposedImport != null);\r
-            }\r
-        }\r
-\r
-        public bool AreAllImportsFullyComposed\r
-        {\r
-            get\r
-            {\r
-                return this.AreAllImportsSet && this.FullyComposedImport.AreAllImportsSet;\r
-            }\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class MyEventDrivenFullComposedNotifyImporter2 : MyEventDrivenNotifyImporter\r
-    {\r
-        [Import]\r
-        public MyEventDrivenFullComposedNotifyImporter1 FullyComposedImport { get; set; }\r
-\r
-        public bool AreAllImportsSet\r
-        {\r
-            get\r
-            {\r
-                return (this.ImportSomethingSoIGetImportCompletedCalled != null)\r
-                    && (this.FullyComposedImport != null);\r
-            }\r
-        }\r
-\r
-        public bool AreAllImportsFullyComposed\r
-        {\r
-            get\r
-            {\r
-                return this.AreAllImportsSet && this.FullyComposedImport.AreAllImportsSet;\r
-            }\r
-        }\r
-    }\r
-\r
-    [Export("MyNotifyImportExporter")]\r
-    public class MyNotifyImportExporter : IPartImportsSatisfiedNotification\r
-    {\r
-        [Import]\r
-        public ICompositionService ImportSomethingSoIGetImportCompletedCalled { get; set; }\r
-\r
-        public int ImportCompletedCallCount { get; set; }\r
-        public void OnImportsSatisfied()\r
-        {\r
-            ImportCompletedCallCount++;\r
-        }\r
-    }\r
-\r
-    public class MyNotifyImportImporter : IPartImportsSatisfiedNotification\r
-    {\r
-        private CompositionContainer container;\r
-        public MyNotifyImportImporter(CompositionContainer container)\r
-        {\r
-            this.container = container;\r
-        }\r
-        [Import("MyNotifyImportExporter")]\r
-        public MyNotifyImportExporter MyNotifyImportExporter { get; set; }\r
-\r
-        public int ImportCompletedCallCount { get; set; }\r
-        public void OnImportsSatisfied()\r
-        {\r
-            ImportCompletedCallCount++;\r
-        }\r
-    }\r
-\r
-    [Export("LowerCaseString")]\r
-    public class LowerCaseString\r
-    {\r
-        public string String { get; private set; }\r
-        public LowerCaseString(string s)\r
-        {\r
-            String = s.ToLower();\r
-        }\r
-    }\r
-\r
-    public class UpperCaseStringComponent : IPartImportsSatisfiedNotification\r
-    {\r
-        public UpperCaseStringComponent()\r
-        {\r
-            UpperCaseStrings = new List<string>();\r
-        }\r
-        Collection<Lazy<LowerCaseString>> lowerCaseString = new Collection<Lazy<LowerCaseString>>();\r
-        \r
-        [ImportMany("LowerCaseString", AllowRecomposition = true)]\r
-        public Collection<Lazy<LowerCaseString>> LowerCaseStrings { \r
-            get { return lowerCaseString; }\r
-            set { lowerCaseString = value; }\r
-        }\r
-\r
-        public List<string> UpperCaseStrings { get; set; }\r
-\r
-        public int ImportCompletedCallCount { get; set; }\r
-\r
-        // This method gets called whenever a bind is completed and any of \r
-        // of the imports have changed, but ar safe to use now.\r
-        public void OnImportsSatisfied()\r
-        {\r
-            UpperCaseStrings.Clear();\r
-            foreach (var i in LowerCaseStrings)\r
-                UpperCaseStrings.Add(i.Value.String.ToUpper());\r
-\r
-            ImportCompletedCallCount++;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModelServicesTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/AttributedModelServicesTests.cs
deleted file mode 100644 (file)
index c7b7af5..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Diagnostics;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Extensibility;\r
-\r
-namespace System.ComponentModel.Composition.AttributedModel\r
-{\r
-    [TestClass]\r
-    public class AttributedModelServicesTests\r
-    {\r
-        [TestMethod]\r
-        public void CreatePartDefinition1_NullAsType_ShouldThrowArgumentNull()\r
-        {\r
-            var origin = ElementFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgumentNull("type", () =>\r
-            {\r
-                AttributedModelServices.CreatePartDefinition((Type)null, origin);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition2_NullAsType_ShouldThrowArgumentNull()\r
-        {\r
-            var origin = ElementFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgumentNull("type", () =>\r
-            {\r
-                AttributedModelServices.CreatePartDefinition((Type)null, origin, false);\r
-            });\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition2_TypeMarkedWithPartNotDiscoverableAttribute_ShouldTraceInformation()\r
-        {\r
-            var types = GetTypesMarkedWithPartNotDiscoverableAttribute();\r
-\r
-            foreach (Type type in types)\r
-            {\r
-                using (TraceContext context = new TraceContext(SourceLevels.Information))\r
-                {\r
-                    AttributedModelServices.CreatePartDefinition(type, null, true);\r
-\r
-                    Assert.IsNotNull(context.LastTraceEvent);\r
-                    Assert.AreEqual(context.LastTraceEvent.EventType, TraceEventType.Information);\r
-                    Assert.AreEqual(context.LastTraceEvent.Id, TraceId.Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition2_OpenGenericType_ShouldTraceInformation()\r
-        {\r
-            var types = GetOpenGenericTypes();\r
-\r
-            foreach (Type type in types)\r
-            {\r
-                using (TraceContext context = new TraceContext(SourceLevels.Information))\r
-                {\r
-                    AttributedModelServices.CreatePartDefinition(type, null, true);\r
-\r
-                    Assert.IsNotNull(context.LastTraceEvent);\r
-                    Assert.AreEqual(context.LastTraceEvent.EventType, TraceEventType.Information);\r
-                    Assert.AreEqual(context.LastTraceEvent.Id, TraceId.Discovery_DefinitionContainsGenericParameters);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition2_TypeWithNoExports_ShouldTraceInformation()\r
-        {\r
-            var types = GetTypesWithNoExports();\r
-\r
-            foreach (Type type in types)\r
-            {\r
-                using (TraceContext context = new TraceContext(SourceLevels.Information))\r
-                {\r
-                    var result = AttributedModelServices.CreatePartDefinition(type, null, true);\r
-\r
-                    Assert.IsNotNull(context.LastTraceEvent);\r
-                    Assert.AreEqual(context.LastTraceEvent.EventType, TraceEventType.Information);\r
-                    Assert.AreEqual(context.LastTraceEvent.Id, TraceId.Discovery_DefinitionContainsNoExports);\r
-                }\r
-            }\r
-        }\r
-\r
-        private static IEnumerable<Type> GetTypesMarkedWithPartNotDiscoverableAttribute()\r
-        {\r
-            yield return typeof(ClassMarkedWithPartNotDiscoverableAttribute);\r
-            yield return typeof(ClassMarkedWithPartNotDiscoverableAttribute<>);\r
-        }\r
-\r
-        private static IEnumerable<Type> GetOpenGenericTypes()\r
-        {\r
-            yield return typeof(OpenGenericType<>);\r
-        }\r
-\r
-        private static IEnumerable<Type> GetTypesWithNoExports()\r
-        {\r
-            yield return typeof(ClassWithNoExports);\r
-            yield return typeof(ClassWithOnlyFieldImport);\r
-            yield return typeof(ClassWithOnlyPropertyImport);\r
-            yield return typeof(ClassWithOnlyParameterImport);\r
-        }\r
-\r
-        public class ClassWithNoExports\r
-        {\r
-        }\r
-\r
-        public class ClassWithOnlyFieldImport\r
-        {\r
-            [Import]\r
-            public string Field;\r
-        }\r
-\r
-        public class ClassWithOnlyPropertyImport\r
-        {\r
-            [Import]\r
-            public string Property\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        public class ClassWithOnlyParameterImport\r
-        {\r
-            [ImportingConstructor]\r
-            public ClassWithOnlyParameterImport(string parameter)\r
-            {\r
-            }\r
-        }\r
-\r
-        public class OpenGenericType<T>\r
-        {\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ClassMarkedWithPartNotDiscoverableAttribute\r
-        {\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ClassMarkedWithPartNotDiscoverableAttribute<T>\r
-        {\r
-        }\r
-#endif\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CardinalityMismatchExceptionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CardinalityMismatchExceptionTests.cs
deleted file mode 100644 (file)
index 39a8a58..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-#if !SILVERLIGHT\r
-using System.Runtime.Serialization;\r
-#endif\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CardinalityMismatchExceptionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ImportCardinalityMismatchException();\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ImportCardinalityMismatchException((string)null);\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ImportCardinalityMismatchException((string)null, new Exception());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ImportCardinalityMismatchException(e);\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ImportCardinalityMismatchException(e, new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ImportCardinalityMismatchException();\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ImportCardinalityMismatchException("Message");\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ImportCardinalityMismatchException("Message", (Exception)null);\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ImportCardinalityMismatchException("Message", e);\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsInfoArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var context = new StreamingContext();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("info", () =>\r
-            {\r
-                SerializationTestServices.Create<ImportCardinalityMismatchException>((SerializationInfo)null, context);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InnerException_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptionsWithNull();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateCardinalityMismatchException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                ExtendedAssert.IsInstanceOfSameType(exception.InnerException, result.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Message_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateCardinalityMismatchException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                Assert.AreEqual(exception.Message, result.Message);\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        private static ImportCardinalityMismatchException CreateCardinalityMismatchException()\r
-        {\r
-            return CreateCardinalityMismatchException((string)null, (Exception)null);\r
-        }\r
-\r
-        private static ImportCardinalityMismatchException CreateCardinalityMismatchException(string message)\r
-        {\r
-            return CreateCardinalityMismatchException(message, (Exception)null);\r
-        }\r
-\r
-        private static ImportCardinalityMismatchException CreateCardinalityMismatchException(Exception innerException)\r
-        {\r
-            return CreateCardinalityMismatchException((string)null, innerException);\r
-        }\r
-\r
-        private static ImportCardinalityMismatchException CreateCardinalityMismatchException(string message, Exception innerException)\r
-        {\r
-            return new ImportCardinalityMismatchException(message, innerException);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComponentModelTestTypes.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComponentModelTestTypes.cs
deleted file mode 100644 (file)
index acef102..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public class CallbackExecuteCodeDuringCompose\r
-    {\r
-        public CallbackExecuteCodeDuringCompose(Action callback)\r
-        {\r
-            this.callback = callback;\r
-        }\r
-\r
-        [Export("MyOwnCallbackContract")]\r
-        public string ExportValue\r
-        {\r
-            get\r
-            {\r
-                callback();\r
-                return string.Empty;\r
-            }\r
-        }\r
-\r
-        [Import("MyOwnCallbackContract")]\r
-        public string ImportValue { get; set; }\r
-        private Action callback;\r
-    }\r
-\r
-    public class CallbackImportNotify : IPartImportsSatisfiedNotification\r
-    {\r
-        private Action callback;\r
-        public CallbackImportNotify(Action callback)\r
-        {\r
-            this.callback = callback;\r
-        }\r
-\r
-        [Import(AllowDefault=true)]\r
-        public ICompositionService ImportSomethingSoIGetImportCompletedCalled { get; set; }\r
-\r
-        public void OnImportsSatisfied()\r
-        {\r
-            this.callback();\r
-        }\r
-    }\r
-\r
-    public class ExportValueTypeFactory\r
-    {\r
-        [Export("{AssemblyCatalogResolver}FactoryValueType")]\r
-        public int Value\r
-        {\r
-            get\r
-            {\r
-                return 18;\r
-            }\r
-        }\r
-    }\r
-\r
-\r
-    public class ExportValueTypeSingleton\r
-    {\r
-        [Export("{AssemblyCatalogResolver}SingletonValueType")]\r
-        public int Value\r
-        {\r
-            get\r
-            {\r
-                return 17;\r
-            }\r
-        }\r
-    }\r
-\r
-\r
-    public class Int32CollectionImporter\r
-    {\r
-\r
-        public Int32CollectionImporter()\r
-        {\r
-            Values = new Collection<int>();\r
-        }\r
-\r
-        [ImportMany("Value")]\r
-        public Collection<int> Values { get; private set; }\r
-    }\r
-\r
-    [PartNotDiscoverable]\r
-    public class Int32Exporter\r
-    {\r
-\r
-        public Int32Exporter(int value) \r
-        {\r
-            Value = value;\r
-        }\r
-\r
-        [Export("Value")]\r
-        public int Value { get; set; }\r
-\r
-    }\r
-\r
-    [PartNotDiscoverable]\r
-    public class Int32ExporterInternal\r
-    {\r
-\r
-        public Int32ExporterInternal(int value) \r
-        {\r
-            Value = value;\r
-        }\r
-\r
-        [Export("Value")]\r
-        public int Value { get; set; }\r
-\r
-    }\r
-\r
-    public class Int32Importer\r
-    {\r
-\r
-        public Int32Importer()\r
-        {\r
-        }\r
-\r
-        [Import("Value", AllowRecomposition = true)]\r
-        public int Value { get; set; }\r
-    }\r
-\r
-    public class Int32ImporterInternal\r
-    {\r
-\r
-        public Int32ImporterInternal()\r
-        {\r
-        }\r
-\r
-        [Import("Value")]\r
-        public int Value { get; set; }\r
-    }\r
-\r
-\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComponentServicesTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComponentServicesTests.cs
deleted file mode 100644 (file)
index 5017463..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ComponentServicesTests\r
-    {\r
-        [TestMethod]\r
-        public void GetValuesByType()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-\r
-            var container = new CompositionContainer(cat);\r
-\r
-            string itestName = AttributedModelServices.GetContractName(typeof(ITest));\r
-\r
-            var e1 = container.GetExportedValues<ITest>();\r
-            var e2 = container.GetExports<ITest, object>(itestName);\r
-\r
-            Assert.IsInstanceOfType(e1.First(), typeof(T1), "First should be T1");\r
-            Assert.IsInstanceOfType(e1.Skip(1).First(), typeof(T2), "Second should be T2");\r
-\r
-            Assert.IsInstanceOfType(e2.First().Value, typeof(T1), "First should be T1");\r
-            Assert.IsInstanceOfType(e2.Skip(1).First().Value, typeof(T2), "Second should be T2");\r
-\r
-            CompositionContainer childContainer = new CompositionContainer(container);\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new T1());\r
-            container.Compose(batch);\r
-            var t1 = childContainer.GetExportedValue<ITest>();\r
-            var t2 = childContainer.GetExport<ITest, object>(itestName);\r
-\r
-            Assert.IsInstanceOfType(t1, typeof(T1), "First (resolved) should be T1");\r
-            Assert.IsInstanceOfType(t2.Value, typeof(T1), "First (resolved) should be T1");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetValueTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            ITest t = new T1();\r
-            string name = AttributedModelServices.GetContractName(typeof(ITest));\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue(name, t);\r
-            container.Compose(batch);\r
-            ITest value = container.GetExportedValue<ITest>();\r
-            Assert.AreEqual(t, value, "TryGetExportedValue should return t (by type)");\r
-            value = container.GetExportedValue<ITest>(name);\r
-            Assert.AreEqual(t, value, "TryGetExportedValue should return t (given name)");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetValuesTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            ITest t = new T1();\r
-            string name = AttributedModelServices.GetContractName(typeof(ITest));\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue(name, t);\r
-            container.Compose(batch);\r
-            IEnumerable<ITest> values = container.GetExportedValues<ITest>();\r
-            Assert.AreEqual(t, values.First(), "TryGetExportedValues should return t (by type)");\r
-            values = container.GetExportedValues<ITest>(name);\r
-            Assert.AreEqual(t, values.First(), "TryGetExportedValues should return t (by name)");\r
-        }\r
-\r
-\r
-\r
-        [TestMethod]\r
-        public void NoResolverExceptionTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new MultiExport());\r
-            batch.AddPart(new SingleImport());\r
-\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PartCannotSetImport, ErrorId.ImportEngine_ImportCardinalityMismatch, RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-    }\r
-\r
-    public class MultiExport\r
-    {\r
-        [Export("Multi")]\r
-        [ExportMetadata("Value", "One")]\r
-        public int M1 { get { return 1; } }\r
-\r
-        [Export("Multi")]\r
-        [ExportMetadata("Value", "Two")]\r
-        public int M2 { get { return 2; } }\r
-\r
-        [Export("Multi")]\r
-        [ExportMetadata("Value", "Three")]\r
-        public int M3 { get { return 3; } }\r
-    }\r
-\r
-    public interface ITest\r
-    {\r
-        void Do();\r
-    }\r
-\r
-    [Export(typeof(ITest))]\r
-    public class T1 : ITest\r
-    {\r
-        public void Do() { }\r
-    }\r
-\r
-    [Export(typeof(ITest))]\r
-    public class T2 : ITest\r
-    {\r
-        public void Do() { }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartCatalogExtensions.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartCatalogExtensions.cs
deleted file mode 100644 (file)
index 019f9e0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.IO;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class ComposablePartCatalogExtensions\r
-    {\r
-        public static IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(this ComposablePartCatalog catalog, Expression<Func<ExportDefinition, bool>> constraint)\r
-        {\r
-            var import = ImportDefinitionFactory.Create(constraint);\r
-            return catalog.GetExports(import);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartDefinitionTests.cs
deleted file mode 100644 (file)
index cdf484e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ComposablePartDefinitionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldNotThrow()\r
-        {\r
-            PartDefinitionFactory.Create();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var definition = PartDefinitionFactory.Create();\r
-\r
-            EnumerableAssert.IsEmpty(definition.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var definition = PartDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                definition.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartExceptionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartExceptionTests.cs
deleted file mode 100644 (file)
index f56a866..0000000
+++ /dev/null
@@ -1,690 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-#if !SILVERLIGHT\r
-using System.Runtime.Serialization;\r
-#endif\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionPartExceptionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException();\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException((string)null);\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException((string)null, ElementFactory.Create());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException((string)null, new Exception());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException((string)null, ElementFactory.Create(), new Exception());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor6_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, (string)null);\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor7_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, (string)null, new Exception());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor8_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, (string)null, ElementFactory.Create());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor9_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, (string)null, ElementFactory.Create(), new Exception());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(e);\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(e, ElementFactory.Create());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(e, new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(e, ElementFactory.Create(), new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor6_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, e);\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor7_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, e, new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor8_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, e, ElementFactory.Create());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor9_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, e, ElementFactory.Create(), new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException();\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message");\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message", ElementFactory.Create());\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message", (Exception)null);\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message", ElementFactory.Create(), (Exception)null);\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor6_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message");\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor7_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", (Exception)null);\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor8_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", ElementFactory.Create());\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor9_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", ElementFactory.Create(), (Exception)null);\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException("Message", e);\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException("Message", ElementFactory.Create(), e);\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor7_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", e);\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor9_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", ElementFactory.Create(), e);\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var exception = (ICompositionError)new ComposablePartException();\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, exception.Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var exception = (ICompositionError)new ComposablePartException("Message");\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, exception.Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var exception = (ICompositionError)new ComposablePartException("Message", ElementFactory.Create());\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, exception.Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var exception = (ICompositionError)new ComposablePartException("Message", new Exception());\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, exception.Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var exception = (ICompositionError)new ComposablePartException("Message", ElementFactory.Create(), new Exception());\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, exception.Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor6_ValueAsIdArgument_ShouldSetICompositionErrorIdProperty()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = (ICompositionError)new ComposablePartException(e, "Message");\r
-\r
-                Assert.AreEqual(e, exception.Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor7_ValueAsIdArgument_ShouldSetICompositionErrorIdProperty()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = (ICompositionError)new ComposablePartException(e, "Message", new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor8_ValueAsIdArgument_ShouldSetICompositionErrorIdProperty()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = (ICompositionError)new ComposablePartException(e, "Message", ElementFactory.Create());\r
-\r
-                Assert.AreEqual(e, exception.Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor9_ValueAsIdArgument_ShouldSetICompositionErrorIdProperty()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = (ICompositionError)new ComposablePartException(e, "Message", ElementFactory.Create(), new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException();\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message");\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsElementArgument_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message", (ICompositionElement)null);\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message", new Exception());\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsElementArgument_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException("Message", (ICompositionElement)null, new Exception());\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor6_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message");\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor7_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", new Exception());\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor8_NullAsElementArgument_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", (ICompositionElement)null);\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor9_NullAsElementArgument_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", (ICompositionElement)null, new Exception());\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsElementArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException("Message", (ICompositionElement)e);\r
-\r
-                Assert.AreSame(e, exception.Element);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsElementArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException("Message", (ICompositionElement)e, new Exception());\r
-\r
-                Assert.AreSame(e, exception.Element);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor8_ValueAsElementArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", (ICompositionElement)e);\r
-\r
-                Assert.AreSame(e, exception.Element);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor9_ValueAsElementArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new ComposablePartException(CompositionErrorId.Unknown, "Message", (ICompositionElement)e, new Exception());\r
-\r
-                Assert.AreSame(e, exception.Element);\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void Constructor10_NullAsInfoArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var context = new StreamingContext();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("info", () =>\r
-            {\r
-                SerializationTestServices.Create<ComposablePartException>((SerializationInfo)null, context);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor10_SerializationInfoWithMissingIdEntryAsInfoArgument_ShouldThrowSerialization()\r
-        {\r
-            var info = SerializationTestServices.CreateSerializationInfoRemovingMember<ComposablePartException>("Id");\r
-            var context = new StreamingContext();\r
-            \r
-            ExceptionAssert.ThrowsSerialization("Id", () =>\r
-            {\r
-                SerializationTestServices.Create<ComposablePartException>(info, context);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor10_SerializationInfoWithMissingElementEntryAsInfoArgument_ShouldThrowSerialization()\r
-        {\r
-            var info = SerializationTestServices.CreateSerializationInfoRemovingMember<ComposablePartException>("Element");\r
-            var context = new StreamingContext();\r
-\r
-            ExceptionAssert.ThrowsSerialization("Element", () =>\r
-            {\r
-                SerializationTestServices.Create<ComposablePartException>(info, context);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor10_SerializationInfoWithWrongTypeForIdEntryAsInfoArgument_ShouldThrowInvalidCast()\r
-        {\r
-            var info = SerializationTestServices.CreateSerializationInfoReplacingMember<ComposablePartException>("Id", "InvalidValue");\r
-            var context = new StreamingContext();\r
-\r
-            ExceptionAssert.Throws<InvalidCastException>(() =>\r
-            {\r
-                SerializationTestServices.Create<ComposablePartException>(info, context);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor10_SerializationInfoWithWrongTypeForElementEntryAsInfoArgument_ShouldThrowInvalidCast()\r
-        {\r
-            var info = SerializationTestServices.CreateSerializationInfoReplacingMember<ComposablePartException>("Element", 10);\r
-            var context = new StreamingContext();\r
-\r
-            ExceptionAssert.Throws<InvalidCastException>(() =>\r
-            {\r
-                SerializationTestServices.Create<ComposablePartException>(info, context);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Id_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = (ICompositionError)CreateComposablePartException(e);\r
-\r
-                var result = (ICompositionError)SerializationTestServices.RoundTrip(exception);\r
-\r
-                Assert.AreEqual(exception.Id, result.Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Element_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetCompositionElementsWithNull();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateComposablePartException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                ElementAssert.AreEqual(exception.Element, result.Element);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InnerException_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateComposablePartException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                ExtendedAssert.IsInstanceOfSameType(exception.InnerException, result.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Message_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateComposablePartException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                Assert.AreEqual(exception.Message, result.Message);\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        private static ComposablePartException CreateComposablePartException()\r
-        {\r
-            return CreateComposablePartException(CompositionErrorId.Unknown, (string)null, (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        private static ComposablePartException CreateComposablePartException(string message)\r
-        {\r
-            return CreateComposablePartException(CompositionErrorId.Unknown, message, (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        private static ComposablePartException CreateComposablePartException(CompositionErrorId id)\r
-        {\r
-            return CreateComposablePartException(CompositionErrorId.Unknown, (string)null, (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        private static ComposablePartException CreateComposablePartException(ICompositionElement element)\r
-        {\r
-            return CreateComposablePartException(CompositionErrorId.Unknown, (string)null, element, (Exception)null);\r
-        }\r
-\r
-        private static ComposablePartException CreateComposablePartException(Exception innerException)\r
-        {\r
-            return CreateComposablePartException(CompositionErrorId.Unknown, (string)null, (ICompositionElement)null, innerException);\r
-        }\r
-\r
-        private static ComposablePartException CreateComposablePartException(CompositionErrorId id, string message, ICompositionElement element, Exception innerException)\r
-        {\r
-            return new ComposablePartException(id, message, element, innerException);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartExtensibilityTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartExtensibilityTests.cs
deleted file mode 100644 (file)
index a195042..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ComposablePartExtensibilityTests\r
-    {\r
-        [TestMethod]\r
-        public void PhaseTest()\r
-        {\r
-            CompositionContainer container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = new OrderingTestComposablePart();\r
-            part.AddImport("Import1", ImportCardinality.ExactlyOne, true, false);\r
-            part.AddExport("Export1", 1);\r
-            part.CallOrder.Enqueue("Import:Import1");\r
-            part.CallOrder.Enqueue("OnComposed");\r
-\r
-            batch.AddExportedValue("Import1", 20);\r
-            batch.AddPart(part);\r
-            container.Compose(batch);\r
-\r
-            // Export shouldn't be called until it is pulled on by someone.\r
-            var export = container.GetExport<object>("Export1");\r
-\r
-            part.CallOrder.Enqueue("Export:Export1");\r
-            Assert.AreEqual(1, export.Value);\r
-\r
-            Assert.IsTrue(part.CallOrder.Count == 0);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportTest()\r
-        {\r
-            var exporter = new TestExportBinder();\r
-            var importer = new TestImportBinder();\r
-\r
-            CompositionContainer container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            ExportsAssert.AreEqual(importer.SetImports["single"], 42);\r
-            ExportsAssert.AreEqual(importer.SetImports["multi"], 1, 2, 3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ConstructorInjectionSimpleCase()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ConstructorInjectionComposablePart(typeof(Foo)));\r
-            batch.AddExportedValue<IBar>(new Bar("Bar Value"));\r
-            container.Compose(batch);\r
-\r
-            var import = container.GetExport<Foo>();\r
-            var foo = import.Value;\r
-\r
-            Assert.AreEqual("Bar Value", foo.Bar.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ConstructorInjectionCycle()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new ConstructorInjectionComposablePart(typeof(AClass)));\r
-            batch.AddPart(new ConstructorInjectionComposablePart(typeof(BClass)));\r
-\r
-            CompositionAssert.ThrowsErrors(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                           ErrorId.ImportEngine_PartCannotSetImport, RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-    }\r
-\r
-    internal class OrderingTestComposablePart : ConcreteComposablePart\r
-    {\r
-        public Queue<string> CallOrder = new Queue<string>();\r
-\r
-        public OrderingTestComposablePart()\r
-        {\r
-        }\r
-\r
-        public new  void AddExport(string contractName, object value)\r
-        {\r
-            var export = ExportFactory.Create(contractName, () =>\r
-            {\r
-                this.OnGetExport(contractName); return value;\r
-            });\r
-\r
-            base.AddExport(export);\r
-        }\r
-\r
-        private void OnGetExport(string contractName)\r
-        {\r
-            Assert.AreEqual("Export:" + contractName, CallOrder.Dequeue());\r
-        }\r
-\r
-        public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-        {\r
-            ContractBasedImportDefinition contractBasedImportDefinition = (ContractBasedImportDefinition)definition;\r
-            Assert.AreEqual("Import:" + contractBasedImportDefinition.ContractName, CallOrder.Dequeue());\r
-            base.SetImport(definition, exports);\r
-        }\r
-\r
-        public override void Activate()\r
-        {\r
-            Assert.AreEqual("OnComposed", CallOrder.Dequeue());\r
-            base.Activate();\r
-        }\r
-    }\r
-\r
-    internal class TestExportBinder : ConcreteComposablePart\r
-    {\r
-        public TestExportBinder()\r
-        {\r
-            AddExport("single", 42);\r
-            AddExport("multi", 1);\r
-            AddExport("multi", 2);\r
-            AddExport("multi", 3);\r
-        }\r
-    }\r
-\r
-    internal class TestImportBinder : ConcreteComposablePart\r
-    {\r
-        public TestImportBinder()\r
-        {\r
-            AddImport("single", ImportCardinality.ExactlyOne, true, false);\r
-            AddImport("multi", ImportCardinality.ZeroOrMore, true, false);\r
-        }\r
-    }\r
-\r
-    public class Foo\r
-    {\r
-        public Foo(IBar bar)\r
-        {\r
-            Bar = bar;\r
-        }\r
-\r
-        public IBar Bar { get; private set; }\r
-    }\r
-\r
-    public interface IBar\r
-    {\r
-        string Value { get; }\r
-    }\r
-\r
-    public class Bar : IBar\r
-    {\r
-        public Bar(string value)\r
-        {\r
-            Value = value;\r
-        }\r
-        public string Value { get; private set; }\r
-    }\r
-\r
-    public class FooBar\r
-    {\r
-        [Import("Foo")]\r
-        public Foo Foo { get; set; }\r
-    }\r
-\r
-    public class AClass\r
-    {\r
-        public AClass(BClass b)\r
-        {\r
-        }\r
-\r
-        public BClass B { get; private set; }\r
-    }\r
-\r
-    public class BClass\r
-    {\r
-        public BClass(AClass a)\r
-        {\r
-            this.A = a;\r
-        }\r
-\r
-        public AClass A { get; private set; }\r
-    }\r
-\r
-    internal class ConstructorInjectionComposablePart : ConcreteComposablePart\r
-    {\r
-        private Type _type;\r
-        private ConstructorInfo _constructor;\r
-        private Dictionary<ImportDefinition, object> _imports;\r
-        private bool currentlyExecuting = false;\r
-\r
-        public ConstructorInjectionComposablePart(Type type)\r
-        {\r
-            this._type = type;\r
-\r
-            // Note that this just blindly takes the first constructor...\r
-            this._constructor = this._type.GetConstructors().FirstOrDefault();\r
-            Assert.IsNotNull(this._constructor);\r
-\r
-            foreach (var param in this._constructor.GetParameters())\r
-            {\r
-                string name = AttributedModelServices.GetContractName(param.ParameterType);\r
-                AddImport(name, ImportCardinality.ExactlyOne, true, true);\r
-            }\r
-\r
-            string contractName = AttributedModelServices.GetContractName(type);\r
-            string typeIdentity = AttributedModelServices.GetTypeIdentity(type);\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, typeIdentity);\r
-            \r
-            Export composableExport = ExportFactory.Create(\r
-                contractName,\r
-                metadata,\r
-                GetInstance);\r
-            this.AddExport(composableExport);\r
-\r
-            this._imports = new Dictionary<ImportDefinition, object>();\r
-        }\r
-\r
-        private object GetInstance()\r
-        {\r
-            var result = CompositionResult.SucceededResult;\r
-\r
-            // We only need this guard if we are pulling on the lazy exports during this call\r
-            // but if we do the pulling in SetImport it isn't needed.\r
-            //if (currentlyExecuting)\r
-            //{\r
-            //    var issue = CompositionError.Create("CM:CreationCycleDetected",\r
-            //        "This failed because there is a creation cycle");\r
-            //    return result.MergeIssue(issue).ToResult<object>(null);\r
-            //}\r
-\r
-            try\r
-            {\r
-                currentlyExecuting = true;\r
-\r
-                List<object> constructorArgs = new List<object>();\r
-\r
-                foreach (ImportDefinition import in this.ImportDefinitions\r
-                    .Where(i => i.IsPrerequisite))\r
-                {\r
-                    object importValue;\r
-                    if (!this._imports.TryGetValue(import, out importValue))\r
-                    {\r
-                        result = result.MergeError(CompositionError.Create(CompositionErrorId.ImportNotSetOnPart,\r
-                            "The import '{0}' is required for construction of '{1}'", import.ToString(), _type.FullName));\r
-\r
-                        continue;\r
-                    }\r
-\r
-                    constructorArgs.Add(importValue);\r
-                }\r
-\r
-                if (!result.Succeeded)\r
-                {\r
-                    throw new CompositionException(result.Errors);\r
-                }\r
-\r
-                object obj = this._constructor.Invoke(constructorArgs.ToArray());\r
-\r
-                return obj;\r
-            }\r
-            finally\r
-            {\r
-                currentlyExecuting = false;\r
-            }\r
-        }\r
-\r
-        public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-        {\r
-            _imports[definition] = exports.First().Value;\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ComposablePartTests.cs
deleted file mode 100644 (file)
index bab987d..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ComposablePartTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var part = PartFactory.Create();\r
-\r
-            EnumerableAssert.IsEmpty(part.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var part = PartFactory.Create();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                part.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void OnComposed_DoesNotThrow()\r
-        {\r
-            var part = PartFactory.Create();\r
-            part.Activate();\r
-        }\r
-\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerCollectionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerCollectionTests.cs
deleted file mode 100644 (file)
index 1f4b023..0000000
+++ /dev/null
@@ -1,929 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionContainerCollectionTests\r
-    {\r
-        public class SupportedImportCollectionAssignments<T>\r
-        {\r
-            // Fields\r
-            [ImportMany("Value")]\r
-            public IEnumerable<T> IEnumerableOfTField;\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<object> IEnumerableOfObjectField;\r
-\r
-            [ImportMany("Value")]\r
-            public T[] ArrayOfTField;\r
-\r
-            [ImportMany("Value")]\r
-            public object[] ArrayOfObjectField;\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<T> IEnumerableOfTProperty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<object> IEnumerableOfObjectProperty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public T[] ArrayOfTProperty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public object[] ArrayOfObjectProperty { get; set; }\r
-            \r
-            public void VerifyImports(params T[] expectedValues)\r
-            {\r
-                // Fields\r
-                EnumerableAssert.AreEqual(IEnumerableOfTField, expectedValues);\r
-                EnumerableAssert.AreEqual(IEnumerableOfObjectField, expectedValues.Cast<object>());\r
-                EnumerableAssert.AreEqual(ArrayOfTField, expectedValues);\r
-                EnumerableAssert.AreEqual(ArrayOfObjectField, expectedValues.Cast<object>());\r
-\r
-                // Properties\r
-                EnumerableAssert.AreEqual(IEnumerableOfTProperty, expectedValues);\r
-                EnumerableAssert.AreEqual(IEnumerableOfObjectProperty, expectedValues.Cast<object>());\r
-                EnumerableAssert.AreEqual(ArrayOfTProperty, expectedValues);\r
-                EnumerableAssert.AreEqual(ArrayOfObjectProperty, expectedValues.Cast<object>());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ValidateSupportedImportCollectionAssignments()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-\r
-            var importer = new SupportedImportCollectionAssignments<int>();\r
-\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("Value", 21);\r
-            batch.AddExportedValue("Value", 32);\r
-            batch.AddExportedValue("Value", 43);\r
-\r
-            container.Compose(batch);\r
-\r
-            importer.VerifyImports(21, 32, 43);\r
-        }\r
-\r
-        public class SupportedImportCollectionMutation<T>\r
-        {\r
-            public SupportedImportCollectionMutation()\r
-            {\r
-                ICollectionOfTReadOnlyField = new List<T>();\r
-                ListOfTReadOnlyField = new List<T>();\r
-                CollectionOfTField = new Collection<T>();\r
-                CollectionOfTReadOnlyField = new Collection<T>();\r
-\r
-                _iCollectionOfTReadOnlyProperty = new List<T>();\r
-                _listOfTReadOnlyProperty = new List<T>();\r
-                CollectionOfTProperty = new Collection<T>();\r
-                _collectionOfTReadOnlyProperty = new Collection<T>();\r
-\r
-#if !SILVERLIGHT\r
-                ObservableCollectionOfTReadOnlyField = new ObservableCollection<T>();\r
-                _observableCollectionOfTReadOnlyProperty = new ObservableCollection<T>();\r
-#endif // !SILVERLIGHT\r
-            }\r
-\r
-            [ImportMany("Value")]\r
-            public readonly ICollection<T> ICollectionOfTReadOnlyField;\r
-\r
-            [ImportMany("Value")]\r
-            public List<T> ListOfTField;\r
-\r
-            [ImportMany("Value")]\r
-            public readonly List<T> ListOfTReadOnlyField;\r
-\r
-            [ImportMany("Value")]\r
-            public Collection<T> CollectionOfTField;\r
-            \r
-            [ImportMany("Value")]\r
-            public Collection<object> CollectionOfObjectField;\r
-\r
-            [ImportMany("Value")]\r
-            public readonly Collection<T> CollectionOfTReadOnlyField;\r
-\r
-            [ImportMany("Value")]\r
-            public ICollection<T> ICollectionOfTReadOnlyProperty { get { return _iCollectionOfTReadOnlyProperty; } }\r
-            private ICollection<T> _iCollectionOfTReadOnlyProperty;\r
-\r
-            [ImportMany("Value")]\r
-            public List<T> ListOfTProperty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public List<T> ListOfTReadOnlyProperty { get { return _listOfTReadOnlyProperty; } }\r
-            private readonly List<T> _listOfTReadOnlyProperty;\r
-\r
-            [ImportMany("Value")]\r
-            public Collection<T> CollectionOfTProperty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public Collection<T> CollectionOfTReadOnlyProperty { get { return _collectionOfTReadOnlyProperty; } }\r
-            private readonly Collection<T> _collectionOfTReadOnlyProperty;\r
-\r
-#if !SILVERLIGHT\r
-            [ImportMany("Value")]\r
-            public ObservableCollection<T> ObservableCollectionOfTField;\r
-\r
-            [ImportMany("Value")]\r
-            public readonly ObservableCollection<T> ObservableCollectionOfTReadOnlyField;\r
-\r
-            [ImportMany("Value")]\r
-            public ObservableCollection<T> ObservableCollectionOfTProperty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public ObservableCollection<T> ObservableCollectionOfTReadOnlyProperty { get { return _observableCollectionOfTReadOnlyProperty; } }\r
-            private readonly ObservableCollection<T> _observableCollectionOfTReadOnlyProperty;\r
-#endif // !SILVERLIGHT\r
-\r
-            public void VerifyImports(params T[] expectedValues)\r
-            {\r
-                EnumerableAssert.AreEqual(ICollectionOfTReadOnlyField, expectedValues);\r
-                EnumerableAssert.AreEqual(ListOfTField, expectedValues);\r
-                EnumerableAssert.AreEqual(ListOfTReadOnlyField, expectedValues);\r
-                EnumerableAssert.AreEqual(CollectionOfTField, expectedValues);\r
-                EnumerableAssert.AreEqual(CollectionOfTReadOnlyField, expectedValues);\r
-\r
-                EnumerableAssert.AreEqual(ICollectionOfTReadOnlyProperty, expectedValues);\r
-                EnumerableAssert.AreEqual(ListOfTProperty, expectedValues);\r
-                EnumerableAssert.AreEqual(ListOfTReadOnlyProperty, expectedValues);\r
-                EnumerableAssert.AreEqual(CollectionOfTProperty, expectedValues);\r
-                EnumerableAssert.AreEqual(CollectionOfTReadOnlyProperty, expectedValues);\r
-                \r
-#if !SILVERLIGHT\r
-                EnumerableAssert.AreEqual(ObservableCollectionOfTField, expectedValues);\r
-                EnumerableAssert.AreEqual(ObservableCollectionOfTReadOnlyField, expectedValues);\r
-                EnumerableAssert.AreEqual(ObservableCollectionOfTProperty, expectedValues);\r
-                EnumerableAssert.AreEqual(ObservableCollectionOfTReadOnlyProperty, expectedValues);\r
-#endif // !SILVERLIGHT\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ValidateSupportedImportCollectionMutation()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-\r
-            var importer = new SupportedImportCollectionMutation<int>();\r
-\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("Value", 21);\r
-            batch.AddExportedValue("Value", 32);\r
-            batch.AddExportedValue("Value", 43);\r
-\r
-            container.Compose(batch);\r
-\r
-            importer.VerifyImports(21, 32, 43);\r
-        }\r
-\r
-        public class ImportCollectionNullValue\r
-        {\r
-            [ImportMany("Value")]\r
-            public List<int> NullValue { get; set; }\r
-        }\r
-\r
-        public class NamelessImporter\r
-        {\r
-            [ImportMany]\r
-            public int[] ReadWriteIList { get; set; }\r
-\r
-            [ImportMany]\r
-            public Collection<Lazy<int>> ReadWriteMetadata { get; set; }\r
-        }\r
-\r
-        public class NamelessExporter\r
-        {\r
-            public NamelessExporter(int value)\r
-            {\r
-                Value = value;\r
-            }\r
-\r
-            [Export]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionsNameless()\r
-        {\r
-            // Verifing that the contract name gets the correct value\r
-            var container = ContainerFactory.Create();\r
-            NamelessImporter importer = new NamelessImporter();\r
-            NamelessExporter exporter42 = new NamelessExporter(42);\r
-            NamelessExporter exporter0 = new NamelessExporter(0);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer, exporter42, exporter0);\r
-            container.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(importer.ReadWriteIList, 42, 0);\r
-        }\r
-\r
-        public class InvalidImporterReadOnlyEnumerable\r
-        {\r
-            IEnumerable<int> readOnlyEnumerable = new List<int>();\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<int> ReadOnlyEnumerable\r
-            {\r
-                get\r
-                {\r
-                    return readOnlyEnumerable;\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionsExceptionReadOnlyEnumerable()\r
-        {\r
-            ExpectedErrorOnPartActivate(new InvalidImporterReadOnlyEnumerable(),\r
-                ErrorId.ReflectionModel_ImportCollectionNotWritable);  \r
-        }\r
-\r
-        public class ImporterWriteOnlyExportCollection\r
-        {\r
-            [ImportMany("Value")]\r
-            public Collection<Lazy<int>> WriteOnlyExportCollection\r
-            {\r
-                set { PublicExportCollection = value; }\r
-            }\r
-\r
-            public Collection<Lazy<int>> PublicExportCollection { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_WriteOnlyExportCollection()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-\r
-            var importer = new ImporterWriteOnlyExportCollection();\r
-\r
-            List<int> values = new List<int>() { 21, 32, 43 };\r
-\r
-            batch.AddPart(importer);\r
-            values.ForEach(v => batch.AddExportedValue("Value", v));\r
-\r
-            container.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(values, importer.PublicExportCollection.Select(export => export.Value));            \r
-        }\r
-\r
-        public class ImporterWriteOnlyIEnumerableOfT\r
-        {\r
-            [ImportMany("Value")]\r
-            public IEnumerable<int> WriteOnlyIEnumerable\r
-            {\r
-                set { PublicIEnumerable = value; }\r
-            }\r
-\r
-            public IEnumerable<int> PublicIEnumerable { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_WriteOnlyIEnumerableOfT()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-\r
-            var importer = new ImporterWriteOnlyIEnumerableOfT();\r
-\r
-            List<int> values = new List<int>() { 21, 32, 43 };\r
-\r
-            batch.AddPart(importer);\r
-            values.ForEach(v => batch.AddExportedValue("Value", v));\r
-\r
-            container.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(values, importer.PublicIEnumerable);\r
-        }\r
-\r
-        public class ImporterWriteOnlyArray\r
-        {\r
-            [ImportMany("Value")]\r
-            public int[] WriteOnlyArray\r
-            {\r
-                set { PublicArray = value; }\r
-            }\r
-\r
-            public int[] PublicArray { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_WriteOnlyArray()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-\r
-            var importer = new ImporterWriteOnlyArray();\r
-\r
-            List<int> values = new List<int>() { 21, 32, 43 };\r
-\r
-            batch.AddPart(importer);\r
-            values.ForEach(v => batch.AddExportedValue("Value", v));\r
-\r
-            container.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(values, importer.PublicArray);\r
-        }\r
-\r
-        public class InvalidImporterNonCollection\r
-        {\r
-            [Import("Value")]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionsExceptionNonCollection()\r
-        {\r
-            ExpectedChangeRejectedErrorOnSetImport(new InvalidImporterNonCollection(),\r
-                ErrorId.ImportEngine_ImportCardinalityMismatch);\r
-        }\r
-\r
-        public class InvalidImporterNonAssignableCollection\r
-        {\r
-            [ImportMany("Value", typeof(int))]\r
-            public IEnumerable<string> StringCollection { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionsExceptionNonAssignableCollection()\r
-        {\r
-            ExpectedErrorOnSetImport(new InvalidImporterNonAssignableCollection(),\r
-                ErrorId.ReflectionModel_ImportNotAssignableFromExport);  \r
-        }\r
-\r
-        public class InvalidImporterNullReadOnlyICollection\r
-        {\r
-            ICollection<int> readOnlyICollection = null;\r
-\r
-            [ImportMany("Value")]\r
-            public ICollection<int> Values { get { return readOnlyICollection; } }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionsExceptionNullReadOnlyICollection()\r
-        {\r
-            ExpectedErrorOnPartActivate(new InvalidImporterNullReadOnlyICollection(),\r
-                ErrorId.ReflectionModel_ImportCollectionNull);   \r
-        }\r
-\r
-        public class ImporterWeakIEnumerable\r
-        {\r
-            public ImporterWeakIEnumerable()\r
-            {\r
-                ReadWriteEnumerable = new IntCollection();\r
-            }\r
-\r
-            [ImportMany("Value")]\r
-            public IntCollection ReadWriteEnumerable { get; set; }\r
-\r
-            public class IntCollection : IEnumerable\r
-            {\r
-                List<int> ints = new List<int>();\r
-                public void Add(int item) { ints.Add(item); }\r
-                public void Clear() { ints.Clear(); }\r
-                public bool Remove(int item) { return ints.Remove(item); }\r
-                public IEnumerator GetEnumerator() { return ints.GetEnumerator(); }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionsExceptionWeakCollectionNotSupportingICollectionOfT()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImporterWeakIEnumerable(),\r
-                ErrorId.ReflectionModel_ImportCollectionNotWritable);\r
-        }\r
-\r
-        public class ImporterThrowsOnGetting\r
-        {\r
-            [ImportMany("Value")]\r
-            public List<int> Value\r
-            {\r
-                get\r
-                {\r
-                    throw new NotSupportedException();\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionsExceptionGettingValue()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            ImporterThrowsOnGetting importer = new ImporterThrowsOnGetting();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("Value", 42);\r
-            batch.AddExportedValue("Value", 0);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotActivate,\r
-                                          ErrorId.ReflectionModel_ImportCollectionGetThrewException, RetryMode.DoNotRetry, () =>\r
-                                          {\r
-                                              container.Compose(batch);\r
-                                          });\r
-        }\r
-\r
-        public class CustomCollectionThrowsDuringConstruction : Collection<int>\r
-        {\r
-            public CustomCollectionThrowsDuringConstruction()\r
-            {\r
-                throw new NotSupportedException();\r
-            }\r
-        }\r
-\r
-        public class ImportCustomCollectionThrowsDuringConstruction\r
-        {\r
-            public ImportCustomCollectionThrowsDuringConstruction()\r
-            {\r
-            }\r
-\r
-            [ImportMany("Value")]\r
-            public CustomCollectionThrowsDuringConstruction Values { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_ImportTypeThrowsOnConstruction()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImportCustomCollectionThrowsDuringConstruction(),\r
-                ErrorId.ReflectionModel_ImportCollectionConstructionThrewException);\r
-        }\r
-\r
-        public class CustomCollectionThrowsDuringClear : Collection<int>\r
-        {\r
-            protected override void ClearItems()\r
-            {\r
-                throw new NotSupportedException();\r
-            }\r
-        }\r
-\r
-        public class ImportCustomCollectionThrowsDuringClear\r
-        {\r
-            public ImportCustomCollectionThrowsDuringClear()\r
-            {\r
-            }\r
-\r
-            [ImportMany("Value")]\r
-            public CustomCollectionThrowsDuringClear Values { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_ImportTypeThrowsOnClear()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImportCustomCollectionThrowsDuringClear(),\r
-                ErrorId.ReflectionModel_ImportCollectionClearThrewException);\r
-        }\r
-\r
-        public class CustomCollectionThrowsDuringAdd : Collection<int>\r
-        {\r
-            protected override void InsertItem(int index, int item)\r
-            {\r
-                throw new NotSupportedException();\r
-            }\r
-        }\r
-\r
-        public class ImportCustomCollectionThrowsDuringAdd\r
-        {\r
-            public ImportCustomCollectionThrowsDuringAdd()\r
-            {\r
-            }\r
-\r
-            [ImportMany("Value")]\r
-            public CustomCollectionThrowsDuringAdd Values { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_ImportTypeThrowsOnAdd()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImportCustomCollectionThrowsDuringAdd(),\r
-                ErrorId.ReflectionModel_ImportCollectionAddThrewException);\r
-        }\r
-\r
-        public class CustomCollectionThrowsDuringIsReadOnly : ICollection<int>\r
-        {\r
-            void ICollection<int>.Add(int item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            void ICollection<int>.Clear()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            bool ICollection<int>.Contains(int item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            void ICollection<int>.CopyTo(int[] array, int arrayIndex)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            int ICollection<int>.Count\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            bool ICollection<int>.IsReadOnly\r
-            {\r
-                get { throw new NotSupportedException(); }\r
-            }\r
-\r
-            bool ICollection<int>.Remove(int item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            IEnumerator<int> IEnumerable<int>.GetEnumerator()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            IEnumerator IEnumerable.GetEnumerator()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-        }\r
-\r
-        public class ImportCustomCollectionThrowsDuringIsReadOnly\r
-        {\r
-            public ImportCustomCollectionThrowsDuringIsReadOnly()\r
-            {\r
-                Values = new CustomCollectionThrowsDuringIsReadOnly();\r
-            }\r
-\r
-            [ImportMany("Value")]\r
-            public CustomCollectionThrowsDuringIsReadOnly Values { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_ImportTypeThrowsOnIsReadOnly()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImportCustomCollectionThrowsDuringIsReadOnly(),\r
-                ErrorId.ReflectionModel_ImportCollectionIsReadOnlyThrewException);\r
-        }\r
-\r
-        public class CollectionTypeWithNoIList<T> : ICollection<T>\r
-        {\r
-            private int _count = 0;\r
-            public CollectionTypeWithNoIList()\r
-            {\r
-                \r
-            }\r
-\r
-            public void Add(T item)\r
-            {\r
-                // Do Nothing\r
-                this._count++;\r
-            }\r
-\r
-            public void Clear()\r
-            {\r
-                // Do Nothings\r
-            }\r
-\r
-            public bool Contains(T item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            public void CopyTo(T[] array, int arrayIndex)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            public int Count\r
-            {\r
-                get { return this._count; }\r
-            }\r
-\r
-            public bool IsReadOnly\r
-            {\r
-                get { return false; }\r
-            }\r
-\r
-            public bool Remove(T item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            public IEnumerator<T> GetEnumerator()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            IEnumerator IEnumerable.GetEnumerator()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-        }\r
-\r
-        public class ImportCollectionWithNoIList\r
-        {\r
-            [ImportMany("Value")]\r
-            public CollectionTypeWithNoIList<int> Values { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollections_NoIList_ShouldWorkFine()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            var importer = new ImportCollectionWithNoIList();\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("Value", 42);\r
-            batch.AddExportedValue("Value", 0);\r
-\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.Values.Count);\r
-        }\r
-\r
-        public class CollectionWithMultipleInterfaces :  ICollection<int>, ICollection<string>\r
-        {\r
-            private int _count = 0;\r
-            public CollectionWithMultipleInterfaces()\r
-            {\r
-\r
-            }\r
-\r
-            #region ICollection<int> Members\r
-\r
-            void ICollection<int>.Add(int item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            void ICollection<int>.Clear()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            bool ICollection<int>.Contains(int item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            void ICollection<int>.CopyTo(int[] array, int arrayIndex)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            int ICollection<int>.Count\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            bool ICollection<int>.IsReadOnly\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            bool ICollection<int>.Remove(int item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            IEnumerator<int> IEnumerable<int>.GetEnumerator()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            #endregion\r
-\r
-            #region IEnumerable Members\r
-\r
-            IEnumerator IEnumerable.GetEnumerator()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            #endregion\r
-\r
-            #region ICollection<string> Members\r
-\r
-            void ICollection<string>.Add(string item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            void ICollection<string>.Clear()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            bool ICollection<string>.Contains(string item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            void ICollection<string>.CopyTo(string[] array, int arrayIndex)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            int ICollection<string>.Count\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            bool ICollection<string>.IsReadOnly\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            bool ICollection<string>.Remove(string item)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            IEnumerator<string> IEnumerable<string>.GetEnumerator()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            #endregion\r
-        }\r
-\r
-        public class ImportCollectionWithMultipleInterfaces\r
-        {\r
-            [ImportMany("Value")]\r
-            public CollectionWithMultipleInterfaces Values { get; set; }\r
-        }\r
-        \r
-        [TestMethod]\r
-        public void ImportCollections_MultipleICollections_ShouldCauseNotWriteable()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImportCollectionWithMultipleInterfaces(),\r
-                ErrorId.ReflectionModel_ImportCollectionNotWritable);\r
-        }\r
-\r
-        public class ImportManyNonCollectionTypeString\r
-        {\r
-            [ImportMany("Value")]\r
-            public string Foo { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportManyOnNonCollectionTypeString_ShouldCauseNotWritable()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImportManyNonCollectionTypeString(),\r
-                ErrorId.ReflectionModel_ImportCollectionNotWritable);\r
-        }\r
-\r
-        public class ImportManyNonCollectionTypeObject\r
-        {\r
-            [ImportMany("Value")]\r
-            public object Foo { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportManyOnNonCollectionTypeObject_ShouldCauseNotWritable()\r
-        {\r
-            ExpectedErrorOnPartActivate(new ImportManyNonCollectionTypeObject(),\r
-                ErrorId.ReflectionModel_ImportCollectionNotWritable);\r
-        }\r
-\r
-#if !SILVERLIGHT \r
-        // SILVERLIGHT doesn't have SetEnvironmentVariable set in this test.\r
-        public class ExportADictionaryObject\r
-        {\r
-            [Export]\r
-            public IDictionary<string, object> MyDictionary\r
-            {\r
-                get\r
-                {\r
-                    var dictionary = new Dictionary<string, object>();\r
-                    dictionary.Add("a", 42);\r
-                    dictionary.Add("b", "c");\r
-                    return dictionary;\r
-                }\r
-            }\r
-        }\r
-\r
-        public class ImportADictionaryObject\r
-        {\r
-            [Import]\r
-            public IDictionary<string, object> MyDictionary { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDictionaryAsSingleObject()\r
-        {\r
-            // Set variable to ensure the hack is turned off.\r
-            Environment.SetEnvironmentVariable("ONLY_ALLOW_IMPORTMANY", "1");\r
-\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            var importer = new ImportADictionaryObject();\r
-            var exporter = new ExportADictionaryObject();\r
-\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.MyDictionary.Count);\r
-        }\r
-\r
-        public class ExportACollectionObject\r
-        {\r
-            [Export]\r
-            public Collection<string> MyCollection\r
-            {\r
-                get\r
-                {\r
-                    var collection = new Collection<string>();\r
-                    collection.Add("a");\r
-                    collection.Add("b");\r
-                    return collection;\r
-                }\r
-            }\r
-        }\r
-\r
-        public class ImportACollectionObject\r
-        {\r
-            [Import]\r
-            public Collection<string> MyCollection { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportCollectionAsSingleObject()\r
-        {\r
-            // Set variable to ensure the hack is turned off.\r
-            Environment.SetEnvironmentVariable("ONLY_ALLOW_IMPORTMANY", "1");\r
-\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            var importer = new ImportACollectionObject();\r
-            var exporter = new ExportACollectionObject();\r
-\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.MyCollection.Count);\r
-        }\r
-#endif\r
-\r
-        public void ExpectedErrorOnPartActivate(object importer, ErrorId expectedErrorId)\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("Value", 42);\r
-            batch.AddExportedValue("Value", 0);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotActivate,\r
-              expectedErrorId, RetryMode.DoNotRetry, () =>\r
-              {\r
-                  container.Compose(batch);\r
-              });\r
-        }\r
-\r
-        public void ExpectedErrorOnSetImport(object importer, ErrorId expectedErrorId)\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("Value", 42);\r
-            batch.AddExportedValue("Value", 0);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-              expectedErrorId, RetryMode.DoNotRetry, () =>\r
-              {\r
-                  container.Compose(batch);\r
-              });\r
-        }\r
-\r
-        public void ExpectedChangeRejectedErrorOnSetImport(object importer, ErrorId expectedErrorId)\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddExportedValue("Value", 42);\r
-            batch.AddExportedValue("Value", 0);\r
-\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PartCannotSetImport,\r
-              expectedErrorId, RetryMode.DoNotRetry, () =>\r
-              {\r
-                  container.Compose(batch);\r
-              });\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerCycleTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerCycleTests.cs
deleted file mode 100644 (file)
index d7c0a68..0000000
Binary files a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerCycleTests.cs and /dev/null differ
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerExtensibilityTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerExtensibilityTests.cs
deleted file mode 100644 (file)
index f088200..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionContainerExtensibilityTests\r
-    {\r
-        [TestMethod]\r
-        public void Dispose_DoesNotThrow()\r
-        {\r
-            var container = CreateCustomCompositionContainer();\r
-            container.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void DerivedCompositionContainer_CanExportItself()\r
-        {\r
-            var container = CreateCustomCompositionContainer();\r
-            container.AddAndComposeExportedValue<CustomCompositionContainer>(container);\r
-\r
-            Assert.AreSame(container, container.GetExportedValue<CustomCompositionContainer>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionService_CanBeExported()\r
-        {\r
-            var container = CreateCustomCompositionContainer();\r
-            container.AddAndComposeExportedValue<ICompositionService>(container);\r
-\r
-            Assert.AreSame(container, container.GetExportedValue<ICompositionService>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CompositionContainer_CanBeExported()\r
-        {\r
-            var container = CreateCustomCompositionContainer();\r
-            container.AddAndComposeExportedValue<CompositionContainer>(container);\r
-\r
-            Assert.AreSame(container, container.GetExportedValue<CompositionContainer>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanBeCollectedAfterDispose()\r
-        {\r
-            AggregateExportProvider exportProvider = new AggregateExportProvider();\r
-            var catalog = new AggregateCatalog(CatalogFactory.CreateDefaultAttributed());\r
-            var container = new CompositionContainer(catalog, exportProvider);\r
-\r
-            WeakReference weakContainer = new WeakReference(container);\r
-            container.Dispose();\r
-            container = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsFalse(weakContainer.IsAlive);\r
-\r
-            GC.KeepAlive(exportProvider);\r
-            GC.KeepAlive(catalog);\r
-        }\r
-\r
-        private CustomCompositionContainer CreateCustomCompositionContainer()\r
-        {\r
-            return new CustomCompositionContainer();\r
-        }\r
-\r
-        // Type needs to be public otherwise container.GetExportedValue<CustomCompositionContainer> \r
-        // fails on Silverlight because it cannot construct a Lazy<T,M> factory. \r
-        public class CustomCompositionContainer : CompositionContainer\r
-        {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerExtensions.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerExtensions.cs
deleted file mode 100644 (file)
index 3a5af3d..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class CompositionContainerExtensions\r
-    {\r
-        public static bool IsPresent<T>(this ExportProvider container)\r
-        {\r
-            try\r
-            {\r
-                container.GetExportedValue<T>();\r
-                return true;\r
-            }\r
-            catch (ImportCardinalityMismatchException)\r
-            {\r
-                return false;\r
-            }\r
-        }\r
-\r
-        public static bool IsPresent(this ExportProvider container, string contractName)\r
-        {\r
-            try\r
-            {\r
-                container.GetExportedValue<object>(contractName);\r
-                return true;\r
-            }\r
-            catch (ImportCardinalityMismatchException)\r
-            {\r
-                return false;\r
-            }\r
-        }\r
-\r
-        public static void AddAndComposeExportedValue<T>(this CompositionContainer container, T exportedValue)\r
-        {\r
-            var batch = new CompositionBatch();\r
-            batch.AddExportedValue<T>(exportedValue);\r
-            container.Compose(batch);\r
-        }\r
-\r
-        public static void AddAndComposeExportedValue<T>(this CompositionContainer container, string contractName, T exportedValue)\r
-        {\r
-            var batch = new CompositionBatch();\r
-            batch.AddExportedValue<T>(contractName, exportedValue);\r
-            container.Compose(batch);\r
-        }\r
-\r
-        public static void AddParts(this CompositionBatch batch, params object[] parts)\r
-        {\r
-            foreach (object instance in parts)\r
-            {\r
-                ComposablePart part = instance as ComposablePart;\r
-                if (part != null)\r
-                {\r
-                    batch.AddPart(part);\r
-                }\r
-                else\r
-                {\r
-                    batch.AddPart((object)instance);\r
-                }\r
-            }\r
-        }\r
-\r
-        public static ComposablePart AddExportedValue(this CompositionBatch batch, string contractName, Type contractType, object exportedValue)\r
-        {\r
-            string typeIdentity = AttributedModelServices.GetTypeIdentity(contractType);\r
-\r
-            IDictionary<string, object> metadata = null;\r
-\r
-            if (typeIdentity != null)\r
-            {\r
-                metadata = new Dictionary<string, object>();\r
-                metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, typeIdentity);\r
-            }\r
-\r
-            return batch.AddExport(new Export(contractName, metadata, () => exportedValue));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerImportTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerImportTests.cs
deleted file mode 100644 (file)
index 3c99bdc..0000000
+++ /dev/null
@@ -1,769 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Linq;\r
-using System.Runtime.InteropServices;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionContainerImportTests\r
-    {\r
-        // Exporting collectin values is not supported\r
-        [TestMethod]\r
-        public void ImportValues()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            Importer importer = new Importer();\r
-            Exporter exporter42 = new Exporter(42);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter42);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ReflectionModel_ImportNotAssignableFromExport, RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportSingle()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new Int32Importer();\r
-            var exporter = new Int32Exporter(42);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Expecting value to be imported");\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportSingleFromInternal()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new Int32Importer();\r
-            var exporter = new Int32ExporterInternal(42);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Expecting value to be imported");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportSingleToInternal()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new Int32ImporterInternal();\r
-            var exporter = new Int32Exporter(42);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Expecting value to be imported");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportSingleIntoCollection()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new Int32CollectionImporter();\r
-            var exporter = new Int32Exporter(42);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(importer.Values, 42);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValuesNameless()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            ImporterNameless importer;\r
-            ExporterNameless exporter42 = new ExporterNameless(42);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer = new ImporterNameless());\r
-            batch.AddPart(exporter42);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.ValueReadWrite);\r
-            Assert.AreEqual(42, importer.MetadataReadWrite.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueExceptionMissing()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            Importer importer;\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer = new Importer());\r
-\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                                          ErrorId.ImportEngine_ImportCardinalityMismatch, \r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueExceptionMultiple()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            Importer importer = new Importer();\r
-            Exporter exporter42 = new Exporter(42);\r
-            Exporter exporter6 = new Exporter(6);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter42);\r
-            batch.AddPart(exporter6);\r
-\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PartCannotSetImport,\r
-                RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueExceptionSetterException()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            ImporterInvalidSetterException importer = new ImporterInvalidSetterException();\r
-            Exporter exporter42 = new Exporter(42);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(exporter42);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotActivate,\r
-                                          ErrorId.ReflectionModel_ImportThrewException, \r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportValueExceptionLazily()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(ImportImporterInvalidSetterExceptionLazily).Assembly);\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(ImportImporterInvalidSetterExceptionLazily), typeof(ImporterInvalidSetterException));\r
-            var invalidLazy = container.GetExportedValue<ImportImporterInvalidSetterExceptionLazily>();\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue,\r
-                                          ErrorId.ImportEngine_PartCannotActivate,\r
-                                          ErrorId.ReflectionModel_ImportThrewException, RetryMode.DoNotRetry, () =>\r
-            {\r
-                var value = invalidLazy.Value.Value;\r
-            });\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void ImportValueComComponent()\r
-        {\r
-            CTaskScheduler scheduler = new CTaskScheduler();\r
-\r
-            try\r
-            {\r
-                var container = ContainerFactory.Create();\r
-                var importer = new ImportComComponent();\r
-\r
-                CompositionBatch batch = new CompositionBatch();\r
-                batch.AddParts(importer);\r
-                batch.AddExportedValue<ITaskScheduler>("TaskScheduler", (ITaskScheduler)scheduler);\r
-\r
-                container.Compose(batch);\r
-\r
-                Assert.AreEqual(scheduler, importer.TaskScheduler);\r
-            }\r
-            finally\r
-            {\r
-                Marshal.ReleaseComObject(scheduler);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void DelayImportValueComComponent()\r
-        {\r
-            CTaskScheduler scheduler = new CTaskScheduler();\r
-\r
-            try\r
-            {\r
-                var container = ContainerFactory.Create();\r
-                var importer = new DelayImportComComponent();\r
-\r
-                CompositionBatch batch = new CompositionBatch();\r
-                batch.AddParts(importer);\r
-                batch.AddExportedValue<ITaskScheduler>("TaskScheduler", (ITaskScheduler)scheduler);\r
-\r
-                container.Compose(batch);\r
-\r
-                Assert.AreEqual(scheduler, importer.TaskScheduler.Value);\r
-            }\r
-            finally\r
-            {\r
-                Marshal.ReleaseComObject(scheduler);\r
-            }\r
-        }\r
-#endif\r
-       \r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfValueTypesAreBoundToDefaultWhenNotSatisfied()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalImport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.ValueTypeSetCount);\r
-            Assert.AreEqual(0, importer.ValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfNullableValueTypesAreBoundToDefaultWhenNotSatisfied()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalImport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.NullableValueTypeSetCount);\r
-            Assert.IsNull(importer.NullableValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfReferenceTypesAreBoundToDefaultWhenNotSatisfied()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalImport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.ReferenceTypeSetCount);\r
-            Assert.IsNull(importer.ReferenceType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfExportValueTypesAreBoundToDefaultWhenNotSatisfied()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalExport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.ValueTypeSetCount);\r
-            Assert.IsNull(importer.ValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfExportNullableValueTypesAreBoundToDefaultWhenNotSatisfied()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalExport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.NullableValueTypeSetCount);\r
-            Assert.IsNull(importer.NullableValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfExportReferenceTypesAreBoundToDefaultWhenNotSatisfied()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalExport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.ReferenceTypeSetCount);\r
-            Assert.IsNull(importer.ReferenceType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfValueTypesAreReboundToDefaultWhenExportIsRemoved()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalImport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var key = batch.AddExportedValue("ValueType", 10);\r
-\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.ValueTypeSetCount);\r
-            Assert.AreEqual(10, importer.ValueType);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.ValueTypeSetCount);\r
-            Assert.AreEqual(0, importer.ValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfNullableValueTypesAreReboundToDefaultWhenExportIsRemoved()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalImport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var key = batch.AddExportedValue<int?>("NullableValueType", 10);\r
-\r
-            container.Compose(batch);\r
-            Assert.AreEqual(1, importer.NullableValueTypeSetCount);\r
-            Assert.AreEqual(10, importer.NullableValueType);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.NullableValueTypeSetCount);\r
-            Assert.IsNull(importer.NullableValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfReferenceTypesAreReboundToDefaultWhenExportIsRemoved()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalImport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var key = batch.AddExportedValue("ReferenceType", "Bar");\r
-\r
-            container.Compose(batch);\r
-            Assert.AreEqual(1, importer.ReferenceTypeSetCount);\r
-            Assert.AreEqual("Bar", importer.ReferenceType);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.ReferenceTypeSetCount);\r
-            Assert.IsNull(importer.ReferenceType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfExportValueTypesAreReboundToDefaultWhenExportIsRemoved()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalExport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var key = batch.AddExportedValue("ValueType", 10);\r
-\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.ValueTypeSetCount);\r
-            Assert.AreEqual(10, importer.ValueType.Value);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.ValueTypeSetCount);\r
-            Assert.IsNull(importer.ValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfExportNullableValueTypesAreReboundToDefaultWhenExportIsRemoved()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalExport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var key = batch.AddExportedValue<int?>("NullableValueType", 10);\r
-\r
-            container.Compose(batch);\r
-            Assert.AreEqual(1, importer.NullableValueTypeSetCount);\r
-            Assert.AreEqual(10, importer.NullableValueType.Value);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.NullableValueTypeSetCount);\r
-            Assert.IsNull(importer.NullableValueType);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfExportReferenceTypesAreReboundToDefaultWhenExportIsRemoved()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importer = new OptionalExport();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var key = batch.AddExportedValue("ReferenceType", "Bar");\r
-\r
-            container.Compose(batch);\r
-            Assert.AreEqual(1, importer.ReferenceTypeSetCount);\r
-            Assert.AreEqual("Bar", importer.ReferenceType.Value);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importer.ReferenceTypeSetCount);\r
-            Assert.IsNull(importer.ReferenceType);\r
-        }\r
-\r
-        public class OptionalImport\r
-        {\r
-            public int ValueTypeSetCount;\r
-            public int NullableValueTypeSetCount;\r
-            public int ReferenceTypeSetCount;\r
-\r
-            private int _valueType;\r
-            private int? _nullableValueType;\r
-            private string _referenceType;\r
-\r
-            [Import("ValueType", AllowDefault = true, AllowRecomposition = true)]\r
-            public int ValueType\r
-            {\r
-                get { return _valueType; }\r
-                set\r
-                {\r
-                    ValueTypeSetCount++;\r
-                    _valueType = value;\r
-                }\r
-            }\r
-\r
-            [Import("NullableValueType", AllowDefault = true, AllowRecomposition = true)]\r
-            public int? NullableValueType\r
-            {\r
-                get { return _nullableValueType; }\r
-                set\r
-                {\r
-                    NullableValueTypeSetCount++;\r
-                    _nullableValueType = value;\r
-                }\r
-            }\r
-\r
-            [Import("ReferenceType", AllowDefault = true, AllowRecomposition = true)]\r
-            public string ReferenceType\r
-            {\r
-                get { return _referenceType; }\r
-                set \r
-                {\r
-                    ReferenceTypeSetCount++;\r
-                    _referenceType = value; \r
-                }\r
-            }\r
-        }\r
-\r
-        public class OptionalExport\r
-        {\r
-            public int ValueTypeSetCount;\r
-            public int NullableValueTypeSetCount;\r
-            public int ReferenceTypeSetCount;\r
-\r
-            private Lazy<int> _valueType;\r
-            private Lazy<int?> _nullableValueType;\r
-            private Lazy<string> _referenceType;\r
-\r
-            [Import("ValueType", AllowDefault = true, AllowRecomposition = true)]\r
-            public Lazy<int> ValueType\r
-            {\r
-                get { return _valueType; }\r
-                set\r
-                {\r
-                    ValueTypeSetCount++;\r
-                    _valueType = value;\r
-                }\r
-            }\r
-\r
-            [Import("NullableValueType", AllowDefault = true, AllowRecomposition = true)]\r
-            public Lazy<int?> NullableValueType\r
-            {\r
-                get { return _nullableValueType; }\r
-                set\r
-                {\r
-                    NullableValueTypeSetCount++;\r
-                    _nullableValueType = value;\r
-                }\r
-            }\r
-\r
-            [Import("ReferenceType", AllowDefault = true, AllowRecomposition = true)]\r
-            public Lazy<string> ReferenceType\r
-            {\r
-                get { return _referenceType; }\r
-                set\r
-                {\r
-                    ReferenceTypeSetCount++;\r
-                    _referenceType = value;\r
-                }\r
-            }\r
-        }\r
-\r
-        private class DelayDuckImporter\r
-        {\r
-            [Import("Duck")]\r
-            public Lazy<IDuck> Duck\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        private class DuckImporter\r
-        {\r
-            [Import("Duck")]\r
-            public IDuck Duck\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        public class QuackLikeADuck\r
-        {\r
-            public virtual string Quack()\r
-            {\r
-                return "Quack";\r
-            }\r
-        }\r
-\r
-        public interface IDuck\r
-        {\r
-            string Quack();            \r
-        }\r
-\r
-        #if !SILVERLIGHT\r
-\r
-        [ComImport]\r
-        [Guid("148BD52A-A2AB-11CE-B11F-00AA00530503")]\r
-        private class CTaskScheduler\r
-        {   // This interface doesn't implement \r
-            // ITaskScheduler deliberately\r
-        }\r
-\r
-        [Guid("148BD527-A2AB-11CE-B11F-00AA00530503")]\r
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]\r
-        private interface ITaskScheduler\r
-        {\r
-            void FakeMethod();\r
-        }\r
-\r
-        private class ImportComComponent\r
-        {\r
-            [Import("TaskScheduler")]\r
-            public ITaskScheduler TaskScheduler\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        private class DelayImportComComponent\r
-        {\r
-            [Import("TaskScheduler")]\r
-            public Lazy<ITaskScheduler> TaskScheduler\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        public class Importer\r
-        {\r
-            public Importer()\r
-            {\r
-            }\r
-\r
-            [Import("Value")]\r
-            public int ValueReadWrite { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IList<int> SingleValueCollectionReadWrite { get; set; }\r
-\r
-            [Import("EmptyValue", AllowDefault = true)]\r
-            public int ValueEmptyOptional { get; set; }\r
-\r
-            [ImportMany("CollectionValue", typeof(IList<int>))]\r
-            public IList<int> ValueCollection { get; set; }\r
-\r
-        }\r
-\r
-        public class ImporterNameless\r
-        {\r
-\r
-            public ImporterNameless()\r
-            {\r
-            }\r
-\r
-            [Import]\r
-            public int ValueReadWrite { get; set; }\r
-\r
-            [Import]\r
-            public Lazy<int> MetadataReadWrite { get; set; }\r
-\r
-        }\r
-\r
-        public class ImporterInvalidWrongType\r
-        {\r
-            [Import("Value")]\r
-            public DateTime ValueReadWrite { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class ImporterInvalidSetterException\r
-        {\r
-            [ImportMany("Value")]\r
-            public IEnumerable<int> ValueReadWrite { get { return null; } set { throw new InvalidOperationException(); } }\r
-        }\r
-\r
-        [Export]\r
-        public class ImportImporterInvalidSetterExceptionLazily\r
-        {\r
-            [Import]\r
-            public Lazy<ImporterInvalidSetterException> Value { get; set; }\r
-        }\r
-\r
-\r
-        [PartNotDiscoverable]\r
-        public class Exporter\r
-        {\r
-            List<int> collectionValue = new List<int>();\r
-\r
-            public Exporter(int value)\r
-            {\r
-                Value = value;\r
-            }\r
-\r
-            [Export("Value")]\r
-            public int Value { get; set; }\r
-\r
-\r
-            [Export("CollectionValue")]\r
-            public IList<int> CollectionValue { get { return collectionValue; } }\r
-\r
-        }\r
-\r
-        public class ExporterNameless\r
-        {\r
-\r
-            public ExporterNameless(int value)\r
-            {\r
-                Value = value;\r
-            }\r
-\r
-            [Export]\r
-            public int Value { get; set; }\r
-\r
-        }\r
-\r
-        public class ExportsString\r
-        {\r
-            [Export]\r
-            public string ExportedString = "Test";\r
-        }\r
-\r
-        public class ExportsInvalidListOfExportOfString\r
-        {\r
-            [Export(typeof(List<Lazy<string>>))]\r
-            public string ExportedString = "Test";\r
-        }\r
-\r
-        public class ExportsValidListOfExportOfString\r
-        {\r
-            [Export(typeof(List<Lazy<string>>))]\r
-            public List<Lazy<string>> ExportedString = new List<Lazy<string>>();\r
-        }\r
-\r
-        [Export]\r
-        public class ImportsListOfExportOfString\r
-        {\r
-            [Import(AllowDefault = true)]\r
-            public List<Lazy<string>> ExportedList { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportListOfExportWithOnlySingleElementsAvailable_ShouldNotFindExport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(ExportsString), typeof(ImportsListOfExportOfString));\r
-            var importer = container.GetExportedValue<ImportsListOfExportOfString>();\r
-            Assert.IsNull(importer.ExportedList);\r
-\r
-            var part = AttributedModelServices.CreatePartDefinition(typeof(ImportsListOfExportOfString), null);\r
-            var contract = AttributedModelServices.GetContractName(typeof(List<Lazy<string>>));\r
-            Assert.AreEqual(contract, ((ContractBasedImportDefinition)part.ImportDefinitions.First()).ContractName);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportListOfExportWithInvalidCollectionAvailable_ShouldThrowMismatch()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(ExportsInvalidListOfExportOfString), typeof(ImportsListOfExportOfString));\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-                container.GetExportedValue<ImportsListOfExportOfString>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportListOfExportWithValidCollectionAvailable_ShouldSatisfyImport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(ExportsValidListOfExportOfString), typeof(ImportsListOfExportOfString));\r
-            var importer = container.GetExportedValue<ImportsListOfExportOfString>();\r
-            Assert.AreEqual(0, importer.ExportedList.Count);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionContainerTests.cs
deleted file mode 100644 (file)
index ac10766..0000000
+++ /dev/null
@@ -1,2998 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Runtime.Serialization;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionContainerTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor2_ArrayWithNullElementAsProvidersArgument_ShouldThrowArgumentException()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("providers", () =>\r
-            {\r
-                new CompositionContainer(new ExportProvider[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ArrayWithNullElementAsProvidersArgument_ShouldThrowArgumentException()\r
-        {\r
-            var catalog = CatalogFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("providers", () =>\r
-            {\r
-                new CompositionContainer(catalog, new ExportProvider[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ArrayAsProvidersArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var providers = new ExportProvider[] { ExportProviderFactory.Create() };\r
-            var container = new CompositionContainer(providers);\r
-\r
-            providers[0] = null;\r
-\r
-            Assert.IsNotNull(container.Providers[0]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ArrayAsProvidersArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var providers = new ExportProvider[] { ExportProviderFactory.Create() };\r
-            var container = new CompositionContainer(CatalogFactory.Create(), providers);\r
-\r
-            providers[0] = null;\r
-\r
-            Assert.IsNotNull(container.Providers[0]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetProvidersPropertyToEmptyCollection()\r
-        {\r
-            var container = new CompositionContainer();\r
-\r
-            EnumerableAssert.IsEmpty(container.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyArrayAsProvidersArgument_ShouldSetProvidersPropertyToEmpty()\r
-        {\r
-            var container = new CompositionContainer(new ExportProvider[0]);\r
-\r
-            EnumerableAssert.IsEmpty(container.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyArrayAsProvidersArgument_ShouldSetProvidersPropertyToEmpty()\r
-        {\r
-            var container = new CompositionContainer(CatalogFactory.Create(), new ExportProvider[0]);\r
-\r
-            EnumerableAssert.IsEmpty(container.Providers);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetCatalogPropertyToNull()\r
-        {\r
-            var container = new CompositionContainer();\r
-\r
-            Assert.IsNull(container.Catalog);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetCatalogPropertyToNull()\r
-        {\r
-            var container = new CompositionContainer(new ExportProvider[0]);\r
-\r
-            Assert.IsNull(container.Catalog);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsCatalogArgument_ShouldSetCatalogPropertyToNull()\r
-        {\r
-            var container = new CompositionContainer((ComposablePartCatalog)null, new ExportProvider[0]);\r
-\r
-            Assert.IsNull(container.Catalog);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsCatalogArgument_ShouldSetCatalogProperty()\r
-        {\r
-            var expectations = Expectations.GetCatalogs();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var container = new CompositionContainer(e, new ExportProvider[0]);\r
-\r
-                Assert.AreSame(e, container.Catalog);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Catalog_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                var catalog = container.Catalog;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Providers_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                var providers = container.Providers;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(579990)]  // NullReferenceException\r
-        public void ExportsChanged_Add_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.ExportsChanged += (o, s) => { };\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(579990)] // NullReferenceException\r
-        public void ExportsChanged_Remove_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.ExportsChanged -= (o, s) => { };\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart1_ImportOnlyPart_ShouldNotGetGarbageCollected()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var import = PartFactory.CreateImporter("Value", ImportCardinality.ZeroOrMore);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(import);\r
-            container.Compose(batch);\r
-\r
-            var weakRef = new WeakReference(import);\r
-            import = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsNotNull(weakRef.Target, "Import only part should not have been collected!");\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Compose_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExport<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExport<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExport<string, object>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExport<string, object>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            var definition = ImportDefinitionFactory.Create();\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExports(typeof(string), typeof(object), "Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExports<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExports<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExports<string, object>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExports<string, object>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExportedValue<string>();\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExportedValue<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExportedValueOrDefault<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExportedValueOrDefault<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT1_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExportedValues<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT2_WhenContainerDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(container, () =>\r
-            {\r
-                container.GetExportedValues<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_NullAsImportDefinitionArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                container.GetExports((ImportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_NullAsTypeArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("type", () =>\r
-            {\r
-                container.GetExports((Type)null, typeof(string), "ContractName");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT1_AskingForContractThatDoesNotExist_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExport<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT2_AskingForContractThatDoesNotExist_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExport<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_AskingForContractThatDoesNotExist_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExport<string, object>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_AskingForContractThatDoesNotExist_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExport<string, object>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_DefinitionAskingForExactlyOneContractThatDoesNotExist_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ExactlyOne);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_DefinitionAskingForExactlyZeroOrOneContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrOne);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_DefinitionAskingForExactlyZeroOrMoreContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrMore);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_AskingForContractThatDoesNotExist_ShouldReturnNoExports()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exports = container.GetExports(typeof(string), (Type)null, "Contract");\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT1_AskingForContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exports = container.GetExports<string>();\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT2_AskingForContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exports = container.GetExports<string>("Contract");\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_AskingForContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exports = container.GetExports<string, object>();\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_AskingForContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exports = container.GetExports<string, object>("Contract");\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT1_AskingForContractThatDoesNotExist_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT2_AskingForContractThatDoesNotExist_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_AskingForStringContractThatDoesNotExist_ShouldReturnNull()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exportedValue = container.GetExportedValueOrDefault<string>();\r
-\r
-            Assert.IsNull(exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_AskingForStringContractThatDoesNotExist_ShouldReturnNull()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exportedValue = container.GetExportedValueOrDefault<string>("Contract");\r
-\r
-            Assert.IsNull(exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_AskingForInt32ContractThatDoesNotExist_ShouldReturnZero()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exportedValue = container.GetExportedValueOrDefault<int>();\r
-\r
-            Assert.AreEqual(0, exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_AskingForInt32ContractThatDoesNotExist_ShouldReturnZero()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exportedValue = container.GetExportedValueOrDefault<int>("Contract");\r
-\r
-            Assert.AreEqual(0, exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT1_AskingForContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exports = container.GetExportedValues<string>();\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT2_AskingForContractThatDoesNotExist_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var exports = container.GetExports<string>("Contract");\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT1_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(ContractFromType(typeof(String)), "Value"));\r
-\r
-            var export = container.GetExport<string>();\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT2_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var export = container.GetExport<string>("Contract");\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(ContractFromType(typeof(String)), "Value"));\r
-\r
-            var export = container.GetExport<string, object>();\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var export = container.GetExport<string, object>("Contract");\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForExactlyOneContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ExactlyOne);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrOneContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrOne);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrMoreContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrMore);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_AskingForContractWithOneExport_ShouldReturnOneExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var exports = container.GetExports(typeof(string), (Type)null, "Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT1_AskingForContractWithOneExport_ShouldReturnOneExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value"));\r
-\r
-            var exports = container.GetExports<string>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT2_AskingForContractWithOneExport_ShouldReturnOneExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var exports = container.GetExports<string>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_AskingForContractWithOneExport_ShouldReturnOneExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value"));\r
-\r
-            var exports = container.GetExports<string, object>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_AskingForContractWithOneExport_ShouldReturnOneExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var exports = container.GetExports<string, object>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT1_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value"));\r
-\r
-            var exportedValue = container.GetExportedValue<string>();\r
-\r
-            Assert.AreEqual("Value", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT2_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var exportedValue = container.GetExportedValue<string>("Contract");\r
-\r
-            Assert.AreEqual("Value", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value"));\r
-\r
-            var exportedValue = container.GetExportedValueOrDefault<string>();\r
-\r
-            Assert.AreEqual("Value", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_AskingForContractWithOneExport_ShouldReturnExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var exportedValue = container.GetExportedValueOrDefault<string>("Contract");\r
-\r
-            Assert.AreEqual("Value", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT1_AskingForContractWithOneExport_ShouldReturnOneExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value"));\r
-\r
-            var exportedValues = container.GetExportedValues<string>();\r
-            \r
-            EnumerableAssert.AreEqual(exportedValues, "Value");            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT2_AskingForContractWithOneExport_ShouldReturnOneExport()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value"));\r
-\r
-            var exportedValues = container.GetExportedValues<string>("Contract");\r
-\r
-            EnumerableAssert.AreEqual(exportedValues, "Value");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT1_AskingForContractWithMultipleExports_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(ContractFromType(typeof(String)), "Value1", "Value2"));\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-             {\r
-                 container.GetExport<string>();\r
-             });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT2_AskingForContractWithMultipleExports_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-             {\r
-                 container.GetExport<string>("Contract");\r
-             });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_AskingForContractWithMultipleExports_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(ContractFromType(typeof(String)), "Value1", "Value2"));\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExport<string, object>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_AskingForContractWithMultipleExports_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExport<string, object>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForExactlyOneContractWithMultipleExports_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ExactlyOne);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrOneContractWithMultipleExports_ShouldReturnZero()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrOne);\r
-\r
-            Assert.AreEqual(0, container.GetExports(definition).Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrMoreContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrMore);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_AskingForContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            var exports = container.GetExports(typeof(string), (Type)null, "Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT1_AskingForContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(String), "Value1", "Value2"));\r
-\r
-            var exports = container.GetExports<string>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT2_AskingForContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            var exports = container.GetExports<string>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_AskingForContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value1", "Value2"));\r
-\r
-            var exports = container.GetExports<string, object>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_AskingForContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            var exports = container.GetExports<string, object>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT1_AskingForContractWithMultipleExports_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value1", "Value2"));\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                 container.GetExportedValue<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT2_AskingForContractWithMultipleExports_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                 container.GetExportedValue<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_AskingForContractWithMultipleExports_ShouldReturnZero()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value1", "Value2"));\r
-\r
-            Assert.IsNull(container.GetExportedValueOrDefault<string>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_AskingForContractWithMultipleExports_ShouldReturnZero()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", "Value1", "Value2"));\r
-\r
-            Assert.IsNull(container.GetExportedValueOrDefault<string>("Contract"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT1_AskingForContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), "Value1", "Value2"));\r
-\r
-            var exportedValues = container.GetExportedValues<string>();\r
-\r
-            EnumerableAssert.AreEqual(exportedValues, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT2_AskingForContractWithMultipleExports_ShouldReturnMultipleExports()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), "Value1", "Value2"));\r
-\r
-            var exportedValues = container.GetExportedValues<string>("Contract");\r
-\r
-            EnumerableAssert.AreEqual(exportedValues, "Value1", "Value2");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForExactlyOneAndAll_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract1", "Value1", "Value2", "Value3"),\r
-                                                    new MicroExport("Contract2", "Value4", "Value5", "Value6"));\r
-\r
-            var definition = ImportDefinitionFactory.Create(import => true, ImportCardinality.ExactlyOne);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrOneAndAll_ShouldReturnZero()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract1", "Value1", "Value2", "Value3"),\r
-                                                    new MicroExport("Contract2", "Value4", "Value5", "Value6"));\r
-\r
-            var definition = ImportDefinitionFactory.Create(import => true, ImportCardinality.ZeroOrOne);\r
-\r
-            Assert.AreEqual(0, container.GetExports(definition).Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrMoreAndAll_ShouldReturnAll()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract1", "Value1", "Value2", "Value3"),\r
-                                                    new MicroExport("Contract2", "Value4", "Value5", "Value6"));\r
-\r
-            var definition = ImportDefinitionFactory.Create(import => true, ImportCardinality.ZeroOrMore);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Value1", "Value2", "Value3",\r
-                                            "Value4", "Value5", "Value6");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT1_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), new object()));\r
-\r
-            var export = container.GetExport<string>();\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT2_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            var export = container.GetExport<string>("Contract");\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), new object()));\r
-\r
-            var export = container.GetExport<string, object>();\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            var export = container.GetExport<string, object>("Contract");\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            var exports = container.GetExports(typeof(string), (Type)null, "Contract");\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.ElementAt(0);\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT1_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), new object()));\r
-\r
-            var exports = container.GetExports<string>();\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.ElementAt(0);\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT2_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            var exports = container.GetExports<string>("Contract");\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.ElementAt(0);\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), new object()));\r
-\r
-            var exports = container.GetExports<string, object>();\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.ElementAt(0);\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            var exports = container.GetExports<string, object>("Contract");\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.ElementAt(0);\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT1_StringAsTTypeArgumentAskingForContractWithObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), new object()));\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT2_StringAsTTypeArgumentAskingForContractWithObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_StringAsTTypeArgumentAskingForContractWithObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), new object()));\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                container.GetExportedValueOrDefault<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_StringAsTTypeArgumentAskingForContractWithObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                container.GetExportedValueOrDefault<string>("Contract");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT1_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport(typeof(string), new object()));\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                container.GetExportedValues<string>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT2_StringAsTTypeArgumentAskingForContractWithOneObjectExport_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.Create(new MicroExport("Contract", typeof(string), new object()));\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                container.GetExportedValues<string>("Contract");\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT1_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var export = child.GetExport<string>();\r
-\r
-            Assert.AreEqual("Parent", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var export = child.GetExport<string>("Contract");\r
-\r
-            Assert.AreEqual("Parent", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var export = child.GetExport<string, object>();\r
-\r
-            Assert.AreEqual("Parent", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var export = child.GetExport<string, object>("Contract");\r
-\r
-            Assert.AreEqual("Parent", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForExactlyOneContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ExactlyOne);\r
-\r
-            var exports = child.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrOneContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrOne);\r
-\r
-            var exports = child.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrMoreContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrMore);\r
-\r
-            var exports = child.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exports = child.GetExports(typeof(string), (Type)null, "Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT1_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exports = child.GetExports<string>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exports = child.GetExports<string>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exports = child.GetExports<string, object>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exports = child.GetExports<string, object>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Parent");            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT1_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exportedValue = child.GetExportedValue<string>();\r
-\r
-            Assert.AreEqual("Parent", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exportedValue = child.GetExportedValue<string>("Contract");\r
-\r
-            Assert.AreEqual("Parent", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exportedValue = child.GetExportedValueOrDefault<string>();\r
-\r
-            Assert.AreEqual("Parent", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exportedValue = child.GetExportedValueOrDefault<string>("Contract");\r
-\r
-            Assert.AreEqual("Parent", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT1_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exportedValues = child.GetExportedValues<string>();\r
-\r
-            EnumerableAssert.AreEqual(exportedValues, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT2_AskingForContractFromChildWithExportInParentContainer_ShouldReturnExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent);\r
-\r
-            var exportedValues = child.GetExportedValues<string>("Contract");\r
-\r
-            EnumerableAssert.AreEqual(exportedValues, "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT1_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport(typeof(string), "Child"));\r
-\r
-            var export = child.GetExport<string>();\r
-\r
-            Assert.AreEqual("Child", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfT2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var export = child.GetExport<string>("Contract");\r
-\r
-            Assert.AreEqual("Child", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport(typeof(string), "Child"));\r
-\r
-            var export = child.GetExport<string, object>();\r
-\r
-            Assert.AreEqual("Child", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var export = child.GetExport<string, object>("Contract");\r
-\r
-            Assert.AreEqual("Child", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForExactlyOneContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ExactlyOne);\r
-\r
-            var exports = child.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Child");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrOneContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrOne);\r
-\r
-            var exports = child.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Child");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrMoreContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var definition = ImportDefinitionFactory.Create("Contract", ImportCardinality.ZeroOrMore);\r
-\r
-            var exports = child.GetExports(definition);\r
-\r
-            ExportsAssert.AreEqual(exports, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var exports = child.GetExports(typeof(string), (Type)null, "Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT1_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport(typeof(string), "Child"));\r
-\r
-            var exports = child.GetExports<string>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfT2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var exports = child.GetExports<string>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport(typeof(string), "Child"));\r
-\r
-\r
-            var exports = child.GetExports<string, object>();\r
-\r
-            ExportsAssert.AreEqual(exports, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var exports = child.GetExports<string, object>("Contract");\r
-\r
-            ExportsAssert.AreEqual(exports, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT1_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport(typeof(string), "Child"));\r
-\r
-            var exportedValue = child.GetExportedValue<string>();\r
-\r
-            Assert.AreEqual("Child", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOfT2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var exportedValue = child.GetExportedValue<string>("Contract");\r
-\r
-            Assert.AreEqual("Child", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT1_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport(typeof(string), "Child"));\r
-\r
-            var exportedValue = child.GetExportedValueOrDefault<string>();\r
-\r
-            Assert.AreEqual("Child", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValueOrDefaultOfT2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnChildExport()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var exportedValue = child.GetExportedValueOrDefault<string>("Contract");\r
-\r
-            Assert.AreEqual("Child", exportedValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT1_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport(typeof(string), "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport(typeof(string), "Child"));\r
-\r
-            var exportedValues = child.GetExportedValues<string>();\r
-\r
-            EnumerableAssert.AreEqual(exportedValues, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValuesOfT2_AskingForContractWithExportInBothParentAndChildContainers_ShouldReturnBothExports()\r
-        {\r
-            var parent = ContainerFactory.Create(new MicroExport("Contract", "Parent"));\r
-            var child = ContainerFactory.Create(parent, new MicroExport("Contract", "Child"));\r
-\r
-            var exportedValues = child.GetExportedValues<string>("Contract");\r
-\r
-            EnumerableAssert.AreEqual(exportedValues, "Child", "Parent");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView1_TypeAsMetadataViewTypeArgument_IsUsedAsMetadataConstraint()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("Metadata1", "MetadataValue1");\r
-            metadata.Add("Metadata2", "MetadataValue2");\r
-            metadata.Add("Metadata3", "MetadataValue3");\r
-\r
-            var container = ContainerFactory.Create(new MicroExport("Another",      metadata, "Value1"),\r
-                                                    new MicroExport(typeof(string), metadata, "Value1"),\r
-                                                    new MicroExport(typeof(string),           "Value2"));\r
-\r
-            var export = container.GetExport<string, IMetadataView>();\r
-            var metadataExport = (Lazy<string, IMetadataView>)export;\r
-\r
-            Assert.AreEqual("Value1", metadataExport.Value);\r
-            Assert.AreEqual("MetadataValue1", metadataExport.Metadata.Metadata1);\r
-            Assert.AreEqual("MetadataValue2", metadataExport.Metadata.Metadata2);\r
-            Assert.AreEqual("MetadataValue3", metadataExport.Metadata.Metadata3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportOfTTMetadataView2_TypeAsMetadataViewTypeArgument_IsUsedAsMetadataConstraint()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("Metadata1", "MetadataValue1");\r
-            metadata.Add("Metadata2", "MetadataValue2");\r
-            metadata.Add("Metadata3", "MetadataValue3");\r
-\r
-            var container = ContainerFactory.Create(new MicroExport("Another", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", "Value2"));\r
-\r
-            var export = container.GetExport<string, IMetadataView>("Contract");\r
-            var metadataExport = (Lazy<string, IMetadataView>)export;\r
-\r
-            Assert.AreEqual("Value1", metadataExport.Value);\r
-            Assert.AreEqual("MetadataValue1", metadataExport.Metadata.Metadata1);\r
-            Assert.AreEqual("MetadataValue2", metadataExport.Metadata.Metadata2);\r
-            Assert.AreEqual("MetadataValue3", metadataExport.Metadata.Metadata3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_TypeAsMetadataViewTypeArgument_IsUsedAsMetadataConstraint()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("Metadata1", "MetadataValue1");\r
-            metadata.Add("Metadata2", "MetadataValue2");\r
-            metadata.Add("Metadata3", "MetadataValue3");\r
-\r
-            var container = ContainerFactory.Create(new MicroExport("Another", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", "Value2"));\r
-\r
-            var definition = ImportDefinitionFactory.Create(\r
-                "Contract",\r
-                new Dictionary<string, Type> { { "Metadata1", typeof(object) }, { "Metadata2", typeof(object) }, { "Metadata3", typeof(object) } }\r
-                );\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.First();\r
-\r
-            Assert.AreEqual("Value1", export.Value);\r
-            EnumerableAssert.AreEqual(metadata, export.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports2_TypeAsMetadataViewTypeArgument_IsUsedAsMetadataConstraint()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("Metadata1", "MetadataValue1");\r
-            metadata.Add("Metadata2", "MetadataValue2");\r
-            metadata.Add("Metadata3", "MetadataValue3");\r
-\r
-            var container = ContainerFactory.Create(new MicroExport("Another", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", "Value2"));\r
-\r
-            var exports = container.GetExports(typeof(string), typeof(IMetadataView), "Contract");\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.First();\r
-            IMetadataView exportMetadata = export.Metadata as IMetadataView;\r
-\r
-            Assert.AreEqual("Value1", export.Value);\r
-            Assert.IsNotNull(exportMetadata);\r
-\r
-            Assert.AreEqual("MetadataValue1", exportMetadata.Metadata1);\r
-            Assert.AreEqual("MetadataValue2", exportMetadata.Metadata2);\r
-            Assert.AreEqual("MetadataValue3", exportMetadata.Metadata3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView1_TypeAsMetadataViewTypeArgument_IsUsedAsMetadataConstraint()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("Metadata1", "MetadataValue1");\r
-            metadata.Add("Metadata2", "MetadataValue2");\r
-            metadata.Add("Metadata3", "MetadataValue3");\r
-\r
-            var container = ContainerFactory.Create(new MicroExport("Another", metadata, "Value1"),\r
-                                                                     new MicroExport(typeof(string), metadata, "Value1"),\r
-                                                                     new MicroExport(typeof(string), "Value2"));\r
-\r
-            var exports = container.GetExports<string, IMetadataView>();\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = (Lazy<string, IMetadataView>)exports.First();\r
-\r
-            Assert.AreEqual("Value1", export.Value);\r
-            Assert.AreEqual("MetadataValue1", export.Metadata.Metadata1);\r
-            Assert.AreEqual("MetadataValue2", export.Metadata.Metadata2);\r
-            Assert.AreEqual("MetadataValue3", export.Metadata.Metadata3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportsOfTTMetadataView2_TypeAsMetadataViewTypeArgument_IsUsedAsMetadataConstraint()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("Metadata1", "MetadataValue1");\r
-            metadata.Add("Metadata2", "MetadataValue2");\r
-            metadata.Add("Metadata3", "MetadataValue3");\r
-\r
-            var container = ContainerFactory.Create(new MicroExport("Another", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", metadata, "Value1"),\r
-                                                                     new MicroExport("Contract", "Value2"));\r
-\r
-            var exports = container.GetExports<string, IMetadataView>("Contract");\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = (Lazy<string, IMetadataView>)exports.First();\r
-\r
-            Assert.AreEqual("Value1", export.Value);\r
-            Assert.AreEqual("MetadataValue1", export.Metadata.Metadata1);\r
-            Assert.AreEqual("MetadataValue2", export.Metadata.Metadata2);\r
-            Assert.AreEqual("MetadataValue3", export.Metadata.Metadata3);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForExactlyOneAndAllWhenContainerEmpty_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var definition = ImportDefinitionFactory.Create(export => true, ImportCardinality.ExactlyOne);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForZeroOrOneAndAllWhenContainerEmpty_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var definition = ImportDefinitionFactory.Create(export => true, ImportCardinality.ZeroOrOne);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports1_AskingForExactlyOneAndAllWhenContainerEmpty_ShouldReturnEmpty()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var definition = ImportDefinitionFactory.Create(export => true, ImportCardinality.ZeroOrMore);\r
-\r
-            var exports = container.GetExports(definition);\r
-\r
-            EnumerableAssert.IsEmpty(exports);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(465976)]\r
-        public void RemovePart_PartNotInContainerAsPartArgument_ShouldNotCauseImportsToBeRebound()\r
-        {\r
-            const string contractName = "Contract";\r
-\r
-            var exporter = PartFactory.CreateExporter(new MicroExport(contractName, 1));\r
-            var importer = PartFactory.CreateImporter(contractName);\r
-            var container = ContainerFactory.Create(exporter, importer);\r
-\r
-\r
-            Assert.AreEqual(1, importer.Value);\r
-            Assert.AreEqual(1, importer.ImportSatisfiedCount);\r
-\r
-            var doesNotExistInContainer = PartFactory.CreateExporter(new MicroExport(contractName, 2));\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.RemovePart(doesNotExistInContainer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importer.ImportSatisfiedCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(436847)]\r
-        public void RemovePart_PartInContainerQueueAsPartArgument_ShouldNotLeavePartInContainer()\r
-        {\r
-            const string contractName = "Contract";\r
-\r
-            var exporter = PartFactory.CreateExporter(new MicroExport(contractName, 1));\r
-            var importer = PartFactory.CreateImporter(contractName);\r
-            var container = ContainerFactory.Create(exporter, importer);\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.RemovePart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsNull(importer.Value);\r
-            Assert.AreEqual(2, importer.ImportSatisfiedCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RemovePart_PartAlreadyRemovedAsPartArgument_ShouldNotThrow()\r
-        {\r
-            var exporter = PartFactory.CreateExporter(new MicroExport("Contract", 1));\r
-            var container = ContainerFactory.Create(exporter);\r
-\r
-            Assert.AreEqual(1, container.GetExportedValue<int>("Contract"));\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.RemovePart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsFalse(container.IsPresent("Contract"));\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(exporter);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsFalse(container.IsPresent("Contract"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryComposeSimple()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            Int32Importer importer = new Int32Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer, new Int32Exporter(42));\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Expected value imported from export");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryComposeSimpleFail()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            Int32Importer importer = new Int32Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer);\r
-\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PartCannotSetImport, ErrorId.ImportEngine_ImportCardinalityMismatch, RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-\r
-            Assert.AreEqual(0, importer.Value, "Expected default value to remain");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeDisposableChildContainer()\r
-        {\r
-            var outerContainer = CreateCompositionContainer();\r
-            Int32Importer outerImporter = new Int32Importer();\r
-\r
-            CompositionBatch outerBatch = new CompositionBatch();\r
-            var key = outerBatch.AddExportedValue("Value", 42);\r
-            outerBatch.AddPart(outerImporter);\r
-            outerContainer.Compose(outerBatch);\r
-            Assert.AreEqual(42, outerImporter.Value, "Expected value imported from export");\r
-\r
-            Int32Importer innerImporter = new Int32Importer();\r
-            var innerContainer = new CompositionContainer(outerContainer);\r
-            CompositionBatch innerBatch = new CompositionBatch();\r
-            innerBatch.AddPart(innerImporter);\r
-\r
-            innerContainer.Compose(innerBatch);\r
-            Assert.AreEqual(42, innerImporter.Value, "Expected value imported from export");\r
-            Assert.AreEqual(42, outerImporter.Value, "Expected value imported from export");\r
-\r
-            outerBatch = new CompositionBatch();\r
-            outerBatch.RemovePart(key);\r
-            key = outerBatch.AddExportedValue("Value", -5);\r
-            outerContainer.Compose(outerBatch);\r
-            Assert.AreEqual(-5, innerImporter.Value, "Expected update value imported from export");\r
-            Assert.AreEqual(-5, outerImporter.Value, "Expected updated value imported from export");\r
-\r
-            innerContainer.Dispose();\r
-            outerBatch = new CompositionBatch();\r
-            outerBatch.RemovePart(key);\r
-            key = outerBatch.AddExportedValue("Value", 500);\r
-            outerContainer.Compose(outerBatch);\r
-            Assert.AreEqual(500, outerImporter.Value, "Expected updated value imported from export");\r
-            Assert.AreEqual(-5, innerImporter.Value, "Expected value not updated");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RemoveValueTest()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var key = batch.AddExportedValue("foo", "hello");\r
-            container.Compose(batch);\r
-            var result = container.GetExportedValue<string>("foo");\r
-            Assert.AreEqual("hello", result, "Should get the correct value");\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsFalse(container.IsPresent("foo"));\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(key);        // Remove should be idempotent\r
-            container.Compose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfValueTypeBoundToDefaultValueShouldNotAffectAvailableValues()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            var importer = new OptionalImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(0, importer.ValueType);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<int>("ValueType");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfNullableValueTypeBoundToDefaultValueShouldNotAffectAvailableValues()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            var importer = new OptionalImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsNull(importer.NullableValueType);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<int>("NullableValueType");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void OptionalImportsOfReferenceTypeBoundToDefaultValueShouldNotAffectAvailableValues()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            var importer = new OptionalImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsNull(importer.ReferenceType);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<int>("ReferenceType");\r
-            });            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportsChanged_ExportNothing_ShouldNotFireExportsChanged()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            container.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.Fail("Event should not be fired!");\r
-            };\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            container.Compose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportsChanged_ExportAdded_ShouldFireExportsChanged()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            IEnumerable<string> changedNames = null;\r
-\r
-            container.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.AreSame(container, sender);\r
-                Assert.IsNull(changedNames, "Ensure this event only fires once!");\r
-                Assert.IsNotNull(args.AddedExports);\r
-                Assert.IsNotNull(args.RemovedExports);\r
-                Assert.IsNotNull(args.ChangedContractNames);\r
-                changedNames = args.ChangedContractNames;\r
-            };\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("MyExport", new object());\r
-            container.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(changedNames, "MyExport");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportsChanged_ExportRemoved_ShouldFireExportsChanged()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            IEnumerable<string> changedNames = null;\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var part = batch.AddExportedValue("MyExport", new object());\r
-            container.Compose(batch);\r
-\r
-            container.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.AreSame(container, sender);\r
-                Assert.IsNull(changedNames, "Ensure this event only fires once!");\r
-                Assert.IsNotNull(args.AddedExports);\r
-                Assert.IsNotNull(args.RemovedExports);\r
-                Assert.IsNotNull(args.ChangedContractNames);\r
-                changedNames = args.ChangedContractNames;\r
-            };\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(part);\r
-            container.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(changedNames, "MyExport");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportsChanged_ExportAddAnother_ShouldFireExportsChanged()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            IEnumerable<string> changedNames = null;\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("MyExport", new object());\r
-            container.Compose(batch);\r
-\r
-            container.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.AreSame(container, sender);\r
-                Assert.IsNull(changedNames, "Ensure this event only fires once!");\r
-                Assert.IsNotNull(args.AddedExports);\r
-                Assert.IsNotNull(args.RemovedExports);\r
-                Assert.IsNotNull(args.ChangedContractNames);\r
-                changedNames = args.ChangedContractNames;\r
-            };\r
-\r
-            batch = new CompositionBatch();\r
-            // Adding another should cause an update.\r
-            batch.AddExportedValue("MyExport", new object());\r
-            container.Compose(batch);\r
-\r
-\r
-            EnumerableAssert.AreEqual(changedNames, "MyExport");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportsChanged_AddExportOnParent_ShouldFireExportsChangedOnBoth()\r
-        {\r
-            var parent = CreateCompositionContainer();\r
-            var child = new CompositionContainer(parent);\r
-\r
-            IEnumerable<string> parentNames = null;\r
-            parent.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.AreSame(parent, sender);\r
-                parentNames = args.ChangedContractNames;\r
-            };\r
-\r
-            IEnumerable<string> childNames = null;\r
-            child.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.AreSame(child, sender);\r
-                childNames = args.ChangedContractNames;\r
-            };\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("MyExport", new object());\r
-            parent.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(parentNames, "MyExport");\r
-            EnumerableAssert.AreEqual(childNames, "MyExport");\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void ExportsChanged_AddExportOnChild_ShouldFireExportsChangedOnChildOnly()\r
-        {\r
-            var parent = CreateCompositionContainer();\r
-            var child = new CompositionContainer(parent);\r
-\r
-            parent.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.Fail("Should not fire on parent container!!");\r
-            };\r
-\r
-            IEnumerable<string> childNames = null;\r
-            child.ExportsChanged += (sender, args) =>\r
-            {\r
-                Assert.AreSame(child, sender);\r
-                childNames = args.ChangedContractNames;\r
-            };\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("MyExport2", new object());\r
-            child.Compose(batch);\r
-\r
-            EnumerableAssert.AreEqual(childNames, "MyExport2");\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Dispose_BeforeCompose_CanBeCallMultipleTimes()\r
-        {\r
-            var container = ContainerFactory.Create(PartFactory.Create(), PartFactory.Create());\r
-            container.Dispose();\r
-            container.Dispose();\r
-            container.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_AfterCompose_CanBeCallMultipleTimes()\r
-        {\r
-            var container = ContainerFactory.Create(PartFactory.Create(), PartFactory.Create());\r
-            container.Dispose();\r
-            container.Dispose();\r
-            container.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CallsGCSuppressFinalize()\r
-        {\r
-            bool finalizerCalled = false;\r
-\r
-            var container = ContainerFactory.CreateDisposable(disposing =>\r
-            {\r
-                if (!disposing)\r
-                {\r
-                    finalizerCalled = true;\r
-                }\r
-\r
-            });\r
-\r
-            container.Dispose();\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-            GC.Collect();\r
-\r
-            Assert.IsFalse(finalizerCalled);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CallsDisposeBoolWithTrue()\r
-        {\r
-            var container = ContainerFactory.CreateDisposable(disposing =>\r
-            {\r
-                Assert.IsTrue(disposing);\r
-            });\r
-\r
-            container.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CallsDisposeBoolOnce()\r
-        {\r
-            int disposeCount = 0;\r
-\r
-            var container = ContainerFactory.CreateDisposable(disposing =>\r
-            {\r
-                disposeCount++;\r
-            });\r
-\r
-            container.Dispose();\r
-\r
-            Assert.AreEqual(1, disposeCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_ContainerAsExportedValue_CanBeDisposed()\r
-        {\r
-            using (var container = CreateCompositionContainer())\r
-            {\r
-                CompositionBatch batch = new CompositionBatch();\r
-                batch.AddExportedValue<ICompositionService>(container);\r
-                container.Compose(batch);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_ContainerAsPart_CanBeDisposed()\r
-        {   // Tests that when we re-enter CompositionContainer.Dispose, that we don't\r
-            // stack overflow.\r
-\r
-            using (var container = CreateCompositionContainer())\r
-            {\r
-                var part = PartFactory.CreateExporter(new MicroExport(typeof(ICompositionService), container));\r
-                CompositionBatch batch = new CompositionBatch();\r
-                batch.AddPart(part);\r
-                container.Compose(batch);\r
-\r
-                Assert.AreSame(container, container.GetExportedValue<ICompositionService>());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionService_ShouldNotBeImplicitlyExported()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            Assert.IsFalse(container.IsPresent<ICompositionService>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CompositionContainer_ShouldNotBeImplicitlyExported()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            Assert.IsFalse(container.IsPresent<CompositionContainer>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionService_ShouldNotBeImplicitlyImported()\r
-        {\r
-            var importer = PartFactory.CreateImporter<ICompositionService>();\r
-            var container = ContainerFactory.Create(importer);\r
-\r
-            Assert.IsNull(importer.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CompositionContainer_ShouldNotBeImplicitlyImported()\r
-        {\r
-            var importer = PartFactory.CreateImporter<CompositionContainer>();\r
-            var container = ContainerFactory.Create(importer);\r
-\r
-            Assert.IsNull(importer.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionService_CanBeExported()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue<ICompositionService>(container);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreSame(container, container.GetExportedValue<ICompositionService>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CompositionContainer_CanBeExported()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue<CompositionContainer>(container);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreSame(container, container.GetExportedValue<CompositionContainer>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReleaseExport_Null_ShouldThrowArugmentNull()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("export", \r
-                () => container.ReleaseExport(null));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReleaseExports_Null_ShouldThrowArgumentNull()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exports",\r
-                () => container.ReleaseExports(null));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReleaseExports_ElementNull_ShouldThrowArgument()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports",\r
-                () => container.ReleaseExports(new Export[] { null }));\r
-        }\r
-\r
-        public class OptionalImporter\r
-        {\r
-            [Import("ValueType", AllowDefault = true)]\r
-            public int ValueType\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("NullableValueType", AllowDefault = true)]\r
-            public int? NullableValueType\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            [Import("ReferenceType", AllowDefault = true)]\r
-            public string ReferenceType\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        public class ExportSimpleIntWithException\r
-        {\r
-            [Export("SimpleInt")]\r
-            public int SimpleInt { get { throw new NotImplementedException(); } }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryGetValueWithCatalogVerifyExecptionDuringGet()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, ErrorId.ReflectionModel_ExportThrewException, () =>\r
-            {\r
-                container.GetExportedValue<int>("SimpleInt");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryGetExportedValueWhileLockedForNotify()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(new CallbackImportNotify(delegate\r
-            {\r
-                container.GetExportedValueOrDefault<int>();\r
-            }));\r
-\r
-            container.Compose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RawExportTests()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("foo", 1);\r
-            container.Compose(batch);\r
-\r
-            Lazy<int> export = container.GetExport<int>("foo");\r
-\r
-            Assert.AreEqual(1, export.Value, "Should be the value I put in...");\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(468388)]\r
-        public void ContainerXGetXTest()\r
-        {\r
-            CompositionContainer container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new MyExporterWithNoFoo());\r
-            container.Compose(batch);\r
-            ContainerXGetExportBoundValue(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(468388)]\r
-        public void ContainerXGetXByComponentCatalogTest()\r
-        {\r
-            CompositionContainer container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            ContainerXGetExportBoundValue(container);\r
-        }\r
-\r
-        private void ContainerXGetExportBoundValue(CompositionContainer container)\r
-        {\r
-            Assert.Fail("This scenario (required metadata warnings) no longer works, see 468388");\r
-\r
-            //string[] required = new string[] { "Foo" };\r
-            //string[] RequiredMetadataNotFound = new string[] { CompositionIssueId.RequiredMetadataNotFound, CompositionIssueId.CardinalityMismatch };\r
-            //container.TryGetExport<MyExporterWithNoFoo>().VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExport<MyExporterWithNoFoo>(required).VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExport<MyExporterWithNoFoo>("MyExporterWithNoFoo").VerifySuccess();\r
-            //container.TryGetExport<MyExporterWithNoFoo>("MyExporterWithNoFoo", required).VerifyFailure(RequiredMetadataNotFound);\r
-            //container.TryGetExports<MyExporterWithNoFoo>().VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExports<MyExporterWithNoFoo>(required).VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExports<MyExporterWithNoFoo>("MyExporterWithNoFoo").VerifySuccess();\r
-            //container.TryGetExports<MyExporterWithNoFoo>("MyExporterWithNoFoo", required).VerifyFailure(RequiredMetadataNotFound);\r
-            //container.TryGetExportedValue<MyExporterWithNoFoo>().VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExportedValue<MyExporterWithNoFoo>(required).VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExportedValue<MyExporterWithNoFoo>("MyExporterWithNoFoo").VerifySuccess();\r
-            //container.TryGetExportedValue<MyExporterWithNoFoo>("MyExporterWithNoFoo", required).VerifyFailure(RequiredMetadataNotFound);\r
-            //container.TryGetExportedValues<MyExporterWithNoFoo>().VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExportedValues<MyExporterWithNoFoo>(required).VerifyFailure(CompositionIssueId.CardinalityMismatch);\r
-            //container.TryGetExportedValues<MyExporterWithNoFoo>("MyExporterWithNoFoo").VerifySuccess();\r
-            //container.TryGetExportedValues<MyExporterWithNoFoo>("MyExporterWithNoFoo", required).VerifyFailure(RequiredMetadataNotFound);\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() => container.GetExportedValue<MyExporterWithNoFoo>());\r
-            Assert.IsNotNull(container.GetExportedValue<MyExporterWithNoFoo>("MyExporterWithNoFoo"));\r
-        }\r
-\r
-        [Export("MyExporterWithNoFoo")]\r
-        public class MyExporterWithNoFoo\r
-        {\r
-        }\r
-\r
-        [Export("MyExporterWithFoo")]\r
-        [ExportMetadata("Foo", "Foo value")]\r
-        public class MyExporterWithFoo\r
-        {\r
-        }\r
-\r
-        [Export("MyExporterWithFooBar")]\r
-        [ExportMetadata("Foo", "Foo value")]\r
-        [ExportMetadata("Bar", "Bar value")]\r
-        public class MyExporterWithFooBar\r
-        {\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-        // Silverlight doesn't support strongly typed metadata\r
-        [TestMethod]\r
-        public void ConverterExportTests()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("foo", 1);\r
-            container.Compose(batch);\r
-\r
-            var export = container.GetExport<int, IDictionary<string, object>>("foo");\r
-            Assert.AreEqual(1, export.Value, "Should be the value I put in...");\r
-            Assert.IsNotNull(export.Metadata, "Should have metadata (as an object)");\r
-        }\r
-\r
-#endif //!SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void RemoveFromWrongContainerTest()\r
-        {\r
-            CompositionContainer d1 = CreateCompositionContainer();\r
-            CompositionContainer d2 = CreateCompositionContainer();\r
-\r
-            CompositionBatch batch1 = new CompositionBatch();\r
-            var valueKey = batch1.AddExportedValue("a", 1);\r
-            d1.Compose(batch1);\r
-\r
-            CompositionBatch batch2 = new CompositionBatch();\r
-            batch2.RemovePart(valueKey);\r
-            // removing entry from wrong container, shoudl be a no-op\r
-            d2.Compose(batch2);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void AddPartSimple()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            var importer = new Int32Importer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            batch.AddPart(new Int32Exporter(42));\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Expected value imported from export");\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void AddPart()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            Int32Importer importer = new Int32Importer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(AttributedModelServices.CreatePart(importer));\r
-            batch.AddPart(new Int32Exporter(42));\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Expected value imported from export");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeReentrantChildContainerDisposed()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            Int32Importer outerImporter = new Int32Importer();\r
-            Int32Importer innerImporter = new Int32Importer();\r
-            Int32Exporter exporter = new Int32Exporter(42);\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(exporter);\r
-            container.Compose(batch);\r
-            CallbackExecuteCodeDuringCompose callback = new CallbackExecuteCodeDuringCompose(() =>\r
-            {\r
-                using (CompositionContainer innerContainer = new CompositionContainer(container))\r
-                {\r
-                    CompositionBatch nestedBatch = new CompositionBatch();\r
-                    nestedBatch.AddPart(innerImporter);\r
-                    innerContainer.Compose(nestedBatch);\r
-                }\r
-                Assert.AreEqual(42, innerImporter.Value, "Expected value imported from export");\r
-            });\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddParts(outerImporter, callback);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, outerImporter.Value, "Expected value imported from export");\r
-            Assert.AreEqual(42, innerImporter.Value, "Expected value imported from export");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeSimple()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            Int32Importer importer = new Int32Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer, new Int32Exporter(42));\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Expected value imported from export");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeSimpleFail()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            Int32Importer importer = new Int32Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PartCannotSetImport,          // Cannot set Int32Importer.Value because\r
-                                          ErrorId.ImportEngine_ImportCardinalityMismatch,    // No exports are present that match contract\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExceptionDuringNotify()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(new CallbackImportNotify(delegate\r
-            {\r
-                throw new InvalidOperationException();\r
-            }));\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotActivate,              // Cannot activate CallbackImportNotify because\r
-                                          ErrorId.ReflectionModel_PartOnImportsSatisfiedThrewException, // OnImportsSatisfied threw an exception\r
-                                          RetryMode.DoNotRetry, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NeutralComposeWhileNotified()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(new CallbackImportNotify(delegate\r
-            {\r
-                // Is this really a supported scenario?\r
-                container.Compose(batch);\r
-            }));\r
-\r
-            container.Compose(batch);\r
-        }\r
-        public class PartWithReentrantCompose : ComposablePart\r
-        {\r
-            private CompositionContainer _container;\r
-\r
-            public PartWithReentrantCompose(CompositionContainer container)\r
-            {\r
-                this._container = container;\r
-            }\r
-\r
-            public override IEnumerable<ExportDefinition> ExportDefinitions\r
-            {\r
-                get\r
-                {\r
-                    this._container.ComposeExportedValue<string>("ExportedString");\r
-                    return Enumerable.Empty<ExportDefinition>();\r
-                }\r
-            }\r
-\r
-            public override IEnumerable<ImportDefinition> ImportDefinitions\r
-            {\r
-                get\r
-                {\r
-                    return Enumerable.Empty<ImportDefinition>();\r
-                }\r
-            }\r
-\r
-            public override object GetExportedValue(ExportDefinition definition)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class SimpleExporter\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ThreadSafeCompositionContainer()\r
-        {\r
-            TypeCatalog catalog = new TypeCatalog(typeof(SimpleExporter));\r
-\r
-            CompositionContainer container = new CompositionContainer(catalog, true);\r
-            Int32Importer importer = new Int32Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer, new Int32Exporter(42));\r
-            container.Compose(batch);\r
-\r
-            Assert.IsNotNull(container.GetExportedValue<SimpleExporter>());\r
-            Assert.AreEqual(42, importer.Value, "Expected value imported from export");\r
-\r
-            container.Dispose();\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReentrantencyDisabledWhileComposing()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new PartWithReentrantCompose(container));\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-                container.Compose(batch));\r
-        }\r
-        private static Expression<Func<ExportDefinition, bool>> ConstraintFromContract(string contractName)\r
-        {\r
-            return ConstraintFactory.Create(contractName);\r
-        }\r
-\r
-        private static string ContractFromType(Type type)\r
-        {\r
-            return AttributedModelServices.GetContractName(type);\r
-        }\r
-\r
-        private static CompositionContainer CreateCompositionContainer()\r
-        {\r
-            return new CompositionContainer();\r
-        }\r
-\r
-        public interface IMetadataView\r
-        {\r
-            string Metadata1\r
-            {\r
-                get;\r
-            }\r
-\r
-            string Metadata2\r
-            {\r
-                get;\r
-            }\r
-\r
-            string Metadata3\r
-            {\r
-                get;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_NullStringAsExportedValueArgument_VerifyCanPullOnValue()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-\r
-            var expectation = (string)null;\r
-            container.ComposeExportedValue<string>(expectation);\r
-            var actualValue = container.GetExportedValue<string>();\r
-\r
-            Assert.AreEqual(expectation, actualValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_StringAsExportedValueArgument_VerifyCanPullOnValue()\r
-        {\r
-            var expectations = new List<string>();\r
-            expectations.Add((string)null);\r
-            expectations.Add(String.Empty);\r
-            expectations.Add("Value");\r
-\r
-            foreach (var expectation in expectations)\r
-            {\r
-                var container = CreateCompositionContainer();\r
-                container.ComposeExportedValue<string>(expectation);\r
-                var actualValue = container.GetExportedValue<string>();\r
-\r
-                Assert.AreEqual(expectation, actualValue);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_StringAsIEnumerableOfCharAsExportedValueArgument_VerifyCanPullOnValue()\r
-        {\r
-            var expectations = new List<string>();\r
-            expectations.Add((string)null);\r
-            expectations.Add(String.Empty);\r
-            expectations.Add("Value");\r
-\r
-            foreach (var expectation in expectations)\r
-            {\r
-                var container = CreateCompositionContainer();\r
-                container.ComposeExportedValue<IEnumerable<char>>(expectation);\r
-                var actualValue = container.GetExportedValue<IEnumerable<char>>();\r
-\r
-                Assert.AreEqual(expectation, actualValue);\r
-            }\r
-        }\r
-            \r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ObjectAsExportedValueArgument_VerifyCanPullOnValue()\r
-        {\r
-            var expectations = new List<object>();\r
-            expectations.Add((string)null);\r
-            expectations.Add(String.Empty);\r
-            expectations.Add("Value");\r
-            expectations.Add(42);\r
-            expectations.Add(new object());\r
-\r
-            foreach (var expectation in expectations)\r
-            {\r
-                var container = CreateCompositionContainer();\r
-                container.ComposeExportedValue<object>(expectation);\r
-                var actualValue = container.GetExportedValue<object>();\r
-\r
-                Assert.AreEqual(expectation, actualValue);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ExportedValue_ExportedUnderDefaultContractName()\r
-        {\r
-            string expectedContractName = AttributedModelServices.GetContractName(typeof(string));\r
-            var container = CreateCompositionContainer();\r
-            container.ComposeExportedValue<string>("Value");\r
-\r
-            var importDefinition = new ImportDefinition(ed => true, null, ImportCardinality.ZeroOrMore, false, false);\r
-            var exports = container.GetExports(importDefinition);\r
-            Assert.AreEqual(1, exports.Count());\r
-            Assert.AreEqual(expectedContractName, exports.Single().Definition.ContractName);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ExportedValue_ExportContainsEmptyMetadata()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.ComposeExportedValue<string>("Value");\r
-\r
-            var importDefinition = new ImportDefinition(ed => true, null, ImportCardinality.ZeroOrMore, false, false);\r
-            var exports = container.GetExports(importDefinition);\r
-            Assert.AreEqual(1, exports.Count());\r
-            Assert.AreEqual(1, exports.Single().Metadata.Count);  // contains type identity\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ExportedValue_LazyContainsEmptyMetadata()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            container.ComposeExportedValue<string>("Value");\r
-\r
-            var lazy = container.GetExport<string, IDictionary<string, object>>();\r
-            Assert.AreEqual(1, lazy.Metadata.Count);  // contains type identity\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ExportedValue_ImportsAreNotDiscovered()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            var importer = new PartWithRequiredImport();\r
-\r
-            container.ComposeExportedValue<object>(importer);\r
-\r
-            var importDefinition = new ImportDefinition(ed => true, null, ImportCardinality.ZeroOrMore, false, false);\r
-            var exports = container.GetExports(importDefinition);\r
-            Assert.AreEqual(1, exports.Count());  // we only get one if the import was not discovered since the import is not satisfied\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_NullAsContractName_ThrowsArgumentNullException()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("contractName", () =>\r
-                container.ComposeExportedValue<string>((string)null, "Value"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_EmptyStringAsContractName_ThrowsArgumentException()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("contractName", () =>\r
-                container.ComposeExportedValue<string>(String.Empty, "Value"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ValidContractName_ValidExportedValue_VerifyCanPullOnValue()\r
-        {\r
-            var expectations = new List<Tuple<string, string>>();\r
-            expectations.Add(new Tuple<string, string>(" ", (string)null));\r
-            expectations.Add(new Tuple<string, string>(" ", String.Empty));\r
-            expectations.Add(new Tuple<string, string>(" ", "Value"));\r
-            expectations.Add(new Tuple<string, string>("ContractName", (string)null));\r
-            expectations.Add(new Tuple<string, string>("ContractName", String.Empty));\r
-            expectations.Add(new Tuple<string, string>("ContractName", "Value"));\r
-\r
-            foreach (var expectation in expectations)\r
-            {\r
-                var container = CreateCompositionContainer();\r
-                container.ComposeExportedValue<string>(expectation.Item1, expectation.Item2);\r
-                var actualValue = container.GetExportedValue<string>(expectation.Item1);\r
-\r
-                Assert.AreEqual(expectation.Item2, actualValue);\r
-\r
-                ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-                    container.GetExportedValue<string>());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ValidContractName_ExportedValue_ExportedUnderSpecifiedContractName()\r
-        {\r
-            string expectedContractName = "ContractName";\r
-            var container = CreateCompositionContainer();\r
-            container.ComposeExportedValue<string>(expectedContractName, "Value");\r
-\r
-            var importDefinition = new ImportDefinition(ed => true, null, ImportCardinality.ZeroOrMore, false, false);\r
-            var exports = container.GetExports(importDefinition);\r
-            Assert.AreEqual(1, exports.Count());\r
-            Assert.AreEqual(expectedContractName, exports.Single().Definition.ContractName);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void ComposeExportedValueOfT_ValidContractName_ExportedValue_ExportContainsEmptyMetadata()\r
-        {\r
-            string expectedContractName = "ContractName";\r
-            var container = CreateCompositionContainer();\r
-            container.ComposeExportedValue<string>(expectedContractName, "Value");\r
-\r
-            var importDefinition = new ImportDefinition(ed => ed.ContractName == expectedContractName, null, ImportCardinality.ZeroOrMore, false, false);\r
-            var exports = container.GetExports(importDefinition);\r
-            Assert.AreEqual(1, exports.Count());\r
-            Assert.AreEqual(1, exports.Single().Metadata.Count); // contains type identity\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ComposeExportedValueOfT_ValidContractName_ExportedValue_ImportsAreNotDiscovered()\r
-        {\r
-            var container = CreateCompositionContainer();\r
-            var importer = new PartWithRequiredImport();\r
-\r
-            container.ComposeExportedValue<object>("ContractName", importer);\r
-\r
-            var importDefinition = new ImportDefinition(ed => true, null, ImportCardinality.ZeroOrMore, false, false);\r
-            var exports = container.GetExports(importDefinition);\r
-            Assert.AreEqual(1, exports.Count());  // we only get one if the import was not discovered since the import is not satisfied\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestExportedValueCachesNullValue()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var exporter = new ExportsMutableProperty();\r
-            exporter.Property = null;\r
-            container.ComposeParts(exporter);\r
-            Assert.IsNull(container.GetExportedValue<string>("Property"));\r
-            exporter.Property = "Value1";\r
-            // Exported value should have been cached and so it shouldn't change\r
-            Assert.IsNull(container.GetExportedValue<string>("Property"));\r
-        }\r
-        public class ExportsMutableProperty\r
-        {\r
-            [Export("Property")]\r
-            public string Property { get; set; }\r
-        }\r
-\r
-\r
-        public class PartWithRequiredImport\r
-        {\r
-            [Import]\r
-            public object Import { get; set; }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorDebuggerProxyTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorDebuggerProxyTests.cs
deleted file mode 100644 (file)
index e154ccd..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionErrorDebuggerProxyTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsErrorArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("error", () =>\r
-            {\r
-                new CompositionErrorDebuggerProxy((CompositionError)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsErrorArgument_ShouldSetExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptionsWithNull();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = ErrorFactory.Create(e);\r
-\r
-                var proxy = new CompositionErrorDebuggerProxy(error);\r
-\r
-                Assert.AreSame(error.Exception, proxy.Exception);\r
-            }            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsErrorArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = ErrorFactory.Create(e);\r
-\r
-                var proxy = new CompositionErrorDebuggerProxy(error);\r
-\r
-                Assert.AreSame(error.Description, proxy.Description);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsErrorArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElementsWithNull();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = ErrorFactory.Create(e);\r
-\r
-                var proxy = new CompositionErrorDebuggerProxy(error);\r
-\r
-                Assert.AreSame(error.Element, proxy.Element);\r
-            }\r
-        }\r
-\r
-   }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorIdTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorIdTests.cs
deleted file mode 100644 (file)
index a1ac6f0..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionErrorIdTests\r
-    {\r
-        [TestMethod]\r
-        public void CompositionErrorIdsAreInSyncWithErrorIds()\r
-        {\r
-            ExtendedAssert.EnumsContainSameValues<CompositionErrorId, ErrorId>();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionErrorTests.cs
deleted file mode 100644 (file)
index 4644364..0000000
+++ /dev/null
@@ -1,533 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-#if !SILVERLIGHT\r
-using System.Runtime.Serialization;\r
-#endif\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionErrorTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_NullAsMessageArgument_ShouldSetMessagePropertyToEmptyString()\r
-        {\r
-            var error = new CompositionError((string)null);\r
-\r
-            Assert.AreEqual("", error.Description);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsMessageArgument_ShouldSetMessagePropertyToEmptyString()\r
-        {\r
-            var error = new CompositionError((string)null, ElementFactory.Create());\r
-\r
-            Assert.AreEqual("", error.Description);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsMessageArgument_ShouldSetMessagePropertyToEmptyString()\r
-        {\r
-            var error = new CompositionError((string)null, new Exception());\r
-\r
-            Assert.AreEqual("", error.Description);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsMessageArgument_ShouldSetMessagePropertyToEmptyString()\r
-        {\r
-            var error = new CompositionError((string)null, ElementFactory.Create(), new Exception());\r
-\r
-            Assert.AreEqual("", error.Description);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsMessageArgument_ShouldSetMessagePropertyToEmptyString()\r
-        {\r
-            var error = new CompositionError(CompositionErrorId.Unknown, (string)null, ElementFactory.Create(), new Exception());\r
-\r
-            Assert.AreEqual("", error.Description);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError(e);\r
-\r
-                Assert.AreEqual(e, exception.Description);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError(e, ElementFactory.Create());\r
-\r
-                Assert.AreEqual(e, exception.Description);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError(e, new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Description);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError(e, ElementFactory.Create(), new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Description);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError(CompositionErrorId.Unknown, e, ElementFactory.Create(), new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Description);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description");\r
-\r
-            Assert.IsNull(error.Exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description", ElementFactory.Create());\r
-\r
-            Assert.IsNull(error.Exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsExceptionArgument_ShouldSetExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description", (Exception)null);\r
-\r
-            Assert.IsNull(error.Exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsExceptionArgument_ShouldSetExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description", ElementFactory.Create(), (Exception)null);\r
-\r
-            Assert.IsNull(error.Exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsExceptionArgument_ShouldSetExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError(CompositionErrorId.Unknown, "Description", ElementFactory.Create(), (Exception)null);\r
-\r
-            Assert.IsNull(error.Exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsExceptionArgument_ShouldSetExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = new CompositionError("Description", e);\r
-\r
-                Assert.AreSame(e, error.Exception);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsExceptionArgument_ShouldSetExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = new CompositionError("Description", ElementFactory.Create(), e);\r
-\r
-                Assert.AreSame(e, error.Exception);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsExceptionArgument_ShouldSetExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = new CompositionError(CompositionErrorId.Unknown, "Description", ElementFactory.Create(), e);\r
-\r
-                Assert.AreSame(e, error.Exception);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description");\r
-\r
-            Assert.IsNull(((ICompositionError)error).InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description", ElementFactory.Create());\r
-\r
-            Assert.IsNull(((ICompositionError)error).InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description", (Exception)null);\r
-\r
-            Assert.IsNull(((ICompositionError)error).InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError("Description", ElementFactory.Create(), (Exception)null);\r
-\r
-            Assert.IsNull(((ICompositionError)error).InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var error = new CompositionError(CompositionErrorId.Unknown, "Description", ElementFactory.Create(), (Exception)null);\r
-\r
-            Assert.IsNull(((ICompositionError)error).InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = new CompositionError("Description", e);\r
-\r
-                Assert.AreSame(e, ((ICompositionError)error).InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = new CompositionError("Description", ElementFactory.Create(), e);\r
-\r
-                Assert.AreSame(e, ((ICompositionError)error).InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var error = new CompositionError("Description");\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, ((ICompositionError)error).Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var error = new CompositionError("Description", ElementFactory.Create());\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, ((ICompositionError)error).Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var error = new CompositionError("Description", new Exception());\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, ((ICompositionError)error).Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ShouldSetICompositionErrorIdPropertyToCompositionErrorIdUnknown()\r
-        {\r
-            var error = new CompositionError("Description", ElementFactory.Create(), new Exception());\r
-\r
-            Assert.AreEqual(CompositionErrorId.Unknown, ((ICompositionError)error).Id);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsIdArgument_ShouldSetICompositionErrorIdProperty()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = new CompositionError(e, "Description", ElementFactory.Create(), new Exception());\r
-\r
-                Assert.AreEqual(e, ((ICompositionError)error).Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new CompositionError("Description");\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsElementArgument_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new CompositionError("Description", (ICompositionElement)null);\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new CompositionError("Description", new Exception());\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsElementArgument_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new CompositionError("Description", (ICompositionElement)null, new Exception());\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsElementArgument_ShouldSetElementPropertyToNull()\r
-        {\r
-            var exception = new CompositionError(CompositionErrorId.Unknown, "Description", (ICompositionElement)null, new Exception());\r
-\r
-            Assert.IsNull(exception.Element);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsElementArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError("Description", (ICompositionElement)e);\r
-\r
-                Assert.AreSame(e, exception.Element);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsElementArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError("Description", (ICompositionElement)e, new Exception());\r
-\r
-                Assert.AreSame(e, exception.Element);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsElementArgument_ShouldSetElementProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionError(CompositionErrorId.Unknown, "Description", (ICompositionElement)e, new Exception());\r
-\r
-                Assert.AreSame(e, exception.Element);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = CreateCompositionError(e);\r
-\r
-                Assert.AreEqual(error.Description, error.ToString());\r
-            }\r
-        }        \r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void ICompositionErrorId_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = (ICompositionError)CreateCompositionError(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(error);\r
-\r
-                Assert.AreEqual(error.Id, result.Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Exception_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptionsWithNull();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = CreateCompositionError(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(error);\r
-\r
-                ExtendedAssert.IsInstanceOfSameType(error.Exception, result.Exception);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Message_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = CreateCompositionError(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(error);\r
-\r
-                Assert.AreEqual(error.Description, result.Description);\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        private static CompositionError CreateCompositionError()\r
-        {\r
-            return CreateCompositionError(CompositionErrorId.Unknown, (string)null, (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError(string message)\r
-        {\r
-            return CreateCompositionError(CompositionErrorId.Unknown, message, (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError(CompositionErrorId id)\r
-        {\r
-            return CreateCompositionError(id, (string)null, (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError(Exception exception)\r
-        {\r
-            return CreateCompositionError(CompositionErrorId.Unknown, (string)null, (ICompositionElement)null, exception);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError(ICompositionElement element)\r
-        {\r
-            return CreateCompositionError(CompositionErrorId.Unknown, (string)null, element, (Exception)null);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError(CompositionErrorId id, string message, ICompositionElement element, Exception exception)\r
-        {\r
-            return new CompositionError(id, message, element, exception);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError(params string[] messages)\r
-        {\r
-            CompositionError error = null;\r
-            foreach (string message in messages.Reverse())\r
-            {\r
-                CompositionException exception = null;\r
-                if (error != null)\r
-                {\r
-                    exception = CreateCompositionException(error);\r
-                }\r
-\r
-                error = ErrorFactory.Create(message, exception);\r
-            }\r
-\r
-            return error;\r
-        }\r
-\r
-        private static CompositionError CreateCompositionErrorWithException(params string[] messages)\r
-        {\r
-            Exception innerException = null;\r
-            foreach (string message in messages.Skip(1).Reverse())\r
-            {\r
-                innerException = new Exception(message, innerException);\r
-            }\r
-\r
-            return new CompositionError(messages[0], innerException);\r
-        }\r
-\r
-        private static CompositionError CreateCompostionErrorWithCompositionException(string message1, string message2)\r
-        {\r
-            var exception = CreateCompositionException(new Exception(message2));\r
-\r
-            return new CompositionError(message1, exception);\r
-        }\r
-\r
-        private static CompositionException CreateCompositionException(CompositionError error)\r
-        {\r
-            return new CompositionException(error);\r
-        }\r
-\r
-        private static CompositionException CreateCompositionException(Exception innerException)\r
-        {\r
-            return new CompositionException("Description", innerException, null);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionExceptionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionExceptionTests.cs
deleted file mode 100644 (file)
index af9d9b0..0000000
+++ /dev/null
@@ -1,680 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Globalization;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.Security;\r
-using System.Security.Permissions;\r
-using System.Text;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.UnitTesting;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-#if !SILVERLIGHT\r
-using System.Runtime.Serialization;\r
-using System.Security.Policy;\r
-#endif\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass][Serializable]\r
-    public class CompositionExceptionTests\r
-    {\r
-#if !SILVERLIGHT\r
-        public delegate void Work(int index);\r
-\r
-        public class Worker : MarshalByRefObject\r
-        {\r
-            public static ExpectationCollection<IEnumerable<CompositionError>, string> expectations = new ExpectationCollection<IEnumerable<CompositionError>, string>();\r
-            static Worker()\r
-            {\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error"), "1<Separator> Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error|Error"), "1<Separator> Error|2<Separator> Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error|Error|Error"), "1<Separator> Error|2<Separator> Error|3<Separator> Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Error)"), "1<Separator> Error|<Prefix>Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Error)"), "1<Separator> Error|<Prefix>Error|2<Separator> Error|<Prefix>Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Error|Error)"), "1<Separator> Error|<Prefix>Error|2<Separator> Error|<Prefix>Error|3<Separator> Error|<Prefix>Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Error(Exception))"), "1<Separator> Exception|<Prefix>Error|<Prefix>Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Exception)"), "1<Separator> Error|<Prefix>Error|2<Separator> Exception|<Prefix>Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Exception)"), "1<Separator> Exception|<Prefix>Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Exception(Exception))"), "1<Separator> Exception|<Prefix>Exception|<Prefix>Error");\r
-                expectations.Add(ErrorFactory.CreateFromDsl("Error(Error(Exception)|Error)"), "1<Separator> Exception|<Prefix>Error|<Prefix>Error|2<Separator> Error|<Prefix>Error");\r
-            }\r
-\r
-            public Work Action;\r
-\r
-            internal void DoWork(int index)\r
-            {\r
-                Action(index);\r
-            }\r
-\r
-        }\r
-\r
-#endif\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionException();\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionException((string)null);\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyEnumerableAsErrorsArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionException(Enumerable.Empty<CompositionError>());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionException((string)null, new Exception());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionException((string)null, new Exception(), Enumerable.Empty<CompositionError>());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionException(e);\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionException(e, new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionException(e, new Exception(), Enumerable.Empty<CompositionError>());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionException();\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionException("Message");\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionException(Enumerable.Empty<CompositionError>());\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionException("Message", (Exception)null);\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionException("Message", (Exception)null, Enumerable.Empty<CompositionError>());\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionException("Message", e);\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionException("Message", e, Enumerable.Empty<CompositionError>());\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ArrayWithNullAsErrorsArgument_ShouldThrowArgument()\r
-        {\r
-            var errors = new CompositionError[] { null };\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("errors", () =>\r
-            {\r
-                new CompositionException(errors);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ArrayWithNullAsErrorsArgument_ShouldThrowArgument()\r
-        {\r
-            var errors = new CompositionError[] { null };\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("errors", () =>\r
-            {\r
-                new CompositionException("Message", new Exception(), errors);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetErrorsPropertyToEmpty()\r
-        {\r
-            var exception = new CompositionException();\r
-\r
-            EnumerableAssert.IsEmpty(exception.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var exception = new CompositionException((IEnumerable<CompositionError>)null);\r
-\r
-            EnumerableAssert.IsEmpty(exception.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyEnumerableAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var exception = new CompositionException(Enumerable.Empty<CompositionError>());\r
-\r
-            EnumerableAssert.IsEmpty(exception.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsErrorsArgument_ShouldSetErrorsProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionException(e);\r
-\r
-                EnumerableAssert.AreSequenceSame(e, exception.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ArrayAsAsErrorsArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var error = CreateCompositionError();\r
-            var errors = new CompositionError[] { error };\r
-\r
-            var exception = new CompositionException(errors);\r
-\r
-            errors[0] = null;\r
-\r
-            EnumerableAssert.AreEqual(exception.Errors, error);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetErrorsPropertyToEmpty()\r
-        {\r
-            var exception = new CompositionException();\r
-\r
-            EnumerableAssert.IsEmpty(exception.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var exception = new CompositionException("Message", new Exception());\r
-\r
-            EnumerableAssert.IsEmpty(exception.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var exception = new CompositionException("Message", new Exception(), (IEnumerable<CompositionError>)null);\r
-\r
-            EnumerableAssert.IsEmpty(exception.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_EmptyEnumerableAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var exception = new CompositionException("Message", new Exception(), Enumerable.Empty<CompositionError>());\r
-\r
-            EnumerableAssert.IsEmpty(exception.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValueAsErrorsArgument_ShouldSetErrorsProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionException("Message", new Exception(), e);\r
-\r
-                EnumerableAssert.AreSequenceSame(e, exception.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ArrayAsAsErrorsArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var error = CreateCompositionError();\r
-            var errors = new CompositionError[] { error };\r
-\r
-            var exception = new CompositionException("Message", new Exception(), errors);\r
-\r
-            errors[0] = null;\r
-\r
-            EnumerableAssert.AreEqual(exception.Errors, error);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Message_ShouldIncludeElementGraph()\r
-        {\r
-            var expectations = new ExpectationCollection<CompositionError, string>();\r
-            CompositionError error = null;\r
-\r
-            error = CreateCompositionErrorWithElementChain(1);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-            error = CreateCompositionErrorWithElementChain(2);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-            error = CreateCompositionErrorWithElementChain(3);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-            error = CreateCompositionErrorWithElementChain(10);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateCompositionException(new CompositionError[] { e.Input });\r
-\r
-                string result = exception.ToString();\r
-                string expected = FixMessage(e.Output);\r
-                StringAssert.Contains(result, expected);\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT && CLR40\r
-        [TestMethod]\r
-        public void Message_ShouldIncludeElementGraphAccrossAppDomain()\r
-        {\r
-            PermissionSet ps = new PermissionSet(PermissionState.None);\r
-            ps.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));\r
-            ps.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.MemberAccess));\r
-\r
-            //Create a new sandboxed domain \r
-            AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;\r
-            AppDomain newDomain = AppDomain.CreateDomain("test domain", null, setup, ps);\r
-\r
-            Worker remoteWorker = (Worker)newDomain.CreateInstanceAndUnwrap(\r
-                Assembly.GetExecutingAssembly().FullName,\r
-                typeof(Worker).FullName);\r
-\r
-            var expectationIndex = new int[] { 1, 2, 3, 10};\r
-\r
-            var expectations = new ExpectationCollection<CompositionError, string>();\r
-            CompositionError error = null;\r
-\r
-            error = CreateCompositionErrorWithElementChain(1);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-            error = CreateCompositionErrorWithElementChain(2);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-            error = CreateCompositionErrorWithElementChain(3);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-            error = CreateCompositionErrorWithElementChain(10);\r
-            expectations.Add(error, GetElementGraphString(error));\r
-\r
-            int index = 0;\r
-            foreach (var e in expectations)\r
-            {\r
-                try\r
-                {\r
-                    remoteWorker.Action = (int x) => \r
-                    {\r
-                        var lclExpectations = new ExpectationCollection<CompositionError, string>();\r
-\r
-                        var lclError = CreateCompositionErrorWithElementChain(x);\r
-                        lclExpectations.Add(lclError, GetElementGraphString(lclError));\r
-\r
-                        var ce =  CreateCompositionException(new CompositionError[] { lclExpectations[0].Input });\r
-                        throw ce;\r
-                    };\r
-                    remoteWorker.DoWork(expectationIndex[index]);\r
-                }\r
-                catch (CompositionException compositionException)\r
-                {\r
-                    string result = compositionException.ToString();\r
-                    string expected = FixMessage(e.Output);\r
-                    StringAssert.Contains(result, expected);\r
-                }\r
-                catch (Exception exception)\r
-                {\r
-                    Assert.Fail(exception.ToString());\r
-                }\r
-                ++index;\r
-            }\r
-        }\r
-#endif\r
-        [TestMethod]\r
-        public void Message_ShouldIncludeErrors()\r
-        { \r
-            var expectations = new ExpectationCollection<IEnumerable<CompositionError>, string>();\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error"),                           "1<Separator> Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error|Error"),                     "1<Separator> Error|2<Separator> Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error|Error|Error"),               "1<Separator> Error|2<Separator> Error|3<Separator> Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error)"),                    "1<Separator> Error|<Prefix>Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Error)"),              "1<Separator> Error|<Prefix>Error|2<Separator> Error|<Prefix>Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Error|Error)"),        "1<Separator> Error|<Prefix>Error|2<Separator> Error|<Prefix>Error|3<Separator> Error|<Prefix>Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error(Exception))"),         "1<Separator> Exception|<Prefix>Error|<Prefix>Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Exception)"),          "1<Separator> Error|<Prefix>Error|2<Separator> Exception|<Prefix>Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Exception)"),                "1<Separator> Exception|<Prefix>Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Exception(Exception))"),     "1<Separator> Exception|<Prefix>Exception|<Prefix>Error");\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error(Exception)|Error)"),   "1<Separator> Exception|<Prefix>Error|<Prefix>Error|2<Separator> Error|<Prefix>Error");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateCompositionException(e.Input);\r
-\r
-                AssertMessage(exception, e.Output.Split('|'));\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT && CLR40\r
-        [TestMethod]\r
-        public void Message_ShouldIncludeErrorsAccrossAppDomain()\r
-        {\r
-            PermissionSet ps = new PermissionSet(PermissionState.None);\r
-            ps.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));\r
-            ps.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.MemberAccess));\r
-\r
-            //Create a new sandboxed domain \r
-            AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;\r
-            AppDomain newDomain = AppDomain.CreateDomain("test domain", null, setup, ps);\r
-\r
-            Worker remoteWorker = (Worker)newDomain.CreateInstanceAndUnwrap(\r
-                Assembly.GetExecutingAssembly().FullName,\r
-                typeof(Worker).FullName);\r
-\r
-            int index = 0;\r
-            foreach (var expectation in Worker.expectations)\r
-            {\r
-                try\r
-                {\r
-                    remoteWorker.Action = (int x) => \r
-                    {\r
-                        Exception e = CreateCompositionException(Worker.expectations[x].Input);\r
-                        throw e;\r
-                    };\r
-\r
-                    remoteWorker.DoWork(index);\r
-                }\r
-                catch(CompositionException e)\r
-                {\r
-                    AssertMessage(e, expectation.Output.Split('|'));\r
-                }\r
-                catch(Exception e)\r
-                {\r
-                    Assert.Fail(e.ToString());\r
-                }\r
-                ++index;\r
-            }\r
-        }\r
-#endif\r
-        [TestMethod]\r
-        public void Messsage_ShouldIncludeCountOfRootCauses()\r
-        {\r
-            var expectations = new ExpectationCollection<IEnumerable<CompositionError>, int>();\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error"),                            1);\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error|Error"),                      2);\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error|Error|Error"),                3);\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error)"),                     1);\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error)|Error(Error)"),        2);\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Error)"),               2);\r
-            expectations.Add(ErrorFactory.CreateFromDsl("Error(Error|Error|Exception)"),     3);\r
-            \r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateCompositionException(e.Input);\r
-\r
-                AssertMessage(exception, e.Output, CultureInfo.CurrentCulture);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Message_ShouldFormatCountOfRootCausesUsingTheCurrentCulture()\r
-        {\r
-            var cultures = Expectations.GetCulturesForFormatting();\r
-\r
-            foreach (var culture in cultures)\r
-            {\r
-                using (new CurrentCultureContext(culture))\r
-                {\r
-                    var errors = CreateCompositionErrors(1000);\r
-                    var exception = CreateCompositionException(errors);\r
-                    AssertMessage(exception, 1000, culture);\r
-\r
-                    errors = CreateCompositionErrors(1);\r
-                    exception = CreateCompositionException(errors);\r
-                    AssertMessage(exception, 1, culture);\r
-                }\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT && CLR40\r
-\r
-        [TestMethod]\r
-        public void Message_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateCompositionException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                Assert.AreEqual(exception.Message, result.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Errors_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateCompositionException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                EnumerableAssert.AreSequenceEqual(exception.Errors, result.Errors, (index, expected, actual) =>\r
-                {\r
-                    CompositionAssert.AreEqual(expected, actual);\r
-                });\r
-            }\r
-        }\r
-\r
-#endif\r
-        private string GetElementGraphString(CompositionError error)\r
-        {\r
-            StringBuilder writer = new StringBuilder();\r
-            ICompositionElement element = error.Element;\r
-            writer.AppendFormat(CultureInfo.CurrentCulture, Strings.CompositionException_ElementPrefix, element.DisplayName);\r
-\r
-            while ((element = element.Origin) != null)\r
-            {\r
-                writer.AppendFormat(CultureInfo.CurrentCulture, Strings.CompositionException_OriginFormat, Strings.CompositionException_OriginSeparator, element.DisplayName);\r
-            }\r
-\r
-            return writer.ToString();\r
-        }\r
-\r
-        private void AssertMessage(CompositionException exception, int rootCauseCount, CultureInfo culture)\r
-        {\r
-            using (StringReader reader = new StringReader(exception.Message))\r
-            {\r
-                string line = reader.ReadLine();\r
-\r
-                if (rootCauseCount == 1)\r
-                {\r
-                    Assert.IsTrue(line.Contains(Strings.CompositionException_SingleErrorWithSinglePath));\r
-                }\r
-                else\r
-                {\r
-                    Assert.IsTrue(\r
-                        line.Contains(string.Format(CultureInfo.CurrentCulture, Strings.CompositionException_SingleErrorWithMultiplePaths, rootCauseCount)) ||\r
-                        line.Contains(string.Format(CultureInfo.CurrentCulture, Strings.CompositionException_MultipleErrorsWithMultiplePaths, rootCauseCount))\r
-                        );\r
-                }\r
-            }\r
-        }\r
-\r
-        private void AssertMessage(CompositionException exception, string[] expected)\r
-        {\r
-            using (StringReader reader = new StringReader(exception.Message))\r
-            {\r
-                // Skip header\r
-                reader.ReadLine();\r
-\r
-                foreach (string expect in expected)\r
-                {\r
-                    // Skip blank line\r
-                    reader.ReadLine();\r
-                    Assert.AreEqual(FixMessage(expect), reader.ReadLine());\r
-                }\r
-            }\r
-        }\r
-\r
-        private string FixMessage(string expect)\r
-        {\r
-            string fixedPrefix = expect.Replace("<Prefix>", Strings.CompositionException_ErrorPrefix + " ");\r
-            string fixedSeparator = fixedPrefix.Replace("<Separator>", Strings.CompositionException_PathsCountSeparator);\r
-            return fixedSeparator.Replace("<OriginSeparator>", Strings.CompositionException_OriginSeparator);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError()\r
-        {\r
-            return CreateCompositionError("Description");\r
-        }\r
-\r
-        private static CompositionError CreateCompositionError(string message)\r
-        {\r
-            return new CompositionError(message);\r
-        }\r
-\r
-        private static CompositionError CreateCompositionErrorWithElementChain(int count)\r
-        {\r
-            return new CompositionError("Description", ElementFactory.CreateChain(count));\r
-        }\r
-\r
-        private static CompositionError[] CreateCompositionErrors(int count)\r
-        {\r
-            CompositionError[] errors = new CompositionError[count];\r
-\r
-            for (int i = 0; i < count; i++)\r
-            {\r
-                errors[i] = CreateCompositionError("Description" + (i + 1));\r
-            }\r
-\r
-            return errors;\r
-        }\r
-\r
-        private static CompositionException CreateCompositionException()\r
-        {\r
-            return CreateCompositionException((string)null, (Exception)null, (IEnumerable<CompositionError>)null);\r
-        }\r
-\r
-        private static CompositionException CreateCompositionException(string message)\r
-        {\r
-            return CreateCompositionException(message, (Exception)null, (IEnumerable<CompositionError>)null);\r
-        }\r
-\r
-        private static CompositionException CreateCompositionException(IEnumerable<CompositionError> errors)\r
-        {\r
-            return CreateCompositionException((string)null, (Exception)null, errors);\r
-        }\r
-\r
-        private static CompositionException CreateCompositionException(Exception innerException)\r
-        {\r
-            return CreateCompositionException((string)null, innerException, (IEnumerable<CompositionError>)null);\r
-        }\r
-\r
-        private static CompositionException CreateCompositionException(string message, Exception innerException, IEnumerable<CompositionError> errors)\r
-        {\r
-            return new CompositionException(message, innerException, errors);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionResultOfTTest.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionResultOfTTest.cs
deleted file mode 100644 (file)
index 98a2960..0000000
+++ /dev/null
@@ -1,460 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionResultOfTTest\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>();\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>("Value");\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>((CompositionError[])null);\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>((IEnumerable<CompositionError>)null);\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>("Value", (IEnumerable<CompositionError>)null);\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>(new CompositionError[0]);\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_EmptyAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>(Enumerable.Empty<CompositionError>());\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_EmptyAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult<string>("Value", Enumerable.Empty<CompositionError>());\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValuesAsErrorsArgument_ShouldSetErrorsProperty()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult<string>(e.ToArray());\r
-\r
-                EnumerableAssert.AreEqual(e, result.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValuesAsErrorsArgument_ShouldSetErrorsProperty()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult<string>(e);\r
-\r
-                EnumerableAssert.AreEqual(e, result.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValuesAsErrorsArgument_ShouldSetErrorsProperty()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult<string>("Value", e);\r
-\r
-                EnumerableAssert.AreEqual(e, result.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>();\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>("Value");\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>((CompositionError[])null);\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>((IEnumerable<CompositionError>)null);\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_NullAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>("Value", (IEnumerable<CompositionError>)null);\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>(new CompositionError[0]);\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_EmptyAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>(Enumerable.Empty<CompositionError>());\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_EmptyAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult<string>("Value", Enumerable.Empty<CompositionError>());\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValuesAsErrorsArgument_ShouldSetSucceededPropertyToTrueIfThereAreErrors()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult<string>(e.ToArray());\r
-\r
-                if (e.Count() > 0)\r
-                {\r
-                    Assert.IsFalse(result.Succeeded);\r
-                }\r
-                else\r
-                {\r
-                    Assert.IsTrue(result.Succeeded);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValuesAsErrorsArgument_ShouldSetSucceededPropertyToTrueIfThereAreErrors()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult<string>(e);\r
-\r
-                if (e.Count() > 0)\r
-                {\r
-                    Assert.IsFalse(result.Succeeded);\r
-                }\r
-                else\r
-                {\r
-                    Assert.IsTrue(result.Succeeded);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor5_ValuesAsErrorsArgument_ShouldSetSucceededPropertyToTrueIfThereAreErrors()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult<string>("Value", e);\r
-\r
-                if (e.Count() > 0)\r
-                {\r
-                    Assert.IsFalse(result.Succeeded);\r
-                }\r
-                else\r
-                {\r
-                    Assert.IsTrue(result.Succeeded);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResult_NullAsErrorsArgument_ShouldReturnResultWithEmptyErrorsProperty()\r
-        {\r
-            var result = CreateCompositionResult<string>((IEnumerable<CompositionError>)null);\r
-\r
-            var copy = result.ToResult();\r
-\r
-            EnumerableAssert.IsEmpty(copy.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResult_EmptyEnumerableAsErrorsArgument_ShouldReturnResultWithEmptyErrorsProperty()\r
-        {\r
-            var result = CreateCompositionResult<string>(Enumerable.Empty<CompositionError>());\r
-\r
-            var copy = result.ToResult();\r
-\r
-            EnumerableAssert.IsEmpty(copy.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResult_ValueAsErrorsArgument_ShouldReturnResultWithErrorsPropertySet()\r
-        {\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult<string>(e);\r
-\r
-                var copy = result.ToResult();\r
-\r
-                EnumerableAssert.AreSequenceSame(result.Errors, copy.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_NullAsErrorsArgument_ShouldReturnResultWithEmptyErrorsProperty()\r
-        {\r
-            var result = CreateCompositionResult<string>((IEnumerable<CompositionError>)null);\r
-\r
-            var copy = result.ToResult<string>();\r
-\r
-            EnumerableAssert.IsEmpty(copy.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_EmptyEnumerableAsErrorsArgument_ShouldReturnResultWithEmptyErrorsProperty()\r
-        {\r
-            var result = CreateCompositionResult<string>(Enumerable.Empty<CompositionError>());\r
-\r
-            var copy = result.ToResult<string>();\r
-\r
-            EnumerableAssert.IsEmpty(copy.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_ValueAsErrorsArgument_ShouldReturnResultWithErrorsPropertySet()\r
-        {\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult<string>(e);\r
-\r
-                var copy = result.ToResult<string>();\r
-\r
-                EnumerableAssert.AreSequenceSame(result.Errors, copy.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_ReferenceValueAsValueArgument_ShouldReturnResultWithNullValueProperty()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult<object>(e);\r
-\r
-                var copy = result.ToResult<object>();\r
-\r
-                Assert.IsNull(copy.Value);                \r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_ValueTypeValueAsValueArgument_ShouldReturnResultWithNullValueProperty()\r
-        {\r
-            var expectations = Expectations.GetObjectsValueTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult<ValueType>(e);\r
-\r
-                var copy = result.ToResult<ValueType>();\r
-\r
-                Assert.IsNull(copy.Value);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Value_NullAsErrorsArgumentAndValueAsValueArgument_ShouldReturnValue()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult<object>(e, (IEnumerable<CompositionError>)null);\r
-\r
-                Assert.AreEqual(e, result.Value);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Value_EmptyEnumerableAsErrorsArgumentAndValueAsValueArgument_ShouldReturnValue()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult<object>(e, Enumerable.Empty<CompositionError>());\r
-\r
-                Assert.AreEqual(e, result.Value);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Value_SingleValueAsErrorsArgument_ShouldThrowComposition()\r
-        {\r
-            var errorIds = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var errorId in errorIds)\r
-            {\r
-                var result = CreateCompositionResult<string>(errorId);\r
-\r
-                CompositionAssert.ThrowsError((ErrorId)errorId, () =>\r
-                {\r
-                    var value = result.Value;\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Value_TwoSameValuesAsErrorsArgument_ShouldThrowComposition()\r
-        {\r
-            var errorIds = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var errorId in errorIds)\r
-            {\r
-                var result = CreateCompositionResult<string>(errorId, errorId);\r
-\r
-                CompositionAssert.ThrowsErrors((ErrorId)errorId, (ErrorId)errorId, () =>\r
-                {\r
-                    var value = result.Value;\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Value_TwoDifferentValuesAsErrorsArgument_ShouldThrowComposition()\r
-        {\r
-            var errorIds1 = Expectations.GetEnumValues<CompositionErrorId>();\r
-            var errorIds2 = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            for (int i = 0; i < errorIds1.Count(); i++)\r
-            {\r
-                var errorId1 = errorIds1.ElementAt(i);\r
-                var errorId2 = errorIds1.ElementAt(errorIds2.Count() - 1 - i);\r
-\r
-                var result = CreateCompositionResult<string>(errorId1, errorId2);\r
-\r
-                CompositionAssert.ThrowsErrors((ErrorId)errorId1, (ErrorId)errorId2, () =>\r
-                {\r
-                    var value = result.Value;\r
-                });\r
-            }\r
-        }\r
-\r
-        private CompositionResult<T> CreateCompositionResult<T>(params CompositionErrorId[] errorIds)\r
-        {\r
-            return new CompositionResult<T>(errorIds.Select(id =>\r
-            {\r
-                return ErrorFactory.Create(id);\r
-            }));\r
-        }\r
-\r
-        private CompositionResult<T> CreateCompositionResult<T>(int count)\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            List<CompositionError> errors = new List<CompositionError>();\r
-\r
-            foreach (var e in expectations.Take(count))\r
-            {\r
-                errors.Add(ErrorFactory.Create(e));\r
-            }\r
-\r
-            return CreateCompositionResult<T>(errors);\r
-        }\r
-\r
-        private CompositionResult<T> CreateCompositionResult<T>(IEnumerable<CompositionError> errors)\r
-        {\r
-            return new CompositionResult<T>(errors);\r
-        }\r
-\r
-        private CompositionResult<T> CreateCompositionResult<T>(T value)\r
-        {\r
-            return new CompositionResult<T>(value);\r
-        }\r
-\r
-        private CompositionResult<T> CreateCompositionResult<T>(T value, IEnumerable<CompositionError> errors)\r
-        {\r
-            return new CompositionResult<T>(value, errors);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionResultTest.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionResultTest.cs
deleted file mode 100644 (file)
index 7231c46..0000000
+++ /dev/null
@@ -1,494 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Factories;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionResultTest\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult();\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult((CompositionError[])null);\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult((IEnumerable<CompositionError>)null);\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult(new CompositionError[0]);\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyAsErrorsArgument_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var result = new CompositionResult(Enumerable.Empty<CompositionError>());\r
-\r
-            EnumerableAssert.IsEmpty(result.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValuesAsErrorsArgument_ShouldSetErrorsProperty()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult(e.ToArray());\r
-\r
-                EnumerableAssert.AreEqual(e, result.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValuesAsErrorsArgument_ShouldSetErrorsProperty()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult(e);\r
-\r
-                EnumerableAssert.AreEqual(e, result.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult();\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult((CompositionError[])null);\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult((IEnumerable<CompositionError>)null);\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult(new CompositionError[0]);\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyAsErrorsArgument_ShouldSetSucceededPropertyToTrue()\r
-        {\r
-            var result = new CompositionResult(Enumerable.Empty<CompositionError>());\r
-\r
-            Assert.IsTrue(result.Succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValuesAsErrorsArgument_ShouldSetSucceededPropertyToTrueIfThereAreErrors()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult(e.ToArray());\r
-\r
-                if (e.Count() > 0)\r
-                {\r
-                    Assert.IsFalse(result.Succeeded);\r
-                }\r
-                else\r
-                {\r
-                    Assert.IsTrue(result.Succeeded);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValuesAsErrorsArgument_ShouldSetSucceededPropertyToTrueIfThereAreErrors()\r
-        {\r
-            var errors = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in errors)\r
-            {\r
-                var result = new CompositionResult(e);\r
-\r
-                if (e.Count() > 0)\r
-                {\r
-                    Assert.IsFalse(result.Succeeded);\r
-                }\r
-                else\r
-                {\r
-                    Assert.IsTrue(result.Succeeded);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeResult_ResultWithNullErrorsAsResultArgument_ShouldReturnResultWithSameErrors()\r
-        {\r
-            var emptyResult = CreateCompositionResult((IEnumerable<CompositionError>)null);\r
-\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult(e);\r
-\r
-                var mergedResult = result.MergeResult(emptyResult);\r
-\r
-                CompositionAssert.AreEqual(result, mergedResult);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeResult_ResultWithEmptyErrorsAsResultArgument_ShouldReturnResultWithSameErrors()\r
-        {\r
-            var emptyResult = CreateCompositionResult(Enumerable.Empty<CompositionError>());\r
-\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult(e);\r
-\r
-                var mergedResult = result.MergeResult(emptyResult);\r
-\r
-                CompositionAssert.AreEqual(result, mergedResult);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeResult_ResultWithErrorsAsResultArgument_ShouldReturnResultWithCombinedErrors()\r
-        {\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result1 = CreateCompositionResult(e);\r
-                var result2 = CreateCompositionResult(e);\r
-\r
-                var mergedResult = result1.MergeResult(result2);\r
-                var mergedErrors = result1.Errors.Concat(result2.Errors);\r
-\r
-                EnumerableAssert.AreSequenceSame(mergedErrors, mergedResult.Errors);\r
-                Assert.AreEqual(mergedResult.Succeeded, result1.Succeeded | result2.Succeeded);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeError_ValueAsErrorArgumentWhenMergedWithResultWithNullErrors_ShouldReturnResultWithCombinedErrors()\r
-        {\r
-            var result = CreateCompositionResult((IEnumerable<CompositionError>)null);\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = ErrorFactory.Create(e);\r
-\r
-                var mergedResult = result.MergeError(error);\r
-                var mergedErrors = result.Errors.Concat(new CompositionError[] { error });\r
-\r
-                EnumerableAssert.AreSequenceSame(mergedErrors, mergedResult.Errors);\r
-                Assert.IsFalse(mergedResult.Succeeded);                \r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeError_ValueAsErrorArgumentWhenMergedWithResultWithEmptyErrors_ShouldReturnResultWithCombinedErrors()\r
-        {\r
-            var result = CreateCompositionResult(Enumerable.Empty<CompositionError>());\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = ErrorFactory.Create(e);\r
-\r
-                var mergedResult = result.MergeError(error);\r
-                var mergedErrors = result.Errors.Concat(new CompositionError[] { error });\r
-\r
-                EnumerableAssert.AreSequenceSame(mergedErrors, mergedResult.Errors);\r
-                Assert.IsFalse(mergedResult.Succeeded);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeError_ValueAsErrorArgumentWhenMergedWithResultWithErrors_ShouldReturnResultWithCombinedErrors()\r
-        {\r
-            var result = CreateCompositionResult(2);\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var error = ErrorFactory.Create(e);\r
-\r
-                var mergedResult = result.MergeError(error);\r
-                var mergedErrors = result.Errors.Concat(new CompositionError[] { error });\r
-\r
-                EnumerableAssert.AreSequenceSame(mergedErrors, mergedResult.Errors);\r
-                Assert.IsFalse(mergedResult.Succeeded);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeErrors_ValueAsErrorArgumentWhenMergedWithResultWithNullErrors_ShouldReturnResultWithCombinedErrors()\r
-        {\r
-            var result = CreateCompositionResult((IEnumerable<CompositionError>)null);\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var mergedResult = result.MergeErrors(e);\r
-                var mergedErrors = result.Errors.Concat(e);\r
-\r
-                EnumerableAssert.AreSequenceSame(mergedErrors, mergedResult.Errors);\r
-                Assert.AreEqual(!e.Any(), mergedResult.Succeeded);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeErrors_ValueAsErrorArgumentWhenMergedWithResultWithEmptyErrors_ShouldReturnResultWithCombinedErrors()\r
-        {\r
-            var result = CreateCompositionResult(Enumerable.Empty<CompositionError>());\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var mergedResult = result.MergeErrors(e);\r
-                var mergedErrors = result.Errors.Concat(e);\r
-\r
-                EnumerableAssert.AreSequenceSame(mergedErrors, mergedResult.Errors);\r
-                Assert.AreEqual(!e.Any(), mergedResult.Succeeded);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MergeErrors_ValueAsErrorArgumentWhenMergedWithResultWithErrors_ShouldReturnResultWithCombinedErrors()\r
-        {\r
-            var result = CreateCompositionResult(2);\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var mergedResult = result.MergeErrors(e);\r
-                var mergedErrors = result.Errors.Concat(e);\r
-\r
-                EnumerableAssert.AreSequenceSame(mergedErrors, mergedResult.Errors);\r
-                Assert.IsFalse(mergedResult.Succeeded);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ThrowOnErrors_NullAsErrorsArgument_ShouldNotThrow()\r
-        {\r
-            var result = CreateCompositionResult((IEnumerable<CompositionError>)null);\r
-\r
-            result.ThrowOnErrors();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ThrowOnErrors_EmptyEnumerableAsErrorsArgument_ShouldNotThrow()\r
-        {\r
-            var result = CreateCompositionResult(Enumerable.Empty<CompositionError>());\r
-\r
-            result.ThrowOnErrors();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ThrowOnErrors_SingleValueAsErrorsArgument_ShouldThrowComposition()\r
-        {\r
-            var errorIds = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var errorId in errorIds)\r
-            {\r
-                var result = CreateCompositionResult(errorId);\r
-\r
-                CompositionAssert.ThrowsError((ErrorId)errorId, () =>\r
-                {\r
-                    result.ThrowOnErrors();\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ThrowOnErrors_TwoSameValuesAsErrorsArgument_ShouldThrowComposition()\r
-        {\r
-            var errorIds = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            foreach (var errorId in errorIds)\r
-            {\r
-                var result = CreateCompositionResult(errorId, errorId);\r
-\r
-                CompositionAssert.ThrowsErrors((ErrorId)errorId, (ErrorId)errorId, () =>\r
-                {\r
-                    result.ThrowOnErrors();\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ThrowOnErrors_TwoDifferentValuesAsErrorsArgument_ShouldThrowComposition()\r
-        {\r
-            var errorIds1 = Expectations.GetEnumValues<CompositionErrorId>();\r
-            var errorIds2 = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            for (int i = 0; i < errorIds1.Count(); i++)\r
-            {\r
-                var errorId1 = errorIds1.ElementAt(i);\r
-                var errorId2 = errorIds1.ElementAt(errorIds2.Count() - 1 - i);\r
-\r
-                var result = CreateCompositionResult(errorId1, errorId2);\r
-\r
-                CompositionAssert.ThrowsErrors((ErrorId)errorId1, (ErrorId)errorId2, () =>\r
-                {\r
-                    result.ThrowOnErrors();\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_NullAsErrorsArgument_ShouldReturnResultWithEmptyErrorsProperty()\r
-        {\r
-            var result = CreateCompositionResult((IEnumerable<CompositionError>)null);\r
-\r
-            var copy = result.ToResult<string>("Value");\r
-\r
-            EnumerableAssert.IsEmpty(copy.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_EmptyEnumerableAsErrorsArgument_ShouldReturnResultWithEmptyErrorsProperty()\r
-        {\r
-            var result = CreateCompositionResult(Enumerable.Empty<CompositionError>());\r
-\r
-            var copy = result.ToResult<string>("Value");\r
-\r
-            EnumerableAssert.IsEmpty(copy.Errors);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_ValueAsErrorsArgument_ShouldReturnResultWithErrorsPropertySet()\r
-        {\r
-            var expectations = Expectations.GetCompositionErrors();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult(e);\r
-\r
-                var copy = result.ToResult<string>("Value");\r
-\r
-                EnumerableAssert.AreSequenceSame(result.Errors, copy.Errors);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_ReferenceValueAsValueArgument_ShouldReturnResultWithValuePropertySet()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult();\r
-\r
-                var copy = result.ToResult<object>(e);\r
-\r
-                Assert.AreSame(e, copy.Value);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToResultOfT_ValueTypeValueAsValueArgument_ShouldReturnResultWithValuePropertySet()\r
-        {\r
-            var expectations = Expectations.GetObjectsValueTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var result = CreateCompositionResult();\r
-\r
-                var copy = result.ToResult<object>(e);\r
-\r
-                Assert.AreEqual(e, copy.Value);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SucceededResult_ShouldSetSuccessPropertyToTrue()\r
-        {\r
-            var succeeded = CompositionResult.SucceededResult.Succeeded;\r
-\r
-            Assert.IsTrue(succeeded);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SucceededResult_ShouldSetErrorsPropertyToEmptyEnumerable()\r
-        {\r
-            var errors = CompositionResult.SucceededResult.Errors;\r
-\r
-            EnumerableAssert.IsEmpty(errors);\r
-        }\r
-\r
-        private CompositionResult CreateCompositionResult(params CompositionErrorId[] errorIds)\r
-        {\r
-            return new CompositionResult(errorIds.Select(id =>\r
-            {\r
-                return ErrorFactory.Create(id);\r
-            }));\r
-        }\r
-\r
-        private CompositionResult CreateCompositionResult(int count)\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CompositionErrorId>();\r
-\r
-            List<CompositionError> errors = new List<CompositionError>();\r
-\r
-            foreach (var e in expectations.Take(count))\r
-            {\r
-                errors.Add(ErrorFactory.Create(e));\r
-            }\r
-\r
-            return CreateCompositionResult(errors);\r
-        }\r
-\r
-        private CompositionResult CreateCompositionResult(IEnumerable<CompositionError> errors)\r
-        {\r
-            return new CompositionResult(errors);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServiceExtensionsTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServiceExtensionsTests.cs
deleted file mode 100644 (file)
index f611c10..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionServiceExtensionsTests\r
-    {\r
-        [TestMethod]\r
-        public void SatisfyImports_BooleanOverride_PartAndFalseHaveBeenPassed()\r
-        {\r
-            MockCompositionService compositionService = new MockCompositionService();\r
-            ComposablePart part = PartFactory.Create();\r
-\r
-            bool importsSatisfiedCalled = false;\r
-            compositionService.ImportsSatisfied += delegate(object sender, SatisfyImportsEventArgs e)\r
-            {\r
-                Assert.IsFalse(importsSatisfiedCalled);\r
-                Assert.AreEqual(part, e.Part);\r
-                importsSatisfiedCalled = true;\r
-            };\r
-\r
-            compositionService.SatisfyImportsOnce(part);\r
-            Assert.IsTrue(importsSatisfiedCalled);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_AttributedOverride_NullAsCompositionService()\r
-        {\r
-            ICompositionService compositionService = null;\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("compositionService", () =>\r
-            {\r
-                compositionService.SatisfyImportsOnce(new MockAttributedPart());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_AttributedOverride_NullAsAttributedPart()\r
-        {\r
-            MockCompositionService compositionService = new MockCompositionService();\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("attributedPart", () =>\r
-            {\r
-                compositionService.SatisfyImportsOnce((object)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_AttributedOverride_PartAndFalseHaveBeenPassed()\r
-        {\r
-            MockCompositionService compositionService = new MockCompositionService();\r
-            object attributedPart = new MockAttributedPart();\r
-\r
-            bool importsSatisfiedCalled = false;\r
-            compositionService.ImportsSatisfied += delegate(object sender, SatisfyImportsEventArgs e)\r
-            {\r
-                Assert.IsFalse(importsSatisfiedCalled);\r
-                Assert.IsTrue(e.Part is ReflectionComposablePart);\r
-                Assert.IsTrue(((ReflectionComposablePart)e.Part).Definition.GetPartType() == typeof(MockAttributedPart));\r
-                importsSatisfiedCalled = true;\r
-            };\r
-\r
-            compositionService.SatisfyImportsOnce(attributedPart);\r
-            Assert.IsTrue(importsSatisfiedCalled);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_AttributedAndBooleanOverride_NullAsCompositionService()\r
-        {\r
-            ICompositionService compositionService = null;\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("compositionService", () =>\r
-            {\r
-                compositionService.SatisfyImportsOnce(new MockAttributedPart());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_AttributedAndBooleanOverride_NullAsAttributedPart()\r
-        {\r
-            MockCompositionService compositionService = new MockCompositionService();\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("attributedPart", () =>\r
-            {\r
-                compositionService.SatisfyImportsOnce((object)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_AttributedAndBooleanOverride_PartAndFalseHaveBeenPassed()\r
-        {\r
-            MockCompositionService compositionService = new MockCompositionService();\r
-            object attributedPart = new MockAttributedPart();\r
-\r
-            bool importsSatisfiedCalled = false;\r
-            compositionService.ImportsSatisfied += delegate(object sender, SatisfyImportsEventArgs e)\r
-            {\r
-                Assert.IsFalse(importsSatisfiedCalled);\r
-                Assert.IsTrue(e.Part is ReflectionComposablePart);\r
-                Assert.IsTrue(((ReflectionComposablePart)e.Part).Definition.GetPartType() == typeof(MockAttributedPart));\r
-                importsSatisfiedCalled = true;\r
-            };\r
-\r
-            compositionService.SatisfyImportsOnce(attributedPart);\r
-            Assert.IsTrue(importsSatisfiedCalled);\r
-        }\r
-\r
-        internal class SatisfyImportsEventArgs : EventArgs\r
-        {\r
-            public SatisfyImportsEventArgs(ComposablePart part)\r
-            {\r
-                this.Part = part;\r
-            }\r
-\r
-            public ComposablePart Part { get; private set; }\r
-        }\r
-\r
-        internal class MockCompositionService : ICompositionService\r
-        {\r
-            public MockCompositionService()\r
-            {\r
-            }\r
-\r
-            public void SatisfyImportsOnce(ComposablePart part)\r
-            {\r
-                if (this.ImportsSatisfied != null)\r
-                {\r
-                    this.ImportsSatisfied.Invoke(this, new SatisfyImportsEventArgs(part));\r
-                }\r
-            }\r
-\r
-            public event EventHandler<SatisfyImportsEventArgs> ImportsSatisfied;\r
-        }\r
-\r
-        public class MockAttributedPart\r
-        {\r
-            public MockAttributedPart()\r
-            {\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServiceProxy.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServiceProxy.cs
deleted file mode 100644 (file)
index db50ffd..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal class CompositionServiceProxy : ICompositionService\r
-    {\r
-        private readonly CompositionContainer _container;\r
-\r
-        public CompositionServiceProxy(CompositionContainer container)\r
-        {\r
-            this._container = container;\r
-        }\r
-\r
-        public void SatisfyImportsOnce(ComposablePart part)\r
-        {\r
-            this._container.SatisfyImportsOnce(part);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServicesTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/CompositionServicesTests.cs
deleted file mode 100644 (file)
index b8ee4c4..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Text;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-using Tests.Integration;\r
-using System.Reflection;\r
-using System.Reflection.Emit;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionServicesTests\r
-    {\r
-        private static readonly Type NonGenericType = typeof(int);\r
-\r
-        [TestMethod]\r
-        public void GetContractName_NullAsTypeArgument_ThrowsArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("type", () =>\r
-                {\r
-                    AttributedModelServices.GetContractName((Type)null);\r
-                });\r
-        }        \r
-\r
-        [TestMethod]\r
-        [Description("Verifies adding custom modifiers to contract name.")]\r
-        public void ContractNameServicesAddCustomModifiersTest()\r
-        {\r
-            Type[] modifiers = new Type[] { typeof(int), typeof(List<int>), typeof(double) };\r
-            StringBuilder typeName = new StringBuilder();\r
-            ContractNameServices.WriteCustomModifiers(typeName, "test", modifiers);\r
-            Assert.AreEqual<string>(\r
-                string.Format(" {0}(System.Int32,System.Collections.Generic.List(System.Int32),System.Double)", "test"),\r
-                typeName.ToString(),\r
-                "Expecting correct modifiers text.");\r
-        }\r
-\r
-        [TestMethod]\r
-        [Description("Verifies CompositionServices.GetDefaultContractName method.")]\r
-        public void GetDefaultContractNameTest()\r
-        {\r
-            ExpectationCollection<Type, string> expectations = new ExpectationCollection<Type, string>();\r
-\r
-            expectations.Add(typeof(string), "System.String");\r
-            expectations.Add(typeof(int?), "System.Nullable(System.Int32)");\r
-            expectations.Add(typeof(NestedParent.NestedChild), "System.ComponentModel.Composition.NestedParent+NestedChild");\r
-            expectations.Add(typeof(int[,]), "System.Int32[,]");\r
-            expectations.Add(typeof(int[,][][]), "System.Int32[,][][]");\r
-            expectations.Add(typeof(Array[,][][]).MakePointerType(), "System.Array[,][][]*");\r
-            expectations.Add(typeof(int).MakePointerType(), "System.Int32*");\r
-            expectations.Add(typeof(int).MakePointerType().MakeArrayType(3).MakeArrayType().MakePointerType(), "System.Int32*[][,,]*");\r
-            expectations.Add(typeof(int).MakeByRefType(), "System.Int32&");\r
-            expectations.Add(typeof(int).MakePointerType().MakeArrayType(4).MakeArrayType().MakeByRefType(), "System.Int32*[][,,,]&");\r
-            expectations.Add(typeof(List<>), "System.Collections.Generic.List()");\r
-            expectations.Add(typeof(Dictionary<int,double>), "System.Collections.Generic.Dictionary(System.Int32,System.Double)");\r
-            expectations.Add(typeof(Dictionary<Dictionary<int,double>,double>), "System.Collections.Generic.Dictionary(System.Collections.Generic.Dictionary(System.Int32,System.Double),System.Double)");\r
-            expectations.Add(typeof(GenericContract1<int>.GenericContract2.GenericContract3<double>), "System.ComponentModel.Composition.GenericContract1(System.Int32)+GenericContract2+GenericContract3(System.Double)");\r
-            expectations.Add(typeof(GenericContract4<int,double>.GenericContract5<double,int>.GenericContract6<int,double>), "System.ComponentModel.Composition.GenericContract4(System.Int32,System.Double)+GenericContract5(System.Double,System.Int32)+GenericContract6(System.Int32,System.Double)");\r
-            expectations.Add(typeof(GenericContract4<,>.GenericContract5<,>.GenericContract6<,>), "System.ComponentModel.Composition.GenericContract4(,)+GenericContract5(,)+GenericContract6(,)");\r
-            expectations.Add(typeof(GenericContract7), "System.ComponentModel.Composition.GenericContract7");\r
-            expectations.Add(typeof(GenericContract8<int>), "System.ComponentModel.Composition.GenericContract8(System.Int32)");\r
-            expectations.Add(typeof(GenericContract4<int,double>.GenericContract5<double,int>[][,,,,]), "System.ComponentModel.Composition.GenericContract4(System.Int32,System.Double)+GenericContract5(System.Double,System.Int32)[][,,,,]");\r
-            expectations.Add(typeof(GenericContract4<int,double>.GenericContract5<double,int>).MakePointerType(), "System.ComponentModel.Composition.GenericContract4(System.Int32,System.Double)+GenericContract5(System.Double,System.Int32)*");\r
-            expectations.Add(typeof(GenericContract4<int,double>.GenericContract5<double,int>[][,]).MakePointerType().MakeArrayType(4), "System.ComponentModel.Composition.GenericContract4(System.Int32,System.Double)+GenericContract5(System.Double,System.Int32)[][,]*[,,,]");            expectations.Add(typeof(OuterClassWithGenericNested.GenericNested<int>), "System.ComponentModel.Composition.OuterClassWithGenericNested+GenericNested(System.Int32)");\r
-            expectations.Add(typeof(Delegate), "System.Delegate");\r
-            expectations.Add(typeof(MulticastDelegate), "System.MulticastDelegate");\r
-            expectations.Add(typeof(Action), "System.Void()");\r
-            expectations.Add(typeof(Func<Func<string>>), "System.Func(System.String)()");\r
-            expectations.Add(typeof(DelegateCompositionTests.DoWorkDelegate), "System.Object(System.Int32,System.Object&,System.String&)");\r
-            expectations.Add(typeof(DelegateCompositionTests.DelegateOneArg), "System.Int32(System.Int32)");\r
-            expectations.Add(typeof(DelegateCompositionTests.DelegateTwoArgs), "System.Int32(System.Int32,System.Int32)");\r
-            expectations.Add(typeof(DelegateCompositionTests.SimpleDelegate), "System.Int32()");\r
-            expectations.Add(typeof(DelegateCompositionTests.ActionWith9Args), "System.Void(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)");\r
-            expectations.Add(typeof(DelegateCompositionTests.FuncWith9Args), "System.Int32(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)");\r
-            expectations.Add(EmitGenericType("MyGeneratedType", typeof(int)), "MyGeneratedType(System.Int32)");\r
-            expectations.Add(EmitGenericType("MyGeneratedType`1", typeof(string)), "MyGeneratedType(System.String)");\r
-            expectations.Add(EmitGenericType("_name_", typeof(List<>)), "_name_(System.Collections.Generic.List())");\r
-\r
-            // This particular case can clash with the name generation for methods because we use () for both generics and methods\r
-            // we may want to fix this clash by changing the generic markers but it is likely to be very rare.\r
-            expectations.Add(EmitGenericType("System.Void", typeof(int)), "System.Void(System.Int32)");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                string typeIdentity = AttributedModelServices.GetTypeIdentity(e.Input);\r
-                Assert.AreEqual(e.Output, typeIdentity);\r
-            }\r
-\r
-            // Do it again to excerise the cache.\r
-            foreach (var e in expectations)\r
-            {\r
-                string typeIdentity = AttributedModelServices.GetTypeIdentity(e.Input);\r
-                Assert.AreEqual(e.Output, typeIdentity);\r
-            }\r
-        }\r
-\r
-        public Type EmitGenericType(string typeName, Type genericArgumentType)\r
-        {\r
-            var assemblyName = new AssemblyName("EmittedTestAssembly");\r
-            var assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);\r
-            var moduleBuilder = assemblyBuilder.DefineDynamicModule("EmittedTestModule");\r
-            var typeBuilder = moduleBuilder.DefineType(typeName, TypeAttributes.Public);\r
-\r
-            GenericTypeParameterBuilder T = typeBuilder.DefineGenericParameters(new string[] { "T" })[0];\r
-            typeBuilder.SetCustomAttribute(new CustomAttributeBuilder(typeof(ExportAttribute).GetConstructor(Type.EmptyTypes), new object[0]));\r
-\r
-            return typeBuilder.CreateType().MakeGenericType(genericArgumentType);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ConcreteComposablePart.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ConcreteComposablePart.cs
deleted file mode 100644 (file)
index e436fc3..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal class ConcreteComposablePart : ComposablePart, IDisposable\r
-    {\r
-        private readonly List<Export> _exports = new List<Export>();\r
-        private readonly List<ImportDefinition> _imports = new List<ImportDefinition>();\r
-        private readonly IDictionary<string, IEnumerable<Export>> _setImports = new Dictionary<string, IEnumerable<Export>>();\r
-\r
-        public ConcreteComposablePart()\r
-        {\r
-        }\r
-\r
-        public override IDictionary<string, object> Metadata\r
-        {\r
-            get { return MetadataServices.EmptyMetadata; }\r
-        }\r
-\r
-        public IDictionary<string, IEnumerable<Export>> SetImports\r
-        {\r
-            get { return this._setImports; }\r
-        }\r
-\r
-        public override IEnumerable<ExportDefinition> ExportDefinitions\r
-        {\r
-            get { return this._exports.Select(export => export.Definition); }\r
-        }\r
-\r
-        public override IEnumerable<ImportDefinition> ImportDefinitions\r
-        {\r
-            get { return this._imports; }\r
-        }\r
-\r
-        public ImportDefinition AddImport(string contractName, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-        {\r
-            var import = ImportDefinitionFactory.CreateDefault(contractName, cardinality, isRecomposable, isPrerequisite);\r
-\r
-            this.AddImport(import);\r
-            return import;\r
-        }\r
-\r
-        public void AddImport(ImportDefinition import)\r
-        {\r
-            this._imports.Add(import);\r
-        }\r
-\r
-        public void AddExport(string contractName, object value)\r
-        {\r
-            this.AddExport(ExportFactory.Create(contractName, () => value));\r
-        }\r
-\r
-        public void AddExport(Export export)\r
-        {\r
-            this._exports.Add(export);\r
-        }\r
-\r
-        public override object GetExportedValue(ExportDefinition definition)\r
-        {\r
-            Export export = _exports.First(e => e.Definition == definition);\r
-\r
-            return export.Value;\r
-        }\r
-\r
-        public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-        {\r
-            ContractBasedImportDefinition contractBasedDefinition = (ContractBasedImportDefinition)definition;\r
-            this._setImports[contractBasedDefinition.ContractName] = exports;\r
-\r
-            foreach (Export export in exports)\r
-            {\r
-                var value = export.Value;\r
-            }\r
-        }\r
-\r
-        void IDisposable.Dispose()\r
-        {\r
-            foreach (var disposable in _exports.Select(export => export.Value).OfType<IDisposable>())\r
-            {\r
-                disposable.Dispose();\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ConstraintServicesTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ConstraintServicesTests.cs
deleted file mode 100644 (file)
index 9ef33a3..0000000
+++ /dev/null
@@ -1,327 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ConstraintServicesTests\r
-    {\r
-        [TestMethod]\r
-        public void TypeIdentityConstraint_ValidMatchingExportDef_ShouldMatch()\r
-        {\r
-            var contractName = "MyContract";\r
-            var typeIdentity = AttributedModelServices.GetTypeIdentity(typeof(ConstraintServicesTests));\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, typeIdentity);\r
-\r
-            var exportDefinition = new ExportDefinition(contractName, metadata);\r
-\r
-            var constraint = ConstraintServices.CreateConstraint(contractName, typeIdentity, null, CreationPolicy.Any);\r
-\r
-            var predicate = constraint.Compile();\r
-\r
-            Assert.IsTrue(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TypeIdentityConstraint_ValidNonMatchingExportDef_ShouldNotMatch()\r
-        {\r
-            var contractName = "MyContract";\r
-            var typeIdentity = AttributedModelServices.GetTypeIdentity(typeof(ConstraintServicesTests));\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, typeIdentity + "Another Identity");\r
-\r
-            var exportDefinition = new ExportDefinition(contractName, metadata);\r
-\r
-            var constraint = ConstraintServices.CreateConstraint(contractName, typeIdentity, null, CreationPolicy.Any);\r
-\r
-            var predicate = constraint.Compile();\r
-\r
-            Assert.IsFalse(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TypeIdentityConstraint_InvalidExportDef_ShouldNotMatch()\r
-        {\r
-            var contractName = "MyContract";\r
-            var typeIdentity = AttributedModelServices.GetTypeIdentity(typeof(ConstraintServicesTests));\r
-            var metadata = new Dictionary<string, object>();\r
-\r
-            var exportDefinition = new ExportDefinition(contractName, metadata);\r
-\r
-            var constraint = ConstraintServices.CreateConstraint(contractName, typeIdentity, null, CreationPolicy.Any);\r
-\r
-            var predicate = constraint.Compile();\r
-\r
-            Assert.IsFalse(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreationPolicyConstraint_ValidMatchingCreationPolicy_ShouldMatch()\r
-        {\r
-            var contractName = "MyContract";\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add(CompositionConstants.PartCreationPolicyMetadataName, CreationPolicy.Shared);\r
-\r
-            var exportDefinition = new ExportDefinition(contractName, metadata);\r
-\r
-            var constraint = ConstraintServices.CreateConstraint(contractName, null, null, CreationPolicy.Shared);\r
-\r
-            var predicate = constraint.Compile();\r
-\r
-            Assert.IsTrue(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreationPolicyConstraint_ValidNonMatchingCreationPolicy_ShouldNotMatch()\r
-        {\r
-            var contractName = "MyContract";\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add(CompositionConstants.PartCreationPolicyMetadataName, CreationPolicy.NonShared);\r
-\r
-            var exportDefinition = new ExportDefinition(contractName, metadata);\r
-\r
-            var constraint = ConstraintServices.CreateConstraint(contractName, null, null, CreationPolicy.Shared);\r
-\r
-            var predicate = constraint.Compile();\r
-\r
-            Assert.IsFalse(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreationPolicyConstraint_InvalidCreationPolicy_ShouldNotMatch()\r
-        {\r
-            var contractName = "MyContract";\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add(CompositionConstants.PartCreationPolicyMetadataName, "Shared");\r
-\r
-            var exportDefinition = new ExportDefinition(contractName, metadata);\r
-\r
-            var constraint = ConstraintServices.CreateConstraint(contractName, null, null, CreationPolicy.Shared);\r
-\r
-            var predicate = constraint.Compile();\r
-\r
-            Assert.IsFalse(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreationPolicyConstraint_NoCreationPolicy_ShouldNotMatch()\r
-        {\r
-            var contractName = "MyContract";\r
-            var metadata = new Dictionary<string, object>();\r
-\r
-            var exportDefinition = new ExportDefinition(contractName, metadata);\r
-\r
-            var constraint = ConstraintServices.CreateConstraint(contractName, null, null, CreationPolicy.Shared);\r
-\r
-            var predicate = constraint.Compile();\r
-\r
-            Assert.IsTrue(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartCreatorConstraint_ShouldMatchPartCreatorExportDefinition()\r
-        {\r
-            var partCreatorImportDef = ReflectionModelServices.CreateImportDefinition(\r
-                new LazyMemberInfo(MemberTypes.Field, () => new MemberInfo[] { typeof(ConstraintServicesTests) }),\r
-                "Foo",\r
-                "Foo",\r
-                new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("MDKey", typeof(string)) },\r
-                ImportCardinality.ZeroOrMore,\r
-                false,\r
-                CreationPolicy.Any,\r
-                true, // IsPartCreator\r
-                null);\r
-\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["MDKey"] = "MDValue";\r
-            metadata[CompositionConstants.ExportTypeIdentityMetadataName] = "Foo";\r
-\r
-            var productExportDefinition = new ExportDefinition("Foo", metadata);\r
-\r
-            metadata = new Dictionary<string, object>(metadata);\r
-            metadata[CompositionConstants.ExportTypeIdentityMetadataName] = CompositionConstants.PartCreatorTypeIdentity;\r
-            metadata[CompositionConstants.ProductDefinitionMetadataName] = productExportDefinition;\r
-\r
-            var exportDefinition = new ExportDefinition(CompositionConstants.PartCreatorContractName, metadata);\r
-\r
-            var predicate = partCreatorImportDef.Constraint.Compile();\r
-            Assert.IsTrue(partCreatorImportDef.IsConstraintSatisfiedBy(exportDefinition));\r
-            Assert.IsTrue(predicate(exportDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryParseConstraint_ConstraintFromCreateConstraintAsConstraintArgument1_CanParse()\r
-        {\r
-            var expectations = Expectations.GetContractNamesWithEmpty();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var constraint = ConstraintServices.CreateConstraint((string)e, null, null, CreationPolicy.Any);\r
-\r
-                AssertCanParse(constraint, e, new Dictionary<string, Type>());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryParseConstraint_ConstraintFromCreateConstraintAsConstraintArgument2_CanParse()\r
-        {\r
-            var expectations = Expectations.GetRequiredMetadata();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var constraint = ConstraintServices.CreateConstraint((IEnumerable<KeyValuePair<string, Type>>)e);\r
-\r
-                AssertCanParse(constraint, (string)null, e);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryParseConstraint_ConstraintFromCreateConstraintAsConstraintArgument3_CanParse()\r
-        {\r
-            var contractNames = Expectations.GetContractNames();\r
-            var metadataValues = Expectations.GetRequiredMetadata();\r
-\r
-            foreach (var contractName in contractNames)\r
-            {\r
-                foreach (var metadataValue in metadataValues)\r
-                {\r
-                    var constraint = ConstraintServices.CreateConstraint(contractName, null, metadataValue, CreationPolicy.Any);\r
-\r
-                    AssertCanParse(constraint, contractName, metadataValue);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryParseConstraint_ContractNameOperatorEqualsAsConstraintArgument_CanParse()\r
-        {\r
-            var expectations = new ExpectationCollection<Expression<Func<ExportDefinition, bool>>, string>();\r
-            expectations.Add(item => item.ContractName == "", "");\r
-            expectations.Add(item => item.ContractName == " ", " ");\r
-            expectations.Add(item => item.ContractName == "   ", "   ");\r
-            expectations.Add(item => item.ContractName == "ContractName", "ContractName");\r
-            expectations.Add(item => item.ContractName == "contractName", "contractName");\r
-            expectations.Add(item => item.ContractName == "{ContractName}", "{ContractName}");\r
-            expectations.Add(item => item.ContractName == "{ContractName}Name", "{ContractName}Name");\r
-            expectations.Add(item => item.ContractName == "System.Windows.Forms.Control", "System.Windows.Forms.Control");\r
-            expectations.Add(item => item.ContractName == "{System.Windows.Forms}Control", "{System.Windows.Forms}Control");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                AssertCanParse(e.Input, e.Output, new Dictionary<string, Type>());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryParseConstraint_MetadataContainsKeyAsConstraintArgument_CanParse()\r
-        {\r
-            var expectations = new ExpectationCollection<Expression<Func<ExportDefinition, bool>>, Dictionary<string, Type>>();\r
-            expectations.Add(\r
-                item => typeof(string).IsInstanceOfType(item.Metadata[""]), \r
-                new Dictionary<string, Type>{ {"", typeof(string) }});\r
-            expectations.Add(\r
-                item => typeof(string).IsInstanceOfType(item.Metadata["value"]), \r
-                new Dictionary<string, Type>{ {"value", typeof(string) } });\r
-            expectations.Add(\r
-                item => typeof(string).IsInstanceOfType(item.Metadata["Value"]), \r
-                new Dictionary<string, Type>{ {"Value", typeof(string) } });\r
-            expectations.Add(\r
-                item => typeof(string).IsInstanceOfType(item.Metadata["Value"]) && typeof(int).IsInstanceOfType(item.Metadata["value"]),\r
-                new Dictionary<string, Type>{ {"Value", typeof(string)}, {"value", typeof(int) }});\r
-            expectations.Add(\r
-                item => typeof(string).IsInstanceOfType(item.Metadata["Value"]) && typeof(int).IsInstanceOfType(item.Metadata["value"]) && typeof(object).IsInstanceOfType(item.Metadata["Metadata"]),\r
-                new Dictionary<string, Type>{ {"Value", typeof(string)}, {"value", typeof(int)}, {"Metadata", typeof(object) } });          \r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                AssertCanParse(e.Input, (string)null, e.Output);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryParseConstraint_ContractNameOperatorEqualsAndMetadataContainsKeyAsConstraintArgumen_CanParse()\r
-        {\r
-            var expectations = new ExpectationCollection<Expression<Func<ExportDefinition, bool>>, KeyValuePair<string, Type>[]>();\r
-            expectations.Add(\r
-                item => item.ContractName == "ContractName" && typeof(string).IsInstanceOfType(item.Metadata[""]),\r
-                new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("", typeof(string)) });\r
-            expectations.Add(\r
-                item => item.ContractName == "ContractName" && typeof(string).IsInstanceOfType(item.Metadata["value"]),\r
-                new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("value", typeof(string)) });\r
-            expectations.Add(\r
-                item => item.ContractName == "ContractName"  && typeof(string).IsInstanceOfType(item.Metadata["Value"]),\r
-                new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Value", typeof(string)) });\r
-            expectations.Add(\r
-                item => item.ContractName == "ContractName"  && typeof(string).IsInstanceOfType(item.Metadata["Value"]) && typeof(int).IsInstanceOfType(item.Metadata["value"]),\r
-                new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Value", typeof(string)), new KeyValuePair<string, Type>("value", typeof(int)) });\r
-            expectations.Add(\r
-                item => item.ContractName == "ContractName"  && typeof(string).IsInstanceOfType(item.Metadata["Value"]) && typeof(int).IsInstanceOfType(item.Metadata["value"]) && typeof(object).IsInstanceOfType(item.Metadata["Metadata"]),\r
-                new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Value", typeof(string)), new KeyValuePair<string, Type>("value", typeof(int)), new KeyValuePair<string, Type>("Metadata", typeof(object)) });\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                AssertCanParse(e.Input, "ContractName", e.Output);\r
-            }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void TryParseConstraint_ContractNameReverseOperatorEqualsAsConstraintArgument_CanParse()\r
-        {\r
-            var expectations = new ExpectationCollection<Expression<Func<ExportDefinition, bool>>, string>();\r
-            expectations.Add(item => "" == item.ContractName, "");\r
-            expectations.Add(item => " " == item.ContractName, " ");\r
-            expectations.Add(item => "   " == item.ContractName, "   ");\r
-            expectations.Add(item => "ContractName" == item.ContractName, "ContractName");\r
-            expectations.Add(item => "contractName" == item.ContractName, "contractName");\r
-            expectations.Add(item => "{ContractName}" == item.ContractName, "{ContractName}");\r
-            expectations.Add(item => "{ContractName}Name" == item.ContractName, "{ContractName}Name");\r
-            expectations.Add(item => "System.Windows.Forms.Control" == item.ContractName, "System.Windows.Forms.Control");\r
-            expectations.Add(item => "{System.Windows.Forms}Control" == item.ContractName, "{System.Windows.Forms}Control");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                AssertCanParse(e.Input, e.Output, new Dictionary<string, Type>());\r
-            }\r
-        }\r
-\r
-        private static void AssertCanParse(Expression<Func<ExportDefinition, bool>> constraint, string contractName, IEnumerable<KeyValuePair<string, Type>> requiredMetadata)\r
-        {\r
-            Assert.IsNotNull(constraint);\r
-\r
-            string contractNameResult = null;\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadataResult = null;\r
-            bool success = ContraintParser.TryParseConstraint(constraint, out contractNameResult, out requiredMetadataResult);\r
-\r
-            Assert.IsTrue(success);\r
-            Assert.AreEqual(contractName, contractNameResult);\r
-            EnumerableAssert.AreEqual(requiredMetadata, requiredMetadataResult);\r
-        }\r
-\r
-        private static void AssertCanNotParse(Expression<Func<ExportDefinition, bool>> constraint)\r
-        {\r
-            Assert.IsNotNull(constraint);\r
-\r
-            string contractNameResult;\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadataResult;\r
-\r
-            var success = ContraintParser.TryParseConstraint(constraint, out contractNameResult, out requiredMetadataResult);\r
-            Assert.IsFalse(success);\r
-            Assert.IsNull(contractNameResult);\r
-            Assert.IsNull(requiredMetadataResult);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ContractBasedImportDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ContractBasedImportDefinitionTests.cs
deleted file mode 100644 (file)
index 19dd66b..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ContractBasedImportDefinitionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetRequiredMetadataPropertyToEmptyEnumerable()\r
-        {\r
-            var definition = new NoOverridesContractBasedImportDefinition();\r
-\r
-            EnumerableAssert.IsEmpty(definition.RequiredMetadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetCardinalityPropertyToExactlyOne()\r
-        {\r
-            var definition = new NoOverridesContractBasedImportDefinition();\r
-\r
-            Assert.AreEqual(ImportCardinality.ExactlyOne, definition.Cardinality);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetIsPrerequisitePropertyToTrue()\r
-        {\r
-            var definition = new NoOverridesContractBasedImportDefinition();\r
-\r
-            Assert.IsTrue(definition.IsPrerequisite);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetIsRecomposablePropertyToFalse()\r
-        {\r
-            var definition = new NoOverridesContractBasedImportDefinition();\r
-\r
-            Assert.IsFalse(definition.IsRecomposable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetRequiredCreationPolicyToAny()\r
-        {\r
-            var definition = new NoOverridesContractBasedImportDefinition();\r
-\r
-            Assert.AreEqual(CreationPolicy.Any, definition.RequiredCreationPolicy);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetRequiredTypeIdentityToNull()\r
-        {\r
-            var definition = new NoOverridesContractBasedImportDefinition();\r
-\r
-            Assert.IsNull(definition.RequiredTypeIdentity);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsContractNameArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("contractName", () =>\r
-            {\r
-                new ContractBasedImportDefinition((string)null, (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), ImportCardinality.ExactlyOne, false, false, CreationPolicy.Any);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyStringAsContractNameArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("contractName", () =>\r
-            {\r
-                new ContractBasedImportDefinition("", (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), ImportCardinality.ExactlyOne, false, false, CreationPolicy.Any);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RequiredMetadata_ArrayWithNullKeyAsRequiredMetadataArgument_ShouldThrowInvalidOperation()\r
-        {\r
-            var requiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>(null, typeof(object)) };\r
-\r
-            var import = new ContractBasedImportDefinition("requiredMetadata", (string)null, requiredMetadata, ImportCardinality.ExactlyOne, false, false, CreationPolicy.Any);\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-            {\r
-                var m = import.RequiredMetadata;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RequiredMetadata_ArrayWithNullValueAsRequiredMetadataArgument_ShouldThrowInvalidOperation()\r
-        {\r
-            var requiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("key", null) };\r
-            var import = new ContractBasedImportDefinition("requiredMetadata", (string)null, requiredMetadata, ImportCardinality.ExactlyOne, false, false, CreationPolicy.Any);\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-            {\r
-                var m = import.RequiredMetadata;\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsRequiredMetadataArgument_ShouldSetRequiredMetadataToEmptyEnumerable()\r
-        {\r
-            var definition = new ContractBasedImportDefinition("requiredMetadata", (string)null, (IEnumerable<KeyValuePair<string, Type>>)null, ImportCardinality.ExactlyOne, false, false, CreationPolicy.Any);\r
-\r
-            EnumerableAssert.IsEmpty(definition.RequiredMetadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_OutOfRangeValueAsCardinalityArgument_ShouldThrowArgument()\r
-        {\r
-            var expectations = Expectations.GetInvalidEnumValues<ImportCardinality>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                ExceptionAssert.ThrowsArgument<ArgumentException>("cardinality", () =>\r
-                {\r
-                    new ContractBasedImportDefinition((string)null, (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), e, false, false, CreationPolicy.Any);\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsCardinalityArgument_ShouldSetCardinalityProperty()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<ImportCardinality>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition("ContractName", (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), e, false, false, CreationPolicy.Any);\r
-\r
-                Assert.AreEqual(e, definition.Cardinality);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsContractNameArgument_ShouldSetContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition(e, (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), ImportCardinality.ExactlyOne, false, false, CreationPolicy.Any);\r
-\r
-                Assert.AreEqual(e, definition.ContractName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsRequiredMetadataArgument_ShouldSetRequiredMetadataProperty()\r
-        {\r
-            var expectations = Expectations.GetRequiredMetadataWithEmpty();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition("ContractName", (string)null, e, ImportCardinality.ExactlyOne, false, false, CreationPolicy.Any);\r
-\r
-                EnumerableAssert.AreEqual(e, definition.RequiredMetadata);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsIsRecomposableArgument_ShouldSetIsRecomposableProperty()\r
-        {\r
-            var expectations = Expectations.GetBooleans();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition("ContractName", (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), ImportCardinality.ExactlyOne, e, false, CreationPolicy.Any);\r
-\r
-                Assert.AreEqual(e, definition.IsRecomposable);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsIsPrerequisiteArgument_ShouldSetIsPrerequisiteProperty()\r
-        {\r
-            var expectations = Expectations.GetBooleans();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition("ContractName", (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), ImportCardinality.ExactlyOne, false, e, CreationPolicy.Any);\r
-\r
-                Assert.AreEqual(e, definition.IsPrerequisite);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetRequiredCreationPolicyToAny()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CreationPolicy>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition("ContractName", (string)null, Enumerable.Empty<KeyValuePair<string, Type>>(), ImportCardinality.ExactlyOne, false, false, e);\r
-\r
-                Assert.AreEqual(e, definition.RequiredCreationPolicy);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constraint_ShouldIncludeContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition(e, (string)null, (IEnumerable<KeyValuePair<string, Type>>)null, ImportCardinality.ExactlyOne, true, false, CreationPolicy.Any);\r
-\r
-                ConstraintAssert.Contains(definition.Constraint, e);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constraint_ShouldIncludeRequiredMetadataProperty()\r
-        {\r
-            var expectations = Expectations.GetRequiredMetadataWithEmpty();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ContractBasedImportDefinition("ContractName", (string)null, e, ImportCardinality.ExactlyOne, true, false, CreationPolicy.Any);\r
-\r
-                ConstraintAssert.Contains(definition.Constraint, "ContractName", e);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constraint_ShouldIncludeOverriddenContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new DerivedContractBasedImportDefinition(e);\r
-\r
-                ConstraintAssert.Contains(definition.Constraint, e);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constraint_ShouldIncludeOverriddenRequiredMetadata()\r
-        {\r
-            var expectations = Expectations.GetRequiredMetadataWithEmpty();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new DerivedContractBasedImportDefinition("ContractName", e);\r
-\r
-                ConstraintAssert.Contains(definition.Constraint, "ContractName", e);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsConstraintSatisfiedBy_ContractNameMatch()\r
-        {\r
-            var export = CreateSimpleExport();\r
-            var import = CreateSimpleImport("ContractName", "ContractName", new string[0], new Type[0]);\r
-            Assert.IsTrue(import.IsConstraintSatisfiedBy(export));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsConstraintSatisfiedBy_ContractNameMismatch()\r
-        {\r
-            var export = CreateSimpleExport();\r
-            var import = CreateSimpleImport("NonContractName", "ContractName", new string[0], new Type[0]);\r
-            Assert.IsFalse(import.IsConstraintSatisfiedBy(export));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsConstraintSatisfiedBy_TypeIdentityMismatch()\r
-        {\r
-            var export = CreateSimpleExport();\r
-            var import = CreateSimpleImport("ContractName", "NonContractName", new string[0], new Type[0]);\r
-            Assert.IsFalse(import.IsConstraintSatisfiedBy(export));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsConstraintSatisfiedBy_MetadataMatch()\r
-        {\r
-            var export = CreateSimpleExport();\r
-            var import = CreateSimpleImport("ContractName", "ContractName", new string[]{"Int", "String", "Type"}, new Type[]{typeof(int), typeof(string), typeof(Type)});\r
-            Assert.IsTrue(import.IsConstraintSatisfiedBy(export));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsConstraintSatisfiedBy_MetadataKeyMismatch()\r
-        {\r
-            var export = CreateSimpleExport();\r
-            var import = CreateSimpleImport("ContractName", "ContractName", new string[] { "Int", "String1", "Type" }, new Type[] { typeof(int), typeof(string), typeof(Type) });\r
-            Assert.IsFalse(import.IsConstraintSatisfiedBy(export));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsConstraintSatisfiedBy_MetadataTypeMatch()\r
-        {\r
-            var export = CreateSimpleExport();\r
-            var import = CreateSimpleImport("ContractName", "ContractName", new string[] { "Int", "String", "Type" }, new Type[] { typeof(int), typeof(string), typeof(int) });\r
-            Assert.IsFalse(import.IsConstraintSatisfiedBy(export));\r
-        }\r
-\r
-        private static ExportDefinition CreateSimpleExport()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("Int", 42);\r
-            metadata.Add("String", "42");\r
-            metadata.Add("Type", typeof(string));\r
-            metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, "ContractName");\r
-            return new ExportDefinition("ContractName", metadata);\r
-        }\r
-\r
-        private static ContractBasedImportDefinition CreateSimpleImport(string contractName, string typeIdentity, string[] metadataKeys, Type[] metadataTypes)\r
-        {\r
-            Dictionary<string, Type> requiredMetadata = new Dictionary<string, Type>();\r
-            Assert.AreEqual(metadataKeys.Length, metadataTypes.Length);\r
-            for(int i=0; i< metadataKeys.Length; i++)\r
-            {\r
-                requiredMetadata[metadataKeys[i]] = metadataTypes[i];\r
-            }\r
-            return new ContractBasedImportDefinition(contractName, typeIdentity, requiredMetadata, ImportCardinality.ZeroOrMore, false, false, CreationPolicy.Any);\r
-            \r
-        }\r
-\r
-        private class NoOverridesContractBasedImportDefinition : ContractBasedImportDefinition\r
-        {\r
-            public NoOverridesContractBasedImportDefinition()\r
-            {\r
-            }\r
-        }\r
-\r
-        private class DerivedContractBasedImportDefinition : ContractBasedImportDefinition\r
-        {\r
-            private readonly string _contractName;\r
-            private readonly IEnumerable<KeyValuePair<string, Type>> _requiredMetadata;\r
-\r
-            public DerivedContractBasedImportDefinition(string contractName)\r
-            {\r
-                _contractName = contractName;\r
-            }\r
-\r
-            public DerivedContractBasedImportDefinition(string contractName, IEnumerable<KeyValuePair<string, Type>> requiredMetadata)\r
-            {\r
-                _contractName = contractName;\r
-                _requiredMetadata = requiredMetadata;\r
-            }\r
-\r
-            public override string ContractName\r
-            {\r
-                get { return _contractName; }\r
-            }\r
-\r
-            public override IEnumerable<KeyValuePair<string, Type>> RequiredMetadata\r
-            {\r
-                get { return _requiredMetadata; }\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ContractMismatchExceptionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ContractMismatchExceptionTests.cs
deleted file mode 100644 (file)
index ca3c5d6..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-#if !SILVERLIGHT\r
-using System.Runtime.Serialization;\r
-#endif\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ContractMismatchExceptionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionContractMismatchException();\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionContractMismatchException((string)null);\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsMessageArgument_ShouldSetMessagePropertyToDefault()\r
-        {\r
-            var exception = new CompositionContractMismatchException((string)null, new Exception());\r
-\r
-            ExceptionAssert.HasDefaultMessage(exception);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionContractMismatchException(e);\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsMessageArgument_ShouldSetMessageProperty()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionContractMismatchException(e, new Exception());\r
-\r
-                Assert.AreEqual(e, exception.Message);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionContractMismatchException();\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionContractMismatchException("Message");\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsInnerExceptionArgument_ShouldSetInnerExceptionPropertyToNull()\r
-        {\r
-            var exception = new CompositionContractMismatchException("Message", (Exception)null);\r
-\r
-            Assert.IsNull(exception.InnerException);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsInnerExceptionArgument_ShouldSetInnerExceptionProperty()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = new CompositionContractMismatchException("Message", e);\r
-\r
-                Assert.AreSame(e, exception.InnerException);\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsInfoArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var context = new StreamingContext();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("info", () =>\r
-            {\r
-                SerializationTestServices.Create<CompositionContractMismatchException>((SerializationInfo)null, context);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InnerException_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetInnerExceptionsWithNull();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateContractMismatchException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                ExtendedAssert.IsInstanceOfSameType(exception.InnerException, result.InnerException);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Message_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetExceptionMessages();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var exception = CreateContractMismatchException(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(exception);\r
-\r
-                Assert.AreEqual(exception.Message, result.Message);\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        private static CompositionContractMismatchException CreateContractMismatchException()\r
-        {\r
-            return CreateContractMismatchException((string)null, (Exception)null);\r
-        }\r
-\r
-        private static CompositionContractMismatchException CreateContractMismatchException(string message)\r
-        {\r
-            return CreateContractMismatchException(message, (Exception)null);\r
-        }\r
-\r
-        private static CompositionContractMismatchException CreateContractMismatchExceptionFromId(string id)\r
-        {\r
-            return CreateContractMismatchException((string)null, (Exception)null);\r
-        }\r
-\r
-        private static CompositionContractMismatchException CreateContractMismatchException(Exception innerException)\r
-        {\r
-            return CreateContractMismatchException((string)null, innerException);\r
-        }\r
-\r
-        private static CompositionContractMismatchException CreateContractMismatchException(string message, Exception innerException)\r
-        {\r
-            return new CompositionContractMismatchException(message, innerException);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/.gitattributes
deleted file mode 100644 (file)
index c78a36d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/CompositionTraceIdTests.cs -crlf
-/CompositionTraceSourceTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/CompositionTraceIdTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/CompositionTraceIdTests.cs
deleted file mode 100644 (file)
index 477237f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    [TestClass]\r
-    public class CompositionTraceIdTests\r
-    {\r
-        [TestMethod]\r
-        public void CompositionTraceIdsAreInSyncWithTraceIds()\r
-        {\r
-            ExtendedAssert.EnumsContainSameValues<CompositionTraceId, TraceId>();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/CompositionTraceSourceTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Diagnostics/CompositionTraceSourceTests.cs
deleted file mode 100644 (file)
index 32f74b8..0000000
+++ /dev/null
@@ -1,528 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics;\r
-\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-using System.Collections.Generic;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    [TestClass]\r
-    public class ComposableTraceSourceTests\r
-    {\r
-#if !SILVERLIGHT\r
-        [TestMethod]\r
-        public void CanWriteInformation_ShouldReturnFalseByDefault()\r
-        {\r
-            Assert.IsFalse(CompositionTraceSource.CanWriteInformation);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteWarning_ShouldReturnTrueByDefault()\r
-        {\r
-            Assert.IsTrue(CompositionTraceSource.CanWriteWarning);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteError_ShouldReturnTrueByDefault()\r
-        {\r
-            Assert.IsTrue(CompositionTraceSource.CanWriteError);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteInformation_WhenSwitchLevelLessThanInformation_ShouldReturnFalse()\r
-        {\r
-            var levels = GetSourceLevelsLessThan(SourceLevels.Information);\r
-            foreach (var level in levels)\r
-            {\r
-                using (new TraceContext(level))\r
-                {\r
-                    Assert.IsFalse(CompositionTraceSource.CanWriteInformation);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteInformation_WhenSwitchLevelGreaterThanOrEqualToInformation_ShouldReturnTrue()\r
-        {\r
-            var levels = GetSourceLevelsGreaterThanOrEqualTo(SourceLevels.Information);\r
-            foreach (var level in levels)\r
-            {\r
-                using (new TraceContext(level))\r
-                {\r
-                    Assert.IsTrue(CompositionTraceSource.CanWriteInformation);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteWarning_WhenSwitchLevelLessThanWarning_ShouldReturnFalse()\r
-        {\r
-            var levels = GetSourceLevelsLessThan(SourceLevels.Warning);\r
-            foreach (var level in levels)\r
-            {\r
-                using (new TraceContext(level))\r
-                {\r
-                    Assert.IsFalse(CompositionTraceSource.CanWriteWarning);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteWarning_WhenSwitchLevelGreaterThanOrEqualToWarning_ShouldReturnTrue()\r
-        {\r
-            var levels = GetSourceLevelsGreaterThanOrEqualTo(SourceLevels.Warning);\r
-            foreach (var level in levels)\r
-            {\r
-                using (new TraceContext(level))\r
-                {\r
-                    Assert.IsTrue(CompositionTraceSource.CanWriteWarning);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteError_WhenSwitchLevelLessThanError_ShouldReturnFalse()\r
-        {\r
-            var levels = GetSourceLevelsLessThan(SourceLevels.Error);\r
-            foreach (var level in levels)\r
-            {\r
-                using (new TraceContext(level))\r
-                {\r
-                    Assert.IsFalse(CompositionTraceSource.CanWriteError);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteError_WhenSwitchLevelGreaterThanOrEqualToError_ShouldReturnTrue()\r
-        {\r
-            var levels = GetSourceLevelsGreaterThanOrEqualTo(SourceLevels.Error);\r
-            foreach (var level in levels)\r
-            {\r
-                using (new TraceContext(level))\r
-                {\r
-                    Assert.IsTrue(CompositionTraceSource.CanWriteError);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteInformation_WhenSwitchLevelLessThanInformation_ShouldThrowInternalError()\r
-        {\r
-            var levels = GetSourceLevelsLessThan(SourceLevels.Information);\r
-            foreach (var level in levels)\r
-            {\r
-                using (TraceContext context = new TraceContext(level))\r
-                {\r
-                    ThrowsInternalError(() =>\r
-                    {\r
-                        CompositionTraceSource.WriteInformation(0, "format", "arguments");\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteInformation_WhenSwitchLevelGreaterThanOrEqualToInformation_ShouldWriteToTraceListener()\r
-        {\r
-            var levels = GetSourceLevelsGreaterThanOrEqualTo(SourceLevels.Information);\r
-            foreach (var level in levels)\r
-            {\r
-                using (TraceContext context = new TraceContext(level))\r
-                {\r
-                    CompositionTraceSource.WriteInformation(0, "format", "arguments");\r
-\r
-                    Assert.IsNotNull(context.LastTraceEvent);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteWarning_WhenSwitchLevelLessThanWarning_ShouldThrowInternalError()\r
-        {\r
-            var levels = GetSourceLevelsLessThan(SourceLevels.Warning);\r
-            foreach (var level in levels)\r
-            {\r
-                using (TraceContext context = new TraceContext(level))\r
-                {\r
-                    ThrowsInternalError(() =>\r
-                    {\r
-                        CompositionTraceSource.WriteWarning(0, "format", "arguments");\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteWarning_WhenSwitchLevelGreaterThanOrEqualToWarning_ShouldWriteToTraceListener()\r
-        {\r
-            var levels = GetSourceLevelsGreaterThanOrEqualTo(SourceLevels.Information);\r
-            foreach (var level in levels)\r
-            {\r
-                using (TraceContext context = new TraceContext(level))\r
-                {\r
-                    CompositionTraceSource.WriteWarning(0, "format", "arguments");\r
-\r
-                    Assert.IsNotNull(context.LastTraceEvent);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteError_WhenSwitchLevelLessThanError_ShouldThrowInternalError()\r
-        {\r
-            var levels = GetSourceLevelsLessThan(SourceLevels.Error);\r
-            foreach (var level in levels)\r
-            {\r
-                using (TraceContext context = new TraceContext(level))\r
-                {\r
-                    ThrowsInternalError(() =>\r
-                    {\r
-                        CompositionTraceSource.WriteError(0, "format", "arguments");\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteError_WhenSwitchLevelGreaterThanOrEqualToError_ShouldWriteToTraceListener()\r
-        {\r
-            var levels = GetSourceLevelsGreaterThanOrEqualTo(SourceLevels.Error);\r
-            foreach (var level in levels)\r
-            {\r
-                using (TraceContext context = new TraceContext(level))\r
-                {\r
-                    CompositionTraceSource.WriteError(0, "format", "arguments");\r
-\r
-                    Assert.IsNotNull(context.LastTraceEvent);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteInformation_ShouldWriteTraceEventTypeInformationToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Information))\r
-            {\r
-                CompositionTraceSource.WriteInformation(0, "format", "arguments");\r
-\r
-                Assert.AreEqual(TraceEventType.Information, context.LastTraceEvent.EventType);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteWarning_ShouldWriteTraceEventTypeWarningToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Warning))\r
-            {\r
-                CompositionTraceSource.WriteWarning(0, "format", "arguments");\r
-\r
-                Assert.AreEqual(TraceEventType.Warning, context.LastTraceEvent.EventType);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteError_ShouldWriteTraceEventTypeWarningToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Error))\r
-            {\r
-                CompositionTraceSource.WriteError(0, "format", "arguments");\r
-\r
-                Assert.AreEqual(TraceEventType.Error, context.LastTraceEvent.EventType);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteInformation_ShouldWriteCorrectSourceToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Information))\r
-            {\r
-                CompositionTraceSource.WriteInformation(0, "format", "arguments");\r
-\r
-                Assert.AreEqual("System.ComponentModel.Composition", context.LastTraceEvent.Source);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteWarning_ShouldWriteCorrectSourceToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Warning))\r
-            {\r
-                CompositionTraceSource.WriteWarning(0, "format", "arguments");\r
-\r
-                Assert.AreEqual("System.ComponentModel.Composition", context.LastTraceEvent.Source);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteError_ShouldWriteCorrectSourceToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Error))\r
-            {\r
-                CompositionTraceSource.WriteError(0, "format", "arguments");\r
-\r
-                Assert.AreEqual("System.ComponentModel.Composition", context.LastTraceEvent.Source);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteInformation_ValueAsTraceId_ShouldWriteIdToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Information))\r
-            {\r
-                var expectations = Expectations.GetEnumValues<CompositionTraceId>();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteInformation(e, "format", "arguments");\r
-\r
-                    Assert.AreEqual(e, (CompositionTraceId)context.LastTraceEvent.Id);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteWarning_ValueAsTraceId_ShouldWriteIdToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Warning))\r
-            {\r
-                var expectations = Expectations.GetEnumValues<CompositionTraceId>();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteWarning(e, "format", "arguments");\r
-\r
-                    Assert.AreEqual(e, (CompositionTraceId)context.LastTraceEvent.Id);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteError_ValueAsTraceId_ShouldWriteIdToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Error))\r
-            {\r
-                var expectations = Expectations.GetEnumValues<CompositionTraceId>();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteError(e, "format", "arguments");\r
-\r
-                    Assert.AreEqual(e, (CompositionTraceId)context.LastTraceEvent.Id);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteInformation_ValueAsFormat_ShouldWriteFormatToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Information))\r
-            {\r
-                var expectations = Expectations.GetExceptionMessages();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteInformation(0, e, "arguments");\r
-\r
-                    Assert.AreEqual(e, context.LastTraceEvent.Format);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteWarning_ValueAsFormat_ShouldWriteFormatToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Warning))\r
-            {\r
-                var expectations = Expectations.GetExceptionMessages();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteWarning(0, e, "arguments");\r
-\r
-                    Assert.AreEqual(e, context.LastTraceEvent.Format);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteError_ValueAsFormat_ShouldWriteFormatToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Error))\r
-            {\r
-                var expectations = Expectations.GetExceptionMessages();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteError(0, e, "arguments");\r
-\r
-                    Assert.AreEqual(e, context.LastTraceEvent.Format);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteInformation_ValueAsArgs_ShouldWriteArgsToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Information))\r
-            {\r
-                var expectations = Expectations.GetObjectArraysWithNull();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteInformation(0, "format", e);\r
-\r
-                    Assert.AreSame(e, context.LastTraceEvent.Args);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteWarning_ValueAsArgs_ShouldWriteArgsToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Warning))\r
-            {\r
-                var expectations = Expectations.GetObjectArraysWithNull();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteWarning(0, "format", e);\r
-\r
-                    Assert.AreSame(e, context.LastTraceEvent.Args);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void WriteError_ValueAsArgs_ShouldWriteArgsToTraceListener()\r
-        {\r
-            using (var context = new TraceContext(SourceLevels.Error))\r
-            {\r
-                var expectations = Expectations.GetObjectArraysWithNull();\r
-                foreach (var e in expectations)\r
-                {\r
-                    CompositionTraceSource.WriteError(0, "format", e);\r
-\r
-                    Assert.AreSame(e, context.LastTraceEvent.Args);\r
-                }\r
-            }\r
-        }\r
-\r
-        private static IEnumerable<SourceLevels> GetSourceLevelsLessThan(SourceLevels level)\r
-        {\r
-            return GetOnSourceLevels(level, false);\r
-        }\r
-\r
-        private static IEnumerable<SourceLevels> GetSourceLevelsGreaterThanOrEqualTo(SourceLevels level)\r
-        {\r
-            return GetOnSourceLevels(level, true);\r
-        }\r
-\r
-        private static IEnumerable<SourceLevels> GetOnSourceLevels(SourceLevels sourceLevel, bool on)\r
-        {\r
-            // SourceSwitch determines if a particular level gets traced based on whether its bit is\r
-            // set in the current level. For example, if the current level was Warning (0000 0111),\r
-            // then Warning (0000 0111), Error (0000 0011), and Critical (0000 0001) all get traced.\r
-\r
-            var levels = TestServices.GetEnumValues<SourceLevels>();\r
-\r
-            foreach (var level in levels)\r
-            {\r
-                if (level == 0)\r
-                    continue;\r
-                \r
-                if (((level & sourceLevel) == sourceLevel) == on)\r
-                {\r
-                    yield return level;\r
-                }\r
-            }\r
-\r
-            if (!on)\r
-            {   \r
-                yield return SourceLevels.Off;\r
-            }\r
-        }\r
-\r
-        private static void ThrowsInternalError(Action action)\r
-        {\r
-            try\r
-            {\r
-                action();\r
-                Assert.Fail();\r
-            }\r
-            catch (Exception ex)\r
-            {\r
-                Type exceptionType = ex.GetType();\r
-\r
-                // The exception should not be a \r
-                // publicily catchable exception\r
-                Assert.IsFalse(exceptionType.IsVisible);\r
-            }\r
-        }\r
-#endif\r
-\r
-#if SILVERLIGHT\r
-        [TestMethod]\r
-        public void CanWriteInformation_ShouldReturnFalse()\r
-        {\r
-            Assert.IsFalse(CompositionTraceSource.CanWriteInformation);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteWarning_ShouldReturnDebuggerLogging()\r
-        {\r
-            Assert.AreEqual(CompositionTraceSource.CanWriteWarning, Debugger.IsLogging());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanWriteError_ShouldReturnDebuggerLogging()\r
-        {\r
-            Assert.AreEqual(CompositionTraceSource.CanWriteError, Debugger.IsLogging());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateLogMessage_ContainsTraceEventType()\r
-        {\r
-            IEnumerable<SilverlightTraceWriter.TraceEventType> eventTypes = Expectations.GetEnumValues<SilverlightTraceWriter.TraceEventType>();\r
-            \r
-            foreach(var eventType in eventTypes)\r
-            {\r
-                string message = SilverlightTraceWriter.CreateLogMessage(eventType, CompositionTraceId.Discovery_AssemblyLoadFailed, "Format");\r
-                Assert.IsTrue(message.Contains(eventType.ToString()), "Should contain enum string of EventType");\r
-            }            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateLogMessage_ContainsTraceIdAsInt()\r
-        {\r
-            IEnumerable<CompositionTraceId> traceIds = Expectations.GetEnumValues<CompositionTraceId>();\r
-            \r
-            foreach(var traceId in traceIds)\r
-            {\r
-                string message = SilverlightTraceWriter.CreateLogMessage(SilverlightTraceWriter.TraceEventType.Information, traceId, "Format");\r
-                Assert.IsTrue(message.Contains(((int)traceId).ToString()), "Should contain int version of TraceId");\r
-            }            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateLogMessage_FormatNull_ThrowsArugmentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgumentNull("format", () =>\r
-                SilverlightTraceWriter.CreateLogMessage(SilverlightTraceWriter.TraceEventType.Information, CompositionTraceId.Discovery_AssemblyLoadFailed, null));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateLogMessage_ArgumentsNull_ShouldCreateValidString()\r
-        {\r
-            string message = SilverlightTraceWriter.CreateLogMessage(SilverlightTraceWriter.TraceEventType.Information, CompositionTraceId.Discovery_AssemblyLoadFailed, "Format", null);\r
-\r
-            Assert.IsFalse(string.IsNullOrEmpty(message));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateLogMessage_ArgumentsPassed_ShouldCreateValidString()\r
-        {\r
-            string message = SilverlightTraceWriter.CreateLogMessage(SilverlightTraceWriter.TraceEventType.Information, CompositionTraceId.Discovery_AssemblyLoadFailed, "{0}", 9999);\r
-\r
-            Assert.IsTrue(message.Contains("9999"));\r
-        }\r
-#endif\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/DynamicMetadata.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/DynamicMetadata.cs
deleted file mode 100644 (file)
index 14272bc..0000000
+++ /dev/null
@@ -1,335 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class DynamicMetadata\r
-    {\r
-        [TestMethod]\r
-        public void SimpleAttachment()\r
-        {\r
-            MetadataStore.Container = new CompositionContainer();\r
-            DynamicMetadataTestClass val = DynamicMetadataTestClass.Get("42");\r
-\r
-            var notYetAttached = TypeDescriptor.GetConverter(val);\r
-            Assert.IsFalse(notYetAttached.CanConvertFrom(typeof(string)), "The default type converter for DynamicMetadataTestClass shouldn't support round tripping");\r
-\r
-            MetadataStore.AddAttribute(\r
-                typeof(DynamicMetadataTestClass),\r
-                ( type, attributes) => \r
-                    Enumerable.Concat(\r
-                        attributes,\r
-                        new Attribute[] { new TypeConverterAttribute(typeof(DynamicMetadataTestClassConverter)) }\r
-                    )\r
-            );\r
-            var attached = TypeDescriptor.GetConverter(val);\r
-            Assert.IsTrue(attached.CanConvertFrom(typeof(string)), "The new type converter for DynamicMetadataTestClass should support round tripping");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void LocalContainer()\r
-        {\r
-            var container1 = new CompositionContainer();\r
-            TypeDescriptorServices dat = new TypeDescriptorServices();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(dat);\r
-            container1.Compose(batch);\r
-            MetadataStore.AddAttribute(\r
-                typeof(DynamicMetadataTestClass),\r
-                ( type, attributes) => \r
-                    Enumerable.Concat(\r
-                        attributes,\r
-                        new Attribute[] { new TypeConverterAttribute(typeof(DynamicMetadataTestClassConverter)) }\r
-                    ),\r
-                container1\r
-            );\r
-            DynamicMetadataTestClass val = DynamicMetadataTestClass.Get("42");\r
-\r
-            var notYetAttached = TypeDescriptor.GetConverter(val.GetType());\r
-            Assert.IsFalse(notYetAttached.CanConvertFrom(typeof(string)), "The default type converter for DynamicMetadataTestClass shouldn't support round tripping");\r
-\r
-            var attached = dat.GetConverter(val.GetType());\r
-            Assert.IsTrue(attached.CanConvertFrom(typeof(string)), "The new type converter for DynamicMetadataTestClass should support round tripping");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void DualContainers()\r
-        {\r
-            var container1 = new CompositionContainer();\r
-            TypeDescriptorServices dat1 = new TypeDescriptorServices();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(dat1);\r
-            container1.Compose(batch);\r
-            MetadataStore.AddAttribute(\r
-                typeof(DynamicMetadataTestClass),\r
-                ( type, attributes) => \r
-                    Enumerable.Concat(\r
-                        attributes,\r
-                        new Attribute[] { new TypeConverterAttribute(typeof(DynamicMetadataTestClassConverter)) }\r
-                    ),\r
-                container1\r
-            );\r
-\r
-\r
-            var container2 = new CompositionContainer();\r
-            CompositionBatch batch2 = new CompositionBatch();\r
-            TypeDescriptorServices dat2 = new TypeDescriptorServices();\r
-            batch2.AddPart(dat2);\r
-            container2.Compose(batch2);\r
-\r
-            DynamicMetadataTestClass val = DynamicMetadataTestClass.Get("42");\r
-\r
-            var attached1 = dat1.GetConverter(val.GetType());\r
-            Assert.IsTrue(attached1.CanConvertFrom(typeof(string)), "The new type converter for DynamicMetadataTestClass should support round tripping");\r
-\r
-            var attached2 = dat2.GetConverter(val.GetType());\r
-            Assert.IsFalse(attached2.CanConvertFrom(typeof(string)), "The default type converter for DynamicMetadataTestClass shouldn't support round tripping");\r
-        }\r
-\r
-        [TestCleanup]\r
-        public void ResetContainer()\r
-        {\r
-            MetadataStore.Container = null;\r
-        }\r
-    }\r
-\r
-\r
-    [Export]\r
-    public class TypeDescriptorServices\r
-    {\r
-        Dictionary<Type, TypeDescriptionProvider> providers = new Dictionary<Type, TypeDescriptionProvider>();\r
-\r
-        internal Dictionary<Type, TypeDescriptionProvider> Providers\r
-        {\r
-            get { return providers; }\r
-            set { providers = value; }\r
-        }\r
-\r
-        public ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)\r
-        {\r
-            if (Providers.ContainsKey(objectType))\r
-            {\r
-                return Providers[objectType].GetTypeDescriptor(objectType);\r
-            }\r
-            else\r
-            {\r
-                return null;\r
-            }\r
-        }\r
-        public void AddProvider(TypeDescriptionProvider provider, Type type)\r
-        {\r
-            Providers[type] = provider;\r
-        }\r
-        public TypeConverter GetConverter(Type type)\r
-        {\r
-            var ictd = GetTypeDescriptor(type, null);\r
-            if (ictd != null)\r
-            {\r
-                return ictd.GetConverter();\r
-            }\r
-            else\r
-            {\r
-                return TypeDescriptor.GetConverter(type);\r
-            }\r
-        }\r
-    }\r
-\r
-    public static class MetadataStore\r
-    {\r
-        public static CompositionContainer Container { get; set; }\r
-        static Dictionary<Type, TypeDescriptionProvider> registeredRedirect = new Dictionary<Type, TypeDescriptionProvider>();\r
-\r
-        public static void AddAttribute(Type target, Func<MemberInfo, IEnumerable<Attribute>, IEnumerable<Attribute>> provider)\r
-        {\r
-            AddAttribute(target, provider, MetadataStore.Container);\r
-        }\r
-        public static void AddAttribute(Type target, Func<MemberInfo, IEnumerable<Attribute>, IEnumerable<Attribute>> provider, CompositionContainer container)\r
-        {\r
-            ContainerUnawareProviderRedirect.GetRedirect(container)[target] = new MetadataStoreProvider(target, provider);\r
-            RegisterTypeDescriptorInterop(target);\r
-        }\r
-        private static void RegisterTypeDescriptorInterop(Type target)\r
-        {\r
-            if (!registeredRedirect.ContainsKey(target))\r
-            {\r
-                var r = new ContainerUnawareProviderRedirect(target);\r
-                TypeDescriptor.AddProvider(r, target);\r
-                registeredRedirect[target] = r;\r
-            }\r
-            else\r
-            {\r
-                // force a uncache of the information from TypeDescriptor\r
-                //\r
-                TypeDescriptor.RemoveProvider(registeredRedirect[target], target);\r
-                TypeDescriptor.AddProvider(registeredRedirect[target], target);\r
-            }\r
-        }\r
-        public static TypeDescriptorServices GetTypeDescriptorServicesForContainer(CompositionContainer container)\r
-        {\r
-            if (container != null)\r
-            {\r
-                var result = container.GetExportedValueOrDefault<TypeDescriptorServices>();\r
-                if (result == null)\r
-                {\r
-                    var v = new TypeDescriptorServices();\r
-                    CompositionBatch batch = new CompositionBatch();\r
-                    batch.AddPart(v);\r
-                    container.Compose(batch);\r
-                    return v;\r
-                }\r
-                \r
-                return result;\r
-            }\r
-            return null;\r
-        }\r
-\r
-        private class ContainerUnawareProviderRedirect : TypeDescriptionProvider\r
-        {\r
-            public ContainerUnawareProviderRedirect(Type forType)\r
-                : base(TypeDescriptor.GetProvider(forType))\r
-            {\r
-            }\r
-            public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)\r
-            {\r
-                var datd = GetTypeDescriptorServicesForContainer(MetadataStore.Container);\r
-                if (datd == null || !datd.Providers.ContainsKey(objectType))\r
-                {\r
-                    return base.GetTypeDescriptor(objectType, instance);\r
-                }\r
-                else\r
-                {\r
-                    return datd.GetTypeDescriptor(objectType, instance);\r
-                }\r
-            }\r
-\r
-            internal static Dictionary<Type, TypeDescriptionProvider> GetRedirect(CompositionContainer container)\r
-            {\r
-                TypeDescriptorServices v = GetTypeDescriptorServicesForContainer(container);\r
-                return v != null ? v.Providers : null;\r
-            }\r
-        }\r
-\r
-        private class MetadataStoreProvider : TypeDescriptionProvider\r
-        {\r
-            Func<MemberInfo, IEnumerable<Attribute>, IEnumerable<Attribute>> provider;\r
-            public MetadataStoreProvider(Type forType, Func<MemberInfo, IEnumerable<Attribute>, IEnumerable<Attribute>> provider)\r
-                : base(TypeDescriptor.GetProvider(forType))\r
-            {\r
-                this.provider = provider;\r
-            }\r
-            public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)\r
-            {\r
-                ICustomTypeDescriptor descriptor = base.GetTypeDescriptor(objectType, instance);\r
-                descriptor = new MetadataStoreTypeDescriptor(objectType, descriptor, provider);\r
-                return descriptor;\r
-            }\r
-\r
-        }\r
-\r
-        private class MetadataStoreTypeDescriptor : CustomTypeDescriptor\r
-        {\r
-            Type targetType;\r
-            Func<MemberInfo, IEnumerable<Attribute>, IEnumerable<Attribute>> provider;\r
-            public MetadataStoreTypeDescriptor(Type targetType, ICustomTypeDescriptor parent, Func<MemberInfo, IEnumerable<Attribute>, IEnumerable<Attribute>> provider)\r
-                : base(parent)\r
-            {\r
-                this.targetType = targetType;\r
-                this.provider = provider;\r
-            }\r
-            public override TypeConverter GetConverter()\r
-            {\r
-                TypeConverterAttribute attribute = (TypeConverterAttribute)GetAttributes()[typeof(TypeConverterAttribute)];\r
-                if (attribute != null)\r
-                {\r
-                    Type c = this.GetTypeFromName(attribute.ConverterTypeName);\r
-                    if ((c != null) && typeof(TypeConverter).IsAssignableFrom(c))\r
-                    {\r
-                        return (TypeConverter)Activator.CreateInstance(c);\r
-                    }\r
-                }\r
-                return base.GetConverter();\r
-            }\r
-            private Type GetTypeFromName(string typeName)\r
-            {\r
-                if ((typeName == null) || (typeName.Length == 0))\r
-                {\r
-                    return null;\r
-                }\r
-                int length = typeName.IndexOf(',');\r
-                Type type = null;\r
-                if (length == -1)\r
-                {\r
-                    type = targetType.Assembly.GetType(typeName);\r
-                }\r
-                if (type == null)\r
-                {\r
-                    type = Type.GetType(typeName);\r
-                }\r
-                if ((type == null) && (length != -1))\r
-                {\r
-                    type = Type.GetType(typeName.Substring(0, length));\r
-                }\r
-                return type;\r
-            }\r
-            public override AttributeCollection GetAttributes()\r
-            {\r
-                var n = new List<Attribute>();\r
-                foreach (var attr in provider(targetType, base.GetAttributes().OfType<Attribute>()))\r
-                {\r
-                    n.Add(attr);\r
-                }\r
-                return new AttributeCollection(n.ToArray());\r
-            }\r
-        }\r
-    }\r
-\r
-    public class DynamicMetadataTestClass\r
-    {\r
-        int i;\r
-\r
-        private DynamicMetadataTestClass(int i)\r
-        {\r
-            this.i = i;\r
-        }\r
-\r
-        public override string ToString()\r
-        {\r
-            return i.ToString();\r
-        }\r
-\r
-        public static DynamicMetadataTestClass Get(string s)\r
-        {\r
-            return new DynamicMetadataTestClass(Int32.Parse(s));\r
-        }\r
-    }\r
-\r
-    public class DynamicMetadataTestClassConverter : TypeConverter\r
-    {\r
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)\r
-        {\r
-            return sourceType == typeof(string);\r
-        }\r
-        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType)\r
-        {\r
-            return ((DynamicMetadataTestClass)value).ToString();\r
-        }\r
-        public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)\r
-        {\r
-            return DynamicMetadataTestClass.Get((string)value);\r
-        }\r
-        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)\r
-        {\r
-            return destinationType == typeof(string);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Expectations.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Expectations.cs
deleted file mode 100644 (file)
index 7dae837..0000000
+++ /dev/null
@@ -1,336 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using System.Collections.Generic;\r
-using Microsoft.Internal.Collections;\r
-using System.Reflection;\r
-using System.Globalization;\r
-using System.Collections.ObjectModel;\r
-using System.Collections;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Reflection.Emit;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class Expectations\r
-    {\r
-        public static IEnumerable<CultureInfo> GetCulturesForFormatting()\r
-        {\r
-            yield return new CultureInfo("en-US");      // English (US)\r
-            yield return new CultureInfo("en-AU");      // English (Australian)\r
-            yield return new CultureInfo("en-CA");      // English (Canada)\r
-            yield return new CultureInfo("en-NZ");      // English (Great Britain)\r
-            yield return new CultureInfo("en-JM");      // English (Jamaica)\r
-            yield return new CultureInfo("pt-BR");      // Portuguese (Brazil)\r
-            yield return new CultureInfo("es-AR");      // Spanish (Argentina)\r
-            yield return new CultureInfo("ja-JP");      // Japanese (Japan)\r
-            yield return new CultureInfo("fr-FR");      // French (France)\r
-            yield return new CultureInfo("it-IT");      // Italian (Italy)\r
-            yield return new CultureInfo("de-DE");      // German (Germany)\r
-            yield return new CultureInfo("es-ES");      // Spanish (Spain)\r
-            yield return new CultureInfo("ko-KR");      // Korean (Korea)\r
-            yield return new CultureInfo("zh-TW");      // Chinese (Taiwan)\r
-            yield return new CultureInfo("zh-CN");      // Chinese (People's Republic of China)            \r
-        }     \r
-\r
-        public static IEnumerable<Assembly> GetAssemblies()\r
-        {\r
-            yield return Assembly.GetExecutingAssembly();\r
-            yield return Assembly.Load("mscorlib");\r
-        }\r
-\r
-        public static IEnumerable<string> GetDisplayNames()\r
-        {\r
-            yield return "";\r
-            yield return " ";\r
-            yield return "  ";\r
-            yield return "DisplayName";\r
-            yield return "displayname";\r
-            yield return "This is the display name.";\r
-        }\r
-\r
-        public static IEnumerable<ICompositionElement> GetCompositionElements()\r
-        {\r
-            yield return ElementFactory.CreateChain(1);\r
-            yield return ElementFactory.CreateChain(2);\r
-            yield return ElementFactory.CreateChain(3);\r
-            yield return ElementFactory.CreateChain(5);\r
-            yield return ElementFactory.CreateChain(10);\r
-        }\r
-\r
-        public static IEnumerable<ICompositionElement> GetCompositionElementsWithNull()\r
-        {\r
-            foreach (var element in GetCompositionElements())\r
-            {\r
-                yield return element;\r
-            }\r
-\r
-            yield return null;\r
-        }\r
-\r
-        public static IEnumerable<ComposablePartCatalog> GetCatalogs()\r
-        {\r
-            yield return CatalogFactory.Create();\r
-            yield return CatalogFactory.CreateDefaultAttributed();            \r
-        }\r
-\r
-        public static IEnumerable<IEnumerable<CompositionError>> GetCompositionErrors()\r
-        {\r
-            foreach (var value in GetEmptyCollections<CompositionError>())\r
-            {\r
-                yield return value;\r
-            }\r
-\r
-            yield return new CompositionError[] { new CompositionError("") };\r
-            yield return new CompositionError[] { new CompositionError(""), new CompositionError("Description") };\r
-            yield return new CompositionError[] { new CompositionError(""), new CompositionError("Description"), ErrorFactory.Create(CompositionErrorId.InvalidExportMetadata, "Description", (Exception)null), ErrorFactory.Create(CompositionErrorId.Unknown, "Description", new Exception()) };\r
-        }\r
-\r
-        public static IEnumerable<string> GetContractNames()\r
-        {\r
-            yield return " ";\r
-            yield return "   ";\r
-            yield return "ContractName";\r
-            yield return "contractName";\r
-            yield return "{ContractName}";\r
-            yield return "{ContractName}Name";\r
-            yield return "System.Windows.Forms.Control";\r
-            yield return "{System.Windows.Forms}Control";\r
-            yield return "{9}Control";\r
-        }\r
-\r
-        public static IEnumerable<string> GetContractNamesWithEmpty()\r
-        {\r
-            foreach (string contractName in GetContractNames())\r
-            {\r
-                yield return contractName;\r
-            }\r
-\r
-            yield return string.Empty;\r
-        }\r
-\r
-        public static IEnumerable<object> GetObjectsReferenceTypes()\r
-        {\r
-            yield return "Value";\r
-            yield return new Collection<string>();\r
-            yield return new IEnumerable[0];\r
-        }\r
-\r
-        public static IEnumerable<ValueType> GetObjectsValueTypes()\r
-        {\r
-            yield return 10;\r
-            yield return 10.0;\r
-            yield return DayOfWeek.Wednesday;\r
-        }\r
-\r
-        public static IEnumerable<string> GetMetadataNames()\r
-        {\r
-            return GetContractNamesWithEmpty();\r
-        }\r
-\r
-        public static IEnumerable<object> GetMetadataValues()\r
-        {\r
-            yield return null;\r
-            yield return string.Empty;\r
-            yield return "";\r
-            yield return " ";\r
-            yield return "   ";\r
-            yield return (Int32)1;\r
-            yield return (Byte)1;\r
-            yield return (Single)1.1;\r
-            yield return (Double)1.1;\r
-            yield return DayOfWeek.Wednesday;\r
-        }\r
-\r
-        public static IEnumerable<Dictionary<string, Type>> GetRequiredMetadata()\r
-        {\r
-            yield return new Dictionary<string, Type> { { "", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { " ", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "  ", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "   ", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "A", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "A", typeof(object) }, { "B", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "A", typeof(object) }, { "B", typeof(object) }, { "C", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "a", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "a", typeof(object) }, { "b", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "a", typeof(object) }, { "b", typeof(object) }, { "c", typeof(object) } };\r
-            yield return new Dictionary<string, Type> { { "Metadata1", typeof(object) }, { "Metadata2", typeof(object) }, { "Metadata3", typeof(object) } };\r
-        }\r
-\r
-        public static IEnumerable<Dictionary<string, Type>> GetRequiredMetadataWithEmpty()\r
-        {\r
-            foreach (var requiredMetadata in GetRequiredMetadata())\r
-            {\r
-                yield return requiredMetadata;\r
-            }\r
-            \r
-            yield return new Dictionary<string, Type>();\r
-        }\r
-\r
-        public static IEnumerable<IDictionary<string, object>> GetMetadata()\r
-        {\r
-            yield return new ReadOnlyDictionary<string, object>(null);\r
-            yield return new Dictionary<string, object>();\r
-\r
-#if !SILVERLIGHT\r
-\r
-            yield return new SortedDictionary<string, object>();\r
-            yield return new SortedList<string, object>();\r
-\r
-#endif            \r
-            var metadata = new Dictionary<string, object>();\r
-            metadata.Add("One", "Value");\r
-            metadata.Add("Two", true);\r
-            metadata.Add("Three", 10);\r
-            metadata.Add("Four", 1.0);\r
-            metadata.Add("Five", null);\r
-            \r
-            yield return metadata;\r
-        }\r
-\r
-        public static IEnumerable<string> GetExceptionMessages()\r
-        {\r
-            yield return "";\r
-            yield return " ";\r
-            yield return "  ";\r
-            yield return "message";\r
-            yield return "This is an error message.";\r
-            yield return "Line One." + Environment.NewLine + "Line Two.";\r
-        }\r
-\r
-        public static IEnumerable<Exception> GetInnerExceptions()\r
-        {\r
-            yield return new Exception();\r
-            yield return new ArgumentException();\r
-            yield return new SystemException();\r
-#if CLR40\r
-            yield return new CompositionException();\r
-            yield return new ImportCardinalityMismatchException();\r
-#endif\r
-        }\r
-\r
-        public static IEnumerable<Exception> GetInnerExceptionsWithNull()\r
-        {\r
-            foreach (var exception in GetInnerExceptions())\r
-            {\r
-                yield return exception;\r
-            }\r
-            \r
-            yield return null;\r
-        }\r
-\r
-        public static IEnumerable<bool> GetBooleans()\r
-        {\r
-            yield return false;\r
-            yield return true;\r
-            yield return false;\r
-            yield return true;\r
-        }\r
-\r
-        public static IEnumerable<ReflectionComposablePartDefinition> GetAttributedDefinitions()\r
-        {\r
-            foreach (var type in GetAttributedTypes())\r
-            {\r
-                yield return PartDefinitionFactory.CreateAttributed(type);\r
-            }\r
-        }\r
-\r
-        public static IEnumerable<Type> GetTypes()\r
-        {\r
-            yield return typeof(void);\r
-            yield return typeof(Type);\r
-            yield return typeof(double);\r
-            yield return typeof(string);\r
-            yield return typeof(int);\r
-            yield return typeof(CompositionServices);\r
-            yield return typeof(ICompositionService);\r
-        }\r
-\r
-        public static IEnumerable<Type> GetAttributedTypes()\r
-        {\r
-            foreach (Type type in typeof(Expectations).Assembly.GetTypes())\r
-            {\r
-                var definition = AttributedModelDiscovery.CreatePartDefinitionIfDiscoverable(type, (ICompositionElement)null);\r
-                if (definition != null)\r
-                {\r
-                    yield return type;\r
-                }\r
-\r
-            }\r
-        }\r
-\r
-        public static IEnumerable<MemberInfo> GetMembers()\r
-        {\r
-            yield return typeof(String).GetSingleMember("Length");\r
-            yield return typeof(Int32).GetSingleMember("MaxValue");\r
-        }\r
-\r
-        public static IEnumerable<TEnum> GetEnumValues<TEnum>() where TEnum : struct\r
-        {\r
-            var values = TestServices.GetEnumValues<TEnum>();\r
-\r
-            foreach (TEnum value in values)\r
-            {\r
-                yield return value;\r
-            }\r
-        }\r
-\r
-        public static IEnumerable<TEnum> GetInvalidEnumValues<TEnum>() where TEnum : struct\r
-        {\r
-            var bounds = GetEnumBounds<TEnum>();\r
-\r
-            yield return AddEnum(bounds.Item1, -3);\r
-            yield return AddEnum(bounds.Item1, -2);\r
-            yield return AddEnum(bounds.Item1, -1);\r
-            yield return AddEnum(bounds.Item2, 1);\r
-            yield return AddEnum(bounds.Item2, 2);\r
-            yield return AddEnum(bounds.Item2, 3);\r
-            yield return (TEnum)(object)(int.MinValue + 1);\r
-            yield return (TEnum)(object)int.MinValue;  \r
-            yield return (TEnum)(object)int.MaxValue;\r
-            yield return (TEnum)(object)(int.MaxValue - 1);\r
-        }\r
-\r
-        public static IEnumerable<object[]> GetObjectArraysWithNull()\r
-        {\r
-            yield return null;\r
-            yield return new object[0];\r
-            yield return new object[] { null };\r
-            yield return new string[] { null };\r
-            yield return new object[] { 1, "2", 3.0 };\r
-            yield return new string[] { "1" };\r
-            yield return new string[] { "1", "2" };\r
-            yield return new string[] { "1", "2", "3" };\r
-        }\r
-\r
-        private static TEnum AddEnum<TEnum>(TEnum left, int right) where TEnum : struct\r
-        {\r
-            int intRight = (int)(object)left;\r
-\r
-            return (TEnum)(object)(intRight + right);\r
-        }\r
-\r
-        private static Tuple<TEnum, TEnum> GetEnumBounds<TEnum>() where TEnum : struct\r
-        {\r
-            var values = TestServices.GetEnumValues<TEnum>();\r
-\r
-            return new Tuple<TEnum, TEnum>(values.First(), values.Last());\r
-        }\r
-\r
-        private static IEnumerable<IEnumerable<T>> GetEmptyCollections<T>()\r
-        {\r
-            yield return new T[0];\r
-            yield return Enumerable.Empty<T>();\r
-            yield return new List<T>();\r
-            yield return new Collection<T>();\r
-            yield return new Dictionary<T, object>().Keys;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportAttributeTests.cs
deleted file mode 100644 (file)
index 922fd66..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ExportAttributeTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ExportAttribute();\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsContractNameArgument_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ExportAttribute((string)null);\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsContractTypeArgument_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ExportAttribute((Type)null);\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsContractTypeArgument_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ExportAttribute((string)null, (Type)null);\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsContractNameArgument_ShouldSetContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNamesWithEmpty();\r
-            \r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new ExportAttribute(e);\r
-\r
-                Assert.AreEqual(e, attribute.ContractName);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportCollectionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportCollectionTests.cs
deleted file mode 100644 (file)
index 40d8fbc..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ExportCollectionTests\r
-    {\r
-        public interface ICustomMetadata\r
-        {\r
-            bool PropertyName { get; }\r
-        }\r
-\r
-        public class Importer\r
-        {\r
-            [ImportMany("Value")]\r
-            public Collection<Lazy<object>> CollectionPlain { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public Collection<Lazy<object, IDictionary<string, object>>> CollectionPlainRawMetadata { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public Collection<Lazy<object>> CollectionPlainEmpty { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public Collection<Lazy<object, IDictionary<string, object>>> CollectionPlainEmptyRawMetadata { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public Collection<Lazy<int>> CollectionTyped { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public Collection<Lazy<int, IDictionary<string, object>>> CollectionTypedRawMetadata { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public Collection<Lazy<int>> CollectionTypedEmpty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public Collection<Lazy<int, ICustomMetadata>> CollectionTypedMetadata { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public Collection<Lazy<int, ICustomMetadata>> CollectionTypedMetadataEmpty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<int> ReadWriteEnumerable { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public IEnumerable<int> ReadWriteEnumerableEmpty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<Lazy<object>> MetadataUntypedEnumerable { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<Lazy<object, IDictionary<string, object>>> MetadataUntypedEnumerableRawMetadata { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public IEnumerable<Lazy<object>> MetadataUntypedEnumerableEmpty { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public IEnumerable<Lazy<object, IDictionary<string, object>>> MetadataUntypedEnumerableEmptyRawMetadata { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<Lazy<int>> MetadataTypedEnumerable { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<Lazy<int, IDictionary<string, object>>> MetadataTypedEnumerableRawMetadata { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public IEnumerable<Lazy<int>> MetadataTypedEnumerableEmpty { get; set; }\r
-\r
-            [ImportMany("Value")]\r
-            public IEnumerable<Lazy<int, ICustomMetadata>> MetadataFullyTypedEnumerable { get; set; }\r
-\r
-            [ImportMany("EmptyValue")]\r
-            public IEnumerable<Lazy<int, ICustomMetadata>> MetadataFullyTypedEnumerableEmpty { get; set; }\r
-\r
-            public void VerifyImport(params int[] expectedValues)\r
-            {\r
-                object[] untypedExpectedValues = expectedValues.Cast<object>().ToArray();\r
-\r
-                ExportsAssert.AreEqual(CollectionPlain, untypedExpectedValues);\r
-                ExportsAssert.AreEqual(CollectionPlainRawMetadata, untypedExpectedValues);\r
-                EnumerableAssert.IsTrueForAll(CollectionPlainRawMetadata, i => true.Equals(i.Metadata["PropertyName"]));\r
-                EnumerableAssert.IsEmpty(CollectionPlainEmpty);\r
-                EnumerableAssert.IsEmpty(CollectionPlainEmptyRawMetadata);\r
-\r
-                // Add a new Export to this collection to ensure that it doesn't\r
-                // modifiy the other collections because they should each have there \r
-                // own collection instance\r
-                CollectionPlain.Add(ExportFactory.Create<object>("Value"));\r
-\r
-                ExportsAssert.AreEqual(CollectionTyped, expectedValues);\r
-                ExportsAssert.AreEqual(CollectionTypedRawMetadata, expectedValues);\r
-                EnumerableAssert.IsTrueForAll(CollectionTypedRawMetadata, i => true.Equals(i.Metadata["PropertyName"]));\r
-                EnumerableAssert.IsEmpty(CollectionTypedEmpty);\r
-\r
-                ExportsAssert.AreEqual(CollectionTypedMetadata, expectedValues);\r
-#if !SILVERLIGHT // Silverlight doesn't support strongly typed metadata\r
-                EnumerableAssert.IsTrueForAll(CollectionTypedMetadata, i => true == i.Metadata.PropertyName);\r
-#endif //!SILVERLIGHT\r
-                EnumerableAssert.IsEmpty(CollectionTypedMetadataEmpty);\r
-\r
-                EnumerableAssert.AreEqual(ReadWriteEnumerable, expectedValues);\r
-                EnumerableAssert.IsEmpty(ReadWriteEnumerableEmpty);\r
-\r
-                ExportsAssert.AreEqual(MetadataUntypedEnumerable, untypedExpectedValues);\r
-                ExportsAssert.AreEqual(MetadataUntypedEnumerableRawMetadata, untypedExpectedValues);\r
-                EnumerableAssert.IsTrueForAll(MetadataUntypedEnumerableRawMetadata, i => true.Equals(i.Metadata["PropertyName"]));\r
-                EnumerableAssert.IsEmpty(MetadataUntypedEnumerableEmpty);\r
-                EnumerableAssert.IsEmpty(MetadataUntypedEnumerableEmptyRawMetadata);\r
-\r
-                ExportsAssert.AreEqual(MetadataTypedEnumerable, expectedValues);\r
-                ExportsAssert.AreEqual(MetadataTypedEnumerableRawMetadata, expectedValues);\r
-                EnumerableAssert.IsTrueForAll(MetadataTypedEnumerableRawMetadata, i => true.Equals(i.Metadata["PropertyName"]));\r
-                EnumerableAssert.IsEmpty(MetadataTypedEnumerableEmpty);\r
-\r
-                ExportsAssert.AreEqual(MetadataFullyTypedEnumerable, expectedValues);\r
-#if !SILVERLIGHT // Silverlight doesn't support strongly typed metadata\r
-                EnumerableAssert.IsTrueForAll(MetadataFullyTypedEnumerable, i => true == i.Metadata.PropertyName);\r
-#endif //!SILVERLIGHT\r
-                EnumerableAssert.IsEmpty(MetadataFullyTypedEnumerableEmpty);\r
-            }\r
-        }\r
-\r
-        public class ExporterDefault21\r
-        {\r
-            public ExporterDefault21() { Value = 21; }\r
-            public ExporterDefault21(int v) { Value = v; }\r
-\r
-            [Export("Value")]\r
-            [ExportMetadata("PropertyName", true)]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        public class ExporterDefault42\r
-        {\r
-            public ExporterDefault42() { Value = 42; }\r
-            public ExporterDefault42(int v) { Value = v; }\r
-\r
-            [Export("Value")]\r
-            [ExportMetadata("PropertyName", true)]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void ImportCollectionsFromContainerOnly()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            Importer importer = new Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer\r
-                , new ExporterDefault21()\r
-                , new ExporterDefault21(22)\r
-                , new ExporterDefault42()\r
-                , new ExporterDefault42(43));\r
-\r
-            container.Compose(batch);\r
-\r
-            importer.VerifyImport(21, 22, 42, 43);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void ImportCollectionsFromCatalogOnly()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            Importer importer = new Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer);\r
-            container.Compose(batch);\r
-\r
-            importer.VerifyImport(21, 42);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void ImportCollectionsFormContainerAndCatalog()\r
-        {\r
-            var cat = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(cat);\r
-            Importer importer = new Importer();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddParts(importer\r
-                , new ExporterDefault21(22)\r
-                , new ExporterDefault42(43));\r
-\r
-            container.Compose(batch);\r
-\r
-            importer.VerifyImport(22, 43, 21, 42);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportDefinitionTests.cs
deleted file mode 100644 (file)
index cb89ebf..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ExportDefinitionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var definition = new DerivedExportDefinition();\r
-\r
-            EnumerableAssert.IsEmpty(definition.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var definition = new DerivedExportDefinition();\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                definition.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsContractNameArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("contractName", () =>\r
-            {\r
-                new ExportDefinition((string)null, new Dictionary<string, object>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyStringAsContractNameArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("contractName", () =>\r
-            {\r
-                new ExportDefinition(string.Empty, new Dictionary<string, object>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsContractNameArgument_ShouldSetContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ExportDefinition(e, new Dictionary<string, object>());\r
-\r
-                Assert.AreEqual(e, definition.ContractName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsMetadataArgument_ShouldSetMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var definition = new ExportDefinition("Contract", (IDictionary<string, object>)null); ;\r
-\r
-            EnumerableAssert.IsEmpty(definition.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsMetadataArgument_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var definition = new ExportDefinition("Contract", (IDictionary<string, object>)null);\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                definition.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_WritableDictionaryAsMetadataArgument_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var definition = new ExportDefinition("Contract", new Dictionary<string, object>());\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                definition.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_DictionaryAsMetadataArgument_ShouldSetMetadataProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadata();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ExportDefinition("Contract", e);\r
-\r
-                EnumerableAssert.AreEqual(e, definition.Metadata);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ContractName_WhenNotOverridden_ShouldThrowNotImplemented()\r
-        {\r
-            var definition = new DerivedExportDefinition();\r
-\r
-            ExceptionAssert.Throws<NotImplementedException>(() =>\r
-            {\r
-                var contractName = definition.ContractName;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_WhenContractNameNotOverridden_ShouldThrowNotImplemented()\r
-        {\r
-            var definition = new DerivedExportDefinition();\r
-\r
-            ExceptionAssert.Throws<NotImplementedException>(() =>\r
-            {\r
-                definition.ToString();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ExportDefinition(e, new Dictionary<string, object>());\r
-\r
-                Assert.AreEqual(e, definition.ToString());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnOverriddenContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNamesWithEmpty();\r
-            \r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new DerivedExportDefinition(() => e);\r
-\r
-                Assert.AreEqual(e, definition.ToString());\r
-            }\r
-        }\r
-\r
-        private class DerivedExportDefinition : ExportDefinition\r
-        {\r
-            private readonly Func<string> _contractNameGetter;\r
-\r
-            public DerivedExportDefinition()\r
-            {\r
-            }\r
-\r
-            public DerivedExportDefinition(Func<string> contractNameGetter)\r
-            {\r
-                _contractNameGetter = contractNameGetter;\r
-            }\r
-\r
-            public override string ContractName\r
-            {\r
-                get \r
-                {\r
-                    if (_contractNameGetter != null)\r
-                    {\r
-                        return _contractNameGetter();\r
-                    }\r
-\r
-                    return base.ContractName;\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportMetadataAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportMetadataAttributeTests.cs
deleted file mode 100644 (file)
index 96ff329..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ExportMetadataAttributeTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsNameArgument_ShouldSetNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ExportMetadataAttribute((string)null, "Value");\r
-\r
-            Assert.AreEqual(string.Empty, attribute.Name);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ShouldSetIsMultiplePropertyToFalse()\r
-        {\r
-            var attribute = new ExportMetadataAttribute("Name", "Value");\r
-\r
-            Assert.IsFalse(attribute.IsMultiple);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsNameArgument_ShouldSetNameProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadataNames();\r
-            \r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new ExportMetadataAttribute(e, "Value");\r
-\r
-                Assert.AreEqual(e, attribute.Name);                \r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsValueArgument_ShouldSetValueProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadataValues();\r
-            \r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new ExportMetadataAttribute("Name", e);\r
-\r
-                Assert.AreEqual(e, attribute.Value);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsMultiple_ValueAsValueArgument_ShouldSetPropert()\r
-        {\r
-            var expectations = Expectations.GetBooleans();\r
-\r
-            var attribute = new ExportMetadataAttribute("Name", "Value");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                attribute.IsMultiple = e;\r
-                Assert.AreEqual(e, attribute.IsMultiple);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportProviderTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportProviderTests.cs
deleted file mode 100644 (file)
index 56f03ec..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ExportProviderTests\r
-    {\r
-        [TestMethod]\r
-        public void GetExports2_NullAsDefinitionArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var provider = ExportProviderFactory.Create();\r
-\r
-            ExceptionAssert.Throws<ArgumentNullException>(() =>\r
-            {\r
-                provider.GetExports((ImportDefinition)null);                \r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryGetExports_NullAsDefinitionArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var provider = ExportProviderFactory.Create();\r
-\r
-            ExceptionAssert.Throws<ArgumentNullException>(() =>\r
-            {\r
-                IEnumerable<Export> exports;\r
-                provider.TryGetExports((ImportDefinition)null, null, out exports);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryGetExports_NullAsDefinitionArgument_ShouldNotSetExportsArgument()\r
-        {\r
-            var provider = ExportProviderFactory.Create();\r
-\r
-            IEnumerable<Export> exports = new Export[0];\r
-            IEnumerable<Export> results = exports;\r
-            \r
-            ExceptionAssert.Throws<ArgumentNullException>(() =>\r
-            {\r
-                provider.TryGetExports((ImportDefinition)null, null, out results);\r
-            });\r
-\r
-            Assert.AreSame(exports, results);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportTests.cs
deleted file mode 100644 (file)
index 44f43b8..0000000
+++ /dev/null
@@ -1,439 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ExportTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldNotThrow()\r
-        {\r
-            new NoOverridesExport();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsExportedValueGetterArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var definition = ExportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exportedValueGetter", () =>\r
-            {\r
-                new Export(definition, (Func<object>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsExportedValueGetterArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exportedValueGetter", () =>\r
-            {\r
-                new Export("ContractName", (Func<object>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsExportedValueGetterArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exportedValueGetter", () =>\r
-            {\r
-                new Export("ContractName", metadata, (Func<object>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsDefinitionArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                new Export((ExportDefinition)null, () => null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_DefinitionAsDefinitionArgument_ShouldSetDefinitionProperty()\r
-        {\r
-            var definition = ExportDefinitionFactory.Create();\r
-\r
-            var export = new Export(definition, () => null);\r
-\r
-            Assert.AreSame(definition, export.Definition);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsContractNameArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("contractName", () =>\r
-            {\r
-                new Export((string)null, () => null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsContractNameArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("contractName", () =>\r
-            {\r
-                new Export((string)null, new Dictionary<string, object>(), () => null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyStringAsContractNameArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("contractName", () =>\r
-            {\r
-                new Export(string.Empty, () => null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_EmptyStringAsContractNameArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("contractName", () =>\r
-            {\r
-                new Export(string.Empty, new Dictionary<string, object>(), () => null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ValueAsContractNameArgument_ShouldSetDefinitionContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var export = new Export(e, () => null);\r
-\r
-                Assert.AreEqual(e, export.Definition.ContractName);\r
-            }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constructor4_ValueAsContractNameArgument_ShouldSetDefinitionContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var export = new Export(e, new Dictionary<string, object>(), () => null);\r
-\r
-                Assert.AreEqual(e, export.Definition.ContractName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var export = new Export("ContractName", () => null); ;\r
-\r
-            EnumerableAssert.IsEmpty(export.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsMetadataArgument_ShouldSetMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var export = new Export("ContractName", (IDictionary<string, object>)null, () => null); ;\r
-\r
-            EnumerableAssert.IsEmpty(export.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsMetadataArgument_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var export = new Export("ContractName", () => null);\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                export.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsMetadataArgument_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var export = new Export("ContractName", (IDictionary<string, object>)null, () => null);\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                export.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_WritableDictionaryAsMetadataArgument_ShouldSetMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var export = new Export("ContractName", new Dictionary<string, object>(), () => null);\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                export.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_DictionaryAsMetadataArgument_ShouldSetMetadataProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadata();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var export = new Export("ContractName", e, () => null);\r
-\r
-                EnumerableAssert.AreEqual(e, export.Metadata);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetDefinitionMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var export = new Export("ContractName", () => null); ;\r
-\r
-            EnumerableAssert.IsEmpty(export.Definition.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsMetadataArgument_ShouldSetDefinitionMetadataPropertyToEmptyDictionary()\r
-        {\r
-            var export = new Export("ContractName", (IDictionary<string, object>)null, () => null); ;\r
-\r
-            EnumerableAssert.IsEmpty(export.Definition.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetDefinitionMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var export = new Export("ContractName", () => null);\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                export.Definition.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsMetadataArgument_ShouldSetDefinitionMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var export = new Export("ContractName", (IDictionary<string, object>)null, () => null);\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                export.Definition.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_WritableDictionaryAsMetadataArgument_ShouldSetDefinitionMetadataPropertyToReadOnlyDictionary()\r
-        {\r
-            var export = new Export("ContractName", new Dictionary<string, object>(), () => null);\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                export.Definition.Metadata["Value"] = "Value";\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_DictionaryAsMetadataArgument_ShouldSetDefinitionMetadataProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadata();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var export = new Export("ContractName", e, () => null);\r
-\r
-                EnumerableAssert.AreEqual(e, export.Definition.Metadata);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_FuncReturningAStringAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var definition = ExportDefinitionFactory.Create();\r
-\r
-            var export = new Export(definition, () => "Value");\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_FuncReturningAStringAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var export = new Export("ContractName", () => "Value");\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_FuncReturningAStringAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var export = new Export("ContractName", new Dictionary<string, object>(), () => "Value");\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_FuncReturningNullAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var definition = ExportDefinitionFactory.Create();\r
-\r
-            var export = new Export(definition, () => null);\r
-\r
-            Assert.IsNull(export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_FuncReturningNullAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var export = new Export("ContractName", () => null);\r
-\r
-            Assert.IsNull(export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_FuncReturningNullAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var export = new Export("ContractName", new Dictionary<string, object>(), () => null);\r
-\r
-            Assert.IsNull(export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Metadata_DerivedExportDefinition_ShouldReturnDefinitionMetadata()\r
-        {\r
-            var expectations = Expectations.GetMetadata();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = ExportDefinitionFactory.Create("ContractName", e);\r
-\r
-                var export = new DerivedExport(definition);\r
-\r
-                EnumerableAssert.AreEqual(e, export.Metadata);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Definition_WhenNotOverridden_ShouldThrowNotImplemented()\r
-        {\r
-            var export = new NoOverridesExport();\r
-\r
-            ExceptionAssert.Throws<NotImplementedException>(() =>\r
-            {\r
-                var definition = export.Definition;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Metadata_WhenDefinitionNotOverridden_ShouldThrowNotImplemented()\r
-        {\r
-            var export = new NoOverridesExport();\r
-\r
-            ExceptionAssert.Throws<NotImplementedException>(() =>\r
-            {\r
-                var definition = export.Metadata;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_WhenGetExportedValueCoreNotOverridden_ShouldThrowNotImplemented()\r
-        {\r
-            var export = new NoOverridesExport();\r
-\r
-            ExceptionAssert.Throws<NotImplementedException>(() =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_ShouldCacheExportedValueGetter()\r
-        {\r
-            int count = 0;\r
-\r
-            var export = new Export("ContractName", () =>\r
-                {\r
-                    count++;\r
-                    return count;\r
-                });\r
-\r
-            Assert.AreEqual(1, export.Value);\r
-            Assert.AreEqual(1, export.Value);\r
-            Assert.AreEqual(1, export.Value);\r
-        }\r
-\r
-        \r
-        [TestMethod]\r
-        public void GetExportedValue_ShouldCacheOverrideGetExportedValueCore()\r
-        {\r
-            int count = 0;\r
-\r
-            var export = new DerivedExport(() =>\r
-            {\r
-                count++;\r
-                return count;\r
-            });\r
-\r
-            Assert.AreEqual(1, export.Value);\r
-            Assert.AreEqual(1, export.Value);\r
-            Assert.AreEqual(1, export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_ThrowingFuncAsObjectGetterArgument_ShouldThrow()\r
-        {\r
-            var exceptionToThrow = new Exception();\r
-\r
-            var export = new Export("ContractName", new Dictionary<string, object>(), () =>\r
-            {\r
-                throw exceptionToThrow;\r
-            });\r
-\r
-            ExceptionAssert.Throws(exceptionToThrow, RetryMode.Retry, () =>\r
-            {\r
-                var value = export.Value;\r
-            });\r
-        }\r
-\r
-\r
-        private class NoOverridesExport : Export\r
-        {\r
-        }\r
-\r
-        private class DerivedExport : Export\r
-        {\r
-            private readonly Func<object> _exportedValueGetter;\r
-            private readonly ExportDefinition _definition;\r
-\r
-            public DerivedExport(ExportDefinition definition)\r
-            {\r
-                _definition = definition;\r
-            }\r
-\r
-            public DerivedExport(Func<object> exportedValueGetter)\r
-            {\r
-                _exportedValueGetter = exportedValueGetter;\r
-            }\r
-\r
-            public override ExportDefinition Definition\r
-            {\r
-                get { return _definition; }\r
-            }\r
-\r
-            protected override object GetExportedValueCore()\r
-            {\r
-                return _exportedValueGetter();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportableAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ExportableAttributeTests.cs
deleted file mode 100644 (file)
index 51b23d4..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Reflection;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class MetadataAttributeTests\r
-    {\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void UntypedStructureTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(AttributedModelServices.CreatePart(new BasicTestComponent()));\r
-            container.Compose(batch);\r
-            var export = container.GetExport<BasicTestComponent, IDictionary<string, object>>();\r
-            \r
-            \r
-            Assert.IsNotNull(export.Metadata, "It should have metadata");\r
-            Assert.AreEqual("One", export.Metadata["String1"], "Property attribute should copy straight across");\r
-            Assert.AreEqual("Two", export.Metadata["String2"], "Property attribute should copy straight across");\r
-            var e = export.Metadata["Numbers"] as IList<int>;\r
-            Assert.IsNotNull(e, "Should get a collection of numbers");\r
-            Assert.IsTrue(e.Contains(1), "Should have 1 in the list");\r
-            Assert.IsTrue(e.Contains(2), "Should have 2 in the list");\r
-            Assert.IsTrue(e.Contains(3), "Should have 3 in the list");\r
-            Assert.AreEqual(3, e.Count, "Should be three numbers total");\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-               // Silverlight doesn't support strongly typed metadata\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void StronglyTypedStructureTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(AttributedModelServices.CreatePart(new BasicTestComponent()));\r
-            container.Compose(batch);\r
-\r
-            var export = container.GetExport<BasicTestComponent, IStronglyTypedStructure>();\r
-\r
-            Assert.IsNotNull(export.Metadata, "It should have metadata");\r
-            Assert.AreEqual("One", export.Metadata.String1, "Property should copy straight across");\r
-            Assert.AreEqual("Two", export.Metadata.String2, "Property should copy straight across");\r
-            Assert.IsTrue(export.Metadata.Numbers.Contains(1), "Should have 1 in the list");\r
-            Assert.IsTrue(export.Metadata.Numbers.Contains(2), "Should have 2 in the list");\r
-            Assert.IsTrue(export.Metadata.Numbers.Contains(3), "Should have 3 in the list");\r
-            Assert.AreEqual(3, export.Metadata.Numbers.Length, "Should be three numbers total");\r
-        }\r
-#endif //!SILVERLIGHT\r
-\r
-        [Export]\r
-        // Should cause a conflict with the multiple nature of Name.Bar because \r
-        // it isn't marked with IsMultiple=true\r
-        [ExportMetadata("Bar", "Blah")]\r
-        [Name("MEF")]\r
-        [Name("MEF2")]\r
-        [PartNotDiscoverable]\r
-        public class BasicTestComponentWithInvalidMetadata\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void InvalidMetadataAttributeTest()\r
-        {\r
-            ComposablePart part = AttributedModelServices.CreatePart(new BasicTestComponentWithInvalidMetadata());\r
-            ExportDefinition export = part.ExportDefinitions.First();\r
-\r
-            var ex = ExceptionAssert.Throws<InvalidOperationException>(RetryMode.DoNotRetry, () => \r
-            {\r
-                var metadata = export.Metadata;\r
-            });\r
-            \r
-            Assert.IsTrue(ex.Message.Contains("Bar"));\r
-        }\r
-\r
-        [AttributeUsage(AttributeTargets.All)]\r
-        [MetadataAttribute]\r
-        public class MetadataWithInvalidCustomAttributeType : Attribute\r
-        {\r
-            public PersonClass Person { get { return new PersonClass(); } }\r
-\r
-            public class PersonClass\r
-            {\r
-                public string First { get { return "George"; } }\r
-                public string Last { get { return "Washington"; } }\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        [MetadataWithInvalidCustomAttributeType]\r
-        [PartNotDiscoverable]\r
-        public class ClassWithInvalidCustomAttributeType\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InvalidAttributType_CustomType_ShouldThrow()\r
-        {\r
-            ComposablePart part = AttributedModelServices.CreatePart(new ClassWithInvalidCustomAttributeType());\r
-            ExportDefinition export = part.ExportDefinitions.First();\r
-            \r
-            // Should throw InvalidOperationException during discovery because\r
-            // the person class is an invalid metadata type\r
-            ExceptionAssert.Throws<InvalidOperationException>(RetryMode.DoNotRetry, () =>\r
-            {\r
-                var metadata = export.Metadata;\r
-            });\r
-        }\r
-\r
-        [AttributeUsage(AttributeTargets.All)]\r
-        [MetadataAttribute]\r
-        public class MetadataWithInvalidVersionPropertyAttributeType : Attribute\r
-        {\r
-            public MetadataWithInvalidVersionPropertyAttributeType()\r
-            {\r
-                this.Version = new Version(1, 1);\r
-            }\r
-            public Version Version { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        [MetadataWithInvalidVersionPropertyAttributeType]\r
-        [PartNotDiscoverable]\r
-        public class ClassWithInvalidVersionPropertyAttributeType\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InvalidAttributType_VersionPropertyType_ShouldThrow()\r
-        {\r
-            ComposablePart part = AttributedModelServices.CreatePart(new ClassWithInvalidVersionPropertyAttributeType());\r
-            ExportDefinition export = part.ExportDefinitions.First();\r
-            \r
-            // Should throw InvalidOperationException during discovery because\r
-            // the person class is an invalid metadata type\r
-            ExceptionAssert.Throws<InvalidOperationException>(RetryMode.DoNotRetry, () =>\r
-            {\r
-                var metadata = export.Metadata;\r
-            });\r
-        }\r
-\r
-        [MetadataAttribute]\r
-        public class BaseMetadataAttribute : Attribute\r
-        {\r
-            public string BaseKey { get { return "BaseValue"; } }\r
-        }\r
-\r
-        public class DerivedMetadataAttribute : BaseMetadataAttribute\r
-        {\r
-            public string DerivedKey { get { return "DerivedValue"; } }\r
-        }\r
-\r
-        [Export]\r
-        [DerivedMetadata]\r
-        public class ExportWithDerivedMetadataAttribute { }\r
-\r
-        [TestMethod]\r
-        public void DerivedMetadataAttributeAttribute_ShouldSupplyMetadata()\r
-        {\r
-            ComposablePart part = AttributedModelServices.CreatePart(new ExportWithDerivedMetadataAttribute());\r
-            ExportDefinition export = part.ExportDefinitions.Single();\r
-\r
-            Assert.AreEqual("BaseValue", export.Metadata["BaseKey"]);\r
-            Assert.AreEqual("DerivedValue", export.Metadata["DerivedKey"]);\r
-        }\r
-    }\r
-\r
-    [AttributeUsage(AttributeTargets.All)]\r
-    [MetadataAttribute]\r
-    public class BasicMetadataAttribute : Attribute\r
-    {\r
-        public string String1 { get { return "One"; } }\r
-\r
-        public string String2 { get { return "Two"; } }\r
-\r
-        public int[] Numbers { get { return new int[] { 1, 2, 3 }; } }\r
-\r
-        public CreationPolicy Policy { get { return CreationPolicy.NonShared; } }\r
-\r
-        public Type Type { get { return typeof(BasicMetadataAttribute); } }\r
-    }\r
-\r
-    public interface IStronglyTypedStructure\r
-    {\r
-        string String1 { get; }\r
-        string String2 { get; }\r
-        int[] Numbers { get; }\r
-        CreationPolicy Policy { get; }\r
-        Type Type { get; }\r
-    }\r
-\r
-    [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]\r
-    [MetadataAttribute]\r
-    public class Name : Attribute\r
-    {\r
-        public Name(string name) { Bar = name; }\r
-\r
-        public string Bar { set; get; }\r
-    }\r
-\r
-    [PartNotDiscoverable]\r
-    [Export]\r
-    [BasicMetadata]\r
-    public class BasicTestComponent\r
-    {\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/.gitattributes
deleted file mode 100644 (file)
index 68b098c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/CustomImportAttribute.cs -crlf
-/CustomImportManyAttribute.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/CustomImportAttribute.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/CustomImportAttribute.cs
deleted file mode 100644 (file)
index 0894a20..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Extensibility\r
-{\r
-    [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = true)]\r
-    public class CustomImportAttribute : ImportAttribute\r
-    {\r
-        public CustomImportAttribute()\r
-        {\r
-        }\r
-\r
-        public CustomImportAttribute(Type type)\r
-            : base(type)\r
-        {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/CustomImportManyAttribute.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Extensibility/CustomImportManyAttribute.cs
deleted file mode 100644 (file)
index b119e79..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Extensibility\r
-{\r
-    [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = true)]\r
-    public class CustomImportManyAttribute : ImportManyAttribute\r
-    {\r
-        public CustomImportManyAttribute()\r
-        {\r
-        }\r
-\r
-        public CustomImportManyAttribute(Type type)\r
-            : base(type)\r
-        {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/.gitattributes
deleted file mode 100644 (file)
index 6f6eeed..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/CatalogFactory.DerivedComposablePartCatalog.cs -crlf
-/CatalogFactory.DisposableComposablePartCatalog.cs -crlf
-/CatalogFactory.FilteredComposablePartCatalog.cs -crlf
-/CatalogFactory.MutableComposablePartCatalog.cs -crlf
-/CatalogFactory.NoOverridesComposablePartCatalog.cs -crlf
-/CatalogFactory.NonFilteringTypeCatalog.cs -crlf
-/CatalogFactory.cs -crlf
-/ConstraintFactory.cs -crlf
-/ContainerFactory.DisposableCompositionContainer.cs -crlf
-/ContainerFactory.NoOverridesCompositionContainer.cs -crlf
-/ContainerFactory.cs -crlf
-/ElementFactory.CompositionElement.cs -crlf
-/ElementFactory.cs -crlf
-/ErrorFactory.cs -crlf
-/ExportDefinitionFactory.DerivedExportDefinition.cs -crlf
-/ExportDefinitionFactory.cs -crlf
-/ExportFactory.cs -crlf
-/ExportProviderFactory.NoOverridesExportProvider.cs -crlf
-/ExportProviderFactory.RecomposableExportProvider.cs -crlf
-/ExportProviderFactory.cs -crlf
-/ImportDefinitionFactory.DerivedContractBasedImportDefinition.cs -crlf
-/ImportDefinitionFactory.DerivedImportDefinition.cs -crlf
-/ImportDefinitionFactory.cs -crlf
-/PartDefinitionFactory.DerivedComposablePartDefinition.cs -crlf
-/PartDefinitionFactory.NoOverridesComposablePartDefinition.cs -crlf
-/PartDefinitionFactory.cs -crlf
-/PartFactory.DisposableComposablePart.cs -crlf
-/PartFactory.NoOverridesComposablePart.cs -crlf
-/PartFactory.cs -crlf
-/ReflectionFactory.MockParameterInfo.cs -crlf
-/ReflectionFactory.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.DerivedComposablePartCatalog.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.DerivedComposablePartCatalog.cs
deleted file mode 100644 (file)
index e5a4657..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Collections.Generic;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class CatalogFactory\r
-    {\r
-        private class DerivedComposablePartCatalog : ComposablePartCatalog\r
-        {\r
-            private readonly IEnumerable<ComposablePartDefinition> _definitions;\r
-\r
-            public DerivedComposablePartCatalog(IEnumerable<ComposablePartDefinition> definitions)\r
-            {\r
-                _definitions = definitions;\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get { return _definitions.AsQueryable(); }\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.DisposableComposablePartCatalog.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.DisposableComposablePartCatalog.cs
deleted file mode 100644 (file)
index 9adf55c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class CatalogFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as ComposablePartCatalogTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class DisposableComposablePartCatalog : ComposablePartCatalog\r
-        {\r
-            private readonly Action<bool> _disposeCallback;\r
-\r
-            public DisposableComposablePartCatalog(Action<bool> disposeCallback)\r
-            {\r
-                Assert.IsNotNull(disposeCallback);\r
-\r
-                _disposeCallback = disposeCallback;\r
-            }\r
-\r
-            ~DisposableComposablePartCatalog()\r
-            {\r
-                Dispose(false);\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            protected override void Dispose(bool disposing)\r
-            {\r
-                _disposeCallback(disposing);\r
-\r
-                base.Dispose(disposing);\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.FilteredComposablePartCatalog.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.FilteredComposablePartCatalog.cs
deleted file mode 100644 (file)
index c891c96..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class CatalogFactory\r
-    {\r
-        public class FilteredCatalog : ComposablePartCatalog, INotifyComposablePartCatalogChanged\r
-        {\r
-            private readonly ComposablePartCatalog _inner;\r
-            private readonly INotifyComposablePartCatalogChanged _innerNotifyChange;\r
-            private readonly IQueryable<ComposablePartDefinition> _partsQuery;\r
-\r
-            public FilteredCatalog(ComposablePartCatalog inner,\r
-                                   Func<ComposablePartDefinition, bool> filter)\r
-            {\r
-                _inner = inner;\r
-                _innerNotifyChange = inner as INotifyComposablePartCatalogChanged;\r
-                _partsQuery = inner.Parts.Where(filter).AsQueryable();\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get\r
-                {\r
-                    return _partsQuery;\r
-                }\r
-            }\r
-\r
-            public event EventHandler<ComposablePartCatalogChangeEventArgs> Changed\r
-            {\r
-                add\r
-                {\r
-                    if (_innerNotifyChange != null)\r
-                        _innerNotifyChange.Changed += value;\r
-                }\r
-                remove\r
-                {\r
-                    if (_innerNotifyChange != null)\r
-                        _innerNotifyChange.Changed -= value;\r
-                }\r
-            }\r
-\r
-            public event EventHandler<ComposablePartCatalogChangeEventArgs> Changing\r
-            {\r
-                add\r
-                {\r
-                    if (_innerNotifyChange != null)\r
-                        _innerNotifyChange.Changing += value;\r
-                }\r
-                remove\r
-                {\r
-                    if (_innerNotifyChange != null)\r
-                        _innerNotifyChange.Changing -= value;\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.MutableComposablePartCatalog.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.MutableComposablePartCatalog.cs
deleted file mode 100644 (file)
index 0cc4862..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class CatalogFactory\r
-    {\r
-        public class MutableComposablePartCatalog : ComposablePartCatalog, INotifyComposablePartCatalogChanged\r
-        {\r
-            private readonly HashSet<ComposablePartDefinition> _definitions;\r
-\r
-            public MutableComposablePartCatalog(IEnumerable<ComposablePartDefinition> definitions)\r
-            {\r
-                _definitions = new HashSet<ComposablePartDefinition>(definitions);\r
-            }\r
-\r
-            public void AddDefinition(ComposablePartDefinition definition)\r
-            {\r
-                OnDefinitionsChanged(definition, true);\r
-            }\r
-\r
-            public void RemoveDefinition(ComposablePartDefinition definition)\r
-            {\r
-                OnDefinitionsChanged(definition, false);\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get { return _definitions.AsQueryable(); }\r
-            }\r
-\r
-            private void OnDefinitionsChanged(ComposablePartDefinition definition, bool added)\r
-            {\r
-                ComposablePartDefinition[] addedDefinitions = added ? new ComposablePartDefinition[] { definition } : new ComposablePartDefinition[0];\r
-                ComposablePartDefinition[] removeDefinitions = added ? new ComposablePartDefinition[0] : new ComposablePartDefinition[] { definition };\r
-\r
-                var e = new ComposablePartCatalogChangeEventArgs(addedDefinitions, removeDefinitions, null);\r
-                Changing(this, e);\r
-\r
-                if (added)\r
-                {\r
-                    _definitions.Add(definition);\r
-                }\r
-                else\r
-                {\r
-                    _definitions.Remove(definition);\r
-                }\r
-\r
-                if (Changed != null)\r
-                {\r
-                    Changed(this, e);\r
-                }\r
-            }\r
-\r
-            public event EventHandler<ComposablePartCatalogChangeEventArgs> Changed;\r
-\r
-            public event EventHandler<ComposablePartCatalogChangeEventArgs> Changing;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.NoOverridesComposablePartCatalog.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.NoOverridesComposablePartCatalog.cs
deleted file mode 100644 (file)
index d0b615e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class CatalogFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as ComposablePartCatalogTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class NoOverridesComposablePartCatalog : ComposablePartCatalog\r
-        {\r
-            public NoOverridesComposablePartCatalog()\r
-            {\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get { return Enumerable.Empty<ComposablePartDefinition>().AsQueryable(); }\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.NonFilteringTypeCatalog.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.NonFilteringTypeCatalog.cs
deleted file mode 100644 (file)
index 784c54d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Collections.Generic;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class CatalogFactory\r
-    {\r
-        private class NonFilteringTypeCatalog : ComposablePartCatalog\r
-        {\r
-            private readonly List<ComposablePartDefinition> _definitions;\r
-\r
-            public NonFilteringTypeCatalog(params Type[] types)\r
-            {\r
-                this._definitions = new List<ComposablePartDefinition>();\r
-                foreach (Type type in types)\r
-                {\r
-                    this._definitions.Add(AttributedModelServices.CreatePartDefinition(type, null));\r
-                }\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get { return this._definitions.AsQueryable(); }\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/CatalogFactory.cs
deleted file mode 100644 (file)
index cb957a2..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    public static partial class CatalogFactory\r
-    {\r
-        public static AggregateCatalog CreateAggregateCatalog()\r
-        {\r
-            return new AggregateCatalog();\r
-        }\r
-\r
-        public static AggregateCatalog CreateAggregateCatalog(params ComposablePartCatalog[] catalogs)\r
-        {\r
-            return new AggregateCatalog(catalogs);\r
-        }\r
-\r
-        public static ComposablePartCatalog Create()\r
-        {\r
-            return new NoOverridesComposablePartCatalog();\r
-        }\r
-\r
-        public static ComposablePartCatalog Create(params ComposablePart[] parts)\r
-        {\r
-            var definitions = parts.Select(part => PartDefinitionFactory.Create(part));\r
-\r
-            return Create(definitions.ToArray());\r
-        }\r
-\r
-        public static ComposablePartCatalog Create(params ComposablePartDefinition[] definitions)\r
-        {\r
-            return new DerivedComposablePartCatalog(definitions);\r
-        }\r
-\r
-        public static ComposablePartCatalog CreateDefaultAttributed()\r
-        {\r
-            return CreateAttributed(typeof(CatalogFactory).Assembly);\r
-        }\r
-\r
-        public static ComposablePartCatalog CreateDisposable(Action<bool> disposeCallback)\r
-        {\r
-            return new DisposableComposablePartCatalog(disposeCallback);\r
-        }\r
-\r
-        public static ComposablePartCatalog CreateAttributed(Assembly assembly)\r
-        {\r
-            return new AssemblyCatalog(assembly);\r
-        }\r
-\r
-        public static ComposablePartCatalog CreateAttributed(params Type[] types)\r
-        {\r
-            return new TypeCatalog(types);\r
-        }\r
-\r
-        public static ComposablePartCatalog CreateNonFilteredAttributed(params Type[] types)\r
-        {\r
-            return new NonFilteringTypeCatalog(types);\r
-        }\r
-\r
-        public static MutableComposablePartCatalog CreateMutable(params ComposablePartDefinition[] definitions)\r
-        {\r
-            return new MutableComposablePartCatalog(definitions);\r
-        }\r
-\r
-        public static ComposablePartCatalog CreateFiltered(ComposablePartCatalog catalog, Func<ComposablePartDefinition, bool> filter)\r
-        {\r
-            return new FilteredCatalog(catalog, filter);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ConstraintFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ConstraintFactory.cs
deleted file mode 100644 (file)
index da08735..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Linq.Expressions;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal static class ConstraintFactory\r
-    {\r
-        public static Expression<Func<ExportDefinition, bool>> Create(string contractName)\r
-        {\r
-            return definition => definition.ContractName.Equals(contractName);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.DisposableCompositionContainer.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.DisposableCompositionContainer.cs
deleted file mode 100644 (file)
index 57710ec..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ContainerFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as CompositionContainerTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class DisposableCompositionContainer : CompositionContainer\r
-        {\r
-            private readonly Action<bool> _disposeCallback;\r
-\r
-            public DisposableCompositionContainer(Action<bool> disposeCallback)\r
-            {\r
-                Assert.IsNotNull(disposeCallback);\r
-\r
-                _disposeCallback = disposeCallback;\r
-            }\r
-\r
-            ~DisposableCompositionContainer()\r
-            {\r
-                Dispose(false);\r
-            }\r
-\r
-            protected override void Dispose(bool disposing)\r
-            {\r
-                _disposeCallback(disposing);\r
-\r
-                base.Dispose(disposing);\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.NoOverridesCompositionContainer.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.NoOverridesCompositionContainer.cs
deleted file mode 100644 (file)
index ddfd16f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ContainerFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as CompositionContainerTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class NoOverridesCompositionContainer : CompositionContainer\r
-        {\r
-            public NoOverridesCompositionContainer()\r
-            {                \r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ContainerFactory.cs
deleted file mode 100644 (file)
index 059e665..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal static partial class ContainerFactory\r
-    {\r
-        public static CompositionContainer Create()\r
-        {\r
-            return Create((ComposablePart[])null);\r
-        }\r
-\r
-        public static CompositionContainer Create(ComposablePartCatalog catalog)\r
-        {\r
-            return new CompositionContainer(catalog);\r
-        }\r
-\r
-        public static CompositionContainer Create(CompositionContainer parent)\r
-        {\r
-            return new CompositionContainer(parent);\r
-        }\r
-\r
-        public static CompositionContainer Create(params ComposablePart[] parts)\r
-        {\r
-            return Create((CompositionContainer)null, parts);\r
-        }\r
-\r
-        public static CompositionContainer CreateWithDefaultAttributedCatalog()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-\r
-            return Create(catalog);            \r
-        }\r
-\r
-        public static CompositionContainer CreateWithAttributedCatalog(params Type[] types)\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed(types);\r
-\r
-            return Create(catalog);\r
-        }\r
-\r
-        public static CompositionContainer CreateAttributed(params object[] parts)\r
-        {\r
-            var container = new CompositionContainer();\r
-            var partsArray = new ComposablePart[parts.Length];\r
-\r
-            for (int i = 0; i < parts.Length; i++)\r
-            {\r
-                Assert.IsNotInstanceOfType(parts[i], typeof(Type), "You should be using CreateWithAttributedCatalog not CreateAttributed");\r
-                partsArray[i] = PartFactory.CreateAttributed(parts[i]);\r
-            }\r
-\r
-            return Create(partsArray);\r
-        }\r
-\r
-        public static CompositionContainer Create(CompositionContainer parent, params ComposablePart[] parts)\r
-        {\r
-            CompositionContainer container;\r
-            if (parent == null)\r
-            {\r
-                container = new CompositionContainer();\r
-            }\r
-            else\r
-            {\r
-                container = new CompositionContainer(parent);\r
-            }\r
-\r
-            if (parts != null)\r
-            {\r
-                CompositionBatch batch = new CompositionBatch(parts, Enumerable.Empty<ComposablePart>());\r
-                container.Compose(batch);\r
-            }\r
-\r
-            return container;\r
-        }\r
-\r
-        public static CompositionContainer Create(params MicroExport[] exports)\r
-        {\r
-            var part = PartFactory.CreateExporter(exports);\r
-\r
-            return Create(part);\r
-        }\r
-\r
-        public static CompositionContainer Create(CompositionContainer parent, params MicroExport[] exports)\r
-        {\r
-            var part = PartFactory.CreateExporter(exports);\r
-\r
-            return Create(parent, part);\r
-        }\r
-\r
-     \r
-        public static CompositionContainer CreateDisposable(Action<bool> disposeCallback)\r
-        {\r
-            return new DisposableCompositionContainer(disposeCallback);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ElementFactory.CompositionElement.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ElementFactory.CompositionElement.cs
deleted file mode 100644 (file)
index 71f8907..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ElementFactory\r
-    {\r
-        private class CompositionElement : ICompositionElement\r
-        {\r
-            private readonly string _displayName;\r
-            private readonly ICompositionElement _origin;\r
-\r
-            public CompositionElement(string displayName, ICompositionElement origin)\r
-            {\r
-                _displayName = displayName;\r
-                _origin = origin;\r
-            }\r
-\r
-            public string DisplayName\r
-            {\r
-                get { return _displayName; }\r
-            }\r
-\r
-            public ICompositionElement Origin\r
-            {\r
-                get { return _origin; }\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ElementFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ElementFactory.cs
deleted file mode 100644 (file)
index 34d1534..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal static partial class ElementFactory\r
-    {\r
-        public static ICompositionElement Create()\r
-        {\r
-            return Create((string)null, (ICompositionElement)null);\r
-        }\r
-\r
-        public static ICompositionElement Create(string displayName)\r
-        {\r
-            return Create(displayName, (ICompositionElement)null);\r
-        }\r
-\r
-        public static ICompositionElement Create(ICompositionElement origin)\r
-        {\r
-            return Create((string)null, origin);\r
-        }\r
-\r
-        public static ICompositionElement Create(string displayName, ICompositionElement origin)\r
-        {\r
-            return new CompositionElement(displayName, origin);\r
-        }\r
-\r
-        public static ICompositionElement CreateChain(int count)\r
-        {\r
-            ICompositionElement previousElement = null;\r
-\r
-            for (int i = 0; i < count; i++)\r
-            {\r
-                previousElement = Create((count - i).ToString(), previousElement);\r
-            }\r
-\r
-            return previousElement;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ErrorFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ErrorFactory.cs
deleted file mode 100644 (file)
index 2424739..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.IO;\r
-using System.Text;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal static partial class ErrorFactory\r
-    {\r
-        public static CompositionError Create(ICompositionElement element)\r
-        {\r
-            return Create(CompositionErrorId.Unknown, (string)null, element, (Exception)null);\r
-        }\r
-\r
-        public static CompositionError Create(Exception exception)\r
-        {\r
-            return Create(CompositionErrorId.Unknown, (string)null, (ICompositionElement)null, exception);\r
-        }\r
-\r
-        public static CompositionError Create(string message)\r
-        {\r
-            return Create(CompositionErrorId.Unknown, message, (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        public static CompositionError Create(string message, Exception exception)\r
-        {\r
-            return Create(CompositionErrorId.Unknown, message, (ICompositionElement)null, exception);\r
-        }\r
-\r
-        public static CompositionError Create(CompositionErrorId errorId)\r
-        {\r
-            return Create(errorId, errorId.ToString(), (ICompositionElement)null, (Exception)null);\r
-        }\r
-\r
-        public static CompositionError Create(CompositionErrorId errorId, string message, Exception exception)\r
-        {\r
-            return new CompositionError(errorId, message, (ICompositionElement)null, exception);\r
-        }\r
-\r
-        public static CompositionError Create(CompositionErrorId errorId, string message, ICompositionElement element, Exception exception)\r
-        {\r
-            return new CompositionError(errorId, message, element, exception);\r
-        }\r
-\r
-        public static IEnumerable<CompositionError> CreateFromDsl(string format)\r
-        {\r
-            CompositionException exception = (CompositionException)CreateFromDslCore(format);\r
-\r
-            return exception.Errors;\r
-        }\r
-\r
-        private static Exception CreateFromDslCore(string format)\r
-        {\r
-            List<Tuple<string, string>> identifiers = new List<Tuple<string,string>>();\r
-\r
-            StringBuilder token = new StringBuilder();\r
-            StringReader reader = new StringReader(format);\r
-\r
-            while (reader.Peek() != -1)\r
-            {\r
-                char c = (char)reader.Read();\r
-                if (c == '|')\r
-                {\r
-                    AddIdentifier(identifiers, token);\r
-                    continue;\r
-                }\r
-\r
-                if (c == '(')\r
-                {\r
-                    string dsl = ReadToNextMatchingParenthesis(reader);\r
-\r
-                    AddIdentifier(identifiers, token, dsl);\r
-                    continue;\r
-                }\r
-\r
-                token.Append(c);\r
-            }\r
-\r
-            AddIdentifier(identifiers, token);\r
-\r
-            return CreateFromList(identifiers);\r
-        }\r
-\r
-        private static Exception CreateFromList(List<Tuple<string, string>> identifiers)\r
-        {\r
-            List<CompositionError> errors = new List<CompositionError>();\r
-            Exception exception = null;\r
-            foreach (var identifier in identifiers)\r
-            {\r
-                Exception innerException = null;\r
-                if (identifier.Item2 != null)\r
-                {\r
-                    innerException = CreateFromDslCore(identifier.Item2);\r
-                }\r
-\r
-                if (identifier.Item1 == "Exception")\r
-                {\r
-                    Assert.IsNull(exception);\r
-                    exception = new Exception(identifier.Item1, innerException);\r
-                }\r
-                else\r
-                {\r
-                    Assert.AreEqual("Error", identifier.Item1);\r
-\r
-                    errors.Add(Create(identifier.Item1, innerException));\r
-                }                \r
-            }\r
-\r
-            if (errors.Count == 0)\r
-            {   \r
-                return exception;\r
-            }\r
-\r
-            return new CompositionException("", exception, errors);\r
-        }\r
-\r
-        private static void AddIdentifier(List<Tuple<string, string>> identifiers, StringBuilder identifier)\r
-        {\r
-            AddIdentifier(identifiers, identifier, (string)null);\r
-        }\r
-\r
-        private static void AddIdentifier(List<Tuple<string, string>> identifiers, StringBuilder identifier, string dsl)\r
-        {\r
-            if (identifier.Length == 0)\r
-                return;\r
-\r
-            identifiers.Add(new Tuple<string, string>(identifier.ToString(), dsl));\r
-\r
-            identifier.Length = 0;\r
-        }\r
-\r
-        private static IEnumerable<CompositionError> CreateFromList(List<string> errors)\r
-        {\r
-            foreach (string value in errors)\r
-            {\r
-                yield return Create(value);\r
-            }\r
-        }\r
-\r
-        private static string ReadToNextMatchingParenthesis(StringReader reader)\r
-        {\r
-            Stack<char> parenthesis = new Stack<char>();\r
-            parenthesis.Push('(');\r
-\r
-            StringBuilder builder = new StringBuilder();\r
-            while (reader.Peek() != -1)\r
-            {\r
-                char c = (char)reader.Read();\r
-                if (c == '(')\r
-                {\r
-                    parenthesis.Push(c);\r
-\r
-                    if (parenthesis.Count == 1)\r
-                    {\r
-                        continue;\r
-                    }\r
-                }\r
-\r
-                if (c == ')')\r
-                {\r
-                    char pop = parenthesis.Pop();\r
-                    Assert.AreEqual('(', pop);\r
-\r
-                    if (parenthesis.Count == 0)\r
-                    {\r
-                        break;\r
-                    }\r
-                }\r
-                \r
-                builder.Append(c);\r
-            }\r
-\r
-            return builder.ToString();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportDefinitionFactory.DerivedExportDefinition.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportDefinitionFactory.DerivedExportDefinition.cs
deleted file mode 100644 (file)
index 41916d3..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ExportDefinitionFactory\r
-    {\r
-        private class DerivedExportDefinition : ExportDefinition, ICompositionElement\r
-        {\r
-            private readonly string _contractName;\r
-            private readonly IDictionary<string, object> _metadata;\r
-\r
-            public DerivedExportDefinition(string contractName, IDictionary<string, object> metadata)\r
-            {\r
-                _contractName = contractName;\r
-                _metadata = metadata ?? new Dictionary<string, object>();\r
-            }\r
-\r
-            public override string ContractName\r
-            {\r
-                get { return _contractName; }\r
-            }\r
-\r
-            public override IDictionary<string, object> Metadata\r
-            {\r
-                get { return _metadata; }\r
-            }\r
-\r
-            public string DisplayName\r
-            {\r
-                get { return base.ToString(); }\r
-            }\r
-\r
-            public ICompositionElement Origin\r
-            {\r
-                get { return null; }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportDefinitionFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportDefinitionFactory.cs
deleted file mode 100644 (file)
index d8b84fd..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    // This class deliberately does not create instances of ExportDefinition,\r
-    // so as to test other derived classes from ImportDefinition.\r
-    internal static partial class ExportDefinitionFactory\r
-    {\r
-        public static ExportDefinition Create()\r
-        {\r
-            return Create((string)null, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        public static ExportDefinition Create(string contractName)\r
-        {\r
-            return Create(contractName, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        public static ExportDefinition Create(string contractName, IDictionary<string, object> metadata)\r
-        {\r
-            return new DerivedExportDefinition(contractName, metadata);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportFactory.cs
deleted file mode 100644 (file)
index 7813fee..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    // This class deliberately does not create instances of Lazy<T, TMetadataView>,\r
-    // so as to test other derived classes from Lazy<T, TMetadataView>.\r
-    internal static partial class ExportFactory\r
-    {\r
-        public static IEnumerable<Export> Create(string contractName, int count)\r
-        {\r
-            Export[] exports = new Export[count];\r
-\r
-            for (int i = 0; i < count; i++)\r
-            {\r
-                exports[i] = Create(contractName, (object)null);\r
-            }\r
-\r
-            return exports;\r
-        }\r
-\r
-        public static Lazy<T> Create<T>(T value)\r
-        {\r
-            return new Lazy<T>(() => value, false);\r
-        }\r
-\r
-        public static Lazy<T, IDictionary<string, object>> Create<T>(T value, IDictionary<string, object> metadata)\r
-        {\r
-            return Create<T, IDictionary<string, object>>(() => value, metadata);\r
-        }\r
-\r
-        public static Export Create(string contractName, Func<object> exportedValueGetter)\r
-        {\r
-            return Create(contractName,(IDictionary<string, object>)null, exportedValueGetter);\r
-        }\r
-\r
-        public static Export Create(string contractName)\r
-        {\r
-            return Create(contractName, null, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        public static Export Create(string contractName, object value)\r
-        {\r
-            return Create(contractName, value, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        public static Export Create(string contractName, object value, IDictionary<string, object> metadata)\r
-        {\r
-            return Create(contractName, metadata, () => value);\r
-        }\r
-\r
-        public static Export Create(string contractName, IDictionary<string, object> metadata, Func<object> exportedValueGetter)\r
-        {\r
-            return new Export(ExportDefinitionFactory.Create(contractName, metadata), exportedValueGetter);\r
-        }\r
-\r
-        private static Lazy<T, TMetadataView> Create<T, TMetadataView>(Func<T> exportedValueGetter, IDictionary<string, object> metadata)\r
-        {\r
-            return new Lazy<T, TMetadataView>(exportedValueGetter, AttributedModelServices.GetMetadataView<TMetadataView>(metadata), false);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.NoOverridesExportProvider.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.NoOverridesExportProvider.cs
deleted file mode 100644 (file)
index 708ebc2..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Collections.Generic;\r
-using System.Linq.Expressions;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ExportProviderFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as ExportProviderTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class NoOverridesExportProvider : ExportProvider\r
-        {\r
-            public NoOverridesExportProvider()\r
-            {\r
-            }\r
-\r
-            protected override IEnumerable<Export> GetExportsCore(ImportDefinition definition, AtomicComposition context)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.RecomposableExportProvider.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.RecomposableExportProvider.cs
deleted file mode 100644 (file)
index c3137c1..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Collections.Generic;\r
-using System.Linq.Expressions;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ExportProviderFactory\r
-    {\r
-        public class RecomposableExportProvider : ExportProvider\r
-        {\r
-            public static Dictionary<string, object> EmptyMetadataDictionary = new Dictionary<string, object>();\r
-            public List<Export> _exports = new List<Export>();\r
-\r
-            public void AddExport(string contractName, object value)\r
-            {\r
-                Export export = CreateExport(contractName, value);\r
-                var exports = this._exports.ToList();\r
-\r
-                exports.Add(export);\r
-                ChangeExports(exports);\r
-            }\r
-\r
-            public void RemoveExport(string contractName)\r
-            {\r
-                int index = FindExport(contractName);\r
-                Assert.IsTrue(index >= 0);\r
-\r
-                var exports = this._exports.ToList();\r
-\r
-                exports.RemoveAt(index);\r
-\r
-                ChangeExports(exports);\r
-            }\r
-\r
-            public void ReplaceExportValue(string contractName, object newValue)\r
-            {\r
-                int index = FindExport(contractName);\r
-                Assert.IsTrue(index >= 0);\r
-\r
-                var exports = this._exports.ToList();\r
-\r
-                exports.RemoveAt(index);\r
-                exports.Add(CreateExport(contractName, newValue));\r
-\r
-                ChangeExports(exports);\r
-            }\r
-\r
-            private void ChangeExports(List<Export> newExports)\r
-            {\r
-                using (var atomicComposition = new AtomicComposition())\r
-                {\r
-                    atomicComposition.AddCompleteAction(() => this._exports = newExports);\r
-                    atomicComposition.SetValue(this, newExports);\r
-\r
-                    var addedExports = newExports.Except(this._exports).Select(export => export.Definition);\r
-                    var removedExports = this._exports.Except(newExports).Select(export => export.Definition);\r
-\r
-                    this.OnExportsChanging(new ExportsChangeEventArgs(addedExports, removedExports, atomicComposition));\r
-\r
-                    atomicComposition.AddCompleteAction(() => this.OnExportsChanged(\r
-                        new ExportsChangeEventArgs(addedExports, removedExports, null)));\r
-\r
-                    atomicComposition.Complete();\r
-                }\r
-            }\r
-\r
-            private int FindExport(string contractName)\r
-            {\r
-                for (int i = 0; i < _exports.Count; i++)\r
-                {\r
-                    if (_exports[i].Definition.ContractName == contractName)\r
-                    {\r
-                        return i;\r
-                    }\r
-                }\r
-                return -1;\r
-            }\r
-\r
-            private Export CreateExport(string contractName, object value)\r
-            {\r
-                return new Export(new ExportDefinition(contractName, EmptyMetadataDictionary), () => value);\r
-            }\r
-\r
-            protected override IEnumerable<Export> GetExportsCore(ImportDefinition importDefinition, AtomicComposition context)\r
-            {\r
-                IEnumerable<Export> contextExports;\r
-\r
-                if (context == null || !context.TryGetValue(this, out contextExports))\r
-                {\r
-                    contextExports = this._exports;\r
-                }\r
-\r
-                List<Export> exports = new List<Export>();\r
-                var func = importDefinition.Constraint.Compile();\r
-                foreach (Export export in contextExports)\r
-                {\r
-                    if (func(export.Definition))\r
-                    {\r
-                        exports.Add(export);\r
-                    }\r
-                }\r
-                return exports;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ExportProviderFactory.cs
deleted file mode 100644 (file)
index bce30e9..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal partial class ExportProviderFactory\r
-    {\r
-        public static ExportProvider Create()\r
-        {\r
-            return new NoOverridesExportProvider();\r
-        }\r
-\r
-        public static RecomposableExportProvider CreateRecomposable()\r
-        {\r
-            return new RecomposableExportProvider();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.DerivedContractBasedImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.DerivedContractBasedImportDefinition.cs
deleted file mode 100644 (file)
index 422c40d..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Collections.Generic;\r
-using System.Linq.Expressions;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ImportDefinitionFactory\r
-    {\r
-        private class DerivedContractBasedImportDefinition : ContractBasedImportDefinition\r
-        {\r
-            private readonly string _contractName;\r
-            private readonly ImportCardinality _cardinality;\r
-            private readonly bool _isRecomposable;\r
-            private readonly bool _isPrerequisite;\r
-            private readonly IEnumerable<KeyValuePair<string, Type>> _requiredMetadata;\r
-\r
-            public DerivedContractBasedImportDefinition(string contractName, IEnumerable<KeyValuePair<string, Type>> requiredMetadata, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-            {\r
-                _contractName = contractName;\r
-                _cardinality = cardinality;\r
-                _isRecomposable = isRecomposable;\r
-                _isPrerequisite = isPrerequisite;\r
-                _requiredMetadata = requiredMetadata;\r
-            }\r
-\r
-            public override IEnumerable<KeyValuePair<string, Type>> RequiredMetadata\r
-            {\r
-                get { return _requiredMetadata ?? base.RequiredMetadata; }\r
-            }\r
-\r
-            public override ImportCardinality Cardinality\r
-            {\r
-                get { return _cardinality; }\r
-            }\r
-\r
-            public override bool IsPrerequisite\r
-            {\r
-                get { return _isPrerequisite; }\r
-            }\r
-\r
-            public override bool IsRecomposable\r
-            {\r
-                get { return _isRecomposable; }\r
-            }\r
-\r
-            public override string ContractName\r
-            {\r
-                get { return _contractName; }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.DerivedImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.DerivedImportDefinition.cs
deleted file mode 100644 (file)
index dbe2fb2..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Collections.Generic;\r
-using System.Linq.Expressions;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ImportDefinitionFactory\r
-    {\r
-        private class DerivedImportDefinition : ImportDefinition\r
-        {\r
-            private readonly Expression<Func<ExportDefinition, bool>> _constraint;\r
-            private readonly ImportCardinality _cardinality;\r
-            private readonly bool _isRecomposable;\r
-            private readonly bool _isPrerequisite;\r
-\r
-            public DerivedImportDefinition(Expression<Func<ExportDefinition, bool>> constraint, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-            {\r
-                _constraint = constraint ?? (export => false);\r
-                _cardinality = cardinality;\r
-                _isRecomposable = isRecomposable;\r
-                _isPrerequisite = isPrerequisite;\r
-            }\r
-\r
-            public override ImportCardinality Cardinality\r
-            {\r
-                get { return _cardinality; }\r
-            }\r
-\r
-            public override bool IsPrerequisite\r
-            {\r
-                get { return _isPrerequisite; }\r
-            }\r
-\r
-            public override bool IsRecomposable\r
-            {\r
-                get { return _isRecomposable; }\r
-            }\r
-\r
-            public override Expression<Func<ExportDefinition, bool>> Constraint\r
-            {\r
-                get { return _constraint; }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ImportDefinitionFactory.cs
deleted file mode 100644 (file)
index 9709a85..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Collections.Generic;\r
-using System.Linq.Expressions;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    // This class deliberately does not create instances of ImportDefinition,\r
-    // so as to test other derived classes from ImportDefinition.\r
-    internal static partial class ImportDefinitionFactory\r
-    {\r
-        public static ImportDefinition Create(string contractName)\r
-        {\r
-            return Create(contractName, (IEnumerable<KeyValuePair<string, Type>>)null, ImportCardinality.ExactlyOne, true, false);\r
-        }\r
-\r
-        public static ImportDefinition Create(string contractName, IEnumerable<KeyValuePair<string, Type>> requiredMetadata)\r
-        {\r
-            return Create(contractName, requiredMetadata, ImportCardinality.ExactlyOne, true, false);\r
-        }\r
-\r
-        public static ImportDefinition Create(string contractName, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-        {\r
-            return Create(contractName, (IEnumerable<KeyValuePair<string, Type>>)null, cardinality, isRecomposable, isPrerequisite);\r
-        }\r
-\r
-        public static ImportDefinition Create(string contractName, ImportCardinality cardinality)\r
-        {\r
-            return Create(contractName, (IEnumerable<KeyValuePair<string, Type>>)null, cardinality, false, false);\r
-        }\r
-\r
-        public static ImportDefinition Create(string contractName, bool isRecomposable)\r
-        {\r
-            return Create(contractName, (IEnumerable<KeyValuePair<string, Type>>)null, ImportCardinality.ExactlyOne, isRecomposable, false);\r
-        }\r
-\r
-        public static ImportDefinition Create(string contractName, bool isRecomposable, bool isPrerequisite)\r
-        {\r
-            return Create(contractName, (IEnumerable<KeyValuePair<string, Type>>)null, ImportCardinality.ExactlyOne, isRecomposable, isPrerequisite);\r
-        }\r
-\r
-        public static ImportDefinition Create(string contractName, IEnumerable<KeyValuePair<string, Type>> requiredMetadata, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-        {\r
-            return new DerivedContractBasedImportDefinition(contractName, requiredMetadata, cardinality, isRecomposable, isPrerequisite);\r
-        }\r
-\r
-        public static ImportDefinition Create()\r
-        {\r
-            return Create((Expression<Func<ExportDefinition, bool>>)null);\r
-        }\r
-\r
-        public static ImportDefinition Create(Expression<Func<ExportDefinition, bool>> constraint)\r
-        {\r
-            return Create(constraint, ImportCardinality.ExactlyOne, true, false);\r
-        }\r
-\r
-        public static ImportDefinition Create(Expression<Func<ExportDefinition, bool>> constraint, ImportCardinality cardinality)\r
-        {\r
-            return Create(constraint, cardinality, true, false);\r
-        }\r
-\r
-        public static ImportDefinition Create(Expression<Func<ExportDefinition, bool>> constraint, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-        {\r
-            return new DerivedImportDefinition(constraint, cardinality, isRecomposable, isPrerequisite);\r
-        }\r
-\r
-        public static ImportDefinition CreateDefault(string contractName, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-        {\r
-            return new ContractBasedImportDefinition(contractName, (string)null, (IEnumerable<KeyValuePair<string, Type>>)null, cardinality, isRecomposable, isPrerequisite, CreationPolicy.Any);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.DerivedComposablePartDefinition.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.DerivedComposablePartDefinition.cs
deleted file mode 100644 (file)
index 09fdd20..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class PartDefinitionFactory\r
-    {\r
-        private class DerivedComposablePartDefinition : ComposablePartDefinition\r
-        {\r
-            private readonly Func<ComposablePart> _partCreator;\r
-            private readonly IDictionary<string, object> _metadata;\r
-            private IEnumerable<ImportDefinition> _importDefinitions;\r
-            private IEnumerable<ExportDefinition> _exportDefinitions;\r
-            private readonly Func<IEnumerable<ImportDefinition>> _importsCreator;\r
-            private readonly Func<IEnumerable<ExportDefinition>> _exportsCreator;\r
-\r
-\r
-            public DerivedComposablePartDefinition(\r
-                IDictionary<string, object> metadata,\r
-                Func<ComposablePart> partCreator,\r
-                Func<IEnumerable<ImportDefinition>> importsCreator,\r
-                Func<IEnumerable<ExportDefinition>> exportsCreator)\r
-            {\r
-                this._metadata = metadata.AsReadOnly();\r
-                this._partCreator = partCreator;\r
-                this._importsCreator = importsCreator;\r
-                this._exportsCreator = exportsCreator;\r
-            }\r
-\r
-            public override IDictionary<string, object> Metadata\r
-            {\r
-                get { return this._metadata; }\r
-            }\r
-\r
-            public override IEnumerable<ExportDefinition> ExportDefinitions\r
-            {\r
-                get \r
-                {\r
-                    if (this._exportDefinitions == null)\r
-                    {\r
-                        this._exportDefinitions = this._exportsCreator.Invoke() ?? Enumerable.Empty<ExportDefinition>();\r
-                    }\r
-                    return this._exportDefinitions; \r
-                }\r
-            }\r
-\r
-            public override IEnumerable<ImportDefinition> ImportDefinitions\r
-            {\r
-                get\r
-                {\r
-                    if (this._importDefinitions == null)\r
-                    {\r
-                        this._importDefinitions = this._importsCreator.Invoke() ?? Enumerable.Empty<ImportDefinition>();\r
-                    }\r
-                    return this._importDefinitions;\r
-                }\r
-            }\r
-\r
-            public override ComposablePart CreatePart()\r
-            {\r
-                return this._partCreator();\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.NoOverridesComposablePartDefinition.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.NoOverridesComposablePartDefinition.cs
deleted file mode 100644 (file)
index 94dbb61..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class PartDefinitionFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as ComposablePartDefinitionTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class NoOverridesComposablePartDefinition : ComposablePartDefinition\r
-        {\r
-            public override IEnumerable<ExportDefinition> ExportDefinitions\r
-            {\r
-                get { return Enumerable.Empty<ExportDefinition>(); }\r
-            }\r
-\r
-            public override IEnumerable<ImportDefinition> ImportDefinitions\r
-            {\r
-                get { return Enumerable.Empty<ImportDefinition>(); }\r
-            }\r
-\r
-            public override ComposablePart CreatePart()\r
-            {\r
-                Assert.Fail();\r
-                return null;\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartDefinitionFactory.cs
deleted file mode 100644 (file)
index bbff18c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal static partial class PartDefinitionFactory\r
-    {\r
-        public static ReflectionComposablePartDefinition CreateAttributed()\r
-        {\r
-            return CreateAttributed(typeof(ComposablePart));\r
-        }\r
-\r
-        public static ReflectionComposablePartDefinition CreateAttributed(Type type)\r
-        {\r
-            return AttributedModelDiscovery.CreatePartDefinition(type, null, false, (ICompositionElement)null);\r
-        }\r
-\r
-        public static ComposablePartDefinition Create()\r
-        {\r
-            return new NoOverridesComposablePartDefinition();\r
-        }\r
-\r
-        public static ComposablePartDefinition Create(ComposablePart part)\r
-        {\r
-            return Create(part.Metadata, () => part, part.ImportDefinitions, part.ExportDefinitions);\r
-        }\r
-\r
-        public static ComposablePartDefinition Create(IDictionary<string, object> metadata,\r
-                                              Func<ComposablePart> partCreator,\r
-                                              IEnumerable<ImportDefinition> imports,\r
-                                              IEnumerable<ExportDefinition> exports)\r
-        {\r
-            return Create(metadata, partCreator, () => imports, () => exports);\r
-        }      \r
-\r
-        public static ComposablePartDefinition Create(IDictionary<string, object> metadata,\r
-                                                      Func<ComposablePart> partCreator,\r
-                                                      Func<IEnumerable<ImportDefinition>> importsCreator,\r
-                                                      Func<IEnumerable<ExportDefinition>> exportsCreator)\r
-        {\r
-            return new DerivedComposablePartDefinition(metadata, partCreator, importsCreator, exportsCreator);\r
-        }        \r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.DisposableComposablePart.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.DisposableComposablePart.cs
deleted file mode 100644 (file)
index 638a469..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class PartFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as ComposablePartTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class DisposableComposablePart : ComposablePart, IDisposable\r
-        {\r
-            private readonly Action<bool> _disposeCallback;\r
-\r
-            public DisposableComposablePart(Action<bool> disposeCallback)\r
-            {\r
-                Assert.IsNotNull(disposeCallback);\r
-\r
-                _disposeCallback = disposeCallback;\r
-            }\r
-\r
-            public void Dispose()\r
-            {\r
-                this.Dispose(true);\r
-            }\r
-\r
-            ~DisposableComposablePart()\r
-            {\r
-                Dispose(false);\r
-            }\r
-\r
-            protected virtual void Dispose(bool disposing)\r
-            {\r
-                _disposeCallback(disposing);\r
-            }\r
-\r
-            public override IEnumerable<ImportDefinition> ImportDefinitions\r
-            {\r
-                get { return Enumerable.Empty<ImportDefinition>(); }\r
-            }\r
-\r
-            public override IEnumerable<ExportDefinition> ExportDefinitions\r
-            {\r
-                get { return Enumerable.Empty<ExportDefinition>(); }\r
-            }\r
-\r
-            public override object GetExportedValue(ExportDefinition definition)\r
-            {\r
-                Assert.Fail();\r
-                return null;\r
-            }\r
-\r
-            public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-            {\r
-                Assert.Fail();\r
-            }\r
-\r
-            public override IDictionary<string, object> Metadata\r
-            {\r
-                get { return new Dictionary<string, object>(); }\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.NoOverridesComposablePart.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.NoOverridesComposablePart.cs
deleted file mode 100644 (file)
index 27f9a3d..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class PartFactory\r
-    {\r
-        // NOTE: Do not add any more behavior to this class, as ComposablePartTests.cs \r
-        // uses this to verify default behavior of the base class.\r
-        private class NoOverridesComposablePart : ComposablePart\r
-        {\r
-            public NoOverridesComposablePart()\r
-            {\r
-            }\r
-\r
-            public override IEnumerable<ExportDefinition> ExportDefinitions\r
-            {\r
-                get { return Enumerable.Empty<ExportDefinition>(); }\r
-            }\r
-\r
-            public override IEnumerable<ImportDefinition> ImportDefinitions\r
-            {\r
-                get { return Enumerable.Empty<ImportDefinition>(); }\r
-            }\r
-\r
-            public override object GetExportedValue(ExportDefinition definition)\r
-            {\r
-                Assert.Fail();\r
-                return null;\r
-            }\r
-\r
-            public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-            {\r
-                Assert.Fail();\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/PartFactory.cs
deleted file mode 100644 (file)
index 44650c0..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal static partial class PartFactory\r
-    {\r
-        public static Type GetAttributedExporterType()\r
-        {\r
-            return typeof(ExportValueTypeFactory);\r
-        }\r
-\r
-        public static ComposablePart CreateAttributed(Type type)\r
-        {\r
-            var definition = PartDefinitionFactory.CreateAttributed(type);\r
-\r
-            return definition.CreatePart();\r
-        }\r
-\r
-        public static ComposablePart CreateAttributed(object instance)\r
-        {\r
-            return AttributedModelServices.CreatePart(instance);\r
-        }\r
-\r
-        public static ComposablePart Create()\r
-        {\r
-            return new NoOverridesComposablePart();\r
-        }\r
-\r
-        public static ComposablePart CreateExporter(string contractName, object value)\r
-        {\r
-            return CreateExporter(new MicroExport(contractName, value));\r
-        }\r
-\r
-        public static ComposablePart CreateExporter(params MicroExport[] exports)\r
-        {\r
-            ConcreteComposablePart part = new ConcreteComposablePart();\r
-\r
-            if (exports != null)\r
-            {\r
-                foreach (var export in exports)\r
-                {\r
-                    foreach (object exportedValue in export.ExportedValues)\r
-                    {\r
-                        part.AddExport(ExportFactory.Create(export.ContractName, exportedValue, export.Metadata));\r
-                    }\r
-                }\r
-            }\r
-\r
-            return part;\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter<T>()\r
-        {\r
-            string contractName = AttributedModelServices.GetContractName(typeof(T));\r
-\r
-            return CreateImporter(contractName);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporterExporter(string exportContractName, string importContractName)\r
-        {\r
-            return new ImportingComposablePart(exportContractName, ImportCardinality.ExactlyOne, false, importContractName);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter(params string[] contractNames)\r
-        {\r
-            return new ImportingComposablePart(ImportCardinality.ZeroOrMore, false, contractNames);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter(bool isRecomposable, params string[] contractNames)\r
-        {\r
-            return new ImportingComposablePart(ImportCardinality.ZeroOrMore, isRecomposable, contractNames);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter(string contractName)\r
-        {\r
-            return CreateImporter(contractName, ImportCardinality.ZeroOrMore);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter(string contractName, bool isRecomposable)\r
-        {\r
-            return CreateImporter(contractName, ImportCardinality.ZeroOrMore, isRecomposable);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter(string contractName, ImportCardinality cardinality)\r
-        {\r
-            return CreateImporter(contractName, cardinality, false);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter(string contractName, ImportCardinality cardinality, bool isRecomposable)\r
-        {\r
-            return new ImportingComposablePart(cardinality, isRecomposable, contractName);\r
-        }\r
-\r
-        public static ImportingComposablePart CreateImporter(params ImportDefinition[] importDefinitions)\r
-        {\r
-            return new ImportingComposablePart(importDefinitions);\r
-        }\r
-\r
-        public static ComposablePart CreateDisposable(Action<bool> disposeCallback)\r
-        {\r
-            return new DisposableComposablePart(disposeCallback);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ReflectionFactory.MockParameterInfo.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ReflectionFactory.MockParameterInfo.cs
deleted file mode 100644 (file)
index 76e8052..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.Reflection;\r
-using System.Linq;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    partial class ReflectionFactory\r
-    {\r
-        private class MockParameterInfo : ParameterInfo\r
-        {\r
-            private readonly string _name;\r
-            private readonly Type _parameterType = typeof(string);\r
-\r
-            public MockParameterInfo(Type parameterType)\r
-            {\r
-                _parameterType = parameterType;\r
-            }\r
-\r
-            public MockParameterInfo(string name)\r
-            {\r
-                _name = name;\r
-            }\r
-\r
-            public override string Name\r
-            {\r
-                get { return _name; }\r
-            }\r
-\r
-            public override Type ParameterType\r
-            {\r
-                get { return _parameterType; }\r
-            }\r
-\r
-            public override MemberInfo Member\r
-            {\r
-                get { return typeof(object).GetConstructors().First(); }\r
-            }\r
-\r
-            public override object[] GetCustomAttributes(Type attributeType, bool inherit)\r
-            {\r
-                return (object[])Array.CreateInstance(attributeType, 0);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ReflectionFactory.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Factories/ReflectionFactory.cs
deleted file mode 100644 (file)
index 76d13ee..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition.Factories\r
-{\r
-    internal static partial class ReflectionFactory\r
-    {\r
-        public static ParameterInfo CreateParameter()\r
-        {\r
-            return CreateParameter((string)null);\r
-        }\r
-\r
-        public static ParameterInfo CreateParameter(Type parameterType)\r
-        {\r
-            return new MockParameterInfo(parameterType);\r
-        }\r
-\r
-        public static ParameterInfo CreateParameter(string name)\r
-        {\r
-            return new MockParameterInfo(name);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/GenerationServicesTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/GenerationServicesTests.cs
deleted file mode 100644 (file)
index b1bfe92..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Reflection.Emit;\r
-using System.Reflection;\r
-using System.ComponentModel.Composition;\r
-using System.UnitTesting;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    [TestClass]\r
-    public class GenerationServicesTests\r
-    {\r
-        // Has to be public, otherwise the dynamic method doesn't see it\r
-        public enum TestEnum\r
-        {\r
-            First = 1,\r
-            Second = 2\r
-        }\r
-\r
-        public static class DelegateTestClass\r
-        {\r
-            public static int Method(int i)\r
-            {\r
-                return i;\r
-            }\r
-        }\r
-\r
-        private Func<T> CreateValueGenerator<T>(T value)\r
-        {\r
-            DynamicMethod methodBuilder = new DynamicMethod(TestServices.GenerateRandomString(), typeof(T), Type.EmptyTypes);\r
-            // Generate the method body that simply returns the dictionary\r
-            ILGenerator ilGenerator = methodBuilder.GetILGenerator();\r
-            GenerationServices.LoadValue(ilGenerator, value);\r
-            ilGenerator.Emit(OpCodes.Ret);\r
-            return (Func<T>)methodBuilder.CreateDelegate(typeof(Func<T>));\r
-        }\r
-\r
-        private void TestSuccessfulValueGeneration<T>(T value)\r
-        {\r
-            Func<T> result = this.CreateValueGenerator<T>(value);\r
-            T generatedValue = result.Invoke();\r
-            Assert.AreEqual(value, generatedValue);\r
-        }\r
-\r
-        private void TestSuccessfulDictionaryGeneration(IDictionary<string, object> dictionary)\r
-        {\r
-            Func<IDictionary<string, object>> result = this.CreateValueGenerator<IDictionary<string, object>>(dictionary);\r
-            IDictionary<string, object> generatedDictionary = result.Invoke();\r
-            EnumerableAssert.AreEqual(dictionary, generatedDictionary);\r
-        }\r
-\r
-        private void TestSuccessfulEnumerableGeneration<T>(IEnumerable enumerable)\r
-        {\r
-            Func<IEnumerable> result = this.CreateValueGenerator<IEnumerable>(enumerable);\r
-            IEnumerable generatedEnumerable = result.Invoke();\r
-            Assert.IsTrue(generatedEnumerable.Cast<T>().SequenceEqual(enumerable.Cast<T>()));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PrimitiveTypes()\r
-        {\r
-            this.TestSuccessfulValueGeneration(Char.MinValue);\r
-            this.TestSuccessfulValueGeneration(Char.MaxValue);\r
-            this.TestSuccessfulValueGeneration((Char)42);\r
-\r
-            this.TestSuccessfulValueGeneration(true);\r
-            this.TestSuccessfulValueGeneration(false);\r
-\r
-            this.TestSuccessfulValueGeneration(Byte.MinValue);\r
-            this.TestSuccessfulValueGeneration(Byte.MaxValue);\r
-            this.TestSuccessfulValueGeneration((Byte)42);\r
-\r
-            this.TestSuccessfulValueGeneration(SByte.MinValue);\r
-            this.TestSuccessfulValueGeneration(SByte.MaxValue);\r
-            this.TestSuccessfulValueGeneration((SByte)42);\r
-\r
-            this.TestSuccessfulValueGeneration(Int16.MinValue);\r
-            this.TestSuccessfulValueGeneration(Int16.MaxValue);\r
-            this.TestSuccessfulValueGeneration((Int16)42);\r
-\r
-            this.TestSuccessfulValueGeneration(UInt16.MinValue);\r
-            this.TestSuccessfulValueGeneration(UInt16.MaxValue);\r
-            this.TestSuccessfulValueGeneration((UInt16)42);\r
-\r
-            this.TestSuccessfulValueGeneration(Int32.MinValue);\r
-            this.TestSuccessfulValueGeneration(Int32.MaxValue);\r
-            this.TestSuccessfulValueGeneration((Int32)42);\r
-\r
-            this.TestSuccessfulValueGeneration(UInt32.MinValue);\r
-            this.TestSuccessfulValueGeneration(UInt32.MaxValue);\r
-            this.TestSuccessfulValueGeneration((UInt32)42);\r
-\r
-            this.TestSuccessfulValueGeneration(Int64.MinValue);\r
-            this.TestSuccessfulValueGeneration(Int64.MaxValue);\r
-            this.TestSuccessfulValueGeneration((Int64)42);\r
-\r
-            this.TestSuccessfulValueGeneration(UInt64.MinValue);\r
-            this.TestSuccessfulValueGeneration(UInt64.MaxValue);\r
-            this.TestSuccessfulValueGeneration((UInt64)42);\r
-\r
-            this.TestSuccessfulValueGeneration(Single.MinValue);\r
-            this.TestSuccessfulValueGeneration(Single.MaxValue);\r
-            this.TestSuccessfulValueGeneration((Single)42.42);\r
-\r
-            this.TestSuccessfulValueGeneration(Double.MinValue);\r
-            this.TestSuccessfulValueGeneration(Double.MaxValue);\r
-            this.TestSuccessfulValueGeneration((Double)42.42);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void StringType()\r
-        {\r
-            this.TestSuccessfulValueGeneration("42");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void EnumType()\r
-        {\r
-            this.TestSuccessfulValueGeneration(TestEnum.Second);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void TypeType()\r
-        {\r
-            this.TestSuccessfulValueGeneration(typeof(TestEnum));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PrimitiveTypeEnumerable()\r
-        {\r
-            int[] enumerable = new int[] { 1, 2, 3, 4, 5 };\r
-            this.TestSuccessfulEnumerableGeneration<int>(enumerable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void StringTypeEnumerable()\r
-        {\r
-            string[] enumerable = new string[] { "1", "2", "3", "4", "5" };\r
-            this.TestSuccessfulEnumerableGeneration<string>(enumerable);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(507696)]\r
-        public void EnumTypeEnumerable()\r
-        {\r
-            TestEnum[] enumerable = new TestEnum[] { TestEnum.First, TestEnum.Second };\r
-            this.TestSuccessfulEnumerableGeneration<string>(enumerable);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void MixedEnumerable()\r
-        {\r
-            List<object> list = new List<object>();\r
-            list.Add(42);\r
-            list.Add("42");\r
-            list.Add(typeof(TestEnum));\r
-            list.Add(TestEnum.Second);\r
-            list.Add(null);\r
-\r
-            this.TestSuccessfulEnumerableGeneration<object>(list);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/.gitattributes
deleted file mode 100644 (file)
index 03c19e8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/AggregateCatalogTest.cs -crlf
-/AssemblyCatalogDebuggerProxyTests.cs -crlf
-/AssemblyCatalogTests.cs -crlf
-/CatalogExportProviderTests.cs -crlf
-/CompositionBatchTests.cs -crlf
-/CompositionTransactionTests.cs -crlf
-/DirectoryCatalogDebuggerProxyTests.cs -crlf
-/DirectoryCatalogTests.cs -crlf
-/ImportEngineTests.cs -crlf
-/TypeCatalogTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AggregateCatalogTest.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AggregateCatalogTest.cs
deleted file mode 100644 (file)
index 4e2d5ca..0000000
+++ /dev/null
@@ -1,980 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Threading;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    [TestClass]\r
-    public class AggregateCatalogTest\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldNotThrow()\r
-        {\r
-            new AggregateCatalog();\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetCatalogsPropertyToEmpty()\r
-        {\r
-            var catalog = new AggregateCatalog();\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Catalogs);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void Constructor1_ShouldSetPartsPropertyToEmpty()\r
-        {\r
-            var catalog = new AggregateCatalog();\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Parts);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsCatalogsArgument_ShouldSetCatalogsPropertyToEmpty()\r
-        {\r
-            var catalog = new AggregateCatalog((IEnumerable<ComposablePartCatalog>)null);\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Catalogs);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyIEnumerableAsCatalogsArgument_ShouldSetCatalogsPropertyToEmpty()\r
-        {\r
-            var catalog = new AggregateCatalog(Enumerable.Empty<ComposablePartCatalog>());\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Catalogs);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void Constructor3_NullAsCatalogsArgument_ShouldSetPartsPropertyToEmpty()\r
-        {\r
-            var catalog = new AggregateCatalog((IEnumerable<ComposablePartCatalog>)null);\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Parts);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void Constructor3_EmptyIEnumerableAsCatalogsArgument_ShouldSetPartsPropertyToEmpty()\r
-        {\r
-            var catalog = new AggregateCatalog(Enumerable.Empty<ComposablePartCatalog>());\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Parts);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ArrayWithNullAsCatalogsArgument_ShouldThrowArgument()\r
-        {\r
-            var catalogs = new ComposablePartCatalog[] { null };\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("catalogs", () =>\r
-            {\r
-                new AggregateCatalog(catalogs);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Catalogs_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateAggregateCatalog();\r
-            catalog.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                var catalogs = catalog.Catalogs;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Parts_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateAggregateCatalog();\r
-            catalog.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                var parts = catalog.Parts;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateAggregateCatalog();\r
-            catalog.Dispose();\r
-            var definition = ImportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                catalog.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_NullAsConstraintArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var catalog = CreateAggregateCatalog();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                catalog.GetExports((ImportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_ShouldNotThrow()\r
-        {\r
-            using (var catalog = CreateAggregateCatalog())\r
-            {\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CanBeCalledMultipleTimes()\r
-        {\r
-            var catalog = CreateAggregateCatalog();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void MutableCatalogNotifications()\r
-        {\r
-            int step = 0;\r
-            int changedStep = 0;\r
-            var catalog = new AggregateCatalog();\r
-\r
-            var typePartCatalog = new TypeCatalog(typeof(SharedPartStuff));\r
-            var typePartCatalog1 = new TypeCatalog(typeof(SharedPartStuff));\r
-            var typePartCatalog2 = new TypeCatalog(typeof(SharedPartStuff));\r
-            var typePartCatalog3 = new TypeCatalog(typeof(SharedPartStuff));\r
-            var typePartCatalog4 = new TypeCatalog(typeof(SharedPartStuff));\r
-            var typePartCatalog5 = new TypeCatalog(typeof(SharedPartStuff));\r
-\r
-            // Smoke test on inner collection\r
-            catalog.Catalogs.Add(typePartCatalog);\r
-            catalog.Catalogs.Remove(typePartCatalog);\r
-            catalog.Catalogs.Clear();\r
-            Assert.IsTrue(catalog.Catalogs.Count == 0, "Add/Remove/Clear -- PartsAsCollection.Count is now 0");\r
-\r
-            // Add notifications\r
-            catalog.Changed += delegate(object source, ComposablePartCatalogChangeEventArgs args)\r
-            {\r
-                // Local code\r
-                ++step; ++step;\r
-                changedStep = step;\r
-            };\r
-\r
-            //Add something then verify counters\r
-            catalog.Catalogs.Add(typePartCatalog);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 1, "Add -- Catalogs.Count is now 1");\r
-            Assert.IsTrue(changedStep == 2, "Add -- Changed must be fired after");\r
-\r
-            // Reset counters\r
-            step = changedStep = 0;\r
-\r
-            // Remove something then verify counters\r
-            catalog.Catalogs.Remove(typePartCatalog);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 0, "Add -- Catalogs.Count is now 0");\r
-            Assert.IsTrue(changedStep == 2, "Remove -- Changed must be fired after");\r
-\r
-\r
-            //Now Add it back\r
-            catalog.Catalogs.Add(typePartCatalog);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 1, "Add -- Catalogs.Count is now 1");\r
-\r
-            step = changedStep = 0;\r
-            // Now clear the collection and verify counters\r
-            catalog.Catalogs.Clear();\r
-            Assert.IsTrue(catalog.Catalogs.Count == 0, "Add -- Catalogs.Count is now 0");\r
-            Assert.IsTrue(changedStep == 2, "Remove -- Changed must be fired after");\r
-\r
-            // Now remove a non existent item and verify counters\r
-            step = changedStep = 0;\r
-            bool removed = catalog.Catalogs.Remove(typePartCatalog);\r
-            Assert.IsTrue(removed == false, "Remove -- correctly returned false");\r
-            Assert.IsTrue(changedStep == 0, "Remove -- Changed should not fire if nothing changed");\r
-\r
-            // Add a bunch\r
-            step = changedStep = 0;\r
-            catalog.Catalogs.Add(typePartCatalog);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 1, "Add -- Catalogs.Count is now 1");\r
-            Assert.IsTrue(changedStep == 2, "Add -- Changed must be fired after");\r
-\r
-            catalog.Catalogs.Add(typePartCatalog1);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 2, "Add -- Catalogs.Count is now 1");\r
-            Assert.IsTrue(changedStep == 4, "Add -- Changing must be fired after");\r
-\r
-            catalog.Catalogs.Add(typePartCatalog2);\r
-            catalog.Catalogs.Add(typePartCatalog3);\r
-            catalog.Catalogs.Add(typePartCatalog4);\r
-            catalog.Catalogs.Add(typePartCatalog5);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 6, "Add -- Catalogs.Count is now 1");\r
-            Assert.IsTrue(changedStep == 12, "Add -- Changing must be fired after");\r
-\r
-            removed = catalog.Catalogs.Remove(typePartCatalog3);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 5, "Add -- Catalogs.Count is now 5");\r
-            Assert.IsTrue(removed == true, "Remove should have succeeded");\r
-            Assert.IsTrue(changedStep == 14, "Remove -- Changed must be fired after");\r
-            removed = catalog.Catalogs.Remove(typePartCatalog2);\r
-            removed = catalog.Catalogs.Remove(typePartCatalog1);\r
-            removed = catalog.Catalogs.Remove(typePartCatalog4);\r
-            removed = catalog.Catalogs.Remove(typePartCatalog);\r
-            removed = catalog.Catalogs.Remove(typePartCatalog5);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 0, "Add -- Catalogs.Count is now 0");\r
-            Assert.IsTrue(removed == true, "Remove should have succeeded");\r
-            Assert.IsTrue(changedStep == 24, "Remove -- Changing must be fired after");\r
-\r
-            // Add and then clear a lot\r
-            step = changedStep = 0;\r
-            catalog.Catalogs.Add(typePartCatalog);\r
-            catalog.Catalogs.Add(typePartCatalog1);\r
-            catalog.Catalogs.Add(typePartCatalog2);\r
-            catalog.Catalogs.Add(typePartCatalog3);\r
-            catalog.Catalogs.Add(typePartCatalog4);\r
-            catalog.Catalogs.Add(typePartCatalog5);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 6, "Add -- Catalogs.Count should be 6");\r
-            Assert.IsTrue(changedStep == 12, "Add -- Changing must be fired after");\r
-\r
-            catalog.Catalogs.Clear();\r
-            Assert.IsTrue(catalog.Catalogs.Count == 0, "Add -- Catalogs.Count should be 0");\r
-\r
-            step = changedStep = 0;\r
-            int step2 = 100;\r
-            int changedStep2 = 0;\r
-\r
-            catalog.Changed += delegate(object source, ComposablePartCatalogChangeEventArgs args)\r
-            {\r
-                // Local code\r
-                --step2; --step2;\r
-                changedStep2 = step2;\r
-            };\r
-\r
-            catalog.Catalogs.Add(typePartCatalog);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 1, "Add -- Catalogs.Count is now 1");\r
-            Assert.IsTrue(changedStep == 2, "Add handler 1 -- Changed must be fired after");\r
-            Assert.IsTrue(changedStep2 == 98, "Add handler 2 -- Changed must be fired after");\r
-\r
-            catalog.Catalogs.Add(typePartCatalog1);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 2, "Add -- Catalogs.Count is now 1");\r
-            Assert.IsTrue(changedStep == 4, "Add handler 1 -- Changed must be fired after");\r
-            Assert.IsTrue(changedStep2 == 96, "Add handler 2 -- Changed must be firedafter");\r
-\r
-            catalog.Catalogs.Remove(typePartCatalog);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 1, "Add -- PartsAsCollection.Count is now 1");\r
-            Assert.IsTrue(changedStep == 6, "Add handler 1 -- Changed must be fired and fired after");\r
-            Assert.IsTrue(changedStep2 == 94, "Add handler 2 -- Changed must be fired and fired after");\r
-\r
-            catalog.Catalogs.Clear();\r
-            Assert.IsTrue(catalog.Catalogs.Count == 0, "Add -- PartsAsCollection.Count is now 0");\r
-            Assert.IsTrue(changedStep == 8, "Add handler 1 -- Changed must be fired after");\r
-            Assert.IsTrue(changedStep2 == 92, "Add handler 2 -- Changed must be fired after");\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void DisposeAggregatingCatalog()\r
-        {\r
-            int changedNotification = 0;\r
-\r
-            var typePartCatalog1 = new TypeCatalog(typeof(SharedPartStuff));\r
-            var typePartCatalog2 = new TypeCatalog(typeof(SharedPartStuff));\r
-            var typePartCatalog3 = new TypeCatalog(typeof(SharedPartStuff));\r
-\r
-            var assemblyPartCatalog1 = new AssemblyCatalog(typeof(SharedPartStuff).Assembly);\r
-            var assemblyPartCatalog2 = new AssemblyCatalog(typeof(SharedPartStuff).Assembly);\r
-            var assemblyPartCatalog3 = new AssemblyCatalog(typeof(SharedPartStuff).Assembly);\r
-\r
-#if !SILVERLIGHT\r
-            var dirPartCatalog1 = new DirectoryCatalog(FileIO.GetRootTemporaryDirectory());\r
-            var dirPartCatalog2 = new DirectoryCatalog(FileIO.GetRootTemporaryDirectory());\r
-            var dirPartCatalog3 = new DirectoryCatalog(FileIO.GetRootTemporaryDirectory());\r
-#endif\r
-            using (var catalog = new AggregateCatalog())\r
-            {\r
-                catalog.Catalogs.Add(typePartCatalog1);\r
-                catalog.Catalogs.Add(typePartCatalog2);\r
-                catalog.Catalogs.Add(typePartCatalog3);\r
-\r
-                catalog.Catalogs.Add(assemblyPartCatalog1);\r
-                catalog.Catalogs.Add(assemblyPartCatalog2);\r
-                catalog.Catalogs.Add(assemblyPartCatalog3);\r
-\r
-#if !SILVERLIGHT\r
-                catalog.Catalogs.Add(dirPartCatalog1);\r
-                catalog.Catalogs.Add(dirPartCatalog2);\r
-                catalog.Catalogs.Add(dirPartCatalog3);\r
-#endif\r
-\r
-                // Add notifications\r
-                catalog.Changed += delegate(object source, ComposablePartCatalogChangeEventArgs args)\r
-                {\r
-                    // Local code\r
-                    ++changedNotification;\r
-                };\r
-\r
-            }\r
-\r
-            Assert.IsTrue(changedNotification == 0, "No changed notifications");\r
-\r
-            //Ensure that the other catalogs are \r
-            ExceptionAssert.ThrowsDisposed(typePartCatalog1, () =>\r
-            {\r
-                var iEnum = typePartCatalog1.Parts.GetEnumerator();\r
-            });\r
-\r
-            ExceptionAssert.ThrowsDisposed(typePartCatalog2, () =>\r
-            {\r
-                var iEnum = typePartCatalog2.Parts.GetEnumerator();\r
-            });\r
-\r
-            ExceptionAssert.ThrowsDisposed(typePartCatalog3, () =>\r
-            {\r
-                var iEnum = typePartCatalog3.Parts.GetEnumerator();\r
-            });\r
-\r
-            //Ensure that the other catalogs are \r
-            ExceptionAssert.ThrowsDisposed(assemblyPartCatalog1, () =>\r
-            {\r
-                var iEnum = assemblyPartCatalog1.Parts.GetEnumerator();\r
-            });\r
-\r
-            ExceptionAssert.ThrowsDisposed(assemblyPartCatalog2, () =>\r
-            {\r
-                var iEnum = assemblyPartCatalog2.Parts.GetEnumerator();\r
-            });\r
-\r
-            ExceptionAssert.ThrowsDisposed(assemblyPartCatalog3, () =>\r
-            {\r
-                var iEnum = assemblyPartCatalog3.Parts.GetEnumerator();\r
-            });\r
-\r
-#if !SILVERLIGHT\r
-            //Ensure that the other catalogs are \r
-            ExceptionAssert.ThrowsDisposed(dirPartCatalog1, () =>\r
-            {\r
-                var iEnum = dirPartCatalog1.Parts.GetEnumerator();\r
-            });\r
-\r
-            ExceptionAssert.ThrowsDisposed(dirPartCatalog2, () =>\r
-            {\r
-                var iEnum = dirPartCatalog2.Parts.GetEnumerator();\r
-            });\r
-\r
-            ExceptionAssert.ThrowsDisposed(dirPartCatalog3, () =>\r
-            {\r
-                var iEnum = dirPartCatalog3.Parts.GetEnumerator();\r
-            });\r
-#endif\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(514749)]\r
-        public void MutableMultithreadedEnumerations()\r
-        {\r
-            var catalog = new AggregateCatalog();\r
-\r
-            ThreadStart func = delegate()\r
-            {\r
-                var typePart = new TypeCatalog(typeof(SharedPartStuff));\r
-                var typePart1 = new TypeCatalog(typeof(SharedPartStuff));\r
-                var typePart2 = new TypeCatalog(typeof(SharedPartStuff));\r
-                var typePart3 = new TypeCatalog(typeof(SharedPartStuff));\r
-                var typePart4 = new TypeCatalog(typeof(SharedPartStuff));\r
-                var typePart5 = new TypeCatalog(typeof(SharedPartStuff));\r
-\r
-                for (int i = 0; i < 100; i++)\r
-                {\r
-                    catalog.Catalogs.Add(typePart);\r
-                    catalog.Catalogs.Add(typePart1);\r
-                    catalog.Catalogs.Add(typePart2);\r
-                    catalog.Catalogs.Add(typePart3);\r
-                    catalog.Catalogs.Add(typePart4);\r
-                    catalog.Catalogs.Add(typePart5);\r
-\r
-                    Assert.IsTrue(catalog.Catalogs.Count >= 6, "Catalogs Collection must be at least 6 big");\r
-\r
-                    for (int k = 0; k < 5; k++)\r
-                    {\r
-                        int j;\r
-                        // Ensure that iterating the returned queryable is okay even though there are many threads mutationg it\r
-                        // We are really just looking to ensure that ollection changed exceptions are not thrown\r
-                        j = 0;\r
-                        var iq = catalog.Parts.GetEnumerator();\r
-                        while (iq.MoveNext())\r
-                        {\r
-                            ++j;\r
-                        }\r
-\r
-                        Assert.IsTrue(j >= 6, "Catalogs Collection must be at least 6 big");\r
-\r
-                        // Ensure that iterating the returned enumerator is okay even though there are many threads mutationg it\r
-                        // We are really just looking to ensure that collection changed exceptions are not thrown\r
-                        j = 0;\r
-                        var ie = catalog.Catalogs.GetEnumerator();\r
-                        while (ie.MoveNext())\r
-                        {\r
-                            ++j;\r
-                        }\r
-                        Assert.IsTrue(j >= 6, "Catalogs Collection must be at least 6 big");\r
-                    }\r
-\r
-\r
-                    catalog.Catalogs.Remove(typePart);\r
-                    catalog.Catalogs.Remove(typePart1);\r
-                    catalog.Catalogs.Remove(typePart2);\r
-                    catalog.Catalogs.Remove(typePart3);\r
-                    catalog.Catalogs.Remove(typePart4);\r
-                    catalog.Catalogs.Remove(typePart5);\r
-                }\r
-            };\r
-\r
-            Thread[] threads = new Thread[100];\r
-            for (int i = 0; i < threads.Length; i++)\r
-            {\r
-                threads[i] = new Thread(func);\r
-            }\r
-\r
-            for (int i = 0; i < threads.Length; i++)\r
-            {\r
-                threads[i].Start();\r
-            }\r
-            for (int i = 0; i < threads.Length; i++)\r
-            {\r
-                threads[i].Join();\r
-            }\r
-\r
-            Assert.IsTrue(catalog.Catalogs.Count == 0, "Collection must be empty");\r
-        }\r
-\r
-\r
-        public void CreateMainAndOtherChildren(\r
-            out AggregateCatalog[] mainChildren,\r
-            out AggregateCatalog[] otherChildren,\r
-            out TypeCatalog[] componentCatalogs)\r
-        {\r
-            componentCatalogs = new TypeCatalog[] \r
-            {\r
-                new TypeCatalog(typeof(SharedPartStuff)),\r
-                new TypeCatalog(typeof(SharedPartStuff)),\r
-                new TypeCatalog(typeof(SharedPartStuff))\r
-            };\r
-\r
-            // Create our child catalogs\r
-            mainChildren = new AggregateCatalog[5];\r
-            for (int i = 0; i < mainChildren.Length; i++)\r
-            {\r
-                mainChildren[i] = new AggregateCatalog(componentCatalogs);\r
-            }\r
-\r
-            otherChildren = new AggregateCatalog[5];\r
-            for (int i = 0; i < otherChildren.Length; i++)\r
-            {\r
-                otherChildren[i] = new AggregateCatalog(componentCatalogs);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void AggregatingCatalogAddAndRemoveChildren()\r
-        {\r
-            int changedCount = 0;\r
-            int typesChanged = 0;\r
-            EventHandler<ComposablePartCatalogChangeEventArgs> onChanged = delegate(object sender, ComposablePartCatalogChangeEventArgs e)\r
-            {\r
-                ++changedCount;\r
-                typesChanged += e.AddedDefinitions.Concat(e.RemovedDefinitions).Count();\r
-            };\r
-\r
-            // Create our child catalogs\r
-            AggregateCatalog[] mainChildren;\r
-            AggregateCatalog[] otherChildren;\r
-            TypeCatalog[] componentCatalogs;\r
-\r
-            CreateMainAndOtherChildren(out mainChildren, out otherChildren, out componentCatalogs);\r
-\r
-            var parent = new AggregateCatalog(mainChildren);\r
-            parent.Changed += onChanged;\r
-\r
-            for (int i = 0; i < otherChildren.Length; i++)\r
-            {\r
-                parent.Catalogs.Add(otherChildren[i]);\r
-            }\r
-\r
-            Assert.AreEqual(otherChildren.Length, changedCount);\r
-            Assert.AreEqual(otherChildren.Length * 3, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-\r
-            parent.Catalogs.Remove(otherChildren[0]);\r
-            parent.Catalogs.Remove(otherChildren[1]);\r
-\r
-            Assert.AreEqual(2, changedCount);\r
-            Assert.AreEqual(2 * 3, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-\r
-            parent.Catalogs.Add(otherChildren[0]);\r
-            parent.Catalogs.Add(otherChildren[1]);\r
-\r
-            Assert.AreEqual(2, changedCount);\r
-            Assert.AreEqual(2 * 3, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-\r
-            parent.Catalogs.Clear();\r
-            Assert.AreEqual(1, changedCount);\r
-            Assert.AreEqual((mainChildren.Length + otherChildren.Length) * 3, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-\r
-            // These have already been removed and so I should be able remove components from them without recieving notifications\r
-            otherChildren[0].Catalogs.Remove(componentCatalogs[0]);\r
-            otherChildren[1].Catalogs.Remove(componentCatalogs[1]);\r
-            Assert.AreEqual(0, changedCount);\r
-            Assert.AreEqual(0, typesChanged);\r
-\r
-            // These have already been Cleared and so I should be able remove components from them without recieving notifications\r
-            otherChildren[3].Catalogs.Remove(componentCatalogs[0]);\r
-            otherChildren[4].Catalogs.Remove(componentCatalogs[1]);\r
-            Assert.AreEqual(0, changedCount);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void AggregatingCatalogAddAndRemoveNestedChildren()\r
-        {\r
-            int changedCount = 0;\r
-            int typesChanged = 0;\r
-\r
-            EventHandler<ComposablePartCatalogChangeEventArgs> onChanged = delegate(object sender, ComposablePartCatalogChangeEventArgs e)\r
-            {\r
-                ++changedCount;\r
-                typesChanged += e.AddedDefinitions.Concat(e.RemovedDefinitions).Count();\r
-            };\r
-\r
-            // Create our child catalogs\r
-            AggregateCatalog[] mainChildren;\r
-            AggregateCatalog[] otherChildren;\r
-            TypeCatalog[] componentCatalogs;\r
-            CreateMainAndOtherChildren(out mainChildren, out otherChildren, out componentCatalogs);\r
-\r
-\r
-            var parent = new AggregateCatalog(mainChildren);\r
-            parent.Changed += onChanged;\r
-\r
-            for (int i = 0; i < otherChildren.Length; i++)\r
-            {\r
-                parent.Catalogs.Add(otherChildren[i]);\r
-            }\r
-\r
-            Assert.AreEqual(otherChildren.Length, changedCount);\r
-            Assert.AreEqual(otherChildren.Length * 3, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-\r
-            otherChildren[0].Catalogs.Remove(componentCatalogs[0]);\r
-            otherChildren[1].Catalogs.Remove(componentCatalogs[1]);\r
-\r
-            Assert.AreEqual(2, changedCount);\r
-            Assert.AreEqual(2, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-\r
-            otherChildren[0].Catalogs.Add(componentCatalogs[0]);\r
-            otherChildren[1].Catalogs.Add(componentCatalogs[1]);\r
-\r
-            Assert.AreEqual(2, changedCount);\r
-            Assert.AreEqual(2, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-            otherChildren[1].Catalogs.Clear();\r
-            Assert.AreEqual(1, changedCount);\r
-            Assert.AreEqual(componentCatalogs.Length, typesChanged);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void AggregatingDisposedAndNotifications()\r
-        {\r
-            int changedCount = 0;\r
-            int typesChanged = 0;\r
-\r
-            EventHandler<ComposablePartCatalogChangeEventArgs> onChanged = delegate(object sender, ComposablePartCatalogChangeEventArgs e)\r
-            {\r
-                ++changedCount;\r
-                typesChanged += e.AddedDefinitions.Concat(e.RemovedDefinitions).Count();\r
-            };\r
-\r
-            // Create our child catalogs\r
-            AggregateCatalog[] mainChildren;\r
-            AggregateCatalog[] otherChildren;\r
-            TypeCatalog[] componentCatalogs;\r
-            CreateMainAndOtherChildren(out mainChildren, out otherChildren, out componentCatalogs);\r
-\r
-\r
-            var parent = new AggregateCatalog(mainChildren);\r
-            parent.Changed += onChanged;\r
-\r
-            for (int i = 0; i < otherChildren.Length; i++)\r
-            {\r
-                parent.Catalogs.Add(otherChildren[i]);\r
-            }\r
-\r
-            Assert.AreEqual(otherChildren.Length, changedCount);\r
-            Assert.AreEqual(otherChildren.Length * 3, typesChanged);\r
-\r
-            changedCount = 0;\r
-            typesChanged = 0;\r
-\r
-            parent.Dispose();\r
-\r
-            Assert.AreEqual(0, changedCount);\r
-            Assert.AreEqual(0, typesChanged);\r
-\r
-            //Ensure that the children are also disposed\r
-            ExceptionAssert.ThrowsDisposed(otherChildren[0], () =>\r
-            {\r
-                otherChildren[0].Catalogs.Remove(componentCatalogs[0]);\r
-            });\r
-\r
-            //Ensure that the children are also disposed\r
-            ExceptionAssert.ThrowsDisposed(otherChildren[4], () =>\r
-            {\r
-                otherChildren[4].Catalogs.Remove(componentCatalogs[0]);\r
-            });\r
-\r
-            Assert.AreEqual(0, changedCount);\r
-            Assert.AreEqual(0, typesChanged);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AggregatingCatalogParmsConstructorAggregateAggregateCatalogs()\r
-        {\r
-            var aggCatalog1 = new AggregateCatalog();\r
-            var aggCatalog2 = new AggregateCatalog();\r
-            var aggCatalog3 = new AggregateCatalog();\r
-\r
-            // Construct with one catalog parameter\r
-            var catalog = new AggregateCatalog(aggCatalog1);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 1);\r
-\r
-            // Construct with two catalog parameters\r
-            catalog = new AggregateCatalog(aggCatalog1, aggCatalog2);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 2);\r
-\r
-            // Construct with three catalog parameters\r
-            catalog = new AggregateCatalog(aggCatalog1, aggCatalog2, aggCatalog3);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 3);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AggregatingCatalogParmsConstructorAggregateAssemblyCatalogs()\r
-        {\r
-            var assemblyCatalog1 = new AssemblyCatalog(typeof(SharedPartStuff).Assembly);\r
-            var assemblyCatalog2 = new AssemblyCatalog(typeof(SharedPartStuff).Assembly);\r
-            var assemblyCatalog3 = new AssemblyCatalog(typeof(SharedPartStuff).Assembly);\r
-\r
-            // Construct with one catalog parameter\r
-            var catalog = new AggregateCatalog(assemblyCatalog1);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 1);\r
-\r
-            // Construct with two catalog parameters\r
-            catalog = new AggregateCatalog(assemblyCatalog1, assemblyCatalog2);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 2);\r
-\r
-            // Construct with three catalog parameters\r
-            catalog = new AggregateCatalog(assemblyCatalog1, assemblyCatalog2, assemblyCatalog3);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AggregatingCatalogParmsConstructorMixedCatalogs()\r
-        {\r
-            var typePartCatalog1 = new TypeCatalog(typeof(SharedPartStuff));\r
-            var assemblyCatalog2 = new AssemblyCatalog(typeof(SharedPartStuff).Assembly);\r
-            var typePartCatalog3 = new TypeCatalog(typeof(SharedPartStuff));\r
-\r
-            // Construct with three catalog parameters\r
-            var catalog = new AggregateCatalog(typePartCatalog1, assemblyCatalog2, typePartCatalog3);\r
-            Assert.IsTrue(catalog.Catalogs.Count == 3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AggregatingCatalogRaisesChangesForCatalogsPassedToConstructor()\r
-        {\r
-            var subCatalog = CreateAggregateCatalog();\r
-            var testCatalog = new AggregateCatalog(subCatalog);\r
-\r
-            bool changedCalled = false;\r
-            testCatalog.Changed += delegate\r
-            {\r
-                changedCalled = true;\r
-            };\r
-\r
-            subCatalog.Catalogs.Add(new TypeCatalog(typeof(SharedPartStuff)));\r
-\r
-            Assert.IsTrue(changedCalled);\r
-        }\r
-\r
-        private AggregateCatalog CreateAggregateCatalog()\r
-        {\r
-            return new AggregateCatalog();\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void CatalogEvents_AggregateAddRemove()\r
-        {\r
-            var catalog = new AggregateCatalog();\r
-            AggregateTests(catalog, catalog);\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void CatalogEvents_DeepAggregateAddRemove()\r
-        {\r
-            var deepCatalog = new AggregateCatalog();\r
-            var midCatalog = new AggregateCatalog(new ComposablePartCatalog[] { deepCatalog });\r
-            var topCatalog = new AggregateCatalog(new ComposablePartCatalog[] { midCatalog });\r
-            AggregateTests(topCatalog, deepCatalog);\r
-        }\r
-\r
-        private void AggregateTests(AggregateCatalog watchedCatalog, AggregateCatalog modifiedCatalog)\r
-        {\r
-            var fooCatalog = new TypeCatalog(new Type[] { typeof(FooExporter) });\r
-            var barCatalog = new TypeCatalog(new Type[] { typeof(BarExporter) });\r
-            var bothCatalog = new TypeCatalog(new Type[] { typeof(FooExporter), typeof(BarExporter) });\r
-\r
-            var catalogListener = new CatalogListener(watchedCatalog, modifiedCatalog);\r
-\r
-            catalogListener.VerifyAdd(fooCatalog, typeof(FooExporter));\r
-            catalogListener.VerifyAdd(barCatalog, typeof(BarExporter));\r
-            catalogListener.VerifyRemove(fooCatalog, typeof(FooExporter));\r
-            catalogListener.VerifyRemove(barCatalog, typeof(BarExporter));\r
-\r
-            catalogListener.VerifyAdd(bothCatalog, typeof(FooExporter), typeof(BarExporter));\r
-            catalogListener.VerifyClear(typeof(FooExporter), typeof(BarExporter));\r
-\r
-            catalogListener.VerifyAdd(bothCatalog, typeof(FooExporter), typeof(BarExporter));\r
-            catalogListener.VerifyRemove(bothCatalog, typeof(FooExporter), typeof(BarExporter));\r
-        }\r
-\r
-\r
-        public interface IFoo { }\r
-        public interface IBar { }\r
-\r
-        [Export(typeof(IFoo))]\r
-        public class FooExporter : IFoo\r
-        {\r
-        }\r
-\r
-        [Export(typeof(IBar))]\r
-        public class BarExporter : IBar\r
-        {\r
-        }\r
-\r
-        public class CatalogListener\r
-        {\r
-            private AggregateCatalog _watchedCatalog;\r
-            private AggregateCatalog _modifiedCatalog;\r
-            private string[] _expectedAdds;\r
-            private string[] _expectedRemoves;\r
-            private int _changedEventCount;\r
-            private int _changingEventCount;\r
-\r
-            public CatalogListener(AggregateCatalog watchCatalog, AggregateCatalog modifiedCatalog)\r
-            {\r
-                watchCatalog.Changing += OnChanging;\r
-                watchCatalog.Changed += OnChanged;\r
-                this._watchedCatalog = watchCatalog;\r
-                this._modifiedCatalog = modifiedCatalog;\r
-            }\r
-\r
-            public void VerifyAdd(ComposablePartCatalog catalogToAdd, params Type[] expectedTypesAdded)\r
-            {\r
-                this._expectedAdds = GetDisplayNames(expectedTypesAdded);\r
-\r
-                this._modifiedCatalog.Catalogs.Add(catalogToAdd);\r
-\r
-                Assert.IsTrue(this._changingEventCount == 1, "Changing event should have been called");\r
-                Assert.IsTrue(this._changedEventCount == 1, "Changed event should have been called");\r
-\r
-                ResetState();\r
-            }\r
-\r
-            public void VerifyRemove(ComposablePartCatalog catalogToRemove, params Type[] expectedTypesRemoved)\r
-            {\r
-                this._expectedAdds = null;\r
-                this._expectedRemoves = GetDisplayNames(expectedTypesRemoved);\r
-\r
-                this._modifiedCatalog.Catalogs.Remove(catalogToRemove);\r
-\r
-                Assert.IsTrue(this._changingEventCount == 1, "Changing event should have been called");\r
-                Assert.IsTrue(this._changedEventCount == 1, "Changed event should have been called");\r
-\r
-                ResetState();\r
-            }\r
-\r
-            public void VerifyClear(params Type[] expectedTypesRemoved)\r
-            {\r
-                this._expectedAdds = null;\r
-                this._expectedRemoves = GetDisplayNames(expectedTypesRemoved);\r
-\r
-                this._modifiedCatalog.Catalogs.Clear();\r
-\r
-                Assert.IsTrue(this._changingEventCount == 1, "Changing event should have been called");\r
-                Assert.IsTrue(this._changedEventCount == 1, "Changed event should have been called");\r
-\r
-                ResetState();\r
-            }\r
-\r
-            public void OnChanging(object sender, ComposablePartCatalogChangeEventArgs args)\r
-            {\r
-                Assert.IsTrue(this._expectedAdds != null || this._expectedRemoves != null);\r
-\r
-                if (this._expectedAdds == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.AddedDefinitions);\r
-                }\r
-                else\r
-                {\r
-                    EnumerableAssert.AreSequenceEqual(this._expectedAdds, GetDisplayNames(args.AddedDefinitions));\r
-                }\r
-\r
-                if (this._expectedRemoves == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.RemovedDefinitions);\r
-                }\r
-                else\r
-                {\r
-                    EnumerableAssert.AreSequenceEqual(this._expectedRemoves, GetDisplayNames(args.RemovedDefinitions));\r
-                }\r
-\r
-                Assert.IsFalse(ContainsChanges(), "The catalog should NOT contain the changes yet");\r
-\r
-                this._changingEventCount++;\r
-            }\r
-\r
-            public void OnChanged(object sender, ComposablePartCatalogChangeEventArgs args)\r
-            {\r
-                Assert.IsTrue(this._expectedAdds != null || this._expectedRemoves != null);\r
-\r
-                if (this._expectedAdds == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.AddedDefinitions);\r
-                }\r
-                else\r
-                {\r
-                    EnumerableAssert.AreSequenceEqual(this._expectedAdds, GetDisplayNames(args.AddedDefinitions));\r
-                }\r
-\r
-                if (this._expectedRemoves == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.RemovedDefinitions);\r
-                }\r
-                else\r
-                {\r
-                    EnumerableAssert.AreSequenceEqual(this._expectedRemoves, GetDisplayNames(args.RemovedDefinitions));\r
-                }\r
-\r
-                Assert.IsNull(args.AtomicComposition);\r
-                Assert.IsTrue(ContainsChanges(), "The catalog should contain the changes");\r
-\r
-                this._changedEventCount++;\r
-            }\r
-\r
-            private bool ContainsChanges()\r
-            {\r
-                var allParts = GetDisplayNames(this._watchedCatalog.Parts);\r
-\r
-                if (this._expectedAdds != null)\r
-                {\r
-                    foreach (var add in this._expectedAdds)\r
-                    {\r
-                        if (!allParts.Contains(add))\r
-                        {\r
-                            return false;\r
-                        }\r
-                    }\r
-                }\r
-\r
-                if (this._expectedRemoves != null)\r
-                {\r
-                    foreach (var remove in this._expectedRemoves)\r
-                    {\r
-                        if (allParts.Contains(remove))\r
-                        {\r
-                            return false;\r
-                        }\r
-                    }\r
-                }\r
-\r
-                return true;\r
-            }\r
-\r
-            private void ResetState()\r
-            {\r
-                this._expectedAdds = null;\r
-                this._expectedRemoves = null;\r
-                this._changedEventCount = 0;\r
-                this._changingEventCount = 0;\r
-            }\r
-\r
-            private static string[] GetDisplayNames(IEnumerable<ComposablePartDefinition> definitions)\r
-            {\r
-                return definitions.OfType<ICompositionElement>().Select(p => p.DisplayName).ToArray();\r
-            }\r
-\r
-            private static string[] GetDisplayNames(IEnumerable<Type> types)\r
-            {\r
-                return GetDisplayNames(types.Select(t => AttributedModelServices.CreatePartDefinition(t, null)));\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class SharedPartStuff\r
-        {\r
-            Guid id = Guid.NewGuid();\r
-\r
-            public override string ToString()\r
-            {\r
-                return id.ToString();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AssemblyCatalogDebuggerProxyTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AssemblyCatalogDebuggerProxyTests.cs
deleted file mode 100644 (file)
index 96f1e1c..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    [TestClass]\r
-    public class AssemblyCatalogDebuggerProxyTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsCatalogArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("catalog", () =>\r
-            {\r
-                new AssemblyCatalogDebuggerProxy((AssemblyCatalog)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsCatalogArgument_ShouldSetPartsProperty()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = CreateAssemblyCatalog(e);\r
-\r
-                var proxy = new AssemblyCatalogDebuggerProxy(catalog);\r
-\r
-                EnumerableAssert.AreSequenceEqual(catalog.Parts, proxy.Parts);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsCatalogArgument_ShouldSetAssemblyProperty()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = CreateAssemblyCatalog(e);\r
-\r
-                var proxy = new AssemblyCatalogDebuggerProxy(catalog);\r
-\r
-                Assert.AreSame(catalog.Assembly, proxy.Assembly);\r
-            }\r
-        }\r
-\r
-        private AssemblyCatalogDebuggerProxy CreateAssemblyDebuggerProxy(AssemblyCatalog catalog)\r
-        {\r
-            return new AssemblyCatalogDebuggerProxy(catalog);\r
-        }\r
-\r
-        private AssemblyCatalog CreateAssemblyCatalog(Assembly assembly)\r
-        {\r
-            return new AssemblyCatalog(assembly);\r
-        }\r
-   }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs
deleted file mode 100644 (file)
index 961da8b..0000000
+++ /dev/null
@@ -1,510 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Reflection;\r
-using System.Security;\r
-using System.Security.Permissions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class AssemblyCatalogTests\r
-    {\r
-#if !SILVERLIGHT\r
-        [TestMethod]\r
-        public void Constructor1_ValueAsAssemblyArgument_ShouldSetAssemblyProperty()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = new AssemblyCatalog(e.CodeBase);\r
-\r
-                Assert.AreSame(e, catalog.Assembly);\r
-            }\r
-        }\r
-#endif\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsAssemblyArgument_ShouldSetAssemblyProperty()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = new AssemblyCatalog(e);\r
-\r
-                Assert.AreSame(e, catalog.Assembly);\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-        \r
-        [TestMethod]\r
-        public void Constructor1_LockedFileAsCodeBaseArgument_ShouldThrowFileLoad()\r
-        {\r
-            using (TemporaryFile file = new TemporaryFile())\r
-            {\r
-                using (FileStream stream = new FileStream(file.FileName, FileMode.Open, FileAccess.Read, FileShare.None))\r
-                {\r
-                    ExceptionAssert.Throws<FileLoadException>(() =>\r
-                    {\r
-                        new AssemblyCatalog(file.FileName);\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_NullFileNameAsCodeBaseArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("codeBase", () =>\r
-            {\r
-                new AssemblyCatalog((string)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_EmptyFileNameAsCodeBaseArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("codeBase", () =>\r
-            {\r
-                new AssemblyCatalog("");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.Throws<ArgumentException>(() =>\r
-            {\r
-                new AssemblyCatalog("??||>");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_DirectoryAsCodeBaseArgument_ShouldThrowFileLoad()\r
-        {\r
-            string directory = Environment.GetFolderPath(Environment.SpecialFolder.System);\r
-            Assert.IsTrue(Directory.Exists(directory));\r
-\r
-            ExceptionAssert.Throws<FileLoadException>(() =>\r
-            {\r
-                new AssemblyCatalog(directory);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_TooLongFileNameAsCodeBaseArgument_ShouldThrowPathTooLong()\r
-        {\r
-            ExceptionAssert.Throws<PathTooLongException>(() =>\r
-            {\r
-                new AssemblyCatalog(@"c:\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\myassembly.dll");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_NonAssemblyFileNameAsCodeBaseArgument_ShouldThrowBadImageFormat()\r
-        {\r
-            using (TemporaryFile temporaryFile = new TemporaryFile())\r
-            {\r
-                ExceptionAssert.Throws<BadImageFormatException>(() =>\r
-                {\r
-                    new AssemblyCatalog(temporaryFile.FileName);\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_NonExistentFileNameAsCodeBaseArgument_ShouldThrowFileNotFound()\r
-        {\r
-            ExceptionAssert.Throws<FileNotFoundException>(() =>\r
-            {\r
-                new AssemblyCatalog(@"FileThat should not ever exist");\r
-            });\r
-        }\r
-#endif\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetOriginToNull()\r
-        {\r
-            var catalog = (ICompositionElement)new AssemblyCatalog(GetAttributedAssemblyCodeBase());\r
-\r
-            Assert.IsNull(catalog.Origin);\r
-        }\r
-\r
-#endif\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetOriginToNull()\r
-        {\r
-            var catalog = (ICompositionElement)new AssemblyCatalog(GetAttributedAssembly());\r
-\r
-            Assert.IsNull(catalog.Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Assembly_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            catalog.Dispose();\r
-\r
-            Assert.IsNotNull(catalog.Assembly);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            catalog.Dispose();\r
-\r
-            var displayName = ((ICompositionElement)catalog).DisplayName;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementOrigin_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            catalog.Dispose();\r
-\r
-            var origin = ((ICompositionElement)catalog).Origin;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            catalog.Dispose();\r
-\r
-            catalog.ToString();\r
-        }\r
-        \r
-        [TestMethod]\r
-        public void Parts_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            catalog.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                var parts = catalog.Parts;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            catalog.Dispose();\r
-                       var definition = ImportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                catalog.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_NullAsConstraintArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                catalog.GetExports((ImportDefinition)null);\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Dispose_ShouldNotThrow()\r
-        {\r
-            using (var catalog = CreateAssemblyCatalog())\r
-            {\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CanBeCalledMultipleTimes()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Parts()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            Assert.IsNotNull(catalog.Parts);\r
-            Assert.IsTrue(catalog.Parts.Count()>0);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Parts_ShouldSetDefinitionOriginToCatalogItself()\r
-        {\r
-            var catalog = CreateAssemblyCatalog();\r
-            Assert.IsTrue(catalog.Parts.Count() > 0);\r
-\r
-            foreach (ICompositionElement definition in catalog.Parts)\r
-            {\r
-                Assert.AreSame(catalog, definition.Origin);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            Expression<Func<ExportDefinition, bool>> constraint = (ExportDefinition exportDefinition) => exportDefinition.ContractName == AttributedModelServices.GetContractName(typeof(MyExport));\r
-            IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> matchingExports = catalog.GetExports(constraint);\r
-            Assert.IsNotNull(matchingExports);\r
-            Assert.IsTrue(matchingExports.Count() >= 0);\r
-\r
-            IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> expectedMatchingExports = catalog.Parts\r
-                .SelectMany(part => part.ExportDefinitions, (part, export) => new Tuple<ComposablePartDefinition, ExportDefinition>(part, export))\r
-                .Where(partAndExport => partAndExport.Item2.ContractName == AttributedModelServices.GetContractName(typeof(MyExport)));\r
-            Assert.IsTrue(matchingExports.SequenceEqual(expectedMatchingExports));\r
-        }\r
-\r
-\r
-\r
-#if !SILVERLIGHT\r
-        // Silverlight does not support loading assemblies via file path\r
-        [TestMethod]\r
-        public void AddAssemblyUsingFile()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly.Location);\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            Assert.IsNotNull(container.GetExportedValue<MyExport>());\r
-        }\r
-#endif\r
-\r
-        [TestMethod]\r
-        public void TwoTypesWithSameSimpleName()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            NotSoUniqueName unique1 = container.GetExportedValue<NotSoUniqueName>();\r
-            Assert.IsNotNull(unique1);\r
-\r
-            Assert.AreEqual(23, unique1.MyIntProperty);\r
-\r
-            NotSoUniqueName2.NotSoUniqueName nestedUnique = container.GetExportedValue<NotSoUniqueName2.NotSoUniqueName>();\r
-\r
-            Assert.IsNotNull(nestedUnique);\r
-            Assert.AreEqual("MyStringProperty", nestedUnique.MyStringProperty);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GettingFunctionExports()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            ImportDefaultFunctions import = container.GetExportedValue<ImportDefaultFunctions>("ImportDefaultFunctions");\r
-            import.VerifyIsBound();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AnExportOfAnInstanceThatFailsToCompose()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Rejection causes the part in the catalog whose imports cannot be\r
-            // satisfied to be ignored, resulting in a cardinality mismatch instead of a\r
-            // composition exception\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<string>("ExportMyString");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SharedPartCreation()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            var container = new CompositionContainer(catalog);\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new Int32Exporter(41));\r
-            container.Compose(batch);\r
-\r
-            var sharedPart1 = container.GetExportedValue<MySharedPartExport>();\r
-            Assert.AreEqual(41, sharedPart1.Value);\r
-            var sharedPart2 = container.GetExportedValue<MySharedPartExport>();\r
-            Assert.AreEqual(41, sharedPart2.Value);\r
-\r
-            Assert.AreEqual(sharedPart1, sharedPart2, "These should be the same instances");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPartCreation()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            var container = new CompositionContainer(catalog);\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new Int32Exporter(41));\r
-            container.Compose(batch);\r
-\r
-            var nonSharedPart1 = container.GetExportedValue<MyNonSharedPartExport>();\r
-            Assert.AreEqual(41, nonSharedPart1.Value);\r
-            var nonSharedPart2 = container.GetExportedValue<MyNonSharedPartExport>();\r
-            Assert.AreEqual(41, nonSharedPart2.Value);\r
-\r
-            Assert.AreNotSame(nonSharedPart1, nonSharedPart2, "These should be different instances");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RecursiveNonSharedPartCreation()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<DirectCycleNonSharedPart>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleNonSharedPart>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleNonSharedPart1>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleNonSharedPart2>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleWithSharedPartAndNonSharedPart>();\r
-            });\r
-\r
-            Assert.IsNotNull(container.GetExportedValue<CycleSharedPart>());\r
-            Assert.IsNotNull(container.GetExportedValue<CycleSharedPart1>());\r
-            Assert.IsNotNull(container.GetExportedValue<CycleSharedPart2>());\r
-            Assert.IsNotNull(container.GetExportedValue<NoCycleNonSharedPart>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryToDiscoverExportWithGenericParameter()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(AssemblyCatalogTests).Assembly);\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Open generic should fail because we should discover that type\r
-            Assert.IsNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<>))));\r
-\r
-            // This specific generic was not exported any where so it should fail\r
-            Assert.IsNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<double>))));\r
-\r
-            // This specific generic was exported so it should succeed\r
-            Assert.IsNotNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<int>))));\r
-\r
-            // Shouldn't discovoer static type with open generic\r
-            Assert.IsNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(StaticExportWithGenericParameter<>))));\r
-\r
-            // Should find a type that inherits from an export\r
-            Assert.IsNotNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWhichInheritsFromGeneric))));\r
-\r
-            // This should be exported because it is inherited by ExportWhichInheritsFromGeneric\r
-            Assert.IsNotNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<string>))));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ShouldIncludeCatalogTypeNameAndAssemblyFullName()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = (ICompositionElement)CreateAssemblyCatalog(e);\r
-\r
-                string expected = string.Format("AssemblyCatalog (Assembly=\"{0}\")", e.FullName);\r
-\r
-                Assert.AreEqual(expected, catalog.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ShouldIncludeDerivedCatalogTypeNameAndAssemblyFullName()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = (ICompositionElement)new DerivedAssemblyCatalog(e);\r
-\r
-                string expected = string.Format("DerivedAssemblyCatalog (Assembly=\"{0}\")", e.FullName);\r
-\r
-                Assert.AreEqual(expected, catalog.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnICompositionElementDisplayName()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = (ICompositionElement)CreateAssemblyCatalog(e);\r
-\r
-                Assert.AreEqual(catalog.DisplayName, catalog.ToString());\r
-            }\r
-        }\r
-\r
-\r
-\r
-        private string GetAttributedAssemblyCodeBase()\r
-        {\r
-            return Assembly.GetExecutingAssembly().CodeBase;\r
-        }\r
-\r
-        private Assembly GetAttributedAssembly()\r
-        {\r
-            return Assembly.GetExecutingAssembly();\r
-        }\r
-\r
-        private AssemblyCatalog CreateAssemblyCatalog()\r
-        {\r
-            return CreateAssemblyCatalog(GetAttributedAssembly());\r
-        }\r
-\r
-        private AssemblyCatalog CreateAssemblyCatalog(Assembly assembly)\r
-        {\r
-            return new AssemblyCatalog(assembly);\r
-        }\r
-\r
-        private class DerivedAssemblyCatalog : AssemblyCatalog\r
-        {\r
-            public DerivedAssemblyCatalog(Assembly assembly)\r
-                : base(assembly)\r
-            {\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CatalogExportProviderTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CatalogExportProviderTests.cs
deleted file mode 100644 (file)
index 3e0eb92..0000000
+++ /dev/null
@@ -1,599 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Diagnostics;\r
-using System.ComponentModel.Composition.Diagnostics;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ComposablePartCatalogExportProviderTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsCatalogArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("catalog", () =>\r
-            {\r
-                new CatalogExportProvider((ComposablePartCatalog)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsCatalogArgument_ShouldSetCatalogPropertyToEmpty()\r
-        {\r
-            var expectations = Expectations.GetCatalogs();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var provider = new CatalogExportProvider(e);\r
-\r
-                Assert.AreSame(e, provider.Catalog);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Catalog_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var provider = CreateCatalogExportProvider();\r
-            provider.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(provider, () =>\r
-            {\r
-                var catalog = provider.Catalog;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SourceProvider_NullAsValueArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var provider = CreateCatalogExportProvider();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("value", () =>\r
-            {\r
-                provider.SourceProvider = null;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenRejectedDefinitionRequiredImportIsAdded_ShouldBeResurrected()\r
-        {\r
-            var part = PartFactory.CreateImporterExporter("Export", "Import");\r
-\r
-            var provider = CreateCatalogExportProvider(part);\r
-            var sourceProvider = ExportProviderFactory.CreateRecomposable();\r
-            provider.SourceProvider = sourceProvider;\r
-\r
-            var exports = provider.GetExports<object>("Export");\r
-\r
-            EnumerableAssert.IsEmpty(exports, "definition should have been rejected.");\r
-\r
-            // Resurrect the definition\r
-            sourceProvider.AddExport("Import", new object());\r
-\r
-            exports = provider.GetExports<object>("Export");\r
-\r
-            Assert.AreEqual(1, exports.Count(), "definition should have been resurrected.");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenMultipleRejectedDefinitionsRequiredImportsAreAdded_ShouldBeResurrected()\r
-        {\r
-            var part1 = PartFactory.CreateImporterExporter("Export", "Import");\r
-            var part2 = PartFactory.CreateImporterExporter("Export", "Import");\r
-\r
-            var provider = CreateCatalogExportProvider(part1, part2);\r
-            var sourceProvider = ExportProviderFactory.CreateRecomposable();\r
-            provider.SourceProvider = sourceProvider;\r
-\r
-            var exports = provider.GetExports<object>("Export");\r
-\r
-            EnumerableAssert.IsEmpty(exports, "definition1 and definition2 should have been rejected.");\r
-\r
-            // Resurrect both definitions\r
-            sourceProvider.AddExport("Import", new object());\r
-\r
-            exports = provider.GetExports<object>("Export");\r
-\r
-            Assert.AreEqual(2, exports.Count(), "definition1 and definition2 should have been resurrected.");\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(743740)]\r
-        public void GetExports_AfterResurrectedDefinitionHasBeenRemovedAndReaddedToCatalog_ShouldNotBeTreatedAsRejected()\r
-        {\r
-            var definition1 = PartDefinitionFactory.Create(PartFactory.CreateImporterExporter("Export", "Import"));\r
-            var definition2 = PartDefinitionFactory.Create(PartFactory.CreateImporterExporter("Export", "Import"));\r
-            var catalog = CatalogFactory.CreateMutable(definition1, definition2);\r
-\r
-            var provider = CreateCatalogExportProvider(catalog);\r
-            var sourceProvider = ExportProviderFactory.CreateRecomposable();\r
-            provider.SourceProvider = sourceProvider;\r
-\r
-            var exports = provider.GetExports<object>("Export");\r
-\r
-            EnumerableAssert.IsEmpty(exports, "definition1 and definition2 should have been rejected.");\r
-\r
-            // Resurrect both definitions\r
-            sourceProvider.AddExport("Import", new object());\r
-\r
-            exports = provider.GetExports<object>("Export");\r
-\r
-            Assert.AreEqual(2, exports.Count(), "definition1 and definition2 should have been resurrected.");\r
-\r
-            catalog.RemoveDefinition(definition1);\r
-\r
-            exports = provider.GetExports<object>("Export");\r
-            Assert.AreEqual(1, exports.Count(), "definition1 should have been removed.");\r
-\r
-            catalog.AddDefinition(definition1);\r
-\r
-            exports = provider.GetExports<object>("Export");\r
-\r
-            Assert.AreEqual(2, exports.Count(), "definition1 and definition2 should be both present.");\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenDefinitionIsRejected_ShouldTraceWarning()\r
-        {\r
-            using (TraceContext context = new TraceContext(SourceLevels.Warning))\r
-            {\r
-                var part = PartFactory.CreateImporterExporter("Export", "Import");\r
-                var provider = CreateCatalogExportProvider(part);\r
-                provider.SourceProvider = ExportProviderFactory.CreateRecomposable();\r
-\r
-                ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-                {\r
-                    provider.GetExport<object>("Export");\r
-\r
-                });\r
-\r
-                Assert.IsNotNull(context.LastTraceEvent);\r
-                Assert.AreEqual(context.LastTraceEvent.EventType, TraceEventType.Warning);\r
-                Assert.AreEqual(context.LastTraceEvent.Id, TraceId.Rejection_DefinitionRejected);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenDefinitionIsResurrected_ShouldTraceInformation()\r
-        {\r
-            using (TraceContext context = new TraceContext(SourceLevels.Information))\r
-            {\r
-                var part = PartFactory.CreateImporterExporter("Export", "Import");\r
-                var sourceProvider = ExportProviderFactory.CreateRecomposable();\r
-                var provider = CreateCatalogExportProvider(part);\r
-                provider.SourceProvider = sourceProvider;\r
-\r
-                ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-                {\r
-                    provider.GetExport<object>("Export");\r
-                });\r
-\r
-                // Add the required export to the source provider 'resurrect' the part\r
-                sourceProvider.AddExport("Import", "Value");\r
-\r
-                provider.GetExport<object>("Export");\r
-\r
-                Assert.IsNotNull(context.LastTraceEvent);\r
-                Assert.AreEqual(context.LastTraceEvent.EventType, TraceEventType.Information);\r
-                Assert.AreEqual(context.LastTraceEvent.Id, TraceId.Rejection_DefinitionResurrected);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenDefinitionsAreResurrected_ShouldTraceInformation()\r
-        {\r
-            using (TraceContext context = new TraceContext(SourceLevels.Information))\r
-            {\r
-                var part1 = PartFactory.CreateImporterExporter("Export", "Import");\r
-                var part2 = PartFactory.CreateImporterExporter("Export", "Import");\r
-\r
-                var sourceProvider = ExportProviderFactory.CreateRecomposable();\r
-                var provider = CreateCatalogExportProvider(part1, part2);\r
-                provider.SourceProvider = sourceProvider;\r
-\r
-                EnumerableAssert.IsEmpty(provider.GetExports<object>("Export"));\r
-\r
-                // Add the required export to the source provider 'resurrect' the part\r
-                sourceProvider.AddExport("Import", "Value");\r
-\r
-                provider.GetExports<object>("Export");\r
-\r
-                Assert.AreEqual(4, context.TraceEvents.Count);  // 2 for rejection, 2 for resurrection\r
-                Assert.AreEqual(context.TraceEvents[2].EventType, TraceEventType.Information);\r
-                Assert.AreEqual(context.TraceEvents[3].EventType, TraceEventType.Information);\r
-                Assert.AreEqual(context.TraceEvents[2].Id, TraceId.Rejection_DefinitionResurrected);\r
-                Assert.AreEqual(context.TraceEvents[3].Id, TraceId.Rejection_DefinitionResurrected);\r
-            }\r
-        }\r
-#endif\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void BasicTest()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = catalogExportProvider;\r
-            var testName = AttributedModelServices.GetContractName(typeof(CatalogComponentTest));\r
-            var testNameNonComponent = AttributedModelServices.GetContractName(typeof(CatalogComponentTestNonComponentPart));\r
-            var testInterfaceName = AttributedModelServices.GetContractName(typeof(ICatalogComponentTest));\r
-\r
-            Assert.AreEqual(1, catalogExportProvider.GetExports(ImportFromContract(testName)).Count());\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContract(testNameNonComponent)).Count());\r
-\r
-            var exports = catalogExportProvider.GetExports(ImportFromContract(testInterfaceName));\r
-            Assert.AreEqual(2, exports.Count(), "There should be 2 of them");\r
-\r
-            foreach (var i in exports)\r
-                Assert.IsNotNull(i.Value, "Should get a value");\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void BasicTestWithRequiredMetadata_NoTypeConstraint()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = catalogExportProvider;\r
-\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithNoFoo", new string[] { "Foo" }, new Type[] {typeof(object)})).Count());\r
-\r
-            Assert.AreEqual(1, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo" }, new Type[] { typeof(object) })).Count());\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo", "Bar" }, new Type[] { typeof(object), typeof(object) })).Count());\r
-\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithNoFoo", new string[] { "Foo" }, new Type[] { typeof(object) })).Count());\r
-            Assert.AreEqual(1, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo" }, new Type[] { typeof(object) })).Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void BasicTestWithRequiredMetadata_TypeConstraint()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = catalogExportProvider;\r
-\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithNoFoo", new string[] { "Foo" }, new Type[] { typeof(string) })).Count());\r
-\r
-            Assert.AreEqual(1, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo" }, new Type[] { typeof(string) })).Count());\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo", "Bar" }, new Type[] { typeof(string), typeof(string) })).Count());\r
-\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithNoFoo", new string[] { "Foo" }, new Type[] { typeof(string) })).Count());\r
-            Assert.AreEqual(1, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo" }, new Type[] { typeof(string) })).Count());\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void BasicTestWithRequiredMetadata_WrongTypeConstraint()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = catalogExportProvider;\r
-\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithNoFoo", new string[] { "Foo" }, new Type[] { typeof(int) })).Count());\r
-\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo" }, new Type[] { typeof(int) })).Count());\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo", "Bar" }, new Type[] { typeof(int), typeof(int) })).Count());\r
-\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithNoFoo", new string[] { "Foo" }, new Type[] { typeof(int) })).Count());\r
-            Assert.AreEqual(0, catalogExportProvider.GetExports(ImportFromContractAndMetadata("MyExporterWithFoo", new string[] { "Foo" }, new Type[] { typeof(int) })).Count());\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void ComponentCatalogResolverGetStaticExport()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = catalogExportProvider;\r
-\r
-            var exports = catalogExportProvider.GetExports(ImportFromContract("StaticString"));\r
-            Assert.AreEqual(1, exports.Count());\r
-            Assert.AreEqual("StaticString", exports.First().Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void ComponentCatalogResolverComponentCatalogExportReference()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = catalogExportProvider;\r
-\r
-            var exports = catalogExportProvider.GetExports(ImportFromContract(AttributedModelServices.GetContractName(typeof(MyExporterWithValidMetadata))));\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-\r
-            var export = exports.First();\r
-            Assert.AreEqual("world", export.Metadata["hello"]);\r
-\r
-            Assert.IsInstanceOfType(export.Value, typeof(MyExporterWithValidMetadata));\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        public void ValueTypeFromCatalog()\r
-        {\r
-            var catalog = CatalogFactory.CreateDefaultAttributed();\r
-            var container = new CompositionContainer(catalog);\r
-            int singletonResult = container.GetExportedValue<int>("{AssemblyCatalogResolver}SingletonValueType");\r
-            Assert.AreEqual(17, singletonResult, "expecting value type resolved from catalog");\r
-            int factoryResult = container.GetExportedValue<int>("{AssemblyCatalogResolver}FactoryValueType");\r
-            Assert.AreEqual(18, factoryResult, "expecting value type resolved from catalog");\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.Any)]\r
-        public class CreationPolicyAny\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreationPolicyAny_MultipleCallsReturnSameInstance()\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed(typeof (CreationPolicyAny));\r
-            var provider = new CatalogExportProvider(catalog);\r
-            provider.SourceProvider = ContainerFactory.Create();\r
-\r
-            var export = provider.GetExportedValue<CreationPolicyAny>();\r
-\r
-            for (int i = 0; i < 5; i++) // 5 is arbitrarily chosen\r
-            {\r
-                var export1 = provider.GetExportedValue<CreationPolicyAny>();\r
-\r
-                Assert.AreEqual(export, export1);\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class CreationPolicyShared\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreationPolicyShared_MultipleCallsReturnSameInstance()\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed(typeof(CreationPolicyShared));\r
-            var provider = new CatalogExportProvider(catalog);\r
-            provider.SourceProvider = ContainerFactory.Create();\r
-\r
-            var export = provider.GetExportedValue<CreationPolicyShared>();\r
-\r
-            for (int i = 0; i < 5; i++) // 5 is arbitrarily chosen\r
-            {\r
-                var export1 = provider.GetExportedValue<CreationPolicyShared>();\r
-\r
-                Assert.AreEqual(export, export1);\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class CreationPolicyNonShared\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreationPolicyNonShared_MultipleCallsReturnsDifferentInstances()\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed(typeof(CreationPolicyNonShared));\r
-            var provider = new CatalogExportProvider(catalog);\r
-            provider.SourceProvider = ContainerFactory.Create();\r
-\r
-            List<CreationPolicyNonShared> list = new List<CreationPolicyNonShared>();\r
-            var export = provider.GetExportedValue<CreationPolicyNonShared>();\r
-            list.Add(export);\r
-\r
-            for (int i = 0; i < 5; i++) // 5 is arbitrarily chosen\r
-            {\r
-                export = provider.GetExportedValue<CreationPolicyNonShared>();\r
-\r
-                CollectionAssert.DoesNotContain(list, export);\r
-                list.Add(export);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(684514)]\r
-        public void GetExports_NoSourceProvider_ShouldThrowInvalidOperation()\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed();\r
-            var provider = new CatalogExportProvider(catalog);\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-                provider.GetExports(ImportFromContract("Foo")));\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        [Ignore]\r
-        [WorkItem(561310)]\r
-        public void Recomposition_PartDefWithRecomposableImportIsRemoved_ExportsMatchingImportChanged_ShouldNotBeRecomposed()\r
-        {\r
-            string dependencyContractName = "dependency";\r
-            var exportValue = new object();\r
-            \r
-            var exporterPart = PartFactory.CreateExporter(dependencyContractName, exportValue);\r
-            var importerPart = PartFactory.CreateImporter(dependencyContractName, true);\r
-            \r
-            var exporterCatalog = CatalogFactory.Create(exporterPart);\r
-            var importerCatalog = CatalogFactory.Create(importerPart);\r
-\r
-            var aggregateCatalog = CatalogFactory.CreateAggregateCatalog(importerCatalog, exporterCatalog);\r
-            \r
-            var provider = new CatalogExportProvider(aggregateCatalog);\r
-            provider.SourceProvider = provider;\r
-\r
-            var exports = provider.GetExports(importerPart.ImportDefinitions.Single());\r
-            Assert.AreEqual(exportValue, importerPart.Value, "Importer was not composed");\r
-\r
-            aggregateCatalog.Catalogs.Remove(importerCatalog);\r
-            aggregateCatalog.Catalogs.Remove(exporterCatalog);\r
-\r
-            Assert.AreEqual(exportValue, importerPart.Value, "Importer was unexpectedly recomposed");\r
-        }\r
-\r
-        [TestMethod]\r
-        [TestProperty("Type", "Integration")]\r
-        [Ignore]\r
-        [WorkItem(561310)]\r
-        public void Recomposition_PartDefWithNonRecomposableImportIsRemoved_ExportsMatchingImportChanged_ShouldNotBeRejected()\r
-        {\r
-            string dependencyContractName = "dependency";\r
-            var exportValue = new object();\r
-\r
-            var exporterPart = PartFactory.CreateExporter(dependencyContractName, exportValue);\r
-            var importerPart = PartFactory.CreateImporter(dependencyContractName, false);\r
-\r
-            var exporterCatalog = CatalogFactory.Create(exporterPart);\r
-            var importerCatalog = CatalogFactory.Create(importerPart);\r
-\r
-            var aggregateCatalog = CatalogFactory.CreateAggregateCatalog(importerCatalog, exporterCatalog);\r
-\r
-            var provider = new CatalogExportProvider(aggregateCatalog);\r
-            provider.SourceProvider = provider;\r
-\r
-            var exports = provider.GetExports(importerPart.ImportDefinitions.Single());\r
-            Assert.AreEqual(exportValue, importerPart.Value, "Importer was not composed");\r
-\r
-            aggregateCatalog.Catalogs.Remove(importerCatalog);\r
-            aggregateCatalog.Catalogs.Remove(exporterCatalog);\r
-\r
-            Assert.AreEqual(exportValue, importerPart.Value, "Importer was unexpectedly recomposed");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CanBeCollectedAfterDispose()\r
-        {\r
-            AggregateExportProvider sourceExportProvider = new AggregateExportProvider();\r
-            var catalog = new AggregateCatalog(CatalogFactory.CreateDefaultAttributed());\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = sourceExportProvider;\r
-\r
-            WeakReference weakCatalogExportProvider = new WeakReference(catalogExportProvider);\r
-            catalogExportProvider.Dispose();\r
-            catalogExportProvider = null;\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            Assert.IsFalse(weakCatalogExportProvider.IsAlive);\r
-\r
-            GC.KeepAlive(sourceExportProvider);\r
-            GC.KeepAlive(catalog);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RemovingAndReAddingMultipleDefinitionsFromCatalog()\r
-        {\r
-            var fixedParts = new TypeCatalog(typeof(RootMultipleImporter), typeof(ExportedService));\r
-            var changingParts = new TypeCatalog(typeof(Exporter1), typeof(Exporter2));\r
-            var catalog = new AggregateCatalog();\r
-            catalog.Catalogs.Add(fixedParts);\r
-            catalog.Catalogs.Add(changingParts);\r
-            var catalogExportProvider = new CatalogExportProvider(catalog);\r
-            catalogExportProvider.SourceProvider = catalogExportProvider;\r
-\r
-            var root = catalogExportProvider.GetExport<RootMultipleImporter>().Value;\r
-            Assert.AreEqual(2, root.Imports.Length);\r
-\r
-            catalog.Catalogs.Remove(changingParts);\r
-            Assert.AreEqual(0, root.Imports.Length);\r
-\r
-            catalog.Catalogs.Add(changingParts);\r
-            Assert.AreEqual(2, root.Imports.Length);\r
-        }\r
-\r
-        [Export]\r
-        public class RootMultipleImporter\r
-        {\r
-            [ImportMany(AllowRecomposition = true)]\r
-            public IExportedInterface[] Imports { get; set; }\r
-        }\r
-        public interface IExportedInterface\r
-        {\r
-        }\r
-        [Export(typeof(IExportedInterface))]\r
-        public class Exporter1 : IExportedInterface\r
-        {\r
-            [Import]\r
-            public ExportedService Service { get; set; }\r
-        }\r
-        [Export(typeof(IExportedInterface))]\r
-        public class Exporter2 : IExportedInterface\r
-        {\r
-            [Import]\r
-            public ExportedService Service { get; set; }\r
-        }\r
-        [Export]\r
-        public class ExportedService\r
-        {\r
-        }\r
-\r
-\r
-\r
-        private static ImportDefinition ImportFromContract(string contractName)\r
-        {\r
-            return ImportDefinitionFactory.CreateDefault(contractName,\r
-\r
-                                                     ImportCardinality.ZeroOrMore,\r
-                                                     false,\r
-                                                     false);\r
-        }\r
-\r
-        private static ImportDefinition ImportFromContractAndMetadata(string contractName, string[] metadataKeys, Type[] metadataValues)\r
-        {\r
-            Assert.AreEqual(metadataKeys.Length, metadataValues.Length);\r
-            Dictionary<string, Type> requiredMetadata = new Dictionary<string, Type>();\r
-            for (int i = 0; i < metadataKeys.Length; i++)\r
-            {\r
-                requiredMetadata.Add(metadataKeys[i], metadataValues[i]);\r
-            }\r
-\r
-            return new ContractBasedImportDefinition(contractName,\r
-                                                     (string)null,\r
-                                                     requiredMetadata,\r
-                                                     ImportCardinality.ZeroOrMore,\r
-                                                     false,\r
-                                                     false,\r
-                                                     CreationPolicy.Any);\r
-        }\r
-\r
-        private static CatalogExportProvider CreateCatalogExportProvider()\r
-        {\r
-            return CreateCatalogExportProvider(CatalogFactory.Create());\r
-        }\r
-\r
-        private static CatalogExportProvider CreateCatalogExportProvider(params ComposablePartDefinition[] definitions)\r
-        {\r
-            return CreateCatalogExportProvider(CatalogFactory.Create(definitions));\r
-        }\r
-\r
-        private static CatalogExportProvider CreateCatalogExportProvider(params ComposablePart[] parts)\r
-        {\r
-            return CreateCatalogExportProvider(CatalogFactory.Create(parts));\r
-        }\r
-\r
-        private static CatalogExportProvider CreateCatalogExportProvider(ComposablePartCatalog catalog)\r
-        {\r
-            return new CatalogExportProvider(catalog);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CompositionBatchTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CompositionBatchTests.cs
deleted file mode 100644 (file)
index f43f56e..0000000
+++ /dev/null
@@ -1,872 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Collections.ObjectModel;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CompositionBatchTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_PropertiesShouldBeSetAndEmpty()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            Assert.IsNotNull(batch.PartsToAdd);\r
-            EnumerableAssert.IsEmpty(batch.PartsToAdd);\r
-\r
-            Assert.IsNotNull(batch.PartsToRemove);\r
-            EnumerableAssert.IsEmpty(batch.PartsToRemove);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_PropertiesShouldBeSetAndMatchArguments()\r
-        {\r
-            ComposablePart[] partsToAdd = new ComposablePart[] { PartFactory.Create(), PartFactory.Create(), PartFactory.Create() };\r
-            ComposablePart[] partsToRemove = new ComposablePart[] { PartFactory.Create(), PartFactory.Create(), PartFactory.Create() };\r
-\r
-\r
-            CompositionBatch batch = new CompositionBatch(partsToAdd, partsToRemove);\r
-\r
-            Assert.IsNotNull(batch.PartsToAdd);\r
-            Assert.IsNotNull(batch.PartsToRemove);\r
-\r
-            EnumerableAssert.AreSequenceEqual(batch.PartsToAdd, partsToAdd);\r
-            EnumerableAssert.AreSequenceEqual(batch.PartsToRemove, partsToRemove);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constructor2_PartsToAddAsNull_PartsToAddShouldBeEmpty()\r
-        {\r
-            ComposablePart[] partsToRemove = new ComposablePart[] { PartFactory.Create(), PartFactory.Create(), PartFactory.Create() };\r
-\r
-            var batch = new CompositionBatch(null, partsToRemove);\r
-\r
-            Assert.AreEqual(0, batch.PartsToAdd.Count);\r
-            Assert.AreEqual(partsToRemove.Length, batch.PartsToRemove.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_PartsToRemoveAsNull_PartsToRemoveShouldBeEmpty()\r
-        {\r
-            ComposablePart[] partsToAdd = new ComposablePart[] { PartFactory.Create(), PartFactory.Create(), PartFactory.Create() };\r
-\r
-            var batch = new CompositionBatch(partsToAdd, null);\r
-\r
-            Assert.AreEqual(partsToAdd.Length, batch.PartsToAdd.Count);\r
-            Assert.AreEqual(0, batch.PartsToRemove.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_PartsToAddHasNull_ShouldThrowArgumentNullException()\r
-        {\r
-            ComposablePart[] partsToAdd = new ComposablePart[] { PartFactory.Create(), null, PartFactory.Create() };\r
-            ComposablePart[] partsToRemove = new ComposablePart[] { PartFactory.Create(), PartFactory.Create(), PartFactory.Create() };\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("partsToAdd", () =>\r
-            {\r
-                new CompositionBatch(partsToAdd, partsToRemove);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_PartsToRemoveHasNull_ShouldThrowArgumentNullException()\r
-        {\r
-            ComposablePart[] partsToAdd = new ComposablePart[] { PartFactory.Create(), PartFactory.Create(), PartFactory.Create() };\r
-            ComposablePart[] partsToRemove = new ComposablePart[] { PartFactory.Create(), null, PartFactory.Create() };\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("partsToRemove", () =>\r
-            {\r
-                new CompositionBatch(partsToAdd, partsToRemove);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_PartIsInPartsToAdd()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            ComposablePart part = PartFactory.Create();\r
-\r
-            batch.AddPart(part);\r
-\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-            Assert.AreSame(part, batch.PartsToAdd[0]);\r
-\r
-            EnumerableAssert.IsEmpty(batch.PartsToRemove);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_PartAsNull_ShouldThrowArgumentNullException()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("part", () =>\r
-            {\r
-                batch.AddPart(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RemovePart_PartIsInPartsToRemove()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            ComposablePart part = PartFactory.Create();\r
-\r
-            batch.RemovePart(part);\r
-\r
-            Assert.AreEqual(1, batch.PartsToRemove.Count);\r
-            Assert.AreSame(part, batch.PartsToRemove[0]);\r
-\r
-            EnumerableAssert.IsEmpty(batch.PartsToAdd);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RemovePart_PartAsNull_ShouldThrowArgumentNullException()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("part", () =>\r
-            {\r
-                batch.RemovePart(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartsToAdd_ShouldGetCopiedAfterAdd()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            ComposablePart part1 = PartFactory.Create();\r
-            ComposablePart part2 = PartFactory.Create();\r
-\r
-            batch.AddPart(part1);\r
-            Assert.IsTrue(batch.PartsToAdd.Contains(part1));\r
-\r
-            ReadOnlyCollection<ComposablePart> partsToAddBeforeCopy = batch.PartsToAdd;\r
-            Assert.AreSame(partsToAddBeforeCopy, batch.PartsToAdd);\r
-\r
-            Assert.AreEqual(1, partsToAddBeforeCopy.Count);\r
-            Assert.IsTrue(partsToAddBeforeCopy.Contains(part1));\r
-\r
-            batch.AddPart(part2);\r
-\r
-            ReadOnlyCollection<ComposablePart> partsToAddAfterCopy = batch.PartsToAdd;\r
-            Assert.AreSame(partsToAddAfterCopy, batch.PartsToAdd);\r
-\r
-            Assert.AreEqual(2, partsToAddAfterCopy.Count);\r
-            Assert.IsTrue(partsToAddAfterCopy.Contains(part1));\r
-            Assert.IsTrue(partsToAddAfterCopy.Contains(part2));\r
-            Assert.AreNotSame(partsToAddBeforeCopy, partsToAddAfterCopy);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartsToRemove_ShouldGetCopiedAfterRemove()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            ComposablePart part1 = PartFactory.Create();\r
-            ComposablePart part2 = PartFactory.Create();\r
-\r
-            batch.RemovePart(part1);\r
-            Assert.IsTrue(batch.PartsToRemove.Contains(part1));\r
-\r
-            ReadOnlyCollection<ComposablePart> partsToRemoveBeforeCopy = batch.PartsToRemove;\r
-            Assert.AreSame(partsToRemoveBeforeCopy, batch.PartsToRemove);\r
-\r
-            Assert.AreEqual(1, partsToRemoveBeforeCopy.Count);\r
-            Assert.IsTrue(partsToRemoveBeforeCopy.Contains(part1));\r
-\r
-            batch.RemovePart(part2);\r
-\r
-            ReadOnlyCollection<ComposablePart> partsToRemoveAfterCopy = batch.PartsToRemove;\r
-            Assert.AreSame(partsToRemoveAfterCopy, batch.PartsToRemove);\r
-\r
-            Assert.AreEqual(2, partsToRemoveAfterCopy.Count);\r
-            Assert.IsTrue(partsToRemoveAfterCopy.Contains(part1));\r
-            Assert.IsTrue(partsToRemoveAfterCopy.Contains(part2));\r
-            Assert.AreNotSame(partsToRemoveBeforeCopy, partsToRemoveAfterCopy);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_NullAsContractNameArgument_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("contractName", () =>\r
-            {\r
-                batch.AddExportedValue((string)null, "Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_EmptyStringAsContractNameArgument_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("contractName", () =>\r
-            {\r
-                batch.AddExportedValue("", "Value");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_NullAsExportArgument_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("export", () =>\r
-            {\r
-                batch.AddExport((Export)null);\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AddExport_ExportWithNullExportedValueAsExportArgument_CanBeExported()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", (object)null);\r
-\r
-            batch.AddExport(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            var result = this.GetSingleExport(batch.PartsToAdd[0], "Contract");\r
-\r
-            Assert.IsNotNull(result);\r
-            Assert.IsNull(result.Value);\r
-        }\r
-\r
-\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_NullAsExportedValueArgument_CanBeExported()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddExportedValue<string>((string)null);\r
-\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-            var result = this.GetSingleLazy<string>(batch.PartsToAdd[0]);\r
-\r
-            Assert.IsNotNull(result);\r
-            Assert.IsNull(result.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_NullAsExportedValueArgument_CanBeExported()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddExportedValue("Contract", (string)null);\r
-\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-            var result = this.GetSingleExport(batch.PartsToAdd[0], "Contract");\r
-\r
-            Assert.IsNotNull(result);\r
-            Assert.IsNull(result.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ExportWithEmptyMetadata_IsExportedWithEmptyMetadata()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value", new Dictionary<string, object>());\r
-\r
-            Assert.AreEqual(0, export.Metadata.Count);\r
-\r
-            batch.AddExport(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            var result = this.GetSingleExport(batch.PartsToAdd[0], "Contract");\r
-\r
-            Assert.AreEqual(0, result.Metadata.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_IsExportedWithEmptyMetadata()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddExportedValue<string>("Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            var result = this.GetSingleLazy<string>(batch.PartsToAdd[0]);\r
-\r
-            Assert.AreEqual(1, result.Metadata.Count); // contains type identity\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_IsExportedWithEmptyMetadata()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddExportedValue("Contract", "Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            var result = this.GetSingleExport(batch.PartsToAdd[0], "Contract");\r
-\r
-            Assert.AreEqual(1, result.Metadata.Count); // contains type identity\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_IsInAddedPartsCollection()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-            var part = batch.AddExport(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreEqual("Value", this.GetSingleExport(batch.PartsToAdd[0], "Contract").Value);\r
-            Assert.IsTrue(batch.PartsToAdd.Contains(part));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_IsInAddedPartsCollection()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreEqual("Value", this.GetSingleLazy<string>(batch.PartsToAdd[0]).Value);\r
-            Assert.IsTrue(batch.PartsToAdd.Contains(part));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_IsInAddedPartsCollection()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreEqual("Value", this.GetSingleExport(batch.PartsToAdd[0], "Contract").Value);\r
-            Assert.IsTrue(batch.PartsToAdd.Contains(part));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ExportAsExportedValueArgument_ShouldBeWrappedInExport()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            batch.AddExportedValue<object>(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreSame(export, this.GetSingleLazy<object>(batch.PartsToAdd[0]).Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ExportAsExportedValueArgument_ShouldBeWrappedInExport()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            batch.AddExportedValue(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreSame(export, this.GetSingleLazy<Export>(batch.PartsToAdd[0]).Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_NullAsDefinitionArgumentToGetExportedValue_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            var part = batch.AddExport(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.GetExportedValue((ExportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_WrongDefinitionAsDefinitionArgumentToGetExportedValue_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            var part = batch.AddExport(export);\r
-            var definition = ExportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_NullAsDefinitionArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            var part = batch.AddExport(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.SetImport((ImportDefinition)null, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_NullAsExportsArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            var part = batch.AddExport(export);\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, (IEnumerable<Export>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_ExportsArrayWithNullElementAsExportsArgumentToSetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            var part = batch.AddExport(export);\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, new Export[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_SetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value");\r
-\r
-            var part = batch.AddExport(export);\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.SetImport(definition, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExport_ReturnedComposablePart_ContainsExportDefinitionRepresentingExport()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Name"] = "Value";\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export = ExportFactory.Create("Contract", "Value", metadata);\r
-            \r
-            var part = batch.AddExport(export);\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            var definition = part.ExportDefinitions.Single();\r
-\r
-            Assert.AreEqual("Contract", definition.ContractName);\r
-            Assert.AreEqual("Value", part.GetExportedValue(definition));\r
-            EnumerableAssert.AreEqual(metadata, definition.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_ImportDefinitionsPropertyIsEmpty()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreEqual(0, part.ImportDefinitions.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_MetadataPropertyIsEmpty()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreEqual(0, part.Metadata.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_NullAsDefinitionArgumentToGetExportedValue_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.GetExportedValue((ExportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_WrongDefinitionAsDefinitionArgumentToGetExportedValue_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            var definition = ExportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_NullAsDefinitionArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.SetImport((ImportDefinition)null, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_NullAsExportsArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, (IEnumerable<Export>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_ExportsArrayWithNullElementAsExportsArgumentToSetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            var definition = ImportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, new Export[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_SetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.SetImport(definition, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValueOfT_ReturnedComposablePart_ContainsExportDefinitionRepresentingExport()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue<string>("Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            var definition = part.ExportDefinitions.Single();\r
-\r
-            Assert.AreEqual(NameForType<string>(), definition.ContractName);\r
-            Assert.AreEqual("Value", part.GetExportedValue(definition));\r
-            Assert.AreEqual(1, definition.Metadata.Count); // contains type identity\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_ImportDefinitionsPropertyIsEmpty()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreEqual(0, part.ImportDefinitions.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_MetadataPropertyIsEmpty()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            Assert.AreEqual(0, part.Metadata.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_NullAsDefinitionArgumentToGetExportedValue_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.GetExportedValue((ExportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_WrongDefinitionAsDefinitionArgumentToGetExportedValue_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            var definition = ExportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_NullAsDefinitionArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.SetImport((ImportDefinition)null, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_NullAsExportsArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, (IEnumerable<Export>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_ExportsArrayWithNullElementAsExportsArgumentToSetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, new Export[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_WrongDefinitionAsDefinitionArgumentToSetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.SetImport(definition, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AddExportedValue_ReturnedComposablePart_ContainsExportDefinitionRepresentingExport()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddExportedValue("Contract", "Value");\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            var definition = part.ExportDefinitions.Single();\r
-\r
-            Assert.AreEqual("Contract", definition.ContractName);\r
-            Assert.AreEqual("Value", part.GetExportedValue(definition));\r
-            Assert.AreEqual(1, definition.Metadata.Count); // containts type identity\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AddPart_Int32ValueTypeAsAttributedPartArgument_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("attributedPart", () =>\r
-            {\r
-                batch.AddPart((object)10);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_ReturnedComposablePart_NullAsDefinitionArgumentToGetExportedValue_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddPart(new Int32Importer());\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.GetExportedValue((ExportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_ReturnedComposablePart_WrongDefinitionAsDefinitionArgumentToGetExportedValue_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddPart(new Int32Importer());\r
-            var definition = ExportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_ReturnedComposablePart_NullAsDefinitionArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddPart(new Int32Importer());\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.SetImport((ImportDefinition)null, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_ReturnedComposablePart_NullAsExportsArgumentToSetImports_ShouldThrowArgumentNull()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddPart(new Int32Importer());\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, (IEnumerable<Export>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_ReturnedComposablePart_ExportsArrayWithNullElementAsExportsArgumentToSetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddPart(new Int32Importer());\r
-            var definition = part.ImportDefinitions.First();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, new Export[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddPart_ReturnedComposablePart_WrongDefinitionAsDefinitionArgumentToSetImports_ShouldThrowArgument()\r
-        {\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var part = batch.AddPart(new Int32Importer());\r
-            var definition = ImportDefinitionFactory.Create();\r
-            Assert.AreEqual(1, batch.PartsToAdd.Count);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.SetImport(definition, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        private Export GetSingleLazy<T>(ComposablePart part)\r
-        {\r
-            return this.GetSingleExport(part, AttributedModelServices.GetContractName(typeof(T)));\r
-        }\r
-\r
-        private Export GetSingleExport(ComposablePart part, string contractName)\r
-        {\r
-            Assert.IsNotNull(part);\r
-            Assert.AreEqual(0, part.Metadata.Count);\r
-            Assert.AreEqual(1, part.ExportDefinitions.Count());\r
-            Assert.AreEqual(0, part.ImportDefinitions.Count());\r
-            ExportDefinition exportDefinition = part.ExportDefinitions.First();\r
-            Assert.AreEqual(contractName, exportDefinition.ContractName);\r
-\r
-            part.Activate();\r
-\r
-            return new Export(exportDefinition, () => part.GetExportedValue(exportDefinition));\r
-        }\r
-\r
-\r
-        private static string NameForType<T>()\r
-        {\r
-            return AttributedModelServices.GetContractName(typeof(T));\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CompositionTransactionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/CompositionTransactionTests.cs
deleted file mode 100644 (file)
index cf1dd30..0000000
+++ /dev/null
@@ -1,516 +0,0 @@
-using System;\r
-using System.Text;\r
-using System.Reflection;\r
-using System.Collections.Generic;\r
-\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    [TestClass]\r
-    public class AtomicCompositionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1()\r
-        {\r
-            var ct = new AtomicComposition();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2()\r
-        {\r
-            // Null should be allowed\r
-            var ct = new AtomicComposition(null);\r
-\r
-            // Another AtomicComposition should be allowed\r
-            var ct2 = new AtomicComposition(ct);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_MultipleTimes()\r
-        {\r
-            var outer = new AtomicComposition();\r
-\r
-            var ct1 = new AtomicComposition(outer);\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() => new AtomicComposition(outer));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_AllMethodsShouldThrow()\r
-        {\r
-            var ct = new AtomicComposition();\r
-\r
-            ct.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(ct, () => ct.AddCompleteAction(() => ct = null));\r
-            ExceptionAssert.ThrowsDisposed(ct, () => ct.Complete());\r
-            ExceptionAssert.ThrowsDisposed(ct, () => ct.SetValue(ct, 10));\r
-            object value;\r
-            ExceptionAssert.ThrowsDisposed(ct, () => ct.TryGetValue(ct, out value));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AfterComplete_AllMethodsShouldThrow()\r
-        {\r
-            var ct = new AtomicComposition();\r
-\r
-            ct.Complete();\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() => ct.AddCompleteAction(() => ct = null));\r
-            ExceptionAssert.Throws<InvalidOperationException>(() => ct.Complete());\r
-            ExceptionAssert.Throws<InvalidOperationException>(() => ct.SetValue(ct, 10));\r
-            object value;\r
-            ExceptionAssert.Throws<InvalidOperationException>(() => ct.TryGetValue(ct, out value));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetValue_ToNull_ShouldBeAllowed()\r
-        {\r
-            var ct = new AtomicComposition();\r
-\r
-            ct.SetValue(ct, null);\r
-\r
-            object value = new object();\r
-\r
-            Assert.IsTrue(ct.TryGetValue(ct, out value));\r
-            Assert.IsNull(value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetValue_ValueType_ShouldBeAllowed()\r
-        {\r
-            var ct = new AtomicComposition();\r
-\r
-            ct.SetValue(ct, 45);\r
-\r
-            int value;\r
-\r
-            Assert.IsTrue(ct.TryGetValue(ct, out value));\r
-            Assert.AreEqual(45, value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetValue_Reference_ShouldBeAllowed()\r
-        {\r
-            var ct = new AtomicComposition();\r
-\r
-            var sb = new StringBuilder();\r
-            ct.SetValue(ct, sb);\r
-\r
-            StringBuilder value;\r
-\r
-            Assert.IsTrue(ct.TryGetValue(ct, out value));\r
-            Assert.AreEqual(sb, value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetValue_CauseResize_ShouldWorkFine()\r
-        {\r
-            var ct = new AtomicComposition();\r
-\r
-            var keys = new List<object>();\r
-            var values = new List<object>();\r
-\r
-\r
-            for (int i = 0; i < 20; i++)\r
-            {\r
-                var key = new object();\r
-                keys.Add(key);\r
-                values.Add(i);\r
-                ct.SetValue(key, i);\r
-            }\r
-\r
-            for (int i = 0; i < keys.Count; i++)\r
-            {\r
-                object value;\r
-                Assert.IsTrue(ct.TryGetValue(keys[i], out value));\r
-                Assert.AreEqual(i, value);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetValue_ChangeOuterValuesWhileHaveInner_ShouldThrow()\r
-        {\r
-            var ct = new AtomicComposition();\r
-\r
-            var ct2 = new AtomicComposition(ct);\r
-\r
-            var key = new object();\r
-            ExceptionAssert.Throws<InvalidOperationException>(() => ct.SetValue(key, 1));\r
-\r
-            object value;\r
-            Assert.IsFalse(ct2.TryGetValue(key, out value));\r
-            Assert.IsFalse(ct.TryGetValue(key, out value));\r
-\r
-            // remove the inner atomicComposition so the outer one becomes unlocked.\r
-            ct2.Dispose();\r
-\r
-            ct.SetValue(key, 2);\r
-            Assert.IsTrue(ct.TryGetValue(key, out value));\r
-            Assert.AreEqual(2, value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Complete_ShouldExecuteActions()\r
-        {\r
-            bool executedAction = false;\r
-\r
-            var ct = new AtomicComposition();\r
-\r
-            ct.AddCompleteAction(() => executedAction = true);\r
-\r
-            ct.Complete();\r
-\r
-            Assert.IsTrue(executedAction);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Complete_ShouldCopyActionsToInner()\r
-        {\r
-            bool executedAction = false;\r
-\r
-            var innerAtomicComposition = new AtomicComposition();\r
-\r
-            using (var ct = new AtomicComposition(innerAtomicComposition))\r
-            {\r
-                ct.AddCompleteAction(() => executedAction = true);\r
-\r
-                ct.Complete();\r
-                Assert.IsFalse(executedAction, "Action should not have been exectued yet");\r
-            }\r
-\r
-            innerAtomicComposition.Complete();\r
-            Assert.IsTrue(executedAction);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Complete_ShouldCopyValuesToInner()\r
-        {\r
-            var innerAtomicComposition = new AtomicComposition();\r
-\r
-            object value;\r
-            using (var ct = new AtomicComposition(innerAtomicComposition))\r
-            {\r
-                ct.SetValue(this, 21);\r
-\r
-                Assert.IsFalse(innerAtomicComposition.TryGetValue(this, out value));\r
-\r
-                ct.Complete();\r
-\r
-                Assert.IsTrue(innerAtomicComposition.TryGetValue(this, out value));\r
-                Assert.AreEqual(21, value);\r
-            }\r
-\r
-            // reverify after dispose\r
-            Assert.IsTrue(innerAtomicComposition.TryGetValue(this, out value));\r
-            Assert.AreEqual(21, value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NoComplete_ShouldNotCopyActionsToInner()\r
-        {\r
-            bool executedAction = false;\r
-\r
-            var innerAtomicComposition = new AtomicComposition();\r
-\r
-            using (var ct = new AtomicComposition(innerAtomicComposition))\r
-            {\r
-                ct.AddCompleteAction(() => executedAction = true);\r
-\r
-                Assert.IsFalse(executedAction, "Action should not have been exectued yet");\r
-\r
-                // Do not complete\r
-            }\r
-\r
-            innerAtomicComposition.Complete();\r
-            Assert.IsFalse(executedAction);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NoComplete_ShouldNotCopyValuesToInner()\r
-        {\r
-            var innerAtomicComposition = new AtomicComposition();\r
-\r
-            object value;\r
-            using (var ct = new AtomicComposition(innerAtomicComposition))\r
-            {\r
-                ct.SetValue(this, 21);\r
-\r
-                Assert.IsFalse(innerAtomicComposition.TryGetValue(this, out value));\r
-\r
-                // Do not call complete\r
-            }\r
-\r
-            // reverify after dispose\r
-            Assert.IsFalse(innerAtomicComposition.TryGetValue(this, out value));\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AtomicComposition_CompleteActions()\r
-        {\r
-            var setMe = false;\r
-            var setMeToo = false;\r
-            var dontSetMe = false;\r
-            using (var contextA = new AtomicComposition())\r
-            {\r
-                contextA.AddCompleteAction(() => setMe = true);\r
-                using (var contextB = new AtomicComposition(contextA))\r
-                {\r
-                    contextB.AddCompleteAction(() => setMeToo = true);\r
-                    contextB.Complete();\r
-                }\r
-\r
-                using (var contextC = new AtomicComposition(contextA))\r
-                {\r
-                    contextC.AddCompleteAction(() => dontSetMe = true);\r
-                    // Don't complete\r
-                }\r
-                Assert.IsFalse(setMe);\r
-                Assert.IsFalse(setMeToo);\r
-                Assert.IsFalse(dontSetMe);\r
-\r
-                contextA.Complete();\r
-\r
-                Assert.IsTrue(setMe);\r
-                Assert.IsTrue(setMeToo);\r
-                Assert.IsFalse(dontSetMe);\r
-            }\r
-        }\r
-\r
-        private void TestNoValue(AtomicComposition context, object key)\r
-        {\r
-            string value;\r
-            Assert.IsFalse(context.TryGetValue(key, out value));\r
-        }\r
-\r
-        private void TestValue(AtomicComposition context, object key, string expectedValue)\r
-        {\r
-            string value;\r
-            Assert.IsTrue(context.TryGetValue(key, out value));\r
-            Assert.AreEqual(expectedValue, value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AtomicComposition_CompleteValues()\r
-        {\r
-            object key1 = new Object();\r
-            object key2 = new Object();\r
-\r
-            using (var contextA = new AtomicComposition())\r
-            {\r
-                TestNoValue(contextA, key1);\r
-                TestNoValue(contextA, key2);\r
-                contextA.SetValue(key1, "Hello");\r
-                TestValue(contextA, key1, "Hello");\r
-                TestNoValue(contextA, key2);\r
-\r
-                // Try overwriting\r
-                using (var contextB = new AtomicComposition(contextA))\r
-                {\r
-                    TestValue(contextB, key1, "Hello");\r
-                    TestNoValue(contextB, key2);\r
-                    contextB.SetValue(key1, "Greetings");\r
-                    TestValue(contextB, key1, "Greetings");\r
-                    TestNoValue(contextB, key2);\r
-\r
-                    contextB.Complete();\r
-                }\r
-                TestValue(contextA, key1, "Greetings");\r
-                TestNoValue(contextA, key2);\r
-\r
-                // Try overwrite with revert\r
-                using (var contextC = new AtomicComposition(contextA))\r
-                {\r
-                    TestValue(contextC, key1, "Greetings");\r
-                    TestNoValue(contextC, key2);\r
-                    contextC.SetValue(key1, "Goodbye");\r
-                    contextC.SetValue(key2, "Goodbye, Again");\r
-                    TestValue(contextC, key1, "Goodbye");\r
-                    TestValue(contextC, key2, "Goodbye, Again");\r
-\r
-                    // Don't complete\r
-                }\r
-                TestValue(contextA, key1, "Greetings");\r
-                TestNoValue(contextA, key2);\r
-\r
-                contextA.Complete();\r
-            }\r
-        }\r
-\r
-        private void TestQuery(AtomicComposition context, object key, int parameter, bool expectation)\r
-        {\r
-            Func<int, bool> query;\r
-            if (context.TryGetValue(key, out query))\r
-                Assert.AreEqual(expectation, query(parameter));\r
-        }\r
-\r
-        private void SetQuery(AtomicComposition context, object key, Func<int, Func<int, bool>, bool> query)\r
-        {\r
-            Func<int, bool> parentQuery;\r
-            context.TryGetValue(key, out parentQuery);\r
-            Func<int, bool> queryFunction = parameter => { return query(parameter, parentQuery); };\r
-            context.SetValue(key, queryFunction);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AtomicComposition_NestedQueries()\r
-        {\r
-            // This is a rather convoluted test that exercises the way AtomicComposition used to work to\r
-            // ensure consistency of the newer design\r
-            var key = new Object();\r
-\r
-            using (var contextA = new AtomicComposition())\r
-            {\r
-                SetQuery(contextA, key, (int parameter, Func<int, bool> parentQuery) =>\r
-                {\r
-                    if (parameter == 22)\r
-                        return true;\r
-                    if (parentQuery != null)\r
-                        return parentQuery(parameter);\r
-                    return false;\r
-                });\r
-                TestQuery(contextA, key, 22, true);\r
-\r
-                using (var contextB = new AtomicComposition(contextA))\r
-                {\r
-                    TestQuery(contextB, key, 22, true);\r
-                    SetQuery(contextB, key, (int parameter, Func<int, bool> parentQuery) =>\r
-                    {\r
-                        if (parentQuery != null)\r
-                            return !parentQuery(parameter);\r
-                        Assert.Fail(); // Should never have no parent\r
-                        return false;\r
-                    });\r
-                    TestQuery(contextB, key, 21, true);\r
-                    TestQuery(contextB, key, 22, false);\r
-\r
-                    using (var contextC = new AtomicComposition(contextB))\r
-                    {\r
-                        SetQuery(contextC, key, (int parameter, Func<int, bool> parentQuery) =>\r
-                        {\r
-                            if (parameter == 23)\r
-                                return true;\r
-                            if (parentQuery != null)\r
-                                return !parentQuery(parameter);\r
-                            Assert.Fail(); // Should never have no parent\r
-                            return false;\r
-                        });\r
-                        TestQuery(contextC, key, 21, false);\r
-                        TestQuery(contextC, key, 22, true);\r
-                        TestQuery(contextC, key, 23, true);\r
-                        contextC.Complete();\r
-                    }\r
-\r
-                    using (var contextD = new AtomicComposition(contextB))\r
-                    {\r
-                        SetQuery(contextD, key, (int parameter, Func<int, bool> parentQuery) =>\r
-                        {\r
-                            if (parentQuery != null)\r
-                                return parentQuery(parameter + 1);\r
-                            Assert.Fail(); // Should never have no parent\r
-                            return false;\r
-                        });\r
-                        TestQuery(contextD, key, 21, true);\r
-                        TestQuery(contextD, key, 22, true);\r
-                        TestQuery(contextD, key, 23, false);\r
-                        // No complete\r
-                    }\r
-\r
-                    contextB.Complete();\r
-                }\r
-                TestQuery(contextA, key, 21, false);\r
-                TestQuery(contextA, key, 22, true);\r
-                TestQuery(contextA, key, 23, true);\r
-                contextA.Complete();\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddRevertAction_ShouldExecuteWhenDisposedAndNotCompleteted()\r
-        {\r
-            var ct = new AtomicComposition();\r
-            bool executed = false;\r
-\r
-            ct.AddRevertAction(() => executed = true);\r
-\r
-            ct.Dispose();\r
-\r
-            Assert.IsTrue(executed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddRevertAction_ShouldNotExecuteWhenCompleteted()\r
-        {\r
-            var ct = new AtomicComposition();\r
-            bool executed = false;\r
-\r
-            ct.AddRevertAction(() => executed = true);\r
-\r
-            ct.Complete();\r
-\r
-            Assert.IsFalse(executed);\r
-\r
-            ct.Dispose();\r
-\r
-            Assert.IsFalse(executed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddRevertAction_ShouldExecuteInReverseOrder()\r
-        {\r
-            var ct = new AtomicComposition();\r
-            Stack<int> stack = new Stack<int>();\r
-            stack.Push(1);\r
-            stack.Push(2);\r
-            stack.Push(3);\r
-\r
-            ct.AddRevertAction(() => Assert.AreEqual(1, stack.Pop()));\r
-            ct.AddRevertAction(() => Assert.AreEqual(2, stack.Pop()));\r
-            ct.AddRevertAction(() => Assert.AreEqual(3, stack.Pop()));\r
-\r
-            ct.Dispose();\r
-\r
-            Assert.IsTrue(stack.Count == 0);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddRevertAction_ShouldBeCopiedWhenCompleteed()\r
-        {\r
-            Stack<int> stack = new Stack<int>();\r
-            stack.Push(1);\r
-            stack.Push(2);\r
-            stack.Push(11);\r
-            stack.Push(12);\r
-            stack.Push(3);\r
-\r
-            using (var ct = new AtomicComposition())\r
-            {\r
-                ct.AddRevertAction(() => Assert.AreEqual(1, stack.Pop()));\r
-                ct.AddRevertAction(() => Assert.AreEqual(2, stack.Pop()));\r
-\r
-                using (var ct2 = new AtomicComposition(ct))\r
-                {\r
-                    ct2.AddRevertAction(() => Assert.AreEqual(11, stack.Pop()));\r
-                    ct2.AddRevertAction(() => Assert.AreEqual(12, stack.Pop()));\r
-\r
-                    // completeting should move those revert actions to ct\r
-                    ct2.Complete();\r
-\r
-                    Assert.AreEqual(5, stack.Count);\r
-                }\r
-\r
-                ct.AddRevertAction(() => Assert.AreEqual(3, stack.Pop()));\r
-\r
-                // Do not complete let ct dispose and revert\r
-            }\r
-\r
-            Assert.IsTrue(stack.Count == 0);\r
-        }\r
-\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/DirectoryCatalogDebuggerProxyTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/DirectoryCatalogDebuggerProxyTests.cs
deleted file mode 100644 (file)
index 9dfd415..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.IO;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using System.Reflection;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    [TestClass]\r
-    public class DirectoryCatalogDebuggerProxyTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsCatalogArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("catalog", () =>\r
-            {\r
-                new DirectoryCatalog.DirectoryCatalogDebuggerProxy((DirectoryCatalog)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsCatalogArgument_ShouldSetPartsProperty()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                using (TemporaryFileCopier copier = new TemporaryFileCopier(e.Location))\r
-                {\r
-                    var catalog = CreateDirectoryCatalog(copier.DirectoryPath);\r
-\r
-                    var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(catalog);\r
-\r
-                    EnumerableAssert.AreSequenceEqual(catalog.Parts, proxy.Parts);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsCatalogArgument_ShouldSetAssemblyProperty()\r
-        {\r
-            var expectations = Expectations.GetAssemblies();\r
-\r
-            using (TemporaryFileCopier copier = new TemporaryFileCopier(expectations.Select(assembly => assembly.Location).ToArray()))\r
-            {\r
-                var catalog = CreateDirectoryCatalog(copier.DirectoryPath);\r
-                var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(catalog);\r
-\r
-                EnumerableAssert.AreEqual(expectations, proxy.Assemblies);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constuctor_ValueAsCatalogArgument_ShouldSetPathProperty()\r
-        {\r
-            string path = FileIO.GetNewTemporaryDirectory();\r
-\r
-            var catalog = CreateDirectoryCatalog(path);\r
-            var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(catalog);\r
-\r
-            Assert.AreEqual(path, proxy.Path);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constuctor_ValueAsCatalogArgument_ShouldSetSearchPatternProperty()\r
-        {\r
-            using (TemporaryDirectory directory = new TemporaryDirectory())\r
-            {\r
-                var expectations = new ExpectationCollection<string, string>();\r
-\r
-                expectations.Add("*.*", "*.*");\r
-                expectations.Add("*.doc", "*.doc");\r
-                expectations.Add("*.exe", "*.exe");\r
-                expectations.Add("*.dll", "*.dll");\r
-\r
-                foreach (var e in expectations)\r
-                {\r
-                    var catalog = CreateDirectoryCatalog(directory.DirectoryPath, e.Input);\r
-                    var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(catalog);\r
-\r
-                    Assert.AreEqual(e.Output, proxy.SearchPattern);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FullPath_ValidPath_ShouldBeFine()\r
-        {\r
-            using (TemporaryDirectory directory = new TemporaryDirectory())\r
-            {\r
-                var expectations = new ExpectationCollection<string, string>();\r
-\r
-                // Ensure the path is always normalized properly.\r
-                string rootTempPath = Path.GetFullPath(FileIO.GetRootTemporaryDirectory()).ToUpperInvariant();\r
-\r
-                // Note: These relative paths work properly because the unit test temporary directories are always\r
-                // created as a subfolder off the AppDomain.CurrentDomain.BaseDirectory.\r
-                expectations.Add(".", Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ".")).ToUpperInvariant());\r
-                expectations.Add(FileIO.RootTemporaryDirectoryName, rootTempPath);\r
-                expectations.Add(FileIO.GetRootTemporaryDirectory(), rootTempPath);\r
-                expectations.Add(directory.DirectoryPath, Path.GetFullPath(directory.DirectoryPath).ToUpperInvariant());\r
-\r
-                foreach (var e in expectations)\r
-                {\r
-                    var cat = CreateDirectoryCatalog(e.Input, DirectoryCatalogTests.NonExistentSearchPattern);\r
-                    var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(cat);\r
-\r
-                    Assert.AreEqual(e.Output, proxy.FullPath);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void LoadedFiles_EmptyDirectory_ShouldBeFine()\r
-        {\r
-            using (var directory = new TemporaryDirectory())\r
-            {\r
-                var cat = CreateDirectoryCatalog(directory.DirectoryPath);\r
-                var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(cat);\r
-\r
-                Assert.AreEqual(0, proxy.LoadedFiles.Count);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void LoadedFiles_ContainsMultipleDllsAndSomeNonDll_ShouldOnlyContainDlls()\r
-        {\r
-            using (var directory = new TemporaryDirectory())\r
-            {\r
-                // Add one text file\r
-                using (File.CreateText(Path.Combine(directory.DirectoryPath, "Test.txt"))) { }\r
-\r
-                // Add two dll's\r
-                string dll1 = Path.Combine(directory.DirectoryPath, "Test1.dll");\r
-                string dll2 = Path.Combine(directory.DirectoryPath, "Test2.dll");\r
-                File.Copy(Assembly.GetExecutingAssembly().Location, dll1);\r
-                File.Copy(Assembly.GetExecutingAssembly().Location, dll2);\r
-\r
-                var cat = CreateDirectoryCatalog(directory.DirectoryPath);\r
-                var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(cat);\r
-\r
-                CollectionAssert.AreEquivalent(new string[] { dll1.ToUpperInvariant(), dll2.ToUpperInvariant() },\r
-                    proxy.LoadedFiles);\r
-            }\r
-        }\r
-\r
-        private DirectoryCatalog.DirectoryCatalogDebuggerProxy CreateAssemblyDebuggerProxy(DirectoryCatalog catalog)\r
-        {\r
-            return new DirectoryCatalog.DirectoryCatalogDebuggerProxy(catalog);\r
-        }\r
-\r
-        private DirectoryCatalog CreateDirectoryCatalog(string path)\r
-        {\r
-            return new DirectoryCatalog(path);\r
-        }\r
-\r
-        private DirectoryCatalog CreateDirectoryCatalog(string path, string filter)\r
-        {\r
-            return new DirectoryCatalog(path, filter);\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs
deleted file mode 100644 (file)
index 3639a80..0000000
+++ /dev/null
@@ -1,543 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class DirectoryCatalogTests\r
-    {\r
-        internal const string NonExistentSearchPattern = "*.NonExistentSearchPattern";\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ShouldIncludeCatalogTypeNameAndDirectoryPath()\r
-        {\r
-            var paths = GetPathExpectations();\r
-\r
-            foreach (var path in paths)\r
-            {\r
-                var catalog = (ICompositionElement)CreateDirectoryCatalog(path, NonExistentSearchPattern);\r
-\r
-                string expected = string.Format("DirectoryCatalog (Path=\"{0}\")", path);\r
-\r
-                Assert.AreEqual(expected, catalog.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ShouldIncludeDerivedCatalogTypeNameAndAssemblyFullName()\r
-        {\r
-            var paths = GetPathExpectations();\r
-\r
-            foreach (var path in paths)\r
-            {\r
-                var catalog = (ICompositionElement)new DerivedDirectoryCatalog(path, NonExistentSearchPattern);\r
-\r
-                string expected = string.Format("DerivedDirectoryCatalog (Path=\"{0}\")", path);\r
-\r
-                Assert.AreEqual(expected, catalog.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnICompositionElementDisplayName()\r
-        {\r
-            var paths = GetPathExpectations();\r
-\r
-            foreach (var path in paths)\r
-            {\r
-                var catalog = (ICompositionElement)CreateDirectoryCatalog(path, NonExistentSearchPattern);\r
-\r
-                Assert.AreEqual(catalog.DisplayName, catalog.ToString());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-            catalog.Dispose();\r
-\r
-            var displayName = ((ICompositionElement)catalog).DisplayName;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementOrigin_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-            catalog.Dispose();\r
-\r
-            var origin = ((ICompositionElement)catalog).Origin;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Parts_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-            catalog.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                var parts = catalog.Parts;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-            catalog.Dispose();\r
-            var definition = ImportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                catalog.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Refresh_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-            catalog.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                catalog.Refresh();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-            catalog.Dispose();\r
-\r
-            catalog.ToString();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_NullAsConstraintArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                catalog.GetExports((ImportDefinition)null);\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Dispose_ShouldNotThrow()\r
-        {\r
-            using (var catalog = CreateDirectoryCatalog())\r
-            {\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CanBeCalledMultipleTimes()\r
-        {\r
-            var catalog = CreateDirectoryCatalog();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AddAssembly1_NonExistentUriAsAssemblyFileNameArgument_ShouldNotSupportedException()\r
-        {\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                var catalog = new DirectoryCatalog("http://microsoft.com/myassembly.dll");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddAssembly1_NullPathArgument_ShouldThrowArugmentNull()\r
-        {\r
-            ExceptionAssert.Throws<ArgumentNullException>(() =>\r
-                new DirectoryCatalog((string)null));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddAssembly1_EmptyPathArgument_ShouldThrowArugment()\r
-        {\r
-            ExceptionAssert.Throws<ArgumentException>(() =>\r
-                new DirectoryCatalog(""));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddAssembly1_InvalidPathName_ShouldThrowDirectoryNotFound()\r
-        {\r
-            ExceptionAssert.Throws<ArgumentException>(() =>\r
-            {\r
-                var c1 = new DirectoryCatalog("*");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddAssembly1_TooLongPathNameArgument_ShouldThrowPathTooLongException()\r
-        {\r
-            ExceptionAssert.Throws<PathTooLongException>(() =>\r
-            {\r
-                var c1 = new DirectoryCatalog(@"c:\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\myassembly.dll");\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Parts()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                var catalog = new DirectoryCatalog(directory.DirectoryPath);\r
-                Assert.IsNotNull(catalog.Parts);\r
-                Assert.IsTrue(catalog.Parts.Count() > 0);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Parts_ShouldSetDefinitionOriginToCatalogItself()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                var catalog = new DirectoryCatalog(directory.DirectoryPath);\r
-                Assert.IsTrue(catalog.Parts.Count() > 0);\r
-\r
-                foreach (ICompositionElement definition in catalog.Parts)\r
-                {\r
-                    Assert.AreSame(catalog, definition.Origin);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Path_ValidPath_ShouldBeFine()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                var expectations = new ExpectationCollection<string, string>();\r
-\r
-                expectations.Add(".", ".");\r
-                expectations.Add(FileIO.RootTemporaryDirectoryName, FileIO.RootTemporaryDirectoryName);\r
-                expectations.Add(FileIO.GetRootTemporaryDirectory(), FileIO.GetRootTemporaryDirectory());\r
-                expectations.Add(directory.DirectoryPath, directory.DirectoryPath);\r
-\r
-                foreach (var e in expectations)\r
-                {\r
-                    var cat = CreateDirectoryCatalog(e.Input, NonExistentSearchPattern);\r
-\r
-                    Assert.AreEqual(e.Output, cat.Path);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FullPath_ValidPath_ShouldBeFine()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                var expectations = new ExpectationCollection<string, string>();\r
-\r
-                // Ensure the path is always normalized properly.\r
-                string rootTempPath = Path.GetFullPath(FileIO.GetRootTemporaryDirectory()).ToUpperInvariant();\r
-\r
-                // Note: These relative paths work properly because the unit test temporary directories are always\r
-                // created as a subfolder off the AppDomain.CurrentDomain.BaseDirectory.\r
-                expectations.Add(".", Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ".")).ToUpperInvariant());\r
-                expectations.Add(FileIO.RootTemporaryDirectoryName, rootTempPath);\r
-                expectations.Add(FileIO.GetRootTemporaryDirectory(), rootTempPath);\r
-                expectations.Add(directory.DirectoryPath, Path.GetFullPath(directory.DirectoryPath).ToUpperInvariant());\r
-\r
-                foreach (var e in expectations)\r
-                {\r
-                    var cat = CreateDirectoryCatalog(e.Input, NonExistentSearchPattern);\r
-\r
-                    Assert.AreEqual(e.Output, cat.FullPath);\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void LoadedFiles_EmptyDirectory_ShouldBeFine()\r
-        {\r
-            using (var directory = new TemporaryDirectory())\r
-            {\r
-                var cat = new DirectoryCatalog(directory.DirectoryPath);\r
-\r
-                Assert.AreEqual(0, cat.LoadedFiles.Count);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void LoadedFiles_ContainsMultipleDllsAndSomeNonDll_ShouldOnlyContainDlls()\r
-        {\r
-            using (var directory = new TemporaryDirectory())\r
-            {\r
-                // Add one text file\r
-                using (File.CreateText(Path.Combine(directory.DirectoryPath, "Test.txt"))) { }\r
-\r
-                // Add two dll's\r
-                string dll1 = Path.Combine(directory.DirectoryPath, "Test1.dll");\r
-                string dll2 = Path.Combine(directory.DirectoryPath, "Test2.dll");\r
-                File.Copy(Assembly.GetExecutingAssembly().Location, dll1);\r
-                File.Copy(Assembly.GetExecutingAssembly().Location, dll2);\r
-\r
-                var cat = new DirectoryCatalog(directory.DirectoryPath);\r
-\r
-                CollectionAssert.AreEquivalent(new string[] { dll1.ToUpperInvariant(), dll2.ToUpperInvariant() },\r
-                    cat.LoadedFiles);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_InvalidAssembly_ShouldBeFine()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                using (File.CreateText(Path.Combine(directory.DirectoryPath, "Test.dll"))) { }\r
-                var cat = new DirectoryCatalog(directory.DirectoryPath);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_NonExistentDirectory_ShouldThrow()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                ExceptionAssert.Throws<DirectoryNotFoundException>( () =>\r
-                    new DirectoryCatalog(directory.DirectoryPath + @"\NonexistentDirectoryWithoutEndingSlash"));\r
-\r
-                ExceptionAssert.Throws<DirectoryNotFoundException>( () =>\r
-                    new DirectoryCatalog(directory.DirectoryPath + @"\NonexistentDirectoryWithEndingSlash\"));\r
-\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassExistingFileName_ShouldThrow()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                using (File.CreateText(Path.Combine(directory.DirectoryPath, "Test.txt"))) { }\r
-                ExceptionAssert.Throws<IOException>(() =>\r
-                    new DirectoryCatalog(Path.Combine(directory.DirectoryPath, "Test.txt")));\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassNonExistingFileName_ShouldThrow()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                ExceptionAssert.Throws<DirectoryNotFoundException>(() =>\r
-                    new DirectoryCatalog(Path.Combine(directory.DirectoryPath, "NonExistingFile.txt")));\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Refresh_AssemblyAdded_ShouldFireOnChanged()\r
-        {\r
-            using (var directory = new TemporaryDirectory())\r
-            {\r
-                bool changedFired = false;\r
-                bool changingFired = false;\r
-                var cat = new DirectoryCatalog(directory.DirectoryPath);\r
-\r
-                Assert.AreEqual(0, cat.Parts.Count(), "Catalog should initially be empty");\r
-\r
-                cat.Changing += new EventHandler<ComposablePartCatalogChangeEventArgs>((o, e) =>\r
-                    {\r
-                        Assert.AreEqual(0, cat.Parts.Count(), "Catalog changes should NOT have been completeed yet");\r
-                        changingFired = true;\r
-                    });\r
-\r
-                cat.Changed += new EventHandler<ComposablePartCatalogChangeEventArgs>((o, e) =>\r
-                    {\r
-                        Assert.AreNotEqual(0, cat.Parts.Count(), "Catalog changes should have been completeed");\r
-                        changedFired = true;\r
-                    });\r
-\r
-\r
-                File.Copy(Assembly.GetExecutingAssembly().Location, Path.Combine(directory.DirectoryPath, "Test.dll"));\r
-\r
-                cat.Refresh();\r
-\r
-                Assert.IsTrue(changingFired);\r
-                Assert.IsTrue(changedFired);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Refresh_AssemblyRemoved_ShouldFireOnChanged()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                string file = Path.Combine(directory.DirectoryPath, "Test.dll");\r
-                File.Copy(Assembly.GetExecutingAssembly().Location, file);\r
-                bool changedFired = false;\r
-                var cat = new DirectoryCatalog(directory.DirectoryPath);\r
-\r
-                cat.Changed += new EventHandler<ComposablePartCatalogChangeEventArgs>((o, e) =>\r
-                    changedFired = true);\r
-\r
-                // This assembly can be deleted because it was already loaded by the CLR in another context\r
-                // in another location so it isn't locked on disk.\r
-                File.Delete(file);\r
-\r
-                cat.Refresh();\r
-\r
-                Assert.IsTrue(changedFired);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Refresh_NoChanges_ShouldNotFireOnChanged()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                var cat = new DirectoryCatalog(directory.DirectoryPath);\r
-\r
-                cat.Changed += new EventHandler<ComposablePartCatalogChangeEventArgs>((o, e) =>\r
-                    Assert.Fail("Should not recieve any change notifications"));\r
-\r
-                cat.Refresh();\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Refresh_DirectoryRemoved_ShouldThrowDirectoryNotFound()\r
-        {\r
-            DirectoryCatalog cat;\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                cat = new DirectoryCatalog(directory.DirectoryPath);\r
-            }\r
-\r
-            ExceptionAssert.Throws<DirectoryNotFoundException>(RetryMode.DoNotRetry, () =>\r
-                cat.Refresh());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                var catalog = new AggregateCatalog();\r
-                Expression<Func<ExportDefinition, bool>> constraint = (ExportDefinition exportDefinition) => exportDefinition.ContractName == AttributedModelServices.GetContractName(typeof(MyExport));\r
-                IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> matchingExports = null;\r
-    \r
-                matchingExports = catalog.GetExports(constraint);\r
-                Assert.IsNotNull(matchingExports);\r
-                Assert.IsTrue(matchingExports.Count() == 0);\r
-\r
-                var testsDirectoryCatalog = new DirectoryCatalog(directory.DirectoryPath);\r
-                catalog.Catalogs.Add(testsDirectoryCatalog);\r
-                matchingExports = catalog.GetExports(constraint);\r
-\r
-                Assert.IsNotNull(matchingExports);\r
-                Assert.IsTrue(matchingExports.Count() >= 0);\r
-\r
-                IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> expectedMatchingExports = catalog.Parts\r
-                    .SelectMany(part => part.ExportDefinitions, (part, export) => new Tuple<ComposablePartDefinition, ExportDefinition>(part, export))\r
-                    .Where(partAndExport => partAndExport.Item2.ContractName == AttributedModelServices.GetContractName(typeof(MyExport)));\r
-\r
-                Assert.IsTrue(matchingExports.SequenceEqual(expectedMatchingExports));\r
-\r
-                catalog.Catalogs.Remove(testsDirectoryCatalog);\r
-                matchingExports = catalog.GetExports(constraint);\r
-                Assert.IsNotNull(matchingExports);\r
-                Assert.IsTrue(matchingExports.Count() == 0);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddAndRemoveDirectory()\r
-        {\r
-            using (var directory = CreateTemporaryDirectory())\r
-            {\r
-                var cat = new AggregateCatalog();\r
-                var container = new CompositionContainer(cat);\r
-\r
-                Assert.IsFalse(container.IsPresent<MyExport>());\r
-\r
-                var dir1 = new DirectoryCatalog(directory.DirectoryPath);\r
-                cat.Catalogs.Add(dir1);\r
-                Assert.IsTrue(container.IsPresent<MyExport>());\r
-\r
-                cat.Catalogs.Remove(dir1);\r
-\r
-                Assert.IsFalse(container.IsPresent<MyExport>());\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddDirectoryNotFoundException()\r
-        {\r
-            ExceptionAssert.Throws<DirectoryNotFoundException>(() =>\r
-            {\r
-                var cat = new DirectoryCatalog("Directory That Should Never Exist tadfasdfasdfsdf");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExecuteOnCreationThread()\r
-        {\r
-            // Add a proper test for event notification on caller thread\r
-        }\r
-\r
-\r
-        private DirectoryCatalog CreateDirectoryCatalog()\r
-        {\r
-            return CreateDirectoryCatalog(FileIO.GetNewTemporaryDirectory());\r
-        }\r
-\r
-        private DirectoryCatalog CreateDirectoryCatalog(string path)\r
-        {\r
-            return new DirectoryCatalog(path);\r
-        }\r
-\r
-        private DirectoryCatalog CreateDirectoryCatalog(string path, string searchPattern)\r
-        {\r
-            return new DirectoryCatalog(path, searchPattern);\r
-        }\r
-\r
-        private TemporaryDirectory CreateTemporaryDirectory()\r
-        {\r
-            return new TemporaryFileCopier(typeof(DirectoryCatalogTests).Assembly.Location);\r
-        }\r
-\r
-        public IEnumerable<string> GetPathExpectations()\r
-        {\r
-            yield return AppDomain.CurrentDomain.BaseDirectory;\r
-            yield return AppDomain.CurrentDomain.BaseDirectory + @"\";\r
-            yield return ".";            \r
-        }\r
-\r
-        private class DerivedDirectoryCatalog : DirectoryCatalog\r
-        {\r
-            public DerivedDirectoryCatalog(string path, string searchPattern)\r
-                : base(path, searchPattern)\r
-            {\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/ImportEngineTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/ImportEngineTests.cs
deleted file mode 100644 (file)
index 5119689..0000000
+++ /dev/null
@@ -1,567 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ImportEngineTests\r
-    {\r
-        [TestMethod]\r
-        public void PreviewImports_Successful_NoAtomicComposition_ShouldBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            engine.PreviewImports(importer, null);\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.AddExport("Value", 22));\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.RemoveExport("Value"));\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_Unsuccessful_NoAtomicComposition_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            ExceptionAssert.Throws<CompositionException>(() =>\r
-                engine.PreviewImports(importer, null));\r
-\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.AddExport("Value", 23);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_Successful_AtomicComposition_Completeted_ShouldBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                engine.PreviewImports(importer, atomicComposition);\r
-                atomicComposition.Complete();\r
-            }\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.AddExport("Value", 22));\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.RemoveExport("Value"));\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_Successful_AtomicComposition_RolledBack_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                engine.PreviewImports(importer, atomicComposition);\r
-\r
-                // Let atomicComposition get disposed thus rolledback\r
-            }\r
-\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_Unsuccessful_AtomicComposition_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                    engine.PreviewImports(importer, atomicComposition));\r
-            }\r
-\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.AddExport("Value", 23);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_ReleaseImports_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            engine.PreviewImports(importer, null);\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.AddExport("Value", 22));\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.RemoveExport("Value"));\r
-\r
-            engine.ReleaseImports(importer, null);\r
-\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_MissingOptionalImport_ShouldSucceed()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrOne);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.PreviewImports(importer, null);\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_ZeroCollectionImport_ShouldSucceed()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrMore);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.PreviewImports(importer, null);\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_MissingOptionalImport_NonRecomposable_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrOne, false, false);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.PreviewImports(importer, null);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PreviewImports_ZeroCollectionImport_NonRecomposable_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrMore, false, false);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.PreviewImports(importer, null);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_NonRecomposable_ValueShouldNotChange()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", false);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import));\r
-\r
-            // After rejection batch failures throw ChangeRejectedException to indicate that\r
-            // the failure did not affect the container\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.ReplaceExportValue("Value", 42));\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import), "Value should not change!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_Recomposable_ValueShouldChange()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", true);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import));\r
-\r
-            exportProvider.ReplaceExportValue("Value", 42);\r
-\r
-            Assert.AreEqual(42, importer.GetImport(import), "Value should change!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_NonRecomposable_Prerequisite_ValueShouldNotChange()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", false, true);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import));\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.ReplaceExportValue("Value", 42));\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import), "Value should NOT change!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_Recomposable_Prerequisite_ValueShouldChange()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", true, true);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import));\r
-\r
-            exportProvider.ReplaceExportValue("Value", 42);\r
-\r
-            Assert.AreEqual(42, importer.GetImport(import), "Value should change!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_OneRecomposable_OneNotRecomposable()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import1 = ImportDefinitionFactory.Create("Value", true);\r
-            var import2 = ImportDefinitionFactory.Create("Value", false);\r
-            var importer = PartFactory.CreateImporter(import1, import2);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            // Initial compose values should be 21\r
-            Assert.AreEqual(21, importer.GetImport(import1));\r
-            Assert.AreEqual(21, importer.GetImport(import2));\r
-\r
-            // Reset value to ensure it doesn't get set to same value again\r
-            importer.ResetImport(import1);\r
-            importer.ResetImport(import2);\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.ReplaceExportValue("Value", 42));\r
-\r
-            Assert.AreEqual(null, importer.GetImport(import1), "Value should NOT have been set!");\r
-            Assert.AreEqual(null, importer.GetImport(import2), "Value should NOT have been set!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_TwoRecomposables_SingleExportValueChanged()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import1 = ImportDefinitionFactory.Create("Value1", true);\r
-            var import2 = ImportDefinitionFactory.Create("Value2", true);\r
-            var importer = PartFactory.CreateImporter(import1, import2);\r
-\r
-            exportProvider.AddExport("Value1", 21);\r
-            exportProvider.AddExport("Value2", 23);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import1));\r
-            Assert.AreEqual(23, importer.GetImport(import2));\r
-\r
-            importer.ResetImport(import1);\r
-            importer.ResetImport(import2);\r
-\r
-            // Only change Value1 \r
-            exportProvider.ReplaceExportValue("Value1", 42);\r
-\r
-            Assert.AreEqual(42, importer.GetImport(import1), "Value should have been set!");\r
-\r
-            Assert.AreEqual(null, importer.GetImport(import2), "Value should NOT have changed to the value in the container.");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_Recomposable_Unregister_ValueShouldChangeOnce()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", true);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import));\r
-\r
-            exportProvider.ReplaceExportValue("Value", 42);\r
-\r
-            Assert.AreEqual(42, importer.GetImport(import), "Value should change!");\r
-\r
-            engine.ReleaseImports(importer, null);\r
-\r
-            exportProvider.ReplaceExportValue("Value", 666);\r
-\r
-            Assert.AreEqual(42, importer.GetImport(import), "Value should not change!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_MissingOptionalImport_NonRecomposable_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrOne, false, false);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 20);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.AddExport("Value", 21));\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.RemoveExport("Value"));\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_ZeroCollectionImport_NonRecomposable_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrMore, false, false);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 20);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.AddExport("Value", 21));\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                exportProvider.RemoveExport("Value"));\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_MissingOptionalImport_Recomposable_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrOne, true, false);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 20);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImports_ZeroCollectionImport_Recomposable_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", ImportCardinality.ZeroOrMore, true, false);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 20);\r
-\r
-            engine.SatisfyImports(importer);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImportsOnce_Recomposable_ValueShouldNotChange_NoRecompositionRequested()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", true);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.SatisfyImportsOnce(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import));\r
-\r
-            exportProvider.ReplaceExportValue("Value", 42);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import), "Value should not change!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisifyImportsOnce_Recomposable_ValueShouldNotChange_NoRecompositionRequested_ViaNonArgumentSignature()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value", true);\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            engine.SatisfyImportsOnce(importer);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import));\r
-\r
-            exportProvider.ReplaceExportValue("Value", 42);\r
-\r
-            Assert.AreEqual(21, importer.GetImport(import), "Value should not change!");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImportsOnce_Successful_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            exportProvider.AddExport("Value", 21);\r
-\r
-            engine.SatisfyImportsOnce(importer);\r
-\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SatisfyImportsOnce_Unsuccessful_ShouldNotBlockChanges()\r
-        {\r
-            var exportProvider = ExportProviderFactory.CreateRecomposable();\r
-            var engine = new ImportEngine(exportProvider);\r
-\r
-            var import = ImportDefinitionFactory.Create("Value");\r
-            var importer = PartFactory.CreateImporter(import);\r
-\r
-            ExceptionAssert.Throws<CompositionException>(() =>\r
-                engine.SatisfyImportsOnce(importer));\r
-\r
-            exportProvider.AddExport("Value", 22);\r
-            exportProvider.AddExport("Value", 23);\r
-            exportProvider.RemoveExport("Value");\r
-\r
-            GC.KeepAlive(importer);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/TypeCatalogTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Hosting/TypeCatalogTests.cs
deleted file mode 100644 (file)
index 2d14991..0000000
+++ /dev/null
@@ -1,506 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Reflection;\r
-using System.UnitTesting;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Globalization;\r
-using System.Text;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class TypeCatalogTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor2_NullAsTypesArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("types", () =>\r
-            {\r
-                new TypeCatalog((Type[])null);\r
-            });\r
-        }\r
-        \r
-        [TestMethod]\r
-        public void Constructor3_NullAsTypesArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("types", () =>\r
-            {\r
-                new TypeCatalog((IEnumerable<Type>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ArrayWithNullAsTypesArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("types", () =>\r
-            {\r
-                new TypeCatalog(new Type[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ArrayWithNullAsTypesArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("types", () =>\r
-            {\r
-                new TypeCatalog((IEnumerable<Type>)new Type[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_EmptyEnumerableAsTypesArgument_ShouldSetPartsPropertyToEmptyEnumerable()\r
-        {\r
-            var catalog = new TypeCatalog(Enumerable.Empty<Type>());\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Parts);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_EmptyArrayAsTypesArgument_ShouldSetPartsPropertyToEmpty()\r
-        {\r
-            var catalog = new TypeCatalog(new Type[0]);\r
-\r
-            EnumerableAssert.IsEmpty(catalog.Parts);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ArrayAsTypesArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var types = new Type[] { PartFactory.GetAttributedExporterType() };\r
-            var catalog = new TypeCatalog(types);\r
-\r
-            types[0] = null;\r
-\r
-            Assert.IsNotNull(catalog.Parts.First());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ArrayAsTypesArgument_ShouldNotAllowModificationAfterConstruction()\r
-        {\r
-            var types = new Type[] { PartFactory.GetAttributedExporterType() };\r
-            var catalog = new TypeCatalog((IEnumerable<Type>)types);\r
-\r
-            types[0] = null;\r
-\r
-            Assert.IsNotNull(catalog.Parts.First());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetOriginToNull()\r
-        {\r
-            var catalog = (ICompositionElement)new TypeCatalog(PartFactory.GetAttributedExporterType());\r
-\r
-            Assert.IsNull(catalog.Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetOriginToNull()\r
-        {\r
-            var catalog = (ICompositionElement)new TypeCatalog((IEnumerable<Type>)new Type[] { PartFactory.GetAttributedExporterType() });\r
-\r
-            Assert.IsNull(catalog.Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void DisplayName_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-            catalog.Dispose();\r
-\r
-            var displayName = ((ICompositionElement)catalog).DisplayName;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Origin_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-            catalog.Dispose();\r
-\r
-            var origin = ((ICompositionElement)catalog).Origin;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Parts_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-            catalog.Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                var parts = catalog.Parts;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_WhenCatalogDisposed_ShouldNotThrow()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-            catalog.Dispose();\r
-\r
-            catalog.ToString();\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetExports_WhenCatalogDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-            catalog.Dispose();\r
-                       var definition = ImportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                catalog.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_NullAsConstraintArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                catalog.GetExports((ImportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_ShouldNotThrow()\r
-        {\r
-            using (var catalog = CreateTypeCatalog())\r
-            {\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CanBeCalledMultipleTimes()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Parts()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            Assert.IsNotNull(catalog.Parts);\r
-            Assert.IsTrue(catalog.Parts.Count()>0);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Parts_ShouldSetDefinitionOriginToCatalogItself()\r
-        {\r
-            var catalog = CreateTypeCatalog();\r
-            Assert.IsTrue(catalog.Parts.Count() > 0);\r
-\r
-            foreach (ICompositionElement definition in catalog.Parts)\r
-            {\r
-                Assert.AreSame(catalog, definition.Origin);\r
-            }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_SingleTypeAsTypesArgument_ShouldIncludeCatalogTypeNameAndTypeFullName()\r
-        {\r
-            var expectations = Expectations.GetAttributedTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = (ICompositionElement)CreateTypeCatalog(e);\r
-\r
-                string expected = string.Format(Strings.TypeCatalog_DisplayNameFormat, typeof(TypeCatalog).Name, e.FullName);\r
-\r
-                Assert.AreEqual(expected, catalog.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ValueAsTypesArgument_ShouldIncludeCatalogTypeNameAndTypeFullNames()\r
-        {\r
-            var expectations = new ExpectationCollection<Type[], string>();\r
-            expectations.Add(new Type[] { typeof(Type) },\r
-                             GetDisplayName(false, typeof(TypeCatalog)));\r
-\r
-            expectations.Add(new Type[] { typeof(ExportValueTypeSingleton) },\r
-                             GetDisplayName(false, typeof(TypeCatalog), typeof(ExportValueTypeSingleton)));\r
-\r
-            expectations.Add(new Type[] { typeof(ExportValueTypeSingleton), typeof(ExportValueTypeSingleton) },\r
-                             GetDisplayName(false, typeof(TypeCatalog), typeof(ExportValueTypeSingleton), typeof(ExportValueTypeSingleton)));\r
-\r
-            expectations.Add(new Type[] { typeof(ExportValueTypeSingleton), typeof(string), typeof(ExportValueTypeSingleton) },\r
-                             GetDisplayName(false, typeof(TypeCatalog), typeof(ExportValueTypeSingleton), typeof(ExportValueTypeSingleton)));\r
-\r
-            expectations.Add(new Type[] { typeof(ExportValueTypeSingleton), typeof(ExportValueTypeFactory) },\r
-                             GetDisplayName(false, typeof(TypeCatalog), typeof(ExportValueTypeSingleton), typeof(ExportValueTypeFactory)));\r
-\r
-            expectations.Add(new Type[] { typeof(ExportValueTypeSingleton), typeof(ExportValueTypeFactory), typeof(CallbackExecuteCodeDuringCompose) },\r
-                             GetDisplayName(true, typeof(TypeCatalog), typeof(ExportValueTypeSingleton), typeof(ExportValueTypeFactory)));\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = (ICompositionElement)CreateTypeCatalog(e.Input);\r
-\r
-                Assert.AreEqual(e.Output, catalog.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ShouldIncludeDerivedCatalogTypeNameAndTypeFullNames()\r
-        {\r
-            var expectations = Expectations.GetAttributedTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = (ICompositionElement)new DerivedTypeCatalog(e);\r
-\r
-                string expected = string.Format(Strings.TypeCatalog_DisplayNameFormat, typeof(DerivedTypeCatalog).Name, e.FullName);\r
-\r
-                Assert.AreEqual(expected, catalog.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnICompositionElementDisplayName()\r
-        {\r
-            var expectations = Expectations.GetAttributedTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var catalog = (ICompositionElement)CreateTypeCatalog(e);\r
-\r
-                Assert.AreEqual(catalog.DisplayName, catalog.ToString());\r
-            }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetExports()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            Expression<Func<ExportDefinition, bool>> constraint = (ExportDefinition exportDefinition) => exportDefinition.ContractName == AttributedModelServices.GetContractName(typeof(MyExport));\r
-            IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> matchingExports = catalog.GetExports(constraint);\r
-            Assert.IsNotNull(matchingExports);\r
-            Assert.IsTrue(matchingExports.Count() >= 0);\r
-\r
-            IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> expectedMatchingExports = catalog.Parts\r
-                .SelectMany(part => part.ExportDefinitions, (part, export) => new Tuple<ComposablePartDefinition, ExportDefinition>(part, export))\r
-                .Where(partAndExport => partAndExport.Item2.ContractName == AttributedModelServices.GetContractName(typeof(MyExport)));\r
-            Assert.IsTrue(matchingExports.SequenceEqual(expectedMatchingExports));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TwoTypesWithSameSimpleName()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            NotSoUniqueName unique1 = container.GetExportedValue<NotSoUniqueName>();\r
-\r
-            Assert.IsNotNull(unique1);\r
-\r
-            Assert.AreEqual(23, unique1.MyIntProperty);\r
-\r
-            NotSoUniqueName2.NotSoUniqueName nestedUnique = container.GetExportedValue<NotSoUniqueName2.NotSoUniqueName>();\r
-\r
-            Assert.IsNotNull(nestedUnique);\r
-\r
-            Assert.AreEqual("MyStringProperty", nestedUnique.MyStringProperty);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GettingFunctionExports()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            ImportDefaultFunctions import = container.GetExportedValue<ImportDefaultFunctions>("ImportDefaultFunctions");\r
-            import.VerifyIsBound();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AnExportOfAnInstanceThatFailsToCompose()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Rejection causes the part in the catalog whose imports cannot be\r
-            // satisfied to be ignored, resulting in a cardinality mismatch instead of a\r
-            // composition exception\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<string>("ExportMyString");\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SharedPartCreation()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            var container = new CompositionContainer(catalog);\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new Int32Exporter(41));\r
-            container.Compose(batch);\r
-\r
-            var sharedPart1 = container.GetExportedValue<MySharedPartExport>();\r
-            Assert.AreEqual(41, sharedPart1.Value);\r
-            var sharedPart2 = container.GetExportedValue<MySharedPartExport>();\r
-            Assert.AreEqual(41, sharedPart2.Value);\r
-\r
-            Assert.AreEqual(sharedPart1, sharedPart2, "These should be the same instances");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPartCreation()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            var container = new CompositionContainer(catalog);\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new Int32Exporter(41));\r
-            container.Compose(batch);\r
-\r
-            var nonSharedPart1 = container.GetExportedValue<MyNonSharedPartExport>();\r
-            Assert.AreEqual(41, nonSharedPart1.Value);\r
-            var nonSharedPart2 = container.GetExportedValue<MyNonSharedPartExport>();\r
-            Assert.AreEqual(41, nonSharedPart2.Value);\r
-\r
-            Assert.AreNotEqual(nonSharedPart1, nonSharedPart2, "These should be different instances");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RecursiveNonSharedPartCreation()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<DirectCycleNonSharedPart>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleNonSharedPart>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleNonSharedPart1>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleNonSharedPart2>();\r
-            });\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-            {\r
-                container.GetExportedValue<CycleWithSharedPartAndNonSharedPart>();\r
-            });\r
-\r
-            Assert.IsNotNull(container.GetExportedValue<CycleSharedPart>());\r
-            Assert.IsNotNull(container.GetExportedValue<CycleSharedPart1>());\r
-            Assert.IsNotNull(container.GetExportedValue<CycleSharedPart2>());\r
-            Assert.IsNotNull(container.GetExportedValue<NoCycleNonSharedPart>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TryToDiscoverExportWithGenericParameter()\r
-        {\r
-            var catalog = new TypeCatalog(Assembly.GetExecutingAssembly().GetTypes());\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Open generic should fail because we should discover that type\r
-            Assert.IsNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<>))));\r
-\r
-            // This specific generic was not exported any where so it should fail\r
-            Assert.IsNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<double>))));\r
-\r
-            // This specific generic was exported so it should succeed\r
-            Assert.IsNotNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<int>))));\r
-\r
-            // Shouldn't discovoer static type with open generic\r
-            Assert.IsNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(StaticExportWithGenericParameter<>))));\r
-\r
-            // Should find a type that inherits from an export\r
-            Assert.IsNotNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWhichInheritsFromGeneric))));\r
-\r
-            // This should be exported because it is inherited by ExportWhichInheritsFromGeneric\r
-            Assert.IsNotNull(container.GetExportedValueOrDefault<object>(AttributedModelServices.GetContractName(typeof(ExportWithGenericParameter<string>))));\r
-        }\r
-\r
-        private string GetDisplayName(bool useEllipses, Type catalogType, params Type[] types)\r
-        {\r
-            return String.Format(CultureInfo.CurrentCulture,\r
-                    Strings.TypeCatalog_DisplayNameFormat,\r
-                    catalogType.Name,\r
-                    this.GetTypesDisplay(useEllipses, types));\r
-        }\r
-\r
-        private string GetTypesDisplay(bool useEllipses, Type[] types)\r
-        {\r
-            int count = types.Length;\r
-            if (count == 0)\r
-            {\r
-                return Strings.TypeCatalog_Empty;\r
-            }\r
-\r
-            StringBuilder builder = new StringBuilder();\r
-            foreach (Type type in types)\r
-            {\r
-                if (builder.Length > 0)\r
-                {\r
-                    builder.Append(CultureInfo.CurrentCulture.TextInfo.ListSeparator);\r
-                    builder.Append(" ");\r
-                }\r
-\r
-                builder.Append(type.FullName);\r
-            }\r
-\r
-            if (useEllipses)\r
-            {   // Add an elipse to indicate that there \r
-                // are more types than actually listed\r
-                builder.Append(CultureInfo.CurrentCulture.TextInfo.ListSeparator);\r
-                builder.Append(" ...");\r
-            }\r
-\r
-            return builder.ToString();\r
-        }\r
-\r
-\r
-        private TypeCatalog CreateTypeCatalog()\r
-        {\r
-            var type = PartFactory.GetAttributedExporterType();\r
-\r
-            return CreateTypeCatalog(type);\r
-        }\r
-\r
-        private TypeCatalog CreateTypeCatalog(params Type[] types)\r
-        {\r
-            return new TypeCatalog(types);\r
-        }\r
-\r
-        private class DerivedTypeCatalog : TypeCatalog\r
-        {\r
-            public DerivedTypeCatalog(params Type[] types)\r
-                : base(types)\r
-            {\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportAttributeTests.cs
deleted file mode 100644 (file)
index 2a4f467..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ImportAttributeTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ImportAttribute();\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsContractNameArgument_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ImportAttribute((string)null);\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_NullAsContractTypeArgument_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ImportAttribute((Type)null);\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_NullAsContractTypeArgument_ShouldSetContractNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new ImportAttribute((string)null, (Type)null);\r
-\r
-            Assert.IsNull(attribute.ContractName);\r
-            Assert.IsNull(attribute.ContractType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsContractNameArgument_ShouldSetContractNameProperty()\r
-        {\r
-            var expectations = Expectations.GetContractNamesWithEmpty();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new ImportAttribute(e);\r
-\r
-                Assert.AreEqual(e, attribute.ContractName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetAllowDefaultPropertyToFalse()\r
-        {\r
-            var attribute = new ImportAttribute();\r
-\r
-            Assert.IsFalse(attribute.AllowDefault);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetAllowDefaultPropertyToFalse()\r
-        {\r
-            var attribute = new ImportAttribute("ContractName");\r
-\r
-            Assert.IsFalse(attribute.AllowDefault);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetAllowDefaultPropertyToFalse()\r
-        {\r
-            var attribute = new ImportAttribute(typeof(String));\r
-\r
-            Assert.IsFalse(attribute.AllowDefault);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetAllowRecompositionPropertyToFalse()\r
-        {\r
-            var attribute = new ImportAttribute();\r
-\r
-            Assert.IsFalse(attribute.AllowRecomposition);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ShouldSetAllowRecompositionPropertyToFalse()\r
-        {\r
-            var attribute = new ImportAttribute("ContractName");\r
-\r
-            Assert.IsFalse(attribute.AllowRecomposition);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor3_ShouldSetAllowRecompositionPropertyToFalse()\r
-        {\r
-            var attribute = new ImportAttribute(typeof(String));\r
-\r
-            Assert.IsFalse(attribute.AllowRecomposition);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AllowDefault_ValueAsValueArgument_ShouldSetProperty()\r
-        {\r
-            var expectations = Expectations.GetBooleans();\r
-\r
-            var attribute = new ImportAttribute();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                attribute.AllowDefault = e;\r
-                Assert.AreEqual(e, attribute.AllowDefault);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AllowRecomposition_ValueAsValueArgument_ShouldSetProperty()\r
-        {\r
-            var expectations = Expectations.GetBooleans();\r
-\r
-            var attribute = new ImportAttribute();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                attribute.AllowRecomposition = e;\r
-                Assert.AreEqual(e, attribute.AllowRecomposition);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportDefinitionTests.cs
deleted file mode 100644 (file)
index a3092cd..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Linq.Expressions;\r
-using System.Text.RegularExpressions;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ImportDefinitionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetCardinalityPropertyToExactlyOne()\r
-        {\r
-            var definition = new NoOverridesImportDefinition();\r
-\r
-            Assert.AreEqual(ImportCardinality.ExactlyOne, definition.Cardinality);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetIsPrerequisitePropertyToTrue()\r
-        {\r
-            var definition = new NoOverridesImportDefinition();\r
-\r
-            Assert.IsTrue(definition.IsPrerequisite);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_ShouldSetIsRecomposablePropertyToFalse()\r
-        {\r
-            var definition = new NoOverridesImportDefinition();\r
-\r
-            Assert.IsFalse(definition.IsRecomposable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsConstraintArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("constraint", () =>\r
-            {\r
-                new ImportDefinition((Expression<Func<ExportDefinition, bool>>)null, "", ImportCardinality.ExactlyOne, false, false);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_OutOfRangeValueAsCardinalityArgument_ShouldThrowArgument()\r
-        {\r
-            var expectations = Expectations.GetInvalidEnumValues<ImportCardinality>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                ExceptionAssert.ThrowsArgument<ArgumentException>("cardinality", () =>\r
-                {\r
-                    new ImportDefinition(d => true, "", e, false, false);\r
-                });\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsCardinalityArgument_ShouldSetCardinalityProperty()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<ImportCardinality>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ImportDefinition(d => true, "", e, false, false);\r
-\r
-                Assert.AreEqual(e, definition.Cardinality);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsConstraintArgument_ShouldSetConstraintProperty()\r
-        {\r
-            var expectations = new List<Expression<Func<ExportDefinition, bool>>>();\r
-            expectations.Add(d => d.ContractName == "ContractName");\r
-            expectations.Add(d => d.ContractName.Equals("ContractName"));\r
-            expectations.Add(d => (string)d.Metadata["Name"] == "Value");\r
-            expectations.Add(d => true);\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ImportDefinition(e, "", ImportCardinality.ExactlyOne, false, false);\r
-\r
-                Assert.AreEqual(e, definition.Constraint);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsIsRecomposableArgument_ShouldSetIsRecomposableProperty()\r
-        {\r
-            var expectations = Expectations.GetBooleans();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ImportDefinition(d => true, "", ImportCardinality.ExactlyOne, e, false);\r
-\r
-                Assert.AreEqual(e, definition.IsRecomposable);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueAsIsPrerequisiteArgument_ShouldSetIsPrerequisiteProperty()\r
-        {\r
-            var expectations = Expectations.GetBooleans();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ImportDefinition(d => true, "", ImportCardinality.ExactlyOne, false, e);\r
-\r
-                Assert.AreEqual(e, definition.IsPrerequisite);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ContractName_ShouldSetAppropriately()\r
-        {\r
-            var expectations = new ExpectationCollection<string, string>();\r
-\r
-            expectations.Add(null, string.Empty);\r
-            expectations.Add(string.Empty, string.Empty);\r
-            expectations.Add("Contract", "Contract");\r
-\r
-            string cn = AttributedModelServices.GetContractName(typeof(ImportDefinitionTests));\r
-            expectations.Add(cn, cn);\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = new ImportDefinition(d => true, e.Input, ImportCardinality.ExactlyOne, false, false);\r
-\r
-                Assert.AreEqual(e.Output, definition.ContractName);\r
-            }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constraint_WhenNotOverridden_ShouldThrowNotImplemented()\r
-        {\r
-            var definition = new NoOverridesImportDefinition();\r
-\r
-            ExceptionAssert.Throws<NotImplementedException>(() =>\r
-            {\r
-                var constraint = definition.Constraint;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_WhenConstraintPropertyNotOverridden_ShouldThrowNotImplemented()\r
-        {\r
-            var definition = new NoOverridesImportDefinition();\r
-\r
-            ExceptionAssert.Throws<NotImplementedException>(() =>\r
-            {\r
-                definition.ToString();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ValueAsConstraintArgument_ShouldReturnConstraintProperty()\r
-        {\r
-            var expectations = new ExpectationCollection<Expression<Func<ExportDefinition, bool>>, string>();\r
-            expectations.Add(d => d.ContractName == "ContractName", @"d.ContractName ==? ""ContractName""");\r
-            expectations.Add(d => d.ContractName.Equals("ContractName"), @"d.ContractName.Equals\(""ContractName""\)");\r
-            expectations.Add(d => (string)d.Metadata["Name"] == "Value", @"Convert\(d.Metadata.get_Item\(""Name""\)\) ==? ""Value""");\r
-            expectations.Add(d => true, "True");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var item = new ImportDefinition(e.Input, "", ImportCardinality.ExactlyOne, false, false);\r
-\r
-                Assert.IsTrue(Regex.IsMatch(item.ToString(), e.Output));\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_DerivedImportDefinition_ShouldReturnOverriddenConstraintProperty()\r
-        {\r
-            var expectations = new ExpectationCollection<Expression<Func<ExportDefinition, bool>>, string>();\r
-            expectations.Add(d => d.ContractName == "ContractName", @"d.ContractName ==? ""ContractName""");\r
-            expectations.Add(d => d.ContractName.Equals("ContractName"), @"d.ContractName.Equals\(""ContractName""\)");\r
-            expectations.Add(d => (string)d.Metadata["Name"] == "Value", @"Convert\(d.Metadata.get_Item\(""Name""\)\) ==? ""Value""");\r
-            expectations.Add(d => true, "True");\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var item = new DerivedImportDefinition(e.Input);\r
-\r
-                Assert.IsTrue(Regex.IsMatch(item.ToString(), e.Output));\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(738535)]\r
-        [Ignore]\r
-        public void ContractName_ShouldBeIncludedInConstraintAutomatically()\r
-        {\r
-            string testContractName = "TestContractName";\r
-            var contractImportDefinition = new ImportDefinition(ed => true, testContractName, ImportCardinality.ZeroOrMore, false, false);\r
-\r
-            var shouldMatch = new ExportDefinition(testContractName, null);\r
-            var shouldNotMatch = new ExportDefinition(testContractName + testContractName, null);\r
-\r
-            Assert.IsTrue(contractImportDefinition.IsConstraintSatisfiedBy(shouldMatch));\r
-            Assert.IsFalse(contractImportDefinition.IsConstraintSatisfiedBy(shouldNotMatch));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void EmptyContractName_ShouldMatchAllContractNames()\r
-        {\r
-            var importDefinition = new ImportDefinition(ed => true, string.Empty, ImportCardinality.ZeroOrMore, false, false);\r
-\r
-            var shouldMatch1 = new ExportDefinition("contract1", null);\r
-            var shouldMatch2 = new ExportDefinition("contract2", null);\r
-\r
-            Assert.IsTrue(importDefinition.IsConstraintSatisfiedBy(shouldMatch1));\r
-            Assert.IsTrue(importDefinition.IsConstraintSatisfiedBy(shouldMatch2));\r
-        }\r
-\r
-        private class NoOverridesImportDefinition : ImportDefinition\r
-        {\r
-        }\r
-\r
-        private class DerivedImportDefinition : ImportDefinition\r
-        {\r
-            private readonly Expression<Func<ExportDefinition, bool>> _constraint;\r
-\r
-            public DerivedImportDefinition(Expression<Func<ExportDefinition, bool>> constraint)\r
-            {\r
-                _constraint = constraint;\r
-            }\r
-\r
-            public override Expression<Func<ExportDefinition, bool>> Constraint\r
-            {\r
-                get { return _constraint ?? base.Constraint; }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportingComposablePart.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportingComposablePart.cs
deleted file mode 100644 (file)
index e89f71e..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal class ImportingComposablePart : ComposablePart\r
-    {\r
-        private readonly List<ImportDefinition> _importDefinitions = new List<ImportDefinition>();\r
-        private readonly List<ExportDefinition> _exportDefinitions = new List<ExportDefinition>();\r
-        private Dictionary<ImportDefinition, object> _importValues = new Dictionary<ImportDefinition, object>();\r
-\r
-        public ImportingComposablePart(ImportCardinality cardinality, bool isRecomposable, params string[] contractNames)\r
-            : this((string)null, cardinality, isRecomposable, contractNames)\r
-        {\r
-        }\r
-\r
-        public ImportingComposablePart(string exportContractName, ImportCardinality cardinality, bool isRecomposable, params string[] contractNames)\r
-        {\r
-            if (exportContractName != null)\r
-            {\r
-                var definition = ExportDefinitionFactory.Create(exportContractName);\r
-\r
-                _exportDefinitions.Add(definition);\r
-            }\r
-\r
-            foreach (string contractName in contractNames)\r
-            {\r
-                var definition = ImportDefinitionFactory.Create(contractName, \r
-                                                                cardinality,\r
-                                                                isRecomposable,\r
-                                                                false);\r
-\r
-                _importDefinitions.Add(definition);\r
-            }\r
-        }\r
-\r
-        public ImportingComposablePart(params ImportDefinition[] importDefintions)\r
-        {\r
-            _importDefinitions.AddRange(importDefintions);\r
-        }\r
-\r
-        public override IEnumerable<ExportDefinition> ExportDefinitions\r
-        {\r
-            get { return this._exportDefinitions; }\r
-        }\r
-\r
-        public override IEnumerable<ImportDefinition> ImportDefinitions\r
-        {\r
-            get { return this._importDefinitions; }\r
-        }\r
-\r
-        public override IDictionary<string, object> Metadata\r
-        {\r
-            get { return new Dictionary<string, object>(); }\r
-        }\r
-\r
-        public int ImportSatisfiedCount\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public void ResetImportSatisfiedCount()\r
-        {\r
-            ImportSatisfiedCount = 0;\r
-        }\r
-\r
-        public object Value\r
-        {\r
-            get \r
-            {\r
-                Assert.AreEqual(1, _importValues.Count);\r
-\r
-                return _importValues.Values.First();\r
-            }\r
-        }\r
-\r
-        public object GetImport(string contractName)\r
-        {\r
-            foreach (var pair in _importValues)\r
-            {\r
-                var definition = (ContractBasedImportDefinition)pair.Key;\r
-                if (definition.ContractName == contractName)\r
-                {\r
-                    return pair.Value;\r
-                }                \r
-            }\r
-\r
-            return null;\r
-        }\r
-\r
-        public object GetImport(ImportDefinition definition)\r
-        {\r
-            Assert.IsTrue(_importValues.ContainsKey(definition));\r
-            return _importValues[definition];\r
-        }\r
-\r
-        public override object GetExportedValue(ExportDefinition definition)\r
-        {\r
-            Assert.Fail();\r
-            return null;\r
-        }\r
-\r
-        public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-        {\r
-            Assert.IsTrue(_importDefinitions.Contains(definition));\r
-\r
-            ImportSatisfiedCount++;\r
-\r
-            _importValues[definition] = GetExportValue(exports);\r
-        }\r
-\r
-        public void ResetImport(ImportDefinition definition)\r
-        {\r
-            Assert.IsTrue(_importDefinitions.Contains(definition));\r
-            _importValues[definition] = null;\r
-        }\r
-\r
-        private object GetExportValue(IEnumerable<Export> exports)\r
-        {\r
-            var exportedValues = exports.Select(export => export.Value);\r
-\r
-            int count = exportedValues.Count();\r
-            if (count == 0)\r
-            {\r
-                return null;\r
-            }\r
-            else if (count == 1)\r
-            {\r
-                return exportedValues.First();\r
-            }\r
-\r
-            return exportedValues.ToArray();\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportingConstructorAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ImportingConstructorAttributeTests.cs
deleted file mode 100644 (file)
index f222b06..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ImportingConstructorAttributeTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_ShouldNotThrow()\r
-        {\r
-            var attribute = new ImportingConstructorAttribute();\r
-\r
-            Assert.IsNotNull(attribute);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/InitializationScopeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/InitializationScopeTests.cs
deleted file mode 100644 (file)
index 303563e..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class InitializationScopeTests\r
-    {\r
-        [TestMethod]\r
-        public void SingleContainerSimpleCompose()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            ImportingComposablePart importPart;\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddExportedValue("value1", "Hello");\r
-            batch.AddExportedValue("value2", "World");\r
-            batch.AddPart(importPart = PartFactory.CreateImporter("value1", "value2"));\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importPart.ImportSatisfiedCount);\r
-            Assert.AreEqual("Hello", importPart.GetImport("value1"));\r
-            Assert.AreEqual("World", importPart.GetImport("value2"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ParentedContainerSimpleCompose()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importPart = PartFactory.CreateImporter("value1", "value2");\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("value1", "Parent");\r
-\r
-            var childContainer = new CompositionContainer(container);\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-            childBatch.AddExportedValue("value2", "Child");\r
-            childBatch.AddPart(importPart);\r
-\r
-            Assert.AreEqual(0, importPart.ImportSatisfiedCount, "Import should not happen until outer scope is disposed");\r
-\r
-            container.Compose(batch);\r
-            childContainer.Compose(childBatch);\r
-\r
-            Assert.AreEqual(2, importPart.ImportSatisfiedCount);\r
-            Assert.AreEqual("Parent", importPart.GetImport("value1"));\r
-            Assert.AreEqual("Child", importPart.GetImport("value2"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SingleContainerPartReplacement()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var importPart = PartFactory.CreateImporter(true, "value1", "value2");\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var export1Key = batch.AddExportedValue("value1", "Hello");\r
-            batch.AddExportedValue("value2", "World");\r
-            batch.AddPart(importPart);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(2, importPart.ImportSatisfiedCount);\r
-            Assert.AreEqual("Hello", importPart.GetImport("value1"));\r
-            Assert.AreEqual("World", importPart.GetImport("value2"));\r
-\r
-            importPart.ResetImportSatisfiedCount();\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(export1Key);\r
-            batch.AddExportedValue("value1", "Goodbye");\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importPart.ImportSatisfiedCount);\r
-            Assert.AreEqual("Goodbye", importPart.GetImport("value1"));\r
-            Assert.AreEqual("World", importPart.GetImport("value2"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ParentedContainerPartReplacement()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var importPart = PartFactory.CreateImporter(true, "value1", "value2");\r
-            var exportKey = batch.AddExportedValue("value1", "Parent");\r
-\r
-            var childContainer = new CompositionContainer(container);\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-            childBatch.AddExportedValue("value2", "Child");\r
-            childBatch.AddPart(importPart);\r
-\r
-            Assert.AreEqual(0, importPart.ImportSatisfiedCount, "Should not import until outer scope is disposed");\r
-            container.Compose(batch);\r
-            childContainer.Compose(childBatch);\r
-\r
-            Assert.AreEqual(2, importPart.ImportSatisfiedCount);\r
-            Assert.AreEqual("Parent", importPart.GetImport("value1"));\r
-            Assert.AreEqual("Child", importPart.GetImport("value2"));\r
-\r
-            importPart.ResetImportSatisfiedCount();\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(exportKey);\r
-            batch.AddExportedValue("value1", "New Parent");\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, importPart.ImportSatisfiedCount);\r
-            Assert.AreEqual("New Parent", importPart.GetImport("value1"));\r
-            Assert.AreEqual("Child", importPart.GetImport("value2"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SelectiveRecompose()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var stableImporter = PartFactory.CreateImporter("stable");\r
-            var dynamicImporter = PartFactory.CreateImporter("dynamic", true);\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(stableImporter);\r
-            batch.AddPart(dynamicImporter);\r
-            var exportKey = batch.AddExportedValue("dynamic", 1);\r
-            batch.AddExportedValue("stable", 42);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(1, stableImporter.ImportSatisfiedCount);\r
-            Assert.AreEqual(stableImporter.GetImport("stable"), 42);\r
-            Assert.AreEqual(1, dynamicImporter.ImportSatisfiedCount);\r
-            Assert.AreEqual(dynamicImporter.GetImport("dynamic"), 1);\r
-\r
-            batch = new CompositionBatch();\r
-            stableImporter.ResetImportSatisfiedCount();\r
-            dynamicImporter.ResetImportSatisfiedCount();\r
-            batch.RemovePart(exportKey);\r
-            batch.AddExportedValue("dynamic", 2);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(0, stableImporter.ImportSatisfiedCount, "Should not have imported the stable import part");\r
-            Assert.AreEqual(stableImporter.GetImport("stable"), 42);\r
-            Assert.AreEqual(1, dynamicImporter.ImportSatisfiedCount);\r
-            Assert.AreEqual(dynamicImporter.GetImport("dynamic"), 2);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataAttributeAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataAttributeAttributeTests.cs
deleted file mode 100644 (file)
index 0cde9ac..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class MetadataAttributeAttributeTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_ShouldNotThrow()\r
-        {\r
-            var attribute = new MetadataAttributeAttribute();\r
-\r
-            Assert.IsNotNull(attribute);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataTests.cs
deleted file mode 100644 (file)
index 73d8c87..0000000
+++ /dev/null
@@ -1,1255 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-using System.Reflection;\r
-using System.Collections.ObjectModel;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class MetadataTests\r
-    {\r
-        #region Tests for metadata on exports\r
-\r
-        public enum SimpleEnum\r
-        {\r
-            First\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        [Export]\r
-        [ExportMetadata("String", "42")]\r
-        [ExportMetadata("Int", 42)]\r
-        [ExportMetadata("Float", 42.0f)]\r
-        [ExportMetadata("Enum", SimpleEnum.First)]\r
-        [ExportMetadata("Type", typeof(string))]\r
-        [ExportMetadata("Object", 42)]\r
-        public class SimpleMetadataExporter\r
-        {\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        [Export]\r
-        [ExportMetadata("String", null)] // null\r
-        [ExportMetadata("Int", 42)]\r
-        [ExportMetadata("Float", 42.0f)]\r
-        [ExportMetadata("Enum", SimpleEnum.First)]\r
-        [ExportMetadata("Type", typeof(string))]\r
-        [ExportMetadata("Object", 42)]\r
-        public class SimpleMetadataExporterWithNullReferenceValue\r
-        {\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        [Export]\r
-        [ExportMetadata("String", "42")]\r
-        [ExportMetadata("Int", null)] //null\r
-        [ExportMetadata("Float", 42.0f)]\r
-        [ExportMetadata("Enum", SimpleEnum.First)]\r
-        [ExportMetadata("Type", typeof(string))]\r
-        [ExportMetadata("Object", 42)]\r
-        public class SimpleMetadataExporterWithNullNonReferenceValue\r
-        {\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        [Export]\r
-        [ExportMetadata("String", "42")]\r
-        [ExportMetadata("Int", "42")] // wrong type\r
-        [ExportMetadata("Float", 42.0f)]\r
-        [ExportMetadata("Enum", SimpleEnum.First)]\r
-        [ExportMetadata("Type", typeof(string))]\r
-        [ExportMetadata("Object", 42)]\r
-        public class SimpleMetadataExporterWithTypeMismatch\r
-        {\r
-        }\r
-\r
-        public interface ISimpleMetadataView\r
-        {\r
-            string String { get; }\r
-            int Int { get; }\r
-            float Float { get; }\r
-            SimpleEnum Enum { get; }\r
-            Type Type { get; }\r
-            object Object { get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SimpleMetadataTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new SimpleMetadataExporter());\r
-\r
-            var export = container.GetExport<SimpleMetadataExporter, ISimpleMetadataView>();\r
-\r
-            Assert.AreEqual("42", export.Metadata.String);\r
-            Assert.AreEqual(42, export.Metadata.Int);\r
-            Assert.AreEqual(42.0f, export.Metadata.Float);\r
-            Assert.AreEqual(SimpleEnum.First, export.Metadata.Enum);\r
-            Assert.AreEqual(typeof(string), export.Metadata.Type);\r
-            Assert.AreEqual(42, export.Metadata.Object);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SimpleMetadataTestWithNullReferenceValue()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new SimpleMetadataExporterWithNullReferenceValue());\r
-\r
-            var export = container.GetExport<SimpleMetadataExporterWithNullReferenceValue, ISimpleMetadataView>();\r
-\r
-            Assert.AreEqual(null, export.Metadata.String);\r
-            Assert.AreEqual(42, export.Metadata.Int);\r
-            Assert.AreEqual(42.0f, export.Metadata.Float);\r
-            Assert.AreEqual(SimpleEnum.First, export.Metadata.Enum);\r
-            Assert.AreEqual(typeof(string), export.Metadata.Type);\r
-            Assert.AreEqual(42, export.Metadata.Object);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SimpleMetadataTestWithNullNonReferenceValue()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new SimpleMetadataExporterWithNullNonReferenceValue());\r
-\r
-            var exports = container.GetExports<SimpleMetadataExporterWithNullNonReferenceValue, ISimpleMetadataView>();\r
-            Assert.IsFalse(exports.Any());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SimpleMetadataTestWithTypeMismatch()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new SimpleMetadataExporterWithTypeMismatch());\r
-\r
-            var exports = container.GetExports<SimpleMetadataExporterWithTypeMismatch, ISimpleMetadataView>();\r
-            Assert.IsFalse(exports.Any());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ValidMetadataTest()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new MyExporterWithValidMetadata());\r
-            container.Compose(batch);\r
-            \r
-            var typeVi = container.GetExport<MyExporterWithValidMetadata, IDictionary<string, object>>();\r
-            var metadataFoo = typeVi.Metadata["foo"] as IList<string>;\r
-            Assert.AreEqual(2, metadataFoo.Count(), "There are should be two items in the metadata foo's collection");\r
-            Assert.IsTrue(metadataFoo.Contains("bar1"), "The metadata collection should include value 'bar1'");\r
-            Assert.IsTrue(metadataFoo.Contains("bar2"), "The metadata collection should include value 'bar2'");\r
-            Assert.AreEqual("world", typeVi.Metadata["hello"], "The single item metadata should be present");\r
-            Assert.AreEqual("GoodOneValue2", typeVi.Metadata["GoodOne2"], "The metadata supplied by strong attribute should also be present");\r
-\r
-            var metadataAcme = typeVi.Metadata["acme"] as IList<object>;\r
-            Assert.AreEqual(2, metadataAcme.Count(), "There are should be two items in the metadata acme's collection");\r
-            Assert.IsTrue(metadataAcme.Contains("acmebar"), "The metadata collection should include value 'bar'");\r
-            Assert.IsTrue(metadataAcme.Contains(2.0), "The metadata collection should include value 2");\r
-           \r
-            var memberVi = container.GetExport<Func<double>, IDictionary<string, object>>("ContractForValidMetadata");\r
-            var metadataBar = memberVi.Metadata["bar"] as IList<string>;\r
-            Assert.AreEqual(2, metadataBar.Count(), "There are should be two items in the metadata bar's collection");\r
-            Assert.IsTrue(metadataBar.Contains("foo1"), "The metadata collection should include value 'foo1'");\r
-            Assert.IsTrue(metadataBar.Contains("foo2"), "The metadata collection should include value 'foo2'");\r
-            Assert.AreEqual("hello", memberVi.Metadata["world"], "The single item metadata should be present");\r
-            Assert.AreEqual("GoodOneValue2", memberVi.Metadata["GoodOne2"], "The metadata supplied by strong attribute should also be present");\r
-\r
-            var metadataStuff = memberVi.Metadata["stuff"] as IList<object>;\r
-            Assert.AreEqual(2, metadataAcme.Count(), "There are should be two items in the metadata acme's collection");\r
-            Assert.IsTrue(metadataStuff.Contains("acmebar"), "The metadata collection should include value 'acmebar'");\r
-            Assert.IsTrue(metadataStuff.Contains(2.0), "The metadata collection should include value 2");\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ValidMetadataDiscoveredByComponentCatalogTest()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            ValidMetadataDiscoveredByCatalog(container);\r
-        }\r
-\r
-        private void ValidMetadataDiscoveredByCatalog(CompositionContainer container)\r
-        {\r
-            var export1 = container.GetExport<MyExporterWithValidMetadata, IDictionary<string, object>>();\r
-            \r
-            var metadataFoo = export1.Metadata["foo"] as IList<string>;\r
-            Assert.AreEqual(2, metadataFoo.Count(), "There are should be two items in the metadata foo's collection");\r
-            Assert.IsTrue(metadataFoo.Contains("bar1"), "The metadata collection should include value 'bar1'");\r
-            Assert.IsTrue(metadataFoo.Contains("bar2"), "The metadata collection should include value 'bar2'");\r
-            Assert.AreEqual("world", export1.Metadata["hello"], "The single item metadata should also be present");\r
-            Assert.AreEqual("GoodOneValue2", export1.Metadata["GoodOne2"], "The metadata supplied by strong attribute should also be present");\r
-\r
-            var metadataAcme = export1.Metadata["acme"] as IList<object>;\r
-            Assert.AreEqual(2, metadataAcme.Count(), "There are should be two items in the metadata acme's collection");\r
-            Assert.IsTrue(metadataAcme.Contains("acmebar"), "The metadata collection should include value 'bar'");\r
-            Assert.IsTrue(metadataAcme.Contains(2.0), "The metadata collection should include value 2");\r
-\r
-            var export2 = container.GetExport<Func<double>, IDictionary<string, object>>("ContractForValidMetadata");\r
-            var metadataBar = export2.Metadata["bar"] as IList<string>;\r
-            Assert.AreEqual(2, metadataBar.Count(), "There are should be two items in the metadata foo's collection");\r
-            Assert.IsTrue(metadataBar.Contains("foo1"), "The metadata collection should include value 'foo1'");\r
-            Assert.IsTrue(metadataBar.Contains("foo2"), "The metadata collection should include value 'foo2'");\r
-            Assert.AreEqual("hello", export2.Metadata["world"], "The single item metadata should also be present");\r
-            Assert.AreEqual("GoodOneValue2", export2.Metadata["GoodOne2"], "The metadata supplied by strong attribute should also be present");\r
-\r
-            var metadataStuff = export2.Metadata["stuff"] as IList<object>;\r
-            Assert.AreEqual(2, metadataAcme.Count(), "There are should be two items in the metadata acme's collection");\r
-            Assert.IsTrue(metadataStuff.Contains("acmebar"), "The metadata collection should include value 'acmebar'");\r
-            Assert.IsTrue(metadataStuff.Contains(2.0), "The metadata collection should include value 2");\r
-        }\r
-\r
-\r
-        [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]\r
-        [MetadataAttribute]\r
-        public class BadStrongMetadata : Attribute\r
-        {\r
-            public string SelfConflicted { get { return "SelfConflictedValue"; } }\r
-        }\r
-\r
-        [Export]\r
-        [BadStrongMetadata]\r
-        [ExportMetadata("InvalidCollection", "InvalidCollectionValue1")]\r
-        [ExportMetadata("InvalidCollection", "InvalidCollectionValue2", IsMultiple = true)]\r
-        [BadStrongMetadata]\r
-        [ExportMetadata("RepeatedMetadata", "RepeatedMetadataValue1")]\r
-        [ExportMetadata("RepeatedMetadata", "RepeatedMetadataValue2")]\r
-        [ExportMetadata("GoodOne1", "GoodOneValue1")]\r
-        [ExportMetadata("ConflictedOne1", "ConfilictedOneValue1")]\r
-        [GoodStrongMetadata]\r
-        [ExportMetadata("ConflictedOne2", "ConflictedOne2Value2")]\r
-        [PartNotDiscoverable]\r
-        public class MyExporterWithInvalidMetadata\r
-        {\r
-            [Export("ContractForInvalidMetadata")]\r
-            [ExportMetadata("ConflictedOne1", "ConfilictedOneValue1")]\r
-            [GoodStrongMetadata]\r
-            [ExportMetadata("ConflictedOne2", "ConflictedOne2Value2")]\r
-            [ExportMetadata("RepeatedMetadata", "RepeatedMetadataValue1")]\r
-            [ExportMetadata("RepeatedMetadata", "RepeatedMetadataValue2")]\r
-            [BadStrongMetadata]\r
-            [ExportMetadata("InvalidCollection", "InvalidCollectionValue1")]\r
-            [ExportMetadata("InvalidCollection", "InvalidCollectionValue2", IsMultiple = true)]\r
-            [BadStrongMetadata]\r
-            [ExportMetadata("GoodOne1", "GoodOneValue1")]\r
-            public double DoSomething() { return 0.618; }\r
-        }\r
-\r
-        [Export]\r
-        [ExportMetadata("DuplicateMetadataName", "My Name")]\r
-        [ExportMetadata("DuplicateMetadataName", "Your Name")]\r
-        [PartNotDiscoverable]\r
-        public class ClassWithInvalidDuplicateMetadataOnType\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InvalidDuplicateMetadataOnType_ShouldThrow()\r
-        {\r
-            var part = AttributedModelServices.CreatePart(new ClassWithInvalidDuplicateMetadataOnType());\r
-            var export = part.ExportDefinitions.First();\r
-            var ex = ExceptionAssert.Throws<InvalidOperationException>(RetryMode.DoNotRetry, () =>\r
-            {\r
-                var metadata = export.Metadata;\r
-            });\r
-\r
-            Assert.IsTrue(ex.Message.Contains("DuplicateMetadataName"));\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ClassWithInvalidDuplicateMetadataOnMember\r
-        {\r
-            [Export]\r
-            [ExportMetadata("DuplicateMetadataName", "My Name")]\r
-            [ExportMetadata("DuplicateMetadataName", "Your Name")]\r
-            public ClassWithDuplicateMetadataOnMember Member { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InvalidDuplicateMetadataOnMember_ShouldThrow()\r
-        {\r
-            var part = AttributedModelServices.CreatePart(new ClassWithInvalidDuplicateMetadataOnMember());\r
-            var export = part.ExportDefinitions.First();\r
-\r
-            var ex = ExceptionAssert.Throws<InvalidOperationException>(RetryMode.DoNotRetry, () =>\r
-            {\r
-                var metadata = export.Metadata;\r
-            });\r
-\r
-            Assert.IsTrue(ex.Message.Contains("DuplicateMetadataName"));\r
-        }\r
-\r
-        [Export]\r
-        [ExportMetadata("DuplicateMetadataName", "My Name", IsMultiple=true)]\r
-        [ExportMetadata("DuplicateMetadataName", "Your Name", IsMultiple=true)]\r
-        public class ClassWithValidDuplicateMetadataOnType\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ValidDuplicateMetadataOnType_ShouldDiscoverAllMetadata()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new ClassWithValidDuplicateMetadataOnType());\r
-\r
-            container.Compose(batch);\r
-\r
-            var export = container.GetExport<ClassWithValidDuplicateMetadataOnType, IDictionary<string, object>>();\r
-\r
-            var names = export.Metadata["DuplicateMetadataName"] as string[];\r
-\r
-            Assert.AreEqual(2, names.Length);\r
-        }\r
-\r
-        public class ClassWithDuplicateMetadataOnMember\r
-        {\r
-            [Export]\r
-            [ExportMetadata("DuplicateMetadataName", "My Name", IsMultiple=true)]\r
-            [ExportMetadata("DuplicateMetadataName", "Your Name", IsMultiple=true)]\r
-            public ClassWithDuplicateMetadataOnMember Member { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ValidDuplicateMetadataOnMember_ShouldDiscoverAllMetadata()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new ClassWithDuplicateMetadataOnMember());\r
-\r
-            container.Compose(batch);\r
-\r
-            var export = container.GetExport<ClassWithDuplicateMetadataOnMember, IDictionary<string, object>>();\r
-\r
-            var names = export.Metadata["DuplicateMetadataName"] as string[];\r
-\r
-            Assert.AreEqual(2, names.Length);\r
-        }\r
-\r
-        [Export]\r
-        [ExportMetadata(CompositionConstants.PartCreationPolicyMetadataName, "My Policy")]\r
-        [PartNotDiscoverable]\r
-        public class ClassWithReservedMetadataValue\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InvalidMetadata_UseOfReservedName_ShouldThrow()\r
-        {\r
-            var part = AttributedModelServices.CreatePart(new ClassWithReservedMetadataValue());\r
-            var export = part.ExportDefinitions.First();\r
-\r
-            var ex = ExceptionAssert.Throws<InvalidOperationException>(RetryMode.DoNotRetry, () =>\r
-            {\r
-                var metadata = export.Metadata;\r
-            });\r
-\r
-            Assert.IsTrue(ex.Message.Contains(CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-        #endregion\r
-\r
-        #region Tests for weakly supported metadata as part of contract\r
-\r
-        [TestMethod]\r
-        [WorkItem(468388)]\r
-        [Ignore]\r
-        public void FailureImportForNoRequiredMetadatForExportCollection()\r
-        {\r
-            CompositionContainer container = ContainerFactory.Create();\r
-\r
-            MyImporterWithExportCollection importer;\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new MyExporterWithNoMetadata());\r
-            batch.AddPart(importer = new MyImporterWithExportCollection());\r
-\r
-            Assert.Fail();\r
-\r
-            //var result = container.TryCompose();\r
-\r
-            //Assert.IsTrue(result.Succeeded, "Composition should be successful because collection import is not required");\r
-            //Assert.AreEqual(1, result.Issues.Count, "There should be one issue reported");\r
-            //Assert.IsTrue(result.Issues[0].Description.Contains("Foo"), "The missing required metadata is 'Foo'");\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(472538)]\r
-        [Ignore]\r
-        public void FailureImportForNoRequiredMetadataThroughComponentCatalogTest()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            FailureImportForNoRequiredMetadataThroughCatalog(container);\r
-        }\r
-\r
-        private void FailureImportForNoRequiredMetadataThroughCatalog(CompositionContainer container)\r
-        {\r
-            Assert.Fail("This needs to be fixed, see: 472538");\r
-\r
-            //var export1 = container.GetExport<MyImporterWithExport>();\r
-\r
-            //export1.TryGetExportedValue().VerifyFailure(CompositionIssueId.RequiredMetadataNotFound, CompositionIssueId.CardinalityMismatch);\r
-\r
-            //var export2 = container.GetExport<MyImporterWithExportCollection>();\r
-            //export2.TryGetExportedValue().VerifySuccess(CompositionIssueId.RequiredMetadataNotFound);\r
-\r
-            //container.TryGetExportedValue<MyImporterWithValue>().VerifyFailure(CompositionIssueId.RequiredMetadataNotFound, CompositionIssueId.CardinalityMismatch);\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(468388)]\r
-        [Ignore]\r
-        public void SelectiveImportBasedOnMetadataForExport()\r
-        {\r
-            CompositionContainer container = ContainerFactory.Create();\r
-\r
-            MyImporterWithExportForSelectiveImport importer;\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new MyExporterWithNoMetadata());\r
-            batch.AddPart(new MyExporterWithMetadata());\r
-            batch.AddPart(importer = new MyImporterWithExportForSelectiveImport());\r
-\r
-            Assert.Fail();\r
-            //var result = container.TryCompose();\r
-\r
-            //Assert.IsTrue(result.Succeeded, "Composition should be successfull because one of two exports meets both the contract name and metadata requirement");\r
-            //Assert.AreEqual(1, result.Issues.Count, "There should be one issue reported about the export who has no required metadata");\r
-            //Assert.IsTrue(result.Issues[0].Description.Contains("Foo"), "The missing required metadata is 'Foo'");\r
-            //Assert.IsNotNull(importer.ValueInfo, "The import should really get bound");\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(468388)]\r
-        [Ignore]\r
-        public void SelectiveImportBasedOnMetadataForExportCollection()\r
-        {\r
-            CompositionContainer container = ContainerFactory.Create();\r
-\r
-            MyImporterWithExportCollectionForSelectiveImport importer;\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new MyExporterWithNoMetadata());\r
-            batch.AddPart(new MyExporterWithMetadata());\r
-            batch.AddPart(importer = new MyImporterWithExportCollectionForSelectiveImport());\r
-\r
-            Assert.Fail();\r
-\r
-            //var result = container.TryCompose();\r
-\r
-            //Assert.IsTrue(result.Succeeded, "Composition should be successfull in anyway for collection import");\r
-            //Assert.AreEqual(1, result.Issues.Count, "There should be one issue reported however, about the export who has no required metadata");\r
-            //Assert.IsTrue(result.Issues[0].Description.Contains("Foo"), "The missing required metadata is 'Foo'");\r
-            //Assert.AreEqual(1, importer.ValueInfoCol.Count, "The export with required metadata should get bound");\r
-            //Assert.IsNotNull(importer.ValueInfoCol[0], "The import should really get bound");\r
-        }\r
-\r
-        \r
-        [TestMethod]\r
-        [WorkItem(472538)]\r
-        [Ignore]\r
-        public void SelectiveImportBasedOnMetadataThruoughComponentCatalogTest()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            SelectiveImportBasedOnMetadataThruoughCatalog(container);\r
-        }\r
-\r
-        private void SelectiveImportBasedOnMetadataThruoughCatalog(CompositionContainer container)\r
-        {\r
-            Assert.Fail("This needs to be fixed, see: 472538");\r
-\r
-            //var export1 = container.GetExport<MyImporterWithExportForSelectiveImport>();\r
-            //export1.TryGetExportedValue().VerifySuccess(CompositionIssueId.RequiredMetadataNotFound);\r
-\r
-            //var export2 = container.GetExport<MyImporterWithExportCollectionForSelectiveImport>();\r
-            //export2.TryGetExportedValue().VerifySuccess(CompositionIssueId.RequiredMetadataNotFound);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildParentContainerTest1()\r
-        {\r
-            CompositionContainer parent = ContainerFactory.Create();\r
-            CompositionContainer child = new CompositionContainer(parent);\r
-\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-            CompositionBatch parentBatch = new CompositionBatch();\r
-            parentBatch.AddPart(new MyExporterWithNoMetadata());\r
-            childBatch.AddPart(new MyExporterWithMetadata());\r
-            parent.Compose(parentBatch);\r
-            child.Compose(childBatch);\r
-\r
-            var exports = child.GetExports(CreateImportDefinition(typeof(IMyExporter), "Foo"));\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildParentContainerTest2()\r
-        {\r
-            CompositionContainer parent = ContainerFactory.Create();\r
-            CompositionContainer child = new CompositionContainer(parent);\r
-\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-            CompositionBatch parentBatch = new CompositionBatch();\r
-            parentBatch.AddPart(new MyExporterWithMetadata());\r
-            childBatch.AddPart(new MyExporterWithNoMetadata());\r
-            parent.Compose(parentBatch);\r
-\r
-            var exports = child.GetExports(CreateImportDefinition(typeof(IMyExporter), "Foo"));\r
-\r
-            Assert.AreEqual(1, exports.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildParentContainerTest3()\r
-        {\r
-            CompositionContainer parent = ContainerFactory.Create();\r
-            CompositionContainer child = new CompositionContainer(parent);\r
-\r
-            CompositionBatch childBatch = new CompositionBatch();\r
-            CompositionBatch parentBatch = new CompositionBatch();\r
-\r
-            parentBatch.AddPart(new MyExporterWithMetadata());\r
-            childBatch.AddPart(new MyExporterWithMetadata());\r
-            parent.Compose(parentBatch);\r
-            child.Compose(childBatch);\r
-\r
-            var exports = child.GetExports(CreateImportDefinition(typeof(IMyExporter), "Foo"));\r
-\r
-            Assert.AreEqual(2, exports.Count(), "There should be two from child and parent container each");\r
-        }\r
-\r
-        private static ImportDefinition CreateImportDefinition(Type type, string metadataKey)\r
-        {\r
-            return new ContractBasedImportDefinition(AttributedModelServices.GetContractName(typeof(IMyExporter)), null, new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>(metadataKey, typeof(object))}, ImportCardinality.ZeroOrMore, true, true, CreationPolicy.Any);\r
-        }\r
-\r
-        #endregion\r
-\r
-        #region Tests for strongly typed metadata as part of contract\r
-\r
-        [TestMethod]\r
-        [WorkItem(468388)]\r
-        [Ignore]\r
-        public void SelectiveImportBySTM_Export()\r
-        {\r
-            CompositionContainer container = ContainerFactory.Create();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            MyImporterWithExportStronglyTypedMetadata importer;\r
-            batch.AddPart(new MyExporterWithNoMetadata());\r
-            batch.AddPart(new MyExporterWithMetadata());\r
-            batch.AddPart(importer = new MyImporterWithExportStronglyTypedMetadata());\r
-\r
-            Assert.Fail();\r
-\r
-            //var result = container.TryCompose();\r
-\r
-            //Assert.IsTrue(result.Succeeded, "Composition should be successful becasue one of two exports does not have required metadata");\r
-            //Assert.AreEqual(1, result.Issues.Count, "There should be an issue reported about the export who has no required metadata");\r
-            //Assert.IsNotNull(importer.ValueInfo, "The valid export should really get bound");\r
-            //Assert.AreEqual("Bar", importer.ValueInfo.Metadata.Foo, "The value of metadata 'Foo' should be 'Bar'");\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(468388)]\r
-        [Ignore]\r
-        public void SelectiveImportBySTM_ExportCollection()\r
-        {\r
-            CompositionContainer container = ContainerFactory.Create();\r
-\r
-            MyImporterWithExportCollectionStronglyTypedMetadata importer;\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            batch.AddPart(new MyExporterWithNoMetadata());\r
-            batch.AddPart(new MyExporterWithMetadata());\r
-            batch.AddPart(importer = new MyImporterWithExportCollectionStronglyTypedMetadata());\r
-\r
-            Assert.Fail();\r
-\r
-            //var result = container.TryCompose();\r
-\r
-            //Assert.IsTrue(result.Succeeded, "Collection import should be successful in anyway");\r
-            //Assert.AreEqual(1, result.Issues.Count, "There should be an issue reported about the export with no required metadata");\r
-            //Assert.AreEqual(1, importer.ValueInfoCol.Count, "There should be only one export got bound");\r
-            //Assert.AreEqual("Bar", importer.ValueInfoCol.First().Metadata.Foo, "The value of metadata 'Foo' should be 'Bar'");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SelectiveImportBySTMThroughComponentCatalog1()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            SelectiveImportBySTMThroughCatalog1(container);\r
-        }\r
-\r
-        public void SelectiveImportBySTMThroughCatalog1(CompositionContainer container)\r
-        {\r
-            Assert.IsNotNull(container.GetExport<IMyExporter, IMetadataView>());\r
-\r
-            var result2 = container.GetExports<IMyExporter, IMetadataView>();\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(468388)]\r
-        [Ignore]\r
-        public void SelectiveImportBySTMThroughComponentCatalog2()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-            SelectiveImportBySTMThroughCatalog2(container);\r
-        }\r
-\r
-        public void SelectiveImportBySTMThroughCatalog2(CompositionContainer container)\r
-        {\r
-            Assert.Fail("This needs to be fixed, see: 472538");\r
-\r
-            //var export1 = container.GetExport<MyImporterWithExportStronglyTypedMetadata>();\r
-            //var result1 = export1.TryGetExportedValue().VerifySuccess(CompositionIssueId.RequiredMetadataNotFound);\r
-            //Assert.IsNotNull(result1.Value.ValueInfo, "The valid export should really get bound");\r
-            //Assert.AreEqual("Bar", result1.Value.ValueInfo.Metadata.Foo, "The value of metadata 'Foo' should be 'Bar'");\r
-\r
-            //var export2 = container.GetExport<MyImporterWithExportCollectionStronglyTypedMetadata>();\r
-            //var result2 = export2.TryGetExportedValue().VerifySuccess(CompositionIssueId.RequiredMetadataNotFound);\r
-            //Assert.AreEqual(1, result2.Value.ValueInfoCol.Count, "There should be only one export got bound");\r
-            //Assert.AreEqual("Bar", result2.Value.ValueInfoCol.First().Metadata.Foo, "The value of metadata 'Foo' should be 'Bar'");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestMultipleStronglyTypedAttributes()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-\r
-            var export = container.GetExport<ExportMultiple, IMyOptions>();\r
-            EnumerableAssert.AreEqual(export.Metadata.OptionNames.OrderBy(s => s), "name1", "name2", "name3");\r
-            EnumerableAssert.AreEqual(export.Metadata.OptionValues.OrderBy(o => o.ToString()), "value1", "value2", "value3");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestMultipleStronglyTypedAttributesAsIEnumerable()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-\r
-            var export = container.GetExport<ExportMultiple, IMyOptionsAsIEnumerable>();\r
-            EnumerableAssert.AreEqual(export.Metadata.OptionNames.OrderBy(s => s), "name1", "name2", "name3");\r
-            EnumerableAssert.AreEqual(export.Metadata.OptionValues.OrderBy(o => o.ToString()), "value1", "value2", "value3");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestMultipleStronglyTypedAttributesAsArray()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-\r
-            var export = container.GetExport<ExportMultiple, IMyOptionsAsArray>();\r
-            EnumerableAssert.AreEqual(export.Metadata.OptionNames.OrderBy(s => s), "name1", "name2", "name3");\r
-            EnumerableAssert.AreEqual(export.Metadata.OptionValues.OrderBy(o => o.ToString()), "value1", "value2", "value3");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestMultipleStronglyTypedAttributesWithInvalidType()\r
-        {\r
-            var container = ContainerFactory.CreateWithDefaultAttributedCatalog();\r
-\r
-            // IMyOption2 actually contains all the correct properties but just the wrong types. This should cause us to not match the exports by metadata\r
-            var exports = container.GetExports<ExportMultiple, IMyOption2>();\r
-            Assert.AreEqual(0, exports.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestOptionalMetadataValueTypeMismatch()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(OptionalFooIsInt));\r
-            var exports = container.GetExports<OptionalFooIsInt, IMetadataView>();\r
-            Assert.AreEqual(1, exports.Count());\r
-            var export = exports.Single();\r
-            Assert.AreEqual(null, export.Metadata.OptionalFoo);\r
-        }\r
-\r
-        #endregion\r
-\r
-\r
-        [ExportMetadata("Name", "FromBaseType")]\r
-        public abstract class BaseClassWithMetadataButNoExport\r
-        {\r
-        }\r
-\r
-        [Export(typeof(BaseClassWithMetadataButNoExport))]\r
-        public class DerivedClassWithExportButNoMetadata : BaseClassWithMetadataButNoExport\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Metadata_BaseClassWithMetadataButNoExport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(BaseClassWithMetadataButNoExport),\r
-                typeof(DerivedClassWithExportButNoMetadata));\r
-\r
-            var export = container.GetExport<BaseClassWithMetadataButNoExport, IDictionary<string, object>>();\r
-\r
-            Assert.IsFalse(export.Metadata.ContainsKey("Name"), "Export should only contain metadata from the derived!");\r
-        }\r
-\r
-        [InheritedExport(typeof(BaseClassWithExportButNoMetadata))]\r
-        public abstract class BaseClassWithExportButNoMetadata\r
-        {\r
-        }\r
-\r
-\r
-        [ExportMetadata("Name", "FromDerivedType")]\r
-        public class DerivedClassMetadataButNoExport : BaseClassWithExportButNoMetadata\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Metadata_BaseClassWithExportButNoMetadata()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(BaseClassWithExportButNoMetadata),\r
-                typeof(DerivedClassMetadataButNoExport));\r
-\r
-            var export = container.GetExport<BaseClassWithExportButNoMetadata, IDictionary<string, object>>();\r
-\r
-            Assert.IsFalse(export.Metadata.ContainsKey("Name"), "Export should only contain metadata from the base!");\r
-        }\r
-\r
-        [Export(typeof(BaseClassWithExportAndMetadata))]\r
-        [ExportMetadata("Name", "FromBaseType")]\r
-        public class BaseClassWithExportAndMetadata\r
-        {\r
-        }\r
-\r
-        [Export(typeof(DerivedClassWithExportAndMetadata))]\r
-        [ExportMetadata("Name", "FromDerivedType")]\r
-        public class DerivedClassWithExportAndMetadata : BaseClassWithExportAndMetadata\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Metadata_BaseAndDerivedWithExportAndMetadata()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(BaseClassWithExportAndMetadata),\r
-                typeof(DerivedClassWithExportAndMetadata));\r
-\r
-            var exportBase = container.GetExport<BaseClassWithExportAndMetadata, IDictionary<string, object>>();\r
-\r
-            Assert.AreEqual("FromBaseType", exportBase.Metadata["Name"]);\r
-\r
-            var exportDerived = container.GetExport<DerivedClassWithExportAndMetadata, IDictionary<string, object>>();\r
-            Assert.AreEqual("FromDerivedType", exportDerived.Metadata["Name"]);\r
-        }\r
-\r
-        [Export]\r
-        [ExportMetadata("Data", null, IsMultiple=true)]\r
-        [ExportMetadata("Data", false, IsMultiple=true)]\r
-        [ExportMetadata("Data", Int16.MaxValue, IsMultiple = true)]\r
-        [ExportMetadata("Data", Int32.MaxValue, IsMultiple = true)]\r
-        [ExportMetadata("Data", Int64.MaxValue, IsMultiple = true)]\r
-        [ExportMetadata("Data", UInt16.MaxValue, IsMultiple = true)]\r
-        [ExportMetadata("Data", UInt32.MaxValue, IsMultiple = true)]\r
-        [ExportMetadata("Data", UInt64.MaxValue, IsMultiple = true)]\r
-        [ExportMetadata("Data", "String", IsMultiple = true)]\r
-        [ExportMetadata("Data", typeof(ClassWithLotsOfDifferentMetadataTypes), IsMultiple = true)]\r
-        [ExportMetadata("Data", CreationPolicy.NonShared, IsMultiple=true)]\r
-        [ExportMetadata("Data", new object[] { 1, 2, null }, IsMultiple=true)]\r
-        [CLSCompliant(false)]\r
-        public class ClassWithLotsOfDifferentMetadataTypes\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithValidCollectionOfMetadata_ShouldDiscoverAllMetadata()\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed(typeof(ClassWithLotsOfDifferentMetadataTypes));\r
-\r
-            var export = catalog.Parts.First().ExportDefinitions.First();\r
-\r
-            var data = (object[])export.Metadata["Data"];\r
-\r
-            Assert.AreEqual(12, data.Length);\r
-        }\r
-\r
-        [Export]\r
-        [ExportMetadata("Data", null, IsMultiple = true)]\r
-        [ExportMetadata("Data", 1, IsMultiple = true)]\r
-        [ExportMetadata("Data", 2, IsMultiple = true)]\r
-        [ExportMetadata("Data", 3, IsMultiple = true)]\r
-        public class ClassWithIntCollectionWithNullValue\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithIntCollectionPlusNullValueOfMetadata_ShouldDiscoverAllMetadata()\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed(typeof(ClassWithIntCollectionWithNullValue));\r
-\r
-            var export = catalog.Parts.First().ExportDefinitions.First();\r
-\r
-            var data = (object[])export.Metadata["Data"];\r
-\r
-            Assert.IsNotInstanceOfType(data, typeof(int[]));\r
-\r
-            Assert.AreEqual(4, data.Length);\r
-        }\r
-\r
-        [AttributeUsage(AttributeTargets.Class, AllowMultiple=true)]\r
-        [MetadataAttribute]\r
-        public class DataAttribute : Attribute\r
-        {\r
-            public object Object { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        [Data(Object="42")]\r
-        [Data(Object = "10")]\r
-        public class ExportWithMultipleMetadata_ExportStringsAsObjects\r
-        {\r
-        }\r
-\r
-        [Export]\r
-        [Data(Object = "42")]\r
-        [Data(Object = "10")]\r
-        [Data(Object = null)]\r
-        public class ExportWithMultipleMetadata_ExportStringsAsObjects_WithNull\r
-        {\r
-        }\r
-\r
-        [Export]\r
-        [Data(Object = 42)]\r
-        [Data(Object = 10)]\r
-        public class ExportWithMultipleMetadata_ExportIntsAsObjects\r
-        {\r
-        }\r
-\r
-        [Export]\r
-        [Data(Object = null)]\r
-        [Data(Object = 42)]\r
-        [Data(Object = 10)]\r
-        public class ExportWithMultipleMetadata_ExportIntsAsObjects_WithNull\r
-        {\r
-        }\r
-\r
-        public interface IObjectView_AsStrings\r
-        {\r
-            string[] Object { get; }\r
-        }\r
-\r
-        public interface IObjectView_AsInts\r
-        {\r
-            int[] Object { get; }\r
-        }\r
-\r
-        public interface IObjectView\r
-        {\r
-            object[] Object { get; }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportStringsAsObjects_ShouldDiscoverMetadataAsStrings()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new ExportWithMultipleMetadata_ExportStringsAsObjects());\r
-\r
-            var export = container.GetExport<ExportWithMultipleMetadata_ExportStringsAsObjects, IObjectView_AsStrings>();\r
-            Assert.IsNotNull(export);\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-            Assert.IsNotNull(export.Metadata.Object);\r
-            Assert.AreEqual(2, export.Metadata.Object.Length);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportStringsAsObjects_With_Null_ShouldDiscoverMetadataAsStrings()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new ExportWithMultipleMetadata_ExportStringsAsObjects_WithNull());\r
-\r
-            var export = container.GetExport<ExportWithMultipleMetadata_ExportStringsAsObjects_WithNull, IObjectView_AsStrings>();\r
-            Assert.IsNotNull(export);\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-            Assert.IsNotNull(export.Metadata.Object);\r
-            Assert.AreEqual(3, export.Metadata.Object.Length);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportIntsAsObjects_ShouldDiscoverMetadataAsInts()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new ExportWithMultipleMetadata_ExportIntsAsObjects());\r
-\r
-            var export = container.GetExport<ExportWithMultipleMetadata_ExportIntsAsObjects, IObjectView_AsInts>();\r
-            Assert.IsNotNull(export);\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-            Assert.IsNotNull(export.Metadata.Object);\r
-            Assert.AreEqual(2, export.Metadata.Object.Length);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportIntsAsObjects_With_Null_ShouldDiscoverMetadataAsObjects()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new ExportWithMultipleMetadata_ExportIntsAsObjects_WithNull());\r
-\r
-            var exports = container.GetExports<ExportWithMultipleMetadata_ExportIntsAsObjects_WithNull, IObjectView_AsInts>();\r
-            Assert.IsFalse(exports.Any());\r
-\r
-            var export = container.GetExport<ExportWithMultipleMetadata_ExportIntsAsObjects_WithNull, IObjectView>();\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-            Assert.IsNotNull(export.Metadata.Object);\r
-            Assert.AreEqual(3, export.Metadata.Object.Length);\r
-        }\r
-\r
-        [MetadataAttribute]\r
-        [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]\r
-        public class OrderAttribute : Attribute\r
-        {\r
-            public string Before { get; set; }\r
-            public string After { get; set; }\r
-        }\r
-\r
-        public interface IOrderMetadataView\r
-        {\r
-            string[] Before { get; }\r
-            string[] After { get; }\r
-        }\r
-\r
-        [Export]\r
-        [Order(Before = "Step3")]\r
-        [Order(Before = "Step2")]\r
-        public class OrderedItemBeforesOnly\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportStringsAndNulls_ThroughMetadataAttributes()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new OrderedItemBeforesOnly());\r
-\r
-            var export = container.GetExport<OrderedItemBeforesOnly, IOrderMetadataView>();\r
-            Assert.IsNotNull(export);\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-\r
-            Assert.IsNotNull(export.Metadata.Before);\r
-            Assert.IsNotNull(export.Metadata.After);\r
-\r
-            Assert.AreEqual(2, export.Metadata.Before.Length);\r
-            Assert.AreEqual(2, export.Metadata.After.Length);\r
-\r
-            Assert.IsNotNull(export.Metadata.Before[0]);\r
-            Assert.IsNotNull(export.Metadata.Before[1]);\r
-\r
-            Assert.IsNull(export.Metadata.After[0]);\r
-            Assert.IsNull(export.Metadata.After[1]);\r
-        }\r
-\r
-        [MetadataAttribute]\r
-        [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]\r
-        public class DataTypeAttribute : Attribute\r
-        {\r
-            public Type Type { get; set; }\r
-        }\r
-\r
-        public interface ITypesMetadataView\r
-        {\r
-            Type[] Type { get; }\r
-        }\r
-\r
-        [Export]\r
-        [DataType(Type = typeof(int))]\r
-        [DataType(Type = typeof(string))]\r
-        public class ItemWithTypeExports\r
-        {\r
-        }\r
-\r
-        [Export]\r
-        [DataType(Type = typeof(int))]\r
-        [DataType(Type = typeof(string))]\r
-        [DataType(Type = null)]\r
-        public class ItemWithTypeExports_WithNulls\r
-        {\r
-        }\r
-\r
-        [Export]\r
-        [DataType(Type = null)]\r
-        [DataType(Type = null)]\r
-        [DataType(Type = null)]\r
-        public class ItemWithTypeExports_WithAllNulls\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportTypes()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new ItemWithTypeExports());\r
-\r
-            var export = container.GetExport<ItemWithTypeExports, ITypesMetadataView>();\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-            Assert.IsNotNull(export.Metadata.Type);\r
-            Assert.AreEqual(2, export.Metadata.Type.Length);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportTypes_WithNulls()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new ItemWithTypeExports_WithNulls());\r
-\r
-            var export = container.GetExport<ItemWithTypeExports_WithNulls, ITypesMetadataView>();\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-            Assert.IsNotNull(export.Metadata.Type);\r
-            Assert.AreEqual(3, export.Metadata.Type.Length);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportWithMultipleMetadata_ExportTypes_WithAllNulls()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.ComposeParts(new ItemWithTypeExports_WithAllNulls());\r
-\r
-            var export = container.GetExport<ItemWithTypeExports_WithAllNulls, ITypesMetadataView>();\r
-\r
-            Assert.IsNotNull(export.Metadata);\r
-            Assert.IsNotNull(export.Metadata.Type);\r
-            Assert.AreEqual(3, export.Metadata.Type.Length);\r
-\r
-            Assert.IsNull(export.Metadata.Type[0]);\r
-            Assert.IsNull(export.Metadata.Type[1]);\r
-            Assert.IsNull(export.Metadata.Type[2]);\r
-        }\r
-        [Export]\r
-        [ExportMetadata(null, "ValueOfNullKey")]\r
-        public class ClassWithNullMetadataKey\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportMetadataWithNullKey_ShouldUseEmptyString()\r
-        {\r
-            var nullMetadataCatalog = CatalogFactory.CreateAttributed(typeof(ClassWithNullMetadataKey));\r
-            var nullMetadataExport = nullMetadataCatalog.Parts.Single().ExportDefinitions.Single();\r
-\r
-            Assert.IsTrue(nullMetadataExport.Metadata.ContainsKey(string.Empty));\r
-            Assert.AreEqual("ValueOfNullKey", nullMetadataExport.Metadata[string.Empty]);\r
-        }\r
-\r
-    }\r
-\r
-\r
-\r
-\r
-\r
-    // Tests for metadata issues on export\r
-\r
-    [Export]\r
-    [ExportMetadata("foo", "bar1", IsMultiple = true)]\r
-    [ExportMetadata("foo", "bar2", IsMultiple = true)]\r
-    [ExportMetadata("acme", "acmebar", IsMultiple = true)]\r
-    [ExportMetadata("acme", 2.0, IsMultiple = true)]\r
-    [ExportMetadata("hello", "world")]\r
-    [GoodStrongMetadata]\r
-    public class MyExporterWithValidMetadata\r
-    {\r
-        [Export("ContractForValidMetadata")]\r
-        [ExportMetadata("bar", "foo1", IsMultiple = true)]\r
-        [ExportMetadata("bar", "foo2", IsMultiple = true)]\r
-        [ExportMetadata("stuff", "acmebar", IsMultiple = true)]\r
-        [ExportMetadata("stuff", 2.0, IsMultiple = true)]\r
-        [ExportMetadata("world", "hello")] // the order of the attribute should not affect the result\r
-        [GoodStrongMetadata]\r
-        public double DoSomething() { return 0.618; }\r
-    }\r
-\r
-    [AttributeUsage(AttributeTargets.All, AllowMultiple = false)]\r
-    [MetadataAttribute]\r
-    public class GoodStrongMetadata : Attribute\r
-    {\r
-        public string GoodOne2 { get { return "GoodOneValue2"; } }\r
-        public string ConflictedOne1 { get { return "ConflictedOneValue1"; } }\r
-        public string ConflictedOne2 { get { return "ConflictedOneValue2"; } }\r
-    }\r
-    \r
-    // Tests for metadata as part of contract\r
-\r
-    public interface IMyExporter { }\r
-\r
-    [Export]\r
-    [Export(typeof(IMyExporter))]\r
-    public class MyExporterWithNoMetadata : IMyExporter\r
-    {\r
-    }\r
-\r
-    [Export]\r
-    [Export(typeof(IMyExporter))]\r
-    [ExportMetadata("Foo", "Bar")]\r
-    public class MyExporterWithMetadata : IMyExporter\r
-    {\r
-    }\r
-\r
-\r
-    public interface IMetadataFoo\r
-    {\r
-        string Foo { get; }\r
-    }\r
-\r
-    public interface IMetadataBar\r
-    {\r
-        string Bar { get; }\r
-    }\r
-\r
-    [Export]\r
-    public class MyImporterWithExport\r
-    {\r
-        [Import(typeof(MyExporterWithNoMetadata))]\r
-        public Lazy<MyExporterWithNoMetadata, IMetadataFoo> ValueInfo { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class SingleImportWithAllowDefault\r
-    {\r
-        [Import("Import", AllowDefault = true)]\r
-        public Lazy<object> Import { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class SingleImport\r
-    {\r
-        [Import("Import")]\r
-        public Lazy<object> Import { get; set; }\r
-    }\r
-\r
-    public interface IFooMetadataView\r
-    {\r
-        string Foo { get; }\r
-    }\r
-\r
-    [Export]\r
-    public class MyImporterWithExportCollection\r
-    {\r
-        [ImportMany(typeof(MyExporterWithNoMetadata))]\r
-        public IEnumerable<Lazy<MyExporterWithNoMetadata, IFooMetadataView>> ValueInfoCol { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class MyImporterWithExportForSelectiveImport\r
-    {\r
-        [Import]\r
-        public Lazy<IMyExporter, IFooMetadataView> ValueInfo { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class MyImporterWithExportCollectionForSelectiveImport\r
-    {\r
-        [ImportMany]\r
-        public Collection<Lazy<IMyExporter, IFooMetadataView>> ValueInfoCol { get; set; }\r
-    }\r
-\r
-    public interface IMetadataView\r
-    {\r
-        string Foo { get; }\r
-\r
-        [System.ComponentModel.DefaultValue(null)]\r
-        string OptionalFoo { get; }\r
-    }\r
-\r
-    [Export]\r
-    [ExportMetadata("Foo", "fooValue3")]\r
-    [ExportMetadata("OptionalFoo", 42)]\r
-    public class OptionalFooIsInt { }\r
-\r
-    [Export]\r
-    public class MyImporterWithExportStronglyTypedMetadata\r
-    {\r
-        [Import]\r
-        public Lazy<IMyExporter, IMetadataView> ValueInfo { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class MyImporterWithExportCollectionStronglyTypedMetadata\r
-    {\r
-        [ImportMany]\r
-        public Collection<Lazy<IMyExporter, IMetadataView>> ValueInfoCol { get; set; }\r
-    }\r
-\r
-    public class MyExporterWithFullMetadata\r
-    {\r
-        [Export("MyStringContract")]\r
-        public string String1 { get { return "String1"; } }\r
-\r
-        [Export("MyStringContract")]\r
-        [ExportMetadata("Foo", "fooValue")]\r
-        public string String2 { get { return "String2"; } }\r
-\r
-        [Export("MyStringContract")]\r
-        [ExportMetadata("Bar", "barValue")]\r
-        public string String3 { get { return "String3"; } }\r
-\r
-        [Export("MyStringContract")]\r
-        [ExportMetadata("Foo", "fooValue")]\r
-        [ExportMetadata("Bar", "barValue")]\r
-        public string String4 { get { return "String4"; } }\r
-    }\r
-\r
-    [MetadataAttribute]\r
-    [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]\r
-    public class MyOption : Attribute\r
-    {\r
-        public MyOption(string name, object value)\r
-        {\r
-            OptionNames = name;\r
-            OptionValues = value;\r
-        }\r
-        public string OptionNames { get; set; }\r
-        public object OptionValues { get; set; }\r
-    }\r
-\r
-    public interface IMyOptions\r
-    {\r
-        IList<string> OptionNames { get; }\r
-        ICollection<string> OptionValues { get; }\r
-    }\r
-\r
-    public interface IMyOptionsAsIEnumerable\r
-    {\r
-        IEnumerable<string> OptionNames { get; }\r
-        IEnumerable<string> OptionValues { get; }\r
-    }\r
-\r
-    public interface IMyOptionsAsArray\r
-    {\r
-        string[] OptionNames { get; }\r
-        string[] OptionValues { get; }\r
-    }\r
-\r
-    [Export]\r
-    [MyOption("name1", "value1")]\r
-    [MyOption("name2", "value2")]\r
-    [ExportMetadata("OptionNames", "name3", IsMultiple = true)]\r
-    [ExportMetadata("OptionValues", "value3", IsMultiple = true)]\r
-    public class ExportMultiple\r
-    {\r
-    }\r
-\r
-    public interface IMyOption2\r
-    {\r
-        string OptionNames { get; }\r
-        string OptionValues { get; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataViewProviderTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MetadataViewProviderTests.cs
deleted file mode 100644 (file)
index 862402c..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Reflection;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class MetadataViewProviderTests\r
-    {\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_InterfaceWithPropertySetter_ShouldThrowNotSupported()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = "value";\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataViewWithPropertySetter>(metadata);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_InterfaceWithMethod_ShouldThrowNotSupportedException()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = "value";\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataViewWithMethod>(metadata);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_InterfaceWithEvent_ShouldThrowNotSupportedException()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = "value";\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataViewWithEvent>(metadata);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_InterfaceWithIndexer_ShouldThrowNotSupportedException()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = "value";\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataViewWithIndexer>(metadata);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_AbstractClass_ShouldThrowMissingMethodException()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = "value";\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<AbstractClassMetadataView>(metadata);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_AbstractClassWithConstructor_ShouldThrowMemberAccessException()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = "value";\r
-\r
-            ExceptionAssert.Throws<MemberAccessException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<AbstractClassWithConstructorMetadataView>(metadata);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IDictionaryAsTMetadataViewTypeArgument_ShouldReturnMetadata()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-\r
-            var result = MetadataViewProvider.GetMetadataView<IDictionary<string, object>>(metadata);\r
-\r
-            Assert.AreSame(metadata, result);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IEnumerableAsTMetadataViewTypeArgument_ShouldReturnMetadata()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-\r
-            var result = MetadataViewProvider.GetMetadataView<IEnumerable<KeyValuePair<string, object>>>(metadata);\r
-\r
-            Assert.AreSame(metadata, result);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_DictionaryAsTMetadataViewTypeArgument_ShouldNotThrow()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            MetadataViewProvider.GetMetadataView<Dictionary<string, object>>(metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_PrivateInterfaceAsTMetadataViewTypeArgument_ShouldhrowNotSupportedException()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["CanActivate"] = true;\r
-\r
-            ExceptionAssert.Throws<NotSupportedException>(() =>\r
-                {\r
-                    MetadataViewProvider.GetMetadataView<IActivator>(metadata);\r
-                });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_DictionaryWithUncastableValueAsMetadataArgument_ShouldThrowCompositionContractMismatchException()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = true;\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataView>(metadata);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_InterfaceWithTwoPropertiesWithSameNameDifferentTypeAsTMetadataViewArgument_ShouldThrowContractMismatch()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = 10;\r
-\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataView2>(metadata);\r
-            });            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_RawMetadata()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = 10;\r
-\r
-            var view = MetadataViewProvider.GetMetadataView<RawMetadata>(new Dictionary<string, object>(metadata));\r
-\r
-            Assert.IsTrue(view.Count == metadata.Count);\r
-            Assert.IsTrue(view["Value"] == metadata["Value"]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_InterfaceInheritance()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = "value";\r
-            metadata["Value2"] = "value2";\r
-\r
-            var view = MetadataViewProvider.GetMetadataView<IMetadataView3>(metadata);\r
-            Assert.AreEqual("value", view.Value);\r
-            Assert.AreEqual("value2", view.Value2);\r
-        }\r
-        \r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_CachesViewType()\r
-        {\r
-            var metadata1 = new Dictionary<string, object>();\r
-            metadata1["Value"] = "value1";\r
-            var view1 = MetadataViewProvider.GetMetadataView<IMetadataView>(metadata1);\r
-            Assert.AreEqual("value1", view1.Value);\r
-\r
-            var metadata2 = new Dictionary<string, object>();\r
-            metadata2["Value"] = "value2";\r
-            var view2 = MetadataViewProvider.GetMetadataView<IMetadataView>(metadata2);\r
-            Assert.AreEqual("value2", view2.Value);\r
-\r
-            Assert.AreEqual(view1.GetType(), view2.GetType());\r
-        }\r
-\r
-        private interface IActivator\r
-        {\r
-            bool CanActivate\r
-            {\r
-                get;\r
-            }\r
-        }\r
-        public class RawMetadata : Dictionary<string, object>\r
-        {\r
-            public RawMetadata(IDictionary<string, object> dictionary) : base(dictionary) { }\r
-        }\r
-\r
-        public interface IMetadataView\r
-        {\r
-            string Value\r
-            {\r
-                get;\r
-            }\r
-        }\r
-\r
-        public interface IMetadataView2 : IMetadataView\r
-        {\r
-            new int Value\r
-            {\r
-                get;\r
-            }\r
-        }\r
-\r
-        public interface IMetadataView3 : IMetadataView\r
-        {\r
-            string Value2\r
-            {\r
-                get;\r
-            }\r
-        }\r
-\r
-        public interface IMetadataViewWithPropertySetter\r
-        {\r
-            string Value\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        public interface IMetadataViewWithMethod\r
-        {\r
-            string Value\r
-            {\r
-                get;\r
-            }\r
-            void Method();\r
-        }\r
-\r
-        public interface IMetadataViewWithEvent\r
-        {\r
-            string Value\r
-            {\r
-                get;\r
-            }\r
-            event EventHandler TestEvent;\r
-        }\r
-\r
-        public interface IMetadataViewWithIndexer\r
-        {\r
-            string Value\r
-            {\r
-                get;\r
-            }\r
-            string this[object o] { get; }\r
-        }\r
-\r
-        public abstract class AbstractClassMetadataView\r
-        {\r
-            public abstract object Value { get; }\r
-        }\r
-\r
-        public abstract class AbstractClassWithConstructorMetadataView\r
-        {\r
-            public AbstractClassWithConstructorMetadataView(IDictionary<string, object> metadata) {}\r
-            public abstract object Value { get; }\r
-        }\r
-\r
-        public interface IMetadataViewWithDefaultedInt\r
-        {\r
-            [DefaultValue(120)]\r
-            int MyInt { get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IMetadataViewWithDefaultedInt()\r
-        {\r
-            var view = MetadataViewProvider.GetMetadataView<IMetadataViewWithDefaultedInt>(new Dictionary<string, object>());\r
-            Assert.AreEqual(120, view.MyInt);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IMetadataViewWithDefaultedIntAndInvalidMetadata()\r
-        {\r
-            Dictionary<string, object> metadata = new Dictionary<string, object>();\r
-            metadata = new Dictionary<string, object>();\r
-            metadata.Add("MyInt", 1.2);\r
-            var view1 = MetadataViewProvider.GetMetadataView<IMetadataViewWithDefaultedInt>(metadata);\r
-            Assert.AreEqual(120, view1.MyInt);\r
-\r
-            metadata = new Dictionary<string, object>();\r
-            metadata.Add("MyInt", "Hello, World");\r
-            var view2 = MetadataViewProvider.GetMetadataView<IMetadataViewWithDefaultedInt>(metadata);\r
-            Assert.AreEqual(120, view2.MyInt);\r
-        }\r
-\r
-\r
-        public interface IMetadataViewWithDefaultedBool\r
-        {\r
-            [DefaultValue(false)]\r
-            bool MyBool { get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IMetadataViewWithDefaultedBool()\r
-        {\r
-            var view = MetadataViewProvider.GetMetadataView<IMetadataViewWithDefaultedBool>(new Dictionary<string, object>());\r
-            Assert.AreEqual(false, view.MyBool);\r
-        }\r
-\r
-        public interface IMetadataViewWithDefaultedInt64\r
-        {\r
-            [DefaultValue(Int64.MaxValue)]\r
-            Int64 MyInt64 { get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IMetadataViewWithDefaultedInt64()\r
-        {\r
-            var view = MetadataViewProvider.GetMetadataView<IMetadataViewWithDefaultedInt64>(new Dictionary<string, object>());\r
-            Assert.AreEqual(Int64.MaxValue, view.MyInt64);\r
-        }\r
-\r
-        public interface IMetadataViewWithDefaultedString\r
-        {\r
-            [DefaultValue("MyString")]\r
-            string MyString { get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IMetadataViewWithDefaultedString()\r
-        {\r
-            var view = MetadataViewProvider.GetMetadataView<IMetadataViewWithDefaultedString>(new Dictionary<string, object>());\r
-            Assert.AreEqual("MyString", view.MyString);\r
-        }\r
-\r
-        public interface IMetadataViewWithTypeMismatchDefaultValue\r
-        {\r
-            [DefaultValue("Strings can't cast to numbers")]\r
-            int MyInt { get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IMetadataViewWithTypeMismatchDefaultValue()\r
-        {\r
-            var exception = ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataViewWithTypeMismatchDefaultValue>(new Dictionary<string, object>());\r
-            });\r
-\r
-            Assert.IsInstanceOfType(exception.InnerException, typeof(TargetInvocationException));\r
-        }\r
-\r
-\r
-        public interface IMetadataViewUnboxAsInt\r
-        {\r
-            int Value { get; }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void GetMetadataView_IMetadataViewWithTypeMismatchOnUnbox()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = (short)9999;\r
-\r
-            var exception = ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IMetadataViewWithTypeMismatchDefaultValue>(new Dictionary<string, object>());\r
-            });\r
-\r
-            Assert.IsInstanceOfType(exception.InnerException, typeof(TargetInvocationException));\r
-        }\r
-\r
-        public interface IHasInt32\r
-        {\r
-            Int32 Value { get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestMetadataIntConversion()\r
-        {\r
-            var metadata = new Dictionary<string, object>();\r
-            metadata["Value"] = (Int64)45;\r
-\r
-            var exception = ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-            {\r
-                MetadataViewProvider.GetMetadataView<IHasInt32>(metadata);\r
-            });\r
-        }\r
-\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MicroExport.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/MicroExport.cs
deleted file mode 100644 (file)
index 3303f4d..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal class MicroExport\r
-    {\r
-        public MicroExport(Type contractType, params object[] exportedValues)\r
-            : this(AttributedModelServices.GetContractName(contractType), contractType, (IDictionary<string, object>)null, exportedValues)\r
-        {\r
-        }\r
-\r
-        public MicroExport(string contractName, params object[] exportedValues)\r
-            : this(contractName, exportedValues[0].GetType(), (IDictionary<string, object>)null, exportedValues)\r
-        {\r
-        }\r
-\r
-        public MicroExport(Type contractType, IDictionary<string, object> metadata, params object[] exportedValues)\r
-            : this(AttributedModelServices.GetContractName(contractType), exportedValues[0].GetType(), metadata, exportedValues)\r
-        {\r
-        }\r
-\r
-        public MicroExport(string contractName, Type contractType, params object[] exportedValues)\r
-            : this(contractName, contractType, (IDictionary<string, object>)null, exportedValues)\r
-        {\r
-        }\r
-\r
-        public MicroExport(string contractName, IDictionary<string, object> metadata, params object[] exportedValues)\r
-            : this(contractName, exportedValues[0].GetType(), metadata, exportedValues)\r
-        {\r
-        }\r
-\r
-        public MicroExport(string contractName, Type contractType, IDictionary<string, object> metadata, params object[] exportedValues)\r
-        {\r
-            this.ContractName = contractName;\r
-            this.ExportedValues = exportedValues;\r
-\r
-            if (contractType != null)\r
-            {\r
-                string typeIdentity = AttributedModelServices.GetTypeIdentity(contractType);\r
-\r
-                if (metadata == null)\r
-                {\r
-                    metadata = new Dictionary<string, object>();\r
-                }\r
-\r
-                object val;\r
-                if (!metadata.TryGetValue(CompositionConstants.ExportTypeIdentityMetadataName, out val))\r
-                {\r
-                    metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, AttributedModelServices.GetTypeIdentity(contractType));\r
-                }\r
-            }\r
-            this.Metadata = metadata;\r
-        }\r
-\r
-        public string ContractName\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public object[] ExportedValues\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IDictionary<string, object> Metadata\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/PartCreationPolicyAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/PartCreationPolicyAttributeTests.cs
deleted file mode 100644 (file)
index cbcac9c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class PartCreationPolicyAttributeTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_ShouldSetCreationPolicyToGivenValue()\r
-        {\r
-            var expectations = Expectations.GetEnumValues<CreationPolicy>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new PartCreationPolicyAttribute(e);\r
-\r
-                Assert.AreEqual(e, attribute.CreationPolicy);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_OutOfRangeValueAsCreationPolicyArgument_ShouldSetCreationPolicy()\r
-        {   // Attributes should not throw exceptions\r
-\r
-            var expectations = Expectations.GetInvalidEnumValues<CreationPolicy>();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new PartCreationPolicyAttribute(e);\r
-\r
-                Assert.AreEqual(e, attribute.CreationPolicy);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/PartMetadataAttributeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/PartMetadataAttributeTests.cs
deleted file mode 100644 (file)
index 54722a3..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class PartMetadataAttributeTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsNameArgument_ShouldSetNamePropertyToEmptyString()\r
-        {\r
-            var attribute = new PartMetadataAttribute((string)null, "Value");\r
-\r
-            Assert.AreEqual(string.Empty, attribute.Name);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsNameArgument_ShouldSetNameProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadataNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new PartMetadataAttribute(e, "Value");\r
-\r
-                Assert.AreEqual(e, attribute.Name);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsValueArgument_ShouldSetValueProperty()\r
-        {\r
-            var expectations = Expectations.GetMetadataValues();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var attribute = new PartMetadataAttribute("Name", e);\r
-\r
-                Assert.AreEqual(e, attribute.Value);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/.gitattributes
deleted file mode 100644 (file)
index 2c06c29..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-/ComposablePartCatalogDebuggerProxyTests.cs -crlf
-/ComposablePartCatalogTests.cs -crlf
-/CompositionElementDebuggerProxyTests.cs -crlf
-/CompositionElementTests.cs -crlf
-/SerializableCompositionElementTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/ComposablePartCatalogDebuggerProxyTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/ComposablePartCatalogDebuggerProxyTests.cs
deleted file mode 100644 (file)
index 4bf0be6..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    [TestClass]\r
-    public class ComposablePartCatalogDebuggerProxyTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsCatalogArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("catalog", () =>\r
-            {\r
-                new ComposablePartCatalogDebuggerProxy((ComposablePartCatalog)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsCatalogArgument_ShouldSetPartsProperty()\r
-        {\r
-            var expectations = Expectations.GetCatalogs();\r
-            foreach (var e in expectations)\r
-            {\r
-                var proxy = new ComposablePartCatalogDebuggerProxy(e);\r
-\r
-                EnumerableAssert.AreSequenceEqual(e.Parts, proxy.Parts);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void Parts_ShouldNotCacheUnderlyingParts()\r
-        {\r
-            var catalog = CatalogFactory.CreateAggregateCatalog();\r
-            var proxy = CreateComposablePartCatalogDebuggerProxy(catalog);\r
-\r
-            EnumerableAssert.IsEmpty(proxy.Parts);\r
-\r
-            var expectations = Expectations.GetCatalogs();\r
-            foreach (var e in expectations)\r
-            {\r
-                catalog.Catalogs.Add(e);\r
-\r
-                EnumerableAssert.AreSequenceEqual(catalog.Parts, proxy.Parts);\r
-\r
-                catalog.Catalogs.Remove(e);\r
-            }\r
-        }\r
-\r
-        private ComposablePartCatalogDebuggerProxy CreateComposablePartCatalogDebuggerProxy(ComposablePartCatalog catalog)\r
-        {\r
-            return new ComposablePartCatalogDebuggerProxy(catalog);\r
-        }\r
-   }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/ComposablePartCatalogTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/ComposablePartCatalogTests.cs
deleted file mode 100644 (file)
index 73a809f..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Linq.Expressions;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ComposablePartCatalogTests\r
-    {\r
-        [TestMethod]\r
-        public void GetExports_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var catalog = CatalogFactory.Create();\r
-            catalog.Dispose();\r
-                       var definition = ImportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsDisposed(catalog, () =>\r
-            {\r
-                catalog.GetExports(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExports_NullAsConstraintArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var catalog = CatalogFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                catalog.GetExports((ImportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_ShouldNotThrow()\r
-        {\r
-            var catalog = CatalogFactory.Create();\r
-            catalog.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CanBeCalledMultipleTimes()\r
-        {\r
-            var catalog = CatalogFactory.Create();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-            catalog.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CallsGCSuppressFinalize()\r
-        {\r
-            bool finalizerCalled = false;\r
-\r
-            var catalog = CatalogFactory.CreateDisposable(disposing =>\r
-            {\r
-                if (!disposing)\r
-                {\r
-                    finalizerCalled = true;\r
-                }\r
-\r
-            });\r
-\r
-            catalog.Dispose();\r
-\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-            GC.Collect();\r
-\r
-            Assert.IsFalse(finalizerCalled);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CallsDisposeBoolWithTrue()\r
-        {\r
-            var catalog = CatalogFactory.CreateDisposable(disposing =>\r
-            {\r
-                Assert.IsTrue(disposing);\r
-            });\r
-\r
-            catalog.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Dispose_CallsDisposeBoolOnce()\r
-        {\r
-            int disposeCount = 0;\r
-            var catalog = CatalogFactory.CreateDisposable(disposing =>\r
-            {\r
-                disposeCount++;\r
-            });\r
-\r
-            catalog.Dispose();\r
-\r
-            Assert.AreEqual(1, disposeCount);\r
-        }\r
-\r
-        private IQueryable<ComposablePartDefinition> GetPartDefinitions(ExportDefinition definition)\r
-        {\r
-            var partDefinition = PartDefinitionFactory.Create(null, () => null, Enumerable.Empty<ImportDefinition>(), new ExportDefinition[] { definition });\r
-\r
-            return new ComposablePartDefinition[] { partDefinition }.AsQueryable();\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/CompositionElementDebuggerProxyTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/CompositionElementDebuggerProxyTests.cs
deleted file mode 100644 (file)
index f4d69dc..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    [TestClass]\r
-    public class CompositionElementDebuggerProxyTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_NullAsElementArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("element", () =>\r
-            {\r
-                new CompositionElementDebuggerProxy((CompositionElement)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsElementArgument_ShouldSetDisplayNameProperty()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = CreateCompositionElement(e);\r
-\r
-                var proxy = new CompositionElementDebuggerProxy(element);\r
-\r
-                Assert.AreSame(element.DisplayName, proxy.DisplayName);\r
-            }            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsElementArgument_ShouldSetOriginProperty()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = CreateCompositionElement(e);\r
-\r
-                var proxy = new CompositionElementDebuggerProxy(element);\r
-\r
-                Assert.AreSame(element.Origin, proxy.Origin);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsElementArgument_ShouldSetUnderlyingObjectProperty()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = CreateCompositionElement(e);\r
-\r
-                var proxy = new CompositionElementDebuggerProxy(element);\r
-\r
-                Assert.AreSame(element.UnderlyingObject, proxy.UnderlyingObject);\r
-            }\r
-        }\r
-\r
-        private static CompositionElement CreateCompositionElement(object underlyingObject)\r
-        {\r
-            return new CompositionElement(underlyingObject);\r
-        }\r
-   }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/CompositionElementTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/CompositionElementTests.cs
deleted file mode 100644 (file)
index e7fdc13..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    [TestClass]\r
-    public class CompositionElementTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_ValueAsUnderlyingObjectArgument_ShouldSetUnderlyingObjectProperty()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = new CompositionElement(e);\r
-\r
-                Assert.AreSame(e, element.UnderlyingObject);\r
-            }            \r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsUnderlyingObjectArgument_ShouldSetDisplayNamePropertyToUnderlyingObjectToString()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = new CompositionElement(e);\r
-\r
-                Assert.AreEqual(e.ToString(), element.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_ValueAsUnderlyingObjectArgument_ShouldSetOriginToUnknown()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = new CompositionElement(e);\r
-\r
-                Assert.IsNotNull(element.Origin);\r
-                Assert.IsNull(element.Origin.Origin);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnDisplayNameProperty()\r
-        {\r
-            var expectations = Expectations.GetObjectsReferenceTypes();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = CreateCompositionElement(e);\r
-\r
-                Assert.AreEqual(element.DisplayName, element.ToString());\r
-            }\r
-        }\r
-\r
-        private static CompositionElement CreateCompositionElement(object underlyingObject)\r
-        {\r
-            return new CompositionElement(underlyingObject);\r
-        }\r
-   }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/SerializableCompositionElementTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/Primitives/SerializableCompositionElementTests.cs
deleted file mode 100644 (file)
index 4f038de..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Runtime.Serialization;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    [TestClass]\r
-    public class SerializableCompositionElementTests\r
-    {\r
-        [TestMethod]\r
-        public void FromICompositionElement_NullAsElementArgument_ShouldReturnNull()\r
-        {\r
-            var result = SerializableCompositionElement.FromICompositionElement((ICompositionElement)null);\r
-\r
-            Assert.IsNull(result);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FromICompositionElement_ValueWithNullDisplayNameAsElementArgument_ShouldSetDisplayNamePropertyToEmptyString()\r
-        {\r
-            var element = ElementFactory.Create((string)null);\r
-            Assert.IsNull(element.DisplayName);\r
-\r
-            var result = SerializableCompositionElement.FromICompositionElement(element);\r
-\r
-            Assert.AreEqual(string.Empty, result.DisplayName);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FromICompositionElement_ValueAsElementArgument_ShouldSetDisplayNameProperty()\r
-        {\r
-            var expectations = Expectations.GetDisplayNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = ElementFactory.Create(e);\r
-\r
-                var result = SerializableCompositionElement.FromICompositionElement(element);\r
-\r
-                Assert.AreEqual(e, result.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FormICompositionElement_ValueWithNullOriginAsElementArgument_ShouldSetOriginPropertyToNull()\r
-        {\r
-            var element = ElementFactory.Create((ICompositionElement)null);\r
-            Assert.IsNull(element.Origin);\r
-\r
-            var result = SerializableCompositionElement.FromICompositionElement(element);\r
-\r
-            Assert.IsNull(element.Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FromICompositionElement_ValueAsElementArgument_ShouldSetOriginProperty()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = ElementFactory.Create(e);\r
-\r
-                var result = SerializableCompositionElement.FromICompositionElement(element);\r
-\r
-                ElementAssert.AreEqual(e, result.Origin);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnDisplayNameProperty()\r
-        {\r
-            var expectations = Expectations.GetDisplayNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = ElementFactory.Create(e);\r
-\r
-                var result = SerializableCompositionElement.FromICompositionElement(element);\r
-\r
-                Assert.AreEqual(e, result.ToString());\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        [TestMethod]\r
-        public void Origin_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetCompositionElements();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = CreateSerializableCompositionElement(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(element);\r
-\r
-                ElementAssert.AreEqual(e, result);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void DisplayName_CanBeSerialized()\r
-        {\r
-            var expectations = Expectations.GetDisplayNames();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var element = CreateSerializableCompositionElement(e);\r
-\r
-                var result = SerializationTestServices.RoundTrip(element);\r
-\r
-                Assert.AreEqual(e, result.DisplayName);\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        private static SerializableCompositionElement CreateSerializableCompositionElement(string displayName)\r
-        {\r
-            var element = ElementFactory.Create(displayName);\r
-\r
-            return CreateSerializableCompositionElement(element);\r
-        }\r
-\r
-        private static SerializableCompositionElement CreateSerializableCompositionElement(ICompositionElement element)\r
-        {\r
-            return (SerializableCompositionElement)SerializableCompositionElement.FromICompositionElement(element);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/.gitattributes
deleted file mode 100644 (file)
index 394a811..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/LazyMemberInfoTests.cs -crlf
-/ReflectionComposablePartDefinitionTests.cs -crlf
-/ReflectionComposablePartTests.cs -crlf
-/ReflectionMemberExportDefinitionTests.cs -crlf
-/ReflectionMemberImportDefinitionTests.cs -crlf
-/ReflectionModelServicesTests.cs -crlf
-/ReflectionParameterImportDefinitionTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/LazyMemberInfoTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/LazyMemberInfoTests.cs
deleted file mode 100644 (file)
index edc08f3..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    [TestClass]\r
-    public class LazyMemberInfoTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor_PassMember()\r
-        {\r
-            foreach (var memberAndAccessorsInfo in GetMembersAndAccessors(typeof(LazyMemberTestClass)))\r
-            {\r
-                MemberInfo member = memberAndAccessorsInfo.Item1;\r
-                MemberTypes memberType = memberAndAccessorsInfo.Item2.Item1;\r
-                MemberInfo[] accessors = memberAndAccessorsInfo.Item2.Item2;\r
-\r
-                LazyMemberInfo lazy = new LazyMemberInfo(member);\r
-                Assert.AreEqual(memberType, lazy.MemberType);\r
-                Assert.AreEqual(accessors.Length, lazy.GetAccessors().Length);\r
-                Assert.IsTrue(accessors.SequenceEqual(lazy.GetAccessors()));\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassNullMember()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("member", () =>\r
-                {\r
-                    LazyMemberInfo lazy = new LazyMemberInfo((MemberInfo)null);\r
-                });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassAccessors()\r
-        {\r
-            foreach (var memberAndAccessorsInfo in GetMembersAndAccessors(typeof(LazyMemberTestClass)))\r
-            {\r
-                MemberInfo member = memberAndAccessorsInfo.Item1;\r
-                MemberTypes memberType = memberAndAccessorsInfo.Item2.Item1;\r
-                MemberInfo[] accessors = memberAndAccessorsInfo.Item2.Item2;\r
-\r
-                LazyMemberInfo lazy = new LazyMemberInfo(memberType, accessors);\r
-                Assert.AreEqual(memberType, lazy.MemberType);\r
-                Assert.AreEqual(accessors.Length, lazy.GetAccessors().Length);\r
-                Assert.IsTrue(accessors.SequenceEqual(lazy.GetAccessors()));\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassInvalidAccessors()\r
-        {\r
-            foreach (var memberAndAccessorsInfo in GetMembersAndAccessors(typeof(LazyMemberTestClass)))\r
-            {\r
-                MemberInfo member = memberAndAccessorsInfo.Item1;\r
-                MemberTypes memberType = memberAndAccessorsInfo.Item2.Item1;\r
-                MemberInfo[] accessors = memberAndAccessorsInfo.Item2.Item2;\r
-\r
-                foreach (MemberTypes wrongMemberType in GetValidMemberTypes())\r
-                {\r
-                    if (wrongMemberType == memberType)\r
-                    {\r
-                        continue;\r
-                    }\r
-                    ExceptionAssert.ThrowsArgument<ArgumentException>("accessors", () =>\r
-                    {\r
-                        LazyMemberInfo lazy = new LazyMemberInfo(wrongMemberType, accessors);\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassAccessorsInvalidMemberType()\r
-        {\r
-            MemberTypes[] validMemberTypes = GetValidMemberTypes().ToArray();\r
-            foreach (MemberTypes memberType in GetMemberTypeValues())\r
-            {\r
-                if (!validMemberTypes.Contains(memberType))\r
-                {\r
-                    ExceptionAssert.ThrowsArgument<ArgumentException>("memberType", () =>\r
-                    {\r
-                        LazyMemberInfo lazy = new LazyMemberInfo(memberType, typeof(LazyMemberTestClass));\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassNullAccessors()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("accessors", () =>\r
-            {\r
-                LazyMemberInfo lazy = new LazyMemberInfo(MemberTypes.Field, (MemberInfo[])null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassAccessorsWithNulls()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("accessors", () =>\r
-            {\r
-                LazyMemberInfo lazy = new LazyMemberInfo(MemberTypes.Field, new MemberInfo[] { null, null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassAccessorCreators()\r
-        {\r
-            foreach (var memberAndAccessorsInfo in GetMembersAndAccessors(typeof(LazyMemberTestClass)))\r
-            {\r
-                MemberInfo member = memberAndAccessorsInfo.Item1;\r
-                MemberTypes memberType = memberAndAccessorsInfo.Item2.Item1;\r
-                MemberInfo[] accessors = memberAndAccessorsInfo.Item2.Item2;\r
-\r
-                LazyMemberInfo lazy = new LazyMemberInfo(memberType, () => accessors);\r
-                Assert.AreEqual(memberType, lazy.MemberType);\r
-                Assert.AreEqual(accessors.Length, lazy.GetAccessors().Length);\r
-                Assert.IsTrue(accessors.SequenceEqual(lazy.GetAccessors()));\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassInvalidAccessorCreators()\r
-        {\r
-            foreach (var memberAndAccessorsInfo in GetMembersAndAccessors(typeof(LazyMemberTestClass)))\r
-            {\r
-                MemberInfo member = memberAndAccessorsInfo.Item1;\r
-                MemberTypes memberType = memberAndAccessorsInfo.Item2.Item1;\r
-                MemberInfo[] accessors = memberAndAccessorsInfo.Item2.Item2;\r
-\r
-                foreach (MemberTypes wrongMemberType in GetValidMemberTypes())\r
-                {\r
-                    if (wrongMemberType == memberType)\r
-                    {\r
-                        continue;\r
-                    }\r
-                    LazyMemberInfo lazy = new LazyMemberInfo(wrongMemberType, () => accessors);\r
-                    ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-                    {\r
-                        lazy.GetAccessors();\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassAccessorCreatorsWithInvalidMemberType()\r
-        {\r
-            MemberTypes[] validMemberTypes = GetValidMemberTypes().ToArray();\r
-            foreach (MemberTypes memberType in GetMemberTypeValues())\r
-            {\r
-                if (!validMemberTypes.Contains(memberType))\r
-                {\r
-                    ExceptionAssert.ThrowsArgument<ArgumentException>("memberType", () =>\r
-                    {\r
-                        LazyMemberInfo lazy = new LazyMemberInfo(memberType, () => new MemberInfo[] { typeof(LazyMemberTestClass) });\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_PassNullAccessorCreators()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("accessorsCreator", () =>\r
-            {\r
-                LazyMemberInfo lazy = new LazyMemberInfo(MemberTypes.Field, (Func<MemberInfo[]>)null);\r
-            });\r
-        }\r
-\r
-\r
-        private static IEnumerable<Tuple<MemberInfo, Tuple<MemberTypes, MemberInfo[]>>> GetMembersAndAccessors(Type type)\r
-        {\r
-            yield return new Tuple<MemberInfo, Tuple<MemberTypes, MemberInfo[]>>(\r
-                type, new Tuple<MemberTypes, MemberInfo[]>(type.MemberType, new MemberInfo[] { type }));\r
-\r
-            foreach (MemberInfo member in type.GetMembers())\r
-            {\r
-                MemberInfo[] accessors = null;\r
-                if (member.MemberType == MemberTypes.Property)\r
-                {\r
-                    PropertyInfo property = (PropertyInfo)member;\r
-                    accessors = new MemberInfo[] { property.GetGetMethod(true), property.GetSetMethod(true) };\r
-                }\r
-                else if (member.MemberType == MemberTypes.Event)\r
-                {\r
-                    EventInfo event_ = (EventInfo)member;\r
-                    accessors = new MemberInfo[] { event_.GetRaiseMethod(true), event_.GetAddMethod(true), event_.GetRemoveMethod(true) };\r
-                }\r
-                else\r
-                {\r
-                    accessors = new MemberInfo[] { member };\r
-                }\r
-\r
-                yield return new Tuple<MemberInfo, Tuple<MemberTypes, MemberInfo[]>>(\r
-                    member, new Tuple<MemberTypes, MemberInfo[]>(member.MemberType, accessors));\r
-            }\r
-        }\r
-\r
-        private static IEnumerable<MemberTypes> GetMemberTypeValues()\r
-        {\r
-            yield return MemberTypes.All;\r
-            yield return MemberTypes.Constructor;\r
-            yield return MemberTypes.Custom;\r
-            yield return MemberTypes.Event;\r
-            yield return MemberTypes.Field;\r
-            yield return MemberTypes.Method;\r
-            yield return MemberTypes.NestedType;\r
-            yield return MemberTypes.Property;\r
-            yield return MemberTypes.TypeInfo;\r
-        }\r
-\r
-        private static IEnumerable<MemberTypes> GetValidMemberTypes()\r
-        {\r
-            yield return MemberTypes.TypeInfo;\r
-            yield return MemberTypes.NestedType;\r
-            yield return MemberTypes.Constructor;\r
-            yield return MemberTypes.Field;\r
-            yield return  MemberTypes.Method;\r
-            yield return  MemberTypes.Property;\r
-            yield return MemberTypes.Event;\r
-        }\r
-\r
-        public class LazyMemberTestClass\r
-        {\r
-            public LazyMemberTestClass() { }\r
-            public string Property { get; set;  }\r
-            public string SetProperty { set { } }\r
-            public string GetProperty { get { return null; } }\r
-            public string Field;\r
-            public void Method() { this.Event(this, new EventArgs()); }\r
-            public event EventHandler Event;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartDefinitionTests.cs
deleted file mode 100644 (file)
index 778ded4..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    [TestClass]\r
-    public class ReflectionComposablePartDefinitionTests\r
-    {\r
-        private ReflectionComposablePartDefinition CreateReflectionPartDefinition(\r
-            Lazy<Type> partType,\r
-            bool requiresDisposal,\r
-            Func<IEnumerable<ImportDefinition>> imports,\r
-            Func<IEnumerable<ExportDefinition>>exports,\r
-            IDictionary<string, object> metadata,\r
-            ICompositionElement origin)\r
-        {\r
-            return (ReflectionComposablePartDefinition)ReflectionModelServices.CreatePartDefinition(partType, requiresDisposal, \r
-                new Lazy<IEnumerable<ImportDefinition>>(imports, false), \r
-                new Lazy<IEnumerable<ExportDefinition>>(exports, false), \r
-                metadata.AsLazy(), origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ReflectionComposablePartDefinition definition = CreateReflectionPartDefinition(\r
-                expectedLazyType,\r
-                false,\r
-                () => expectedImports,\r
-                () => expectedExports,\r
-                expectedMetadata,\r
-                expectedOrigin);\r
-\r
-            Assert.AreSame(expectedType, definition.GetPartType());\r
-            Assert.IsTrue(definition.Metadata.Keys.SequenceEqual(expectedMetadata.Keys));\r
-            Assert.IsTrue(definition.Metadata.Values.SequenceEqual(expectedMetadata.Values));\r
-            Assert.IsTrue(definition.ExportDefinitions.SequenceEqual(expectedExports.Cast<ExportDefinition>()));\r
-            Assert.IsTrue(definition.ImportDefinitions.SequenceEqual(expectedImports.Cast<ImportDefinition>()));\r
-            Assert.AreSame(expectedOrigin, ((ICompositionElement)definition).Origin);\r
-            Assert.IsNotNull(((ICompositionElement)definition).DisplayName);\r
-            Assert.IsFalse(definition.IsDisposalRequired);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_DisposablePart()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ReflectionComposablePartDefinition definition = CreateReflectionPartDefinition(\r
-                expectedLazyType,\r
-                true,\r
-                () => expectedImports,\r
-                () => expectedExports,\r
-                expectedMetadata,\r
-                expectedOrigin);\r
-\r
-            Assert.AreSame(expectedType, definition.GetPartType());\r
-            Assert.IsTrue(definition.Metadata.Keys.SequenceEqual(expectedMetadata.Keys));\r
-            Assert.IsTrue(definition.Metadata.Values.SequenceEqual(expectedMetadata.Values));\r
-            Assert.IsTrue(definition.ExportDefinitions.SequenceEqual(expectedExports.Cast<ExportDefinition>()));\r
-            Assert.IsTrue(definition.ImportDefinitions.SequenceEqual(expectedImports.Cast<ImportDefinition>()));\r
-            Assert.AreSame(expectedOrigin, ((ICompositionElement)definition).Origin);\r
-            Assert.IsNotNull(((ICompositionElement)definition).DisplayName);\r
-            Assert.IsTrue(definition.IsDisposalRequired);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePart()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ReflectionComposablePartDefinition definition = CreateReflectionPartDefinition(\r
-                expectedLazyType,\r
-                false,\r
-                () => expectedImports,\r
-                () => expectedExports,\r
-                expectedMetadata,\r
-                expectedOrigin);\r
-\r
-            var part = definition.CreatePart();\r
-            Assert.IsNotNull(part);\r
-            Assert.IsFalse(part is IDisposable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePart_Disposable()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ReflectionComposablePartDefinition definition = CreateReflectionPartDefinition(\r
-                expectedLazyType,\r
-                true,\r
-                () => expectedImports,\r
-                () => expectedExports,\r
-                expectedMetadata,\r
-                expectedOrigin);\r
-\r
-            var part = definition.CreatePart();\r
-            Assert.IsNotNull(part);\r
-            Assert.IsTrue(part is IDisposable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePart_DoesntLoadType()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = new Lazy<Type>(() => { Assert.Fail("Part should not be loaded"); return null; });\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ReflectionComposablePartDefinition definition = CreateReflectionPartDefinition(\r
-                expectedLazyType,\r
-                true,\r
-                () => expectedImports,\r
-                () => expectedExports,\r
-                expectedMetadata,\r
-                expectedOrigin);\r
-\r
-            var part = definition.CreatePart();\r
-            Assert.IsNotNull(part);\r
-            Assert.IsTrue(part is IDisposable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_NullMetadata_ShouldSetMetadataPropertyToEmpty()\r
-        {\r
-            ReflectionComposablePartDefinition definition = CreateEmptyDefinition(typeof(object), typeof(object).GetConstructors().First(), null, new MockOrigin());\r
-            Assert.IsNotNull(definition.Metadata);\r
-            Assert.AreEqual(0, definition.Metadata.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_NullOrigin_ShouldSetOriginPropertyToNull()\r
-        {\r
-            ReflectionComposablePartDefinition definition = CreateEmptyDefinition(typeof(object), typeof(object).GetConstructors().First(), MetadataServices.EmptyMetadata, null);\r
-            Assert.IsNotNull(((ICompositionElement)definition).DisplayName);\r
-            Assert.IsNull(((ICompositionElement)definition).Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportaAndExports_CreatorsShouldBeCalledLazilyAndOnce()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            bool importsCreatorCalled = false;\r
-            Func<IEnumerable<ImportDefinition>> importsCreator = () =>\r
-            {\r
-                Assert.IsFalse(importsCreatorCalled);\r
-                importsCreatorCalled = true;\r
-                return expectedImports.Cast<ImportDefinition>();\r
-            };\r
-\r
-            bool exportsCreatorCalled = false;\r
-            Func<IEnumerable<ExportDefinition>> exportsCreator = () =>\r
-            {\r
-                Assert.IsFalse(exportsCreatorCalled);\r
-                exportsCreatorCalled = true;\r
-                return expectedExports.Cast<ExportDefinition>();\r
-            };\r
-\r
-            ReflectionComposablePartDefinition definition = CreateReflectionPartDefinition(\r
-                expectedType.AsLazy(),\r
-                false,\r
-                importsCreator,\r
-                exportsCreator,\r
-                null,\r
-                null);\r
-\r
-            IEnumerable<ExportDefinition> exports;\r
-            Assert.IsFalse(exportsCreatorCalled);\r
-            exports = definition.ExportDefinitions;\r
-            Assert.IsTrue(exportsCreatorCalled);\r
-            exports = definition.ExportDefinitions;\r
-\r
-\r
-            IEnumerable<ImportDefinition> imports;\r
-            Assert.IsFalse(importsCreatorCalled);\r
-            imports = definition.ImportDefinitions;\r
-            Assert.IsTrue(importsCreatorCalled);\r
-            imports = definition.ImportDefinitions;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ShouldReturnTypeDisplayName()\r
-        {\r
-            var expectations = Expectations.GetAttributedTypes();\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = (ICompositionElement)CreateEmptyDefinition(e, null, null, null);\r
-\r
-                Assert.AreEqual(e.GetDisplayName(), definition.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnICompositionElementDisplayName()\r
-        {\r
-            var expectations = Expectations.GetAttributedTypes();\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = (ICompositionElement)CreateEmptyDefinition(e, null, null, null);\r
-\r
-                Assert.AreEqual(definition.DisplayName, definition.ToString());\r
-            }\r
-        }\r
-\r
-        private ReflectionComposablePartDefinition CreateEmptyDefinition(Type type, ConstructorInfo constructor, IDictionary<string, object> metadata, ICompositionElement origin)\r
-        {\r
-            return (ReflectionComposablePartDefinition)ReflectionModelServices.CreatePartDefinition(\r
-                (type != null) ? type.AsLazy() : null,\r
-                false,\r
-                Enumerable.Empty<ImportDefinition>().AsLazy(),\r
-                Enumerable.Empty<ExportDefinition>().AsLazy(),\r
-                metadata.AsLazy(),\r
-                origin);\r
-        }\r
-\r
-        private static List<ImportDefinition> CreateImports(Type type)\r
-        {\r
-            List<ImportDefinition> imports = new List<ImportDefinition>();\r
-            foreach (PropertyInfo property in type.GetProperties())\r
-            {\r
-                imports.Add(new ReflectionMemberImportDefinition(new LazyMemberInfo(property), "Contract", (string)null, new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(object)) }, ImportCardinality.ZeroOrOne, true, CreationPolicy.Any, new TypeOrigin(type)));\r
-            }\r
-\r
-            return imports;\r
-        }\r
-\r
-        private static List<ExportDefinition> CreateExports(Type type)\r
-        {\r
-            List<ExportDefinition> exports = new List<ExportDefinition>();\r
-            foreach (PropertyInfo property in type.GetProperties())\r
-            {\r
-                exports.Add(ReflectionModelServices.CreateExportDefinition(new LazyMemberInfo(property), "Contract", new Lazy<IDictionary<string, object>>(() => null, false), new TypeOrigin(type)));\r
-            }\r
-\r
-            return exports;\r
-        }\r
-\r
-        public class TestPart\r
-        {\r
-            public int field1;\r
-            public string field2;\r
-            public int Property1 { get; set; }\r
-            public string Property2 { get; set; }\r
-        }\r
-\r
-        private class TypeOrigin : ICompositionElement\r
-        {\r
-            private readonly Type _type;\r
-            private readonly ICompositionElement _orgin; \r
-\r
-            public TypeOrigin(Type type)\r
-                : this(type, null)\r
-            {\r
-            }\r
-\r
-            public TypeOrigin(Type type, ICompositionElement origin)\r
-            {\r
-                this._type = type;\r
-                this._orgin = origin;\r
-            }\r
-\r
-            public string DisplayName\r
-            {\r
-                get\r
-                {\r
-                    return this._type.GetDisplayName();\r
-                }\r
-            }\r
-\r
-            public ICompositionElement Origin\r
-            {\r
-                get\r
-                {\r
-                    return this._orgin;\r
-                }\r
-            }\r
-        }\r
-\r
-        private class MockOrigin : ICompositionElement\r
-        {\r
-            public string DisplayName\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            public ICompositionElement Origin\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartTests.cs
deleted file mode 100644 (file)
index 9a7c6ed..0000000
+++ /dev/null
@@ -1,932 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.Collections.Generic;\r
-using Microsoft.Internal;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Diagnostics;\r
-using System.Diagnostics;\r
-using System.ComponentModel.Composition.Extensibility;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    [TestClass]\r
-    public class ReflectionComposablePartTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor1_DefinitionAsDefinitionArgument_ShouldSetOriginProperty()\r
-        {\r
-            var expectations = Expectations.GetAttributedDefinitions();\r
-\r
-            foreach (var e in expectations)\r
-            {\r
-                var definition = (ICompositionElement)new ReflectionComposablePart(e);\r
-\r
-                Assert.AreSame(e, definition.Origin);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_NullAsDefinitionArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                new ReflectionComposablePart((ReflectionComposablePartDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_NullAsAttributedPartArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("attributedPart", () =>\r
-            {\r
-                new ReflectionComposablePart(PartDefinitionFactory.CreateAttributed(), (object)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor2_ValueTypeAsAttributedPartArgument_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("attributedPart", () =>\r
-            {\r
-                new ReflectionComposablePart(PartDefinitionFactory.CreateAttributed(), 42);\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constructor1_AttributedComposablePartDefintion_ShouldProduceValidObject()\r
-        {\r
-            var definition = PartDefinitionFactory.CreateAttributed(typeof(MyExport));\r
-            var part = new ReflectionComposablePart(definition);\r
-\r
-            Assert.AreEqual(definition, part.Definition);\r
-            Assert.IsNotNull(part.Metadata);\r
-\r
-            Assert.IsFalse(part is IDisposable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_AttributedComposablePartDefintion_Disposable_ShouldProduceValidObject()\r
-        {\r
-            var definition = PartDefinitionFactory.CreateAttributed(typeof(DisposablePart));\r
-            var part = new DisposableReflectionComposablePart(definition);\r
-\r
-            Assert.AreEqual(definition, part.Definition);\r
-            Assert.IsNotNull(part.Metadata);\r
-\r
-            Assert.IsTrue(part is IDisposable);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_Type_ShouldProduceValidObject()\r
-        {\r
-            var part = new ReflectionComposablePart(PartDefinitionFactory.CreateAttributed(typeof(MyExport)));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_Object_ShouldProduceValidObject()\r
-        {\r
-            var part = new ReflectionComposablePart(PartDefinitionFactory.CreateAttributed(typeof(MyExport)), new MyExport());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Metadata_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var part = CreateDefaultDisposablePart();\r
-            ((IDisposable)part).Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(part, () =>\r
-            {\r
-                var metadata = part.Metadata;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var part = CreateDefaultDisposablePart();\r
-            ((IDisposable)part).Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(part, () =>\r
-            {\r
-                var definitions = part.ImportDefinitions;\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ExportDefinitions_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var part = CreateDefaultDisposablePart();\r
-            ((IDisposable)part).Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(part, () =>\r
-            {\r
-                var definitions = part.ExportDefinitions;\r
-            });\r
-        }\r
-        [TestMethod]\r
-        public void OnComposed_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var part = CreateDefaultDisposablePart();\r
-            ((IDisposable)part).Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(part, () =>\r
-            {\r
-                part.Activate();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void OnComposed_MissingPostImportsOnInstance_ShouldThrowComposition()\r
-        {\r
-            var part = CreatePart(new MySharedPartExport());\r
-\r
-            // Dev10:484204 - This used to cause a failure but after we made \r
-            // ReflectionComposablePart internal we needed to back remove this \r
-            // validation for post imports to make declarative composition work.\r
-            //part.Activate().VerifyFailure(CompositionIssueId.ImportNotSetOnPart);\r
-            part.Activate();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void OnComposed_ProperlyComposed_ShouldSucceed()\r
-        {\r
-            var import = new TrivialImporter();\r
-            var export = new TrivialExporter();\r
-\r
-            var part = CreatePart(import);\r
-\r
-            var importDef = part.ImportDefinitions.First();\r
-            part.SetImport(importDef, CreateSimpleExports(export));\r
-            part.Activate();\r
-            Assert.IsTrue(export.done, "OnImportsSatisfied should have been called");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void OnComposed_UnhandledExceptionThrowInOnImportsSatisfied_ShouldThrowComposablePart()\r
-        {\r
-            var part = CreatePart(typeof(ExceptionDuringINotifyImport));\r
-            var definition = part.ImportDefinitions.First();\r
-            part.SetImport(definition, CreateSimpleExports(21));\r
-\r
-            CompositionAssert.ThrowsPart<NotImplementedException>(ErrorId.ReflectionModel_PartOnImportsSatisfiedThrewException, RetryMode.DoNotRetry, () =>\r
-            {\r
-                part.Activate();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var part = CreateDefaultDisposablePart();\r
-            var definition = part.ImportDefinitions.First();\r
-\r
-            ((IDisposable)part).Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(part, () =>\r
-            {\r
-                part.SetImport(definition, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_NullAsImportDefinitionArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var part = CreateDefaultPart();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.SetImport((ImportDefinition)null, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_NullAsExportsArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var part = CreatePart(typeof(MySharedPartExport));\r
-            var import = part.ImportDefinitions.First();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exports", () =>\r
-            {\r
-                part.SetImport(import, (IEnumerable<Export>)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_ExportsArrayWithNullElementAsExportsArgument_ShouldThrowArgument()\r
-        {\r
-            var part = CreatePart(typeof(MySharedPartExport));\r
-            var definition = part.ImportDefinitions.First();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, new Export[] { null });\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_WrongDefinitionAsDefinitionArgument_ShouldThrowArgument()\r
-        {\r
-            var part = CreateDefaultPart();\r
-\r
-            var definition = ImportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.SetImport(definition, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_SetNonRecomposableDefinitionAsDefinitionArgumentAfterOnComposed_ShouldThrowInvalidOperation()\r
-        {\r
-            var part = CreatePartWithNonRecomposableImport();\r
-            var definition = part.ImportDefinitions.First();\r
-\r
-            part.SetImport(definition, Enumerable.Empty<Export>());\r
-            part.Activate();\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-            {\r
-                part.SetImport(definition, Enumerable.Empty<Export>());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_ZeroOrOneDefinitionAsDefinitionArgumentAndTwoExportsAsExportsArgument_ShouldThrowArgument()\r
-        {\r
-            var part = CreatePartWithZeroOrOneImport();\r
-            var definition = part.ImportDefinitions.First();\r
-\r
-            var exports = ExportFactory.Create("Import", 2);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, exports);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_ExactlyOneDefinitionAsDefinitionArgumentAndTwoExportsAsExportsArgument_ShouldThrowArgument()\r
-        {\r
-            var part = CreatePartWithExactlyOneImport();\r
-            var definition = part.ImportDefinitions.First();\r
-\r
-            var exports = ExportFactory.Create("Import", 2);\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, exports);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_ExactlyOneDefinitionAsDefinitionArgumentAndEmptyExportsAsExportsArgument_ShouldThrowArgument()\r
-        {\r
-            var part = CreatePartWithExactlyOneImport();\r
-            var definition = part.ImportDefinitions.First();\r
-\r
-            var exports = Enumerable.Empty<Export>();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exports", () =>\r
-            {\r
-                part.SetImport(definition, exports);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_WrongTypeExportGiven_ShouldThrowComposablePart()\r
-        {\r
-            var part = CreatePart(new MySharedPartExport());\r
-            var import = part.ImportDefinitions.First();\r
-\r
-            CompositionAssert.ThrowsPart(ErrorId.ReflectionModel_ImportNotAssignableFromExport, () =>\r
-            {\r
-                part.SetImport(import, CreateSimpleExports("21"));\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetImport_SetPostValueAndSetAgainOnInstance_ShouldSetProperty()\r
-        {\r
-            var import = new MySharedPartExport();\r
-            var part = CreatePart(import);\r
-            var importDef = part.ImportDefinitions.First();\r
-\r
-            part.SetImport(importDef, CreateSimpleExports(21));\r
-\r
-            Assert.AreNotEqual(import.Value, 21, "Value should NOT be set on live object until OnComposed");\r
-            part.Activate();\r
-\r
-            Assert.AreEqual(import.Value, 21, "Value should be set on live object now");\r
-\r
-            part.SetImport(importDef, CreateSimpleExports(42));\r
-\r
-            Assert.AreNotEqual(import.Value, 42, "Value should NOT be rebound on live object");\r
-\r
-            part.Activate();\r
-\r
-            Assert.AreEqual(import.Value, 42, "Value should be set on live object now");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_WhenDisposed_ShouldThrowObjectDisposed()\r
-        {\r
-            var part = CreateDefaultDisposablePart();\r
-            var definition = part.ExportDefinitions.First();\r
-\r
-            ((IDisposable)part).Dispose();\r
-\r
-            ExceptionAssert.ThrowsDisposed(part, () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_NullAsDefinitionArgument_ShouldThrowArgumentNull()\r
-        {\r
-            var part = CreateDefaultPart();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("definition", () =>\r
-            {\r
-                part.GetExportedValue((ExportDefinition)null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_WrongDefinitionAsDefinitionArgument_ShouldThrowArgument()\r
-        {\r
-            var part = CreateDefaultPart();\r
-            var definition = ExportDefinitionFactory.Create();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("definition", () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_MissingPrerequisiteImport_ShouldThrowInvalidOperation()\r
-        {\r
-            var part = CreatePart(typeof(SimpleConstructorInjectedObject));\r
-            var definition = part.ExportDefinitions.First();\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [Ignore]\r
-        [TestMethod]\r
-        [WorkItem(484204)]\r
-        public void GetExportedValue_MissingPostImports_ShouldThrowComposition()\r
-        {\r
-            var part = CreatePart(typeof(MySharedPartExport));\r
-\r
-            // Signal that the composition should be finished\r
-            part.Activate();\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-\r
-            // Dev10:484204 - This used to cause a failure but after we made \r
-            // ReflectionComposablePart internal we needed to back remove this \r
-            // validation for post imports to make declarative composition work.\r
-            CompositionAssert.ThrowsError(ErrorId.ImportNotSetOnPart, () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_NoConstructorOnDefinition_ShouldThrowComposablePart()\r
-        {\r
-            var part = CreatePart(typeof(ClassWithNoMarkedOrDefaultConstructor));\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-\r
-            CompositionAssert.ThrowsPart(ErrorId.ReflectionModel_PartConstructorMissing, () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_UnhandledExceptionThrowInConstructor_ShouldThrowComposablePart()\r
-        {\r
-            var part = CreatePart(typeof(ExportWithExceptionDuringConstruction));\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-\r
-            CompositionAssert.ThrowsPart<NotImplementedException>(ErrorId.ReflectionModel_PartConstructorThrewException, () =>\r
-            {\r
-                part.GetExportedValue(definition);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_GetObjectAfterSetPreImport_ShouldGetValue()\r
-        {\r
-            var part = CreatePart(typeof(SimpleConstructorInjectedObject));\r
-\r
-            var import = part.ImportDefinitions.First();\r
-            part.SetImport(import, CreateSimpleExports(21));\r
-\r
-            part.Activate();\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-            var exportObject = (SimpleConstructorInjectedObject)part.GetExportedValue(definition);\r
-\r
-            Assert.AreEqual(21, exportObject.CISimpleValue);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_GetObjectAfterSetPostImport_ShouldGetValue()\r
-        {\r
-            var part = CreatePart(typeof(MySharedPartExport));\r
-\r
-            var import = part.ImportDefinitions.First();\r
-            part.SetImport(import, CreateSimpleExports(21));\r
-\r
-            part.Activate();\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-            var exportObject = (MySharedPartExport)part.GetExportedValue(definition);\r
-\r
-            Assert.IsNotNull(exportObject);\r
-            Assert.AreEqual(21, exportObject.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_CallMultipleTimes_ShouldReturnSame()\r
-        {\r
-            var part = CreatePart(typeof(MySharedPartExport));\r
-\r
-            var import = part.ImportDefinitions.First();\r
-            part.SetImport(import, CreateSimpleExports(21));\r
-\r
-            part.Activate();\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-            var exportedValue1 = part.GetExportedValue(definition);\r
-            var exportedValue2 = part.GetExportedValue(definition);\r
-\r
-            Assert.AreSame(exportedValue1, exportedValue2);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_FromStaticClass_ShouldReturnExport()\r
-        {\r
-            var part = CreatePart(typeof(StaticExportClass));\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-\r
-            var exportObject = (string)part.GetExportedValue(definition);\r
-\r
-            Assert.AreEqual("StaticString", exportObject);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_OptionalPostNotGiven_ShouldReturnValidObject()\r
-        {\r
-            var part = CreatePart(typeof(ClassWithOptionalPostImport));\r
-            part.Activate();\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-            var exportObject = (ClassWithOptionalPostImport)part.GetExportedValue(definition);\r
-\r
-            Assert.IsNull(exportObject.Formatter);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedValue_OptionalPreNotGiven_ShouldReturnValidObject()\r
-        {\r
-            var part = CreatePart(typeof(ClassWithOptionalPreImport));\r
-            part.Activate();\r
-\r
-            var definition = part.ExportDefinitions.First();\r
-\r
-            var exportedValue = (ClassWithOptionalPreImport)part.GetExportedValue(definition);\r
-            Assert.IsNull(exportedValue.Formatter);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ShouldReturnTypeDisplayName()\r
-        {\r
-            var expectations = Expectations.GetAttributedTypes();\r
-            foreach (var e in expectations)\r
-            {\r
-                var part = (ICompositionElement)CreatePart(e);\r
-\r
-                Assert.AreEqual(e.GetDisplayName(), part.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnICompositionElementDisplayName()\r
-        {\r
-            var expectations = Expectations.GetAttributedTypes();\r
-            foreach (var e in expectations)\r
-            {\r
-                var part = (ICompositionElement)CreatePart(e);\r
-\r
-                Assert.AreEqual(part.DisplayName, part.ToString());\r
-            }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class PropertyExporter\r
-        {\r
-            [Export]\r
-            public object Property { get { return new object(); } }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class FieldExporter\r
-        {\r
-            [Export]\r
-            public object Field = null;\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class MethodExporter\r
-        {\r
-            [Export("Method")]\r
-            public void Method() { }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        [Export]\r
-        public class TypeExporter\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedObjectAlwaysReturnsSameReference_ForProperty()\r
-        {\r
-            var cp = CreatePart(new PropertyExporter());\r
-            var ed = cp.ExportDefinitions.Single();\r
-            var eo1 = cp.GetExportedValue(ed);\r
-            var eo2 = cp.GetExportedValue(ed);\r
-            Assert.AreSame(eo1, eo2);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedObjectAlwaysReturnsSameReference_ForField()\r
-        {\r
-            var exporter = new FieldExporter();\r
-            var cp = CreatePart(new FieldExporter());\r
-            var ed = cp.ExportDefinitions.Single();\r
-\r
-            exporter.Field = new object();\r
-            var eo1 = cp.GetExportedValue(ed);\r
-            exporter.Field = new object();\r
-            var eo2 = cp.GetExportedValue(ed);\r
-            Assert.AreSame(eo1, eo2);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedObjectAlwaysReturnsSameReference_ForMethod()\r
-        {\r
-            var cp = CreatePart(new MethodExporter());\r
-            var ed = cp.ExportDefinitions.Single();\r
-            var eo1 = cp.GetExportedValue(ed);\r
-            var eo2 = cp.GetExportedValue(ed);\r
-            Assert.AreSame(eo1, eo2);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportedObjectAlwaysReturnsSameReference_ForType()\r
-        {\r
-            var cp = CreatePart(new TypeExporter());\r
-            var ed = cp.ExportDefinitions.Single();\r
-            var eo1 = cp.GetExportedValue(ed);\r
-            var eo2 = cp.GetExportedValue(ed);\r
-            Assert.AreSame(eo1, eo2);\r
-        }\r
-\r
-\r
-        [PartNotDiscoverable]\r
-        public class MethodWithoutContractName\r
-        {\r
-            [Export]\r
-            public void MethodWithoutContractNameNotAllowed()\r
-            {\r
-            }\r
-        }\r
-\r
-        public interface IContract\r
-        {\r
-        }\r
-\r
-\r
-        [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]\r
-        public class CustomImportAttributeInvalidTarget : ImportAttribute\r
-        {\r
-            public CustomImportAttributeInvalidTarget()\r
-                : base(typeof(IContract))\r
-            {\r
-            }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ImportWithCustomImport\r
-        {\r
-            [CustomImport]\r
-            IContract ImportWithCustomAttributeImport { get; set; }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ImportWithCustomImportInvalidTarget\r
-        {\r
-            [CustomImportAttributeInvalidTarget]\r
-            void InvalidImport() { }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_ImportWithCustomAttributeImports()\r
-        {\r
-            var part = CreatePart(typeof(ImportWithCustomImport));\r
-            Assert.AreEqual(part.ImportDefinitions.Count(), 1);\r
-            ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition;\r
-            Assert.IsNotNull(import);\r
-\r
-            Assert.AreEqual(AttributedModelServices.GetContractName(typeof(IContract)), import.ContractName);\r
-            Assert.AreEqual(AttributedModelServices.GetTypeIdentity(typeof(IContract)), import.RequiredTypeIdentity);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_ImportWithCustomImportInvalidTarget_ShouldbeIgnored()\r
-        {\r
-            var part = CreatePart(typeof(ImportWithCustomImportInvalidTarget));\r
-            Assert.AreEqual(part.ImportDefinitions.Count(), 0);\r
-        }        \r
-\r
-        [PartNotDiscoverable]\r
-        public class ImportManyWithCustomImportMany\r
-        {\r
-            [CustomImportMany]\r
-            IContract ImportManyWithCustomAttributeImportMany { get; set; }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ImportManyWithCustomImportManyInvalidTarget\r
-        {\r
-            [CustomImportMany]\r
-            void InvalidImportMany() { }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_ImportManyWithCustomAttributeImportManys()\r
-        {\r
-            var part = CreatePart(typeof(ImportManyWithCustomImportMany));\r
-            Assert.AreEqual(part.ImportDefinitions.Count(), 1);\r
-            ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition;\r
-            Assert.IsNotNull(import);\r
-\r
-            Assert.AreEqual(AttributedModelServices.GetContractName(typeof(IContract)), import.ContractName);\r
-            Assert.AreEqual(AttributedModelServices.GetTypeIdentity(typeof(IContract)), import.RequiredTypeIdentity);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_ImportManyWithCustomImportManyInvalidTarget_ShouldbeIgnored()\r
-        {\r
-            var part = CreatePart(typeof(ImportManyWithCustomImportManyInvalidTarget));\r
-            Assert.AreEqual(part.ImportDefinitions.Count(), 0);\r
-        }\r
-\r
-        [AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]\r
-        public class CustomImportingConstructorAttribute : ImportingConstructorAttribute\r
-        {\r
-            public CustomImportingConstructorAttribute()\r
-                : base()\r
-            {\r
-            }\r
-        }\r
-\r
-        [AttributeUsage(AttributeTargets.Constructor, AllowMultiple = true, Inherited = false)]\r
-        public class CustomImportingConstructorAllowMultipleAttribute : ImportingConstructorAttribute\r
-        {\r
-            public CustomImportingConstructorAllowMultipleAttribute()\r
-                : base()\r
-            {\r
-            }\r
-        }\r
-\r
-        [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]\r
-        public class CustomImportingConstructorInvalidTargetAttribute : ImportingConstructorAttribute\r
-        {\r
-            public CustomImportingConstructorInvalidTargetAttribute()\r
-                : base()\r
-            {\r
-            }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ImportingConstructorWithCustomImportingConstructor\r
-        {\r
-            [CustomImportingConstructor]\r
-            ImportingConstructorWithCustomImportingConstructor([Import] IContract argument) {}\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ImportingConstructorWithCustomImportingConstructorAllowMultiple\r
-        {\r
-            [CustomImportingConstructorAllowMultiple]\r
-            [CustomImportingConstructorAllowMultiple]\r
-            ImportingConstructorWithCustomImportingConstructorAllowMultiple([Import] IContract argument) { }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class ImportingConstructorWithCustomImportingConstructorInvalidTarget\r
-        {\r
-            [CustomImportingConstructorInvalidTarget]\r
-            void InvalidImportingConstructor() { }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_ImportingConstructorWithCustomAttributeImportingConstructors()\r
-        {\r
-            var part = CreatePart(typeof(ImportingConstructorWithCustomImportingConstructor));\r
-            Assert.AreEqual(part.ImportDefinitions.Count(), 1);\r
-            ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition;\r
-            Assert.IsNotNull(import);\r
-\r
-            Assert.AreEqual(AttributedModelServices.GetContractName(typeof(IContract)), import.ContractName);\r
-            Assert.AreEqual(AttributedModelServices.GetTypeIdentity(typeof(IContract)), import.RequiredTypeIdentity);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_ImportingConstructorWithCustomAttributeImportingConstructorsWithAllowMultiple_ShouldNotThrowInvalidOperation()\r
-        {\r
-            var part = CreatePart(typeof(ImportingConstructorWithCustomImportingConstructorAllowMultiple));\r
-\r
-            Assert.AreEqual(part.ImportDefinitions.Count(), 1);\r
-            ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition;\r
-            Assert.IsNotNull(import);\r
-\r
-            Assert.AreEqual(AttributedModelServices.GetContractName(typeof(IContract)), import.ContractName);\r
-            Assert.AreEqual(AttributedModelServices.GetTypeIdentity(typeof(IContract)), import.RequiredTypeIdentity);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_ImportingConstructorWithCustomImportingConstructorInvalidTarget_ShouldbeIgnored()\r
-        {\r
-            var part = CreatePart(typeof(ImportingConstructorWithCustomImportingConstructorInvalidTarget));\r
-            Assert.AreEqual(part.ImportDefinitions.Count(), 0);\r
-        }\r
-#if !SILVERLIGHT\r
-\r
-        [Export]\r
-        public class ClassWithMultipleParameterImports\r
-        {\r
-            [ImportingConstructor]\r
-            public ClassWithMultipleParameterImports([Import][ImportMany]string parameter)\r
-            {\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithMultipleFieldImports\r
-        {\r
-            [Import]\r
-            [ImportMany]\r
-            public string Field;\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithMultiplePropertyImports\r
-        {\r
-            [Import]\r
-            [ImportMany]\r
-            public string Property\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithMultipleCustomPropertyImports\r
-        {\r
-            [CustomImport]\r
-            [CustomImport]\r
-            string Property { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithMultipleCustomPropertyImportManys\r
-        {\r
-            [CustomImportMany]\r
-            [CustomImportMany]\r
-            string Property { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithMultipleCustomPropertyImportAndImportManys\r
-        {\r
-            [CustomImport]\r
-            [CustomImportMany]\r
-            string Property { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportDefinitions_TypeWithMemberMarkedWithMultipleImports_ShouldTraceError()\r
-        {\r
-            var types = new Type[] { typeof(ClassWithMultipleParameterImports),\r
-                                     typeof(ClassWithMultipleFieldImports),\r
-                                     typeof(ClassWithMultiplePropertyImports),\r
-                                     typeof(ClassWithMultipleCustomPropertyImports),\r
-                                     typeof(ClassWithMultipleCustomPropertyImportManys),\r
-                                     typeof(ClassWithMultipleCustomPropertyImportAndImportManys)};\r
-\r
-            foreach (Type type in types)\r
-            {\r
-                using (TraceContext context = new TraceContext(SourceLevels.Error))\r
-                {\r
-                    var definition = AttributedModelServices.CreatePartDefinition(type, null, true);\r
-                    definition.ImportDefinitions.Count();\r
-\r
-                    Assert.IsNotNull(context.LastTraceEvent);\r
-                    Assert.AreEqual(context.LastTraceEvent.EventType, TraceEventType.Error);\r
-                    Assert.AreEqual(context.LastTraceEvent.Id, TraceId.Discovery_MemberMarkedWithMultipleImportAndImportMany);\r
-                }\r
-            }\r
-        }\r
-#endif\r
-\r
-        private Export[] CreateSimpleExports(object value)\r
-        {\r
-            var export = ExportFactory.Create("NoContract", () => value);\r
-\r
-            return new Export[] { export };\r
-        }\r
-\r
-        private ReflectionComposablePart CreatePartWithExport()\r
-        {\r
-            return CreatePart(typeof(StaticExportClass));\r
-        }\r
-\r
-        private ReflectionComposablePart CreatePartWithNonRecomposableImport()\r
-        {\r
-            return CreatePart(typeof(SingleImportWithAllowDefault));\r
-        }\r
-\r
-        private ReflectionComposablePart CreatePartWithZeroOrOneImport()\r
-        {\r
-            return CreatePart(typeof(SingleImportWithAllowDefault));\r
-        }\r
-\r
-        private ReflectionComposablePart CreatePartWithExactlyOneImport()\r
-        {\r
-            return CreatePart(typeof(SingleImport));\r
-        }\r
-\r
-        private ReflectionComposablePart CreateDefaultPart()\r
-        {\r
-            return CreatePart(new object());\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        [Export]\r
-        public class DisposablePart : IDisposable\r
-        {\r
-            [Import(AllowDefault = true)]\r
-            public int Foo { get; set; }\r
-\r
-            public void Dispose() { }\r
-        }\r
-\r
-        private ReflectionComposablePart CreateDefaultDisposablePart()\r
-        {\r
-            return CreatePart(typeof(DisposablePart));\r
-        }\r
-\r
-        private ReflectionComposablePart CreatePart(object instance)\r
-        {\r
-            if (instance is Type)\r
-            {\r
-                var definition = PartDefinitionFactory.CreateAttributed((Type)instance);\r
-\r
-                return (ReflectionComposablePart)definition.CreatePart();\r
-            }\r
-            else\r
-            {\r
-                var definition = PartDefinitionFactory.CreateAttributed(instance.GetType()); \r
-\r
-                return new ReflectionComposablePart(definition, instance);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberExportDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberExportDefinitionTests.cs
deleted file mode 100644 (file)
index cad1f40..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    [TestClass]\r
-    public class ReflectionMemberExportDefinitionTests\r
-    {\r
-        private static ReflectionMemberExportDefinition CreateReflectionExportDefinition(LazyMemberInfo exportMember, string contractname, IDictionary<string, object> metadata)\r
-        {\r
-            return CreateReflectionExportDefinition(exportMember, contractname, metadata, null);\r
-        }\r
-\r
-        private static ReflectionMemberExportDefinition CreateReflectionExportDefinition(LazyMemberInfo exportMember, string contractname, IDictionary<string, object> metadata, ICompositionElement origin)\r
-        {\r
-            return (ReflectionMemberExportDefinition)ReflectionModelServices.CreateExportDefinition(\r
-                exportMember, contractname, CreateLazyMetadata(metadata), origin);\r
-        }\r
-\r
-        private static Lazy<IDictionary<string, object>> CreateLazyMetadata(IDictionary<string, object> metadata)\r
-        {\r
-            return new Lazy<IDictionary<string, object>>(() => metadata, false);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor()\r
-        {\r
-            MemberInfo expectedMember = this.GetType();\r
-            LazyMemberInfo expectedExportingMemberInfo = new LazyMemberInfo(expectedMember);\r
-\r
-            string expectedContractName = "Contract";\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            ReflectionMemberExportDefinition definition = CreateReflectionExportDefinition(expectedExportingMemberInfo, expectedContractName, expectedMetadata);\r
-\r
-            Assert.AreEqual(expectedExportingMemberInfo, definition.ExportingLazyMember);\r
-            Assert.AreSame(expectedMember, definition.ExportingLazyMember.GetAccessors()[0]);\r
-            Assert.AreEqual(MemberTypes.TypeInfo, definition.ExportingLazyMember.MemberType);\r
-\r
-            Assert.AreSame(expectedContractName, definition.ContractName);\r
-\r
-            Assert.IsNotNull(definition.Metadata);\r
-            Assert.IsTrue(definition.Metadata.Keys.SequenceEqual(expectedMetadata.Keys));\r
-            Assert.IsTrue(definition.Metadata.Values.SequenceEqual(expectedMetadata.Values));\r
-\r
-            Assert.IsNull(((ICompositionElement)definition).Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_NullMetadata()\r
-        {\r
-            MemberInfo expectedMember = this.GetType();\r
-            LazyMemberInfo expectedExportingMemberInfo = new LazyMemberInfo(expectedMember);\r
-\r
-            string expectedContractName = "Contract";\r
-\r
-            ReflectionMemberExportDefinition definition = CreateReflectionExportDefinition(expectedExportingMemberInfo, expectedContractName, null);\r
-\r
-            Assert.AreEqual(expectedExportingMemberInfo, definition.ExportingLazyMember);\r
-            Assert.AreSame(expectedMember, definition.ExportingLazyMember.GetAccessors()[0]);\r
-            Assert.AreEqual(MemberTypes.TypeInfo, definition.ExportingLazyMember.MemberType);\r
-\r
-            Assert.AreSame(expectedContractName, definition.ContractName);\r
-\r
-            Assert.IsNotNull(definition.Metadata);\r
-            Assert.AreEqual(0, definition.Metadata.Count);\r
-\r
-            Assert.IsNull(((ICompositionElement)definition).Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetDefinition_OriginIsSet()\r
-        {\r
-            var expectedPartDefinition = PartDefinitionFactory.CreateAttributed(typeof(object));\r
-            var exportDefinition = CreateReflectionExportDefinition(new LazyMemberInfo(this.GetType()), "ContractName", null, expectedPartDefinition);\r
-\r
-            Assert.AreSame(expectedPartDefinition, ((ICompositionElement)exportDefinition).Origin);\r
-        }\r
-        \r
-        [TestMethod]\r
-        public void SetDefinition_PartDefinitionDoesNotContainCreationPolicy_CreationPolicyShouldNotBeInMetadata()\r
-        {\r
-            var expectedPartDefinition = PartDefinitionFactory.CreateAttributed(typeof(object));\r
-            var exportDefinition = CreateReflectionExportDefinition(new LazyMemberInfo(this.GetType()), "ContractName", null);\r
-\r
-            Assert.IsFalse(exportDefinition.Metadata.ContainsKey(CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ValueAsContractName_ShouldIncludeContractName()\r
-        {\r
-            var contractNames = Expectations.GetContractNamesWithEmpty();\r
-\r
-            foreach (var contractName in contractNames)\r
-            {\r
-                if (string.IsNullOrEmpty(contractName)) continue;\r
-                var definition = (ICompositionElement)CreateReflectionExportDefinition(new LazyMemberInfo(typeof(string)), contractName, null);\r
-\r
-                var e = CreateDisplayNameExpectation(contractName);\r
-\r
-                Assert.AreEqual(e, definition.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_TypeAsMember_ShouldIncludeMemberDisplayName()\r
-        {\r
-            var types = Expectations.GetTypes();\r
-\r
-            foreach (var type in types)\r
-            {\r
-                var definition = (ICompositionElement)CreateReflectionExportDefinition(new LazyMemberInfo(type), "Contract", null);\r
-\r
-                var e = CreateDisplayNameExpectation(type);\r
-\r
-                Assert.AreEqual(e, definition.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ValueAsMember_ShouldIncludeMemberDisplayName()\r
-        {\r
-            var members = Expectations.GetMembers();\r
-\r
-            foreach (var member in members)\r
-            {\r
-                var definition = (ICompositionElement)CreateReflectionExportDefinition(new LazyMemberInfo(member), "Contract", null);\r
-\r
-                var e = CreateDisplayNameExpectation(member);\r
-\r
-                Assert.AreEqual(e, definition.DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnDisplayName()\r
-        {\r
-            var members = Expectations.GetMembers();\r
-\r
-            foreach (var member in members)\r
-            {\r
-                var definition = (ICompositionElement)CreateReflectionExportDefinition(new LazyMemberInfo(member), "Contract", null);\r
-\r
-                Assert.AreEqual(definition.DisplayName, definition.ToString());\r
-            }\r
-        }\r
-\r
-        private static string CreateDisplayNameExpectation(string contractName)\r
-        {\r
-            return String.Format("System.String (ContractName=\"{0}\")", contractName);\r
-        }\r
-\r
-        private static string CreateDisplayNameExpectation(MemberInfo member)\r
-        {\r
-            return String.Format("{0} (ContractName=\"Contract\")", member.GetDisplayName());\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinitionTests.cs
deleted file mode 100644 (file)
index 5705310..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    [TestClass]\r
-    public class ReflectionMemberImportDefinitionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor()\r
-        {\r
-            PropertyInfo expectedMember = typeof(PublicImportsExpectingPublicExports).GetProperty("PublicImportPublicProperty");\r
-            LazyMemberInfo expectedImportingMemberInfo = new LazyMemberInfo(expectedMember);\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Foo", typeof(object)) };\r
-\r
-            ReflectionMemberImportDefinition definition = new ReflectionMemberImportDefinition(\r
-                expectedImportingMemberInfo, "Contract", (string)null, requiredMetadata, ImportCardinality.ZeroOrMore, true, CreationPolicy.NonShared, null);\r
-\r
-            Assert.AreEqual(expectedImportingMemberInfo, definition.ImportingLazyMember);\r
-\r
-            Assert.AreEqual("Contract", definition.ContractName);\r
-            Assert.AreSame(requiredMetadata, definition.RequiredMetadata);\r
-            Assert.AreEqual(CreationPolicy.NonShared, definition.RequiredCreationPolicy);\r
-            Assert.AreEqual(true, definition.IsRecomposable);\r
-            Assert.AreEqual(false, definition.IsPrerequisite);\r
-            Assert.IsNull(((ICompositionElement)definition).Origin);\r
-            Assert.IsNotNull(((ICompositionElement)definition).DisplayName);\r
-            Assert.IsTrue(((ICompositionElement)definition).DisplayName.Contains(expectedMember.GetDisplayName()));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_WithNullRequiredMetadata()\r
-        {\r
-            LazyMemberInfo member = CreateLazyMemberInfo();\r
-\r
-            ReflectionMemberImportDefinition definition = new ReflectionMemberImportDefinition(\r
-                member, "Contract", (string)null, null, ImportCardinality.ZeroOrMore, true, CreationPolicy.NonShared, null);\r
-\r
-            Assert.IsNotNull(definition.RequiredMetadata);\r
-            Assert.AreEqual(0, definition.RequiredMetadata.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetDefinition_OriginIsSet()\r
-        {\r
-            LazyMemberInfo member = CreateLazyMemberInfo();\r
-            var expectedPartDefinition = PartDefinitionFactory.CreateAttributed(typeof(object));\r
-            ReflectionMemberImportDefinition definition = new ReflectionMemberImportDefinition(\r
-                member, "Contract", (string)null, null, ImportCardinality.ZeroOrMore, true, CreationPolicy.NonShared, expectedPartDefinition);\r
-\r
-            Assert.AreSame(expectedPartDefinition, ((ICompositionElement)definition).Origin);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnDisplayName()\r
-        {\r
-            var members = Expectations.GetMembers();\r
-\r
-            foreach (var member in members)\r
-            {\r
-                var definition = (ICompositionElement)new ReflectionMemberImportDefinition(\r
-                    new LazyMemberInfo(member), "Contract", (string)null, null, ImportCardinality.ZeroOrMore, true, CreationPolicy.NonShared, null);\r
-\r
-                Assert.AreEqual(definition.DisplayName, definition.ToString());\r
-            }\r
-        }\r
-\r
-        private static LazyMemberInfo CreateLazyMemberInfo()\r
-        {\r
-            PropertyInfo expectedMember = typeof(PublicImportsExpectingPublicExports).GetProperty("PublicImportPublicProperty");\r
-            return new LazyMemberInfo(expectedMember);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesTests.cs
deleted file mode 100644 (file)
index 4cf4d95..0000000
+++ /dev/null
@@ -1,1098 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    [TestClass]\r
-    public class ReflectionModelServicesTests\r
-    {\r
-        [TestMethod]\r
-        public void CreatePartDefinition()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-\r
-            Assert.AreSame(expectedType, definition.GetPartType());\r
-            Assert.IsTrue(definition.Metadata.Keys.SequenceEqual(expectedMetadata.Keys));\r
-            Assert.IsTrue(definition.Metadata.Values.SequenceEqual(expectedMetadata.Values));\r
-            Assert.IsTrue(definition.ExportDefinitions.SequenceEqual(expectedExports.Cast<ExportDefinition>()));\r
-            Assert.IsTrue(definition.ImportDefinitions.SequenceEqual(expectedImports.Cast<ImportDefinition>()));\r
-            Assert.AreSame(expectedOrigin, ((ICompositionElement)definition).Origin);\r
-            Assert.IsNotNull(((ICompositionElement)definition).DisplayName);\r
-            Assert.IsFalse(definition.IsDisposalRequired);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_Disposable()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, true,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-\r
-            Assert.AreSame(expectedType, definition.GetPartType());\r
-            Assert.IsTrue(definition.Metadata.Keys.SequenceEqual(expectedMetadata.Keys));\r
-            Assert.IsTrue(definition.Metadata.Values.SequenceEqual(expectedMetadata.Values));\r
-            Assert.IsTrue(definition.ExportDefinitions.SequenceEqual(expectedExports.Cast<ExportDefinition>()));\r
-            Assert.IsTrue(definition.ImportDefinitions.SequenceEqual(expectedImports.Cast<ImportDefinition>()));\r
-            Assert.AreSame(expectedOrigin, ((ICompositionElement)definition).Origin);\r
-            Assert.IsNotNull(((ICompositionElement)definition).DisplayName);\r
-            Assert.IsTrue(definition.IsDisposalRequired);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NullMetadataAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                null, expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-            Assert.IsNotNull(definition.Metadata);\r
-            Assert.AreEqual(0, definition.Metadata.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_EvaluatedNullMetadataAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = null;\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-            Assert.IsNotNull(definition.Metadata);\r
-            Assert.AreEqual(0, definition.Metadata.Count);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NullExportsAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                null,\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-            Assert.IsNotNull(definition.ExportDefinitions);\r
-            Assert.AreEqual(0, definition.ExportDefinitions.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_EvaluatedNullExportsAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => null),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-            Assert.IsNotNull(definition.ExportDefinitions);\r
-            Assert.AreEqual(0, definition.ExportDefinitions.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_ExportsMustBeOfRightType()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => CreateInvalidExports()),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-            {\r
-                definition.ExportDefinitions.Count();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NullImportsAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                null,\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-            Assert.IsNotNull(definition.ImportDefinitions);\r
-            Assert.AreEqual(0, definition.ImportDefinitions.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_EvaluatedNullImportsAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => null),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-            Assert.IsNotNull(definition.ImportDefinitions);\r
-            Assert.AreEqual(0, definition.ImportDefinitions.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_ImportsMustBeOfRightType()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => CreateInvalidImports()),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-            {\r
-                definition.ImportDefinitions.Count();\r
-            });\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NullTypeNotAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("partType", () =>\r
-            {\r
-                ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(null, false,\r
-                    new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                    new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                    expectedMetadata.AsLazy(), expectedOrigin);\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void CreatePartDefinition_NullEvaluatedTypeNotAllowed()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(new Lazy<Type>(() => null), false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-\r
-            ReflectionComposablePartDefinition definition = partDefinition as ReflectionComposablePartDefinition;\r
-            Assert.IsNotNull(definition);\r
-\r
-            ExceptionAssert.Throws<InvalidOperationException>(() =>\r
-            {\r
-                definition.GetPartType();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetPartType()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            Lazy<Type> lazyPartType = ReflectionModelServices.GetPartType(partDefinition);\r
-            Assert.AreEqual(expectedLazyType, lazyPartType);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetPartType_NullAsPart_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("partDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetPartType(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetPartType_InvalidPart_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("partDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetPartType(new InvalidPartDefinition());\r
-            });\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void IsDisposalRequired_ForNonDisposable()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, false,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            bool isDisposalRequired = ReflectionModelServices.IsDisposalRequired(partDefinition);\r
-            Assert.IsFalse(isDisposalRequired);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsDisposalRequired_ForDisposable()\r
-        {\r
-            Type expectedType = typeof(TestPart);\r
-            Lazy<Type> expectedLazyType = expectedType.AsLazy();\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            IEnumerable<ImportDefinition> expectedImports = CreateImports(expectedType);\r
-            IEnumerable<ExportDefinition> expectedExports = CreateExports(expectedType);\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ComposablePartDefinition partDefinition = ReflectionModelServices.CreatePartDefinition(expectedLazyType, true,\r
-                new Lazy<IEnumerable<ImportDefinition>>(() => expectedImports),\r
-                new Lazy<IEnumerable<ExportDefinition>>(() => expectedExports),\r
-                expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(partDefinition);\r
-\r
-            bool isDisposalRequired = ReflectionModelServices.IsDisposalRequired(partDefinition);\r
-            Assert.IsTrue(isDisposalRequired);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void IsDisposalRequired_NullAsPart_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("partDefinition", () =>\r
-            {\r
-                ReflectionModelServices.IsDisposalRequired(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsDisposalRequired_InvalidPart_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("partDefinition", () =>\r
-            {\r
-                ReflectionModelServices.IsDisposalRequired(new InvalidPartDefinition());\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateExportDefinition()\r
-        {\r
-            PropertyInfo property = typeof(TestPart).GetProperties().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(property);\r
-\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            string expectedContractName = "Foo";\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExportDefinition exportDefinition = ReflectionModelServices.CreateExportDefinition(expectedLazyMember, expectedContractName, expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(exportDefinition);\r
-            ReflectionMemberExportDefinition definition = exportDefinition as ReflectionMemberExportDefinition;\r
-            Assert.IsNotNull(definition);\r
-\r
-            Assert.AreEqual(expectedContractName, definition.ContractName);\r
-            Assert.IsTrue(definition.Metadata.Keys.SequenceEqual(expectedMetadata.Keys));\r
-            Assert.IsTrue(definition.Metadata.Values.SequenceEqual(expectedMetadata.Values));\r
-            Assert.AreEqual(expectedOrigin, ((ICompositionElement)definition).Origin);\r
-            Assert.AreEqual(expectedLazyMember, definition.ExportingLazyMember);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateExportDefinition_NullAsContractName_ThrowsNullArgument()\r
-        {\r
-            PropertyInfo property = typeof(TestPart).GetProperties().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(property);\r
-\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("contractName", () =>\r
-            {\r
-                ReflectionModelServices.CreateExportDefinition(expectedLazyMember, null, expectedMetadata.AsLazy(), expectedOrigin);\r
-            });\r
-        }\r
-\r
-        public void CreateExportDefinition_NullAsMetadata_Allowed()\r
-        {\r
-            PropertyInfo property = typeof(TestPart).GetProperties().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(property);\r
-\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            string expectedContractName = "Foo";\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExportDefinition definition = ReflectionModelServices.CreateExportDefinition(expectedLazyMember, expectedContractName, expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(definition.Metadata);\r
-            Assert.AreEqual(0, definition.Metadata.Count);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateExportDefinition_InvalidLazymemberInfo_ShouldThrowArtument()\r
-        {\r
-            EventInfo _event = typeof(TestPart).GetEvents().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(_event);\r
-\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            string expectedContractName = "Foo";\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exportingMember", () =>\r
-            {\r
-                ReflectionModelServices.CreateExportDefinition(expectedLazyMember, expectedContractName, expectedMetadata.AsLazy(), expectedOrigin);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportingMember()\r
-        {\r
-            PropertyInfo property = typeof(TestPart).GetProperties().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(property);\r
-\r
-            IDictionary<string, object> expectedMetadata = new Dictionary<string, object>();\r
-            expectedMetadata["Key1"] = 1;\r
-            expectedMetadata["Key2"] = "Value2";\r
-\r
-            string expectedContractName = "Foo";\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExportDefinition exportDefinition = ReflectionModelServices.CreateExportDefinition(expectedLazyMember, expectedContractName, expectedMetadata.AsLazy(), expectedOrigin);\r
-            Assert.IsNotNull(exportDefinition);\r
-\r
-            LazyMemberInfo lazyMember = ReflectionModelServices.GetExportingMember(exportDefinition);\r
-            Assert.AreEqual(expectedLazyMember, lazyMember);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportingMember_NullAsExportDefinition_ShouldThrowArhumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("exportDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetExportingMember(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportingMember_InvalidExportDefinition_ShouldThrowArhumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("exportDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetExportingMember(new ExportDefinition("Foo", null));\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateImportDefinition_Member()\r
-        {\r
-            PropertyInfo property = typeof(TestPart).GetProperties().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(property);\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-            bool expectedRecomposable = true;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ImportDefinition importDefinition = ReflectionModelServices.CreateImportDefinition(\r
-                expectedLazyMember,\r
-                expectedContractName,\r
-                expectedRequiredTypeIdentity,\r
-                expectedRequiredMetadata,\r
-                expectedCardinality,\r
-                expectedRecomposable,\r
-                expectedCreationPolicy,\r
-                expectedOrigin);\r
-            Assert.IsNotNull(importDefinition);\r
-\r
-            ReflectionMemberImportDefinition definition = importDefinition as ReflectionMemberImportDefinition;\r
-            Assert.IsNotNull(definition);\r
-\r
-            Assert.AreEqual(expectedLazyMember, definition.ImportingLazyMember);\r
-            Assert.AreEqual(definition.ContractName, expectedContractName);\r
-            Assert.AreEqual(definition.RequiredTypeIdentity, expectedRequiredTypeIdentity);\r
-            Assert.IsTrue(definition.RequiredMetadata.SequenceEqual(expectedRequiredMetadata));\r
-            Assert.AreEqual(definition.Cardinality, expectedCardinality);\r
-            Assert.AreEqual(definition.RequiredCreationPolicy, expectedCreationPolicy);\r
-            Assert.AreEqual(definition.IsRecomposable, expectedRecomposable);\r
-            Assert.AreSame(expectedOrigin, ((ICompositionElement)definition).Origin);\r
-            Assert.IsFalse(definition.IsPrerequisite);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateImportDefinition_Member_InvalidMember_ShouldThrowArgument()\r
-        {\r
-            MethodInfo method = typeof(TestPart).GetMethods().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(method);\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-            bool expectedRecomposable = true;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("importingMember", () =>\r
-            {\r
-                ReflectionModelServices.CreateImportDefinition(\r
-                expectedLazyMember,\r
-                expectedContractName,\r
-                expectedRequiredTypeIdentity,\r
-                expectedRequiredMetadata,\r
-                expectedCardinality,\r
-                expectedRecomposable,\r
-                expectedCreationPolicy,\r
-                expectedOrigin);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetImporingMember()\r
-        {\r
-            PropertyInfo property = typeof(TestPart).GetProperties().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(property);\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-            bool expectedRecomposable = true;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ImportDefinition importDefinition = ReflectionModelServices.CreateImportDefinition(\r
-                expectedLazyMember,\r
-                expectedContractName,\r
-                expectedRequiredTypeIdentity,\r
-                expectedRequiredMetadata,\r
-                expectedCardinality,\r
-                expectedRecomposable,\r
-                expectedCreationPolicy,\r
-                expectedOrigin);\r
-            Assert.IsNotNull(importDefinition);\r
-\r
-            LazyMemberInfo lazyMember = ReflectionModelServices.GetImportingMember(importDefinition);\r
-            Assert.AreEqual(expectedLazyMember, lazyMember);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetImporingMember_NullAsImport_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("importDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetImportingMember(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetImporingMember_InvalidImport_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("importDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetImportingMember(new ContractBasedImportDefinition("Foo", "Foo", null, ImportCardinality.ZeroOrMore, false, false, CreationPolicy.Any));\r
-            });\r
-        }\r
-\r
-\r
-\r
-        [TestMethod]\r
-        public void CreateImportDefinition_Parameter()\r
-        {\r
-\r
-            ParameterInfo parameter = typeof(TestPart).GetConstructor(new Type[] { typeof(int) }).GetParameters()[0];\r
-            Lazy<ParameterInfo> expectedLazyParameter = parameter.AsLazy();\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ImportDefinition importDefinition = ReflectionModelServices.CreateImportDefinition(\r
-                expectedLazyParameter,\r
-                expectedContractName,\r
-                expectedRequiredTypeIdentity,\r
-                expectedRequiredMetadata,\r
-                expectedCardinality,\r
-                expectedCreationPolicy,\r
-                expectedOrigin);\r
-            Assert.IsNotNull(importDefinition);\r
-\r
-            ReflectionParameterImportDefinition definition = importDefinition as ReflectionParameterImportDefinition;\r
-            Assert.IsNotNull(definition);\r
-\r
-            Assert.AreEqual(expectedLazyParameter, definition.ImportingLazyParameter);\r
-            Assert.AreEqual(definition.ContractName, expectedContractName);\r
-            Assert.AreEqual(definition.RequiredTypeIdentity, expectedRequiredTypeIdentity);\r
-            Assert.IsTrue(definition.RequiredMetadata.SequenceEqual(expectedRequiredMetadata));\r
-            Assert.AreEqual(definition.Cardinality, expectedCardinality);\r
-            Assert.AreEqual(definition.RequiredCreationPolicy, expectedCreationPolicy);\r
-            Assert.IsFalse(definition.IsRecomposable);\r
-            Assert.AreSame(expectedOrigin, ((ICompositionElement)definition).Origin);\r
-            Assert.IsTrue(definition.IsPrerequisite);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CreateImportDefinition_Parameter_NullAsParamater_ShouldThrowArgumentNull()\r
-        {\r
-            ParameterInfo parameter = typeof(TestPart).GetConstructor(new Type[] { typeof(int) }).GetParameters()[0];\r
-            Lazy<ParameterInfo> expectedLazyParameter = parameter.AsLazy();\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("parameter", () =>\r
-            {\r
-                ReflectionModelServices.CreateImportDefinition(\r
-                                null,\r
-                                expectedContractName,\r
-                                expectedRequiredTypeIdentity,\r
-                                expectedRequiredMetadata,\r
-                                expectedCardinality,\r
-                                expectedCreationPolicy,\r
-                                expectedOrigin);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetImportingParameter()\r
-        {\r
-            ParameterInfo parameter = typeof(TestPart).GetConstructor(new Type[] { typeof(int) }).GetParameters()[0];\r
-            Lazy<ParameterInfo> expectedLazyParameter = parameter.AsLazy();\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-            ImportDefinition importDefinition = ReflectionModelServices.CreateImportDefinition(\r
-                expectedLazyParameter,\r
-                expectedContractName,\r
-                expectedRequiredTypeIdentity,\r
-                expectedRequiredMetadata,\r
-                expectedCardinality,\r
-                expectedCreationPolicy,\r
-                expectedOrigin);\r
-            Assert.IsNotNull(importDefinition);\r
-\r
-            Lazy<ParameterInfo> lazyParameter = ReflectionModelServices.GetImportingParameter(importDefinition);\r
-            Assert.AreEqual(expectedLazyParameter, lazyParameter);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetImportingParameter_NullAsImport_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("importDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetImportingParameter(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetImportingParameter_InvalidImport_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("importDefinition", () =>\r
-            {\r
-                ReflectionModelServices.GetImportingParameter(new ContractBasedImportDefinition("Foo", "Foo", null, ImportCardinality.ZeroOrMore, false, false, CreationPolicy.Any));\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsImportingParameter_OnParameterImport()\r
-        {\r
-            ParameterInfo parameter = typeof(TestPart).GetConstructor(new Type[] { typeof(int) }).GetParameters()[0];\r
-            Lazy<ParameterInfo> expectedLazyParameter = parameter.AsLazy();\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-            ImportDefinition importDefinition = ReflectionModelServices.CreateImportDefinition(\r
-                expectedLazyParameter,\r
-                expectedContractName,\r
-                expectedRequiredTypeIdentity,\r
-                expectedRequiredMetadata,\r
-                expectedCardinality,\r
-                expectedCreationPolicy,\r
-                expectedOrigin);\r
-            Assert.IsNotNull(importDefinition);\r
-\r
-            Assert.IsTrue(ReflectionModelServices.IsImportingParameter(importDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsImportingParameter_OnMemberImport()\r
-        {\r
-            PropertyInfo property = typeof(TestPart).GetProperties().First();\r
-            LazyMemberInfo expectedLazyMember = new LazyMemberInfo(property);\r
-\r
-            string expectedContractName = "Foo";\r
-            string expectedRequiredTypeIdentity = "Bar";\r
-            KeyValuePair<string, Type>[] expectedRequiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) };\r
-            ImportCardinality expectedCardinality = ImportCardinality.ExactlyOne;\r
-            CreationPolicy expectedCreationPolicy = CreationPolicy.NonShared;\r
-            bool expectedRecomposable = true;\r
-\r
-            ICompositionElement expectedOrigin = new MockOrigin();\r
-\r
-            ImportDefinition importDefinition = ReflectionModelServices.CreateImportDefinition(\r
-                expectedLazyMember,\r
-                expectedContractName,\r
-                expectedRequiredTypeIdentity,\r
-                expectedRequiredMetadata,\r
-                expectedCardinality,\r
-                expectedRecomposable,\r
-                expectedCreationPolicy,\r
-                expectedOrigin);\r
-            Assert.IsNotNull(importDefinition);\r
-\r
-            Assert.IsFalse(ReflectionModelServices.IsImportingParameter(importDefinition));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsImportingParameter_NullAsImport_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("importDefinition", () =>\r
-            {\r
-                ReflectionModelServices.IsImportingParameter(null);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsImportingParameter_InvalidImport_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentException>("importDefinition", () =>\r
-            {\r
-                ReflectionModelServices.IsImportingParameter(new ContractBasedImportDefinition("Foo", "Foo", null, ImportCardinality.ZeroOrMore, false, false, CreationPolicy.Any));\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsExportFactoryImportDefinition_NullImport_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgumentNull("importDefinition", () =>\r
-                ReflectionModelServices.IsExportFactoryImportDefinition(null));\r
-        }\r
-        \r
-        [TestMethod]\r
-        public void IsExportFactoryImportDefinition_InvalidImport_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument("importDefinition", () =>\r
-                ReflectionModelServices.IsExportFactoryImportDefinition(CreateInvalidImport()));\r
-        }\r
-        \r
-        [TestMethod]\r
-        public void IsExportFactoryImportDefinition_NonPartCreatorImport_ShouldReturnFalse()\r
-        {\r
-            var import = ReflectionModelServices.CreateImportDefinition(\r
-                new LazyMemberInfo(MemberTypes.Field, () => new MemberInfo[] { typeof(ReflectionModelServicesTests) }), // bogus member\r
-                "Foo",\r
-                "Foo",\r
-                Enumerable.Empty<KeyValuePair<string, Type>>(),\r
-                ImportCardinality.ZeroOrMore,\r
-                false,\r
-                CreationPolicy.Any,\r
-                null);\r
-\r
-            Assert.IsFalse(ReflectionModelServices.IsExportFactoryImportDefinition(import));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void IsExportFactoryImportDefinition_PartCreatorImport_ShouldReturnTrue()\r
-        {\r
-            var import = ReflectionModelServices.CreateImportDefinition(\r
-                new LazyMemberInfo(MemberTypes.Field, () => new MemberInfo[] { typeof(ReflectionModelServicesTests) }), // bogus member\r
-                "Foo",\r
-                "Foo",\r
-                Enumerable.Empty<KeyValuePair<string, Type>>(),\r
-                ImportCardinality.ZeroOrMore,\r
-                false,\r
-                CreationPolicy.Any,\r
-                true, //isPartCreator\r
-                null);\r
-\r
-            Assert.IsTrue(ReflectionModelServices.IsExportFactoryImportDefinition(import));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetPartCreatorProductImportDefinition_NullImport_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgumentNull("importDefinition", () =>\r
-                ReflectionModelServices.GetPartCreatorProductImportDefinition(null));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetPartCreatorProductImportDefinition_InvalidImport_ShouldThrowArgument()\r
-        {\r
-            ExceptionAssert.ThrowsArgument("importDefinition", () =>\r
-                ReflectionModelServices.GetPartCreatorProductImportDefinition(CreateInvalidImport()));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetPartCreatorProductImportDefinition_()\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetPartCreatorProductImportDefinition_PartCreatorImport_()\r
-        {\r
-            LazyMemberInfo bogusMember = new LazyMemberInfo(MemberTypes.Field, () => new MemberInfo[] { typeof(ReflectionModelServicesTests) });\r
-            var import = ReflectionModelServices.CreateImportDefinition(\r
-                bogusMember,\r
-                "Foo",\r
-                "Foo",\r
-                Enumerable.Empty<KeyValuePair<string, Type>>(),\r
-                ImportCardinality.ZeroOrMore,\r
-                false,\r
-                CreationPolicy.Any,\r
-                true, //isPartCreator\r
-                null);\r
-\r
-            var productImport = ReflectionModelServices.GetPartCreatorProductImportDefinition(import);\r
-\r
-            var import2 = ReflectionModelServices.CreateImportDefinition(\r
-                bogusMember,\r
-                productImport.ContractName,\r
-                productImport.RequiredTypeIdentity,\r
-                productImport.RequiredMetadata,\r
-                productImport.Cardinality,\r
-                productImport.IsRecomposable,\r
-                productImport.RequiredCreationPolicy,\r
-                true, //isPartCreator\r
-                null);\r
-\r
-            Assert.AreEqual(import.ContractName, import2.ContractName);\r
-            Assert.AreEqual(import.Cardinality, import2.Cardinality);\r
-            Assert.AreEqual(import.IsRecomposable, import2.IsRecomposable);\r
-            Assert.AreEqual(import.RequiredCreationPolicy, import2.RequiredCreationPolicy);\r
-            Assert.AreEqual(import.RequiredTypeIdentity, import2.RequiredTypeIdentity);\r
-            EnumerableAssert.AreEqual(import.RequiredMetadata, import2.RequiredMetadata);\r
-        }\r
-\r
-        private static IEnumerable<ImportDefinition> CreateInvalidImports()\r
-        {\r
-            yield return new ContractBasedImportDefinition("Foo", "Foo", null, ImportCardinality.ZeroOrMore, false, false, CreationPolicy.Any);\r
-        }\r
-\r
-        private static ImportDefinition CreateInvalidImport()\r
-        {\r
-            return new ContractBasedImportDefinition("Foo", "Foo", null, ImportCardinality.ZeroOrMore, false, false, CreationPolicy.Any);\r
-        }\r
-\r
-        private static IEnumerable<ExportDefinition> CreateInvalidExports()\r
-        {\r
-            yield return new ExportDefinition("Foo", null);\r
-        }\r
-\r
-\r
-        class InvalidPartDefinition : ComposablePartDefinition\r
-        {\r
-            public override ComposablePart CreatePart()\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            public override IEnumerable<ExportDefinition> ExportDefinitions\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            public override IEnumerable<ImportDefinition> ImportDefinitions\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-        }\r
-\r
-        private static List<ImportDefinition> CreateImports(Type type)\r
-        {\r
-            List<ImportDefinition> imports = new List<ImportDefinition>();\r
-            foreach (PropertyInfo property in type.GetProperties())\r
-            {\r
-                imports.Add(new ReflectionMemberImportDefinition(new LazyMemberInfo(property), "Contract", (string)null, new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Key1", typeof(string)), new KeyValuePair<string, Type>("Key2", typeof(int)) }, ImportCardinality.ZeroOrOne, true, CreationPolicy.Any, new TypeOrigin(type)));\r
-            }\r
-\r
-            return imports;\r
-        }\r
-\r
-        private static List<ExportDefinition> CreateExports(Type type)\r
-        {\r
-            List<ExportDefinition> exports = new List<ExportDefinition>();\r
-            foreach (PropertyInfo property in type.GetProperties())\r
-            {\r
-                exports.Add(ReflectionModelServices.CreateExportDefinition(new LazyMemberInfo(property), "Contract", new Lazy<IDictionary<string, object>>(() => null), new TypeOrigin(type)));\r
-            }\r
-\r
-            return exports;\r
-        }\r
-\r
-        public class TestPart\r
-        {\r
-            public TestPart(int arg1)\r
-            {\r
-            }\r
-\r
-            public int field1;\r
-            public string field2;\r
-            public int Property1 { get; set; }\r
-            public string Property2\r
-            {\r
-                get { return null; }\r
-                set\r
-                {\r
-                    this.Event.Invoke(this, null);\r
-                }\r
-            }\r
-            public event EventHandler Event;\r
-        }\r
-\r
-        private class TypeOrigin : ICompositionElement\r
-        {\r
-            private readonly Type _type;\r
-            private readonly ICompositionElement _orgin;\r
-\r
-            public TypeOrigin(Type type)\r
-                : this(type, null)\r
-            {\r
-            }\r
-\r
-            public TypeOrigin(Type type, ICompositionElement origin)\r
-            {\r
-                this._type = type;\r
-                this._orgin = origin;\r
-            }\r
-\r
-            public string DisplayName\r
-            {\r
-                get\r
-                {\r
-                    return this._type.GetDisplayName();\r
-                }\r
-            }\r
-\r
-            public ICompositionElement Origin\r
-            {\r
-                get\r
-                {\r
-                    return this._orgin;\r
-                }\r
-            }\r
-        }\r
-\r
-        private class MockOrigin : ICompositionElement\r
-        {\r
-            public string DisplayName\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-\r
-            public ICompositionElement Origin\r
-            {\r
-                get { throw new NotImplementedException(); }\r
-            }\r
-        }\r
-\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionParameterImportDefinitionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/ReflectionModel/ReflectionParameterImportDefinitionTests.cs
deleted file mode 100644 (file)
index 5016f9a..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    [TestClass]\r
-    public class ReflectionParameterImportDefinitionTests\r
-    {\r
-        [TestMethod]\r
-        public void Constructor()\r
-        {\r
-            Lazy<ParameterInfo> parameter = CreateLazyParameter();\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata = new KeyValuePair<string, Type>[] { new KeyValuePair<string, Type>("Foo", typeof(object)) };\r
-\r
-            ReflectionParameterImportDefinition definition = new ReflectionParameterImportDefinition(\r
-                parameter, "Contract", (string)null, requiredMetadata, ImportCardinality.ZeroOrMore, CreationPolicy.NonShared, null);\r
-\r
-            Assert.AreSame(parameter, definition.ImportingLazyParameter);\r
-            Assert.AreEqual("Contract", definition.ContractName);\r
-            Assert.AreSame(requiredMetadata, definition.RequiredMetadata);\r
-            Assert.AreEqual(CreationPolicy.NonShared, definition.RequiredCreationPolicy);\r
-            Assert.AreEqual(false, definition.IsRecomposable);\r
-            Assert.AreEqual(true, definition.IsPrerequisite);\r
-            Assert.IsNull(((ICompositionElement)definition).Origin);\r
-            Assert.IsNotNull(((ICompositionElement)definition).DisplayName);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor_WithNullRequiredMetadata()\r
-        {\r
-            Lazy<ParameterInfo> parameter = CreateLazyParameter();\r
-\r
-            ReflectionParameterImportDefinition definition = new ReflectionParameterImportDefinition(\r
-                parameter, "Contract", (string)null, null, ImportCardinality.ZeroOrMore, CreationPolicy.NonShared, null);\r
-\r
-\r
-            Assert.IsNotNull(definition.RequiredMetadata);\r
-            Assert.AreEqual(0, definition.RequiredMetadata.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SetDefinition_OriginIsSet()\r
-        {\r
-            Lazy<ParameterInfo> parameter = CreateLazyParameter();\r
-            var expectedPartDefinition = PartDefinitionFactory.CreateAttributed(typeof(object));\r
-\r
-            ReflectionParameterImportDefinition definition = new ReflectionParameterImportDefinition(\r
-                parameter, "Contract", (string)null, null, ImportCardinality.ZeroOrMore, CreationPolicy.NonShared, expectedPartDefinition);\r
-\r
-            Assert.AreSame(expectedPartDefinition, ((ICompositionElement)definition).Origin);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ValueAsParameter_ShouldIncludeParameterName()\r
-        {\r
-            var names = Expectations.GetContractNamesWithEmpty();\r
-\r
-            foreach (var name in names)\r
-            {\r
-                var definition = CreateReflectionParameterImportDefinition(name);\r
-\r
-                var e = CreateDisplayNameExpectationFromParameterName(definition, name);\r
-\r
-                Assert.AreEqual(e, ((ICompositionElement)definition).DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ICompositionElementDisplayName_ValueAsParameter_ShouldIncludeContractName()\r
-        {\r
-            var types = Expectations.GetTypes();\r
-\r
-            foreach (var type in types)\r
-            {\r
-                var definition = CreateReflectionParameterImportDefinition(type);\r
-\r
-                var e = CreateDisplayNameExpectationFromContractName(definition, type);\r
-\r
-                Assert.AreEqual(e, ((ICompositionElement)definition).DisplayName);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ToString_ShouldReturnICompositionElementDisplayName()\r
-        {\r
-            var types = Expectations.GetTypes();\r
-\r
-            foreach (var type in types)\r
-            {\r
-                var definition = CreateReflectionParameterImportDefinition(type);\r
-\r
-                Assert.AreEqual(((ICompositionElement)definition).DisplayName, definition.ToString());\r
-            }\r
-        }\r
-\r
-\r
-        private Lazy<ParameterInfo> CreateLazyParameter()\r
-        {\r
-            return typeof(SimpleConstructorInjectedObject).GetConstructors().First().GetParameters().First().AsLazy();\r
-        }\r
-\r
-        private static string CreateDisplayNameExpectationFromContractName(ReflectionParameterImportDefinition definition, Type type)\r
-        {\r
-            string contractName = AttributedModelServices.GetContractName(type);\r
-\r
-            return String.Format("{0} (Parameter=\"\", ContractName=\"{1}\")", definition.ImportingLazyParameter.Value.Member.GetDisplayName(), contractName);\r
-        }\r
-\r
-        private static string CreateDisplayNameExpectationFromParameterName(ReflectionParameterImportDefinition definition, string name)\r
-        {\r
-            return String.Format("{0} (Parameter=\"{1}\", ContractName=\"System.String\")", definition.ImportingLazyParameter.Value.Member.GetDisplayName(), name);\r
-        }\r
-\r
-        private static ReflectionParameterImportDefinition CreateReflectionParameterImportDefinition(Type parameterType)\r
-        {\r
-            var parameter = ReflectionFactory.CreateParameter(parameterType);\r
-\r
-            return CreateReflectionParameterImportDefinition(parameter);\r
-        }\r
-\r
-        private static ReflectionParameterImportDefinition CreateReflectionParameterImportDefinition(string name)\r
-        {\r
-            var parameter = ReflectionFactory.CreateParameter(name);\r
-\r
-            return CreateReflectionParameterImportDefinition(parameter);\r
-        }\r
-\r
-        private static ReflectionParameterImportDefinition CreateReflectionParameterImportDefinition(ParameterInfo parameter)\r
-        {\r
-            return new ReflectionParameterImportDefinition(\r
-                parameter.AsLazy(), AttributedModelServices.GetContractName(parameter.ParameterType), (string)null, null, ImportCardinality.ZeroOrMore, CreationPolicy.NonShared, null);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/SampleComponents.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/SampleComponents.cs
deleted file mode 100644 (file)
index f82d9ea..0000000
+++ /dev/null
@@ -1,1023 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public interface IGetString\r
-    {\r
-        string GetString();\r
-    }\r
-    public class PublicComponentWithPublicExports\r
-    {\r
-        public const string PublicFieldExpectedValue = "PublicField";\r
-        [Export("PublicField")]\r
-        public string PublicField = PublicFieldExpectedValue;\r
-        public const string PublicPropertyExpectedValue = "PublicProperty";\r
-        [Export("PublicProperty")]\r
-        public string PublicProperty { get { return PublicPropertyExpectedValue; } }\r
-        public const string PublicMethodExpectedValue = "PublicMethod";\r
-        [Export("PublicDelegate")]\r
-        public string PublicMethod() { return PublicMethodExpectedValue; }\r
-        public const string PublicNestedClassExpectedValue = "PublicNestedClass";\r
-        [Export("PublicIGetString", typeof(IGetString))]\r
-        public class PublicNestedClass : IGetString\r
-        {\r
-            public string GetString() { return PublicNestedClassExpectedValue; }\r
-        }\r
-    }\r
-    [Export]\r
-    public class PublicImportsExpectingPublicExports\r
-    {\r
-        [Import("PublicField")]\r
-        public string PublicImportPublicField { get; set; }\r
-        [Import("PublicProperty")]\r
-        public string PublicImportPublicProperty { get; set; }\r
-        [Import("PublicDelegate")]\r
-        public Func<string> PublicImportPublicMethod { get; set; }\r
-        [Import("PublicIGetString")]\r
-        public IGetString PublicImportPublicNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicFieldExpectedValue, PublicImportPublicField, "PublicImportPublicField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicPropertyExpectedValue, PublicImportPublicProperty, "PublicImportPublicProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicMethodExpectedValue, PublicImportPublicMethod(), "PublicImportPublicMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicNestedClassExpectedValue, PublicImportPublicNestedClass.GetString(), "PublicImportPublicNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    [Export]\r
-    internal class InternalImportsExpectingPublicExports\r
-    {\r
-        [Import("PublicField")]\r
-        internal string InternalImportPublicField { get; set; }\r
-        [Import("PublicProperty")]\r
-        internal string InternalImportPublicProperty { get; set; }\r
-        [Import("PublicDelegate")]\r
-        internal Func<string> InternalImportPublicMethod { get; set; }\r
-        [Import("PublicIGetString")]\r
-        internal IGetString InternalImportPublicNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicFieldExpectedValue, InternalImportPublicField, "InternalImportPublicField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicPropertyExpectedValue, InternalImportPublicProperty, "InternalImportPublicProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicMethodExpectedValue, InternalImportPublicMethod(), "InternalImportPublicMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPublicExports.PublicNestedClassExpectedValue, InternalImportPublicNestedClass.GetString(), "InternalImportPublicNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    public class PublicComponentWithInternalExports\r
-    {\r
-        public const string InternalFieldExpectedValue = "InternalField";\r
-        [Export("InternalField")]\r
-        internal string InternalField = InternalFieldExpectedValue;\r
-        public const string InternalPropertyExpectedValue = "InternalProperty";\r
-        [Export("InternalProperty")]\r
-        internal string InternalProperty { get { return InternalPropertyExpectedValue; } }\r
-        public const string InternalMethodExpectedValue = "InternalMethod";\r
-        [Export("InternalDelegate")]\r
-        internal string InternalMethod() { return InternalMethodExpectedValue; }\r
-        public const string InternalNestedClassExpectedValue = "InternalNestedClass";\r
-        [Export("InternalIGetString", typeof(IGetString))]\r
-        internal class InternalNestedClass : IGetString\r
-        {\r
-            public string GetString() { return InternalNestedClassExpectedValue; }\r
-        }\r
-    }\r
-    [Export]\r
-    public class PublicImportsExpectingInternalExports\r
-    {\r
-        [Import("InternalField")]\r
-        public string PublicImportInternalField { get; set; }\r
-        [Import("InternalProperty")]\r
-        public string PublicImportInternalProperty { get; set; }\r
-        [Import("InternalDelegate")]\r
-        public Func<string> PublicImportInternalMethod { get; set; }\r
-        [Import("InternalIGetString", typeof(IGetString))]\r
-        public IGetString PublicImportInternalNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalFieldExpectedValue, PublicImportInternalField, "PublicImportInternalField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalPropertyExpectedValue, PublicImportInternalProperty, "PublicImportInternalProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalMethodExpectedValue, PublicImportInternalMethod(), "PublicImportInternalMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalNestedClassExpectedValue, PublicImportInternalNestedClass.GetString(), "PublicImportInternalNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    [Export]\r
-    internal class InternalImportsExpectingInternalExports\r
-    {\r
-        [Import("InternalField")]\r
-        internal string InternalImportInternalField { get; set; }\r
-        [Import("InternalProperty")]\r
-        internal string InternalImportInternalProperty { get; set; }\r
-        [Import("InternalDelegate")]\r
-        internal Func<string> InternalImportInternalMethod { get; set; }\r
-        [Import("InternalIGetString")]\r
-        internal IGetString InternalImportInternalNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalFieldExpectedValue, InternalImportInternalField, "InternalImportInternalField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalPropertyExpectedValue, InternalImportInternalProperty, "InternalImportInternalProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalMethodExpectedValue, InternalImportInternalMethod(), "InternalImportInternalMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithInternalExports.InternalNestedClassExpectedValue, InternalImportInternalNestedClass.GetString(), "InternalImportInternalNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    public class PublicComponentWithProtectedExports\r
-    {\r
-        public const string ProtectedFieldExpectedValue = "ProtectedField";\r
-        [Export("ProtectedField")]\r
-        protected string ProtectedField = ProtectedFieldExpectedValue;\r
-        public const string ProtectedPropertyExpectedValue = "ProtectedProperty";\r
-        [Export("ProtectedProperty")]\r
-        protected string ProtectedProperty { get { return ProtectedPropertyExpectedValue; } }\r
-        public const string ProtectedMethodExpectedValue = "ProtectedMethod";\r
-        [Export("ProtectedDelegate")]\r
-        protected string ProtectedMethod() { return ProtectedMethodExpectedValue; }\r
-        public const string ProtectedNestedClassExpectedValue = "ProtectedNestedClass";\r
-        [Export("ProtectedIGetString", typeof(IGetString))]\r
-        protected class ProtectedNestedClass : IGetString\r
-        {\r
-            public string GetString() { return ProtectedNestedClassExpectedValue; }\r
-        }\r
-    }\r
-    [Export]\r
-    public class PublicImportsExpectingProtectedExports\r
-    {\r
-        [Import("ProtectedField")]\r
-        public string PublicImportProtectedField { get; set; }\r
-        [Import("ProtectedProperty")]\r
-        public string PublicImportProtectedProperty { get; set; }\r
-        [Import("ProtectedDelegate")]\r
-        public Func<string> PublicImportProtectedMethod { get; set; }\r
-        [Import("ProtectedIGetString")]\r
-        public IGetString PublicImportProtectedNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedFieldExpectedValue, PublicImportProtectedField, "PublicImportProtectedField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedPropertyExpectedValue, PublicImportProtectedProperty, "PublicImportProtectedProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedMethodExpectedValue, PublicImportProtectedMethod(), "PublicImportProtectedMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedNestedClassExpectedValue, PublicImportProtectedNestedClass.GetString(), "PublicImportProtectedNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    [Export]\r
-    internal class InternalImportsExpectingProtectedExports\r
-    {\r
-        [Import("ProtectedField")]\r
-        internal string InternalImportProtectedField { get; set; }\r
-        [Import("ProtectedProperty")]\r
-        internal string InternalImportProtectedProperty { get; set; }\r
-        [Import("ProtectedDelegate")]\r
-        internal Func<string> InternalImportProtectedMethod { get; set; }\r
-        [Import("ProtectedIGetString")]\r
-        internal IGetString InternalImportProtectedNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedFieldExpectedValue, InternalImportProtectedField, "InternalImportProtectedField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedPropertyExpectedValue, InternalImportProtectedProperty, "InternalImportProtectedProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedMethodExpectedValue, InternalImportProtectedMethod(), "InternalImportProtectedMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedExports.ProtectedNestedClassExpectedValue, InternalImportProtectedNestedClass.GetString(), "InternalImportProtectedNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    public class PublicComponentWithProtectedInternalExports\r
-    {\r
-        public const string ProtectedInternalFieldExpectedValue = "ProtectedInternalField";\r
-        [Export("ProtectedInternalField")]\r
-        protected internal string ProtectedInternalField = ProtectedInternalFieldExpectedValue;\r
-        public const string ProtectedInternalPropertyExpectedValue = "ProtectedInternalProperty";\r
-        [Export("ProtectedInternalProperty")]\r
-        protected internal string ProtectedInternalProperty { get { return ProtectedInternalPropertyExpectedValue; } }\r
-        public const string ProtectedInternalMethodExpectedValue = "ProtectedInternalMethod";\r
-        [Export("ProtectedInternalDelegate")]\r
-        protected internal string ProtectedInternalMethod() { return ProtectedInternalMethodExpectedValue; }\r
-        public const string ProtectedInternalNestedClassExpectedValue = "ProtectedInternalNestedClass";\r
-        [Export("ProtectedInternalIGetString", typeof(IGetString))]\r
-        protected internal class ProtectedInternalNestedClass : IGetString\r
-        {\r
-            public string GetString() { return ProtectedInternalNestedClassExpectedValue; }\r
-        }\r
-    }\r
-    [Export]\r
-    public class PublicImportsExpectingProtectedInternalExports\r
-    {\r
-        [Import("ProtectedInternalField")]\r
-        public string PublicImportProtectedInternalField { get; set; }\r
-        [Import("ProtectedInternalProperty")]\r
-        public string PublicImportProtectedInternalProperty { get; set; }\r
-        [Import("ProtectedInternalDelegate")]\r
-        public Func<string> PublicImportProtectedInternalMethod { get; set; }\r
-        [Import("ProtectedInternalIGetString")]\r
-        public IGetString PublicImportProtectedInternalNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalFieldExpectedValue, PublicImportProtectedInternalField, "PublicImportProtectedInternalField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalPropertyExpectedValue, PublicImportProtectedInternalProperty, "PublicImportProtectedInternalProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalMethodExpectedValue, PublicImportProtectedInternalMethod(), "PublicImportProtectedInternalMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalNestedClassExpectedValue, PublicImportProtectedInternalNestedClass.GetString(), "PublicImportProtectedInternalNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    [Export]\r
-    internal class InternalImportsExpectingProtectedInternalExports\r
-    {\r
-        [Import("ProtectedInternalField")]\r
-        internal string InternalImportProtectedInternalField { get; set; }\r
-        [Import("ProtectedInternalProperty")]\r
-        internal string InternalImportProtectedInternalProperty { get; set; }\r
-        [Import("ProtectedInternalDelegate")]\r
-        internal Func<string> InternalImportProtectedInternalMethod { get; set; }\r
-        [Import("ProtectedInternalIGetString")]\r
-        internal IGetString InternalImportProtectedInternalNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalFieldExpectedValue, InternalImportProtectedInternalField, "InternalImportProtectedInternalField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalPropertyExpectedValue, InternalImportProtectedInternalProperty, "InternalImportProtectedInternalProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalMethodExpectedValue, InternalImportProtectedInternalMethod(), "InternalImportProtectedInternalMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithProtectedInternalExports.ProtectedInternalNestedClassExpectedValue, InternalImportProtectedInternalNestedClass.GetString(), "InternalImportProtectedInternalNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    public class PublicComponentWithPrivateExports\r
-    {\r
-        public const string PrivateFieldExpectedValue = "PrivateField";\r
-        [Export("PrivateField")]\r
-        private string PrivateField = PrivateFieldExpectedValue;\r
-        public const string PrivatePropertyExpectedValue = "PrivateProperty";\r
-        [Export("PrivateProperty")]\r
-        private string PrivateProperty { get { return PrivatePropertyExpectedValue; } }\r
-        public const string PrivateMethodExpectedValue = "PrivateMethod";\r
-        [Export("PrivateDelegate")]\r
-        private string PrivateMethod() { return PrivateMethodExpectedValue; }\r
-        public const string PrivateNestedClassExpectedValue = "PrivateNestedClass";\r
-        [Export("PrivateIGetString", typeof(IGetString))]\r
-        private class PrivateNestedClass : IGetString\r
-        {\r
-            public string GetString() { return PrivateNestedClassExpectedValue; }\r
-        }\r
-    }\r
-    [Export]\r
-    public class PublicImportsExpectingPrivateExports\r
-    {\r
-        [Import("PrivateField")]\r
-        public string PublicImportPrivateField { get; set; }\r
-        [Import("PrivateProperty")]\r
-        public string PublicImportPrivateProperty { get; set; }\r
-        [Import("PrivateDelegate")]\r
-        public Func<string> PublicImportPrivateMethod { get; set; }\r
-        [Import("PrivateIGetString")]\r
-        public IGetString PublicImportPrivateNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivateFieldExpectedValue, PublicImportPrivateField, "PublicImportPrivateField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivatePropertyExpectedValue, PublicImportPrivateProperty, "PublicImportPrivateProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivateMethodExpectedValue, PublicImportPrivateMethod(), "PublicImportPrivateMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivateNestedClassExpectedValue, PublicImportPrivateNestedClass.GetString(), "PublicImportPrivateNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-    [Export]\r
-    internal class InternalImportsExpectingPrivateExports\r
-    {\r
-        [Import("PrivateField")]\r
-        internal string InternalImportPrivateField { get; set; }\r
-        [Import("PrivateProperty")]\r
-        internal string InternalImportPrivateProperty { get; set; }\r
-        [Import("PrivateDelegate")]\r
-        internal Func<string> InternalImportPrivateMethod { get; set; }\r
-        [Import("PrivateIGetString")]\r
-        internal IGetString InternalImportPrivateNestedClass { get; set; }\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivateFieldExpectedValue, InternalImportPrivateField, "InternalImportPrivateField should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivatePropertyExpectedValue, InternalImportPrivateProperty, "InternalImportPrivateProperty should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivateMethodExpectedValue, InternalImportPrivateMethod(), "InternalImportPrivateMethod should be bound.");\r
-            Assert.AreEqual(PublicComponentWithPrivateExports.PrivateNestedClassExpectedValue, InternalImportPrivateNestedClass.GetString(), "InternalImportPrivateNestedClass should be bound and have a method GetString.");\r
-        }\r
-    }\r
-\r
-    [Export("ImportDefaultFunctions")]\r
-    public class ImportDefaultFunctions\r
-    {\r
-        [Import("FunctionWith0Args")]\r
-        public Func<int> MyFunction0;\r
-\r
-        [Import("FunctionWith1Arg")]\r
-        public Func<int, int> MyFunction1;\r
-\r
-        [Import("FunctionWith2Args")]\r
-        public Func<int, int, int> MyFunction2;\r
-\r
-        [Import("FunctionWith3Args")]\r
-        public Func<int, int, int, int> MyFunction3;\r
-\r
-        [Import("FunctionWith4Args")]\r
-        public Func<int, int, int, int, int> MyFunction4;\r
-\r
-        [Import("ActionWith0Args")]\r
-        public Action MyAction0;\r
-\r
-        [Import("ActionWith1Arg")]\r
-        public Action<int> MyAction1;\r
-\r
-        [Import("ActionWith2Args")]\r
-        public Action<int, int> MyAction2;\r
-\r
-        [Import("ActionWith3Args")]\r
-        public Action<int, int, int> MyAction3;\r
-\r
-        [Import("ActionWith4Args")]\r
-        public Action<int, int, int, int> MyAction4;\r
-\r
-        public void VerifyIsBound()\r
-        {\r
-            Assert.AreEqual(0, MyFunction0.Invoke());\r
-            Assert.AreEqual(1, MyFunction1.Invoke(1));\r
-            Assert.AreEqual(3, MyFunction2.Invoke(1, 2));\r
-            Assert.AreEqual(6, MyFunction3.Invoke(1, 2, 3));\r
-            Assert.AreEqual(10, MyFunction4.Invoke(1, 2, 3, 4));\r
-\r
-            MyAction0.Invoke();\r
-            MyAction1.Invoke(1);\r
-            MyAction2.Invoke(1, 2);\r
-            MyAction3.Invoke(1, 2, 3);\r
-            MyAction4.Invoke(1, 2, 3, 4);\r
-        }\r
-    }\r
-\r
-    public class ExportDefaultFunctions\r
-    {\r
-        [Export("FunctionWith0Args")]\r
-        public int MyFunction0()\r
-        {\r
-            return 0;\r
-        }\r
-\r
-        [Export("FunctionWith1Arg")]\r
-        public int MyFunction1(int i1)\r
-        {\r
-            return i1;\r
-        }\r
-\r
-        [Export("FunctionWith2Args")]\r
-        public int MyFunction2(int i1, int i2)\r
-        {\r
-            return i1 + i2;\r
-        }\r
-\r
-        [Export("FunctionWith3Args")]\r
-        public int MyFunction3(int i1, int i2, int i3)\r
-        {\r
-            return i1 + i2 + i3;\r
-        }\r
-\r
-        [Export("FunctionWith4Args")]\r
-        public int MyFunction4(int i1, int i2, int i3, int i4)\r
-        {\r
-            return i1 + i2 + i3 + i4;\r
-        }\r
-\r
-\r
-\r
-        [Export("ActionWith0Args")]\r
-        public void MyAction0()\r
-        {\r
-        }\r
-\r
-        [Export("ActionWith1Arg")]\r
-        public void MyAction1(int i1)\r
-        {\r
-            Assert.AreEqual(i1, 1);\r
-        }\r
-\r
-        [Export("ActionWith2Args")]\r
-        public void MyAction2(int i1, int i2)\r
-        {\r
-            Assert.AreEqual(i1, 1);\r
-            Assert.AreEqual(i2, 2);\r
-        }\r
-\r
-        [Export("ActionWith3Args")]\r
-        public void MyAction3(int i1, int i2, int i3)\r
-        {\r
-            Assert.AreEqual(i1, 1);\r
-            Assert.AreEqual(i2, 2);\r
-            Assert.AreEqual(i3, 3);\r
-        }\r
-\r
-        [Export("ActionWith4Args")]\r
-        public void MyAction4(int i1, int i2, int i3, int i4)\r
-        {\r
-            Assert.AreEqual(i1, 1);\r
-            Assert.AreEqual(i2, 2);\r
-            Assert.AreEqual(i3, 3);\r
-            Assert.AreEqual(i4, 4);\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class CatalogComponentTest\r
-    {\r
-    }\r
-\r
-    [Export]\r
-    [PartNotDiscoverable]\r
-    public class CatalogComponentTestNonComponentPart\r
-    {\r
-    }\r
-\r
-    public interface ICatalogComponentTest\r
-    {\r
-    }\r
-\r
-    [Export(typeof(ICatalogComponentTest))]\r
-    public class CatalogComponentInterfaceTest1 : ICatalogComponentTest\r
-    {\r
-    }\r
-\r
-    public class CatalogComponentInterfaceTest2\r
-    {\r
-        [Export]\r
-        public ICatalogComponentTest ExportedInterface\r
-        {\r
-            get { return new CatalogComponentInterfaceTest1(); }\r
-        }\r
-    }\r
-\r
-    public static class StaticExportClass\r
-    {\r
-        [Export("StaticString")]\r
-        public static string StaticString { get { return "StaticString"; } }\r
-    }\r
-\r
-    [Export]\r
-    public class DisposableExportClass : IDisposable\r
-    {\r
-        public bool IsDisposed { get; set; }\r
-        public void Dispose()\r
-        {\r
-            Assert.IsFalse(IsDisposed);\r
-            IsDisposed = true;\r
-        }\r
-    }\r
-\r
-    public interface IServiceView\r
-    {\r
-        int GetSomeInt();\r
-    }\r
-\r
-    [Export("service1")]\r
-    public class Service\r
-    {\r
-        public int GetSomeInt()\r
-        {\r
-            return 5;\r
-        }\r
-    }\r
-\r
-    public class Client\r
-    {\r
-        private IServiceView mySerivce;\r
-\r
-        [Import("service1")]\r
-        public IServiceView MyService\r
-        {\r
-            get { return mySerivce; }\r
-            set { mySerivce = value; }\r
-        }\r
-        public int GetSomeValue()\r
-        {\r
-            return MyService.GetSomeInt() * 2;\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class TrivialExporter\r
-    {\r
-        public bool done = false;\r
-    }\r
-\r
-    [Export]\r
-    public class TrivialImporter : IPartImportsSatisfiedNotification\r
-    {\r
-        [Import]\r
-        public TrivialExporter checker;\r
-\r
-        public void OnImportsSatisfied()\r
-        {\r
-            checker.done = true;\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class UnnamedImportAndExport\r
-    {\r
-        [Import]\r
-        public IUnnamedExport ImportedValue;\r
-    }\r
-\r
-    [Export]\r
-    public class StaticExport\r
-    {\r
-    }\r
-\r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class NonStaticExport\r
-    {\r
-    }\r
-\r
-    public interface IUnnamedExport\r
-    {\r
-    }\r
-\r
-    [Export(typeof(IUnnamedExport))]\r
-    public class UnnamedExport : IUnnamedExport\r
-    {\r
-    }\r
-\r
-    public interface IExportableTest\r
-    {\r
-        string Var1 { get; }\r
-    }\r
-\r
-    [AttributeUsage(AttributeTargets.All)]\r
-    [MetadataAttribute]\r
-    public class ExportableTestAttribute : Attribute\r
-    {\r
-        private string var1;\r
-\r
-        public string Var1\r
-        {\r
-            get { return var1; }\r
-            set { var1 = value; }\r
-        }\r
-    }\r
-\r
-    [AttributeUsage(AttributeTargets.All)]\r
-    [MetadataAttribute]\r
-    [CLSCompliant(false)]\r
-    public class MetadataWithCollectionPropertyAttribute : Attribute\r
-    {\r
-        private string[] values;\r
-\r
-        public string[] Values\r
-        {\r
-            get { return values; }\r
-        }\r
-\r
-        public MetadataWithCollectionPropertyAttribute(params string[] values)\r
-        {\r
-            this.values = values;\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    [MetadataWithCollectionProperty("One", "two", "3")]\r
-    [CLSCompliant(false)]\r
-    public class ComponentWithCollectionProperty\r
-    {\r
-    }\r
-\r
-    public interface ICollectionOfStrings\r
-    {\r
-        IEnumerable<string> Values { get; }\r
-    }\r
-\r
-    public class SubtractProvider\r
-    {\r
-        [Export("One")]\r
-        public int One = 1;\r
-\r
-        [Export("Two")]\r
-        public int Two { get { return 2; } }\r
-\r
-        [Export("Add")]\r
-        [ExportableTest(Var1 = "sub")]\r
-        public Func<int, int, int> Subtract = (x, y) => x - y;\r
-    }\r
-    public class RealAddProvider\r
-    {\r
-        [Export("One")]\r
-        public int One = 1;\r
-\r
-        [Export("Two")]\r
-        public int Two { get { return 2; } }\r
-\r
-        [Export("Add")]\r
-        [ExportMetadata("Var1", "add")]\r
-        public int Add(int x, int y)\r
-        {\r
-            return x + y;\r
-        }\r
-    }\r
-    public class Consumer\r
-    {\r
-        [Import("One")]\r
-        public int a;\r
-        [Import("Two")]\r
-        public int b;\r
-        [Import("Add")]\r
-        public Func<int, int, int> op;\r
-        [Import("Add", AllowDefault = true)]\r
-        public Lazy<Func<int, int, int>> opInfo;\r
-    }\r
-\r
-    public class ConsumerOfMultiple\r
-    {\r
-        [ImportMany("Add")]\r
-        public IEnumerable<Lazy<Func<int, int, int>, IDictionary<string, object>>> opInfo;\r
-    }\r
-\r
-    public interface IStrongValueMetadata\r
-    {\r
-        int value { get; set; }\r
-    }\r
-\r
-    public class UntypedExportImporter\r
-    {\r
-        [Import("untyped")]\r
-        public Lazy<object> Export;\r
-    }\r
-\r
-    public class UntypedExportsImporter\r
-    {\r
-        [ImportMany("untyped")]\r
-        public IEnumerable<Lazy<object>> Exports;\r
-    }\r
-\r
-    public class DerivedExport : Export\r
-    {\r
-    }\r
-\r
-    public class DerivedExportImporter\r
-    {\r
-        [Import("derived")]\r
-        public DerivedExport Export;\r
-\r
-    }\r
-\r
-    public class DerivedExportsImporter\r
-    {\r
-        [ImportMany("derived")]\r
-        public IEnumerable<DerivedExport> Exports;\r
-    }\r
-\r
-    [Export]\r
-    public class NotSoUniqueName\r
-    {\r
-        public int MyIntProperty { get { return 23; } }\r
-    }\r
-\r
-    public class NotSoUniqueName2\r
-    {\r
-        [Export]\r
-        public class NotSoUniqueName\r
-        {\r
-            public virtual string MyStringProperty { get { return "MyStringProperty"; } }\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class MyExport\r
-    {\r
-    }\r
-\r
-    [Export]\r
-    public class MySharedPartExport\r
-    {\r
-        [Import("Value", AllowRecomposition = true)]\r
-        public int Value { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class MyNonSharedPartExport\r
-    {\r
-        [Import("Value")]\r
-        public int Value { get; set; }\r
-    }\r
-\r
-    public class ExportThatCantBeActivated\r
-    {\r
-        [Export("ExportMyString")]\r
-        public string MyString { get { return "MyString"; } }\r
-\r
-        [Import("ContractThatShouldNotexist")]\r
-        public string MissingImport { get; set; }\r
-    }\r
-\r
-    public class GenericContract1<T>\r
-    {\r
-        public class GenericContract2\r
-        {\r
-            public class GenericContract3<N>\r
-            {\r
-            }\r
-        }\r
-    }\r
-\r
-    public class GenericContract4<T, K>\r
-    {\r
-        public class GenericContract5<A, B>\r
-        {\r
-            public class GenericContract6<N, M>\r
-            {\r
-            }\r
-        }\r
-    }\r
-\r
-    public class OuterClassWithGenericNested\r
-    {\r
-        public class GenericNested<T>\r
-        {\r
-        }\r
-    }\r
-\r
-    public class GenericContract7 :\r
-        GenericContract4<string, string>.GenericContract5<int, int>.GenericContract6<double, double> { }\r
-\r
-    public class GenericContract8<T> : GenericContract1<string>.GenericContract2.GenericContract3<T> { }\r
-\r
-    public class NestedParent\r
-    {\r
-        public class NestedChild { }\r
-    }\r
-  \r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class DirectCycleNonSharedPart\r
-    {\r
-        [Import]\r
-        public DirectCycleNonSharedPart NonSharedPart { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class CycleNonSharedPart1\r
-    {\r
-        [Import]\r
-        public CycleNonSharedPart2 NonSharedPart2 { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class CycleNonSharedPart2\r
-    {\r
-        [Import]\r
-        public CycleNonSharedPart1 NonSharedPart1 { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class CycleNonSharedPart\r
-    {\r
-        [Import]\r
-        public CycleNonSharedPart1 NonSharedPart1 { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class CycleSharedPart1\r
-    {\r
-        [Import]\r
-        public CycleSharedPart2 SharedPart2 { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class CycleSharedPart2\r
-    {\r
-        [Import]\r
-        public CycleSharedPart1 SharedPart2 { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class CycleSharedPart\r
-    {\r
-        [Import]\r
-        public CycleSharedPart1 SharedPart1 { get; set; }\r
-\r
-        [Import]\r
-        public CycleSharedPart2 SharedPart2 { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class NoCycleNonSharedPart\r
-    {\r
-        [Import]\r
-        public SharedPartWithNoCycleNonSharedPart SharedPart { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class SharedPartWithNoCycleNonSharedPart\r
-    {\r
-        [Import]\r
-        public NoCycleNonSharedPart NonSharedPart { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class CycleWithSharedPartAndNonSharedPart\r
-    {\r
-        [Import]\r
-        public SharedPartWithNoCycleNonSharedPart BeforeNonSharedPart { get; set; }\r
-\r
-        [Import]\r
-        public CycleWithNonSharedPartOnly NonSharedPart { get; set; }\r
-\r
-        [Import]\r
-        public SharedPartWithNoCycleNonSharedPart SharedPart { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    [PartCreationPolicy(CreationPolicy.NonShared)]\r
-    public class CycleWithNonSharedPartOnly\r
-    {\r
-        [Import]\r
-        public CycleWithSharedPartAndNonSharedPart NonSharedPart { get; set; }\r
-\r
-    }\r
-\r
-    [InheritedExport]\r
-    public class ExportWithGenericParameter<T>\r
-    {\r
-    }\r
-\r
-    public class ExportWithGenericParameterOfInt\r
-    {\r
-        [Export]\r
-        public ExportWithGenericParameter<int> GenericExport { get { return new ExportWithGenericParameter<int>(); } }\r
-    }\r
-\r
-    [Export]\r
-    public static class StaticExportWithGenericParameter<T>\r
-    {\r
-    }\r
-\r
-    [Export]\r
-    public class ExportWhichInheritsFromGeneric : ExportWithGenericParameter<string>\r
-    {\r
-\r
-    }\r
-\r
-    [Export]\r
-    public class ExportWithExceptionDuringConstruction\r
-    {\r
-        public ExportWithExceptionDuringConstruction()\r
-        {\r
-            throw new NotImplementedException();\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class SimpleConstructorInjectedObject\r
-    {\r
-        [ImportingConstructor]\r
-        public SimpleConstructorInjectedObject([Import("CISimpleValue")]int value)\r
-        {\r
-            CISimpleValue = value;\r
-        }\r
-\r
-        public int CISimpleValue { get; private set; }\r
-    }\r
-\r
-    [Export]\r
-    public class ClassWithNoMarkedOrDefaultConstructor\r
-    {\r
-        public ClassWithNoMarkedOrDefaultConstructor(int blah) { }\r
-    }\r
-\r
-    public class ClassWhichOnlyHasImportingConstructorWithOneArgument\r
-    {\r
-        [ImportingConstructor]\r
-        public ClassWhichOnlyHasImportingConstructorWithOneArgument(int blah) { }\r
-    }\r
-\r
-    public class ClassWhichOnlyHasImportingConstructor\r
-    {\r
-        [ImportingConstructor]\r
-        public ClassWhichOnlyHasImportingConstructor() { }\r
-    }\r
-\r
-    public class ClassWhichOnlyHasDefaultConstructor\r
-    {\r
-        public ClassWhichOnlyHasDefaultConstructor() { }\r
-    }\r
-\r
-    [Export]\r
-    public class BaseExportForImportingConstructors\r
-    {\r
-        \r
-    }\r
-\r
-    [Export]\r
-    public class ClassWithOnlyHasImportingConstructorButInherits : BaseExportForImportingConstructors\r
-    {\r
-        [ImportingConstructor]\r
-        public ClassWithOnlyHasImportingConstructorButInherits(int blah) { }\r
-    }\r
-\r
-    [Export]\r
-    public class ClassWithOnlyHasMultipleImportingConstructorButInherits : BaseExportForImportingConstructors\r
-    {\r
-        [ImportingConstructor]\r
-        public ClassWithOnlyHasMultipleImportingConstructorButInherits(int blah) { }\r
-\r
-        [ImportingConstructor]\r
-        public ClassWithOnlyHasMultipleImportingConstructorButInherits(string blah) { }\r
-    }\r
-\r
-\r
-    [Export]\r
-    public class ClassWithMultipleMarkedConstructors\r
-    {\r
-        [ImportingConstructor]\r
-        public ClassWithMultipleMarkedConstructors(int i) { }\r
-\r
-        [ImportingConstructor]\r
-        public ClassWithMultipleMarkedConstructors(string s) { }\r
-\r
-        public ClassWithMultipleMarkedConstructors() { }\r
-    }\r
-\r
-    [Export]\r
-    public class ClassWithOneMarkedAndOneDefaultConstructor\r
-    {\r
-        [ImportingConstructor]\r
-        public ClassWithOneMarkedAndOneDefaultConstructor(int i) { }\r
-\r
-        public ClassWithOneMarkedAndOneDefaultConstructor() { }\r
-    }\r
-\r
-    [Export]\r
-    public class ClassWithTwoZeroParameterConstructors\r
-    {\r
-        public ClassWithTwoZeroParameterConstructors() { }\r
-\r
-        static ClassWithTwoZeroParameterConstructors() { }\r
-    }\r
-\r
-    [Export]\r
-    public class ExceptionDuringINotifyImport : IPartImportsSatisfiedNotification\r
-    {\r
-        [ImportMany("Value")]\r
-        public IEnumerable<int> ValuesJustUsedToGetImportCompletedCalled { get; set; }\r
-\r
-        public void OnImportsSatisfied()\r
-        {\r
-            throw new NotImplementedException();\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    public class ClassWithOptionalPostImport\r
-    {\r
-        [Import(AllowDefault = true)]\r
-        public IFormattable Formatter { get; set; }\r
-    }\r
-\r
-    [Export]\r
-    public class ClassWithOptionalPreImport\r
-    {\r
-        [ImportingConstructor]\r
-        public ClassWithOptionalPreImport([Import(AllowDefault = true)] IFormattable formatter)\r
-        {\r
-            this.Formatter = formatter;\r
-        }\r
-\r
-        public IFormattable Formatter { get; private set; }\r
-    }\r
-\r
-    [MetadataAttribute]\r
-    public class ThisIsMyMetadataMetadataAttribute : Attribute\r
-    {\r
-        public string Argument1 { get; set; }\r
-        public int Argument2 { get; set; }\r
-        public double Argument3 { get; set; }\r
-        public string Argument4 { get; set; }\r
-\r
-        public ThisIsMyMetadataMetadataAttribute()\r
-        {\r
-        }\r
-\r
-        public ThisIsMyMetadataMetadataAttribute(string Argument1, int Argument2)\r
-        {\r
-            this.Argument1 = Argument1;\r
-            this.Argument2 = Argument2;\r
-        }\r
-    }\r
-\r
-    [Export]\r
-    [ThisIsMyMetadataMetadataAttribute("One", 2, Argument3 = 3.0)]\r
-    public class ExportedTypeWithConcreteMetadata\r
-    {\r
-    }\r
-\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/UnitTesting/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/UnitTesting/.gitattributes
deleted file mode 100644 (file)
index bc32a4e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/ConstraintAssert.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/UnitTesting/ConstraintAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/ComponentModel/Composition/UnitTesting/ConstraintAssert.cs
deleted file mode 100644 (file)
index 1266032..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.UnitTesting\r
-{\r
-    internal static class ConstraintAssert\r
-    {\r
-        public static void Contains(Expression<Func<ExportDefinition, bool>> constraint, string contractName)\r
-        {\r
-            Contains(constraint, contractName, Enumerable.Empty<KeyValuePair<string, Type>>());\r
-        }\r
-\r
-        public static void Contains(Expression<Func<ExportDefinition, bool>> constraint, string contractName, IEnumerable<KeyValuePair<string, Type>> requiredMetadata)\r
-        {\r
-            string actualContractName;\r
-            IEnumerable<KeyValuePair<string, Type>> actualRequiredMetadata;\r
-            bool success = TryParseConstraint(constraint, out actualContractName, out actualRequiredMetadata);\r
-\r
-            Assert.IsTrue(success);\r
-            Assert.AreEqual(contractName, actualContractName);\r
-            EnumerableAssert.AreEqual(requiredMetadata, actualRequiredMetadata);\r
-        }\r
-\r
-        private static bool TryParseConstraint(Expression<Func<ExportDefinition, bool>> constraint, out string contractName, out IEnumerable<KeyValuePair<string, Type>> requiredMetadata)\r
-        {\r
-            return ContraintParser.TryParseConstraint(constraint, out contractName, out requiredMetadata);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/.gitattributes
deleted file mode 100644 (file)
index 2b2b014..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/AdaptingCollectionTests.cs -crlf
-/CatalogFilteringTests.cs -crlf
-/CompositionContainerAttributedModelCycleTests.cs -crlf
-/ConstructorInjectionTests.cs -crlf
-/DelayLoadingTests.cs -crlf
-/DelegateCompositionTests.cs -crlf
-/DiscoveryTests.cs -crlf
-/ExportProviderEventTests.cs -crlf
-/LifetimeTests.cs -crlf
-/PartCreatorTests.cs -crlf
-/RecompositionTests.cs -crlf
-/RejectionTests.cs -crlf
-/RequiredCreationPolicyTests.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/AdaptingCollectionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/AdaptingCollectionTests.cs
deleted file mode 100644 (file)
index 442cfd5..0000000
+++ /dev/null
@@ -1,405 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.Specialized;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public class FilteringCollection<T, M> : AdaptingCollection<T, M>\r
-    {\r
-        public FilteringCollection(Func<Lazy<T, M>, bool> filter)\r
-            : base(e => e.Where(filter))\r
-        {\r
-        }\r
-    }\r
-\r
-    public class OrderingCollection<T, M> : AdaptingCollection<T, M>\r
-    {\r
-        public OrderingCollection(Func<Lazy<T, M>, object> keySelector)\r
-            : this(keySelector, false)\r
-        {\r
-        }\r
-\r
-        public OrderingCollection(Func<Lazy<T, M>, object> keySelector, bool descending)\r
-            : base(e => descending ? e.OrderByDescending(keySelector) : e.OrderBy(keySelector))\r
-        {\r
-        }\r
-    }\r
-\r
-    public class AdaptingCollection<T> : AdaptingCollection<T, IDictionary<string, object>>\r
-    {\r
-        public AdaptingCollection(Func<IEnumerable<Lazy<T, IDictionary<string, object>>>, \r
-                                       IEnumerable<Lazy<T, IDictionary<string, object>>>> adaptor)\r
-            : base(adaptor)\r
-        {\r
-        }\r
-    }\r
-\r
-    public class AdaptingCollection<T, M> : ICollection<Lazy<T, M>>, INotifyCollectionChanged\r
-    {\r
-        private readonly List<Lazy<T, M>> _allItems = new List<Lazy<T, M>>();\r
-        private readonly Func<IEnumerable<Lazy<T, M>>, IEnumerable<Lazy<T, M>>> _adaptor = null;\r
-        private List<Lazy<T, M>> _adaptedItems = null;\r
-\r
-        public AdaptingCollection() : this(null)\r
-        {\r
-        }\r
-\r
-        public AdaptingCollection(Func<IEnumerable<Lazy<T, M>>, IEnumerable<Lazy<T, M>>> adaptor)\r
-        {\r
-            this._adaptor = adaptor;\r
-        }\r
-\r
-        public event NotifyCollectionChangedEventHandler CollectionChanged;\r
-\r
-        public void ReapplyAdaptor()\r
-        {\r
-            if (this._adaptedItems != null)\r
-            {\r
-                this._adaptedItems = null;\r
-                this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));\r
-            }\r
-        }\r
-\r
-        protected virtual IEnumerable<Lazy<T, M>> Adapt(IEnumerable<Lazy<T, M>> collection)\r
-        {\r
-            if (this._adaptor != null)\r
-            {\r
-                return this._adaptor.Invoke(collection);\r
-            }\r
-\r
-            return collection;\r
-        }\r
-\r
-        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e)\r
-        {\r
-            NotifyCollectionChangedEventHandler collectionChanged = this.CollectionChanged;\r
-\r
-            if (collectionChanged != null)\r
-            {\r
-                collectionChanged.Invoke(this, e);\r
-            }\r
-        }\r
-\r
-        private List<Lazy<T, M>> AdaptedItems\r
-        {\r
-            get\r
-            {\r
-                if (this._adaptedItems == null)\r
-                {\r
-                    this._adaptedItems = Adapt(this._allItems).ToList();\r
-                }\r
-\r
-                return this._adaptedItems;\r
-            }\r
-        }\r
-\r
-        #region ICollection Implementation\r
-        // Accessors work directly against adapted collection\r
-        public bool Contains(Lazy<T, M> item)\r
-        {\r
-            return this.AdaptedItems.Contains(item);\r
-        }\r
-\r
-        public void CopyTo(Lazy<T, M>[] array, int arrayIndex)\r
-        {\r
-            this.AdaptedItems.CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        public int Count\r
-        {\r
-            get { return this.AdaptedItems.Count; }\r
-        }\r
-\r
-        public bool IsReadOnly\r
-        {\r
-            get { return false; }\r
-        }\r
-\r
-        public IEnumerator<Lazy<T, M>> GetEnumerator()\r
-        {\r
-            return this.AdaptedItems.GetEnumerator();\r
-        }\r
-\r
-        Collections.IEnumerator Collections.IEnumerable.GetEnumerator()\r
-        {\r
-            return this.GetEnumerator();\r
-        }\r
-\r
-        // Mutation methods work against complete collection\r
-        // and then force a reset of the adapted collection\r
-        public void Add(Lazy<T, M> item)\r
-        {\r
-            this._allItems.Add(item);\r
-            ReapplyAdaptor();\r
-        }\r
-\r
-        public void Clear()\r
-        {\r
-            this._allItems.Clear();\r
-            ReapplyAdaptor();\r
-        }\r
-\r
-        public bool Remove(Lazy<T, M> item)\r
-        {\r
-            bool removed = this._allItems.Remove(item);\r
-            ReapplyAdaptor();\r
-            return removed;\r
-        }\r
-        #endregion\r
-    }\r
-\r
-    [TestClass]\r
-    public class AdaptingCollectionTests\r
-    {\r
-        public interface IContract { }\r
-        public interface INetworkAwareMetadata\r
-        {\r
-            [DefaultValue(false)]\r
-            bool RequiresOnline { get; }\r
-        }\r
-\r
-        [Export(typeof(IContract))]\r
-        [ExportMetadata("RequiresOnline", true)]\r
-        public class NetworkExport : IContract { }\r
-\r
-        [Export(typeof(IContract))]\r
-        public class NonNetworkExport : IContract { }\r
-\r
-        public class FilterExports\r
-        {\r
-            public FilterExports()\r
-            {\r
-                this.OnlineOnly = new AdaptingCollection<IContract, INetworkAwareMetadata>(e =>\r
-                    e.Where(p => p.Metadata.RequiresOnline));\r
-\r
-                this.OnlineOnly2 = new FilteringCollection<IContract, INetworkAwareMetadata>(p => p.Metadata.RequiresOnline);\r
-            }\r
-\r
-            [ImportMany]\r
-            public AdaptingCollection<IContract, INetworkAwareMetadata> OnlineOnly { get; set; }\r
-\r
-            [ImportMany]\r
-            public FilteringCollection<IContract, INetworkAwareMetadata> OnlineOnly2 { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestFilteringImports()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(NetworkExport), typeof(NonNetworkExport));\r
-\r
-            var filterExports = new FilterExports();\r
-            container.ComposeParts(filterExports);\r
-\r
-            Assert.AreEqual(1, filterExports.OnlineOnly.Count);\r
-            Assert.AreEqual(1, filterExports.OnlineOnly2.Count);\r
-        }\r
-\r
-        public interface IOrderMetadata\r
-        {\r
-            [DefaultValue(Int32.MaxValue)]\r
-            int Order { get; }\r
-        }\r
-\r
-        [Export(typeof(IContract))]\r
-        [ExportMetadata("Order", 2)]\r
-        public class BExport : IContract { }\r
-\r
-        [Export(typeof(IContract))]\r
-        [ExportMetadata("Order", 1)]\r
-        public class AExport : IContract { }\r
-\r
-        [Export(typeof(IContract))]\r
-        public class CExport : IContract { }\r
-\r
-        public class OrderExportsByMetadata\r
-        {\r
-            public OrderExportsByMetadata()\r
-            {\r
-                this.OrderedItems = new AdaptingCollection<IContract, IOrderMetadata>(e =>\r
-                    e.OrderBy(p => p.Metadata.Order));\r
-\r
-                this.OrderedItems2 = new OrderingCollection<IContract, IOrderMetadata>(p => p.Metadata.Order);\r
-            }\r
-\r
-            [ImportMany]\r
-            public AdaptingCollection<IContract, IOrderMetadata> OrderedItems { get; set; }\r
-\r
-            [ImportMany]\r
-            public OrderingCollection<IContract, IOrderMetadata> OrderedItems2 { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestOrderingImportsByMetadata()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(BExport), typeof(AExport), typeof(CExport));\r
-            var orderExports = new OrderExportsByMetadata();\r
-\r
-            container.ComposeParts(orderExports);\r
-\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(0).Value, typeof(AExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(1).Value, typeof(BExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(2).Value, typeof(CExport));\r
-\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems2.ElementAt(0).Value, typeof(AExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems2.ElementAt(1).Value, typeof(BExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems2.ElementAt(2).Value, typeof(CExport));\r
-        }\r
-\r
-        public class OrderExportsByName\r
-        {\r
-            public OrderExportsByName(bool descending)\r
-            {\r
-                if (descending)\r
-                {\r
-                    this.OrderedItems = new AdaptingCollection<IContract>(e =>\r
-                        e.OrderByDescending(p => p.Value.GetType().FullName));\r
-                }\r
-                else\r
-                {\r
-                    this.OrderedItems = new AdaptingCollection<IContract>(e =>\r
-                        e.OrderBy(p => p.Value.GetType().FullName));\r
-                }\r
-            }\r
-\r
-            [ImportMany]\r
-            public AdaptingCollection<IContract> OrderedItems { get; set; }\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void TestOrderingImportsByTypeName()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(BExport), typeof(AExport), typeof(CExport));\r
-            var orderExports = new OrderExportsByName(false);\r
-\r
-            container.ComposeParts(orderExports);\r
-\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(0).Value, typeof(AExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(1).Value, typeof(BExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(2).Value, typeof(CExport));\r
-\r
-            orderExports = new OrderExportsByName(true);\r
-\r
-            container.ComposeParts(orderExports);\r
-\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(0).Value, typeof(CExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(1).Value, typeof(BExport));\r
-            Assert.IsInstanceOfType(orderExports.OrderedItems.ElementAt(2).Value, typeof(AExport));\r
-        }\r
-\r
-        public interface IDynamicFilteredMetadata\r
-        {\r
-            bool Dynamic { get; }\r
-        }\r
-\r
-        [Export(typeof(IContract))]\r
-        [ExportMetadata("Dynamic", true)]\r
-        public class Dynamic1 : IContract { }\r
-\r
-        [Export(typeof(IContract))]\r
-        [ExportMetadata("Dynamic", true)]\r
-        public class Dynamic2 : IContract { }\r
-\r
-        [Export(typeof(IContract))]\r
-        [ExportMetadata("Dynamic", false)]\r
-        public class NonDynamic1 : IContract { }\r
-\r
-        public class DynamicFilteredCollection<T, M> : AdaptingCollection<T, M> where M : IDynamicFilteredMetadata\r
-        {\r
-            public DynamicFilteredCollection()\r
-            {\r
-            }\r
-\r
-            private bool _includeDynamic = false;\r
-            public bool IncludeDynamic \r
-            {\r
-                get { return this._includeDynamic; }\r
-                set \r
-                {\r
-                    if (this._includeDynamic != value)\r
-                    {\r
-                        this.ReapplyAdaptor();\r
-                    }\r
-\r
-                    this._includeDynamic = value;\r
-                }\r
-            }\r
-\r
-            protected override IEnumerable<Lazy<T, M>> Adapt(IEnumerable<Lazy<T, M>> collection)\r
-            {\r
-                return collection.Where(p => !p.Metadata.Dynamic || IncludeDynamic);\r
-            }\r
-        }\r
-\r
-        public class DynamicExports\r
-        {\r
-            [ImportMany]\r
-            public DynamicFilteredCollection<IContract, IDynamicFilteredMetadata> DynamicCollection { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestDyamicallyFilteringImports()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Dynamic1), typeof(Dynamic2), typeof(NonDynamic1));\r
-            var dynamicExports = new DynamicExports();\r
-\r
-            container.ComposeParts(dynamicExports);\r
-\r
-            Assert.AreEqual(1, dynamicExports.DynamicCollection.Count);\r
-\r
-            dynamicExports.DynamicCollection.IncludeDynamic = true;\r
-\r
-            Assert.AreEqual(3, dynamicExports.DynamicCollection.Count);\r
-        }\r
-\r
-        public class DynamicExportsNoSubType\r
-        {\r
-            public DynamicExportsNoSubType()\r
-            {\r
-                this.DynamicCollection = new AdaptingCollection<IContract, IDynamicFilteredMetadata>(e =>\r
-                    e.Where(p => !p.Metadata.Dynamic || this.IncludeDynamic));\r
-            }\r
-\r
-            private bool _includeDynamic = false;\r
-            public bool IncludeDynamic\r
-            {\r
-                get { return this._includeDynamic; }\r
-                set\r
-                {\r
-                    if (this._includeDynamic != value)\r
-                    {\r
-                        this.DynamicCollection.ReapplyAdaptor();\r
-                    }\r
-\r
-                    this._includeDynamic = value;\r
-                }\r
-            }\r
-\r
-            [ImportMany]\r
-            public AdaptingCollection<IContract, IDynamicFilteredMetadata> DynamicCollection { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestDyamicallyFilteringNoSubTypeImports()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Dynamic1), typeof(Dynamic2), typeof(NonDynamic1));\r
-            var dynamicExports = new DynamicExportsNoSubType();\r
-\r
-            container.ComposeParts(dynamicExports);\r
-\r
-            Assert.AreEqual(1, dynamicExports.DynamicCollection.Count);\r
-\r
-            dynamicExports.IncludeDynamic = true;\r
-\r
-            Assert.AreEqual(3, dynamicExports.DynamicCollection.Count);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/CatalogFilteringTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/CatalogFilteringTests.cs
deleted file mode 100644 (file)
index 0b11315..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class CatalogFilteringTests\r
-    {\r
-        [TestMethod]\r
-        public void FilteredCatalog_ScopeA()\r
-        {\r
-            var cat = GetCatalog();\r
-            var contA = new CompositionContainer(ScopeCatalog(cat, "A"));\r
-\r
-            Assert.IsTrue(contA.IsPresent<ScopeAComponent1>());\r
-            Assert.IsTrue(contA.IsPresent<ScopeAComponent2>());\r
-            Assert.IsFalse(contA.IsPresent<ScopeBComponent>());\r
-            Assert.IsFalse(contA.IsPresent<ScopeCComponent>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FilteredCatalog_ScopeB()\r
-        {\r
-            var cat = GetCatalog();\r
-            var contA = new CompositionContainer(ScopeCatalog(cat, "A"));\r
-            var contB = new CompositionContainer(ScopeCatalog(cat, "B"), contA);\r
-\r
-            Assert.IsTrue(contB.IsPresent<ScopeAComponent1>());\r
-            Assert.IsTrue(contB.IsPresent<ScopeAComponent2>());\r
-            Assert.IsTrue(contB.IsPresent<ScopeBComponent>());\r
-            Assert.IsFalse(contB.IsPresent<ScopeCComponent>());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FilteredCatalog_ScopeC()\r
-        {\r
-            var cat = GetCatalog();\r
-            var contA = new CompositionContainer(ScopeCatalog(cat, "A"));\r
-            var contB = new CompositionContainer(ScopeCatalog(cat, "B"), contA);\r
-            var contC = new CompositionContainer(ScopeCatalog(cat, "C"), contB);\r
-\r
-            Assert.IsTrue(contC.IsPresent<ScopeAComponent1>());\r
-            Assert.IsTrue(contC.IsPresent<ScopeAComponent2>());\r
-            Assert.IsTrue(contC.IsPresent<ScopeBComponent>());\r
-            Assert.IsTrue(contC.IsPresent<ScopeCComponent>());\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void FilteredCatalog_EventsFired()\r
-        {\r
-            var aggCatalog = CatalogFactory.CreateAggregateCatalog();\r
-            var cat1 = CatalogFactory.CreateAttributed(typeof(ScopeAComponent1), typeof(ScopeBComponent));\r
-\r
-            var filteredCatalog = CatalogFactory.CreateFiltered(aggCatalog, \r
-                partDef => partDef.Metadata.ContainsKey("Scope") &&\r
-                                    partDef.Metadata["Scope"].ToString() == "A");\r
-\r
-            var container = ContainerFactory.Create(filteredCatalog);\r
-\r
-            Assert.IsFalse(container.IsPresent<ScopeAComponent1>(), "sa before add");\r
-            Assert.IsFalse(container.IsPresent<ScopeBComponent>(), "sb before add");\r
-\r
-            aggCatalog.Catalogs.Add(cat1);\r
-\r
-            Assert.IsTrue(container.IsPresent<ScopeAComponent1>(), "sa after add");\r
-            Assert.IsFalse(container.IsPresent<ScopeBComponent>(), "sb after add");\r
-\r
-            aggCatalog.Catalogs.Remove(cat1);\r
-\r
-            Assert.IsFalse(container.IsPresent<ScopeAComponent1>(), "sa after remove");\r
-            Assert.IsFalse(container.IsPresent<ScopeBComponent>(), "sb after remove");\r
-        }\r
-\r
-        private ComposablePartCatalog GetCatalog()\r
-        {\r
-            return CatalogFactory.CreateAttributed(\r
-                typeof(ScopeAComponent1),\r
-                typeof(ScopeAComponent2),\r
-                typeof(ScopeBComponent),\r
-                typeof(ScopeCComponent));\r
-        }\r
-\r
-        private ComposablePartCatalog ScopeCatalog(ComposablePartCatalog catalog, string scope)\r
-        {\r
-            return CatalogFactory.CreateFiltered(catalog,\r
-                         partDef => partDef.Metadata.ContainsKey("Scope") &&\r
-                                    partDef.Metadata["Scope"].ToString() == scope);\r
-        }\r
-\r
-        [Export]\r
-        [PartMetadata("Scope", "A")]\r
-        public class ScopeAComponent1\r
-        {\r
-        }\r
-\r
-        [Export]\r
-        [PartMetadata("Scope", "A")]\r
-        public class ScopeAComponent2\r
-        {\r
-            [Import]\r
-            public ScopeAComponent1 ScopeA { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        [PartMetadata("Scope", "B")]\r
-        public class ScopeBComponent\r
-        {\r
-            [Import]\r
-            public ScopeAComponent1 ScopeA { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        [PartMetadata("Scope", "C")]\r
-        public class ScopeCComponent\r
-        {\r
-            [Import]\r
-            public ScopeBComponent ScopeB { get; set; }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/CompositionContainerAttributedModelCycleTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/CompositionContainerAttributedModelCycleTests.cs
deleted file mode 100644 (file)
index 952ef53..0000000
+++ /dev/null
@@ -1,274 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace Tests.Integration\r
-{  \r
-    [TestClass]\r
-    public class CompositionContainerAttributedModelCycleTests\r
-    {\r
-        // There are nine possible scenarios that cause a part to have a dependency on another part, some of which\r
-        // are legal and some not. For example, below, is not legal for a part, A, to have a prerequisite dependency\r
-        // on a part, B, which has also has a prerequisite dependency on A. In contrast, however, it is legal for \r
-        // part A and B to have a non-prerequisite (Post) dependency on each other.\r
-        // \r
-        // ------------------------------\r
-        // |        |         B         |\r
-        // |        | Pre | Post | None |\r
-        // |--------|-----|------|------|\r
-        // |   Pre  |  X  |    X |    √ |\r
-        // | A Post |  X  |    √ |    √ |\r
-        // |   None |  √  |    √ |    √ |\r
-        // ------------------------------\r
-        //\r
-\r
-        [TestMethod]\r
-        public void APrerequisiteDependsOnBPrerequisite_ShouldThrowComposition()\r
-        {\r
-            AssertCycle(typeof(APrerequisiteDependsOnBPrerequisite), \r
-                        typeof(BPrerequisiteDependsOnAPrerequisite));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void APrerequisiteDependsOnBPost_ShouldThrowComposition()\r
-        {\r
-            AssertCycle(typeof(APrerequisiteDependsOnBPost),\r
-                        typeof(BPostDependsOnAPrerequisite));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void APrerequisiteDependsOnBNone_ShouldNotThrow()\r
-        {\r
-            AssertNotCycle(typeof(APrerequisiteDependsOnBNone), \r
-                           typeof(BNone));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void APostDependsOnBPrerequisite_ShouldThrowComposition()\r
-        {\r
-            AssertCycle(typeof(APostDependsOnBPrerequisite), \r
-                        typeof(BPrerequisiteDependsOnAPost));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void APostDependsOnBPost_ShouldNotThrow()\r
-        {\r
-            AssertNotCycle(typeof(APostDependsOnBPost), \r
-                           typeof(BPostDependsOnAPost));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void APostDependsOnBNone_ShouldNotThrow()\r
-        {\r
-            AssertNotCycle(typeof(APostDependsOnBNone), \r
-                           typeof(BNone));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void BPrerequisiteDependsOnANone_ShouldNotThrow()\r
-        {\r
-            AssertNotCycle(typeof(ANone),\r
-                           typeof(BPrerequisiteDependsOnANone));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void BPostDependsOnANone_ShouldNotThrow()\r
-        {\r
-            AssertNotCycle(typeof(ANone),\r
-                           typeof(BPostDependsOnANone));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ANoneWithBNone_ShouldNotThrow()\r
-        {\r
-            AssertNotCycle(typeof(ANone),\r
-                           typeof(BNone));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartWithHasPrerequisteImportThatIsInAPostCycle_ShouldNotThrow()\r
-        {\r
-            AssertNotCycle(typeof(PartWithHasPrerequisteImportThatIsInAPostCycle)\r
-                , typeof(APostDependsOnBPost), typeof(BPostDependsOnAPost));\r
-        }\r
-\r
-        private static void AssertCycle(params Type[] types)\r
-        {\r
-            foreach (Type type in types)\r
-            {\r
-                var export = GetExport(type, types);\r
-\r
-                CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue, () =>\r
-                {\r
-                    var value = export.Value;\r
-                });\r
-            }\r
-        }\r
-\r
-        private static void AssertNotCycle(params Type[] types)\r
-        {\r
-            foreach (Type type in types)\r
-            {\r
-                var export = GetExport(type, types);\r
-\r
-                Assert.IsInstanceOfType(export.Value, type);\r
-            }\r
-        }\r
-\r
-        private static Lazy<object, object> GetExport(Type type, Type[] partTypes)\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(partTypes);\r
-\r
-            return container.GetExports(type, null, null).Single();\r
-        }\r
-\r
-        [Export]\r
-        public class APrerequisiteDependsOnBPrerequisite\r
-        {\r
-            [ImportingConstructor]\r
-            public APrerequisiteDependsOnBPrerequisite(BPrerequisiteDependsOnAPrerequisite b)\r
-            {\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class BPrerequisiteDependsOnAPrerequisite\r
-        {\r
-            [ImportingConstructor]\r
-            public BPrerequisiteDependsOnAPrerequisite(APrerequisiteDependsOnBPrerequisite a)\r
-            {\r
-            }\r
-        }\r
-\r
-\r
-        [Export]\r
-        public class APrerequisiteDependsOnBPost\r
-        {\r
-            [ImportingConstructor]\r
-            public APrerequisiteDependsOnBPost(BPostDependsOnAPrerequisite b)\r
-            {\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class BPostDependsOnAPrerequisite\r
-        {\r
-            [Import]\r
-            public APrerequisiteDependsOnBPost A\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class APrerequisiteDependsOnBNone\r
-        {\r
-            [ImportingConstructor]\r
-            public APrerequisiteDependsOnBNone(BNone b)\r
-            {\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class BNone\r
-        {\r
-        }\r
-\r
-\r
-        [Export]\r
-        public class ANone\r
-        {\r
-        }\r
-\r
-        [Export]\r
-        public class APostDependsOnBPrerequisite\r
-        {\r
-            [Import]\r
-            public BPrerequisiteDependsOnAPost B\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class BPrerequisiteDependsOnAPost\r
-        {\r
-            [ImportingConstructor]\r
-            public BPrerequisiteDependsOnAPost(APostDependsOnBPrerequisite a)\r
-            {\r
-            }\r
-        }\r
-\r
-\r
-        [Export]\r
-        public class APostDependsOnBPost\r
-        {\r
-            [Import]\r
-            public BPostDependsOnAPost B\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class BPostDependsOnAPost\r
-        {\r
-            [Import]\r
-            public APostDependsOnBPost A\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class APostDependsOnBNone\r
-        {\r
-            [Import]\r
-            public BNone B\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class BPrerequisiteDependsOnANone\r
-        {\r
-            [ImportingConstructor]\r
-            public BPrerequisiteDependsOnANone(ANone a)\r
-            {\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class BPostDependsOnANone\r
-        {\r
-            [Import]\r
-            public ANone A\r
-            {\r
-                get;\r
-                set;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class PartWithHasPrerequisteImportThatIsInAPostCycle\r
-        {\r
-            [ImportingConstructor]\r
-            public PartWithHasPrerequisteImportThatIsInAPostCycle(APostDependsOnBPost a)\r
-            {\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/ConstructorInjectionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/ConstructorInjectionTests.cs
deleted file mode 100644 (file)
index 099347e..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class ConstructorInjectionTests\r
-    {\r
-        [TestMethod]\r
-        public void SimpleConstructorInjection()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(PartFactory.CreateAttributed(typeof(SimpleConstructorInjectedObject)));\r
-            batch.AddExportedValue("CISimpleValue", 42);\r
-            container.Compose(batch);\r
-\r
-            SimpleConstructorInjectedObject simple = container.GetExportedValue<SimpleConstructorInjectedObject>();\r
-\r
-            Assert.AreEqual(42, simple.CISimpleValue);\r
-        }\r
-\r
-        public interface IOptionalRef { }\r
-\r
-        [Export]\r
-        public class OptionalExportProvided { }\r
-\r
-        [Export]\r
-        public class AWithOptionalParameter\r
-        {\r
-            [ImportingConstructor]\r
-            public AWithOptionalParameter([Import(AllowDefault = true)]IOptionalRef import,\r
-                [Import("ContractThatShouldNotBeFound", AllowDefault = true)]int value,\r
-                [Import(AllowDefault=true)]OptionalExportProvided provided)\r
-            {\r
-                Assert.IsNull(import);\r
-                Assert.AreEqual(0, value);\r
-                Assert.IsNotNull(provided);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void OptionalConstructorArgument()\r
-        {\r
-            var container = GetContainerWithCatalog();\r
-            var a = container.GetExportedValue<AWithOptionalParameter>();\r
-\r
-            // A should verify that it receieved optional arugments properly\r
-            Assert.IsNotNull(a);\r
-        }\r
-\r
-        [Export]\r
-        public class AWithCollectionArgument\r
-        {\r
-            private IEnumerable<int> _values;\r
-\r
-            [ImportingConstructor]\r
-            public AWithCollectionArgument([ImportMany("MyConstructorCollectionItem")]IEnumerable<int> values)\r
-            {\r
-                this._values = values;\r
-            }\r
-\r
-            public IEnumerable<int> Values { get { return this._values; } }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RebindingShouldNotHappenForConstructorArguments()\r
-        {\r
-            var container = GetContainerWithCatalog();\r
-            CompositionBatch batch = new CompositionBatch();\r
-\r
-            var p1 = batch.AddExportedValue("MyConstructorCollectionItem", 1);\r
-            batch.AddExportedValue("MyConstructorCollectionItem", 2);\r
-            batch.AddExportedValue("MyConstructorCollectionItem", 3);\r
-            container.Compose(batch);\r
-\r
-            var a = container.GetExportedValue<AWithCollectionArgument>();\r
-\r
-            EnumerableAssert.AreEqual(a.Values, 1, 2, 3);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddExportedValue("MyConstructorCollectionItem", 4);\r
-            batch.AddExportedValue("MyConstructorCollectionItem", 5);\r
-            batch.AddExportedValue("MyConstructorCollectionItem", 6);\r
-            // After rejection changes that are incompatible with existing assumptions are no\r
-            // longer silently ignored.  The batch attempting to make this change is rejected\r
-            // with a ChangeRejectedException\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PreventedByExistingImport,() =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-\r
-            // The collection which is a constructor import should not be rebound\r
-            EnumerableAssert.AreEqual(a.Values, 1, 2, 3);\r
-\r
-            batch.RemovePart(p1);\r
-            // After rejection changes that are incompatible with existing assumptions are no\r
-            // longer silently ignored.  The batch attempting to make this change is rejected\r
-            // with a ChangeRejectedException\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PreventedByExistingImport, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-\r
-            // The collection which is a constructor import should not be rebound\r
-            EnumerableAssert.AreEqual(a.Values, 1, 2, 3);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MissingConstructorArgsWithAlreadyCreatedInstance()\r
-        {\r
-            var container = GetContainerWithCatalog();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(new ClassWithNotFoundConstructorArgs(21));\r
-            container.Compose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MissingConstructorArgsWithTypeFromCatalogMissingArg()\r
-        {\r
-            var container = GetContainerWithCatalog();\r
-\r
-            // After rejection part definitions in catalogs whose dependencies cannot be\r
-            // satisfied are now silently ignored, turning this into a cardinality\r
-            // exception for the GetExportedValue call\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-            {\r
-                container.GetExportedValue<ClassWithNotFoundConstructorArgs>();\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MissingConstructorArgsWithWithTypeFromCatalogWithArg()\r
-        {\r
-            var container = GetContainerWithCatalog();\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("ContractThatDoesntExist", 21);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsTrue(container.IsPresent<ClassWithNotFoundConstructorArgs>());\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithNotFoundConstructorArgs\r
-        {\r
-            [ImportingConstructor]\r
-            public ClassWithNotFoundConstructorArgs([Import("ContractThatDoesntExist")]int i)\r
-            {\r
-            }\r
-        }\r
-\r
-        private CompositionContainer GetContainerWithCatalog()\r
-        {\r
-            var catalog = new AssemblyCatalog(typeof(ConstructorInjectionTests).Assembly);\r
-\r
-            return new CompositionContainer(catalog);\r
-        }\r
-\r
-        [Export]\r
-        public class InvalidImportManyCI\r
-        {\r
-            [ImportingConstructor]\r
-            public InvalidImportManyCI(\r
-                [ImportMany]List<MyExport> exports)\r
-            {\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ImportMany_ConstructorParameter_OnNonAssiganbleType_ShouldThrowCompositionException()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(InvalidImportManyCI));\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue,\r
-                ErrorId.ImportEngine_PartCannotActivate, \r
-                ErrorId.ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned,\r
-                () => container.GetExportedValue<InvalidImportManyCI>());\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DelayLoadingTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DelayLoadingTests.cs
deleted file mode 100644 (file)
index 24afb67..0000000
+++ /dev/null
@@ -1,309 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using Microsoft.Internal;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class DelayLoadingTests\r
-    {\r
-        [TestMethod]\r
-        public void PartTypeLoadedLazily()\r
-        {\r
-            var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart));\r
-            var container = new CompositionContainer(catalog);\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            Lazy<IExporter> lazyContract = container.GetExport<IExporter>();\r
-            Assert.IsNotNull(lazyContract);\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            IExporter value = lazyContract.Value;\r
-\r
-            catalog.AssertLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(1, catalog.LoadedTypes.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartTypeLoadedLazilyEagerDependeciesLoadEagerly()\r
-        {\r
-            var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingEagerly));\r
-            var container = new CompositionContainer(catalog);\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            catalog.AssertNotLoaded(typeof(PartImportingEagerly));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            Lazy<IImporter> lazyContract = container.GetExport<IImporter>();\r
-            Assert.IsNotNull(lazyContract);\r
-            catalog.AssertNotLoaded(typeof(PartImportingEagerly));\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            IImporter value = lazyContract.Value;\r
-            catalog.AssertLoaded(typeof(PartImportingEagerly));\r
-            catalog.AssertLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(2, catalog.LoadedTypes.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartTypeLoadedLazilyLazyDependeciesLoadLazily()\r
-        {\r
-            var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingLazily));\r
-            var container = new CompositionContainer(catalog);\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            catalog.AssertNotLoaded(typeof(PartImportingLazily));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            Lazy<IImporter> lazyContract = container.GetExport<IImporter>();\r
-            Assert.IsNotNull(lazyContract);\r
-            catalog.AssertNotLoaded(typeof(PartImportingLazily));\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            IImporter value = lazyContract.Value;\r
-            catalog.AssertLoaded(typeof(PartImportingLazily));\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(1, catalog.LoadedTypes.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartTypeLoadedLazilyEagerCollectionDependeciesLoadEagerly()\r
-        {\r
-            var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingCollectionEagerly));\r
-            var container = new CompositionContainer(catalog);\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            catalog.AssertNotLoaded(typeof(PartImportingCollectionEagerly));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            Lazy<IImporter> lazyContract = container.GetExport<IImporter>();\r
-            Assert.IsNotNull(lazyContract);\r
-            catalog.AssertNotLoaded(typeof(PartImportingCollectionEagerly));\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            IImporter value = lazyContract.Value;\r
-            catalog.AssertLoaded(typeof(PartImportingCollectionEagerly));\r
-            catalog.AssertLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(2, catalog.LoadedTypes.Count());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartTypeLoadedLazilyLazyCollectionDependeciesLoadLazily()\r
-        {\r
-            var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingCollectionLazily));\r
-            var container = new CompositionContainer(catalog);\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            catalog.AssertNotLoaded(typeof(PartImportingCollectionLazily));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            Lazy<IImporter> lazyContract = container.GetExport<IImporter>();\r
-            Assert.IsNotNull(lazyContract);\r
-            catalog.AssertNotLoaded(typeof(PartImportingCollectionLazily));\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            IImporter value = lazyContract.Value;\r
-            catalog.AssertLoaded(typeof(PartImportingCollectionLazily));\r
-            catalog.AssertNotLoaded(typeof(ExportingPart));\r
-            Assert.AreEqual(1, catalog.LoadedTypes.Count());\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void PartTypeLoadedLazilyLazyLoopLoadsLazily()\r
-        {\r
-            var catalog = new TypeLoadNotifyingCatalog(typeof(LazyLoopImporter), typeof(LazyLoopExporter));\r
-            var container = new CompositionContainer(catalog);\r
-            catalog.AssertNotLoaded(typeof(LazyLoopImporter));\r
-            catalog.AssertNotLoaded(typeof(LazyLoopExporter));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            Lazy<IImporter> lazyContract = container.GetExport<IImporter>();\r
-            Assert.IsNotNull(lazyContract);\r
-            catalog.AssertNotLoaded(typeof(LazyLoopImporter));\r
-            catalog.AssertNotLoaded(typeof(LazyLoopExporter));\r
-            Assert.AreEqual(0, catalog.LoadedTypes.Count());\r
-\r
-            IImporter value = lazyContract.Value;\r
-            catalog.AssertLoaded(typeof(LazyLoopImporter));\r
-            catalog.AssertNotLoaded(typeof(LazyLoopExporter));\r
-            Assert.AreEqual(1, catalog.LoadedTypes.Count());\r
-        }\r
-\r
-        public class IExporter\r
-        {\r
-        }\r
-\r
-        public class IImporter\r
-        {\r
-        }\r
-\r
-        [Export(typeof(IExporter))]\r
-        public class ExportingPart : IExporter\r
-        {\r
-        }\r
-\r
-        [Export(typeof(IImporter))]\r
-        public class PartImportingLazily : IImporter\r
-        {\r
-            [Import]\r
-            public Lazy<IExporter> Exporter { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IImporter))]\r
-        public class PartImportingCollectionLazily : IImporter\r
-        {\r
-            [ImportMany]\r
-            public IEnumerable<Lazy<IExporter>> Exporters { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IImporter))]\r
-        public class PartImportingEagerly : IImporter\r
-        {\r
-            [Import]\r
-            public IExporter Exporter { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IImporter))]\r
-        public class PartImportingCollectionEagerly : IImporter\r
-        {\r
-            [ImportMany]\r
-            public IEnumerable<IExporter> Exporters { get; set; }\r
-        }\r
-\r
-\r
-        [Export(typeof(IImporter))]\r
-        public class LazyLoopImporter : IImporter\r
-        {\r
-            [Import]\r
-            public Lazy<IExporter> Exporter { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IExporter))]\r
-        public class LazyLoopExporter : IExporter\r
-        {\r
-            [Import]\r
-            public Lazy<IImporter> Importer { get; set; }\r
-        }\r
-       \r
-\r
-        private class TypeLoadNotifyingCatalog : ComposablePartCatalog\r
-        {\r
-            ComposablePartDefinition[] _definitions;\r
-            public HashSet<Type> LoadedTypes { get; private set; }\r
-\r
-            public TypeLoadNotifyingCatalog(params Type[] types)\r
-            {\r
-                this._definitions = types.Select(type => this.CreatePartDefinition(type)).ToArray();\r
-                this.LoadedTypes = new HashSet<Type>();\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get { return this._definitions.AsQueryable(); }\r
-            }\r
-\r
-            private ComposablePartDefinition CreatePartDefinition(Type type)\r
-            {\r
-                ComposablePartDefinition partDefinition = AttributedModelServices.CreatePartDefinition(type, null);\r
-                return this.CreateWrapped(partDefinition, type);\r
-            }\r
-\r
-            private ComposablePartDefinition CreateWrapped(ComposablePartDefinition partDefinition, Type type)\r
-            {\r
-                IEnumerable<ExportDefinition> exports = partDefinition.ExportDefinitions.Select(e => this.CreateWrapped(e, type)).ToArray();\r
-                IEnumerable<ImportDefinition> imports = partDefinition.ImportDefinitions.Cast<ContractBasedImportDefinition>().Select(i => this.CreateWrapped(i, type)).ToArray();\r
-\r
-                return ReflectionModelServices.CreatePartDefinition(\r
-                    this.CreateWrapped(ReflectionModelServices.GetPartType(partDefinition), type),\r
-                    ReflectionModelServices.IsDisposalRequired(partDefinition),\r
-                    imports.AsLazy(),\r
-                    exports.AsLazy(),\r
-                    partDefinition.Metadata.AsLazy(),\r
-                    null);\r
-            }\r
-\r
-            private Lazy<T> CreateWrapped<T>(Lazy<T> lazy, Type type)\r
-            {\r
-                return new Lazy<T>(\r
-                    () => { this.OnTypeLoaded(type); return lazy.Value; });\r
-            }\r
-\r
-            private LazyMemberInfo CreateWrapped(LazyMemberInfo lazyMember, Type type)\r
-            {\r
-                return new LazyMemberInfo(\r
-                    lazyMember.MemberType,\r
-                    () => { this.OnTypeLoaded(type); return lazyMember.GetAccessors(); });\r
-            }\r
-\r
-            private ExportDefinition CreateWrapped(ExportDefinition export, Type type)\r
-            {\r
-                return ReflectionModelServices.CreateExportDefinition(\r
-                    this.CreateWrapped(ReflectionModelServices.GetExportingMember(export), type),\r
-                    export.ContractName,\r
-                    export.Metadata.AsLazy(),\r
-                    null);\r
-            }\r
-\r
-            private ImportDefinition CreateWrapped(ContractBasedImportDefinition import, Type type)\r
-            {\r
-                if (ReflectionModelServices.IsImportingParameter(import))\r
-                {\r
-                    return ReflectionModelServices.CreateImportDefinition(\r
-                        this.CreateWrapped(ReflectionModelServices.GetImportingParameter(import), type),\r
-                        import.ContractName,\r
-                        import.RequiredTypeIdentity,\r
-                        import.RequiredMetadata,\r
-                        import.Cardinality,\r
-                        import.RequiredCreationPolicy,\r
-                        null);\r
-                }\r
-                else\r
-                {\r
-                    return ReflectionModelServices.CreateImportDefinition(\r
-                        this.CreateWrapped(ReflectionModelServices.GetImportingMember(import), type),\r
-                        import.ContractName,\r
-                        import.RequiredTypeIdentity,\r
-                        import.RequiredMetadata,\r
-                        import.Cardinality,\r
-                        import.IsRecomposable,\r
-                        import.RequiredCreationPolicy,\r
-                        null);\r
-                }\r
-            }\r
-\r
-\r
-\r
-            private void OnTypeLoaded(Type type)\r
-            {\r
-                this.LoadedTypes.Add(type);\r
-            }\r
-\r
-            public void AssertLoaded(Type type)\r
-            {\r
-                Assert.IsTrue(this.LoadedTypes.Contains(type));\r
-            }\r
-\r
-            public void AssertNotLoaded(Type type)\r
-            {\r
-                Assert.IsFalse(this.LoadedTypes.Contains(type));\r
-            }\r
-\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DelegateCompositionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DelegateCompositionTests.cs
deleted file mode 100644 (file)
index d775424..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class DelegateCompositionTests\r
-    {\r
-        public delegate int SimpleDelegate();\r
-        public delegate object DoWorkDelegate(int i, ref object o, out string s);\r
-\r
-        public class MethodExporter\r
-        {\r
-            [Export]\r
-            public int SimpleMethod()\r
-            {\r
-                return 1;\r
-            }\r
-\r
-            [Export(typeof(DoWorkDelegate))]\r
-            public object DoWork(int i, ref object o, out string s)\r
-            {\r
-                s = "";\r
-                return o;\r
-            }\r
-\r
-            [Export("ActionWith8Arguments")]\r
-            [Export("ActionWith8Arguments", typeof(Delegate))]\r
-            public void Action(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8)\r
-            {\r
-            }\r
-\r
-            [Export("FunctionWith8Arguments")]\r
-            [Export("FunctionWith8Arguments", typeof(Delegate))]\r
-            public int Function(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8)\r
-            {\r
-                return i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8;\r
-            }\r
-\r
-            [Export("ActionWith9Arguments")]\r
-            [Export("ActionWith9Arguments", typeof(Delegate))]\r
-            public void Action(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9)\r
-            {\r
-            }\r
-\r
-            [Export("FunctionWith9Arguments")]\r
-            [Export("FunctionWith9Arguments", typeof(Delegate))]\r
-            public int Function(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9)\r
-            {\r
-                return i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9;\r
-            }\r
-\r
-#if CLR40 && !SILVERLIGHT\r
-            [Export("FunctionWithDefaultValue")]\r
-            public int FunctionWithDefaultValue(int i, string s = "")\r
-            {\r
-                return i; \r
-            }\r
-#endif\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_SimpleCustomDelegate_ShouldWork()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MethodExporter));\r
-\r
-            var contractName = AttributedModelServices.GetContractName(typeof(SimpleDelegate));\r
-\r
-            var export1 = container.GetExportedValue<SimpleDelegate>();\r
-            Assert.AreEqual(1, export1());\r
-\r
-            var export2 = container.GetExportedValue<Func<int>>();\r
-            Assert.AreEqual(1, export1());\r
-\r
-            var export3 = (ExportedDelegate)container.GetExportedValue<object>(contractName);\r
-            var export4 = (SimpleDelegate)export3.CreateDelegate(typeof(SimpleDelegate));\r
-            Assert.AreEqual(1, export4());\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_CustomDelegateWithOutRefParams_ShouldWork()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MethodExporter));\r
-\r
-            var export1 = container.GetExportedValue<DoWorkDelegate>();\r
-\r
-            int i = 0;\r
-            object o = new object();\r
-            string s;\r
-\r
-            export1(i, ref o, out s);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_FunctionWith8Arguments_ShouldWorkFine()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MethodExporter));\r
-\r
-#if CLR40 && !SILVERLIGHT\r
-            Assert.IsNotNull(container.GetExportedValue<Delegate>("FunctionWith8Arguments"));\r
-#else\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-                container.GetExportedValue<Delegate>("FunctionWith8Arguments"));\r
-#endif\r
-        }\r
-\r
-        public delegate int FuncWith9Args(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9);\r
-\r
-        [TestMethod]\r
-        public void Export_FuncWith9Arguments_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MethodExporter));\r
-\r
-            // Cannot Create a standard delegate that takes 9 arguments\r
-            // so the generic Delegate type will not work\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-                container.GetExportedValue<Delegate>("FunctionWith9Arguments"));\r
-\r
-            // If a matching custom delegate type is used then it will work\r
-            Assert.IsNotNull(container.GetExportedValue<FuncWith9Args>("FunctionWith9Arguments"));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_ActionWith8Arguments_ShouldWorkFine()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MethodExporter));\r
-\r
-#if CLR40 && !SILVERLIGHT\r
-            Assert.IsNotNull(container.GetExportedValue<Delegate>("ActionWith8Arguments"));\r
-#else\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-                container.GetExportedValue<Delegate>("ActionWith8Arguments"));\r
-#endif\r
-        }\r
-\r
-        public delegate void ActionWith9Args(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9);\r
-\r
-        [TestMethod]\r
-        public void Export_ActionWith9Arguments_ShouldThrowContractMismatch()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MethodExporter));\r
-\r
-            // Cannot Create a standard delegate that takes 9 arguments\r
-            // so the generic Delegate type will not work\r
-            ExceptionAssert.Throws<CompositionContractMismatchException>(() =>\r
-                container.GetExportedValue<Delegate>("ActionWith9Arguments"));\r
-\r
-            // If a matching custom delegate type is used then it will work\r
-            Assert.IsNotNull(container.GetExportedValue<ActionWith9Args>("ActionWith9Arguments"));\r
-        }\r
-\r
-#if CLR40 && !SILVERLIGHT\r
-        [TestMethod]\r
-        public void Export_FunctionWithDefaultValue_ShouldWorkFine()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MethodExporter));\r
-\r
-            var export = container.GetExportedValue<Func<int, string, int>>("FunctionWithDefaultValue");\r
-            Assert.AreEqual(3, export(3, "a"));\r
-\r
-            // Even though the string argument is optional it still cannot be cast to Func<int, int>.\r
-            var export2 = (ExportedDelegate)container.GetExportedValue<object>("FunctionWithDefaultValue");\r
-            var export3 = export2.CreateDelegate(typeof(Func<int, int>));\r
-\r
-            Assert.IsNull(export3);\r
-        }\r
-#endif\r
-\r
-\r
-        public delegate int DelegateOneArg(int i);\r
-        public delegate int DelegateTwoArgs(int i, int j);\r
-\r
-        public class CustomExportedDelegate : ExportedDelegate\r
-        {\r
-            private Func<int, int, int> _func;\r
-\r
-            public CustomExportedDelegate(Func<int, int, int> func)\r
-            {\r
-                this._func = func;\r
-            }\r
-\r
-            public override Delegate CreateDelegate(Type delegateType)\r
-            {\r
-                if (delegateType == typeof(DelegateOneArg))\r
-                {\r
-                    return (DelegateOneArg)((i) => this._func(i, 0));\r
-                }\r
-                else if (delegateType == typeof(DelegateTwoArgs))\r
-                {\r
-                    return (DelegateTwoArgs)((i, j) => this._func(i, j));\r
-                }\r
-\r
-                return null;\r
-            }\r
-        }\r
-\r
-        public class ExportCustomExportedDelegates\r
-        {\r
-            [Export("CustomExportedDelegate", typeof(DelegateOneArg))]\r
-            [Export("CustomExportedDelegate", typeof(DelegateTwoArgs))]\r
-            public ExportedDelegate MyExportedDelegate\r
-            {\r
-                get\r
-                {\r
-                    return new CustomExportedDelegate(DoWork);\r
-                }\r
-            }\r
-\r
-            public int DoWork(int i, int j)\r
-            {\r
-                return i + j;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class ImportCustomExportedDelegates\r
-        {\r
-            [Import("CustomExportedDelegate")]\r
-            public DelegateOneArg DelegateOneArg { get; set; }\r
-\r
-            [Import("CustomExportedDelegate")]\r
-            public DelegateTwoArgs DelegateTwoArgs { get; set; }\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CustomExportedDelegate_ShouldWork()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(ExportCustomExportedDelegates),\r
-                typeof(ImportCustomExportedDelegates));\r
-\r
-            var importer = container.GetExportedValue<ImportCustomExportedDelegates>();\r
-\r
-            Assert.AreEqual(1, importer.DelegateOneArg(1));\r
-            Assert.AreEqual(2, importer.DelegateTwoArgs(1, 1));\r
-        }\r
-\r
-        public delegate void GetRef(ref int i);\r
-        public delegate void GetOut(out int i);\r
-\r
-        public class RefOutMethodExporter\r
-        {\r
-            [Export]\r
-            public void MyGetOut(out int i)\r
-            {\r
-                i = 29;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void MethodWithOutParam_ShouldWorkWithRefParam()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(RefOutMethodExporter));\r
-\r
-            int i = 0;\r
-\r
-            var export1 = container.GetExportedValue<GetRef>();\r
-            \r
-            export1(ref i);\r
-            Assert.AreEqual(29, i);\r
-            i = 0;\r
-\r
-            var export2 = container.GetExportedValue<GetOut>();\r
-            \r
-            export2(out i);\r
-            Assert.AreEqual(29, i);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DiscoveryTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/DiscoveryTests.cs
deleted file mode 100644 (file)
index 32d2d5d..0000000
+++ /dev/null
@@ -1,874 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class DiscoveryTests\r
-    {\r
-        public abstract class AbstractClassWithExports\r
-        {\r
-            [Export("StaticExport")]\r
-            public static string StaticExport { get { return "ExportedValue"; } }\r
-\r
-            [Export("InstanceExport")]\r
-            public string InstanceExport { get { return "InstanceExportedValue"; } }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_StaticOnAbstractClass_ShouldExist()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(AbstractClassWithExports));\r
-\r
-            Assert.IsTrue(container.IsPresent("StaticExport"));\r
-            Assert.IsFalse(container.IsPresent("InstanceExport"));\r
-        }\r
-\r
-        public class ClassWithStaticImport\r
-        {\r
-            [Import("StaticImport")]\r
-            public static string MyImport\r
-            {\r
-                get; set;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_StaticImport_ShouldNotBeSet()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.AddAndComposeExportedValue("StaticImport", "String that shouldn't be imported");\r
-\r
-            var importer = new ClassWithStaticImport();\r
-\r
-            container.SatisfyImportsOnce(importer);\r
-\r
-            Assert.IsNull(ClassWithStaticImport.MyImport, "Static import should not have been set!");\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-// private imports don't work on SILVERLIGHT\r
-        [Export]\r
-        public class BaseWithNonPublicImportAndExport\r
-        {\r
-            [Import("BasePrivateImport")]\r
-            private string _basePrivateImport = null;\r
-\r
-            public string BasePrivateImport { get { return this._basePrivateImport; } }\r
-        }\r
-\r
-        [Export]\r
-        public class DerivedBaseWithNonPublicImportAndExport : BaseWithNonPublicImportAndExport\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_PrivateOnClass_ShouldSetImport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(BaseWithNonPublicImportAndExport));\r
-            container.AddAndComposeExportedValue("BasePrivateImport", "Imported String");\r
-\r
-            var importer = container.GetExportedValue<BaseWithNonPublicImportAndExport>();\r
-            Assert.AreEqual("Imported String", importer.BasePrivateImport);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Import_PrivateOnBase_ShouldSetImport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(DerivedBaseWithNonPublicImportAndExport));\r
-            container.AddAndComposeExportedValue("BasePrivateImport", "Imported String");\r
-\r
-            var importer = container.GetExportedValue<DerivedBaseWithNonPublicImportAndExport>();\r
-            Assert.AreEqual("Imported String", importer.BasePrivateImport);\r
-        }\r
-#endif // !SILVERLIGHT\r
-\r
-        public interface InterfaceWithImport\r
-        {\r
-            [Import("InterfaceImport")]\r
-            int MyImport { get; set; }\r
-        }\r
-\r
-        public interface InterfaceWithExport\r
-        {\r
-            [Export("InterfaceExport")]\r
-            int MyExport { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AttributesOnInterface_ShouldNotBeConsiderAPart()\r
-        {\r
-            var catalog = CatalogFactory.CreateAttributed(\r
-                typeof(InterfaceWithImport),\r
-                typeof(InterfaceWithExport));\r
-\r
-            Assert.AreEqual(0, catalog.Parts.Count());\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithInterfaceInheritedImport : InterfaceWithImport\r
-        {\r
-            public int MyImport { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_InheritImportFromInterface_ShouldExposeImport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(ClassWithInterfaceInheritedImport));\r
-\r
-            container.AddAndComposeExportedValue("InterfaceImport", 42);\r
-\r
-            var importer = container.GetExportedValue<ClassWithInterfaceInheritedImport>();\r
-\r
-            Assert.IsTrue(importer.MyImport == default(int), "Imports declared on interfaces should not be discovered");\r
-        }\r
-\r
-        public class ClassWithInterfaceInheritedExport : InterfaceWithExport\r
-        {\r
-            public ClassWithInterfaceInheritedExport()\r
-            {\r
-                MyExport = 42;\r
-            }\r
-\r
-            public int MyExport { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_InheritExportFromInterface_ShouldNotExposeExport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(ClassWithInterfaceInheritedExport));\r
-\r
-            Assert.IsFalse(container.IsPresent("InterfaceExport"), "Export defined on interface should not be discovered!");\r
-        }\r
-\r
-        public interface IFoo { }\r
-\r
-        [InheritedExport]\r
-        public abstract class BaseWithVirtualExport\r
-        {\r
-            [Export]\r
-            public virtual IFoo MyProp { get; set; }\r
-        }\r
-\r
-        [InheritedExport(typeof(BaseWithVirtualExport))]\r
-        public class DerivedWithOverrideExport : BaseWithVirtualExport\r
-        {\r
-            [Export]\r
-            public override IFoo MyProp { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_BaseAndDerivedShouldAmountInTwoExports()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(BaseWithVirtualExport),\r
-                typeof(DerivedWithOverrideExport));\r
-\r
-            var exports1 = container.GetExportedValues<BaseWithVirtualExport>();\r
-            Assert.AreEqual(1, exports1.Count());\r
-\r
-            var exports2 = container.GetExportedValues<IFoo>();\r
-            Assert.AreEqual(1, exports2.Count());\r
-        }\r
-\r
-        public interface IDocument { }\r
-\r
-        [Export(typeof(IDocument))]\r
-        [ExportMetadata("Name", "TextDocument")]\r
-        public class TextDocument : IDocument\r
-        {\r
-        }\r
-\r
-        [Export(typeof(IDocument))]\r
-        [ExportMetadata("Name", "XmlDocument")]\r
-        public class XmlDocument : TextDocument\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_ExportingSameContractInDerived_ShouldResultInHidingBaseExport()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(IDocument),\r
-                typeof(XmlDocument));\r
-\r
-            var export = container.GetExport<IDocument, IDictionary<string, object>>();\r
-\r
-            Assert.AreEqual("XmlDocument", export.Metadata["Name"]);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_ExportingBaseAndDerivedSameContract_ShouldResultInOnlyTwoExports()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(IDocument),\r
-                typeof(TextDocument),\r
-                typeof(XmlDocument));\r
-\r
-            var exports = container.GetExports<IDocument, IDictionary<string, object>>();\r
-\r
-            Assert.AreEqual(2, exports.Count());\r
-            Assert.AreEqual("TextDocument", exports.ElementAt(0).Metadata["Name"]);\r
-            Assert.IsInstanceOfType(exports.ElementAt(0).Value, typeof(TextDocument));\r
-            \r
-            Assert.AreEqual("XmlDocument", exports.ElementAt(1).Metadata["Name"]);\r
-            Assert.IsInstanceOfType(exports.ElementAt(1).Value, typeof(XmlDocument));\r
-        }\r
-\r
-        public interface IObjectSerializer { }\r
-\r
-        [Export(typeof(IDocument))]\r
-        [Export(typeof(IObjectSerializer))]\r
-        [ExportMetadata("Name", "XamlDocument")]\r
-        public class XamlDocument : XmlDocument, IObjectSerializer\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_ExportingSameContractInDerivedAndNewContract_ShouldResultInHidingBaseAndExportingNewContract()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(XamlDocument));\r
-\r
-            var export = container.GetExport<IDocument, IDictionary<string, object>>();\r
-\r
-            Assert.AreEqual("XamlDocument", export.Metadata["Name"]);\r
-\r
-            var export2 = container.GetExport<IObjectSerializer, IDictionary<string, object>>();\r
-\r
-            Assert.AreEqual("XamlDocument", export2.Metadata["Name"]);\r
-        }\r
-\r
-\r
-        [Export(typeof(IDocument))]\r
-        [ExportMetadata("Name", "WPFDocument")]\r
-        public class WPFDocument : XamlDocument\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_ExportingSameContractInDerivedAndAnotherContractInBase_ShouldResultInHidingOneBaseAndInheritingNewContract()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(WPFDocument));\r
-\r
-            var export = container.GetExport<IDocument, IDictionary<string, object>>();\r
-\r
-            Assert.AreEqual("WPFDocument", export.Metadata["Name"]);\r
-\r
-            var export2 = container.GetExportedValueOrDefault<IObjectSerializer>();\r
-\r
-            Assert.IsNull(export2, "IObjectSerializer export should not have been inherited");\r
-        }\r
-       \r
-        [InheritedExport]\r
-        public abstract class Plugin\r
-        {\r
-            public virtual string GetLocation()\r
-            {\r
-                return "NoWhere";\r
-            }\r
-\r
-            public virtual int Version\r
-            {\r
-                get\r
-                {\r
-                    return 0;\r
-                }\r
-            }\r
-        }\r
-\r
-        private void VerifyValidPlugin(CompositionContainer container, int version, string location)\r
-        {\r
-            var plugins = container.GetExports<Plugin>();\r
-            Assert.AreEqual(1, plugins.Count());\r
-\r
-            var plugin = plugins.Single().Value;\r
-\r
-            Assert.AreEqual(location, plugin.GetLocation());\r
-            Assert.AreEqual(version, plugin.Version);\r
-        }\r
-\r
-        public class Plugin1 : Plugin\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_Plugin1()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(Plugin1));\r
-\r
-            VerifyValidPlugin(container, 0, "NoWhere");\r
-        }\r
-\r
-        public class Plugin2 : Plugin\r
-        {\r
-            public override string GetLocation()\r
-            {\r
-                return "SomeWhere";\r
-            }\r
-            public override int Version\r
-            {\r
-                get\r
-                {\r
-                    return 1;\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_Plugin2()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(Plugin2));\r
-\r
-            VerifyValidPlugin(container, 1, "SomeWhere");\r
-        }\r
-\r
-        public class Plugin3 : Plugin\r
-        {\r
-            [Export("PluginLocation")]\r
-            public override string GetLocation()\r
-            {\r
-                return "SomeWhere3";\r
-            }\r
-\r
-            [Export("PluginVersion")]\r
-            public override int Version\r
-            {\r
-                get\r
-                {\r
-                    return 3;\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_Plugin3()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(Plugin3));\r
-\r
-            VerifyValidPlugin(container, 3, "SomeWhere3");\r
-\r
-            var plVer = container.GetExportedValue<int>("PluginVersion");\r
-            Assert.AreEqual(3, plVer);\r
-\r
-            var plLoc = container.GetExportedValue<Func<string>>("PluginLocation");\r
-            Assert.AreEqual("SomeWhere3", plLoc());\r
-        }\r
-\r
-        [InheritedExport(typeof(Plugin))]\r
-        public class Plugin4 : Plugin\r
-        {\r
-            public override string GetLocation()\r
-            {\r
-                return "SomeWhere4";\r
-            }\r
-\r
-            public override int Version\r
-            {\r
-                get\r
-                {\r
-                    return 4;\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_Plugin4()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(Plugin4));\r
-\r
-            VerifyValidPlugin(container, 4, "SomeWhere4");\r
-        }\r
-\r
-        \r
-        public interface IPlugin\r
-        {\r
-            int Id { get; }\r
-        }\r
-        \r
-        public class MyPlugin : IPlugin\r
-        {\r
-            [Export("PluginId")]\r
-            public int Id { get { return 0; } }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_MyPlugin()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MyPlugin));\r
-\r
-            var export = container.GetExportedValue<int>("PluginId");\r
-        }\r
-\r
-        [InheritedExport]\r
-        public interface IApplicationPlugin\r
-        {\r
-            string Name { get; }\r
-            \r
-            object Application { get; set; }\r
-        }\r
-\r
-        [InheritedExport]\r
-        public interface IToolbarPlugin : IApplicationPlugin\r
-        {\r
-            object ToolBar { get; set; }\r
-        }\r
-\r
-        public class MyToolbarPlugin : IToolbarPlugin\r
-        {\r
-            [Export("ApplicationPluginNames")]\r
-            public string Name { get { return "MyToolbarPlugin"; } }\r
-\r
-            [Import("Application")]\r
-            public object Application { get; set; }\r
-\r
-            [Import("ToolBar")]\r
-            public object ToolBar { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void TestInterfaces()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MyToolbarPlugin));\r
-\r
-            var app = new object();\r
-            container.AddAndComposeExportedValue<object>("Application", app);\r
-\r
-            var toolbar = new object();\r
-            container.AddAndComposeExportedValue<object>("ToolBar", toolbar);\r
-\r
-            var export = container.GetExportedValue<IToolbarPlugin>();\r
-\r
-            Assert.AreEqual(app, export.Application);\r
-            Assert.AreEqual(toolbar, export.ToolBar);\r
-            Assert.AreEqual("MyToolbarPlugin", export.Name);\r
-\r
-            var pluginNames = container.GetExportedValues<string>("ApplicationPluginNames");\r
-            Assert.AreEqual(1, pluginNames.Count());\r
-        }\r
-\r
-        public class ImportOnVirtualProperty\r
-        {\r
-            public int ImportSetCount = 0;\r
-            private int _value;\r
-\r
-            [Import("VirtualImport")]\r
-            public virtual int VirtualImport \r
-            {\r
-                get\r
-                {\r
-                    return this._value;\r
-                }\r
-                set\r
-                {\r
-                    this._value = value;\r
-                    ImportSetCount++;\r
-                }\r
-            }\r
-        }\r
-\r
-        public class ImportOnOverridenPropertyWithSameContract : ImportOnVirtualProperty\r
-        {\r
-            [Import("VirtualImport")]\r
-            public override int VirtualImport\r
-            {\r
-                get\r
-                {\r
-                    return base.VirtualImport;\r
-                }\r
-                set\r
-                {\r
-                    base.VirtualImport = value;\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_VirtualPropertyOverrideWithSameContract_ShouldSucceed()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.AddAndComposeExportedValue<int>("VirtualImport", 21);\r
-\r
-            var import = new ImportOnOverridenPropertyWithSameContract();\r
-\r
-            container.SatisfyImportsOnce(import);\r
-\r
-            // Import will get set twice because there are 2 imports on the same property.\r
-            // We would really like to either elminate it getting set twice or error in this case\r
-            // but we figure it is a rare enough corner case that it doesn't warrented the run time cost\r
-            // and can be covered by an FxCop rule.\r
-\r
-            Assert.AreEqual(2, import.ImportSetCount);\r
-            Assert.AreEqual(21, import.VirtualImport);\r
-        }\r
-\r
-        public class ImportOnOverridenPropertyWithDifferentContract : ImportOnVirtualProperty\r
-        {\r
-            [Import("OverriddenImport")]\r
-            public override int VirtualImport\r
-            {\r
-                set\r
-                {\r
-                    base.VirtualImport = value;\r
-                }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_VirtualPropertyOverrideWithDifferentContract_ShouldSucceed()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            container.AddAndComposeExportedValue<int>("VirtualImport", 21);\r
-            container.AddAndComposeExportedValue<int>("OverriddenImport", 42);\r
-\r
-            var import = new ImportOnOverridenPropertyWithSameContract();\r
-\r
-            container.SatisfyImportsOnce(import);\r
-\r
-            // Import will get set twice because there are 2 imports on the same property.\r
-            // We would really like to either elminate it getting set twice or error in this case\r
-            // but we figure it is a rare enough corner case that it doesn't warrented the run time cost\r
-            // and can be covered by an FxCop rule.\r
-\r
-            Assert.AreEqual(2, import.ImportSetCount);\r
-\r
-            // The derived most import should be discovered first and so it will get set first\r
-            // and thus the value should be the base import which is 21.\r
-            Assert.AreEqual(21, import.VirtualImport);\r
-        }\r
-\r
-        [InheritedExport]\r
-        public interface IOrderScreen { }\r
-\r
-        public class NorthwindOrderScreen : IOrderScreen\r
-        {\r
-        }\r
-\r
-        public class SouthsandOrderScreen : IOrderScreen\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Export_ExportOnlyOnBaseInterfacewithInheritedMarked_ShouldFindAllImplementers()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(NorthwindOrderScreen),\r
-                typeof(SouthsandOrderScreen));\r
-\r
-            var exports = container.GetExportedValues<IOrderScreen>();\r
-\r
-            Assert.AreEqual(2, exports.Count());\r
-            Assert.IsInstanceOfType(exports.ElementAt(0), typeof(NorthwindOrderScreen));\r
-            Assert.IsInstanceOfType(exports.ElementAt(1), typeof(SouthsandOrderScreen));\r
-        }\r
-\r
-        [Export]\r
-        public class PartWithStaticConstructor\r
-        {\r
-            static PartWithStaticConstructor()\r
-            {\r
-                throw new Exception();\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void StaticConstructor()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(PartWithStaticConstructor));\r
-\r
-            CompositionAssert.ThrowsError(ErrorId.ImportEngine_PartCannotGetExportedValue,\r
-                ErrorId.ImportEngine_PartCannotActivate, \r
-                ErrorId.ReflectionModel_PartConstructorThrewException,\r
-                () => container.GetExportedValue<PartWithStaticConstructor>());\r
-        }\r
-\r
-        public interface IAddin\r
-        {\r
-            void LoadAddin(object application);\r
-            void Shutdown();\r
-        }\r
-\r
-        public interface IAddinMetadata\r
-        {\r
-            string Name { get; }\r
-            string Version { get; }\r
-            string Id { get; }\r
-        }\r
-\r
-        [MetadataAttribute]\r
-        [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]\r
-        public class AddinAttribute : ExportAttribute, IAddinMetadata\r
-        {\r
-            private string _name;\r
-            private string _version;\r
-            private string _id;\r
-\r
-            public AddinAttribute(string name, string version, string id)\r
-                : base(typeof(IAddin))\r
-            {\r
-                this._name = name;\r
-                this._version = version;\r
-                this._id = id;\r
-            }\r
-\r
-            public string Name { get { return this._name; } }\r
-            public string Version { get { return this._version; } }\r
-            public string Id { get { return this._id; } }\r
-        }\r
-\r
-\r
-        [Addin("Addin1", "1.0", "{63D1B00F-AD2F-4F14-8A36-FFA59E4A101C}")]\r
-        public class Addin1 : IAddin\r
-        {\r
-            public void LoadAddin(object application)\r
-            {\r
-            }\r
-            public void Shutdown()\r
-            {\r
-            }\r
-        }\r
-\r
-        [Addin("Addin2", "1.0", "{63D1B00F-AD2F-4F14-8A36-FFA59E4A101D}")]\r
-        public class Addin2 : IAddin\r
-        {\r
-            public void LoadAddin(object application)\r
-            {\r
-            }\r
-            public void Shutdown()\r
-            {\r
-            }\r
-        }\r
-\r
-        [Addin("Addin3", "1.0", "{63D1B00F-AD2F-4F14-8A36-FFA59E4A101E}")]\r
-        public class Addin3 : IAddin\r
-        {\r
-            public void LoadAddin(object application)\r
-            {\r
-            }\r
-            public void Shutdown()\r
-            {\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void DiscoverAddinsWithCombinedCustomExportAndMetadataAttribute()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Addin1), typeof(Addin2), typeof(Addin3));\r
-\r
-            var addins = container.GetExports<IAddin, IAddinMetadata>().ToArray();\r
-\r
-            Assert.AreEqual(3, addins.Length, "Incorrect number of addins");\r
-\r
-            var values = new AddinAttribute[] \r
-                {\r
-                    new AddinAttribute("Addin1", "1.0", "{63D1B00F-AD2F-4F14-8A36-FFA59E4A101C}"),\r
-                    new AddinAttribute("Addin2", "1.0", "{63D1B00F-AD2F-4F14-8A36-FFA59E4A101D}"),\r
-                    new AddinAttribute("Addin3", "1.0", "{63D1B00F-AD2F-4F14-8A36-FFA59E4A101E}"),\r
-                };\r
-\r
-            for (int i = 0; i < values.Length; i++)\r
-            {\r
-                var addinMetadata = addins[i].Metadata;\r
-\r
-                Assert.AreEqual(values[i].Name, addinMetadata.Name);\r
-                Assert.AreEqual(values[i].Version, addinMetadata.Version);\r
-                Assert.AreEqual(values[i].Id, addinMetadata.Id);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CombinedCustomExportMetadataAttribute_ShouldNotContainMetadataFromExportAttribute()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Addin1));\r
-            var addin = container.GetExport<IAddin, IDictionary<string, object>>();\r
-\r
-            Assert.AreEqual(4, addin.Metadata.Count); // 3 metadata values and type identity\r
-\r
-            Assert.AreEqual(AttributedModelServices.GetTypeIdentity(typeof(IAddin)), addin.Metadata[CompositionConstants.ExportTypeIdentityMetadataName]);\r
-            Assert.AreEqual("Addin1", addin.Metadata["Name"]);\r
-            Assert.AreEqual("1.0", addin.Metadata["Version"]);\r
-            Assert.AreEqual("{63D1B00F-AD2F-4F14-8A36-FFA59E4A101C}", addin.Metadata["Id"]);\r
-        }\r
-\r
-        public class CustomInheritedExportAttribute : InheritedExportAttribute\r
-        {\r
-        }\r
-\r
-        [CustomInheritedExport]\r
-        public interface IUsesCustomInheritedExport\r
-        {\r
-            int Property { get; }\r
-        }\r
-\r
-        public class UsesCustomInheritedExportOnInterface : IUsesCustomInheritedExport\r
-        {\r
-            public int Property\r
-            {\r
-                get { return 42; }\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Test_CustomInheritedExportAttribute_OnInterface()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(UsesCustomInheritedExportOnInterface));\r
-            var exporter = container.GetExportedValue<IUsesCustomInheritedExport>();\r
-            Assert.AreEqual(42, exporter.Property);\r
-        }\r
-\r
-        [CustomInheritedExport]\r
-        public class BaseClassWithCustomInheritedExport\r
-        {\r
-            public int Property { get; set; }\r
-        }\r
-\r
-        public class DerivedFromBaseWithCustomInheritedExport : BaseClassWithCustomInheritedExport\r
-        {\r
-            public DerivedFromBaseWithCustomInheritedExport()\r
-            {\r
-                Property = 43;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Test_CustomInheritedExportAttribute_OnBaseClass()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(DerivedFromBaseWithCustomInheritedExport));\r
-            var exporter = container.GetExportedValue<BaseClassWithCustomInheritedExport>();\r
-            Assert.AreEqual(43, exporter.Property);\r
-        }\r
-\r
-\r
-        [InheritedExport("Foo")]\r
-        [ExportMetadata("Name", "IFoo1")]\r
-        public interface IFoo1 { }\r
-\r
-        [InheritedExport("Foo")]\r
-        [ExportMetadata("Name", "IFoo2")]\r
-        public interface IFoo2 { }\r
-\r
-        [InheritedExport("Foo")]\r
-        [ExportMetadata("Name", "FooWithOneFoo")]\r
-        public class FooWithOneFoo : IFoo1\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void InheritedExport_OnTypeAndInterface()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(FooWithOneFoo));\r
-\r
-            var foos = container.GetExports<object, IDictionary<string, object>>("Foo").ToArray();\r
-\r
-            Assert.AreEqual(1, foos.Length);\r
-            Assert.AreEqual("FooWithOneFoo", foos[0].Metadata["Name"]);\r
-        }\r
-\r
-        public class FooWithTwoFoos : IFoo1, IFoo2 { }\r
-\r
-        [TestMethod]\r
-        public void InheritedExport_TwoInterfaces()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(FooWithTwoFoos));\r
-\r
-            var foos = container.GetExports<object, IDictionary<string, object>>("Foo").ToArray();\r
-\r
-            Assert.AreEqual(2, foos.Length);\r
-\r
-            EnumerableAssert.AreEqual(foos.Select(e => (string)e.Metadata["Name"]), "IFoo1", "IFoo2");\r
-        }\r
-\r
-        public class FooWithIfaceByOneFoo : FooWithOneFoo, IFoo1 { }\r
-\r
-        [TestMethod]\r
-        public void InheritedExport_BaseAndInterface()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(FooWithIfaceByOneFoo));\r
-\r
-            var foos = container.GetExports<object, IDictionary<string, object>>("Foo").ToArray();\r
-\r
-            Assert.AreEqual(1, foos.Length);\r
-\r
-            Assert.AreEqual("FooWithOneFoo", foos[0].Metadata["Name"]);\r
-        }\r
-\r
-        [InheritedExport("Foo")]\r
-        [ExportMetadata("Name", "FooWithInheritedOnSelf")]\r
-        public class FooWithInheritedOnSelf : FooWithOneFoo, IFoo1 { }\r
-\r
-        [TestMethod]\r
-        public void InheritedExport_BaseInterfaceAndSelf()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(FooWithInheritedOnSelf));\r
-\r
-            var foos = container.GetExports<object, IDictionary<string, object>>("Foo").ToArray();\r
-\r
-            Assert.AreEqual(1, foos.Length);\r
-\r
-            Assert.AreEqual("FooWithInheritedOnSelf", foos[0].Metadata["Name"]);\r
-        }\r
-\r
-        [InheritedExport("Foo")]\r
-        [ExportMetadata("Name", "IFoo3")]\r
-        public interface IFoo3 : IFoo1 { }\r
-\r
-        public class FooWithInterfaceWithMultipleFoos : IFoo3 { }\r
-\r
-        [TestMethod]\r
-        public void InheritedExport_InterfaceHiearchy()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(FooWithInterfaceWithMultipleFoos));\r
-\r
-            var foos = container.GetExports<object, IDictionary<string, object>>("Foo").ToArray();\r
-            Assert.AreEqual(2, foos.Length);\r
-\r
-            EnumerableAssert.AreEqual(foos.Select(e => (string)e.Metadata["Name"]), "IFoo1", "IFoo3");\r
-        }\r
-\r
-        [InheritedExport("Foo2")]\r
-        [ExportMetadata("Name", "FooWithMultipleInheritedExports")]\r
-        public class FooWithMultipleInheritedExports : IFoo1 { }\r
-\r
-        [TestMethod]\r
-        public void InheritedExport_MultipleDifferentContracts()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(FooWithMultipleInheritedExports));\r
-\r
-            var foos = container.GetExports<object, IDictionary<string, object>>("Foo").ToArray();\r
-\r
-            Assert.AreEqual(1, foos.Length);\r
-\r
-            Assert.AreEqual("IFoo1", foos[0].Metadata["Name"]);\r
-\r
-            var foo2s = container.GetExports<object, IDictionary<string, object>>("Foo2").ToArray();\r
-\r
-            Assert.AreEqual(1, foo2s.Length);\r
-\r
-            Assert.AreEqual("FooWithMultipleInheritedExports", foo2s[0].Metadata["Name"]);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/ExportProviderEventTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/ExportProviderEventTests.cs
deleted file mode 100644 (file)
index 3744048..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    [TestClass]\r
-    public class ExportProviderEventTests\r
-    {\r
-        [TestMethod]\r
-        public void BatchAdd_ShouldFireEvents()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var eventListener = new ExportProviderListener(container, container);\r
-\r
-            var batch = new CompositionBatch();\r
-            batch.AddExportedValue<object>("MyExport", new object());\r
-            eventListener.VerifyCompose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void BatchRemove_ShouldFireEvents()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            var exportPart = batch.AddExportedValue<object>("MyExport", new object());\r
-            container.Compose(batch);\r
-\r
-            var eventListener = new ExportProviderListener(container, container);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(exportPart);\r
-            eventListener.VerifyCompose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void BatchAddRemove_ShouldFireEvents()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var batch = new CompositionBatch();\r
-            var exportPart = batch.AddExportedValue<object>("MyExport", new object());\r
-            container.Compose(batch);\r
-\r
-            var eventListener = new ExportProviderListener(container, container);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(exportPart);\r
-            batch.AddExportedValue<object>("MyExport2", new object());\r
-            eventListener.VerifyCompose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void BatchMultipleAdds_ShouldFireEvents()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var eventListener = new ExportProviderListener(container, container);\r
-\r
-            var batch = new CompositionBatch();\r
-            batch.AddExportedValue<object>("MyExport", new object());\r
-            batch.AddExportedValue<object>("MyExport2", new object());\r
-            batch.AddExportedValue<object>("MyExport3", new object());\r
-            eventListener.VerifyCompose(batch);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void BatchNestedContainerAdds_ShouldFireEvents()\r
-        {\r
-            var parentContainer = ContainerFactory.Create();\r
-            var container = ContainerFactory.Create(parentContainer);\r
-            var eventListener = new ExportProviderListener(parentContainer, container);\r
-\r
-            var batch = new CompositionBatch();\r
-            batch.AddExportedValue<object>("MyExport", new object());\r
-            eventListener.VerifyCompose(batch);\r
-        }\r
-\r
-        [Export]\r
-        public class SampleCatalogExport { }\r
-\r
-        [TestMethod]\r
-        public void CatalogAdd_ShouldFireEvents()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SampleCatalogExport));\r
-            var aggCat = new AggregateCatalog();\r
-            var container = ContainerFactory.Create(aggCat);\r
-            var eventListener = new ExportProviderListener(container, container);\r
-\r
-            eventListener.VerifyCatalogAdd(() => aggCat.Catalogs.Add(catalog), typeof(SampleCatalogExport));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CatalogRemove_ShouldFireEvents()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SampleCatalogExport));\r
-            var aggCat = new AggregateCatalog();\r
-            var container = ContainerFactory.Create(aggCat);\r
-\r
-            aggCat.Catalogs.Add(catalog);\r
-            var eventListener = new ExportProviderListener(container, container);\r
-\r
-            eventListener.VerifyCatalogRemove(() => aggCat.Catalogs.Remove(catalog), typeof(SampleCatalogExport));\r
-        }\r
-\r
-        [Export]\r
-        public class SampleCatalogExport2 { }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(812029)]\r
-        public void CatalogMultipleAdds_ShouldFireEvents()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SampleCatalogExport));\r
-            var aggCat = new AggregateCatalog();\r
-            var container = ContainerFactory.Create(aggCat);\r
-            var eventListener = new ExportProviderListener(container, container);\r
-\r
-            var otherAggCat = new AggregateCatalog(new TypeCatalog(typeof(SampleCatalogExport)), new TypeCatalog(typeof(SampleCatalogExport2)));\r
-\r
-            eventListener.VerifyCatalogAdd(() => aggCat.Catalogs.Add(otherAggCat), typeof(SampleCatalogExport), typeof(SampleCatalogExport2));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void CatalogNestedContainerAdds_ShouldFireEvents()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SampleCatalogExport));\r
-            var aggCat = new AggregateCatalog();\r
-            var parentContainer = ContainerFactory.Create(aggCat);\r
-            var container = ContainerFactory.Create(parentContainer);\r
-            var eventListener = new ExportProviderListener(parentContainer, container);\r
-\r
-            eventListener.VerifyCatalogAdd(() => aggCat.Catalogs.Add(catalog), typeof(SampleCatalogExport));\r
-        }\r
-\r
-        public class ExportProviderListener\r
-        {\r
-            private CompositionContainer _container;\r
-            private ExportProvider _watchedProvider;\r
-            private string[] _expectedAdds;\r
-            private string[] _expectedRemoves;\r
-            private int _changedEventCount;\r
-            private int _changingEventCount;\r
-\r
-            public ExportProviderListener(CompositionContainer container, ExportProvider watchExportProvider)\r
-            {\r
-                watchExportProvider.ExportsChanged += OnExportsChanged;\r
-                watchExportProvider.ExportsChanging += OnExportsChanging;\r
-                this._watchedProvider = watchExportProvider;\r
-                this._container = container;\r
-            }\r
-\r
-            public void VerifyCompose(CompositionBatch batch)\r
-            {\r
-                this._expectedAdds = GetContractNames(batch.PartsToAdd);\r
-                this._expectedRemoves = GetContractNames(batch.PartsToRemove);\r
-\r
-                this._container.Compose(batch);\r
-\r
-                Assert.IsTrue(this._changingEventCount == 1, "Changing event should have been called");\r
-                Assert.IsTrue(this._changedEventCount == 1, "Changed event should have been called");\r
-\r
-                ResetState();\r
-            }\r
-\r
-            public void VerifyCatalogAdd(Action doAdd, params Type[] expectedTypesAdded)\r
-            {\r
-                this._expectedAdds = GetContractNames(expectedTypesAdded);\r
-\r
-                doAdd();\r
-\r
-                Assert.IsTrue(this._changingEventCount == 1, "Changing event should have been called");\r
-                Assert.IsTrue(this._changedEventCount == 1, "Changed event should have been called");\r
-\r
-                ResetState();\r
-            }\r
-\r
-            public void VerifyCatalogRemove(Action doRemove, params Type[] expectedTypesRemoved)\r
-            {\r
-                this._expectedRemoves = GetContractNames(expectedTypesRemoved);\r
-\r
-                doRemove();\r
-\r
-                Assert.IsTrue(this._changingEventCount == 1, "Changing event should have been called");\r
-                Assert.IsTrue(this._changedEventCount == 1, "Changed event should have been called");\r
-\r
-                ResetState();\r
-            }\r
-\r
-            public void OnExportsChanging(object sender, ExportsChangeEventArgs args)\r
-            {\r
-                Assert.IsTrue(this._expectedAdds != null || this._expectedRemoves != null);\r
-\r
-                if (this._expectedAdds == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.AddedExports);\r
-                }\r
-                else\r
-                {\r
-                    foreach (var add in this._expectedAdds)\r
-                    {\r
-                        Assert.IsFalse(this._container.IsPresent(add), "Added exports should ot be added yet during changing");\r
-                    }\r
-                }\r
-\r
-                if (this._expectedRemoves == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.RemovedExports);\r
-                }\r
-                else\r
-                {\r
-                    foreach (var remove in this._expectedRemoves)\r
-                    {\r
-                        Assert.IsTrue(this._container.IsPresent(remove), "Removed exports should not be removed yet during changing");\r
-                    }\r
-                }\r
-\r
-                this._changingEventCount++;\r
-            }\r
-\r
-            public void OnExportsChanged(object sender, ExportsChangeEventArgs args)\r
-            {\r
-                Assert.IsTrue(this._expectedAdds != null || this._expectedRemoves != null);\r
-\r
-                if (this._expectedAdds == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.AddedExports);\r
-                }\r
-                else\r
-                {\r
-                    foreach (var add in this._expectedAdds)\r
-                    {\r
-                        Assert.IsTrue(this._container.IsPresent(add), "Added exports should be added during changed");\r
-                    }\r
-                }\r
-\r
-                if (this._expectedRemoves == null)\r
-                {\r
-                    EnumerableAssert.IsEmpty(args.RemovedExports);\r
-                }\r
-                else\r
-                {\r
-                    foreach (var remove in this._expectedRemoves)\r
-                    {\r
-                        Assert.IsFalse(this._container.IsPresent(remove), "Removed exports should be removed during changed");\r
-                    }\r
-                }\r
-\r
-                Assert.IsNull(args.AtomicComposition);\r
-\r
-                this._changedEventCount++;\r
-            }\r
-\r
-            private void ResetState()\r
-            {\r
-                this._expectedAdds = null;\r
-                this._expectedRemoves = null;\r
-                this._changedEventCount = 0;\r
-                this._changingEventCount = 0;\r
-            }\r
-\r
-            private static string[] GetContractNames(IEnumerable<ExportDefinition> definitions)\r
-            {\r
-                return definitions.Select(e => e.ContractName).ToArray();\r
-            }\r
-\r
-            private static string[] GetContractNames(IEnumerable<ComposablePart> parts)\r
-            {\r
-                return GetContractNames(parts.SelectMany(p => p.ExportDefinitions));\r
-            }\r
-\r
-            private static string[] GetContractNames(IEnumerable<Type> types)\r
-            {\r
-                return GetContractNames(types.Select(t => AttributedModelServices.CreatePartDefinition(t, null)).SelectMany(p => p.ExportDefinitions));\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/LifetimeTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/LifetimeTests.cs
deleted file mode 100644 (file)
index 5a5cd5d..0000000
+++ /dev/null
@@ -1,1273 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class LifetimeTests\r
-    {\r
-        [Export]\r
-        public class AnyPartSimple\r
-        {\r
-\r
-        }\r
-\r
-        [Export]\r
-        public class AnyPartDisposable : IDisposable\r
-        {\r
-            public bool IsDisposed { get; set; }\r
-            public void Dispose()\r
-            {\r
-                Assert.IsFalse(IsDisposed);\r
-                IsDisposed = true;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class AnyPartRecomposable\r
-        {\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class AnyPartDisposableRecomposable : IDisposable\r
-        {\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int Value { get; set; }\r
-\r
-            public bool IsDisposed { get; set; }\r
-            public void Dispose()\r
-            {\r
-                Assert.IsFalse(IsDisposed);\r
-                IsDisposed = true;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartAddedViaAddExportedValue_ShouldNotBeDisposedWithContainer()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var disposablePart = new AnyPartDisposable();\r
-            var batch = new CompositionBatch();\r
-            batch.AddPart(batch);\r
-            container.Compose(batch);\r
-\r
-            container.Dispose();\r
-            Assert.IsFalse(disposablePart.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartAddedTwice_AppearsTwice()\r
-        {\r
-            //  You probably shouldn't be adding a part to the container twice, but it's not something we're going to check for and throw an exception on\r
-            var container = new CompositionContainer();\r
-            var disposable = new AnyPartDisposable();\r
-            var part = AttributedModelServices.CreatePart(disposable);\r
-            var batch = new CompositionBatch();\r
-            batch.AddPart(part);\r
-            container.Compose(batch);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddPart(part);\r
-            container.Compose(batch);\r
-\r
-            var exports = container.GetExports<AnyPartDisposable>();\r
-            Assert.AreEqual(2, exports.Count());\r
-\r
-            container.Dispose();\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AnyPart_Simple_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(AnyPartSimple));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<AnyPartSimple>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AnyPart_Disposable_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(AnyPartDisposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<AnyPartDisposable>());\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AnyPart_Disposable_ShouldBeDisposedWithContainer()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(AnyPartDisposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var exportedValue = container.GetExportedValue<AnyPartDisposable>();\r
-\r
-            Assert.IsFalse(exportedValue.IsDisposed);\r
-\r
-            container.Dispose();\r
-\r
-            Assert.IsTrue(exportedValue.IsDisposed, "AnyPart should be disposed with the container!");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AnyPart_RecomposabeImport_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(AnyPartRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<AnyPartRecomposable>());\r
-            refTracker.CollectAndAssert();\r
-\r
-            // Lets make sure recomposition doesn't blow anything up here.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var exportedValue = (AnyPartRecomposable)refTracker.ReferencesNotExpectedToBeCollected[0].Target;\r
-            Assert.AreEqual(42, exportedValue.Value);\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AnyPart_DisposableRecomposabeImport_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(AnyPartDisposableRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<AnyPartDisposableRecomposable>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            // Lets make sure recomposition doesn't blow anything up here.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var exportedValue = (AnyPartDisposableRecomposable)refTracker.ReferencesNotExpectedToBeCollected[0].Target;\r
-            Assert.AreEqual(42, exportedValue.Value);\r
-\r
-            GC.KeepAlive(container);\r
-\r
-            container.Dispose();\r
-\r
-            Assert.IsTrue(exportedValue.IsDisposed, "Any parts should be disposed with the container!");\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class SharedPartSimple\r
-        {\r
-\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class SharedPartDisposable : IDisposable\r
-        {\r
-            public bool IsDisposed { get; set; }\r
-            public void Dispose()\r
-            {\r
-                Assert.IsFalse(IsDisposed);\r
-                IsDisposed = true;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class SharedPartRecomposable\r
-        {\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int Value { get; set; } \r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class SharedPartDisposableRecomposable : IDisposable\r
-        {\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int Value { get; set; }\r
-\r
-            public bool IsDisposed { get; set; }\r
-            public void Dispose()\r
-            {\r
-                Assert.IsFalse(IsDisposed);\r
-                IsDisposed = true;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SharedPart_Simple_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SharedPartSimple));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<SharedPartSimple>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SharedPart_Disposable_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SharedPartDisposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<SharedPartDisposable>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SharedPart_Disposable_ShouldBeDisposedWithContainer()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SharedPartDisposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var export = container.GetExportedValue<SharedPartDisposable>();\r
-\r
-            Assert.IsFalse(export.IsDisposed);\r
-\r
-            container.Dispose();\r
-\r
-            Assert.IsTrue(export.IsDisposed, "SharedPart should be disposed with the container!");\r
-        }\r
-       \r
-        [TestMethod]\r
-        public void SharedPart_RecomposabeImport_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SharedPartRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<SharedPartRecomposable>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            // Lets make sure recomposition doesn't blow anything up here.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var exportedValue = (SharedPartRecomposable)refTracker.ReferencesNotExpectedToBeCollected[0].Target;\r
-            Assert.AreEqual(42, exportedValue.Value);\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void SharedPart_DisposableRecomposabeImport_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(SharedPartDisposableRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<SharedPartDisposableRecomposable>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            // Lets make sure recomposition doesn't blow anything up here.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var exportedValue = (SharedPartDisposableRecomposable)refTracker.ReferencesNotExpectedToBeCollected[0].Target;\r
-            Assert.AreEqual(42, exportedValue.Value);\r
-\r
-            container.Dispose();\r
-\r
-            Assert.IsTrue(exportedValue.IsDisposed, "Any parts should be disposed with the container!");\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedPartSimple\r
-        {\r
-            \r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedPartRecomposable\r
-        {\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedPartDisposable : IDisposable\r
-        {\r
-            public bool IsDisposed { get; set; }\r
-            public void Dispose()\r
-            {\r
-                Assert.IsFalse(IsDisposed);\r
-                IsDisposed = true;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedPartDisposableRecomposable : IDisposable\r
-        {\r
-            private int _value;\r
-\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int Value\r
-            {\r
-                get\r
-                {\r
-                    if (this.IsDisposed) throw new ObjectDisposedException(this.GetType().Name);\r
-                    return this._value; \r
-                }\r
-                set\r
-                {\r
-                    if (this.IsDisposed) throw new ObjectDisposedException(this.GetType().Name);\r
-                    this._value = value;\r
-                }\r
-            }\r
-\r
-            public bool IsDisposed { get; set; }\r
-            public void Dispose()\r
-            {\r
-                Assert.IsFalse(IsDisposed);\r
-                IsDisposed = true;\r
-            } \r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPart_Disposable_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartDisposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<NonSharedPartDisposable>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPart_Disposable_ShouldBeDisposedWithContainer()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartDisposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var export = container.GetExportedValue<NonSharedPartDisposable>();\r
-\r
-            Assert.IsFalse(export.IsDisposed);\r
-\r
-            container.Dispose();\r
-\r
-            Assert.IsTrue(export.IsDisposed, "NonSharedParts should be disposed with the container!");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPart_RecomposableImport_WithReference_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var exportedValue = container.GetExportedValue<NonSharedPartRecomposable>();\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(exportedValue);\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            // Recompose should work because we are still holding a reference to the exported value.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            Assert.AreEqual(42, exportedValue.Value, "Value should have been recomposed");\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPart_DisposableRecomposabeImport_NoReference_ShouldNotBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartDisposableRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                container.GetExportedValue<NonSharedPartDisposableRecomposable>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            // Recompose just to ensure we don't blow up, even though we don't expect anything to happen.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var exportedValue = (NonSharedPartDisposableRecomposable)refTracker.ReferencesNotExpectedToBeCollected[0].Target;\r
-            Assert.AreEqual(42, exportedValue.Value, "Value shoudl ahve been recomposed.");\r
-            \r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [Export]\r
-        public class SharedState\r
-        {\r
-            public static int instanceNumber = 0;\r
-            public SharedState()\r
-            {\r
-                MyInstanceNumber = instanceNumber++;\r
-            }\r
-\r
-            public int MyInstanceNumber { get; private set; }\r
-        }\r
-\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedState\r
-        {\r
-            [Import(AllowRecomposition = true)]\r
-            public SharedState State { set { ExportState = value; } }\r
-\r
-            [Export("SharedFromNonShared")]\r
-            public SharedState ExportState { get; private set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPart_TwoRecomposablePartsSameExportedValue()\r
-        {\r
-            // This test is primarily used to ensure that we allow for multiple parts to be associated\r
-            // with the same exported value.\r
-            var catalog = new TypeCatalog(typeof(SharedState), typeof(NonSharedState));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var export1 = container.GetExportedValue<SharedState>("SharedFromNonShared");\r
-            var export2 = container.GetExportedValue<SharedState>("SharedFromNonShared");\r
-\r
-            // Same exported value that comes from two different recomposable part instances.\r
-            Assert.AreEqual(export1.MyInstanceNumber, export2.MyInstanceNumber, "Should be the same shared object!");\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class SharedImporter\r
-        {\r
-            [Import(RequiredCreationPolicy = CreationPolicy.Shared)]\r
-            public AnyPartSimple AnyPartSimple { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.Shared)]\r
-            public AnyPartDisposable AnyPartDisposable { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.Shared)]\r
-            public AnyPartRecomposable AnyPartRecomposable { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.Shared)]\r
-            public AnyPartDisposableRecomposable AnyPartDisposableRecomposable { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedImporter\r
-        {\r
-            [Import(RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public AnyPartSimple AnyPartSimple { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public AnyPartDisposable AnyPartDisposable { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public AnyPartRecomposable AnyPartRecomposable { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public AnyPartDisposableRecomposable AnyPartDisposableRecomposable { get; set; }\r
-        }\r
-\r
-        private static CompositionContainer GetContainer()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(LifetimeTests).GetNestedTypes(BindingFlags.Public));\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            return container;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetReleaseExport_SharedRoot_ShouldNotDisposeChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<SharedImporter, IDictionary<string, object>>();\r
-            var exportedValue = export.Value;\r
-\r
-            container.ReleaseExport(export);\r
-\r
-            Assert.IsFalse(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsFalse(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddRemovePart_SharedRoot_ShouldNotDisposeChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var exportedValue = new SharedImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var part = batch.AddPart(exportedValue);\r
-            container.Compose(batch);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(part);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsFalse(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsFalse(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ContainerDispose_SharedRoot_ShouldDisposeChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<SharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            container.Dispose();\r
-\r
-            Assert.IsTrue(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsTrue(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetReleaseExport_NonSharedRoot_ShouldDisposeChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var exports = new List<Lazy<NonSharedImporter>>();\r
-            var exportedValues = new List<NonSharedImporter>();\r
-\r
-            // Executing this 100 times to help uncover any GC bugs\r
-            for (int i = 0; i < 100; i++)\r
-            {\r
-                var export = container.GetExport<NonSharedImporter>();\r
-                var exportedValue = export.Value;\r
-\r
-                exports.Add(export);\r
-                exportedValues.Add(exportedValue);\r
-            }\r
-\r
-            for (int i = 0; i < 100; i++)\r
-            {\r
-                var export = exports[i];\r
-                var exportedValue = exportedValues[i];\r
-\r
-                container.ReleaseExport(export);\r
-\r
-                Assert.IsTrue(exportedValue.AnyPartDisposable.IsDisposed);\r
-                Assert.IsTrue(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-            }\r
-        }\r
-\r
-        public void GetReleaseExport_NonSharedRoot_ShouldDisposeChain_WithMetadata()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var exports = new List<Lazy<NonSharedImporter, IDictionary<string, object>>>();\r
-            var exportedValues = new List<NonSharedImporter>();\r
-\r
-            // Executing this 100 times to help uncover any GC bugs\r
-            for (int i = 0; i < 100; i++)\r
-            {\r
-                var export = container.GetExport<NonSharedImporter, IDictionary<string, object>>();\r
-                var exportedValue = export.Value;\r
-\r
-                exports.Add(export);\r
-                exportedValues.Add(exportedValue);\r
-            }\r
-\r
-            for (int i = 0; i < 100; i++)\r
-            {\r
-                var export = exports[i];\r
-                var exportedValue = exportedValues[i];\r
-\r
-                container.ReleaseExport(export);\r
-\r
-                Assert.IsTrue(exportedValue.AnyPartDisposable.IsDisposed);\r
-                Assert.IsTrue(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReleaseExports_ShouldDispose_NonSharedParts()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var export1 = container.GetExport<NonSharedImporter>();\r
-            var exportedValue1 = export1.Value;\r
-\r
-            var export2 = container.GetExport<NonSharedImporter>();\r
-            var exportedValue2 = export2.Value;\r
-\r
-            container.ReleaseExports(new[] { export1, export2 });\r
-\r
-            Assert.IsTrue(exportedValue1.AnyPartDisposable.IsDisposed);\r
-            Assert.IsTrue(exportedValue1.AnyPartDisposableRecomposable.IsDisposed);\r
-\r
-            Assert.IsTrue(exportedValue2.AnyPartDisposable.IsDisposed);\r
-            Assert.IsTrue(exportedValue2.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void AddRemovePart_NonSharedRoot_ShouldDisposeChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var exportedValue = new NonSharedImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var part = batch.AddPart(exportedValue);\r
-            container.Compose(batch);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(part);\r
-            container.Compose(batch);\r
-\r
-            Assert.IsTrue(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsTrue(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ContainerDispose_NonSharedRoot_ShouldNotDisposeChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<NonSharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            container.Dispose();\r
-\r
-            Assert.IsTrue(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsTrue(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetReleaseExport_NonSharedPart_ShouldNotRecomposeAfterRelease()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            \r
-            var export = container.GetExport<NonSharedPartRecomposable>();\r
-            var exportedValue = export.Value;\r
-\r
-            Assert.AreEqual(21, exportedValue.Value);\r
-\r
-            container.ReleaseExport(export);\r
-\r
-            // Recompose just to ensure we don't blow up, even though we don't expect anything to happen.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(21, exportedValue.Value, "Value should not be recomposed after ReleaseExport is called on it.");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetExportManualDisposeThenRecompose_NonSharedDisposableRecomposablePart_ShouldThrowComposition()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartDisposableRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            \r
-            var export = container.GetExport<NonSharedPartDisposableRecomposable>();\r
-            var exportedValue = export.Value;\r
-\r
-            Assert.AreEqual(21, exportedValue.Value);\r
-\r
-            exportedValue.Dispose();\r
-\r
-            // Recompose should cause a ObjectDisposedException.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-\r
-            CompositionAssert.ThrowsError(\r
-                              ErrorId.ImportEngine_PartCannotActivate,         // Cannot activate part because\r
-                              ErrorId.ReflectionModel_ImportThrewException,         // Import threw an exception\r
-                              RetryMode.DoNotRetry,\r
-                              () => \r
-            {\r
-                container.Compose(batch);\r
-            });\r
-        }\r
\r
-        [Export]\r
-        public class MyImporter\r
-        {\r
-            [Import(AllowDefault = true, AllowRecomposition = true, RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public AnyPartDisposable AnyPartDisposable { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RecomposeCausesOldImportedValuesToBeDisposed()\r
-        {\r
-            var cat = new AggregateCatalog();\r
-            var cat1 = new TypeCatalog(typeof(AnyPartDisposable));\r
-\r
-            cat.Catalogs.Add(new TypeCatalog(typeof (MyImporter)));\r
-            cat.Catalogs.Add(cat1);\r
-\r
-            var container = new CompositionContainer(cat);\r
-\r
-            var importer = container.GetExportedValue<MyImporter>();\r
-\r
-            var anyPart = importer.AnyPartDisposable;\r
-\r
-            Assert.IsFalse(anyPart.IsDisposed);\r
-            Assert.IsInstanceOfType(anyPart, typeof(AnyPartDisposable));\r
-\r
-            // Remove the instance of MyClass1\r
-            cat.Catalogs.Remove(cat1);\r
-\r
-            Assert.IsNull(importer.AnyPartDisposable);\r
-            Assert.IsTrue(anyPart.IsDisposed);\r
-        }\r
-\r
-        private static CompositionContainer CreateParentChildContainerWithNonSharedImporter()\r
-        {\r
-            var parentCat = CatalogFactory.CreateAttributed(typeof(AnyPartDisposable),\r
-                                      typeof(AnyPartDisposableRecomposable),\r
-                                      typeof(AnyPartRecomposable),\r
-                                      typeof(AnyPartSimple));\r
-            var parent = new CompositionContainer(parentCat);\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue("Value", 21);\r
-            parent.Compose(batch);\r
-\r
-            var childCat = CatalogFactory.CreateAttributed(typeof(NonSharedImporter));\r
-            var child = new CompositionContainer(childCat, parent);\r
-\r
-            return child;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildContainerGetReleaseExport_NonSharedRoot_ShouldDisposeChain()\r
-        {\r
-            var child = CreateParentChildContainerWithNonSharedImporter();\r
-\r
-            var export = child.GetExport<NonSharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            child.ReleaseExport(export);\r
-\r
-            Assert.IsTrue(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsTrue(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildContainerAddRemovePart_NonSharedRoot_ShouldDisposeChain()\r
-        {\r
-            var child = CreateParentChildContainerWithNonSharedImporter();\r
-\r
-            var exportedValue = new NonSharedImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var part = batch.AddPart(exportedValue);\r
-            child.Compose(batch);\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(part);\r
-            child.Compose(batch);\r
-\r
-            Assert.IsTrue(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsTrue(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildContainerAddRemovePart_NonSharedRoot_ShouldNotDisposeChain()\r
-        {\r
-            var child = CreateParentChildContainerWithNonSharedImporter();\r
-\r
-            var exportedValue = child.GetExportedValue<NonSharedImporter>();\r
-\r
-            child.Dispose();\r
-\r
-            Assert.IsFalse(exportedValue.AnyPartDisposable.IsDisposed);\r
-            Assert.IsFalse(exportedValue.AnyPartDisposableRecomposable.IsDisposed);\r
-        }\r
-\r
-#if CLR40\r
-\r
-        [TestMethod]\r
-        public void NonSharedPart_Simple_ShouldBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartSimple));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                container.GetExportedValue<NonSharedPartSimple>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ContainerDispose_SharedPart_ShouldCollectWholeObjectChain()\r
-        {\r
-            // Test only works properly with while using the real ConditionalWeakTable\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<SharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            container.Dispose();\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            export = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddRemovePart_SharedPart_ShouldCollectOnlyRoot()\r
-        {\r
-            var container = GetContainer();\r
-            \r
-            var exportedValue = new SharedImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var part = batch.AddPart(exportedValue);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(part);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-             exportedValue);\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            part = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AddRemovePart_NonSharedPart_ShouldCollectWholeObjectChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var exportedValue = new NonSharedImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var part = batch.AddPart(exportedValue);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(part);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            part = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ContainerDispose_NonSharedPart_ShouldCollectWholeObjectChain()\r
-        {\r
-            // Test only works properly with while using the real ConditionalWeakTable\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<NonSharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            container.Dispose();\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            export = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedImporter_ReleaseReference_ShouldCollectWholeChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<NonSharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            // Non-Disposable references in the chain should be GC'ed\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            // Disposable references in the chain should NOT be GC'ed\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable);\r
-\r
-            export = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildContainerDispose_NonSharedPart_ShouldOnlyCleanupChildAndSimpleNonShared()\r
-        {\r
-            var child = CreateParentChildContainerWithNonSharedImporter();\r
-\r
-            var exportedValue = child.GetExportedValue<NonSharedImporter>();\r
-\r
-            child.Dispose();\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,                // object in child\r
-                exportedValue.AnyPartSimple,  // No reference parent so collected.\r
-                exportedValue.AnyPartRecomposable);\r
-\r
-            // These are in the parent and will not be cleaned out\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable);\r
-\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(child);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildContainerGetReleaseExport_NonSharedPart_ShouldCollectWholeObjectChain()\r
-        {\r
-            var child = CreateParentChildContainerWithNonSharedImporter();\r
-\r
-            var export = child.GetExport<NonSharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            child.ReleaseExport(export);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            export = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(child);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void NonSharedPart_RecomposableImport_NoReference_ShouldBeCollected()\r
-        {\r
-            var catalog = new TypeCatalog(typeof(NonSharedPartRecomposable));\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            // Setup dependency\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                container.GetExportedValue<NonSharedPartRecomposable>());\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            // Recompose just to ensure we don't blow up, even though we don't expect anything to happen.\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-            batch = null;\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ChildContainerAddRemovePart_NonSharedPart_ShouldCollectWholeObjectChain()\r
-        {\r
-            var child = CreateParentChildContainerWithNonSharedImporter();\r
-\r
-            var exportedValue = new NonSharedImporter();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            var part = batch.AddPart(exportedValue);\r
-            child.Compose(batch);\r
-            batch = null;\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(part);\r
-            child.Compose(batch);\r
-            batch = null;\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            part = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(child);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetReleaseExport_SharedPart_ShouldCollectOnlyRoot()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<SharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            container.ReleaseExport(export);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue);\r
-\r
-            refTracker.AddReferencesNotExpectedToBeCollected(\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            export = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void GetReleaseExport_NonSharedPart_ShouldCollectWholeObjectChain()\r
-        {\r
-            var container = GetContainer();\r
-\r
-            var export = container.GetExport<NonSharedImporter>();\r
-            var exportedValue = export.Value;\r
-\r
-            container.ReleaseExport(export);\r
-\r
-            var refTracker = new ReferenceTracker();\r
-\r
-            refTracker.AddReferencesExpectedToBeCollected(\r
-                exportedValue,\r
-                exportedValue.AnyPartDisposable,\r
-                exportedValue.AnyPartDisposableRecomposable,\r
-                exportedValue.AnyPartRecomposable,\r
-                exportedValue.AnyPartSimple);\r
-\r
-            export = null;\r
-            exportedValue = null;\r
-\r
-            refTracker.CollectAndAssert();\r
-\r
-            GC.KeepAlive(container);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void ReleaseExports_ShouldWorkWithExportCollection()\r
-        {\r
-            var container = GetContainer();\r
-            var exports = container.GetExports<NonSharedImporter>();\r
-\r
-            Assert.IsTrue(exports.Count() > 0);\r
-\r
-            var exportedValues = exports.Select(export => export.Value).ToList();\r
-\r
-            container.ReleaseExports(exports);\r
-\r
-            foreach (var obj in exportedValues)\r
-            {\r
-                Assert.IsTrue(obj.AnyPartDisposable.IsDisposed);\r
-                Assert.IsTrue(obj.AnyPartDisposableRecomposable.IsDisposed);\r
-            }\r
-        }\r
-#endif\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/PartCreatorTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/PartCreatorTests.cs
deleted file mode 100644 (file)
index 1ce8356..0000000
+++ /dev/null
@@ -1,368 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Diagnostics;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-\r
-#if SILVERLIGHT\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class PartCreatorTests\r
-    {\r
-        public interface IId\r
-        {\r
-            int Id { get; }\r
-        }\r
-\r
-        public interface IIdTypeMetadata\r
-        {\r
-            string IdType { get; }\r
-            string ExportTypeIdentity { get; }\r
-        }\r
-\r
-\r
-        [Export(typeof(IId))]\r
-        [ExportMetadata("IdType", "PostiveIncrement")]\r
-        public class UniqueExport : IId, IDisposable\r
-        {\r
-            private static int lastId = 0;\r
-\r
-            public UniqueExport()\r
-            {\r
-                Id = lastId++;\r
-            }\r
-\r
-            public int Id { get; private set; }\r
-\r
-            public void Dispose()\r
-            {\r
-                Id = -1;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        [CLSCompliant(false)]\r
-        public class PartCreatorImporter\r
-        {\r
-            [ImportingConstructor]\r
-            public PartCreatorImporter(\r
-                PartCreator<IId> idCreatorTCtor, \r
-                PartCreator<IId, IIdTypeMetadata> idCreatorTMCtor)\r
-            {\r
-                this._idCreatorTCtor = idCreatorTCtor;\r
-                this._idCreatorTMCtor = idCreatorTMCtor;\r
-            }\r
-\r
-            private PartCreator<IId> _idCreatorTCtor;\r
-            private PartCreator<IId, IIdTypeMetadata> _idCreatorTMCtor;\r
-\r
-            [Import(typeof(IId))]\r
-            public PartCreator<IId> _idCreatorTField = null; // public so these can work on SL\r
-\r
-            [Import]\r
-            public PartCreator<IId, IIdTypeMetadata> _idCreatorTMField = null; // public so these can work on SL\r
-\r
-            [Import]\r
-            public PartCreator<IId> IdCreatorTProperty { get; set; }\r
-\r
-            [Import(typeof(IId))]\r
-            public PartCreator<IId, IIdTypeMetadata> IdCreatorTMProperty { get; set; }\r
-\r
-            [ImportMany]\r
-            public PartCreator<IId>[] IdCreatorsTProperty { get; set; }\r
-\r
-            [ImportMany]\r
-            public PartCreator<IId, IIdTypeMetadata>[] IdCreatorsTMProperty { get; set; }\r
-\r
-            public void AssertValid()\r
-            {\r
-                var ids = new int[] \r
-                {\r
-                    VerifyPartCreator(this._idCreatorTCtor),\r
-                    VerifyPartCreator(this._idCreatorTMCtor),\r
-                    VerifyPartCreator(this._idCreatorTField),\r
-                    VerifyPartCreator(this._idCreatorTMField),\r
-                    VerifyPartCreator(this.IdCreatorTProperty),\r
-                    VerifyPartCreator(this.IdCreatorTMProperty),\r
-                    VerifyPartCreator(this.IdCreatorsTProperty[0]),\r
-                    VerifyPartCreator(this.IdCreatorsTMProperty[0])\r
-                };\r
-\r
-                Assert.AreEqual(1, this.IdCreatorsTProperty.Length, "Should only be one PartCreator");\r
-                Assert.AreEqual(1, this.IdCreatorsTMProperty.Length, "Should only be one PartCreator");\r
-\r
-                CollectionAssert.AllItemsAreUnique(ids, "There should be no duplicate ids");\r
-            }\r
-\r
-            private int VerifyPartCreator(PartCreator<IId> creator)\r
-            {\r
-                var val1 = creator.CreatePart();\r
-                var val2 = creator.CreatePart();\r
-\r
-                Assert.AreNotEqual(val1.ExportedValue, val2.ExportedValue, "Values should not be the same");\r
-                Assert.AreNotEqual(val1.ExportedValue.Id, val2.ExportedValue.Id, "Value Ids should not be the same");\r
-\r
-                Assert.IsTrue(val1.ExportedValue.Id >= 0, "Id should be positive");\r
-\r
-                val1.Dispose();\r
-\r
-                Assert.IsTrue(val1.ExportedValue.Id < 0, "Disposal of the value should set the id to negative");\r
-\r
-                return creator.CreatePart().ExportedValue.Id;\r
-            }\r
-\r
-            private int VerifyPartCreator(PartCreator<IId, IIdTypeMetadata> creator)\r
-            {\r
-                var val = VerifyPartCreator((PartCreator<IId>)creator);\r
-\r
-                Assert.AreEqual("PostiveIncrement", creator.Metadata.IdType, "IdType should be PositiveIncrement");\r
-                Assert.AreEqual(AttributedModelServices.GetTypeIdentity(typeof(ComposablePartDefinition)), creator.Metadata.ExportTypeIdentity);\r
-\r
-                return val;\r
-            }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartCreatorStandardImports_ShouldWorkProperly()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(UniqueExport), typeof(PartCreatorImporter));\r
-            var partCreatorImporter = container.GetExportedValue<PartCreatorImporter>();\r
-\r
-            partCreatorImporter.AssertValid();\r
-        }\r
-\r
-        [Export]\r
-        public class Foo : IDisposable\r
-        {\r
-            public bool IsDisposed { get; private set; }\r
-\r
-            public void Dispose()\r
-            {\r
-                this.IsDisposed = true;\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class SimplePartCreatorImporter\r
-        {\r
-            [Import]\r
-            public PartCreator<Foo> FooFactory { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartCreatorOfT_RecompositionSingle_ShouldBlockChanges()\r
-        {\r
-            var aggCat = new AggregateCatalog();\r
-            var typeCat = new TypeCatalog(typeof(Foo));\r
-            aggCat.Catalogs.Add(new TypeCatalog(typeof(SimplePartCreatorImporter)));\r
-            aggCat.Catalogs.Add(typeCat);\r
-\r
-            var container = new CompositionContainer(aggCat);\r
-\r
-            var fooFactory = container.GetExportedValue<SimplePartCreatorImporter>();\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                aggCat.Catalogs.Remove(typeCat));\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                aggCat.Catalogs.Add(new TypeCatalog(typeof(Foo))));\r
-        }\r
-\r
-        [Export]\r
-        public class ManyPartCreatorImporter\r
-        {\r
-            [ImportMany(AllowRecomposition = true)]\r
-            public PartCreator<Foo>[] FooFactories { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void FactoryOfT_RecompositionImportMany_ShouldSucceed()\r
-        {\r
-            var aggCat = new AggregateCatalog();\r
-            var typeCat = new TypeCatalog(typeof(Foo));\r
-            aggCat.Catalogs.Add(new TypeCatalog(typeof(ManyPartCreatorImporter)));\r
-            aggCat.Catalogs.Add(typeCat);\r
-\r
-            var container = new CompositionContainer(aggCat);\r
-\r
-            var fooFactories = container.GetExportedValue<ManyPartCreatorImporter>();\r
-\r
-            Assert.AreEqual(1, fooFactories.FooFactories.Length);\r
-\r
-            aggCat.Catalogs.Add(new TypeCatalog(typeof(Foo)));\r
-\r
-            Assert.AreEqual(2, fooFactories.FooFactories.Length);\r
-        }\r
-\r
-        public class PartCreatorExplicitCP\r
-        {\r
-            [Import(RequiredCreationPolicy = CreationPolicy.Any)]\r
-            public PartCreator<Foo> FooCreatorAny { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public PartCreator<Foo> FooCreatorNonShared { get; set; }\r
-\r
-            [Import(RequiredCreationPolicy = CreationPolicy.Shared)]\r
-            public PartCreator<Foo> FooCreatorShared { get; set; }\r
-\r
-            [ImportMany(RequiredCreationPolicy = CreationPolicy.Any)]\r
-            public PartCreator<Foo>[] FooCreatorManyAny { get; set; }\r
-\r
-            [ImportMany(RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public PartCreator<Foo>[] FooCreatorManyNonShared { get; set; }\r
-\r
-            [ImportMany(RequiredCreationPolicy = CreationPolicy.Shared)]\r
-            public PartCreator<Foo>[] FooCreatorManyShared { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartCreator_ExplicitCreationPolicy_CPShouldBeIgnored()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Foo));\r
-\r
-            var part = new PartCreatorExplicitCP();\r
-\r
-            container.SatisfyImportsOnce(part);\r
-\r
-            // specifying the required creation policy explicit on the import \r
-            // of a PartCreator will be ignored because the PartCreator requires\r
-            // the part it wraps to be either Any or NonShared to work properly.\r
-            Assert.IsNotNull(part.FooCreatorAny);\r
-            Assert.IsNotNull(part.FooCreatorNonShared);\r
-            Assert.IsNotNull(part.FooCreatorShared);\r
-\r
-            Assert.AreEqual(1, part.FooCreatorManyAny.Length);\r
-            Assert.AreEqual(1, part.FooCreatorManyNonShared.Length);\r
-            Assert.AreEqual(1, part.FooCreatorManyShared.Length);\r
-        }\r
-\r
-        public class PartCreatorImportRequiredMetadata\r
-        {\r
-            [ImportMany]\r
-            public PartCreator<Foo>[] FooCreator { get; set; }\r
-\r
-            [ImportMany]\r
-            public PartCreator<Foo, IIdTypeMetadata>[] FooCreatorWithMetadata { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartCreator_ImportRequiredMetadata_MissingMetadataShouldCauseImportToBeExcluded()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Foo));\r
-\r
-            var part = new PartCreatorImportRequiredMetadata();\r
-\r
-            container.SatisfyImportsOnce(part);\r
-\r
-            Assert.AreEqual(1, part.FooCreator.Length, "Should contain the one Foo");\r
-            Assert.AreEqual(0, part.FooCreatorWithMetadata.Length, "Should NOT contain Foo because it is missing the required Id metadata property");\r
-        }\r
-\r
-        [Export(typeof(Foo))]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class SharedFoo : Foo\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartCreator_ImportShouldNotImportSharedPart()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(SharedFoo));\r
-\r
-            var foo = container.GetExportedValue<Foo>();\r
-            Assert.IsNotNull(foo, "Ensure that a Foo actually exists in the container");\r
-\r
-            var part = new PartCreatorImportRequiredMetadata();\r
-\r
-            container.SatisfyImportsOnce(part);\r
-\r
-            Assert.AreEqual(0, part.FooCreator.Length, "Should not contain the SharedFoo because the PartCreator should only wrap Any/NonShared parts");\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void PartCreator_QueryContainerDirectly_ShouldWork()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Foo));\r
-\r
-            var importDef = ReflectionModelServices.CreateImportDefinition(\r
-                new LazyMemberInfo(MemberTypes.Field, () => new MemberInfo[] { typeof(PartCreatorTests) }), // Give it a bogus member\r
-                AttributedModelServices.GetContractName(typeof(Foo)),\r
-                AttributedModelServices.GetTypeIdentity(typeof(Foo)),\r
-                Enumerable.Empty<KeyValuePair<string, Type>>(),\r
-                ImportCardinality.ZeroOrMore,\r
-                true,\r
-                CreationPolicy.Any,\r
-                true, // isPartCreator\r
-                null);\r
-\r
-            var exports = container.GetExports(importDef);\r
-\r
-            var partCreator = exports.Single();\r
-\r
-            // Manually walk the steps of using a raw part creator which is modeled as a PartDefinition with\r
-            // a single ExportDefinition.\r
-            var partDef = (ComposablePartDefinition)partCreator.Value;\r
-            var part = partDef.CreatePart();\r
-            var foo = (Foo)part.GetExportedValue(partDef.ExportDefinitions.Single());\r
-\r
-            Assert.IsNotNull(foo);\r
-\r
-            var foo1 = (Foo)part.GetExportedValue(partDef.ExportDefinitions.Single());\r
-            Assert.AreEqual(foo, foo1, "Retrieving the exported value from the same part should return the same value");\r
-\r
-            // creating a new part should result in getting a new exported value\r
-            var part2 = partDef.CreatePart();\r
-            var foo2 = (Foo)part2.GetExportedValue(partDef.ExportDefinitions.Single());\r
-\r
-            Assert.AreNotEqual(foo, foo2, "New part should equate to a new exported value");\r
-\r
-            // Disposing of part should cause foo to be disposed\r
-            ((IDisposable)part).Dispose();\r
-            Assert.IsTrue(foo.IsDisposed);\r
-        }\r
-\r
-        [Export]\r
-        public class PartImporter<PartType>\r
-        {\r
-            [Import]\r
-            public PartCreator<PartType> Creator { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class SimpleExport\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartCreator_SimpleRejectionRecurrection_ShouldWork()\r
-        {\r
-            var importTypeCat = new TypeCatalog(typeof(PartImporter<SimpleExport>));\r
-            var aggCatalog = new AggregateCatalog(importTypeCat);\r
-            var container = ContainerFactory.Create(aggCatalog);\r
-            var exports = container.GetExports<PartImporter<SimpleExport>>();\r
-            Assert.AreEqual(0, exports.Count());\r
-\r
-            aggCatalog.Catalogs.Add(new TypeCatalog(typeof(SimpleExport)));\r
-\r
-            exports = container.GetExports<PartImporter<SimpleExport>>();\r
-            Assert.AreEqual(1, exports.Count());\r
-        }\r
-    }\r
-}\r
-\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RecompositionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RecompositionTests.cs
deleted file mode 100644 (file)
index 1ec3610..0000000
+++ /dev/null
@@ -1,565 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.UnitTesting;\r
-using System.Linq;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class RecompositionTests\r
-    {\r
-        public class Class_OptIn_AllowRecompositionImports\r
-        {\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_OptIn_AllowRecomposition()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var importer = new Class_OptIn_AllowRecompositionImports();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-\r
-            // Initial compose Value should be 21\r
-            Assert.AreEqual(21, importer.Value);\r
-\r
-            // Recompose Value to be 42\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value, "Value should have changed!");\r
-        }\r
-\r
-        public class Class_OptOut_AllowRecompositionImports\r
-        {\r
-            [Import("Value", AllowRecomposition = false)]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_OptOut_AllowRecomposition()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var importer = new Class_OptOut_AllowRecompositionImports();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-\r
-            // Initial compose Value should be 21\r
-            Assert.AreEqual(21, importer.Value);\r
-\r
-            // Reset value to ensure it doesn't get set to same value again\r
-            importer.Value = -21; \r
-\r
-            // Recompose Value to be 42\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            // After rejection batch failures throw ChangeRejectedException to indicate that\r
-            // the failure did not affect the container\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PreventedByExistingImport, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-\r
-            Assert.AreEqual(-21, importer.Value, "Value should NOT have changed!");\r
-        }\r
-\r
-        public class Class_Default_AllowRecompositionImports\r
-        {\r
-            [Import("Value")]\r
-            public int Value { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_Default_AllowRecomposition()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var importer = new Class_Default_AllowRecompositionImports();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-\r
-            // Initial compose Value should be 21\r
-            Assert.AreEqual(21, importer.Value);\r
-\r
-            // Reset value to ensure it doesn't get set to same value again\r
-            importer.Value = -21; \r
-\r
-            // Recompose Value to be 42\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            // After rejection batch failures throw ChangeRejectedException to indicate that\r
-            // the failure did not affect the container\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PreventedByExistingImport, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-\r
-            Assert.AreEqual(-21, importer.Value, "Value should NOT have changed!");\r
-        }\r
-\r
-        public class Class_BothOptInAndOptOutRecompositionImports\r
-        {\r
-            [Import("Value", AllowRecomposition = true)]\r
-            public int RecomposableValue { get; set; }\r
-\r
-            [Import("Value", AllowRecomposition = false)]\r
-            public int NonRecomposableValue { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_BothOptInAndOptOutRecomposition()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var importer = new Class_BothOptInAndOptOutRecompositionImports();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var valueKey = batch.AddExportedValue("Value", 21);\r
-            container.Compose(batch);\r
-\r
-            // Initial compose values should be 21\r
-            Assert.AreEqual(21, importer.RecomposableValue);\r
-            Assert.AreEqual(21, importer.NonRecomposableValue);\r
-\r
-            // Reset value to ensure it doesn't get set to same value again\r
-            importer.NonRecomposableValue = -21;\r
-            importer.RecomposableValue = -21;\r
-\r
-            // Recompose Value to be 42\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(valueKey);\r
-            batch.AddExportedValue("Value", 42);\r
-            // After rejection batch failures throw ChangeRejectedException to indicate that\r
-            // the failure did not affect the container\r
-            CompositionAssert.ThrowsChangeRejectedError(ErrorId.ImportEngine_PreventedByExistingImport, () =>\r
-            {\r
-                container.Compose(batch);\r
-            });\r
-\r
-            Assert.AreEqual(-21, importer.NonRecomposableValue, "Value should NOT have changed!");\r
-            // The batch rejection means that the recomposable value shouldn't change either\r
-            Assert.AreEqual(-21, importer.RecomposableValue, "Value should NOT have changed!");\r
-        }\r
-\r
-        public class Class_MultipleOptInRecompositionImportsWithDifferentContracts\r
-        {\r
-            [Import("Value1", AllowRecomposition = true)]\r
-            public int Value1 { get; set; }\r
-\r
-            [Import("Value2", AllowRecomposition = true)]\r
-            public int Value2 { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Import_OptInRecomposition_Multlple()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var importer = new Class_MultipleOptInRecompositionImportsWithDifferentContracts();\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddPart(importer);\r
-            var value1Key = batch.AddExportedValue("Value1", 21);\r
-            var value2Key = batch.AddExportedValue("Value2", 23);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(21, importer.Value1);\r
-            Assert.AreEqual(23, importer.Value2);\r
-\r
-            // Reset value to ensure it doesn't get set to same value again\r
-            importer.Value1 = -21;\r
-            importer.Value2 = -23;\r
-\r
-            // Recompose Value to be 42\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(value1Key);\r
-            batch.AddExportedValue("Value1", 42);\r
-            container.Compose(batch);\r
-\r
-            Assert.AreEqual(42, importer.Value1, "Value should have changed!");\r
-            Assert.AreEqual(-23, importer.Value2, "Value should NOT have changed because Value2 contract should not be updated.");\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class MyName\r
-        {\r
-            public MyName(string name)\r
-            {\r
-                this.Name = name;\r
-            }\r
-\r
-            [Export("Name")]\r
-            public string Name { get; private set; }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class Spouse\r
-        {\r
-            public Spouse(string name)\r
-            {\r
-                this.Name = name;\r
-            }\r
-\r
-            [Export("Friend")]\r
-            [ExportMetadata("Relationship", "Wife")]\r
-            public string Name { get; private set; }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class Child\r
-        {\r
-            public Child(string name)\r
-            {\r
-                this.Name = name;\r
-            }\r
-\r
-            [Export("Child")]\r
-            public string Name { get; private set; }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class Job\r
-        {\r
-            public Job(string name)\r
-            {\r
-                this.Name = name;\r
-            }\r
-\r
-            [Export("Job")]\r
-            public string Name { get; private set; }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class Friend\r
-        {\r
-            public Friend(string name)\r
-            {\r
-                this.Name = name;\r
-            }\r
-\r
-            [Export("Friend")]\r
-            public string Name { get; private set; }\r
-        }\r
-\r
-        public interface IRelationshipView\r
-        {\r
-            string Relationship { get; }\r
-        }\r
-\r
-        [PartNotDiscoverable]\r
-        public class Me\r
-        {\r
-            [Import("Name", AllowRecomposition = true)]\r
-            public string Name { get; set; }\r
-\r
-            [Import("Job", AllowDefault = true, AllowRecomposition = true)]\r
-            public string Job { get; set; }\r
-\r
-            [ImportMany("Child")]\r
-            public string[] Children { get; set; }\r
-\r
-            [ImportMany("Friend")]\r
-            public Lazy<string, IRelationshipView>[] Relatives { get; set; }\r
-\r
-            [ImportMany("Friend", AllowRecomposition = true)]\r
-            public string[] Friends { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Recomposition_IntegrationTest()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var batch = new CompositionBatch();\r
-\r
-            var me = new Me();\r
-            batch.AddPart(me);\r
-            var namePart = batch.AddPart(new MyName("Blake"));\r
-            batch.AddPart(new Spouse("Barbara"));\r
-            batch.AddPart(new Friend("Steve"));\r
-            batch.AddPart(new Friend("Joyce"));\r
-            container.Compose(batch);\r
-            Assert.AreEqual(me.Name, "Blake", "Name in initial composition incorrect");\r
-            Assert.AreEqual(me.Job, null, "Job should have the default value");\r
-            Assert.AreEqual(me.Friends.Length, 3, "Number of friends in initial composition incorrect");\r
-            Assert.AreEqual(me.Relatives.Length, 1, "Number of relatives in initial composition incorrect");\r
-            Assert.AreEqual(me.Children.Length, 0, "Number of children in initial composition incorrect");\r
-\r
-            // Can only have one name\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.ComposeParts(new MyName("Blayke")));\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddPart(new MyName("Blayke"));\r
-            batch.RemovePart(namePart);\r
-            container.Compose(batch);\r
-            Assert.AreEqual(me.Name, "Blayke", "Name after recomposition incorrect");\r
-\r
-            batch = new CompositionBatch();\r
-            var jobPart = batch.AddPart(new Job("Architect"));\r
-            container.Compose(batch);\r
-            Assert.AreEqual(me.Job, "Architect", "Job after recomposition incorrect");\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddPart(new Job("Chimney Sweep"));\r
-            container.Compose(batch);\r
-            Assert.IsTrue(me.Job == null, "More than one of an optional import should result in the default value");\r
-\r
-            batch = new CompositionBatch();\r
-            batch.RemovePart(jobPart);\r
-            container.Compose(batch);\r
-            Assert.AreEqual(me.Job, "Chimney Sweep", "Job after re-recomposition incorrect");\r
-\r
-            batch = new CompositionBatch();\r
-\r
-            // Can only have one spouse because they aren't recomposable\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.ComposeParts(new Spouse("Cameron")));\r
-\r
-            Assert.AreEqual(me.Relatives.Length, 1, "Number of relatives shouldn't be affected by rolled back composition");\r
-\r
-            batch = new CompositionBatch();\r
-            batch.AddPart(new Friend("Graham"));\r
-            container.Compose(batch);\r
-            Assert.AreEqual(me.Friends.Length, 4, "Number of friends after recomposition incorrect");\r
-            Assert.AreEqual(me.Relatives.Length, 1, "Number of relatives shouldn't be affected by rolled back composition");\r
-        }\r
-\r
-        public class FooWithOptionalImport\r
-        {\r
-            private FooWithSimpleImport _optionalImport;\r
-\r
-            [Import(AllowDefault=true, AllowRecomposition=true)]\r
-            public FooWithSimpleImport OptionalImport\r
-            {\r
-                get\r
-                {\r
-                    return this._optionalImport;\r
-                }\r
-                set\r
-                {\r
-                    if (value != null)\r
-                    {\r
-                        this._optionalImport = value;\r
-\r
-                        Assert.IsTrue(!string.IsNullOrEmpty(this._optionalImport.SimpleValue), "Value should have it's imports satisfied");\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        [Export]\r
-        public class FooWithSimpleImport\r
-        {\r
-            [Import("FooSimpleImport")]\r
-            public string SimpleValue { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void PartsShouldHaveImportsSatisfiedBeforeBeingUsedToSatisfyRecomposableImports()\r
-        {\r
-            var container = new CompositionContainer();\r
-            var fooOptional = new FooWithOptionalImport();\r
-            \r
-            container.ComposeParts(fooOptional);\r
-            container.ComposeExportedValue<string>("FooSimpleImport", "NotNullOrEmpty");\r
-            container.ComposeParts(new FooWithSimpleImport());\r
-\r
-            Assert.IsTrue(!string.IsNullOrEmpty(fooOptional.OptionalImport.SimpleValue));\r
-        }\r
-\r
-\r
-        [Export]\r
-        public class RootImportRecomposable\r
-        {\r
-            [Import(AllowDefault = true, AllowRecomposition = true)]\r
-            public NonSharedImporter Importer { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class NonSharedImporter\r
-        {\r
-            [Import]\r
-            public SimpleImport Import { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class RootImporter\r
-        {\r
-            [Import]\r
-            public SimpleImport Import { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class SimpleImport\r
-        {\r
-            public int Property { get { return 42; } }\r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(733533)]\r
-        public void RemoveCatalogWithNonSharedPartWithRequiredImport()\r
-        {\r
-            var typeCatalog = new TypeCatalog(typeof(NonSharedImporter), typeof(SimpleImport));\r
-            var aggCatalog = new AggregateCatalog();\r
-            var container = new CompositionContainer(aggCatalog);\r
-\r
-            aggCatalog.Catalogs.Add(typeCatalog);\r
-            aggCatalog.Catalogs.Add(new TypeCatalog(typeof(RootImportRecomposable)));\r
-\r
-            var rootExport = container.GetExport<RootImportRecomposable>();\r
-            var root = rootExport.Value;\r
-\r
-            Assert.AreEqual(42, root.Importer.Import.Property);\r
-\r
-            aggCatalog.Catalogs.Remove(typeCatalog);\r
-\r
-            Assert.IsNull(root.Importer);            \r
-        }\r
-\r
-        [TestMethod]\r
-        [Ignore]\r
-        [WorkItem(734123)]\r
-        public void GetExportResultShouldBePromise()\r
-        {\r
-            var typeCatalog = new TypeCatalog(typeof(RootImporter), typeof(SimpleImport));\r
-            var aggCatalog = new AggregateCatalog();\r
-            var container = new CompositionContainer(aggCatalog);\r
-\r
-            aggCatalog.Catalogs.Add(typeCatalog);\r
-\r
-            var root = container.GetExport<RootImporter>();\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                aggCatalog.Catalogs.Remove(typeCatalog)\r
-            );\r
-\r
-            var value = root.Value;\r
-            Assert.AreEqual(42, value.Import.Property);\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(789269)]\r
-        public void TestRemovingAndReAddingMultipleDefinitionsFromCatalog()\r
-        {\r
-            var fixedParts = new TypeCatalog(typeof(RootMultipleImporter), typeof(ExportedService));\r
-            var changingParts = new TypeCatalog(typeof(Exporter1), typeof(Exporter2));\r
-            var catalog = new AggregateCatalog();\r
-            catalog.Catalogs.Add(fixedParts);\r
-            catalog.Catalogs.Add(changingParts);\r
-\r
-            var container = new CompositionContainer(catalog);\r
-\r
-            var root = container.GetExport<RootMultipleImporter>().Value;\r
-\r
-            Assert.AreEqual(2, root.Imports.Length);\r
-\r
-            catalog.Catalogs.Remove(changingParts);\r
-\r
-            Assert.AreEqual(0, root.Imports.Length);\r
-\r
-            catalog.Catalogs.Add(changingParts);\r
-\r
-            Assert.AreEqual(2, root.Imports.Length);\r
-        }\r
-\r
-        [Export]\r
-        public class RootMultipleImporter\r
-        {\r
-            [ImportMany(AllowRecomposition=true)]\r
-            public IExportedInterface[] Imports { get; set; }\r
-        }\r
-\r
-        public interface IExportedInterface\r
-        {\r
-\r
-        }\r
-\r
-        [Export(typeof(IExportedInterface))]\r
-        public class Exporter1 : IExportedInterface\r
-        {\r
-            [Import]\r
-            public ExportedService Service { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IExportedInterface))]\r
-        public class Exporter2 : IExportedInterface\r
-        {\r
-            [Import]\r
-            public ExportedService Service { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class ExportedService\r
-        {\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(762215)]\r
-        [Ignore]\r
-        public void TestPartCreatorResurrection()\r
-        {\r
-            var container = new CompositionContainer(new TypeCatalog(typeof(NonDisposableImportsDisposable), typeof(PartImporter<NonDisposableImportsDisposable>)));\r
-            var exports = container.GetExports<PartImporter<NonDisposableImportsDisposable>>();\r
-            Assert.AreEqual(0, exports.Count());\r
-            container.ComposeParts(new DisposablePart());\r
-            exports = container.GetExports<PartImporter<NonDisposableImportsDisposable>>();\r
-            Assert.AreEqual(1, exports.Count());\r
-        }\r
-\r
-        [Export]\r
-        public class PartImporter<PartType>\r
-        {\r
-            [Import]\r
-            public PartType Creator { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class NonDisposableImportsDisposable\r
-        {\r
-            [Import]\r
-            public DisposablePart Part { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class Part\r
-        {\r
-\r
-        }\r
-        [Export]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class DisposablePart : Part, IDisposable\r
-        {\r
-            public bool Disposed { get; private set; }\r
-            public void Dispose()\r
-            {\r
-                Disposed = true;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RejectionTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RejectionTests.cs
deleted file mode 100644 (file)
index 9efdc6c..0000000
+++ /dev/null
@@ -1,505 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.UnitTesting;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class RejectionTests\r
-    {\r
-        public interface IExtension\r
-        {\r
-            int Id { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class MyImporter\r
-        {\r
-            [ImportMany(AllowRecomposition = true)]\r
-            public IExtension[] Extensions { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IExtension))]\r
-        public class Extension1 : IExtension\r
-        {\r
-            [Import("IExtension.IdValue")]\r
-            public int Id { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IExtension))]\r
-        public class Extension2 : IExtension\r
-        {\r
-            [Import("IExtension.IdValue2")]\r
-            public int Id { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_ExtensionLightUp_AddedViaBatch()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(MyImporter),\r
-                typeof(Extension1),\r
-                typeof(Extension2));\r
-\r
-            var importer = container.GetExportedValue<MyImporter>();\r
-\r
-            Assert.AreEqual(0, importer.Extensions.Length, "Should have 0 extensions");\r
-\r
-            container.ComposeExportedValue<int>("IExtension.IdValue", 10);\r
-\r
-            Assert.AreEqual(1, importer.Extensions.Length, "Should have 1 extension");\r
-            Assert.AreEqual(10, importer.Extensions[0].Id);\r
-\r
-            container.ComposeExportedValue<int>("IExtension.IdValue2", 20);\r
-\r
-            Assert.AreEqual(2, importer.Extensions.Length, "Should have 2 extension");\r
-            Assert.AreEqual(10, importer.Extensions[0].Id);\r
-            Assert.AreEqual(20, importer.Extensions[1].Id);\r
-        }\r
-\r
-        public class ExtensionValues\r
-        {\r
-            [Export("IExtension.IdValue")]\r
-            public int Value = 10;\r
-\r
-            [Export("IExtension.IdValue2")]\r
-            public int Value2 = 20;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_ExtensionLightUp_AddedViaCatalog()\r
-        {\r
-            var ext1Cat = CatalogFactory.CreateAttributed(typeof(Extension1));\r
-            var ext2Cat = CatalogFactory.CreateAttributed(typeof(Extension2));\r
-            var hostCat = CatalogFactory.CreateAttributed(typeof(MyImporter));\r
-            var valueCat = CatalogFactory.CreateAttributed(typeof(ExtensionValues));\r
-\r
-            var catalog = new AggregateCatalog();\r
-            catalog.Catalogs.Add(hostCat);\r
-\r
-            var container = ContainerFactory.Create(catalog);\r
-\r
-            var importer = container.GetExportedValue<MyImporter>();\r
-\r
-            Assert.AreEqual(0, importer.Extensions.Length, "Should have 0 extensions");\r
-\r
-            catalog.Catalogs.Add(ext1Cat);\r
-\r
-            Assert.AreEqual(0, importer.Extensions.Length, "Should have 0 extensions after ext1 added without dependency");\r
-\r
-            catalog.Catalogs.Add(ext2Cat);\r
-\r
-            Assert.AreEqual(0, importer.Extensions.Length, "Should have 0 extensions after ext2 added without dependency");\r
-\r
-            catalog.Catalogs.Add(valueCat);\r
-\r
-            Assert.AreEqual(2, importer.Extensions.Length, "Should have 2 extension");\r
-            Assert.AreEqual(10, importer.Extensions[0].Id);\r
-            Assert.AreEqual(20, importer.Extensions[1].Id);\r
-        }\r
-\r
-        public interface IMissing { }\r
-        public interface ISingle { }\r
-        public interface IMultiple { }\r
-        public interface IConditional { }\r
-        public class SingleImpl : ISingle { }\r
-        public class MultipleImpl : IMultiple { }\r
-\r
-        public class NoImportPart\r
-        {\r
-            public NoImportPart()\r
-            {\r
-                SingleExport = new SingleImpl();\r
-                MultipleExport1 = new MultipleImpl();\r
-                MultipleExport2 = new MultipleImpl();\r
-            }\r
-\r
-            [Export]\r
-            public ISingle SingleExport { private set; get; }\r
-\r
-            [Export]\r
-            public IMultiple MultipleExport1 { private set; get; }\r
-\r
-            [Export]\r
-            public IMultiple MultipleExport2 { private set; get; }\r
-        }\r
-\r
-        [Export]\r
-        public class Needy\r
-        {\r
-            public Needy() { }\r
-\r
-            [Import]\r
-            public ISingle SingleImport { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_Resurrection()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Needy));\r
-\r
-            var exports1 = container.GetExportedValues<Needy>();\r
-\r
-            Assert.AreEqual(0, exports1.Count(), "Catalog entry should be rejected");\r
-\r
-            container.ComposeParts(new NoImportPart());\r
-\r
-            var exports2 = container.GetExportedValues<Needy>();\r
-            Assert.AreEqual(1, exports2.Count(), "Catalog entry should be ressurrected");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_BatchSatisfiesBatch()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var needy = new Needy();\r
-            container.ComposeParts(needy, new NoImportPart());\r
-            Assert.IsInstanceOfType(needy.SingleImport, typeof(SingleImpl), "Import not satisifed as expected");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_BatchSatisfiesBatchReversed()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-            var needy = new Needy();\r
-            container.ComposeParts(new NoImportPart(), needy);\r
-            Assert.IsInstanceOfType(needy.SingleImport, typeof(SingleImpl), "Import not satisifed as expected");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_CatalogSatisfiesBatch()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(NoImportPart));\r
-            var needy = new Needy();\r
-            container.ComposeParts(needy);\r
-            Assert.IsInstanceOfType(needy.SingleImport, typeof(SingleImpl), "Import not satisifed as expected");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_TransitiveDependenciesSatisfied()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Needy), typeof(NoImportPart));\r
-            var needy = container.GetExportedValue<Needy>();\r
-            Assert.IsNotNull(needy);\r
-            Assert.IsInstanceOfType(needy.SingleImport, typeof(SingleImpl), "Import not satisifed as expected");\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_TransitiveDependenciesUnsatisfied_ShouldThrowCardinalityMismatch()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Needy), typeof(MissingImportPart));\r
-\r
-            ExceptionAssert.Throws<ImportCardinalityMismatchException>(() =>\r
-                container.GetExportedValue<Needy>());\r
-        }\r
-\r
-        public class MissingImportPart : NoImportPart\r
-        {\r
-            [Import]\r
-            public IMissing MissingImport { set; get; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_BatchRevert()\r
-        {\r
-            var container = ContainerFactory.Create();\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.ComposeParts(new MissingImportPart()));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_DefendPromisesOnceMade()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Needy));\r
-\r
-            var addBatch = new CompositionBatch();\r
-            var removeBatch = new CompositionBatch();\r
-            var addedPart = addBatch.AddPart(new NoImportPart());\r
-            removeBatch.RemovePart(addedPart);\r
-\r
-            // Add then remove should be fine as long as exports aren't used yet.\r
-            container.Compose(addBatch);\r
-            container.Compose(removeBatch);\r
-\r
-            // Add the dependencies\r
-            container.Compose(addBatch);\r
-\r
-            // Retrieve needy which uses an export from addedPart\r
-            var export = container.GetExportedValue<Needy>();\r
-\r
-            // Should not be able to remove the addedPart because someone depends on it.\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.Compose(removeBatch));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Rejection_DefendPromisesLazily()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Needy));\r
-\r
-            // Add the missing dependency for Needy\r
-            container.ComposeParts(new NoImportPart());\r
-\r
-            // This change should succeed since the component "Needy" hasn't been fully composed\r
-            // and one way of satisfying its needs is as good ask another\r
-            var export = container.GetExport<Needy>();\r
-\r
-            // Cannot add another import because it would break existing promised compositions\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.ComposeParts(new NoImportPart()));\r
-\r
-            // Instansitate the object\r
-            var needy = export.Value;\r
-\r
-            // Cannot add another import because it would break existing compositions\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.ComposeParts(new NoImportPart()));\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Rejection_SwitchPromiseFromManualToCatalog()\r
-        {\r
-            // This test shows how the priority list in the AggregateCatalog can actually play with \r
-            // the rejection work. Until the actual object is actually pulled on and satisfied the \r
-            // promise can be moved around even for not-recomposable imports but once the object is \r
-            // pulled on it is fixed from that point on.\r
-\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(Needy), typeof(NoImportPart));\r
-\r
-            // Add the missing dependency for Needy\r
-            container.ComposeParts(new NoImportPart());\r
-\r
-            // This change should succeed since the component "Needy" hasn't been fully composed\r
-            // and one way of satisfying its needs is as good as another\r
-            var export = container.GetExport<Needy>();\r
-\r
-            // Adding more exports doesn't fail because we push the promise to use the NoImportPart from the catalog\r
-            // using the priorities from the AggregateExportProvider\r
-            container.ComposeParts(new NoImportPart());\r
-\r
-            // Instansitate the object\r
-            var needy = export.Value;\r
-\r
-            // Cannot add another import because it would break existing compositions\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.ComposeParts(new NoImportPart()));\r
-        }\r
-\r
-        public interface ILoopA { }\r
-        public interface ILoopB { }\r
-\r
-        [Export(typeof(ILoopA))]\r
-        public class LoopA1 : ILoopA\r
-        {\r
-            [Import]\r
-            public ILoopB LoopB { set; get; }\r
-        }\r
-\r
-        [Export(typeof(ILoopA))]\r
-        public class LoopA2 : ILoopA\r
-        {\r
-            [Import]\r
-            public ILoopB LoopB { set; get; }\r
-        }\r
-\r
-        [Export(typeof(ILoopB))]\r
-        public class LoopB1 : ILoopB\r
-        {\r
-            [Import]\r
-            public ILoopA LoopA { set; get; }\r
-        }\r
-\r
-        [Export(typeof(ILoopB))]\r
-        public class LoopB2 : ILoopB\r
-        {\r
-            [Import]\r
-            public ILoopA LoopA { set; get; }\r
-        }\r
-\r
-        // This is an interesting situation.  There are several possible self-consistent outcomes:\r
-        // - All parts involved in the loop are rejected\r
-        // - A consistent subset are not rejected (exactly one of LoopA1/LoopA2 and one of LoopB1/LoopB2\r
-        //\r
-        // Both have desireable and undesirable characteristics.  The first case is non-discriminatory but\r
-        // rejects more parts than are necessary, the second minimizes rejection but must choose a subset\r
-        // on somewhat arbitary grounds.\r
-        [TestMethod]\r
-        public void Rejection_TheClemensLoop()\r
-        {\r
-            var catalog = new TypeCatalog(new Type[] { typeof(LoopA1), typeof(LoopA2), typeof(LoopB1), typeof(LoopB2) });\r
-            var container = new CompositionContainer(catalog);\r
-            var exportsA = container.GetExportedValues<ILoopA>();\r
-            var exportsB = container.GetExportedValues<ILoopB>();\r
-\r
-            // These assertions would prove solution one\r
-            Assert.AreEqual(0, exportsA.Count(), "Catalog ILoopA entries should be rejected");\r
-            Assert.AreEqual(0, exportsB.Count(), "Catalog ILoopB entries should be rejected");\r
-\r
-            // These assertions would prove solution two\r
-            //Assert.AreEqual(1, exportsA.Count, "Only noe ILoopA entry should not be rejected");\r
-            //Assert.AreEqual(1, exportsB.Count, "Only noe ILoopB entry should not be rejected");\r
-        }\r
-\r
-        public interface IWorkItem\r
-        {\r
-            string Id { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class AllWorkItems\r
-        {\r
-            [ImportMany(AllowRecomposition = true)]\r
-            public Lazy<IWorkItem>[] WorkItems { get; set; }\r
-        }\r
-\r
-        [Export(typeof(IWorkItem))]\r
-        public class WorkItem : IWorkItem\r
-        {\r
-            [Import("WorkItem.Id", AllowRecomposition = true)]\r
-            public string Id { get; set; }\r
-        }\r
-\r
-        public class Ids\r
-        {\r
-            [Export("WorkItem.Id")]\r
-            public string Id = "MyId";\r
-\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AppliedStateNotCompleteedYet()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(AllWorkItems));\r
-\r
-            container.ComposeExportedValue<string>("WorkItem.Id", "A");\r
-\r
-            var workItems = container.GetExportedValue<AllWorkItems>();\r
-\r
-            Assert.AreEqual(0, workItems.WorkItems.Length);\r
-\r
-            container.ComposeParts(new WorkItem());\r
-\r
-            Assert.AreEqual(1, workItems.WorkItems.Length);\r
-            Assert.AreEqual("A", workItems.WorkItems[0].Value.Id);\r
-        }\r
-\r
-        [Export]\r
-        public class ClassWithMissingImport\r
-        {\r
-            [Import]\r
-            private string _importNotFound = null;\r
-        }\r
-\r
-        [TestMethod]\r
-        public void AppliedStateStored_ShouldRevertStateOnFailure()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(AllWorkItems), typeof(WorkItem), typeof(Ids));\r
-\r
-            var workItems = container.GetExportedValue<AllWorkItems>();\r
-\r
-            Assert.AreEqual(1, workItems.WorkItems.Length);\r
-\r
-            var batch = new CompositionBatch();\r
-\r
-            batch.AddExportedValue("WorkItem.Id", "B");\r
-            batch.AddPart(new ClassWithMissingImport());\r
-\r
-            ExceptionAssert.Throws<ChangeRejectedException>(() =>\r
-                container.Compose(batch));\r
-\r
-            Assert.AreEqual("MyId", workItems.WorkItems[0].Value.Id);\r
-        }\r
-\r
-        [Export]\r
-        public class OptionalImporter\r
-        {\r
-            [Import(AllowDefault = true)]\r
-            public ClassWithMissingImport Import { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        public void OptionalImportWithMissingDependency_ShouldRejectAndComposeFine()\r
-        {\r
-            var container = ContainerFactory.CreateWithAttributedCatalog(typeof(OptionalImporter), typeof(ClassWithMissingImport));\r
-\r
-            var importer = container.GetExportedValue<OptionalImporter>();\r
-\r
-            Assert.IsNull(importer.Import);\r
-        }\r
-\r
-        [Export]\r
-        public class PartA\r
-        {\r
-            [Import(AllowDefault = true, AllowRecomposition = true)]\r
-            public PartB ImportB { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class PartB\r
-        {\r
-            [Import]\r
-            public PartC ImportC { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class PartC\r
-        {\r
-            [Import]\r
-            public PartB ImportB { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(684510)]\r
-        public void PartAOptionalDependsOnPartB_PartBGetAddedLater()\r
-        {\r
-            var container = new CompositionContainer(new TypeCatalog(typeof(PartC), typeof(PartA)));\r
-            var partA = container.GetExportedValue<PartA>();\r
-\r
-            Assert.IsNull(partA.ImportB);\r
-\r
-            var partB = new PartB();\r
-            container.ComposeParts(partB);\r
-\r
-            Assert.AreEqual(partA.ImportB, partB);\r
-            Assert.IsNotNull(partB.ImportC);\r
-        }\r
-\r
-        [Export]\r
-        public class PartA2\r
-        {\r
-            [Import(AllowDefault = true, AllowRecomposition = true)]\r
-            public PartB ImportB { get; set; }\r
-\r
-            [Import(AllowDefault = true, AllowRecomposition = true)]\r
-            public PartC ImportC { get; set; }\r
-        }\r
-\r
-        [TestMethod]\r
-        [WorkItem(684510)]\r
-        public void PartAOptionalDependsOnPartBAndPartC_PartCGetRecurrected()\r
-        {\r
-            var container = new CompositionContainer(new TypeCatalog(typeof(PartA2), typeof(PartB)));\r
-            var partA = container.GetExportedValue<PartA2>();\r
-\r
-            Assert.IsNull(partA.ImportB);\r
-            Assert.IsNull(partA.ImportC);\r
-\r
-            var partC = new PartC();\r
-            container.ComposeParts(partC);\r
-\r
-            Assert.AreEqual(partA.ImportB, partC.ImportB);\r
-            Assert.AreEqual(partA.ImportC, partC);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RequiredCreationPolicyTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/Integration/RequiredCreationPolicyTests.cs
deleted file mode 100644 (file)
index 742b4c8..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Tests.Integration\r
-{\r
-    [TestClass]\r
-    public class RequiredCreationPolicyTests\r
-    {\r
-        // Matrix that details which policy to use for a given part to satisfy a given import.\r
-        //                   Part.Any   Part.Shared  Part.NonShared\r
-        // Import.Any        Shared     Shared       NonShared\r
-        // Import.Shared     Shared     Shared       N/A\r
-        // Import.NonShared  NonShared  N/A          NonShared\r
-\r
-        public interface ICreationPolicyExport\r
-        {\r
-\r
-        }\r
-\r
-        [Export(typeof(ICreationPolicyExport))]\r
-        public class CreationPolicyAnyExportImplicit : ICreationPolicyExport\r
-        {\r
-\r
-        }\r
-\r
-        [Export(typeof(ICreationPolicyExport))]\r
-        [PartCreationPolicy(CreationPolicy.Any)]\r
-        public class CreationPolicyAnyExportExplicit : ICreationPolicyExport\r
-        {\r
-\r
-        }\r
-\r
-        [Export(typeof(ICreationPolicyExport))]\r
-        [PartCreationPolicy(CreationPolicy.Shared)]\r
-        public class CreationPolicySharedExport : ICreationPolicyExport\r
-        {\r
-\r
-        }\r
-\r
-        [Export(typeof(ICreationPolicyExport))]\r
-        [PartCreationPolicy(CreationPolicy.NonShared)]\r
-        public class CreationPolicyNonSharedExport : ICreationPolicyExport\r
-        {\r
-\r
-        }\r
-\r
-        [Export]\r
-        public class RequiredAnyImporterImplicit\r
-        {\r
-            [ImportMany]\r
-            public IEnumerable<ICreationPolicyExport> Exports { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class RequiredAnyImporterExplicit\r
-        {\r
-            [ImportMany(RequiredCreationPolicy = CreationPolicy.Any)]\r
-            public IEnumerable<ICreationPolicyExport> Exports { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class RequiredSharedImporter\r
-        {\r
-            [ImportMany(RequiredCreationPolicy = CreationPolicy.Shared)]\r
-            public IEnumerable<ICreationPolicyExport> Exports { get; set; }\r
-        }\r
-\r
-        [Export]\r
-        public class RequiredNonSharedImporter\r
-        {\r
-            [ImportMany(RequiredCreationPolicy = CreationPolicy.NonShared)]\r
-            public IEnumerable<ICreationPolicyExport> Exports { get; set; }\r
-        }\r
-\r
-        private static CompositionContainer CreateDefaultContainer()\r
-        {\r
-            return ContainerFactory.CreateWithAttributedCatalog(\r
-                typeof(ICreationPolicyExport),\r
-\r
-                typeof(CreationPolicyAnyExportImplicit),\r
-                typeof(CreationPolicyAnyExportExplicit),\r
-                typeof(CreationPolicySharedExport),\r
-                typeof(CreationPolicyNonSharedExport),\r
-                \r
-                typeof(RequiredAnyImporterImplicit),\r
-                typeof(RequiredAnyImporterExplicit),\r
-                typeof(RequiredSharedImporter),\r
-                typeof(RequiredNonSharedImporter));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RequiredAnyImporterImplicit_ShouldIncludeAll()\r
-        {\r
-            var container = CreateDefaultContainer();\r
-\r
-            var importer = container.GetExportedValue<RequiredAnyImporterImplicit>();\r
-\r
-            EnumerableAssert.AreEqual(\r
-                importer.Exports.Select(obj => obj.GetType()),\r
-                typeof(CreationPolicyAnyExportImplicit),\r
-                typeof(CreationPolicyAnyExportExplicit),\r
-                typeof(CreationPolicySharedExport),\r
-                typeof(CreationPolicyNonSharedExport));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RequiredAnyImporterExplicit_ShouldIncludeAll()\r
-        {\r
-            var container = CreateDefaultContainer();\r
-\r
-            var importer = container.GetExportedValue<RequiredAnyImporterExplicit>();\r
-\r
-            EnumerableAssert.AreEqual(\r
-                importer.Exports.Select(obj => obj.GetType()),\r
-                typeof(CreationPolicyAnyExportImplicit),\r
-                typeof(CreationPolicyAnyExportExplicit),\r
-                typeof(CreationPolicySharedExport),\r
-                typeof(CreationPolicyNonSharedExport));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RequiredSharedImporter_ShouldFilterNonShared()\r
-        {\r
-            var container = CreateDefaultContainer();\r
-\r
-            var importer = container.GetExportedValue<RequiredSharedImporter>();\r
-\r
-            EnumerableAssert.AreEqual(\r
-                importer.Exports.Select(obj => obj.GetType()),\r
-                typeof(CreationPolicyAnyExportImplicit),\r
-                typeof(CreationPolicyAnyExportExplicit),\r
-                typeof(CreationPolicySharedExport));\r
-        }\r
-\r
-        [TestMethod]\r
-        public void RequiredNonSharedImporter_ShouldFilterShared()\r
-        {\r
-            var container = CreateDefaultContainer();\r
-\r
-            var importer = container.GetExportedValue<RequiredNonSharedImporter>();\r
-\r
-            EnumerableAssert.AreEqual(\r
-                importer.Exports.Select(obj => obj.GetType()),\r
-                typeof(CreationPolicyAnyExportImplicit),\r
-                typeof(CreationPolicyAnyExportExplicit),\r
-                typeof(CreationPolicyNonSharedExport));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/LazyOfTTMetadataTests.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/LazyOfTTMetadataTests.cs
deleted file mode 100644 (file)
index 8e22488..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Factories;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System\r
-{\r
-    [TestClass]\r
-    public class LazyOfTMetadataTests\r
-    {\r
-        public class MetadataView\r
-        {\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_MetadataViewSet()\r
-        {\r
-            MetadataView metadataView = new MetadataView();\r
-            var export = new Lazy<string, MetadataView>(() => "Value", metadataView, false);\r
-            Assert.AreEqual(metadataView, export.Metadata);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_MetadataViewSetToNull()\r
-        {\r
-            MetadataView metadataView = new MetadataView();\r
-            var export = new Lazy<string, MetadataView>(() => "Value", null, false);\r
-            Assert.IsNull(export.Metadata);\r
-        }\r
-\r
-\r
-        [TestMethod]\r
-        public void Constructor1_NullAsExportedValueGetterArgument_ShouldThrowArgumentNull()\r
-        {\r
-            ExceptionAssert.ThrowsArgument<ArgumentNullException>("valueFactory", () =>\r
-            {\r
-                new Lazy<string, MetadataView>((Func<string>)null, new MetadataView(), false);\r
-            });\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_FuncReturningAStringAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var export = new Lazy<string, MetadataView>(() => "Value", new MetadataView(), false);\r
-\r
-            Assert.AreEqual("Value", export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor1_FuncReturningNullAsExportedValueGetter_ShouldBeReturnedByGetExportedValue()\r
-        {\r
-            var export = new Lazy<string, MetadataView>(() => null, new MetadataView(), false);\r
-\r
-            Assert.IsNull(export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Value_ShouldCacheExportedValueGetter()\r
-        {\r
-            int count = 0;\r
-\r
-            var export = new Lazy<int, MetadataView>(() =>\r
-            {\r
-                count++;\r
-                return count;\r
-            }, new MetadataView(), false);\r
-\r
-            Assert.AreEqual(1, export.Value);\r
-            Assert.AreEqual(1, export.Value);\r
-            Assert.AreEqual(1, export.Value);\r
-        }\r
-        [TestMethod]\r
-        public void Constructor2_MetadataSet()\r
-        {\r
-            MetadataView metadataView = new MetadataView();\r
-            var export = new Lazy<object, MetadataView>(metadataView, false);\r
-\r
-            Assert.AreSame(metadataView, export.Metadata);\r
-            Assert.IsNotNull(export.Value);\r
-        }\r
-\r
-#if CLR40\r
-        [TestMethod]\r
-        public void Constructor3_MetadataSet()\r
-        {\r
-            MetadataView metadataView = new MetadataView();\r
-            var export = new Lazy<object, MetadataView>(metadataView, true);\r
-\r
-            Assert.AreSame(metadataView, export.Metadata);\r
-            Assert.IsNotNull(export.Value);\r
-        }\r
-\r
-        [TestMethod]\r
-        public void Constructor4_MetadataSet()\r
-        {\r
-            MetadataView metadataView = new MetadataView();\r
-            var export = new Lazy<string, MetadataView>(() => "Value",\r
-                metadataView, true);\r
-\r
-            Assert.AreSame(metadataView, export.Metadata);\r
-            Assert.IsNotNull(export.Value);\r
-        }\r
-#endif\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/.gitattributes
deleted file mode 100644 (file)
index 5c302f0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/ReflectionItemAssert.cs -crlf
-/TestUtilities.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/ReflectionItemAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/ReflectionItemAssert.cs
deleted file mode 100644 (file)
index 2fac3f6..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    internal static class ReflectionItemAssert\r
-    {\r
-        public static void AreSame(ReflectionItem expected, ReflectionItem actual)\r
-        {\r
-            switch (expected.ItemType)\r
-            {\r
-                case ReflectionItemType.Property:\r
-                {\r
-                    ReflectionProperty expectedProperty = (ReflectionProperty)expected;\r
-                    ReflectionProperty actualProperty = (ReflectionProperty)actual;\r
-\r
-                    ReflectionAssert.AreSame(expectedProperty.UnderlyingGetMethod, actualProperty.UnderlyingGetMethod);\r
-                    ReflectionAssert.AreSame(expectedProperty.UnderlyingSetMethod, actualProperty.UnderlyingSetMethod);\r
-                    return;\r
-                }\r
-\r
-                case ReflectionItemType.Parameter:\r
-                {\r
-                    ReflectionParameter expectedParameter = (ReflectionParameter)expected;\r
-                    ReflectionParameter actualParameter = (ReflectionParameter)actual;\r
-\r
-                    ReflectionAssert.AreSame(expectedParameter.UnderlyingParameter, actualParameter.UnderlyingParameter);\r
-                    return;\r
-                }\r
-\r
-                default:\r
-                {\r
-                    ReflectionMember expectedMember = (ReflectionMember)expected;\r
-                    ReflectionMember actualMember = (ReflectionMember)actual;\r
-\r
-                    ReflectionAssert.AreSame(expectedMember.UnderlyingMember, actualMember.UnderlyingMember);\r
-                    return;\r
-                }\r
-            }\r
-        }\r
-    }    \r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/TestUtilities.cs b/mcs/class/System.ComponentModel.Composition/Tests/ComponentModelUnitTest/System/UnitTesting/TestUtilities.cs
deleted file mode 100644 (file)
index 9da9f86..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Reflection;\r
-\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public static class TestUtilities\r
-    {\r
-\r
-        public static void CheckICollectionOfTConformance<T>(ICollection<T> list, T a, T b, T c, T d)\r
-        {\r
-            list.Clear();\r
-            EnumerableAssert.AreEqual(list);\r
-\r
-            Assert.IsFalse(list.IsReadOnly, "The list should not report being read-only for these tests to work");\r
-            Assert.IsFalse(list.Contains(a), "Contains should fail for anything when the collection is empty");\r
-            Assert.IsFalse(list.Remove(a), "Remove should fail on anything when the collection is empty");\r
-\r
-            list.Add(a);\r
-            EnumerableAssert.AreEqual(list, a);\r
-\r
-            list.Add(b);\r
-            EnumerableAssert.AreEqual(list, a, b);\r
-\r
-            list.Add(c);\r
-            EnumerableAssert.AreEqual(list, a, b, c);\r
-\r
-            list.Remove(b);\r
-            EnumerableAssert.AreEqual(list, a, c);\r
-\r
-            list.Remove(c);\r
-            EnumerableAssert.AreEqual(list, a);\r
-\r
-            list.Remove(a);\r
-            EnumerableAssert.AreEqual(list);\r
-\r
-            list.Add(a); list.Add(b); list.Add(c);\r
-\r
-            list.Clear();\r
-            EnumerableAssert.AreEqual(list);\r
-\r
-            list.Clear();\r
-            EnumerableAssert.AreEqual(list);\r
-\r
-            list.Add(d); list.Add(c); list.Add(b); list.Add(a);\r
-\r
-            T[] destination = new T[5];\r
-            list.CopyTo(destination, 0);\r
-            EnumerableAssert.AreEqual(destination, d, c, b, a, default(T));\r
-        }\r
-\r
-        public static void CheckIListOfTConformance<T>(IList<T> list, T a, T b, T c, T d)\r
-        {\r
-            CheckICollectionOfTConformance(list, a, b, c, d);\r
-\r
-            list.Clear();\r
-            list.Insert(0, d);\r
-            list.Insert(0, a);\r
-            list.Insert(1, c);\r
-            list.Insert(1, b);\r
-            CompareListContents(list, a, b, c, d);\r
-\r
-            list[1] = a;\r
-            CompareListContents(list, a, a, c, d);\r
-\r
-            list.RemoveAt(2);\r
-            CompareListContents(list, a, a, d);\r
-\r
-            Assert.AreEqual(2, list.IndexOf(d), "Expected indexof to return the correct location of {0}", d);\r
-            Assert.AreEqual(-1, list.IndexOf(b), "{0} should not be found in the collection", b);\r
-            Assert.AreEqual(-1, list.IndexOf(c), "{0} should not be found in the collection", c);\r
-        }\r
-\r
-        \r
-\r
-        public static void CompareListContents<T>(IList<T> list, params object[] values)\r
-        {\r
-            EnumerableAssert.AreEqual(list, values);\r
-\r
-            for (var index = 0; index < values.Length; index++)\r
-            {\r
-                Assert.AreEqual(values[index], list[index],\r
-                    "List should return true for Contains on every element, index {0}, length {1}", index, values[index]);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/.gitattributes
deleted file mode 100644 (file)
index f7d8287..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/AssemblyInfo.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/AssemblyInfo.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/AssemblyInfo.cs
deleted file mode 100644 (file)
index d043eef..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-[assembly: System.CLSCompliant(true)]\r
-[assembly: System.Reflection.AssemblyTitle("System.ComponentModel.Composition.UnitTestFramework")]\r
-[assembly: System.Reflection.AssemblyCopyright("(c) Microsoft Corporation. All rights reserved.")]\r
-[assembly: System.Reflection.AssemblyVersion("2010.02.11")]\r
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.ComponentModel.Composition.UnitTests")]\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/.gitattributes
deleted file mode 100644 (file)
index ed47a62..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/DisposableObject.cs -crlf
-/EnumExtensions.cs -crlf
-/ReferenceTracker.cs -crlf
-/TypeExtensions.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/.gitattributes
deleted file mode 100644 (file)
index e27dae9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/EnumerableExtensions.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/EnumerableExtensions.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/EnumerableExtensions.cs
deleted file mode 100644 (file)
index efb9c82..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    public static class EnumerableExtensions\r
-    {\r
-        public static int Count(this IEnumerable source)\r
-        {\r
-            int count = 0;\r
-\r
-            foreach (object o in source)\r
-            {\r
-                count++;\r
-            }\r
-\r
-            return count;\r
-        }\r
-\r
-        public static IEnumerable<T> ToEnumerable<T>(this IEnumerable source)\r
-        {\r
-            foreach (object value in source)\r
-            {\r
-                yield return (T)value;\r
-            }\r
-        }\r
-\r
-        public static List<object> ToList(this IEnumerable source)\r
-        {\r
-            var enumerable = source.ToEnumerable<object>();\r
-\r
-            return System.Linq.Enumerable.ToList(enumerable);\r
-        }\r
-\r
-        public static T AssertSingle<T>(this IEnumerable<T> source)\r
-        {\r
-            return AssertSingle(source, t => true);\r
-        }\r
-\r
-        public static T AssertSingle<T>(this IEnumerable<T> source, string message)\r
-        {\r
-            return AssertSingle(source, t => true, message);\r
-        }\r
-\r
-        public static T AssertSingle<T>(this IEnumerable<T> source, Func<T, bool> predicate)\r
-        {\r
-            return AssertSingle(source, predicate, "Expecting a single item matching the predicate in the collection.");\r
-        }\r
-\r
-        public static T AssertSingle<T>(this IEnumerable<T> source, Func<T, bool> predicate, string message)\r
-        {\r
-            int count = 0;\r
-            T ret = default(T);\r
-            foreach (T t in source)\r
-            {\r
-                if (predicate(t))\r
-                {\r
-                    count++;\r
-                    ret = t;\r
-                }\r
-            }\r
-\r
-            Assert.AreEqual(1, count, message);\r
-            return ret;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/Generic/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/Generic/.gitattributes
deleted file mode 100644 (file)
index f96646a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/DictionaryExtensions.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/Generic/DictionaryExtensions.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Collections/Generic/DictionaryExtensions.cs
deleted file mode 100644 (file)
index c994240..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    public static class DictionaryExtensions\r
-    {\r
-        public static bool ContainsAllKeys<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, IEnumerable<TKey> keys)\r
-        {\r
-            foreach (TKey key in keys)\r
-            {\r
-                if (!dictionary.ContainsKey(key))\r
-                    return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        public static bool DictionaryEquals<TKey, TValue>(this IDictionary<TKey, TValue> dictionary1, IDictionary<TKey, TValue> dictionary2)\r
-        {\r
-            if (dictionary1.Keys.Count != dictionary2.Keys.Count)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            foreach (KeyValuePair<TKey, TValue> kvp in dictionary1)\r
-            {\r
-                TValue value1 = kvp.Value;\r
-                TValue value2 = default(TValue);\r
-                if (!dictionary2.TryGetValue(kvp.Key, out value2))\r
-                {\r
-                    return false;\r
-                }\r
-\r
-                IDictionary<TKey, TValue> nestedDictionary1 = value1 as IDictionary<TKey, TValue>;\r
-                IDictionary<TKey, TValue> nestedDictionary2 = value1 as IDictionary<TKey, TValue>;\r
-\r
-                if ((nestedDictionary1 != null) && (nestedDictionary2 != null))\r
-                {\r
-                    if (!nestedDictionary1.DictionaryEquals(nestedDictionary2))\r
-                    {\r
-                        return false;\r
-                    }\r
-                }\r
-                else\r
-                {\r
-                    if (!(value1.Equals(value2)))\r
-                    {\r
-                        return false;\r
-                    }\r
-                }\r
-            }\r
-\r
-            return true;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/.gitattributes
deleted file mode 100644 (file)
index 8946265..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/ConstraintParser.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ConstraintParser.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ConstraintParser.cs
deleted file mode 100644 (file)
index 2a0a0d3..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq.Expressions;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public class ContraintParser\r
-    {\r
-        private static readonly PropertyInfo _exportDefinitionContractNameProperty = typeof(ExportDefinition).GetProperty("ContractName");\r
-        private static readonly PropertyInfo _exportDefinitionMetadataProperty = typeof(ExportDefinition).GetProperty("Metadata");\r
-        private static readonly MethodInfo _metadataContainsKeyMethod = typeof(IDictionary<string, object>).GetMethod("ContainsKey");\r
-        private static readonly MethodInfo _metadataItemMethod = typeof(IDictionary<string, object>).GetMethod("get_Item");\r
-        private static readonly MethodInfo _typeIsInstanceOfTypeMethod = typeof(Type).GetMethod("IsInstanceOfType");\r
-\r
-        public static bool TryParseConstraint(Expression<Func<ExportDefinition, bool>> constraint, out string contractName, out IEnumerable<KeyValuePair<string, Type>> requiredMetadata)\r
-        {\r
-            contractName = null;\r
-            requiredMetadata = null;\r
-\r
-            List<KeyValuePair<string, Type>> requiredMetadataList = new List<KeyValuePair<string, Type>>();\r
-            foreach (Expression expression in SplitConstraintBody(constraint.Body))\r
-            {\r
-                // First try to parse as a contract, if we don't have one already\r
-                if (contractName == null && TryParseExpressionAsContractConstraintBody(expression, constraint.Parameters[0], out contractName))\r
-                {\r
-                    continue;\r
-                }\r
-\r
-                // Then try to parse as a required metadata item name\r
-                string requiredMetadataItemName = null;\r
-                Type requiredMetadataItemType = null;\r
-                if (TryParseExpressionAsMetadataConstraintBody(expression, constraint.Parameters[0], out requiredMetadataItemName, out requiredMetadataItemType))\r
-                {\r
-                    requiredMetadataList.Add(new KeyValuePair<string, Type>(requiredMetadataItemName, requiredMetadataItemType));\r
-                }\r
-\r
-                // Just skip the expressions we don't understand  \r
-            }\r
-\r
-            // ContractName should have been set already, just need to set metadata\r
-            requiredMetadata = requiredMetadataList;\r
-            return true;\r
-        }\r
-\r
-\r
-        private static IEnumerable<Expression> SplitConstraintBody(Expression expression)\r
-        {\r
-            Assert.IsNotNull(expression);\r
-\r
-            // The expression we know about should be a set of nested AndAlso's, we\r
-            // need to flatten them into one list. we do this iteratively, as \r
-            // recursion will create too much of a memory churn.\r
-            Stack<Expression> expressions = new Stack<Expression>();\r
-            expressions.Push(expression);\r
-\r
-            while (expressions.Count > 0)\r
-            {\r
-                Expression current = expressions.Pop();\r
-                if (current.NodeType == ExpressionType.AndAlso)\r
-                {\r
-                    BinaryExpression andAlso = (BinaryExpression)current;\r
-                    // Push right first - this preserves the ordering of the expression, which will force\r
-                    // the contract constraint to come up first as the callers are optimized for this form\r
-                    expressions.Push(andAlso.Right);\r
-                    expressions.Push(andAlso.Left);\r
-                    continue;\r
-                }\r
-\r
-                yield return current;\r
-            }\r
-        }\r
-\r
-        private static bool TryParseExpressionAsContractConstraintBody(Expression expression, Expression parameter, out string contractName)\r
-        {\r
-            contractName = null;\r
-\r
-            // The expression should be an '==' expression\r
-            if (expression.NodeType != ExpressionType.Equal)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            BinaryExpression contractConstraintExpression = (BinaryExpression)expression;\r
-\r
-            // First try item.ContractName == "Value"\r
-            if (TryParseContractNameFromEqualsExpression(contractConstraintExpression.Left, contractConstraintExpression.Right, parameter, out contractName))\r
-            {\r
-                return true;\r
-            }\r
-\r
-            // Then try "Value == item.ContractName\r
-            if (TryParseContractNameFromEqualsExpression(contractConstraintExpression.Right, contractConstraintExpression.Left, parameter, out contractName))\r
-            {\r
-                return true;\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-        private static bool TryParseContractNameFromEqualsExpression(Expression left, Expression right, Expression parameter, out string contractName)\r
-        {\r
-            contractName = null;\r
-\r
-            // The left should be access to property "Contract" applied to the parameter\r
-            MemberExpression targetMember = left as MemberExpression;\r
-            if (targetMember == null)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            if ((targetMember.Member != _exportDefinitionContractNameProperty) || (targetMember.Expression != parameter))\r
-            {\r
-                return false;\r
-            }\r
-\r
-            // Right should a constant expression containing the contract name\r
-            ConstantExpression contractNameConstant = right as ConstantExpression;\r
-            if (contractNameConstant == null)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            if (!TryParseConstant<string>(contractNameConstant, out contractName))\r
-            {\r
-                return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private static bool TryParseExpressionAsMetadataConstraintBody(Expression expression, Expression parameter, out string requiredMetadataKey, out Type requiredMetadataType)\r
-        {\r
-            Assumes.NotNull(expression, parameter);\r
-\r
-            requiredMetadataKey = null;\r
-            requiredMetadataType = null;\r
-\r
-            // Should be a call to Type.IsInstanceofType on definition.Metadata[key]\r
-            MethodCallExpression outerMethodCall = expression as MethodCallExpression;\r
-            if (outerMethodCall == null)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            // Make sure that the right method ie being called\r
-            if (outerMethodCall.Method != _typeIsInstanceOfTypeMethod)\r
-            {\r
-                return false;\r
-            }\r
-            Assumes.IsTrue(outerMethodCall.Arguments.Count == 1);\r
-\r
-\r
-            // 'this' should be a constant expression pointing at a Type object\r
-            ConstantExpression targetType = outerMethodCall.Object as ConstantExpression;\r
-            if(!TryParseConstant<Type>(targetType, out requiredMetadataType))\r
-            {\r
-                return false;\r
-            }\r
-\r
-            // SHould be a call to get_Item\r
-            MethodCallExpression methodCall = outerMethodCall.Arguments[0] as MethodCallExpression;\r
-            if (methodCall == null)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            if (methodCall.Method != _metadataItemMethod)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            // Make sure the method is being called on the right object            \r
-            MemberExpression targetMember = methodCall.Object as MemberExpression;\r
-            if (targetMember == null)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            if ((targetMember.Expression != parameter) || (targetMember.Member != _exportDefinitionMetadataProperty))\r
-            {\r
-                return false;\r
-            }\r
-\r
-            // There should only ever be one argument; otherwise, \r
-            // we've got the wrong IDictionary.get_Item method.\r
-            Assumes.IsTrue(methodCall.Arguments.Count == 1);\r
-\r
-            // Argument should a constant expression containing the metadata key\r
-            ConstantExpression requiredMetadataKeyConstant = methodCall.Arguments[0] as ConstantExpression;\r
-            if (requiredMetadataKeyConstant == null)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            if (!TryParseConstant<string>(requiredMetadataKeyConstant, out requiredMetadataKey))\r
-            {\r
-                return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private static bool TryParseConstant<T>(ConstantExpression constant, out T result)\r
-            where T : class\r
-        {\r
-            Assumes.NotNull(constant);\r
-\r
-            if (constant.Type == typeof(T) && constant.Value != null)\r
-            {\r
-                result = (T)constant.Value;\r
-                return true;\r
-            }\r
-\r
-            result = default(T);\r
-            return false;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/.gitattributes
deleted file mode 100644 (file)
index 2d87a8b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/TraceContext.TraceContextTraceListener.cs -crlf
-/TraceContext.cs -crlf
-/TraceEventDetails.cs -crlf
-/TraceId.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceContext.TraceContextTraceListener.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceContext.TraceContextTraceListener.cs
deleted file mode 100644 (file)
index aa47b32..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Diagnostics;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    partial class TraceContext : IDisposable\r
-    {\r
-        private class TraceContextTraceListener : TraceListener\r
-        {\r
-            private readonly Collection<TraceEventDetails> _traceEvents = new Collection<TraceEventDetails>();\r
-\r
-            public IList<TraceEventDetails> TraceEvents\r
-            {\r
-                get { return _traceEvents; }\r
-            }\r
-\r
-            public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id, string format, params object[] args)\r
-            {\r
-                _traceEvents.Add(new TraceEventDetails(eventCache, source, eventType, (TraceId)id, format, args));\r
-            }\r
-\r
-            public override void Write(string message)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-\r
-            public override void WriteLine(string message)\r
-            {\r
-                throw new NotImplementedException();\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceContext.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceContext.cs
deleted file mode 100644 (file)
index 57486c7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Linq;\r
-using System.Diagnostics;\r
-using System.Collections.Generic;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    public partial class TraceContext : IDisposable\r
-    {\r
-        private readonly SourceLevels _previousLevel = TraceSourceTraceWriter.Source.Switch.Level;\r
-        private readonly TraceContextTraceListener _listener = new TraceContextTraceListener();\r
-\r
-        public TraceContext(SourceLevels level)\r
-        {\r
-            TraceSourceTraceWriter.Source.Switch.Level = level;\r
-            TraceSourceTraceWriter.Source.Listeners.Add(_listener);\r
-        }\r
-\r
-        [CLSCompliant(false)]\r
-        public TraceEventDetails LastTraceEvent\r
-        {\r
-            get { return _listener.TraceEvents.LastOrDefault(); }\r
-        }\r
-\r
-        [CLSCompliant(false)]\r
-        public IList<TraceEventDetails> TraceEvents\r
-        {\r
-            get { return _listener.TraceEvents; }\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            TraceSourceTraceWriter.Source.Listeners.Remove(_listener);\r
-            TraceSourceTraceWriter.Source.Switch.Level = _previousLevel;            \r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceEventDetails.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceEventDetails.cs
deleted file mode 100644 (file)
index 8883b0f..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Diagnostics;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    [CLSCompliant(false)]\r
-    public class TraceEventDetails\r
-    {\r
-        public TraceEventDetails(TraceEventCache eventCache, string source, TraceEventType eventType, TraceId id, string format, params object[] args)\r
-        {\r
-            EventCache = eventCache;\r
-            Source = source;\r
-            EventType = eventType;\r
-            Id = id;\r
-            Format = format;\r
-            Args = args;\r
-        }\r
-\r
-        public TraceEventCache EventCache\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string Source\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public TraceEventType EventType\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public TraceId Id\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string Format\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public object[] Args\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceId.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Diagnostics/TraceId.cs
deleted file mode 100644 (file)
index 7d07532..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    // We need a public version of CompositionTraceId, so that the QA tests can access and verify the trace.\r
-    [CLSCompliant(false)]\r
-    public enum TraceId : ushort\r
-    {\r
-        Rejection_DefinitionRejected = CompositionTraceId.Rejection_DefinitionRejected,\r
-        Rejection_DefinitionResurrected = CompositionTraceId.Rejection_DefinitionResurrected,\r
-\r
-        Discovery_AssemblyLoadFailed = CompositionTraceId.Discovery_AssemblyLoadFailed,\r
-        Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute = CompositionTraceId.Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute,\r
-        Discovery_DefinitionContainsGenericParameters = CompositionTraceId.Discovery_DefinitionContainsGenericParameters,\r
-        Discovery_DefinitionContainsNoExports = CompositionTraceId.Discovery_DefinitionContainsNoExports,\r
-        Discovery_MemberMarkedWithMultipleImportAndImportMany = CompositionTraceId.Discovery_MemberMarkedWithMultipleImportAndImportMany,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Hosting/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Hosting/.gitattributes
deleted file mode 100644 (file)
index 4a9c903..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/CompositionHostTestService.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Hosting/CompositionHostTestService.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/Hosting/CompositionHostTestService.cs
deleted file mode 100644 (file)
index fc96063..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#if SILVERLIGHT \r
-using System;\r
-using System.Net;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public static class CompositionHostTestService\r
-    {\r
-        public static void SetupTestGlobalContainer(CompositionContainer container)\r
-        {\r
-            CompositionHost._container = null;\r
-            CompositionHost.Initialize(container);\r
-        }\r
-\r
-        public static void SetupTestGlobalContainer(ComposablePartCatalog catalog)\r
-        {\r
-            CompositionHost._container = null;\r
-            CompositionHost.Initialize(catalog);\r
-        }\r
-\r
-        public static void ClearGlobalContainer()\r
-        {\r
-            CompositionHost._container = null;\r
-        }\r
-\r
-        public static void ResetGlobalContainer()\r
-        {\r
-            ClearGlobalContainer();\r
-#if !BUILDING_IN_VS\r
-            // We can only use the default SL Deployment option while building in VS otherwise we \r
-            // will not have a proper Application/Deployment object setup.\r
-            SetupTestGlobalContainer(new AssemblyCatalog(typeof(CompositionHostTestService).Assembly));\r
-#endif\r
-        }\r
-\r
-        public static CompositionContainer GlobalContainer\r
-        {\r
-            get { return CompositionHost._container; }\r
-        }\r
-    }\r
-}\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ReflectionModel/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ReflectionModel/.gitattributes
deleted file mode 100644 (file)
index 8e8fec9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/ReflectionModelServicesEx.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesEx.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesEx.cs
deleted file mode 100644 (file)
index 75b483e..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Reflection;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-// NOTE : this is a helper class for exosig the EditorFactory functionality to tests until ExportFactory can be moved where it belongs\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    public static class ReflectionModelServicesEx\r
-    {\r
-        public static ContractBasedImportDefinition CreateImportDefinition(\r
-            Lazy<ParameterInfo> parameter,\r
-            string contractName,\r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-            ImportCardinality cardinality,\r
-            CreationPolicy requiredCreationPolicy,\r
-            bool isExportFactory,\r
-            ICompositionElement origin)\r
-        {\r
-            return ReflectionModelServices.CreateImportDefinition(parameter, contractName, requiredTypeIdentity, requiredMetadata, cardinality, requiredCreationPolicy, isExportFactory, origin);\r
-        }\r
-\r
-        public static ContractBasedImportDefinition CreateImportDefinition(\r
-                LazyMemberInfo importingMember,\r
-                string contractName,\r
-                string requiredTypeIdentity,\r
-                IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-                ImportCardinality cardinality,\r
-                bool isRecomposable,\r
-                CreationPolicy requiredCreationPolicy,\r
-                bool isExportFactory,\r
-                ICompositionElement origin)\r
-        {\r
-            return ReflectionModelServices.CreateImportDefinition(importingMember, contractName, requiredTypeIdentity, requiredMetadata, cardinality, isRecomposable, requiredCreationPolicy, isExportFactory, origin);\r
-        }\r
-\r
-        public static bool IsExportFactoryImportDefinition(ImportDefinition importDefinition)\r
-        {\r
-            return ReflectionModelServices.IsExportFactoryImportDefinition(importDefinition);\r
-        }\r
-\r
-        public static ContractBasedImportDefinition CreateExportFactoryImportDefinition(ContractBasedImportDefinition productImportDefinition)\r
-        {\r
-            return new ExportFactoryImportDefinition(productImportDefinition);\r
-        }\r
-\r
-        private class ExportFactoryImportDefinition : ContractBasedImportDefinition, IPartCreatorImportDefinition\r
-        {\r
-            private readonly ContractBasedImportDefinition _productImportDefinition;\r
-\r
-            public ExportFactoryImportDefinition(ContractBasedImportDefinition productImportDefinition)\r
-                : base(CompositionConstants.PartCreatorContractName, CompositionConstants.PartCreatorTypeIdentity, productImportDefinition.RequiredMetadata,\r
-                    productImportDefinition.Cardinality, productImportDefinition.IsRecomposable, false, CreationPolicy.Any)\r
-            {\r
-                _productImportDefinition = productImportDefinition;\r
-            }\r
-\r
-            public ContractBasedImportDefinition ProductImportDefinition\r
-            {\r
-                get\r
-                {\r
-                    return _productImportDefinition;\r
-                }\r
-            }\r
-\r
-            public override Expression<Func<ExportDefinition, bool>> Constraint\r
-            {\r
-                get\r
-                {\r
-                    return CreateExportFactoryConstraint(base.Constraint, this._productImportDefinition);\r
-                }\r
-            }\r
-\r
-            public override bool IsConstraintSatisfiedBy(ExportDefinition exportDefinition)\r
-            {\r
-                if (!base.IsConstraintSatisfiedBy(exportDefinition))\r
-                {\r
-                    return false;\r
-                }\r
-\r
-                return IsProductConstraintSatisfiedBy(this._productImportDefinition, exportDefinition);\r
-            }\r
-\r
-            private static bool IsProductConstraintSatisfiedBy(ImportDefinition productImportDefinition, ExportDefinition exportDefinition)\r
-            {\r
-                object productValue = null;\r
-                if (exportDefinition.Metadata.TryGetValue(CompositionConstants.ProductDefinitionMetadataName, out productValue))\r
-                {\r
-                    ExportDefinition productDefinition = productValue as ExportDefinition;\r
-\r
-                    if (productDefinition != null)\r
-                    {\r
-                        return productImportDefinition.IsConstraintSatisfiedBy(productDefinition);\r
-                    }\r
-                }\r
-\r
-                return false;\r
-            }\r
-\r
-            private static readonly PropertyInfo _exportDefinitionMetadataProperty = typeof(ExportDefinition).GetProperty("Metadata");\r
-            private static readonly MethodInfo _metadataContainsKeyMethod = typeof(IDictionary<string, object>).GetMethod("ContainsKey");\r
-            private static readonly MethodInfo _metadataItemMethod = typeof(IDictionary<string, object>).GetMethod("get_Item");\r
-\r
-            private static Expression<Func<ExportDefinition, bool>> CreateExportFactoryConstraint(Expression<Func<ExportDefinition, bool>> baseConstraint, ImportDefinition productImportDefinition)\r
-            {\r
-                ParameterExpression exportDefinitionParameter = baseConstraint.Parameters[0];\r
-\r
-                // exportDefinition.Metadata\r
-                Expression metadataExpression = Expression.Property(exportDefinitionParameter, _exportDefinitionMetadataProperty);\r
-\r
-                // exportDefinition.Metadata.ContainsKey("ProductDefinition")\r
-                Expression containsProductExpression = Expression.Call(\r
-                    metadataExpression,\r
-                    _metadataContainsKeyMethod,\r
-                    Expression.Constant(CompositionConstants.ProductDefinitionMetadataName));\r
-\r
-                // exportDefinition.Metadata["ProductDefinition"]\r
-                Expression productExportDefinitionExpression = Expression.Call(\r
-                        metadataExpression,\r
-                        _metadataItemMethod,\r
-                        Expression.Constant(CompositionConstants.ProductDefinitionMetadataName));\r
-\r
-                // ProductImportDefinition.Contraint((ExportDefinition)exportDefinition.Metadata["ProductDefinition"])\r
-                Expression productMatchExpression =\r
-                    Expression.Invoke(productImportDefinition.Constraint,\r
-                        Expression.Convert(productExportDefinitionExpression, typeof(ExportDefinition)));\r
-\r
-                // baseContraint(exportDefinition) &&\r
-                // exportDefinition.Metadata.ContainsKey("ProductDefinition") &&\r
-                // ProductImportDefinition.Contraint((ExportDefinition)exportDefinition.Metadata["ProductDefinition"])\r
-                Expression<Func<ExportDefinition, bool>> constraint =\r
-                     Expression.Lambda<Func<ExportDefinition, bool>>(\r
-                        Expression.AndAlso(\r
-                            baseConstraint.Body,\r
-                            Expression.AndAlso(\r
-                               containsProductExpression,\r
-                               productMatchExpression)),\r
-                        exportDefinitionParameter);\r
-\r
-                return constraint;\r
-            }\r
-        }\r
-\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/.gitattributes
deleted file mode 100644 (file)
index 54538e6..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/CompositionAssert.cs -crlf
-/ElementAssert.cs -crlf
-/ErrorId.cs -crlf
-/ExportsAssert.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/CompositionAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/CompositionAssert.cs
deleted file mode 100644 (file)
index 8039a82..0000000
+++ /dev/null
@@ -1,439 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Reflection;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.UnitTesting\r
-{\r
-    public static class CompositionAssert\r
-    {\r
-        internal static void AreEqual(CompositionResult expected, CompositionResult actual)\r
-        {\r
-            Assert.AreEqual(expected.Succeeded, actual.Succeeded);\r
-\r
-            EnumerableAssert.AreSequenceEqual(expected.Errors, actual.Errors, (index, expectedError, actualError) =>\r
-            {\r
-                AreEqual(expectedError, actualError);\r
-            });\r
-        }\r
-\r
-        internal static void AreEqual(CompositionError expected, CompositionError actual)\r
-        {\r
-            Assert.AreEqual(((ICompositionError)expected).Id, ((ICompositionError)actual).Id);\r
-            Assert.AreEqual(expected.Description, actual.Description);\r
-            ExtendedAssert.IsInstanceOfSameType(expected.Exception, actual.Exception);\r
-        }\r
-\r
-        public static void ThrowsPart(ErrorId id, Action action)\r
-        {\r
-            ThrowsPart(id, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsPart(ErrorId id, RetryMode retry, Action action)\r
-        {\r
-            ThrowsPart(new CompositionErrorExpectation { Id = id }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsPart(ErrorId id, ICompositionElement element, Action action)\r
-        {\r
-            ThrowsPart(id, element, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsPart(ErrorId id, ICompositionElement element, RetryMode retry, Action action)\r
-        {\r
-            ThrowsPart(new CompositionErrorExpectation { Id = id, Element = element }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsPart<TInner>(ErrorId id, Action action)\r
-            where TInner : Exception\r
-        {\r
-            ThrowsPart<TInner>(id, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsPart<TInner>(ErrorId id, RetryMode retry, Action action)\r
-            where TInner : Exception\r
-        {\r
-            ThrowsPart(new CompositionErrorExpectation { Id = id, InnerExceptionType = typeof(TInner) }, retry, action);\r
-        }\r
-\r
-        private static void ThrowsPart(CompositionErrorExpectation expectation, RetryMode retry, Action action)\r
-        {\r
-            ExceptionAssert.Throws<ComposablePartException>(retry, action, (thrownException, retryCount) =>\r
-            {\r
-                AssertCore(retryCount, "ComposablePartException", thrownException, expectation);\r
-            });\r
-        }\r
-\r
-        public static void ThrowsRootError(ErrorId rootId, RetryMode retry, Action action)\r
-        {\r
-            var exception = ExceptionAssert.Throws<CompositionException>(retry, action, (thrownException, retryCount) =>\r
-            {\r
-                ErrorId actualId = GetRootErrorId(thrownException);\r
-\r
-                Assert.AreEqual(rootId, actualId, "Retry Count {0}: Expected '{1}' to be the root ErrorId, however, '{2}' is.", retryCount, rootId, actualId);\r
-            });\r
-        }\r
-\r
-        public static void ThrowsError<TInner>(ErrorId id, RetryMode retry, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, InnerExceptionType = typeof(TInner) }, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id}, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ErrorId innerId, Action action)\r
-        {\r
-            ThrowsError(id, innerId, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ErrorId innerId, RetryMode retry, Action action)\r
-        {\r
-            ThrowsError(GetExpectation(id, innerId), retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ErrorId innerId, ErrorId innerInnerId, Action action)\r
-        {\r
-            ThrowsError(id, innerId, innerInnerId, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ErrorId innerId, ErrorId innerInnerId, RetryMode retry, Action action)\r
-        {\r
-            ThrowsError(GetExpectation(id, innerId, innerInnerId), retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, RetryMode retry, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ICompositionElement element, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, Element = element}, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ICompositionElement element, RetryMode retry, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, Element = element }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, Exception exception, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, InnerException = exception }, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, Exception exception, RetryMode retry, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, InnerException = exception }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ICompositionElement element, Exception exception, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, Element = element, InnerException = exception }, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsError(ErrorId id, ICompositionElement element, Exception exception, RetryMode retry, Action action)\r
-        {\r
-            ThrowsError(new CompositionErrorExpectation { Id = id, Element = element, InnerException = exception }, retry, action);\r
-        }\r
-\r
-        private static void ThrowsError(CompositionErrorExpectation expectation, RetryMode retry, Action action)\r
-        {\r
-            ThrowsErrors(new CompositionErrorExpectation[] { expectation }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsErrors(ErrorId id1, ErrorId id2, Action action)\r
-        {\r
-            ThrowsErrors(id1, id2, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsErrors(ErrorId id1, ErrorId id2, RetryMode retry, Action action)\r
-        {\r
-            ThrowsErrors(new ErrorId[] { id1, id2 }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsErrors(ErrorId[] ids, RetryMode retry, Action action)\r
-        {\r
-            CompositionErrorExpectation[] expectations = new CompositionErrorExpectation[ids.Length]; \r
-            for (int i = 0; i < expectations.Length; i++)\r
-            {\r
-                expectations[i] = new CompositionErrorExpectation { Id = ids[i] };\r
-            }\r
-\r
-            ThrowsErrors(expectations, retry, action);\r
-        }\r
-\r
-        private static void ThrowsErrors(CompositionErrorExpectation[] expectations, RetryMode retry, Action action)\r
-        {\r
-            ExceptionAssert.Throws<CompositionException>(retry, action, (thrownException, retryCount) =>\r
-            {\r
-                AssertCore(retryCount, "CompositionException", thrownException, expectations);\r
-            });\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedRootError(ErrorId rootId, RetryMode retry, Action action)\r
-        {\r
-            var exception = ExceptionAssert.Throws<ChangeRejectedException>(retry, action, (thrownException, retryCount) =>\r
-            {\r
-                ErrorId actualId = GetRootErrorId(thrownException);\r
-\r
-                Assert.AreEqual(rootId, actualId, "Retry Count {0}: Expected '{1}' to be the root ErrorId, however, '{2}' is.", retryCount, rootId, actualId);\r
-            });\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedError(ErrorId id, Action action)\r
-        {\r
-            ThrowsChangeRejectedError(new CompositionErrorExpectation { Id = id }, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedError(ErrorId id, RetryMode retry, Action action)\r
-        {\r
-            ThrowsChangeRejectedError(new CompositionErrorExpectation { Id = id, }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedError(ErrorId id, ICompositionElement element, Action action)\r
-        {\r
-            ThrowsChangeRejectedError(new CompositionErrorExpectation { Id = id, Element = element }, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedError(ErrorId id, ErrorId innerId, RetryMode retry, Action action)\r
-        {\r
-            ThrowsChangeRejectedError(GetExpectation(id, innerId), retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedError(ErrorId id, ErrorId innerId, ErrorId innerInnerId, Action action)\r
-        {\r
-            ThrowsChangeRejectedError(id, innerId, innerInnerId, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedError(ErrorId id, ErrorId innerId, ErrorId innerInnerId, RetryMode retry, Action action)\r
-        {\r
-            ThrowsChangeRejectedError(GetExpectation(id, innerId, innerInnerId), retry, action);\r
-        }\r
-\r
-        private static void ThrowsChangeRejectedError(CompositionErrorExpectation expectation, RetryMode retry, Action action)\r
-        {\r
-            ThrowsChangeRejectedErrors(new CompositionErrorExpectation[] { expectation }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedError(ErrorId id, ICompositionElement element, Exception exception, Action action)\r
-        {\r
-            ThrowsChangeRejectedError(new CompositionErrorExpectation { Id = id, Element = element, InnerException = exception }, RetryMode.Retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedErrors(ErrorId id1, ErrorId id2, RetryMode retry, Action action)\r
-        {\r
-            ThrowsChangeRejectedErrors(new ErrorId[] { id1, id2 }, retry, action);\r
-        }\r
-\r
-        public static void ThrowsChangeRejectedErrors(ErrorId[] ids, RetryMode retry, Action action)\r
-        {\r
-            CompositionErrorExpectation[] expectations = new CompositionErrorExpectation[ids.Length];\r
-            for (int i = 0; i < expectations.Length; i++)\r
-            {\r
-                expectations[i] = new CompositionErrorExpectation { Id = ids[i] };\r
-            }\r
-\r
-            ThrowsChangeRejectedErrors(expectations, retry, action);\r
-        }\r
-\r
-        private static void ThrowsChangeRejectedErrors(CompositionErrorExpectation[] expectations, RetryMode retry, Action action)\r
-        {\r
-            ExceptionAssert.Throws<ChangeRejectedException>(retry, action, (thrownException, retryCount) =>\r
-            {\r
-                AssertCore(retryCount, "CompositionException", thrownException, expectations);\r
-            });\r
-        }\r
-\r
-        private static void AssertCore(int retryCount, string prefix, CompositionException exception, CompositionErrorExpectation[] expectations)\r
-        {\r
-            Assert.AreEqual(exception.Errors.Count, expectations.Length);\r
-\r
-            for (int i = 0; i < exception.Errors.Count; i++)\r
-            {\r
-                AssertCore(retryCount, prefix + ".Errors[" + i + "]", exception.Errors[i], expectations[i]);\r
-            }\r
-        }\r
-\r
-        private static void AssertCore(int retryCount, string prefix, ICompositionError error, CompositionErrorExpectation expectation)\r
-        {\r
-            if (expectation.IdSpecified)\r
-            {\r
-                AssertCore(retryCount, prefix, "Id", expectation.Id, (ErrorId)error.Id);\r
-            }\r
-\r
-            if (expectation.ElementSpecified)\r
-            {\r
-                AssertCore(retryCount, prefix, "Element", expectation.Element, error.Element);\r
-            }\r
-\r
-            if (expectation.InnerExceptionSpecified)\r
-            {\r
-                AssertCore(retryCount, prefix, "InnerException", expectation.InnerException, error.InnerException);\r
-            }\r
-\r
-            if (expectation.InnerExceptionTypeSpecified)\r
-            {\r
-                AssertCore(retryCount, prefix, "InnerException.GetType()", expectation.InnerExceptionType, error.InnerException == null ? null : error.InnerException.GetType());\r
-            }\r
-\r
-            if (expectation.InnerExpectationsSpecified)\r
-            {\r
-                ICompositionError innerError = error.InnerException as ICompositionError;\r
-                if (innerError != null)\r
-                {\r
-                    Assert.AreEqual(1, expectation.InnerExpectations.Length);\r
-                    AssertCore(retryCount, prefix + ".InnerException", innerError, expectation.InnerExpectations[0]);\r
-                }\r
-                else\r
-                {\r
-                    AssertCore(retryCount, prefix + ".InnerException", (CompositionException)error.InnerException, expectation.InnerExpectations);\r
-                }\r
-            }\r
-        }\r
-               \r
-        private static void AssertCore<T>(int retryCount, string prefix, string propertyName, T expected, T actual)\r
-        {\r
-            Assert.AreEqual(expected, actual, "Retry Count {0}: Expected '{1}' to be {3}.{4}, however, '{2}' is.", retryCount, expected, actual, prefix, propertyName);\r
-        }\r
-\r
-        private static CompositionErrorExpectation GetExpectation(params ErrorId[] ids)\r
-        {\r
-            var parent = new CompositionErrorExpectation() { Id = ids[0] };\r
-            var expectation = parent;\r
-\r
-            for (int i = 1; i < ids.Length; i++)\r
-            {\r
-                expectation.InnerExpectations = new CompositionErrorExpectation[] { new CompositionErrorExpectation() { Id = ids[i] } };\r
-                expectation = expectation.InnerExpectations[0];\r
-            }\r
-\r
-            return parent;\r
-        }\r
-\r
-        private static ErrorId GetRootErrorId(CompositionException exception)\r
-        {\r
-            Assert.IsTrue(exception.Errors.Count == 1);\r
-\r
-            return GetRootErrorId(exception.Errors[0]);\r
-        }\r
-\r
-        private static ErrorId GetRootErrorId(ICompositionError error)\r
-        {\r
-            Exception exception = error.InnerException;\r
-\r
-            var childError = exception as ICompositionError;\r
-            if (childError != null)\r
-            {\r
-                return GetRootErrorId(childError);\r
-            }\r
-\r
-            CompositionException composition = exception as CompositionException;\r
-            if (composition != null)\r
-            {\r
-                return GetRootErrorId(composition);\r
-            }\r
-\r
-            return (ErrorId)error.Id;\r
-        }\r
-\r
-        private class CompositionErrorExpectation\r
-        {\r
-            private ErrorId _id;\r
-            private Exception _innerException;\r
-            private Type _innerExceptionType;\r
-            private ICompositionElement _element;\r
-            private CompositionErrorExpectation[] _innerExpectations;\r
-\r
-            public ErrorId Id\r
-            {\r
-                get { return _id; }\r
-                set\r
-                {\r
-                    _id = value;\r
-                    IdSpecified = true;\r
-                }\r
-            }\r
-\r
-            public Exception InnerException\r
-            {\r
-                get { return _innerException; }\r
-                set\r
-                {\r
-                    _innerException = value;\r
-                    InnerExceptionSpecified = true;\r
-                }\r
-            }\r
-\r
-            public Type InnerExceptionType\r
-            {\r
-                get { return _innerExceptionType; }\r
-                set\r
-                {\r
-                    _innerExceptionType = value;\r
-                    InnerExceptionTypeSpecified = true;\r
-                }\r
-            }\r
-\r
-            public ICompositionElement Element\r
-            {\r
-                get { return _element; }\r
-                set\r
-                {\r
-                    _element = value;\r
-                    ElementSpecified = true;\r
-                }\r
-            }\r
-\r
-            public CompositionErrorExpectation[] InnerExpectations\r
-            {\r
-                get { return _innerExpectations; }\r
-                set\r
-                {\r
-                    _innerExpectations = value;\r
-                    InnerExpectationsSpecified = true;\r
-                }\r
-            }\r
-\r
-            public bool IdSpecified\r
-            {\r
-                get;\r
-                private set;\r
-            }\r
-\r
-            public bool InnerExceptionSpecified\r
-            {\r
-                get;\r
-                private set;\r
-            }\r
-\r
-            public bool InnerExceptionTypeSpecified\r
-            {\r
-                get;\r
-                private set;\r
-            }\r
-\r
-            public bool ElementSpecified\r
-            {\r
-                get;\r
-                private set;\r
-            }\r
-\r
-            public bool InnerExpectationsSpecified\r
-            {\r
-                get;\r
-                private set;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ElementAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ElementAssert.cs
deleted file mode 100644 (file)
index 8a9a419..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.UnitTesting;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.ComponentModel.Composition.UnitTesting\r
-{\r
-    internal static class ElementAssert\r
-    {\r
-        public static void AreEqual(ICompositionElement expected, ICompositionElement actual)\r
-        {\r
-            if (expected == null || actual == null)\r
-            {\r
-                Assert.AreEqual(expected, actual);\r
-                return;\r
-            }\r
-\r
-            Assert.AreEqual(expected.DisplayName, actual.DisplayName);\r
-            ElementAssert.AreEqual(expected.Origin, actual.Origin);\r
-        }\r
-\r
-        public static void AreEqual(IEnumerable<ICompositionElement> expected, IEnumerable<ICompositionElement> actual)\r
-        {\r
-            Assert.AreEqual(expected.Count(), actual.Count());\r
-\r
-            int index = 0;\r
-            foreach (var element in expected)\r
-            {\r
-                AreEqual(element, actual.ElementAt(index));\r
-\r
-                index++;\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ErrorId.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ErrorId.cs
deleted file mode 100644 (file)
index 4ed1d2c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    // We need a public version of CompositionErrorId, so that the QA tests can access and verify the errors.\r
-    public enum ErrorId : int\r
-    {\r
-        Unknown = CompositionErrorId.Unknown,\r
-        InvalidExportMetadata = CompositionErrorId.InvalidExportMetadata,\r
-        RequiredMetadataNotFound = CompositionErrorId.RequiredMetadataNotFound,\r
-        UnsupportedExportType = CompositionErrorId.UnsupportedExportType,\r
-        ImportNotSetOnPart = CompositionErrorId.ImportNotSetOnPart,\r
-        ImportEngine_ComposeTookTooManyIterations = CompositionErrorId.ImportEngine_ComposeTookTooManyIterations,\r
-        ImportEngine_ImportCardinalityMismatch = CompositionErrorId.ImportEngine_ImportCardinalityMismatch,        \r
-        ImportEngine_PartCycle = CompositionErrorId.ImportEngine_PartCycle,\r
-        ImportEngine_PartCannotSetImport = CompositionErrorId.ImportEngine_PartCannotSetImport,\r
-        ImportEngine_PartCannotGetExportedValue = CompositionErrorId.ImportEngine_PartCannotGetExportedValue,\r
-        ImportEngine_PartCannotActivate = CompositionErrorId.ImportEngine_PartCannotActivate,\r
-        ImportEngine_PreventedByExistingImport = CompositionErrorId.ImportEngine_PreventedByExistingImport,\r
-        ImportEngine_InvalidStateForRecomposition = CompositionErrorId.ImportEngine_InvalidStateForRecomposition,\r
-        ReflectionModel_PartConstructorMissing = CompositionErrorId.ReflectionModel_PartConstructorMissing,\r
-        ReflectionModel_PartConstructorThrewException = CompositionErrorId.ReflectionModel_PartConstructorThrewException,\r
-        ReflectionModel_PartOnImportsSatisfiedThrewException = CompositionErrorId.ReflectionModel_PartOnImportsSatisfiedThrewException,\r
-        ReflectionModel_ExportNotReadable = CompositionErrorId.ReflectionModel_ExportNotReadable,\r
-        ReflectionModel_ExportThrewException = CompositionErrorId.ReflectionModel_ExportThrewException,\r
-        ReflectionModel_ExportMethodTooManyParameters = CompositionErrorId.ReflectionModel_ExportMethodTooManyParameters,\r
-        ReflectionModel_ImportNotWritable = CompositionErrorId.ReflectionModel_ImportNotWritable,\r
-        ReflectionModel_ImportThrewException = CompositionErrorId.ReflectionModel_ImportThrewException,\r
-        ReflectionModel_ImportNotAssignableFromExport = CompositionErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-        ReflectionModel_ImportCollectionNull = CompositionErrorId.ReflectionModel_ImportCollectionNull,\r
-        ReflectionModel_ImportCollectionNotWritable = CompositionErrorId.ReflectionModel_ImportCollectionNotWritable,\r
-        ReflectionModel_ImportCollectionConstructionThrewException = CompositionErrorId.ReflectionModel_ImportCollectionConstructionThrewException,\r
-        ReflectionModel_ImportCollectionGetThrewException = CompositionErrorId.ReflectionModel_ImportCollectionGetThrewException,\r
-        ReflectionModel_ImportCollectionIsReadOnlyThrewException = CompositionErrorId.ReflectionModel_ImportCollectionIsReadOnlyThrewException,\r
-        ReflectionModel_ImportCollectionClearThrewException = CompositionErrorId.ReflectionModel_ImportCollectionClearThrewException,\r
-        ReflectionModel_ImportCollectionAddThrewException = CompositionErrorId.ReflectionModel_ImportCollectionAddThrewException,\r
-        ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned = CompositionErrorId.ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ExportsAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ComponentModel/Composition/UnitTesting/ExportsAssert.cs
deleted file mode 100644 (file)
index d68a4ba..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.UnitTesting\r
-{\r
-    public static class ExportsAssert\r
-    {\r
-        public static void AreEqual<T>(IEnumerable<Export> actual, params T[] expected)\r
-        {\r
-            EnumerableAssert.AreEqual((IEnumerable)expected, (IEnumerable)actual.Select(export => export.Value));\r
-        }\r
-\r
-        public static void AreEqual<T>(IEnumerable<Lazy<T>> actual, params T[] expected)\r
-        {\r
-            EnumerableAssert.AreEqual((IEnumerable<T>)expected, (IEnumerable<T>)actual.Select(export => export.Value));\r
-        }\r
-\r
-        public static void AreEqual<T, TMetadataView>(IEnumerable<Lazy<T, TMetadataView>> actual, params T[] expected)\r
-        {\r
-            EnumerableAssert.AreEqual((IEnumerable<T>)expected, (IEnumerable<T>)actual.Select(export => export.Value));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/DisposableObject.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/DisposableObject.cs
deleted file mode 100644 (file)
index 5b7ba3c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System\r
-{\r
-    public class DisposableObject : IDisposable\r
-    {\r
-        public int DisposeCount\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            DisposeCount++;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/EnumExtensions.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/EnumExtensions.cs
deleted file mode 100644 (file)
index f631478..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !CLR40\r
-using System;\r
-\r
-namespace System\r
-{\r
-    public static class EnumExtensions\r
-    {\r
-        public static bool HasFlag(this Enum enumRef, Enum flag)\r
-        {\r
-            long value = Convert.ToInt64(enumRef);\r
-            long flagVal = Convert.ToInt64(flag);\r
-\r
-            return (value & flagVal) == flagVal;\r
-        }\r
-    }\r
-}\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Globalization/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Globalization/.gitattributes
deleted file mode 100644 (file)
index f5c09b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/CurrentCultureContext.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Globalization/CurrentCultureContext.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Globalization/CurrentCultureContext.cs
deleted file mode 100644 (file)
index 6210c7f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Globalization;\r
-using System.Threading;\r
-\r
-namespace System.Globalization\r
-{\r
-    public class CurrentCultureContext : IDisposable\r
-    {\r
-        private CultureInfo _previousCulture;\r
-\r
-        public CurrentCultureContext(CultureInfo culture)\r
-        {\r
-            _previousCulture = Thread.CurrentThread.CurrentCulture;\r
-\r
-            Thread.CurrentThread.CurrentCulture = culture;\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (_previousCulture != null)\r
-            {\r
-                Thread.CurrentThread.CurrentCulture = _previousCulture;\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/.gitattributes
deleted file mode 100644 (file)
index bca099d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/FileIO.cs -crlf
-/TemporaryDirectory.cs -crlf
-/TemporaryFile.cs -crlf
-/TemporaryFileCopier.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/FileIO.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/FileIO.cs
deleted file mode 100644 (file)
index d004fd7..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-using System.UnitTesting;\r
-\r
-namespace System.IO \r
-{\r
-    public static class FileIO\r
-    {\r
-        public const string RootTemporaryDirectoryName = "RootTempDirectory";\r
-\r
-        private static string _temporaryDirectory;\r
-        public static string GetRootTemporaryDirectory()\r
-        {\r
-            if (_temporaryDirectory == null)\r
-            {\r
-#if SILVERLIGHT\r
-                string path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), RootTemporaryDirectoryName);\r
-#else\r
-                string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, RootTemporaryDirectoryName);\r
-#endif\r
-\r
-                if (!Directory.Exists(path))\r
-                {\r
-                    Directory.CreateDirectory(path);\r
-                }\r
-\r
-                _temporaryDirectory = path;\r
-            }\r
-\r
-            return _temporaryDirectory;\r
-        }\r
-\r
-        public static string GetNewTemporaryDirectory()\r
-        {\r
-            string path = Path.Combine(GetRootTemporaryDirectory(), TestServices.GenerateRandomString());\r
-\r
-            Directory.CreateDirectory(path);\r
-\r
-            return path;\r
-        }\r
-\r
-        public static string GetTemporaryFileName(string extension)\r
-        {\r
-            return Path.Combine(GetRootTemporaryDirectory(), TestServices.GenerateRandomString() + "." + extension);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryDirectory.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryDirectory.cs
deleted file mode 100644 (file)
index 7f373a2..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-\r
-namespace System.IO \r
-{\r
-    public class TemporaryDirectory : IDisposable\r
-    {\r
-        private string _directoryPath;\r
-\r
-        public TemporaryDirectory()\r
-        {\r
-            _directoryPath = FileIO.GetNewTemporaryDirectory();\r
-        }\r
-\r
-        public string DirectoryPath\r
-        {\r
-            get { return _directoryPath; }\r
-        }\r
-        \r
-        public void Dispose()\r
-        {\r
-            if (_directoryPath != null)\r
-            {\r
-                try\r
-                {\r
-                    Directory.Delete(_directoryPath, true);\r
-                }\r
-                catch (IOException)\r
-                {\r
-                }\r
-\r
-                _directoryPath = null;\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryFile.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryFile.cs
deleted file mode 100644 (file)
index 69fda64..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-\r
-namespace System.IO \r
-{\r
-    public class TemporaryFile : IDisposable\r
-    {\r
-        private string _fileName;\r
-\r
-        public TemporaryFile()\r
-        {\r
-            _fileName = Path.GetTempFileName();\r
-        }\r
-\r
-        public string FileName\r
-        {\r
-            get { return _fileName; }\r
-        }\r
-        \r
-        public void Dispose()\r
-        {\r
-            if (_fileName != null)\r
-            {\r
-                File.Delete(_fileName);\r
-                _fileName = null;\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryFileCopier.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/IO/TemporaryFileCopier.cs
deleted file mode 100644 (file)
index d1ae907..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-\r
-namespace System.IO \r
-{\r
-    public class TemporaryFileCopier : TemporaryDirectory\r
-    {\r
-        public TemporaryFileCopier(params string[] fileNames)\r
-        {\r
-            foreach (string fileName in fileNames)\r
-            {\r
-                File.Copy(fileName, Path.Combine(DirectoryPath, Path.GetFileName(fileName)));\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ReferenceTracker.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/ReferenceTracker.cs
deleted file mode 100644 (file)
index b803e62..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.UnitTesting;\r
-\r
-namespace System\r
-{\r
-    public class ReferenceTracker\r
-    {\r
-        public readonly List<WeakReference> ReferencesExpectedToBeCollected = new List<WeakReference>();\r
-        public readonly List<WeakReference> ReferencesNotExpectedToBeCollected = new List<WeakReference>();\r
-\r
-        public void AddReferencesExpectedToBeCollected(params object[] objects)\r
-        {\r
-            for (int i = 0; i < objects.Length; i++)\r
-            {\r
-                ReferencesExpectedToBeCollected.Add(new WeakReference(objects[i]));\r
-                objects[i] = null;\r
-            }\r
-        }\r
-\r
-        public void AddReferencesNotExpectedToBeCollected(params object[] objects)\r
-        {\r
-            for (int i = 0; i < objects.Length; i++)\r
-            {\r
-                ReferencesNotExpectedToBeCollected.Add(new WeakReference(objects[i]));\r
-                objects[i] = null;\r
-            }\r
-        }\r
-\r
-        public void CollectAndAssert()\r
-        {\r
-            GC.Collect();\r
-            GC.WaitForPendingFinalizers();\r
-\r
-            EnumerableAssert.IsTrueForAll(ReferencesExpectedToBeCollected, wr => wr.Target == null, "Object should have been collected.");\r
-            EnumerableAssert.IsTrueForAll(ReferencesNotExpectedToBeCollected, wr => wr.Target != null, "Object should be have NOT been collected.");\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/.gitattributes
deleted file mode 100644 (file)
index 3ed0af6..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/SerializationTestServices.cs -crlf
-/StrictFormatterConverter.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/SerializationTestServices.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/SerializationTestServices.cs
deleted file mode 100644 (file)
index 338b520..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.IO;\r
-using System.Runtime.Serialization.Formatters.Binary;\r
-using System.Reflection;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.Runtime.Serialization\r
-{\r
-    public static class SerializationTestServices\r
-    {\r
-        /// <summary>\r
-        ///     Serializes and then deserializes the specified value.\r
-        /// </summary>\r
-        public static T RoundTrip<T>(T value)\r
-        {\r
-            Assert.IsNotNull(value);\r
-\r
-            using (MemoryStream stream = new MemoryStream())\r
-            {\r
-                BinaryFormatter formatter = new BinaryFormatter();\r
-                formatter.Serialize(stream, value);\r
-\r
-                stream.Seek(0, SeekOrigin.Begin);\r
-                return (T)formatter.Deserialize(stream);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Creates an instance of a type using the serialization constructor.\r
-        /// </summary>\r
-        public static T Create<T>(SerializationInfo info, StreamingContext context)\r
-        {\r
-            ConstructorInfo constructor = typeof(T).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null,\r
-                                                                   new Type[] { typeof(SerializationInfo), typeof(StreamingContext) },\r
-                                                                   (ParameterModifier[])null);\r
-\r
-            Assert.IsNotNull(constructor, "Type does not have a private or protected serialization constructor.");\r
-\r
-            try\r
-            {\r
-                return (T)constructor.Invoke(new object[] { info, context });\r
-            }\r
-            catch (TargetInvocationException ex)\r
-            {\r
-                throw ex.InnerException;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a new instance of <see cref="SerializationInfo"/> replacing the specified member name with the specified value.\r
-        /// </summary>\r
-        public static SerializationInfo CreateSerializationInfoReplacingMember<T>(string memberName, object value)\r
-            where T : ISerializable, new()\r
-        {\r
-            return CreateSerializationInfoReplacingMember(memberName, value, () => new T()); \r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a new instance of <see cref="SerializationInfo"/> replacing the specified member name with the specified value.\r
-        /// </summary>\r
-        public static SerializationInfo CreateSerializationInfoReplacingMember<T>(string memberName, object value, Func<T> creator)\r
-            where T : ISerializable\r
-        {\r
-            T serializableObject = creator();\r
-\r
-            var info = GetObjectDataFrom(serializableObject);\r
-\r
-            return CloneReplacingMember<T>(info, memberName, value);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a new instance of <see cref="SerializationInfo"/> removing the specified member name.\r
-        /// </summary>\r
-        public static SerializationInfo CreateSerializationInfoRemovingMember<T>(string memberName)\r
-            where T : ISerializable, new()\r
-        {\r
-            return CreateSerializationInfoRemovingMember(memberName, () => new T());\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a new instance of <see cref="SerializationInfo"/> removing the specified member name.\r
-        /// </summary>\r
-        public static SerializationInfo CreateSerializationInfoRemovingMember<T>(string memberName, Func<T> creator)\r
-            where T : ISerializable\r
-        {\r
-            T serializableObject = creator();\r
-\r
-            var info = GetObjectDataFrom(serializableObject);\r
-\r
-            return CloneRemovingMember<T>(info, memberName);\r
-        }\r
-\r
-        private static SerializationInfo CloneReplacingMember<T>(SerializationInfo info, string memberName, object value)\r
-        {\r
-            return Clone<T>(info, (entry, clone) =>\r
-            {\r
-                if (entry.Name != memberName)\r
-                {\r
-                    return true;\r
-                }\r
-\r
-                // Replace the entry\r
-                clone.AddValue(entry.Name, value, value == null ? entry.ObjectType : value.GetType());\r
-                return false;\r
-            });\r
-        }\r
-\r
-        private static SerializationInfo CloneRemovingMember<T>(SerializationInfo info, string memberName)\r
-        {\r
-            return Clone<T>(info, (entry, clone) =>\r
-            {\r
-                // Add everything except the member we want to remove\r
-                return entry.Name != memberName;\r
-            });\r
-        }\r
-\r
-        private static SerializationInfo Clone<T>(SerializationInfo info, Func<SerializationEntry, SerializationInfo, bool> predicate)\r
-        {\r
-            var clone = GetEmptySerializationInfo<T>();\r
-\r
-            foreach (var entry in info)\r
-            {\r
-                if (predicate(entry, clone))\r
-                {\r
-                    clone.AddValue(entry.Name, entry.Value, entry.ObjectType);\r
-                }\r
-            }\r
-\r
-            return clone;\r
-        }\r
-\r
-        private static SerializationInfo GetObjectDataFrom<T>(T serializableObject) where T : ISerializable\r
-        {\r
-            var info = GetEmptySerializationInfo<T>();\r
-\r
-            serializableObject.GetObjectData(info, new StreamingContext());\r
-\r
-            return info;\r
-        }\r
-\r
-        private static SerializationInfo GetEmptySerializationInfo<T>()\r
-        {\r
-            StrictFormatterConverter converter = new StrictFormatterConverter();\r
-\r
-            return new SerializationInfo(typeof(T), converter);\r
-        }\r
-    }\r
-}\r
-\r
-#endif // !SILVERLIGHT
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/StrictFormatterConverter.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/Runtime/Serialization/StrictFormatterConverter.cs
deleted file mode 100644 (file)
index 29e68d7..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-\r
-namespace System.Runtime.Serialization\r
-{\r
-    /// <summary>\r
-    ///     Represents an <see cref="IFormatterConverter"/> where no conversion is actually performed.\r
-    /// </summary>\r
-    public class StrictFormatterConverter : IFormatterConverter\r
-    {\r
-        public object Convert(object value, TypeCode typeCode)\r
-        {\r
-            return value;\r
-        }\r
-\r
-        public object Convert(object value, Type type)\r
-        {\r
-            return value;\r
-        }\r
-\r
-        public bool ToBoolean(object value)\r
-        {\r
-            return (bool)value;\r
-        }\r
-\r
-        public byte ToByte(object value)\r
-        {\r
-            return (byte)value;\r
-        }\r
-\r
-        public char ToChar(object value)\r
-        {\r
-            return (char)value;\r
-        }\r
-\r
-        public DateTime ToDateTime(object value)\r
-        {\r
-            return (DateTime)value;\r
-        }\r
-\r
-        public decimal ToDecimal(object value)\r
-        {\r
-            return (decimal)value;\r
-        }\r
-\r
-        public double ToDouble(object value)\r
-        {\r
-            return (double)value;\r
-        }\r
-\r
-        public short ToInt16(object value)\r
-        {\r
-            return (short)value;\r
-        }\r
-\r
-        public int ToInt32(object value)\r
-        {\r
-            return (int)value;\r
-        }\r
-\r
-        public long ToInt64(object value)\r
-        {\r
-            return (long)value;\r
-        }\r
-\r
-        [CLSCompliant(false)]\r
-        public sbyte ToSByte(object value)\r
-        {\r
-            return (sbyte)value;\r
-        }\r
-\r
-        public float ToSingle(object value)\r
-        {\r
-            return (float)value;\r
-        }\r
-\r
-        public string ToString(object value)\r
-        {\r
-            return (string)value;\r
-        }\r
-\r
-        [CLSCompliant(false)]\r
-        public ushort ToUInt16(object value)\r
-        {\r
-            return (ushort)value;\r
-        }\r
-\r
-        [CLSCompliant(false)]\r
-        public uint ToUInt32(object value)\r
-        {\r
-            return (uint)value;\r
-        }\r
-\r
-        [CLSCompliant(false)]\r
-        public ulong ToUInt64(object value)\r
-        {\r
-            return (ulong)value;\r
-        }\r
-    }\r
-}\r
-\r
-#endif // !SILVERLIGHT
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/TypeExtensions.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/TypeExtensions.cs
deleted file mode 100644 (file)
index 55d0fb1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System\r
-{\r
-    public static class TypeExtensions\r
-    {\r
-        public static MemberInfo GetSingleMember(this Type type, string name)\r
-        {\r
-            Assert.IsNotNull(type);\r
-            Assert.IsNotNull(name);\r
-\r
-            return type.GetMember(name).Single();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/.gitattributes b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/.gitattributes
deleted file mode 100644 (file)
index 7c48b21..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/EnumerableAssert.cs -crlf
-/ExceptionAssert.cs -crlf
-/ExpectationCollectionOfI.cs -crlf
-/ExpectationCollectionOfIO.cs -crlf
-/ExpectationOfI.cs -crlf
-/ExpectationOfIO.cs -crlf
-/ExtendedAssert.cs -crlf
-/ReflectionAssert.cs -crlf
-/RetryMode.cs -crlf
-/TestServices.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/EnumerableAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/EnumerableAssert.cs
deleted file mode 100644 (file)
index 3533118..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Collections;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public static class EnumerableAssert\r
-    {\r
-        public static void IsTrueForAll<T>(IEnumerable<T> source, Predicate<T> predicate)\r
-        {\r
-            IsTrueForAll(source, predicate, "IsTrueForAll Failed");\r
-        }\r
-\r
-        public static void IsTrueForAll<T>(IEnumerable<T> source, Predicate<T> predicate, string message)\r
-        {\r
-            Assert.IsNotNull(source, "Source should not be null!");\r
-\r
-            foreach (T t in source)\r
-            {\r
-                Assert.IsTrue(predicate(t), message);\r
-            }\r
-        }\r
-\r
-        // Needed to prevent strings from matching to the plain IEnumerable overload\r
-        public static void AreEqual(IEnumerable actual, params string[] expected)\r
-        {\r
-            AreEqual((IEnumerable)expected, (IEnumerable)actual);\r
-        }\r
-\r
-        public static void AreEqual(IEnumerable actual, params object[] expected)\r
-        {\r
-            AreEqual((IEnumerable)expected, (IEnumerable)actual);\r
-        }\r
-\r
-        public static void AreEqual<T>(IEnumerable<T> actual, params T[] expected)\r
-        {\r
-            AreEqual<T>((IEnumerable<T>)expected, (IEnumerable<T>)actual);\r
-        }\r
-\r
-        public static void AreEqual(IEnumerable expected, IEnumerable actual)\r
-        {\r
-            Assert.AreEqual(expected.Count(), actual.Count(), "Enumerable should contain the correct number of items");\r
-\r
-            List<object> actualList = actual.ToList();\r
-\r
-            foreach (object value in expected)\r
-            {\r
-                bool removed = actualList.Remove(value);\r
-\r
-                Assert.IsTrue(removed, "Enumerable does not contain value {0}.", value);\r
-            }\r
-\r
-            Assert.AreEqual(0, actualList.Count, "Enumerable contains extra values.");\r
-        }\r
-\r
-        public static void AreEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual)\r
-        {\r
-            // First, test the IEnumerable implementation\r
-            AreEqual((IEnumerable)expected, (IEnumerable)actual);\r
-\r
-            // Second, test the IEnumerable<T> implementation\r
-            Assert.AreEqual(expected.Count(), actual.Count(), "Enumerable should contain the correct number of items");\r
-\r
-            List<T> actualList = actual.ToList();\r
-\r
-            foreach (T value in expected)\r
-            {\r
-                bool removed = actualList.Remove(value);\r
-\r
-                Assert.IsTrue(removed, "Enumerable does not contain value {0}.", value);\r
-            }\r
-\r
-            Assert.AreEqual(0, actualList.Count, "Enumerable contains extra values.");\r
-        }\r
-\r
-        // Needed to prevent strings from matching to the plain IEnumerable overload\r
-        public static void AreSequenceEqual(IEnumerable actual, params string[] expected)\r
-        {   \r
-            AreEqual((IEnumerable)expected, (IEnumerable)actual);\r
-        }\r
-\r
-        public static void AreSequenceEqual(IEnumerable actual, params object[] expected)\r
-        {\r
-            AreEqual((IEnumerable)expected, (IEnumerable)actual);\r
-        }\r
-\r
-        public static void AreSequenceEqual(IEnumerable expected, IEnumerable actual)\r
-        {\r
-            AreSequenceEqual(expected, actual, (Action<int, object, object>)null);\r
-        }\r
-\r
-        public static void AreSequenceEqual(IEnumerable expected, IEnumerable actual, Action<int, object, object> comparer)\r
-        {\r
-            if (comparer == null)\r
-            {\r
-                comparer = (i, left, right) => Assert.AreEqual(left, right, "Enumerable at index {0} should have same value", i);\r
-            }\r
-\r
-            int expectedCount = expected.Count();\r
-\r
-            Assert.AreEqual(expectedCount, actual.Count(), "Enumerable should contain the correct number of items");\r
-\r
-            IEnumerator actualEnumerator = actual.GetEnumerator();\r
-            IEnumerator expectedEnumerator = expected.GetEnumerator();\r
-\r
-            int index = 0;\r
-            while (index < expectedCount)\r
-            {\r
-                Assert.IsTrue(actualEnumerator.MoveNext());\r
-                Assert.IsTrue(expectedEnumerator.MoveNext());\r
-\r
-                comparer(index, expectedEnumerator.Current, actualEnumerator.Current);\r
-                index++;\r
-            }\r
-        }\r
-\r
-        public static void AreSequenceEqual<T>(IEnumerable<T> actual, params T[] expected)\r
-        {\r
-            AreSequenceEqual<T>((IEnumerable<T>)expected, (IEnumerable<T>)actual);\r
-        }\r
-\r
-        public static void AreSequenceEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual)\r
-        {\r
-            AreSequenceEqual<T>(expected, actual, (Action<int, T, T>)null);\r
-        }\r
-\r
-        public static void AreSequenceEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual, Action<int, T, T> comparer)\r
-        {\r
-            if (comparer == null)\r
-            {\r
-                comparer = (i, left, right) => Assert.AreEqual(left, right, "Enumerable at index {0} should have same value", i);\r
-            }\r
-\r
-            // First, test the IEnumerable implementation\r
-            AreSequenceEqual((IEnumerable)expected, (IEnumerable)actual, (Action<int, object, object>)((currentIndex, left, right) => comparer(currentIndex, (T)left, (T)right)));\r
-\r
-            // Second, test the IEnumerable<T> implementation\r
-            int expectedCount = expected.Count();\r
-\r
-            IEnumerator<T> actualEnumerator = actual.GetEnumerator();\r
-            IEnumerator<T> expectedEnumerator = expected.GetEnumerator();\r
-\r
-            int index = 0;\r
-            while (index < expectedCount)\r
-            {\r
-                Assert.IsTrue(actualEnumerator.MoveNext());\r
-                Assert.IsTrue(expectedEnumerator.MoveNext());\r
-\r
-                comparer(index, expectedEnumerator.Current, actualEnumerator.Current);                \r
-                index++;\r
-            }\r
-        }\r
-\r
-        public static void AreSequenceSame<T>(IEnumerable<T> expected, IEnumerable<T> actual)\r
-        {\r
-            AreSequenceEqual<T>(expected, actual, (index, left, right) =>\r
-            {\r
-                Assert.AreSame(left, right, "Enumerable at index {0} should have same value", index);\r
-            });\r
-        }\r
-\r
-        public static void AreEqual<TKey, TValue>(IDictionary<TKey, TValue> expected, IDictionary<TKey, TValue> actual)\r
-        {\r
-            Assert.AreEqual(expected.Count, actual.Count, "Dictionaries are different : first has '{0} elements, whereas second has '{1}", expected.Count, actual.Count);\r
-\r
-            foreach (KeyValuePair<TKey, TValue> kvp in expected)\r
-            {\r
-                TValue firstValue = kvp.Value;\r
-                TValue secondValue = default(TValue);\r
-                if (!actual.TryGetValue(kvp.Key, out secondValue))\r
-                {\r
-                    Assert.Fail("Dictionaries are different : There is no item with key '{0}' in the second dictionary", kvp.Key);\r
-                }\r
-\r
-                if ((firstValue is IDictionary<TKey, TValue>) && (secondValue is IDictionary<TKey, TValue>))\r
-                {\r
-                    AreEqual((IDictionary<TKey, TValue>)firstValue, (IDictionary<TKey, TValue>)secondValue);\r
-                    continue;\r
-                }\r
-\r
-                Assert.AreEqual(kvp.Value, secondValue, "Dictionaries are different : values for key '{0}' are different - '{1}' vs '{2}'", kvp.Key, firstValue, secondValue);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified enumerable is empty.\r
-        /// </summary>\r
-        public static void IsEmpty(IEnumerable source)\r
-        {\r
-            IsEmpty(source, null);\r
-        }\r
-\r
-        public static void IsEmpty(IEnumerable source, string message)\r
-        {\r
-            Assert.AreEqual(0, source.Count(), message);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExceptionAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExceptionAssert.cs
deleted file mode 100644 (file)
index c75dcc7..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Runtime.Serialization;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public static class ExceptionAssert\r
-    {\r
-        // NOTE: To catch state corrupting exceptions, it by design that \r
-        // the ThrowsXXX methods retry by default. To prevent this in a \r
-        // test, simply use one of the overloads that takes a RetryMode.\r
-\r
-        /// <summary>\r
-        ///     Verifies that the exception has the default message generated by the base Exception class.\r
-        /// </summary>\r
-        public static void HasDefaultMessage(Exception exception)\r
-        {\r
-            Assert.IsNotNull(exception);\r
-\r
-            // Exception of type '[typename]' was thrown\r
-            StringAssert.Contains(exception.Message, exception.GetType().FullName);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws a SerializationException.\r
-        /// </summary>\r
-        public static SerializationException ThrowsSerialization(string memberName, Action action)\r
-        {\r
-            var exception = Throws<SerializationException>(RetryMode.Retry, action, (actual, retryCount) =>\r
-            {\r
-                AssertSerializationMemberName(memberName, actual, retryCount);\r
-            });\r
-\r
-            return exception;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an ObjectDisposedException.\r
-        /// </summary>\r
-        public static ObjectDisposedException ThrowsDisposed(object instance, Action action)            \r
-        {\r
-            var exception = Throws<ObjectDisposedException>(RetryMode.Retry, action, (actual, retryCount) =>\r
-            {\r
-                AssertObjectDisposed(instance, actual, retryCount);\r
-            });\r
-\r
-            return exception;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an ArgumentNullException.\r
-        /// </summary>\r
-        public static ArgumentNullException ThrowsArgumentNull(string parameterName, Action action)\r
-        {\r
-            return ThrowsArgument<ArgumentNullException>(parameterName, action);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an ArgumentException.\r
-        /// </summary>\r
-        public static ArgumentException ThrowsArgument(string parameterName, Action action)\r
-        {\r
-            return ThrowsArgument<ArgumentException>(parameterName, action);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an ArgumentException of type <typeparam name="T"/>.\r
-        /// </summary>\r
-        public static T ThrowsArgument<T>(string parameterName, Action action)\r
-            where T : ArgumentException\r
-        {\r
-            var exception = Throws<T>(RetryMode.Retry, action, (actual, retryCount) =>\r
-            {\r
-                AssertSameParameterName(parameterName, actual, retryCount);\r
-            });\r
-\r
-            return exception;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>,\r
-        ///     with the specified inner exception of type <typeparam name="TInner"/>.\r
-        /// </summary>\r
-        public static T Throws<T, TInner>(Action action)\r
-            where T : Exception\r
-            where TInner : Exception\r
-        {\r
-            return Throws<T, TInner>(RetryMode.Retry, action);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>,\r
-        ///     with the specified inner exception of type <typeparam name="TInner"/>, and indicating \r
-        ///     whether to retry.\r
-        /// </summary>\r
-        public static T Throws<T, TInner>(RetryMode retry, Action action)\r
-            where T : Exception\r
-            where TInner : Exception\r
-        {\r
-            return Throws<T, TInner>(retry, action, (Action<T, int>)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>,\r
-        ///     with the specified inner exception of type <typeparam name="TInner"/>, indicating \r
-        ///     whether to retry and running the specified validator.\r
-        /// </summary>\r
-        public static T Throws<T, TInner>(RetryMode retry, Action action, Action<T, int> validator)\r
-            where T : Exception\r
-            where TInner : Exception\r
-        {\r
-            var exception = Throws<T>(retry, action, (actual, retryCount) =>\r
-            {\r
-                AssertIsExactInstanceOfInner(typeof(TInner), actual, retryCount);\r
-\r
-                if (validator != null)\r
-                {\r
-                    validator(actual, retryCount);\r
-                }\r
-            });\r
-\r
-            return exception;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>,\r
-        ///     with the specified inner exception.\r
-        /// </summary>\r
-        public static T Throws<T>(Exception innerException, Action action)\r
-            where T : Exception\r
-        {\r
-            return Throws<T>(innerException, RetryMode.Retry, action, (Action<T, int>)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>,\r
-        ///     with the specified inner exception, and indicating whether to retry.\r
-        /// </summary>\r
-        public static T Throws<T>(Exception innerException, RetryMode retry, Action action)\r
-            where T : Exception\r
-        {\r
-            return Throws<T>(innerException, RetryMode.Retry, action, (Action<T, int>)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>,\r
-        ///     with the specified inner exception, indicating whether to retry and running the \r
-        ///     specified validator.\r
-        /// </summary>\r
-        public static T Throws<T>(Exception innerException, RetryMode retry, Action action, Action<T, int> validator)\r
-            where T : Exception\r
-        {\r
-            T exception = Throws<T>(retry, action, (actual, retryCount) =>\r
-            {\r
-                AssertSameInner(innerException, actual, retryCount);\r
-\r
-                if (validator != null)\r
-                {\r
-                    validator(actual, retryCount);\r
-                }\r
-            });\r
-\r
-            return exception;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>.\r
-        /// </summary>\r
-        public static T Throws<T>(Action action)\r
-            where T : Exception\r
-        {\r
-            return Throws<T>(RetryMode.Retry, action, (Action<T, int>)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>, \r
-        ///     indicating whether to retry.\r
-        /// </summary>\r
-        public static T Throws<T>(RetryMode retry, Action action)\r
-            where T : Exception\r
-        {\r
-            return Throws<T>(retry, action, (Action<T, int>)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws an exception of type <typeparam name="T"/>, \r
-        ///     indicating whether to retry and running the specified validator.\r
-        /// </summary>\r
-        public static T Throws<T>(RetryMode retry, Action action, Action<T, int> validator)\r
-            where T : Exception\r
-        {\r
-            var exception = (T)Run(retry, action, (actual, retryCount) =>\r
-            {\r
-                AssertIsExactInstanceOf(typeof(T), actual, retryCount);\r
-\r
-                if (validator != null)\r
-                {\r
-                    validator((T)actual, retryCount);\r
-                }\r
-            });\r
-\r
-            return exception;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws the specified exception.\r
-        /// </summary>\r
-        public static void Throws(Exception expected, Action action)\r
-        {\r
-            Throws(expected, RetryMode.Retry, action);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws the specified exception,\r
-        ///     indicating whether to retry.\r
-        /// </summary>\r
-        public static void Throws(Exception expected, RetryMode retry, Action action)\r
-        {\r
-            Throws(expected, retry, action, (Action<Exception, int>)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Verifies that the specified action throws the specified exception,\r
-        ///     indicating whether to retry and running the specified validator.\r
-        /// </summary>\r
-        public static void Throws(Exception expected, RetryMode retry, Action action, Action<Exception, int> validator)\r
-        {\r
-            Run(retry, action, (actual, retryCount) =>\r
-            {\r
-                AssertSame(expected, actual, retryCount);\r
-\r
-                if (validator != null)\r
-                {\r
-                    validator(actual, retryCount);\r
-                }\r
-            });\r
-        }\r
-\r
-        private static Exception Run(RetryMode retry, Action action, Action<Exception, int> validator)\r
-        {\r
-            Exception exception = null;\r
-\r
-            for (int i = -1; i < (int)retry; i++)\r
-            {\r
-                exception = Run(action);\r
-\r
-                validator(exception, i + 2);\r
-            }\r
-\r
-            return exception;\r
-        }\r
-\r
-        private static Exception Run(Action action)\r
-        {\r
-            try\r
-            {\r
-                action();\r
-                return null;\r
-            }\r
-            catch (Exception ex)\r
-            {\r
-                return ex;\r
-            }\r
-        }\r
-\r
-        private static void AssertSerializationMemberName(string memberName, SerializationException actual, int retryCount)\r
-        {\r
-            // Unfortunately, SerializationException does not provide a way to get our hands on the\r
-            // the actual member that was missing from the SerializationInfo, so we need to grok the \r
-            // message string.\r
-\r
-            // Member '[memberName]' was not found.\r
-            StringAssert.Contains(actual.Message, "'" + memberName + "'", "Retry Count {0}: Expected SerializationException MemberName to be '{1}'", retryCount, memberName);\r
-        }\r
-\r
-        private static void AssertObjectDisposed(object instance, ObjectDisposedException actual, int retryCount)\r
-        {\r
-            string objectName = instance.GetType().FullName;\r
-\r
-            Assert.AreEqual(objectName, actual.ObjectName, "Retry Count {0}: Expected {1}.ObjectName to be '{2}', however, '{3}' is.", retryCount, actual.GetType().Name, objectName, actual.ObjectName);\r
-        }\r
-\r
-        private static void AssertSameParameterName(string parameterName, ArgumentException actual, int retryCount)\r
-        {\r
-#if !SILVERLIGHT    \r
-            Assert.AreEqual(parameterName, actual.ParamName, "Retry Count {0}: Expected {1}.ParamName to be '{2}', however, '{3}' is.", retryCount, actual.GetType().Name, parameterName, actual.ParamName);\r
-#else\r
-            // Silverlight doesn't have ArgumentException.ParamName\r
-            StringAssert.Contains(actual.Message, parameterName, "Retry Count {0}: Expected {1}.ParamName to be '{2}'", retryCount, actual.GetType().Name, parameterName);\r
-#endif\r
-        }\r
-\r
-        private static void AssertSame(Exception expected, Exception actual, int retryCount)\r
-        {\r
-            Assert.AreSame(expected, actual, "Retry Count {0}: Expected '{1}' to be thrown, however, '{2}' was thrown.", retryCount, expected, actual);\r
-        }\r
-\r
-        private static void AssertSameInner(Exception innerException, Exception actual, int retryCount)\r
-        {\r
-            Assert.AreSame(innerException, actual.InnerException, "Retry Count {0}: Expected '{1}' to be the inner exception, however, '{2}' is.", retryCount, innerException, actual.InnerException);\r
-        }\r
-\r
-        private static void AssertIsExactInstanceOf(Type expectedType, Exception actual, int retryCount)\r
-        {\r
-            if (actual == null)\r
-                Assert.Fail("Retry Count {0}: Expected '{1}' to be thrown", retryCount, expectedType);\r
-\r
-            Type actualType = actual.GetType();\r
-\r
-            Assert.AreSame(expectedType, actualType, "Retry Count {0}: Expected '{1}' to be thrown, however, '{2}' was thrown.", retryCount, expectedType, actualType);\r
-        }\r
-\r
-        private static void AssertIsExactInstanceOfInner(Type expectedType, Exception actual, int retryCount)\r
-        {\r
-            if (actual.InnerException == null)\r
-                Assert.Fail("Retry Count {0}: Expected '{1}' be the inner exception, however, it is null.", retryCount, expectedType);\r
-\r
-            Type actualType = actual.InnerException.GetType();\r
-\r
-            Assert.AreSame(expectedType, actualType, "Retry Count {0}: Expected '{1}' to be the inner exception, however, '{2}' is.", retryCount, expectedType, actualType);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationCollectionOfI.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationCollectionOfI.cs
deleted file mode 100644 (file)
index 718c898..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.ObjectModel;\r
-using System.Collections.Generic;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public class ExpectationCollection<TInputAndOutput> : Collection<Expectation<TInputAndOutput>>\r
-    {\r
-        public void Add(TInputAndOutput inputAndOutput)\r
-        {\r
-            Add(inputAndOutput, inputAndOutput);\r
-        }\r
-\r
-        public void AddRange(IEnumerable<TInputAndOutput> inputAndOutputs)\r
-        {\r
-            foreach (TInputAndOutput inputAndOutput in inputAndOutputs)\r
-            {\r
-                Add(inputAndOutput);\r
-            }\r
-        }\r
-\r
-        public void Add(TInputAndOutput input, TInputAndOutput output)\r
-        {\r
-            Add(new Expectation<TInputAndOutput>(input, output));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationCollectionOfIO.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationCollectionOfIO.cs
deleted file mode 100644 (file)
index f323eb5..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.ObjectModel;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public class ExpectationCollection<TInput, TOutput> : Collection<Expectation<TInput, TOutput>>\r
-    {\r
-        public void Add(TInput input, TOutput output)\r
-        {\r
-            Add(new Expectation<TInput, TOutput>(input, output));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationOfI.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationOfI.cs
deleted file mode 100644 (file)
index 7670f8c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public class Expectation<TInputAndOutput> : Expectation<TInputAndOutput, TInputAndOutput>\r
-    {\r
-        public Expectation(TInputAndOutput input, TInputAndOutput output)\r
-            : base(input, output)\r
-        {\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationOfIO.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExpectationOfIO.cs
deleted file mode 100644 (file)
index 00e1b7b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public class Expectation<TInput, TOutput>\r
-    {\r
-        public Expectation(TInput input, TOutput output)\r
-        {\r
-            Input = input;\r
-            Output = output;\r
-        }\r
-\r
-        public TInput Input\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public TOutput Output\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExtendedAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ExtendedAssert.cs
deleted file mode 100644 (file)
index 97b605c..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.IO;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public static class ExtendedAssert\r
-    {\r
-        /// <summary>\r
-        ///     Verifies that the two specified objects are an instance of the same type.\r
-        /// </summary>\r
-        public static void IsInstanceOfSameType(object expected, object actual)\r
-        {\r
-            if (expected == null || actual == null)\r
-            {\r
-                Assert.AreSame(expected, actual);\r
-                return;\r
-            }\r
-\r
-            Assert.AreSame(expected.GetType(), actual.GetType());\r
-        }\r
-\r
-        public static void ContainsLines(string value, params string[] lines)\r
-        {\r
-            StringReader reader = new StringReader(value);\r
-\r
-            int count = 0;\r
-            string line;\r
-            while ((line = reader.ReadLine()) != null)\r
-            {\r
-                if (count == lines.Length)\r
-                {\r
-                    Assert.Fail();\r
-                }\r
-\r
-                StringAssert.Contains(line, lines[count]);\r
-\r
-                count++;\r
-            }\r
-\r
-            Assert.AreEqual(lines.Length, count, "Expectation: {0}; Result: {1}", String.Join(Environment.NewLine, lines), value);\r
-        }\r
-\r
-        public static void EnumsContainSameValues<TEnum1, TEnum2>()\r
-            where TEnum1 : struct\r
-            where TEnum2 : struct\r
-        {\r
-            EnumsContainSameValuesCore<TEnum1, TEnum2>();\r
-            EnumsContainSameValuesCore<TEnum2, TEnum1>();            \r
-        }\r
-\r
-        private static void EnumsContainSameValuesCore<TEnum1, TEnum2>()\r
-            where TEnum1 : struct\r
-            where TEnum2 : struct\r
-        {\r
-            var values = TestServices.GetEnumValues<TEnum1>();\r
-\r
-            foreach (TEnum1 value in values)\r
-            {\r
-                string name1 = Enum.GetName(typeof(TEnum1), value);\r
-                string name2 = Enum.GetName(typeof(TEnum2), value);\r
-\r
-                Assert.AreEqual(name1, name2, "{0} contains a value that {1} does not have. These enums need to be in sync.", typeof(TEnum1), typeof(TEnum2));\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ReflectionAssert.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/ReflectionAssert.cs
deleted file mode 100644 (file)
index bc0fca3..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-using System.Reflection;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    // Unfortunately, you can't rely on reference equality for MemberInfo and ParameterInfo\r
-    // objects because, you may get different instances representing the same members depending\r
-    // on the type that the member was retrieived from.\r
-\r
-    public static class ReflectionAssert\r
-    {\r
-        public static void AreSame(MemberInfo expected, MemberInfo actual)\r
-        {\r
-            if (expected == null && actual == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            Assert.AreEqual(expected.MetadataToken, actual.MetadataToken);\r
-            Assert.AreSame(expected.Module, actual.Module);\r
-            Assert.AreEqual(expected.MemberType, actual.MemberType);            \r
-        }\r
-\r
-        public static void AreSame(ParameterInfo expected, ParameterInfo actual)\r
-        {\r
-            if (expected == null && actual == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            ReflectionAssert.AreSame(expected.Member, actual.Member);\r
-            Assert.AreEqual(expected.MetadataToken, actual.MetadataToken);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/RetryMode.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/RetryMode.cs
deleted file mode 100644 (file)
index bdda321..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.VisualStudio.TestTools.UnitTesting;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public enum RetryMode : int\r
-    {\r
-        DoNotRetry = 0,\r
-        Retry = 1,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/TestServices.cs b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/System/UnitTesting/TestServices.cs
deleted file mode 100644 (file)
index 87032d7..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-using System.Collections.Generic;\r
-\r
-namespace System.UnitTesting\r
-{\r
-    public static class TestServices\r
-    {\r
-        public static string GenerateRandomString()\r
-        {\r
-            return Guid.NewGuid().ToString().Replace('-', '_');\r
-        }\r
-\r
-        public static IEnumerable<TEnum> GetEnumValues<TEnum>() where TEnum : struct\r
-        {   // Silverlight 2.0 does not have Enum.GetValues() \r
-            // so we need to write our own\r
-\r
-            foreach (FieldInfo field in typeof(TEnum).GetFields())\r
-            {\r
-                if (!field.IsLiteral)\r
-                    continue;\r
-\r
-                yield return (TEnum)field.GetRawConstantValue();\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/UnitTestFramework.csproj b/mcs/class/System.ComponentModel.Composition/Tests/UnitTestFramework/UnitTestFramework.csproj
deleted file mode 100644 (file)
index 3bde43f..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">\r
-    <CodeAnalysisRuleSet>Migrated rules for UnitTestFramework.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules />\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <OutputPath>..\..\bin</OutputPath>\r
-    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>\r
-    <NoWarn>1570;1572;1573;1591;1699</NoWarn>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{35FBE8A0-D87E-4991-B3FC-2A77807DEC85}</ProjectGuid>\r
-    <ProjectClrTypes>FULLCLR;SILVERLIGHT</ProjectClrTypes>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition.UnitTestFramework</AssemblyName>\r
-    <FileAlignment>512</FileAlignment>\r
-    <NoWarn>;1699;1570;1572;1573;1591;0414</NoWarn>\r
-    <PublishUrl>publish\</PublishUrl>\r
-    <Install>true</Install>\r
-    <InstallFrom>Disk</InstallFrom>\r
-    <UpdateEnabled>false</UpdateEnabled>\r
-    <UpdateMode>Foreground</UpdateMode>\r
-    <UpdateInterval>7</UpdateInterval>\r
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
-    <UpdatePeriodically>false</UpdatePeriodically>\r
-    <UpdateRequired>false</UpdateRequired>\r
-    <MapFileExtensions>true</MapFileExtensions>\r
-    <ApplicationRevision>0</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
-    <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <UseApplicationTrust>false</UseApplicationTrust>\r
-    <BootstrapperEnabled>true</BootstrapperEnabled>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <NoStdLib>true</NoStdLib>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib" />\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="System.Xml" />\r
-    <ProjectReference Include="..\..\src\ComponentModel\ComponentModel.csproj">\r
-      <Project>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</Project>\r
-      <Name>ComponentModel</Name>\r
-    </ProjectReference>\r
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />\r
-  </ItemGroup>\r
-  <ItemGroup Condition=" '$(IsSilverlight)' == 'true' ">\r
-    <ProjectReference Include="$(CMInitProjectPath)\Composition.Initialization.csproj">\r
-      <Project>{A497DC28-0A3B-4BAD-B964-B8B436686D98}</Project>\r
-      <Name>Composition.Initialization</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="System\Collections\EnumerableExtensions.cs" />\r
-    <Compile Include="System\Collections\Generic\DictionaryExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ConstraintParser.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceContext.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceContext.TraceContextTraceListener.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceEventDetails.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\UnitTesting\CompositionAssert.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\UnitTesting\ErrorId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\UnitTesting\ElementAssert.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\UnitTesting\ExportsAssert.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionHostTestService.cs" />\r
-    <Compile Include="System\IO\TemporaryFileCopier.cs" />\r
-    <Compile Include="System\IO\TemporaryFile.cs" />\r
-    <Compile Include="System\ReferenceTracker.cs" />\r
-    <Compile Include="System\Globalization\CurrentCultureContext.cs" />\r
-    <Compile Include="System\IO\FileIO.cs" />\r
-    <Compile Include="System\IO\TemporaryDirectory.cs" />\r
-    <Compile Include="System\DisposableObject.cs" />\r
-    <Compile Include="System\Runtime\Serialization\StrictFormatterConverter.cs" />\r
-    <Compile Include="System\Runtime\Serialization\SerializationTestServices.cs" />\r
-    <Compile Include="System\TypeExtensions.cs" />\r
-    <Compile Include="System\UnitTesting\ExtendedAssert.cs" />\r
-    <Compile Include="System\UnitTesting\RetryMode.cs" />\r
-    <Compile Include="System\UnitTesting\ExpectationCollectionOfIO.cs" />\r
-    <Compile Include="System\UnitTesting\ExpectationCollectionOfI.cs" />\r
-    <Compile Include="System\UnitTesting\ExpectationOfIO.cs" />\r
-    <Compile Include="System\UnitTesting\ExpectationOfI.cs" />\r
-    <Compile Include="System\UnitTesting\TestServices.cs" />\r
-    <Compile Include="System\UnitTesting\ReflectionAssert.cs" />\r
-    <Compile Include="System\UnitTesting\EnumerableAssert.cs" />\r
-    <Compile Include="System\UnitTesting\ExceptionAssert.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionModelServicesEx.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
-      <Visible>False</Visible>\r
-      <ProductName>Windows Installer 3.1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />\r
-</Project>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/.gitattributes
deleted file mode 100644 (file)
index 5bebade..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-/AssemblyInfo.cs -crlf
-/SilverlightAdditions.cs -crlf
-/Strings.Designer.cs -crlf
-/Strings.resx -crlf
-/SuppressMessages.cs -crlf
-/SuppressMessagesBaselined.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/AssemblyInfo.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/AssemblyInfo.cs
deleted file mode 100644 (file)
index e77ac0d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-\r
-[assembly: System.CLSCompliant(true)]\r
-[assembly: System.Reflection.AssemblyTitle("System.ComponentModel.Composition")]\r
-[assembly: System.Reflection.AssemblyCopyright("(c) Microsoft Corporation. All rights reserved.")]\r
-[assembly: System.Reflection.AssemblyVersion(Consts.FxVersion)]\r
-[assembly: System.Reflection.AssemblyKeyFile ("../ecma.pub")]\r
-[assembly: System.Reflection.AssemblyDelaySign (true)]\r
-//[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.ComponentModel.Composition.UnitTests")]\r
-//[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.ComponentModel.Composition.UnitTestFramework")]\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModel - SL.csproj b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModel - SL.csproj
deleted file mode 100644 (file)
index 819645d..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A36AEF66-2411-4225-B68E-F2D29368A31B}</ProjectGuid>\r
-    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Microsoft.Internal</RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>..\..\bin\SL</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>\r
-    <NoStdLib>true</NoStdLib>\r
-    <NoConfig>true</NoConfig>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <NoWarn>1570;1572;1573;1591;1699</NoWarn>\r
-    <DocumentationFile>..\..\bin\SL\System.ComponentModel.Composition.xml</DocumentationFile>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib" />\r
-    <Reference Include="system" />\r
-    <Reference Include="System.Core" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft\Internal\Assumes.cs" />\r
-    <Compile Include="Microsoft\Internal\Assumes.InternalErrorException.cs" />\r
-    <Compile Include="Microsoft\Internal\AttributeServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ConditionalWeakTable.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\EnumerableCardinality.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionary.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionaryDebuggerProxy.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\WeakReferenceCollection.cs" />\r
-    <Compile Include="Microsoft\Internal\ContractServices.cs" />\r
-    <Compile Include="Microsoft\Internal\GenerationServices.cs" />\r
-    <Compile Include="Microsoft\Internal\LazyServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="Microsoft\Internal\ReflectionServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="Microsoft\Internal\Runtime\Serialization\SerializationServices.cs" />\r
-    <Compile Include="Microsoft\Internal\StringComparers.cs" />\r
-    <Compile Include="SilverlightAdditions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModelServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ChangeRejectedException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContractMismatchException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionError.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResult.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResultOfT.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ConstraintServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ContractNameServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CreationPolicy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTrace.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceSource.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\SilverlightTraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceSourceTraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ErrorBuilder.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExceptionBuilder.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportCardinalityCheckResult.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportMetadataAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicComposition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionLock.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\IAttributedImport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ICompositionError.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ICompositionService.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportManyAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\InheritedExportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataViewGenerator.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataViewProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartCreationPolicyAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartCreatorOfT.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartCreatorOfTTMetadata.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartLifetimeContextOfT.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartMetadataAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartNotDiscoverableAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ContractBasedImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\Export.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorParameterImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionField.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItem.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItemType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMethod.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionModelServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionProperty.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />\r
-    <Compile Include="System\Lazy.cs" />\r
-    <Compile Include="System\LazyOfTTMetadata.cs" />\r
-    <Compile Include="System\Tuple.cs" />\r
-    <Compile Include="Strings.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>Strings.resx</DependentUpon>\r
-    </Compile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings.resx">\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>\r
-      <CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <ProjectExtensions>\r
-    <VisualStudio>\r
-      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">\r
-        <SilverlightProjectProperties />\r
-      </FlavorProperties>\r
-    </VisualStudio>\r
-  </ProjectExtensions>\r
-</Project>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModel.csproj b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModel.csproj
deleted file mode 100644 (file)
index 75c4836..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">\r
-    <CodeAnalysisRuleSet>Migrated rules for ComponentModel.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules />\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <OutputPath>..\..\bin</OutputPath>\r
-    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>\r
-    <NoWarn>1570;1572;1573;1591;1699</NoWarn>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <ProductVersion>10.0.20729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</ProjectGuid>\r
-    <ProjectClrTypes>FULLCLR;SILVERLIGHT</ProjectClrTypes>\r
-    <OutputType>Library</OutputType>\r
-    <RootNamespace>Microsoft.Internal</RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>\r
-    <DocumentationFile>$(OutputPath)\System.ComponentModel.Composition.xml</DocumentationFile>\r
-    <PublishUrl>publish\</PublishUrl>\r
-    <Install>true</Install>\r
-    <InstallFrom>Disk</InstallFrom>\r
-    <UpdateEnabled>false</UpdateEnabled>\r
-    <UpdateMode>Foreground</UpdateMode>\r
-    <UpdateInterval>7</UpdateInterval>\r
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
-    <UpdatePeriodically>false</UpdatePeriodically>\r
-    <UpdateRequired>false</UpdateRequired>\r
-    <MapFileExtensions>true</MapFileExtensions>\r
-    <ApplicationRevision>0</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
-    <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <UseApplicationTrust>false</UseApplicationTrust>\r
-    <BootstrapperEnabled>true</BootstrapperEnabled>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <NoStdLib>true</NoStdLib>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(USE_CUSTOM_KEY)' != 'true'">\r
-    <CreateMetaAssembly>true</CreateMetaAssembly>\r
-    <CreateRefAssembly>true</CreateRefAssembly>\r
-    <PublishMetaAssemblyToSDK>true</PublishMetaAssemblyToSDK>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib" />\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft\Internal\Assumes.cs" />\r
-    <Compile Include="Microsoft\Internal\AttributeServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ConditionalWeakTable.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\EnumerableCardinality.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionary.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionaryDebuggerProxy.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\WeakReferenceCollection.cs" />\r
-    <Compile Include="Microsoft\Internal\ContractServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Assumes.InternalErrorException.cs" />\r
-    <Compile Include="Microsoft\Internal\SilverlightReflectionInvoke.cs" />\r
-    <Compile Include="Microsoft\Internal\GenerationServices.cs" />\r
-    <Compile Include="Microsoft\Internal\LazyServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="Microsoft\Internal\Runtime\Serialization\SerializationServices.cs" />\r
-    <Compile Include="Microsoft\Internal\StringComparers.cs" />\r
-    <Compile Include="Microsoft\Internal\ReflectionServices.cs" />\r
-    <Compile Include="Strings.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>Strings.resx</DependentUpon>\r
-      <CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>\r
-    </Compile>\r
-    <Compile Include="SuppressMessages.cs" />\r
-    <Compile Include="SuppressMessagesBaselined.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModelServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTrace.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ConstraintServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContractMismatchException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionError.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResultOfT.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionLock.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceSource.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceSourceTraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\SilverlightTraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\InheritedExportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicComposition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorParameterImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\IAttributedImport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportManyAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ErrorBuilder.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExceptionBuilder.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportCardinalityCheckResult.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ICompositionError.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ContractBasedImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\Export.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionImportDefinition.cs" />\r
-    <Compile Include="Microsoft\Internal\ReflectionInvoke.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItemType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataViewProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartCreationPolicyAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartMetadataAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartNotDiscoverableAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionModelServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataViewGenerator.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionField.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionProperty.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItem.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMethod.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ChangeRejectedException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResult.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ContractNameServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CreationPolicy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportMetadataAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ICompositionService.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />\r
-    <Compile Include="System\Lazy.cs" />\r
-    <Compile Include="System\LazyOfTTMetadata.cs" />\r
-    <Compile Include="System\Tuple.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup Condition="'$(IsSilverLight)' != 'true'">\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup Condition="'$(IsSilverLight)' == 'true'">\r
-    <Compile Include="SilverlightAdditions.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings.resx">\r
-      <SubType>Designer</SubType>\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>\r
-      <CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
-      <Visible>False</Visible>\r
-      <ProductName>Windows Installer 3.1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />\r
-</Project>\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModelSL.csproj b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/ComponentModelSL.csproj
deleted file mode 100644 (file)
index be3fe5e..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">\r
-    <CodeAnalysisRuleSet>Migrated rules for ComponentModel.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules />\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <IsSilverlight>true</IsSilverlight>\r
-    <DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>\r
-    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>\r
-    <OutputPath>..\..\bin\SL</OutputPath>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <NoWarn>1570;1572;1573;1591;1699</NoWarn>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <ProductVersion>10.0.20729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</ProjectGuid>\r
-    <ProjectClrTypes>FULLCLR;SILVERLIGHT</ProjectClrTypes>\r
-    <OutputType>Library</OutputType>\r
-    <RootNamespace>Microsoft.Internal</RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>\r
-    <DocumentationFile>$(OutputPath)\System.ComponentModel.Composition.xml</DocumentationFile>\r
-    <PublishUrl>publish\</PublishUrl>\r
-    <Install>true</Install>\r
-    <InstallFrom>Disk</InstallFrom>\r
-    <UpdateEnabled>false</UpdateEnabled>\r
-    <UpdateMode>Foreground</UpdateMode>\r
-    <UpdateInterval>7</UpdateInterval>\r
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
-    <UpdatePeriodically>false</UpdatePeriodically>\r
-    <UpdateRequired>false</UpdateRequired>\r
-    <MapFileExtensions>true</MapFileExtensions>\r
-    <ApplicationRevision>0</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
-    <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <UseApplicationTrust>false</UseApplicationTrust>\r
-    <BootstrapperEnabled>true</BootstrapperEnabled>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <NoStdLib>true</NoStdLib>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(USE_CUSTOM_KEY)' != 'true'">\r
-    <CreateMetaAssembly>true</CreateMetaAssembly>\r
-    <CreateRefAssembly>true</CreateRefAssembly>\r
-    <PublishMetaAssemblyToSDK>true</PublishMetaAssemblyToSDK>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib" />\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft\Internal\Assumes.cs" />\r
-    <Compile Include="Microsoft\Internal\AttributeServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ConditionalWeakTable.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\EnumerableCardinality.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionary.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionaryDebuggerProxy.cs" />\r
-    <Compile Include="Microsoft\Internal\Collections\WeakReferenceCollection.cs" />\r
-    <Compile Include="Microsoft\Internal\ContractServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Assumes.InternalErrorException.cs" />\r
-    <Compile Include="Microsoft\Internal\SilverlightReflectionInvoke.cs" />\r
-    <Compile Include="Microsoft\Internal\GenerationServices.cs" />\r
-    <Compile Include="Microsoft\Internal\LazyServices.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="Microsoft\Internal\Runtime\Serialization\SerializationServices.cs" />\r
-    <Compile Include="Microsoft\Internal\StringComparers.cs" />\r
-    <Compile Include="Microsoft\Internal\ReflectionServices.cs" />\r
-    <Compile Include="Strings.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>Strings.resx</DependentUpon>\r
-      <CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>\r
-    </Compile>\r
-    <Compile Include="SuppressMessages.cs" />\r
-    <Compile Include="SuppressMessagesBaselined.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModelServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTrace.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ConstraintServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionContractMismatchException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionError.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResultOfT.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionLock.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceSource.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceSourceTraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\SilverlightTraceWriter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\InheritedExportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicComposition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorParameterImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\IAttributedImport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportManyAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ErrorBuilder.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExceptionBuilder.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportCardinalityCheckResult.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ICompositionError.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ContractBasedImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\Export.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionImportDefinition.cs" />\r
-    <Compile Include="Microsoft\Internal\ReflectionInvoke.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItemType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataViewProvider.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartCreationPolicyAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartMetadataAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\PartNotDiscoverableAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionExtensions.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePart.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionModelServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinition.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataViewGenerator.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionField.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMember.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameter.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionProperty.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItem.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMethod.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ChangeRejectedException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionException.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorId.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionResult.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ContractNameServices.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CreationPolicy.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportMetadataAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ICompositionService.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ImportAttribute.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />\r
-    <Compile Include="System\Lazy.cs" />\r
-    <Compile Include="System\LazyOfTTMetadata.cs" />\r
-    <Compile Include="System\Tuple.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup Condition="'$(IsSilverLight)' != 'true'">\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup Condition="'$(IsSilverLight)' == 'true'">\r
-    <Compile Include="SilverlightAdditions.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings.resx">\r
-      <SubType>Designer</SubType>\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>\r
-      <CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
-      <Visible>False</Visible>\r
-      <ProductName>Windows Installer 3.1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />\r
-</Project>\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/.gitattributes
deleted file mode 100644 (file)
index 8843daa..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/Assumes.InternalErrorException.cs -crlf
-/Assumes.cs -crlf
-/AttributeServices.cs -crlf
-/ContractServices.cs -crlf
-/GenerationServices.cs -crlf
-/LazyServices.cs -crlf
-/Lock.Reader.cs -crlf
-/Lock.Writer.cs -crlf
-/Lock.cs -crlf
-/ReflectionInvoke.cs -crlf
-/ReflectionServices.cs -crlf
-/Requires.cs -crlf
-/SilverlightReflectionInvoke.cs -crlf
-/StringComparers.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Assumes.InternalErrorException.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Assumes.InternalErrorException.cs
deleted file mode 100644 (file)
index 147e857..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Runtime.Serialization;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    partial class Assumes\r
-    {\r
-        // The exception that is thrown when an internal assumption failed.\r
-        [Serializable]\r
-        [SuppressMessage("Microsoft.Design", "CA1064:ExceptionsShouldBePublic")]\r
-        private class InternalErrorException : Exception\r
-        {\r
-            public InternalErrorException(string message)\r
-                : base(string.Format(CultureInfo.CurrentCulture, Strings.InternalExceptionMessage, message))\r
-            {\r
-            }\r
-\r
-#if !SILVERLIGHT\r
-            [System.Security.SecuritySafeCritical]\r
-            protected InternalErrorException(SerializationInfo info, StreamingContext context)\r
-                : base(info, context)\r
-            {\r
-            }\r
-#endif\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Assumes.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Assumes.cs
deleted file mode 100644 (file)
index 7b1dd6f..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Runtime.Serialization;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static partial class Assumes\r
-    {\r
-        [DebuggerStepThrough]\r
-        internal static void NotNull<T>(T value)\r
-            where T : class\r
-        {\r
-            IsTrue(value != null);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void NotNull<T1, T2>(T1 value1, T2 value2)\r
-            where T1 : class\r
-            where T2 : class\r
-        {\r
-            NotNull(value1);\r
-            NotNull(value2);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void NotNull<T1, T2, T3>(T1 value1, T2 value2, T3 value3)\r
-            where T1 : class\r
-            where T2 : class\r
-            where T3 : class\r
-        {\r
-            NotNull(value1);\r
-            NotNull(value2);\r
-            NotNull(value3);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void NotNullOrEmpty<T>(T[] values)\r
-        {\r
-            Assumes.NotNull(values);\r
-            Assumes.IsTrue(values.Length > 0);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void NotNullOrEmpty(string value)\r
-        {\r
-            NotNull(value);\r
-            IsTrue(value.Length > 0);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void Null<T>(T value)\r
-            where T : class\r
-        {\r
-            IsTrue(value == null);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void IsFalse(bool condition)\r
-        {\r
-            if (condition)\r
-            {\r
-                Fail(null);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void IsTrue(bool condition)\r
-        {\r
-            if (!condition)\r
-            {\r
-                Fail(null);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void IsTrue(bool condition, [Localizable(false)]string message)\r
-        {\r
-            if (!condition)\r
-            {\r
-                Fail(message);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static void Fail([Localizable(false)]string message)\r
-        {\r
-            throw new InternalErrorException(message);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        internal static T NotReachable<T>()\r
-        {\r
-            throw new InternalErrorException("Code path should never be reached!");\r
-        }\r
-    } \r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/AttributeServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/AttributeServices.cs
deleted file mode 100644 (file)
index 6364fa9..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Reflection;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class AttributeServices\r
-    {\r
-        public static T[] GetAttributes<T>(this ICustomAttributeProvider attributeProvider) where T : class\r
-        {\r
-            return (T[])attributeProvider.GetCustomAttributes(typeof(T), false);\r
-        }\r
-\r
-        public static T[] GetAttributes<T>(this ICustomAttributeProvider attributeProvider, bool inherit) where T : class\r
-        {\r
-            return (T[])attributeProvider.GetCustomAttributes(typeof(T), inherit);\r
-        }\r
-\r
-        public static T GetFirstAttribute<T>(this ICustomAttributeProvider attributeProvider) where T : class\r
-        {\r
-            return GetAttributes<T>(attributeProvider).FirstOrDefault();\r
-        }\r
-\r
-        public static T GetFirstAttribute<T>(this ICustomAttributeProvider attributeProvider, bool inherit) where T : class\r
-        {\r
-            return GetAttributes<T>(attributeProvider, inherit).FirstOrDefault();\r
-        }\r
-\r
-        public static bool IsAttributeDefined<T>(this ICustomAttributeProvider attributeProvider) where T : class\r
-        {\r
-            return attributeProvider.IsDefined(typeof(T), false);\r
-        }\r
-\r
-        public static bool IsAttributeDefined<T>(this ICustomAttributeProvider attributeProvider, bool inherit) where T : class\r
-        {\r
-            return attributeProvider.IsDefined(typeof(T), inherit);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/.gitattributes
deleted file mode 100644 (file)
index 71f3581..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/CollectionServices.CollectionOfObject.cs -crlf
-/CollectionServices.cs -crlf
-/ConditionalWeakTable.cs -crlf
-/EnumerableCardinality.cs -crlf
-/ReadOnlyDictionary.cs -crlf
-/ReadOnlyDictionaryDebuggerProxy.cs -crlf
-/WeakReferenceCollection.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.CollectionOfObject.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.CollectionOfObject.cs
deleted file mode 100644 (file)
index a915efc..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Reflection;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    internal static partial class CollectionServices\r
-    {\r
-        public static ICollection<object> GetCollectionWrapper(Type itemType, object collectionObject)\r
-        {\r
-            Assumes.NotNull(itemType, collectionObject);\r
-\r
-            if (itemType == typeof(object))\r
-            {\r
-                return (ICollection<object>)collectionObject;\r
-            }\r
-\r
-            // Most common .Net collections implement IList as well so for those\r
-            // cases we can optimize the wrapping instead of using reflection to create\r
-            // a generic type.\r
-            if (typeof(IList).IsAssignableFrom(collectionObject.GetType()))\r
-            {\r
-                return new CollectionOfObjectList((IList)collectionObject);\r
-            }\r
-\r
-            Type collectionType = typeof(CollectionOfObject<>).MakeGenericType(itemType);\r
-\r
-            return (ICollection<object>)Activator.CreateInstance(collectionType, collectionObject);           \r
-        }\r
-\r
-        private class CollectionOfObjectList : ICollection<object>\r
-        {\r
-            private readonly IList _list;\r
-\r
-            public CollectionOfObjectList(IList list)\r
-            {\r
-                this._list = list;\r
-            }\r
-\r
-            public void Add(object item)\r
-            {\r
-                this._list.Add(item);\r
-            }\r
-\r
-            public void Clear()\r
-            {\r
-                this._list.Clear();\r
-            }\r
-\r
-            public bool Contains(object item)\r
-            {\r
-                return Assumes.NotReachable<bool>();\r
-            }\r
-\r
-            public void CopyTo(object[] array, int arrayIndex)\r
-            {\r
-                Assumes.NotReachable<object>();\r
-            }\r
-\r
-            public int Count\r
-            {\r
-                get { return Assumes.NotReachable<int>(); }\r
-            }\r
-\r
-            public bool IsReadOnly\r
-            {\r
-                get { return this._list.IsReadOnly; }\r
-            }\r
-\r
-            public bool Remove(object item)\r
-            {\r
-                return Assumes.NotReachable<bool>();\r
-            }\r
-\r
-            public IEnumerator<object> GetEnumerator()\r
-            {\r
-                return Assumes.NotReachable<IEnumerator<object>>();\r
-            }\r
-\r
-            IEnumerator IEnumerable.GetEnumerator()\r
-            {\r
-                return Assumes.NotReachable<IEnumerator>();\r
-            }\r
-        }\r
-\r
-        private class CollectionOfObject<T> : ICollection<object>\r
-        {\r
-            private readonly ICollection<T> _collectionOfT;\r
-\r
-            public CollectionOfObject(object collectionOfT)\r
-            {\r
-                this._collectionOfT = (ICollection<T>)collectionOfT;\r
-            }\r
-\r
-            public void Add(object item)\r
-            {\r
-                this._collectionOfT.Add((T) item);\r
-            }\r
-\r
-            public void Clear()\r
-            {\r
-                this._collectionOfT.Clear();\r
-            }\r
-\r
-            public bool Contains(object item)\r
-            {\r
-                return Assumes.NotReachable<bool>();\r
-            }\r
-\r
-            public void CopyTo(object[] array, int arrayIndex)\r
-            {\r
-                Assumes.NotReachable<object>();\r
-            }\r
-\r
-            public int Count\r
-            {\r
-                get { return Assumes.NotReachable<int>(); }\r
-            }\r
-\r
-            public bool IsReadOnly\r
-            {\r
-                get { return this._collectionOfT.IsReadOnly; }\r
-            }\r
-\r
-            public bool Remove(object item)\r
-            {\r
-                return Assumes.NotReachable<bool>();\r
-            }\r
-\r
-            public IEnumerator<object> GetEnumerator()\r
-            {\r
-                return Assumes.NotReachable<IEnumerator<object>>();\r
-            }\r
-\r
-            IEnumerator IEnumerable.GetEnumerator()\r
-            {\r
-                return Assumes.NotReachable<IEnumerator>();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/CollectionServices.cs
deleted file mode 100644 (file)
index 33fabda..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    internal static partial class CollectionServices\r
-    {\r
-        private static readonly Type StringType = typeof(string);\r
-        private static readonly Type IEnumerableType = typeof(IEnumerable);\r
-        private static readonly Type IEnumerableOfTType = typeof(IEnumerable<>);\r
-        private static readonly Type ICollectionOfTType = typeof(ICollection<>);\r
-\r
-        public static bool IsEnumerableOfT(Type type)\r
-        {\r
-            if (type.IsGenericType)\r
-            {\r
-                Type genericType = type.GetGenericTypeDefinition();\r
-\r
-                if (genericType == IEnumerableOfTType)\r
-                {\r
-                    return true;\r
-                }\r
-            }\r
-            return false;\r
-        }\r
-\r
-        public static Type GetEnumerableElementType(Type type)\r
-        {\r
-            if (type == StringType || !IEnumerableType.IsAssignableFrom(type))\r
-            {\r
-                return null;\r
-            }\r
-\r
-            Type closedType;\r
-            if (ReflectionServices.TryGetGenericInterfaceType(type, IEnumerableOfTType, out closedType))\r
-            {\r
-                return closedType.GetGenericArguments()[0];\r
-            }\r
-\r
-            return null;\r
-        }\r
-\r
-        public static Type GetCollectionElementType(Type type)\r
-        {\r
-            Type closedType;\r
-            if (ReflectionServices.TryGetGenericInterfaceType(type, ICollectionOfTType, out closedType))\r
-            {\r
-                return closedType.GetGenericArguments()[0];\r
-            }\r
-\r
-            return null;\r
-        }\r
-\r
-        public static ReadOnlyCollection<T> ToReadOnlyCollection<T>(this IEnumerable<T> source)\r
-        {\r
-            Assumes.NotNull(source);\r
-\r
-            return new ReadOnlyCollection<T>(source.AsArray());\r
-        }\r
-\r
-        public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T> source) where T : class\r
-        {\r
-            Assumes.NotNull(source);\r
-            return source.Where(NotNull); // Use non-generic NotNull for performance reasons\r
-        }\r
-        \r
-        private static bool NotNull(object element)\r
-        {\r
-          return element != null;\r
-        }\r
-\r
-        public static IEnumerable<T> ConcatAllowingNull<T>(this IEnumerable<T> source, IEnumerable<T> second)\r
-        {\r
-            if (second == null || !second.FastAny())\r
-            {\r
-                return source;\r
-            }\r
-\r
-            if (source == null || !source.FastAny())\r
-            {\r
-                return second;\r
-            }\r
-\r
-            return source.Concat(second);\r
-        }\r
\r
-        public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)\r
-        {\r
-            foreach(T t in source)\r
-            {\r
-                action.Invoke(t);\r
-            }\r
-        }\r
-\r
-        public static EnumerableCardinality GetCardinality<T>(this IEnumerable<T> source)\r
-        {\r
-            Assumes.NotNull(source);\r
-\r
-            // Cast to ICollection instead of ICollection<T> for performance reasons.\r
-            ICollection collection = source as ICollection;\r
-            if (collection != null)\r
-            {\r
-                switch (collection.Count)\r
-                {\r
-                    case 0:\r
-                        return EnumerableCardinality.Zero;\r
-\r
-                    case 1:\r
-                        return EnumerableCardinality.One;\r
-\r
-                    default:\r
-                        return EnumerableCardinality.TwoOrMore;\r
-                }\r
-            }\r
-\r
-            using (var enumerator = source.GetEnumerator())\r
-            {\r
-                if (!enumerator.MoveNext())\r
-                {\r
-                    return EnumerableCardinality.Zero;\r
-                }\r
-\r
-                if (!enumerator.MoveNext())\r
-                {\r
-                    return EnumerableCardinality.One;\r
-                }\r
-\r
-                return EnumerableCardinality.TwoOrMore;\r
-            }\r
-        }\r
-\r
-        public static bool FastAny<T>(this IEnumerable<T> source)\r
-        {\r
-            // Enumerable.Any<T> underneath doesn't cast to ICollection, \r
-            // like it does with many of the other LINQ methods.\r
-            // Below is significantly (4x) when mainly working with ICollection\r
-            // sources and a little slower if working with mainly IEnumerable<T> \r
-            // sources.\r
-\r
-            // Cast to ICollection instead of ICollection<T> for performance reasons.\r
-            ICollection collection = source as ICollection;\r
-            if (collection != null)\r
-            {\r
-                return collection.Count > 0;\r
-            }\r
-\r
-            return source.Any();\r
-        }\r
-\r
-        public static Stack<T> Copy<T>(this Stack<T> stack)\r
-        {\r
-            Assumes.NotNull(stack);\r
-\r
-            // Stack<T>.GetEnumerator walks from top to bottom \r
-            // of the stack, whereas Stack<T>(IEnumerable<T>) \r
-            // pushes to bottom from top, so we need to reverse \r
-            // the stack to get them in the right order.\r
-            return new Stack<T>(stack.Reverse());\r
-        }\r
-\r
-        public static T[] AsArray<T>(this IEnumerable<T> enumerable)\r
-        {\r
-            T[] array = enumerable as T[];\r
-\r
-            if (array != null)\r
-            {\r
-                return array;\r
-            }\r
-\r
-            return enumerable.ToArray();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ConditionalWeakTable.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ConditionalWeakTable.cs
deleted file mode 100644 (file)
index d25dad3..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !CLR40\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    // This is a broken implementation of ConditionalWeakTable that allows us\r
-    // to compile and work on versions of .Net eariler then 4.0. This class is\r
-    // broken when there are circular dependencies between keys and values, which\r
-    // can only be fixed by using some specific CLR 4.0 features.\r
-    // For code samples of the broken behavior see ConditionalWeakTableTests.cs.\r
-    internal class ConditionalWeakTable<TKey, TValue> \r
-        where TKey : class\r
-        where TValue : class\r
-    {\r
-        private readonly Dictionary<object, TValue> _table;\r
-        private int _capacity = 4;\r
-\r
-        public ConditionalWeakTable()\r
-        {\r
-            this._table = new Dictionary<object, TValue>();\r
-        }\r
-\r
-        public void Add(TKey key, TValue value)\r
-        {\r
-            CleanupDeadReferences();\r
-            this._table.Add(CreateWeakKey(key), value);\r
-        }\r
-\r
-        public bool Remove(TKey key)\r
-        {\r
-            return this._table.Remove(key);\r
-        }\r
-\r
-        public bool TryGetValue(TKey key, out TValue value)\r
-        {\r
-            return this._table.TryGetValue(key, out value);\r
-        }\r
-\r
-        private void CleanupDeadReferences()\r
-        {\r
-            if (this._table.Count < _capacity)\r
-            {\r
-                return;\r
-            }\r
-\r
-            object[] deadKeys = this._table.Keys\r
-                .Where(weakRef => !((EquivalentWeakReference)weakRef).IsAlive).ToArray();\r
-\r
-            foreach (var deadKey in deadKeys)\r
-            {\r
-                this._table.Remove(deadKey);\r
-            }\r
-\r
-            if (this._table.Count >= _capacity)\r
-            {\r
-                _capacity *= 2;\r
-            }\r
-        }\r
-\r
-        private static object CreateWeakKey(TKey key)\r
-        {\r
-            return new EquivalentWeakReference(key);\r
-        }\r
-\r
-        private class EquivalentWeakReference\r
-        {\r
-            private readonly WeakReference _weakReference;\r
-            private readonly int _hashCode;\r
-\r
-            public EquivalentWeakReference(object obj)\r
-            {\r
-                this._hashCode = obj.GetHashCode();\r
-                this._weakReference = new WeakReference(obj);\r
-            }\r
-\r
-            public bool IsAlive\r
-            {\r
-                get\r
-                {\r
-                    return this._weakReference.IsAlive;\r
-                }\r
-            }\r
-\r
-            public override bool Equals(object obj)\r
-            {\r
-                EquivalentWeakReference weakRef = obj as EquivalentWeakReference;\r
-\r
-                if (weakRef != null)\r
-                {\r
-                    obj = weakRef._weakReference.Target;\r
-                }\r
-\r
-                if (obj == null)\r
-                {\r
-                    return base.Equals(weakRef);\r
-                }\r
-                \r
-                return object.Equals(this._weakReference.Target, obj);\r
-            }\r
-\r
-            public override int GetHashCode()\r
-            {\r
-                return this._hashCode;\r
-            }\r
-        }\r
-    }\r
-}\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/EnumerableCardinality.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/EnumerableCardinality.cs
deleted file mode 100644 (file)
index 45fc7de..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    internal enum EnumerableCardinality : int\r
-    {\r
-        Zero = 0,\r
-        One = 1,\r
-        TwoOrMore = 2,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionary.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionary.cs
deleted file mode 100644 (file)
index 55da711..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Diagnostics;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    [DebuggerDisplay("Count = {Count}")]\r
-    [DebuggerTypeProxy(typeof(ReadOnlyDictionaryDebuggerProxy<,>))]\r
-    internal sealed partial class ReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>\r
-    {\r
-        private readonly IDictionary<TKey, TValue> _innerDictionary;\r
-\r
-        public ReadOnlyDictionary(IDictionary<TKey, TValue> dictionary)\r
-        {\r
-            this._innerDictionary = dictionary ?? new Dictionary<TKey, TValue>(0);\r
-        }\r
-\r
-        public int Count\r
-        {\r
-            get { return this._innerDictionary.Count; }\r
-        }\r
-\r
-        public bool IsReadOnly\r
-        {\r
-            get { return true; }\r
-        }\r
-\r
-        public ICollection<TKey> Keys\r
-        {\r
-            get { return this._innerDictionary.Keys; }\r
-        }\r
-\r
-        public TValue this[TKey key]\r
-        {\r
-            get { return this._innerDictionary[key]; }\r
-            set { throw new NotSupportedException(Strings.NotSupportedReadOnlyDictionary); }\r
-        }\r
-\r
-        public ICollection<TValue> Values\r
-        {\r
-            get { return this._innerDictionary.Values; }\r
-        }\r
-\r
-        public bool Contains(KeyValuePair<TKey, TValue> item)\r
-        {\r
-            return this._innerDictionary.Contains(item);\r
-        }\r
-\r
-        public bool ContainsKey(TKey key)\r
-        {\r
-            return this._innerDictionary.ContainsKey(key);\r
-        }\r
-\r
-        public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)\r
-        {\r
-            this._innerDictionary.CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()\r
-        {\r
-            return this._innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        public bool TryGetValue(TKey key, out TValue value)\r
-        {\r
-            return this._innerDictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        IEnumerator IEnumerable.GetEnumerator()\r
-        {\r
-            return this._innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        void IDictionary<TKey, TValue>.Add(TKey key, TValue value)\r
-        {\r
-            throw new NotSupportedException(Strings.NotSupportedReadOnlyDictionary);\r
-        }\r
-\r
-        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)\r
-        {\r
-            throw new NotSupportedException(Strings.NotSupportedReadOnlyDictionary);\r
-        }\r
-\r
-        void ICollection<KeyValuePair<TKey, TValue>>.Clear()\r
-        {\r
-            throw new NotSupportedException(Strings.NotSupportedReadOnlyDictionary);\r
-        }\r
-\r
-        bool IDictionary<TKey, TValue>.Remove(TKey key)\r
-        {\r
-            throw new NotSupportedException(Strings.NotSupportedReadOnlyDictionary);\r
-        }\r
-\r
-        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item)\r
-        {\r
-            throw new NotSupportedException(Strings.NotSupportedReadOnlyDictionary);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionaryDebuggerProxy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/ReadOnlyDictionaryDebuggerProxy.cs
deleted file mode 100644 (file)
index 8fa7ad5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    // NOTE: This type cannot be a nested proxy of ReadOnlyDictionary due to a bug \r
-    // in the Visual Studio Debugger which causes it to ignore nested generic proxies.\r
-    internal class ReadOnlyDictionaryDebuggerProxy<TKey, TValue>\r
-    {\r
-        private readonly ReadOnlyDictionary<TKey, TValue> _dictionary;\r
-        \r
-        public ReadOnlyDictionaryDebuggerProxy(ReadOnlyDictionary<TKey, TValue> dictionary)\r
-        {\r
-            Requires.NotNull(dictionary, "dictionary");\r
-            \r
-            _dictionary = dictionary;\r
-        }\r
-\r
-        [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]\r
-        public KeyValuePair<TKey, TValue>[] Items\r
-        {\r
-            // NOTE: This shouldn't be cached, so that on every query of\r
-            // the current value of the underlying dictionary is respected.\r
-            get { return this._dictionary.ToArray(); }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/WeakReferenceCollection.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Collections/WeakReferenceCollection.cs
deleted file mode 100644 (file)
index ce8b55a..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace Microsoft.Internal.Collections\r
-{\r
-    internal class WeakReferenceCollection<T> where T : class\r
-    {\r
-        private readonly List<WeakReference> _items = new List<WeakReference>();\r
-\r
-        public void Add(T item)\r
-        {\r
-            // Only cleanup right before we need to reallocate space.\r
-            if (this._items.Capacity == this._items.Count)\r
-            {\r
-                this.CleanupDeadReferences();\r
-            }\r
-\r
-            this._items.Add(new WeakReference(item));\r
-        }\r
-\r
-        public void Remove(T item)\r
-        {\r
-            int index = IndexOf(item);\r
-\r
-            if (index != -1)\r
-            {\r
-                this._items.RemoveAt(index);\r
-            }\r
-        }\r
-\r
-        public bool Contains(T item)\r
-        {\r
-            return IndexOf(item) >= 0;\r
-        }\r
-\r
-        public void Clear()\r
-        {\r
-            this._items.Clear();\r
-        }\r
-\r
-        // Should be executed under at least a read lock.\r
-        private int IndexOf(T item)\r
-        {\r
-            int count = this._items.Count;\r
-            for (int i = 0; i < count; i++)\r
-            {\r
-                if (this._items[i].Target == item)\r
-                {\r
-                    return i;\r
-                }\r
-            }\r
-            return -1;\r
-        }\r
-\r
-        // Should be executed under a write lock\r
-        private void CleanupDeadReferences()\r
-        {\r
-            int count = this._items.Count;\r
-            for (int i = count - 1; i >= 0; i--)\r
-            {\r
-                if (this._items[i].Target == null)\r
-                {\r
-                    this._items.RemoveAt(i);\r
-                }\r
-            }           \r
-        }\r
-\r
-        public List<T> AliveItemsToList()\r
-        {\r
-            List<T> aliveItems = new List<T>();\r
-\r
-            foreach (var weakItem in this._items)\r
-            {\r
-                T item = weakItem.Target as T;\r
-\r
-                if (item != null)\r
-                {\r
-                    aliveItems.Add(item);\r
-                }\r
-            }\r
-\r
-            return aliveItems;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ContractServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ContractServices.cs
deleted file mode 100644 (file)
index 4a125d6..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal class ContractServices\r
-    {\r
-        public static T Cast<T>(object o)\r
-        {\r
-            return (T)o;\r
-        }\r
-\r
-        public static bool TryCast(Type contractType, object value, out object result)\r
-        {\r
-            if (value == null)\r
-            {\r
-                result = null;\r
-                return true;\r
-            }\r
-            if (contractType.IsInstanceOfType(value))\r
-            {\r
-                result = value;\r
-                return true;\r
-            }\r
-\r
-            // We couldn't cast see if a delegate works for us.\r
-            if (typeof(Delegate).IsAssignableFrom(contractType))\r
-            {\r
-                ExportedDelegate exportedDelegate = value as ExportedDelegate;\r
-                if (exportedDelegate != null)\r
-                {\r
-                    result = exportedDelegate.CreateDelegate(contractType);\r
-                    return (result != null);\r
-                }\r
-            }\r
-\r
-            result = null;\r
-            return false;\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/GenerationServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/GenerationServices.cs
deleted file mode 100644 (file)
index 9aae10c..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Reflection;\r
-using System.Reflection.Emit;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class GenerationServices\r
-    {\r
-        // Type.GetTypeFromHandle\r
-        private static readonly MethodInfo _typeGetTypeFromHandleMethod = typeof(Type).GetMethod("GetTypeFromHandle");\r
-\r
-\r
-        // typeofs are pretty expensive, so we cache them statically\r
-        private static readonly Type TypeType = typeof(System.Type);\r
-        private static readonly Type StringType = typeof(System.String);\r
-        private static readonly Type CharType = typeof(System.Char);\r
-        private static readonly Type BooleanType = typeof(System.Boolean);\r
-        private static readonly Type ByteType = typeof(System.Byte);\r
-        private static readonly Type SByteType = typeof(System.SByte);\r
-        private static readonly Type Int16Type = typeof(System.Int16);\r
-        private static readonly Type UInt16Type = typeof(System.UInt16);\r
-        private static readonly Type Int32Type = typeof(System.Int32);\r
-        private static readonly Type UInt32Type = typeof(System.UInt32);\r
-        private static readonly Type Int64Type = typeof(System.Int64);\r
-        private static readonly Type UInt64Type = typeof(System.UInt64);\r
-        private static readonly Type DoubleType = typeof(System.Double);\r
-        private static readonly Type SingleType = typeof(System.Single);\r
-        private static readonly Type IEnumerableTypeofT = typeof(System.Collections.Generic.IEnumerable<>);\r
-        private static readonly Type IEnumerableType = typeof(System.Collections.IEnumerable);\r
-\r
-        private static readonly MethodInfo ExceptionGetData = typeof(Exception).GetProperty("Data").GetGetMethod();\r
-        private static readonly MethodInfo DictionaryAdd = typeof(IDictionary).GetMethod("Add");\r
-        private static readonly ConstructorInfo ObjectCtor = typeof(object).GetConstructor(Type.EmptyTypes);\r
-\r
-        public static ILGenerator CreateGeneratorForPublicConstructor(this TypeBuilder typeBuilder, Type[] ctrArgumentTypes)\r
-        {\r
-            ConstructorBuilder ctorBuilder = typeBuilder.DefineConstructor(\r
-                MethodAttributes.Public,\r
-                CallingConventions.Standard,\r
-                ctrArgumentTypes);\r
-\r
-            ILGenerator ctorIL = ctorBuilder.GetILGenerator();\r
-            ctorIL.Emit(OpCodes.Ldarg_0);\r
-            ctorIL.Emit(OpCodes.Call, ObjectCtor);\r
-\r
-            return ctorIL;\r
-        }\r
-        \r
-        /// Generates the code that loads the supplied value on the stack\r
-        /// This is not as simple as it seems, as different instructions need to be generated depending\r
-        /// on its type.\r
-        /// We support:\r
-        /// 1. All primitive types\r
-        /// 2. Strings\r
-        /// 3. Enums\r
-        /// 4. typeofs\r
-        /// 5. nulls\r
-        /// 6. Enumerables\r
-        /// 7. Delegates on static functions or any of the above\r
-        /// Everything else cannot be represented as literals\r
-        /// <param name="ilGenerator"></param>\r
-        /// <param name="item"></param>\r
-        /// <param name="key"></param>\r
-        /// <param name="value"></param>\r
-        /// <returns></returns>\r
-        public static void LoadValue(this ILGenerator ilGenerator, object value)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-\r
-            //\r
-            // Get nulls out of the way - they are basically typeless, so we just load null\r
-            //\r
-            if (value == null)\r
-            {\r
-                ilGenerator.LoadNull();\r
-                return;\r
-            }\r
-\r
-            //\r
-            // Prepare for literal loading - decide whether we should box, and handle enums properly\r
-            //\r
-            Type valueType = value.GetType();\r
-            object rawValue = value;\r
-            if (valueType.IsEnum)\r
-            {\r
-                // enums are special - we need to load the underlying constant on the stack\r
-                rawValue = Convert.ChangeType(value, Enum.GetUnderlyingType(valueType), null);\r
-                valueType = rawValue.GetType();\r
-            }\r
-\r
-            //\r
-            // Generate IL depending on the valueType - this is messier than it should ever be, but sadly necessary\r
-            //\r
-            if (valueType == GenerationServices.StringType)\r
-            {\r
-                // we need to check for strings before enumerables, because strings are IEnumerable<char>\r
-                ilGenerator.LoadString((string)rawValue);\r
-            }\r
-            else if (GenerationServices.TypeType.IsAssignableFrom(valueType))\r
-            {\r
-                ilGenerator.LoadTypeOf((Type)rawValue);\r
-            }\r
-            else if (GenerationServices.IEnumerableType.IsAssignableFrom(valueType))\r
-            {\r
-                // NOTE : strings and dictionaries are also enumerables, but we have already handled those\r
-                ilGenerator.LoadEnumerable((IEnumerable) rawValue);\r
-            }\r
-            else if (\r
-                (valueType == GenerationServices.CharType) ||\r
-                (valueType == GenerationServices.BooleanType) ||\r
-                (valueType == GenerationServices.ByteType) ||\r
-                (valueType == GenerationServices.SByteType) ||\r
-                (valueType == GenerationServices.Int16Type) ||\r
-                (valueType == GenerationServices.UInt16Type) ||\r
-                (valueType == GenerationServices.Int32Type)\r
-                )\r
-            {\r
-                // NOTE : Everything that is 32 bit or less uses ldc.i4. We need to pass int32, even if the actual types is shorter - this is IL memory model\r
-                // direct casting to (int) won't work, because the value is boxed, thus we need to use Convert.\r
-                // Sadly, this will not work for all cases - namely large uint32 - because they can't semantically fit into 32 signed bits\r
-                // We have a special case for that next\r
-                ilGenerator.LoadInt((int)Convert.ChangeType(rawValue, typeof(int), CultureInfo.InvariantCulture));\r
-            }\r
-            else if (valueType == GenerationServices.UInt32Type)\r
-            {\r
-                // NOTE : This one is a bit tricky. Ldc.I4 takes an Int32 as an argument, although it really treats it as a 32bit number\r
-                // That said, some UInt32 values are larger that Int32.MaxValue, so the Convert call above will fail, which is why \r
-                // we need to treat this case individually and cast to uint, and then - unchecked - to int.\r
-                ilGenerator.LoadInt(unchecked((int)((uint)rawValue)));\r
-            }\r
-            else if (valueType == GenerationServices.Int64Type)\r
-            {\r
-                ilGenerator.LoadLong((long)rawValue);\r
-            }\r
-            else if (valueType == GenerationServices.UInt64Type)\r
-            {\r
-                // NOTE : This one is a bit tricky. Ldc.I8 takes an Int64 as an argument, although it really treats it as a 64bit number\r
-                // That said, some UInt64 values are larger that Int64.MaxValue, so the direct case we use above (or Convert, for that matter)will fail, which is why\r
-                // we need to treat this case individually and cast to ulong, and then - unchecked - to long.\r
-                ilGenerator.LoadLong(unchecked((long)((ulong)rawValue)));\r
-            }\r
-            else if (valueType == GenerationServices.SingleType)\r
-            {\r
-                ilGenerator.LoadFloat((float)rawValue);\r
-            }\r
-            else if (valueType == GenerationServices.DoubleType)\r
-            {\r
-                ilGenerator.LoadDouble((double)rawValue);\r
-            }\r
-            else\r
-            {\r
-                throw new InvalidOperationException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.InvalidMetadataValue, value.GetType().FullName));\r
-            }\r
-        }\r
-\r
-        /// Generates the code that adds an object to a dictionary stored in a local variable\r
-        /// <param name="ilGenerator"></param>\r
-        /// <param name="dictionary"></param>\r
-        /// <param name="key"></param>\r
-        /// <param name="value"></param>\r
-        /// <returns></returns>\r
-        public static void AddItemToLocalDictionary(this ILGenerator ilGenerator, LocalBuilder dictionary, object key, object value)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            Assumes.NotNull(dictionary);\r
-            Assumes.NotNull(key);\r
-            Assumes.NotNull(value);\r
-\r
-            ilGenerator.Emit(OpCodes.Ldloc, dictionary);\r
-            ilGenerator.LoadValue(key);\r
-            ilGenerator.LoadValue(value);\r
-            ilGenerator.Emit(OpCodes.Callvirt, DictionaryAdd);\r
-        }\r
-\r
-        /// Generates the code that adds an object from a local variable to a dictionary also stored in a local\r
-        /// <param name="ilGenerator"></param>\r
-        /// <param name="dictionary"></param>\r
-        /// <param name="key"></param>\r
-        /// <param name="value"></param>\r
-        /// <returns></returns>\r
-        public static void AddLocalToLocalDictionary(this ILGenerator ilGenerator, LocalBuilder dictionary, object key, LocalBuilder value)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            Assumes.NotNull(dictionary);\r
-            Assumes.NotNull(key);\r
-            Assumes.NotNull(value);\r
-\r
-            ilGenerator.Emit(OpCodes.Ldloc, dictionary);\r
-            ilGenerator.LoadValue(key);\r
-            ilGenerator.Emit(OpCodes.Ldloc, value);\r
-            ilGenerator.Emit(OpCodes.Callvirt, DictionaryAdd);\r
-        }\r
-\r
-        /// Generates the code to get the type of an object and store it in a local\r
-        /// <param name="ilGenerator"></param>\r
-        /// <param name="dictionary"></param>\r
-        /// <param name="key"></param>\r
-        /// <param name="value"></param>\r
-        /// <returns></returns>\r
-        public static void GetExceptionDataAndStoreInLocal(this ILGenerator ilGenerator, LocalBuilder exception, LocalBuilder dataStore)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            Assumes.NotNull(exception);\r
-            Assumes.NotNull(dataStore);\r
-\r
-            ilGenerator.Emit(OpCodes.Ldloc, exception);\r
-            ilGenerator.Emit(OpCodes.Callvirt, ExceptionGetData);\r
-            ilGenerator.Emit(OpCodes.Stloc, dataStore);\r
-        }\r
-\r
-        private static void LoadEnumerable(this ILGenerator ilGenerator, IEnumerable enumerable)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            Assumes.NotNull(enumerable);\r
-\r
-            // We load enumerable as an array - this is the most compact and efficient way of representing it\r
-            Type elementType = null;\r
-            Type closedType = null;\r
-            if (ReflectionServices.TryGetGenericInterfaceType(enumerable.GetType(), GenerationServices.IEnumerableTypeofT, out closedType))\r
-            {\r
-                elementType = closedType.GetGenericArguments()[0];\r
-            }\r
-            else\r
-            {\r
-                elementType = typeof(object);\r
-            }\r
-\r
-            //\r
-            // elem[] array = new elem[<enumerable.Count()>]\r
-            //\r
-            Type generatedArrayType = elementType.MakeArrayType();\r
-            LocalBuilder generatedArrayLocal = ilGenerator.DeclareLocal(generatedArrayType);\r
-\r
-            ilGenerator.LoadInt(enumerable.Cast<object>().Count());\r
-            ilGenerator.Emit(OpCodes.Newarr, elementType);\r
-            ilGenerator.Emit(OpCodes.Stloc, generatedArrayLocal);\r
-            \r
-            int index = 0;\r
-            foreach (object value in enumerable)\r
-            {\r
-                //\r
-                //array[<index>] = value;\r
-                //\r
-                ilGenerator.Emit(OpCodes.Ldloc, generatedArrayLocal);\r
-                ilGenerator.LoadInt(index);\r
-                ilGenerator.LoadValue(value);\r
-                if (GenerationServices.IsBoxingRequiredForValue(value) && !elementType.IsValueType)\r
-                {\r
-                    ilGenerator.Emit(OpCodes.Box, value.GetType());\r
-                }\r
-                ilGenerator.Emit(OpCodes.Stelem, elementType);\r
-                index++;\r
-            }\r
-\r
-            ilGenerator.Emit(OpCodes.Ldloc, generatedArrayLocal);\r
-        }\r
-\r
-        private static bool IsBoxingRequiredForValue(object value)\r
-        {\r
-            if (value == null)\r
-            {\r
-                return false;\r
-            }\r
-            else\r
-            {\r
-                return value.GetType().IsValueType;\r
-            }\r
-        }\r
-\r
-\r
-        private static void LoadNull(this ILGenerator ilGenerator)\r
-        {\r
-            ilGenerator.Emit(OpCodes.Ldnull);\r
-        }\r
-\r
-        private static void LoadString(this ILGenerator ilGenerator, string s)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            if (s == null)\r
-            {\r
-                ilGenerator.LoadNull();\r
-            }\r
-            else\r
-            {\r
-                ilGenerator.Emit(OpCodes.Ldstr, s);\r
-            }\r
-        }\r
-\r
-\r
-        private static void LoadInt(this ILGenerator ilGenerator, int value)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            ilGenerator.Emit(OpCodes.Ldc_I4, value);\r
-        }\r
-\r
-        private static void LoadLong(this ILGenerator ilGenerator, long value)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            ilGenerator.Emit(OpCodes.Ldc_I8, value);\r
-        }\r
-\r
-        private static void LoadFloat(this ILGenerator ilGenerator, float value)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            ilGenerator.Emit(OpCodes.Ldc_R4, value);\r
-        }\r
-\r
-        private static void LoadDouble(this ILGenerator ilGenerator, double value)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            ilGenerator.Emit(OpCodes.Ldc_R8, value);\r
-        }\r
-\r
-        private static void LoadTypeOf(this ILGenerator ilGenerator, Type type)\r
-        {\r
-            Assumes.NotNull(ilGenerator);\r
-            //typeofs() translate into ldtoken and Type::GetTypeFromHandle call\r
-            ilGenerator.Emit(OpCodes.Ldtoken, type);\r
-            ilGenerator.EmitCall(OpCodes.Call, GenerationServices._typeGetTypeFromHandleMethod, null);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/LazyServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/LazyServices.cs
deleted file mode 100644 (file)
index 07783ff..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Threading;\r
-using System.Text;\r
-using System.Globalization;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class LazyServices\r
-    {\r
-        public static Lazy<T> AsLazy<T>(this T t)\r
-            where T : class\r
-        {\r
-            return new Lazy<T>(() => t, false);\r
-        }\r
-\r
-        public static T GetNotNullValue<T>(this Lazy<T> lazy, string argument)\r
-            where T : class\r
-        {\r
-            Assumes.NotNull(lazy);\r
-            T value = lazy.Value;\r
-            if (value == null)\r
-            {\r
-                throw new InvalidOperationException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.LazyServices_LazyResolvesToNull, typeof(T), argument));\r
-            }\r
-\r
-            return value;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.Reader.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.Reader.cs
deleted file mode 100644 (file)
index 3f81a68..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal struct ReadLock : IDisposable\r
-    {\r
-        private readonly Lock _lock;\r
-        private int _isDisposed;\r
-\r
-        public ReadLock(Lock @lock)\r
-        {\r
-            this._isDisposed = 0;\r
-            this._lock = @lock;\r
-            this._lock.EnterReadLock();\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-            {\r
-                this._lock.ExitReadLock();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.Writer.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.Writer.cs
deleted file mode 100644 (file)
index e9d7088..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal struct WriteLock : IDisposable\r
-    {\r
-        private readonly Lock _lock;\r
-        private int _isDisposed;\r
-\r
-        public WriteLock(Lock @lock)\r
-        {\r
-            this._isDisposed = 0;\r
-            this._lock = @lock;\r
-            this._lock.EnterWriteLock();\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-            {\r
-                this._lock.ExitWriteLock();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Lock.cs
deleted file mode 100644 (file)
index 7cd7ac2..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal sealed class Lock : IDisposable\r
-    {\r
-#if (!SILVERLIGHT)\r
-        private ReaderWriterLockSlim _thisLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);\r
-        private int _isDisposed = 0;\r
-        public void EnterReadLock()\r
-        {\r
-            this._thisLock.EnterReadLock();\r
-        }\r
-\r
-        public void EnterWriteLock()\r
-        {\r
-            this._thisLock.EnterWriteLock();\r
-        }\r
-\r
-        public void ExitReadLock()\r
-        {\r
-            this._thisLock.ExitReadLock();\r
-        }\r
-\r
-        public void ExitWriteLock()\r
-        {\r
-            this._thisLock.ExitWriteLock();\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-            {\r
-                this._thisLock.Dispose();\r
-            }\r
-        }\r
-\r
-#else\r
-        // ReaderWriterLockSlim is not yet implemented on SilverLight\r
-        // Satisfies our requirements until it is implemented\r
-        object _thisLock = new object();\r
-\r
-        public Lock()\r
-        {\r
-        }\r
-\r
-        public void EnterReadLock()\r
-        {\r
-            Monitor.Enter(this._thisLock);\r
-        }\r
-\r
-        public void EnterWriteLock()\r
-        {\r
-            Monitor.Enter(this._thisLock);\r
-        }\r
-\r
-        public void ExitReadLock()\r
-        {\r
-            Monitor.Exit(this._thisLock);\r
-        }\r
-\r
-        public void ExitWriteLock()\r
-        {\r
-            Monitor.Exit(this._thisLock);\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-        }\r
-#endif\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ReflectionInvoke.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ReflectionInvoke.cs
deleted file mode 100644 (file)
index b91a0c5..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-#if !SILVERLIGHT && CLR40\r
-\r
-using System;\r
-using System.Reflection;\r
-using System.Security;\r
-using System.Security.Permissions;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class ReflectionInvoke\r
-    {\r
-        private static readonly ReflectionPermission _memberAccess = new ReflectionPermission(ReflectionPermissionFlag.MemberAccess);\r
-        private static readonly ReflectionPermission _restrictedMemberAccess = new ReflectionPermission(ReflectionPermissionFlag.RestrictedMemberAccess);\r
-\r
-        public static object SafeCreateInstance(this Type type, params object[] arguments)\r
-        {\r
-            DemandMemberAccessIfNeeded(type);\r
-\r
-            return Activator.CreateInstance(type, arguments);\r
-        }\r
-\r
-        public static object SafeInvoke(this ConstructorInfo constructor, params object[] arguments)\r
-        {\r
-            DemandMemberAccessIfNeeded(constructor);\r
-\r
-            return constructor.Invoke(arguments);\r
-        }\r
-\r
-        public static object SafeInvoke(this MethodInfo method, object instance, params object[] arguments)\r
-        {\r
-            DemandMemberAccessIfNeeded(method);\r
-\r
-            return method.Invoke(instance, arguments);\r
-        }\r
-\r
-        public static object SafeGetValue(this FieldInfo field, object instance)\r
-        {\r
-            DemandMemberAccessIfNeeded(field);\r
-\r
-            return field.GetValue(instance);\r
-        }\r
-\r
-        public static void SafeSetValue(this FieldInfo field, object instance, object value)\r
-        {\r
-            DemandMemberAccessIfNeeded(field);\r
-\r
-            field.SetValue(instance, value);\r
-        }\r
-\r
-        public static void DemandMemberAccessIfNeeded(MethodInfo method)\r
-        {\r
-            if (!method.IsVisible())\r
-            {\r
-                DemandMemberAccess(method);\r
-            }\r
-        }\r
-\r
-        private static void DemandMemberAccessIfNeeded(FieldInfo field)\r
-        {\r
-            if (!field.IsVisible())\r
-            {\r
-                DemandMemberAccess(field);\r
-            }\r
-        }\r
-\r
-        public static void DemandMemberAccessIfNeeded(Type type)\r
-        {\r
-            // Consult UnderlyingSystemType this is the type that Activator.CreateInstance creates            \r
-            if (!type.UnderlyingSystemType.IsVisible)\r
-            {\r
-                DemandMemberAccess(type);\r
-            }\r
-        }\r
-\r
-        private static void DemandMemberAccessIfNeeded(ConstructorInfo constructor)\r
-        {\r
-            if (!constructor.IsVisible())\r
-            {\r
-                DemandMemberAccess(constructor);\r
-            }\r
-        }\r
-\r
-        private static void DemandMemberAccess(MemberInfo target)\r
-        {\r
-            try\r
-            {\r
-                _memberAccess.Demand();\r
-            }\r
-            catch (SecurityException)\r
-            {   // The caller doesn't have member access, but let's see whether they have access to\r
-                // members of assemblies with less or equal permissions (this mimics Reflection's behavior)\r
-\r
-                DemandRestrictedMemberAccess(target);\r
-            }\r
-        }\r
-\r
-        private static void DemandRestrictedMemberAccess(MemberInfo target)\r
-        {\r
-            Assembly targetAssembly = target.Assembly();\r
-\r
-            PermissionSet targetGrantSet = UnsafePermissionSet(targetAssembly);\r
-            targetGrantSet.AddPermission(_restrictedMemberAccess);\r
-            targetGrantSet.Demand();\r
-        }\r
-\r
-        [SecuritySafeCritical] // PermissionSet is [SecurityCritical]\r
-        private static PermissionSet UnsafePermissionSet(Assembly assembly)\r
-        {\r
-            return assembly.PermissionSet;\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ReflectionServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/ReflectionServices.cs
deleted file mode 100644 (file)
index 937e5bd..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.Runtime.InteropServices;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class ReflectionServices\r
-    {\r
-        public static Assembly Assembly(this MemberInfo member)\r
-        {\r
-            Type type = member as Type;\r
-            if (type != null)\r
-            {\r
-                return type.Assembly;\r
-            }\r
-\r
-            return member.DeclaringType.Assembly;\r
-        }\r
-\r
-        public static bool IsVisible(this ConstructorInfo constructor)\r
-        {\r
-            return constructor.DeclaringType.IsVisible && constructor.IsPublic;\r
-        }\r
-\r
-        public static bool IsVisible(this FieldInfo field)\r
-        {\r
-            return field.DeclaringType.IsVisible && field.IsPublic;\r
-        }\r
-\r
-        public static bool IsVisible(this MethodInfo method)\r
-        {\r
-            if (!method.DeclaringType.IsVisible)\r
-                return false;\r
-\r
-            if (!method.IsPublic)\r
-                return false;\r
-\r
-            if (method.IsGenericMethod)\r
-            {\r
-                // Check type arguments, for example if we're passed 'Activator.CreateInstance<SomeMefInternalType>()'\r
-                foreach (Type typeArgument in method.GetGenericArguments())\r
-                {\r
-                    if (!typeArgument.IsVisible)\r
-                        return false;\r
-                }\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        public static string GetDisplayName(Type declaringType, string name)\r
-        {\r
-            Assumes.NotNull(declaringType);\r
-\r
-            return declaringType.GetDisplayName() + "." + name;\r
-        }\r
-\r
-        public static string GetDisplayName(this MemberInfo member)\r
-        {\r
-            Assumes.NotNull(member);\r
-  \r
-            switch (member.MemberType)\r
-            {\r
-                case MemberTypes.TypeInfo:\r
-                case MemberTypes.NestedType:\r
-                    return ((Type)member).FullName;\r
-            }\r
-\r
-            return GetDisplayName(member.DeclaringType, member.Name);            \r
-        }\r
-\r
-        internal static bool TryGetGenericInterfaceType(Type instanceType, Type targetOpenInterfaceType, out Type targetClosedInterfaceType)\r
-        {\r
-            // The interface must be open\r
-            Assumes.IsTrue(targetOpenInterfaceType.IsInterface);\r
-            Assumes.IsTrue(targetOpenInterfaceType.IsGenericTypeDefinition);\r
-            Assumes.IsTrue(!instanceType.IsGenericTypeDefinition);\r
-\r
-            // if instanceType is an interface, we must first check it directly\r
-            if (instanceType.IsInterface &&\r
-                instanceType.IsGenericType &&\r
-                instanceType.GetGenericTypeDefinition() == targetOpenInterfaceType)\r
-            {\r
-                targetClosedInterfaceType = instanceType;\r
-                return true;\r
-            }\r
-\r
-            try\r
-            {\r
-                // Purposefully not using FullName here because it results in a significantly\r
-                //  more expensive implementation of GetInterface, this does mean that we're\r
-                //  takign the chance that there aren't too many types which implement multiple\r
-                //  interfaces by the same name...\r
-                Type targetInterface = instanceType.GetInterface(targetOpenInterfaceType.Name, false);\r
-                if (targetInterface != null &&\r
-                    targetInterface.GetGenericTypeDefinition() == targetOpenInterfaceType)\r
-                {\r
-                    targetClosedInterfaceType = targetInterface;\r
-                    return true;\r
-                }\r
-            }\r
-            catch (AmbiguousMatchException)\r
-            {\r
-                // If there are multiple with the same name we should not pick any\r
-            }\r
-\r
-            targetClosedInterfaceType = null;\r
-            return false;\r
-        }\r
-\r
-        internal static IEnumerable<PropertyInfo> GetAllProperties(this Type type)\r
-        {\r
-            return type.GetInterfaces().Concat(new Type[] { type }).SelectMany(itf => itf.GetProperties());\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Requires.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Requires.cs
deleted file mode 100644 (file)
index fa9656c..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using System.ComponentModel.Composition;\r
-using System.Text;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class Requires\r
-    {\r
-        [DebuggerStepThrough]\r
-        public static void NotNull<T>(T value, string parameterName) \r
-            where T : class\r
-        {\r
-            if (value == null)\r
-            {\r
-                throw new ArgumentNullException(parameterName);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        public static void NotNullOrEmpty(string value, string parameterName)\r
-        {\r
-            NotNull(value, parameterName);\r
-\r
-            if (value.Length == 0)\r
-            {\r
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.ArgumentException_EmptyString, parameterName), parameterName);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        public static void NotNullOrNullElements<T>(IEnumerable<T> values, string parameterName)\r
-            where T : class\r
-        {\r
-            NotNull(values, parameterName);\r
-            NotNullElements(values, parameterName);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        public static void NullOrNotNullElements<TKey, TValue>(IEnumerable<KeyValuePair<TKey, TValue>> values, string parameterName)\r
-            where TKey : class\r
-            where TValue : class\r
-        {\r
-            if (values != null)\r
-            {\r
-                NotNullElements(values, parameterName);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        public static void NullOrNotNullElements<T>(IEnumerable<T> values, string parameterName)\r
-            where T : class\r
-        {\r
-            if (values != null)\r
-            {\r
-                NotNullElements(values, parameterName);\r
-            }\r
-        }\r
-\r
-        private static void NotNullElements<T>(IEnumerable<T> values, string parameterName)\r
-            where T : class\r
-        {\r
-            foreach (T value in values)\r
-            {\r
-                if (value == null)\r
-                {\r
-                    throw ExceptionBuilder.CreateContainsNullElement(parameterName);\r
-                }\r
-            }\r
-        }\r
-\r
-        private static void NotNullElements<TKey, TValue>(IEnumerable<KeyValuePair<TKey, TValue>> values, string parameterName)\r
-            where TKey : class\r
-            where TValue : class\r
-        {\r
-            foreach (KeyValuePair<TKey, TValue> value in values)\r
-            {\r
-                if ((value.Key == null) || (value.Value == null))\r
-                {\r
-                    throw ExceptionBuilder.CreateContainsNullElement(parameterName);\r
-                }\r
-            }\r
-        }\r
-        [DebuggerStepThrough]\r
-        public static void IsInMembertypeSet(MemberTypes value, string parameterName, MemberTypes enumFlagSet)\r
-        {\r
-            if ((value & enumFlagSet) != value || // Ensure the member is in the set\r
-                (value & (value - 1)) != 0) // Ensure that there is only one flag in the value (i.e. value is a power of 2).\r
-            {\r
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.ArgumentOutOfRange_InvalidEnumInSet, parameterName, value, enumFlagSet.ToString()), parameterName);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Runtime/Serialization/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Runtime/Serialization/.gitattributes
deleted file mode 100644 (file)
index cc023ba..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/SerializationServices.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Runtime/Serialization/SerializationServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/Runtime/Serialization/SerializationServices.cs
deleted file mode 100644 (file)
index 39c6f41..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Runtime.Serialization;\r
-\r
-namespace Microsoft.Internal.Runtime.Serialization\r
-{\r
-    internal static class SerializationServices\r
-    {\r
-        public static T GetValue<T>(this SerializationInfo info, string name)\r
-        {\r
-            Assumes.NotNull(info, name);\r
-\r
-            return (T)info.GetValue(name, typeof(T));\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/SilverlightReflectionInvoke.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/SilverlightReflectionInvoke.cs
deleted file mode 100644 (file)
index 0e2e3f6..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#if SILVERLIGHT || !CLR40\r
-\r
-using System;\r
-using System.Reflection;\r
-using System.Security;\r
-using System.Security.Permissions;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class ReflectionInvoke\r
-    {\r
-        public static object SafeCreateInstance(this Type type, params object[] arguments)\r
-        {\r
-            return Activator.CreateInstance(type, arguments);\r
-        }\r
-\r
-        public static object SafeInvoke(this ConstructorInfo constructor, params object[] arguments)\r
-        {\r
-            return constructor.Invoke(arguments);\r
-        }\r
-\r
-        public static object SafeInvoke(this MethodInfo method, object instance, params object[] arguments)\r
-        {\r
-            return method.Invoke(instance, arguments);\r
-        }\r
-\r
-        public static object SafeGetValue(this FieldInfo field, object instance)\r
-        {\r
-            return field.GetValue(instance);\r
-        }\r
-\r
-        public static void SafeSetValue(this FieldInfo field, object instance, object value)\r
-        {\r
-            field.SetValue(instance, value);\r
-        }\r
-\r
-        public static void DemandMemberAccessIfNeeded(MethodInfo method)\r
-        {\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/StringComparers.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Microsoft/Internal/StringComparers.cs
deleted file mode 100644 (file)
index d66113b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class StringComparers\r
-    {\r
-        public static StringComparer ContractName\r
-        {\r
-            get { return StringComparer.Ordinal; }\r
-        }\r
-        \r
-        public static StringComparer MetadataKeyNames\r
-        {\r
-            get { return StringComparer.Ordinal; }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/SilverlightAdditions.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/SilverlightAdditions.cs
deleted file mode 100644 (file)
index 75c1cf6..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System\r
-{\r
-    [Conditional("NOT_SILVERLIGHT")]    // Trick so that the attribute is never actually applied\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Delegate, Inherited = false)]\r
-    internal sealed class SerializableAttribute : Attribute\r
-    {\r
-    }\r
-}\r
-\r
-namespace System.ComponentModel\r
-{\r
-    internal sealed class LocalizableAttribute : Attribute\r
-    {\r
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "isLocalizable")]\r
-        public LocalizableAttribute(bool isLocalizable)\r
-        {\r
-        }\r
-    }\r
-}\r
-\r
-#if !CLR40\r
-namespace System.Collections.Generic\r
-{\r
-    internal class HashSet<T> : IEnumerable<T>\r
-    {\r
-        private Dictionary<T, object> _set = new Dictionary<T, object>();\r
-\r
-        public HashSet()\r
-        {\r
-        }\r
-\r
-        public HashSet(IEnumerable<T> items)\r
-        {\r
-            foreach (T item in items)\r
-            {\r
-                Add(item);\r
-            }\r
-        }\r
-\r
-        public bool Add(T item)\r
-        {\r
-            if (!this._set.ContainsKey(item))\r
-            {\r
-                this._set.Add(item, null);\r
-                return true;\r
-            }\r
-            return false;\r
-        }\r
-\r
-        public void Clear()\r
-        {\r
-            this._set.Clear();\r
-        }\r
-\r
-        public bool Contains(T item)\r
-        {\r
-            return this._set.ContainsKey(item);\r
-        }\r
-\r
-        public bool Remove(T item)\r
-        {\r
-            if (this._set.ContainsKey(item))\r
-            {\r
-                this._set.Remove(item);\r
-                return true;\r
-            }\r
-            return false;\r
-        }\r
-\r
-        public IEnumerator<T> GetEnumerator()\r
-        {\r
-            return this._set.Keys.GetEnumerator();\r
-        }\r
-\r
-        IEnumerator IEnumerable.GetEnumerator()\r
-        {\r
-            return GetEnumerator();\r
-        }\r
-    }\r
-}\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Strings.Designer.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Strings.Designer.cs
deleted file mode 100644 (file)
index 5650944..0000000
+++ /dev/null
@@ -1,927 +0,0 @@
-//------------------------------------------------------------------------------\r
-// <auto-generated>\r
-//     This code was generated by a tool.\r
-//     Runtime Version:4.0.20626.0\r
-//\r
-//     Changes to this file may cause incorrect behavior and will be lost if\r
-//     the code is regenerated.\r
-// </auto-generated>\r
-//------------------------------------------------------------------------------\r
-\r
-namespace Microsoft.Internal {\r
-    using System;\r
-    \r
-    \r
-    /// <summary>\r
-    ///   A strongly-typed resource class, for looking up localized strings, etc.\r
-    /// </summary>\r
-    // This class was auto-generated by the StronglyTypedResourceBuilder\r
-    // class via a tool like ResGen or Visual Studio.\r
-    // To add or remove a member, edit your .ResX file then rerun ResGen\r
-    // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    internal class Strings {\r
-        \r
-        private static global::System.Resources.ResourceManager resourceMan;\r
-        \r
-        private static global::System.Globalization.CultureInfo resourceCulture;\r
-        \r
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]\r
-        internal Strings() {\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Returns the cached ResourceManager instance used by this class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Resources.ResourceManager ResourceManager {\r
-            get {\r
-                if (object.ReferenceEquals(resourceMan, null)) {\r
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Internal.Strings", typeof(Strings).Assembly);\r
-                    resourceMan = temp;\r
-                }\r
-                return resourceMan;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Overrides the current thread's CurrentUICulture property for all\r
-        ///   resource lookups using this strongly typed resource class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Globalization.CultureInfo Culture {\r
-            get {\r
-                return resourceCulture;\r
-            }\r
-            set {\r
-                resourceCulture = value;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;{0}&apos; is a reflection-only assembly which is not supported..\r
-        /// </summary>\r
-        internal static string Argument_AssemblyReflectionOnly {\r
-            get {\r
-                return ResourceManager.GetString("Argument_AssemblyReflectionOnly", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;{0}&apos; contains a reflection-only type which is not supported..\r
-        /// </summary>\r
-        internal static string Argument_ElementReflectionOnlyType {\r
-            get {\r
-                return ResourceManager.GetString("Argument_ElementReflectionOnlyType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;exports&apos; cannot be empty when ImportDefinition.ImportCardinality is ImportCardinality.ExactlyOne..\r
-        /// </summary>\r
-        internal static string Argument_ExportsEmpty {\r
-            get {\r
-                return ResourceManager.GetString("Argument_ExportsEmpty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;exports&apos; cannot contain more than one element when ImportDefinition.ImportCardinality is ImportCardinality.ZeroOrOne or ImportCardinality.ExactlyOne..\r
-        /// </summary>\r
-        internal static string Argument_ExportsTooMany {\r
-            get {\r
-                return ResourceManager.GetString("Argument_ExportsTooMany", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;{0}&apos; cannot contain a null (Nothing in Visual Basic) element..\r
-        /// </summary>\r
-        internal static string Argument_NullElement {\r
-            get {\r
-                return ResourceManager.GetString("Argument_NullElement", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;{0}&apos; cannot be an empty string (&quot;&quot;)..\r
-        /// </summary>\r
-        internal static string ArgumentException_EmptyString {\r
-            get {\r
-                return ResourceManager.GetString("ArgumentException_EmptyString", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value of argument &apos;{0}&apos; ({1}) is invalid for Enum type &apos;{2}&apos;..\r
-        /// </summary>\r
-        internal static string ArgumentOutOfRange_InvalidEnum {\r
-            get {\r
-                return ResourceManager.GetString("ArgumentOutOfRange_InvalidEnum", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value of argument &apos;{0}&apos; ({1}) is not supported. Allowed values are : &apos;{2}&apos;..\r
-        /// </summary>\r
-        internal static string ArgumentOutOfRange_InvalidEnumInSet {\r
-            get {\r
-                return ResourceManager.GetString("ArgumentOutOfRange_InvalidEnumInSet", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The argument was a value type which is not supported..\r
-        /// </summary>\r
-        internal static string ArgumentValueType {\r
-            get {\r
-                return ResourceManager.GetString("ArgumentValueType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Assembly file {0} is either not found or not a dll or exe file..\r
-        /// </summary>\r
-        internal static string AssemblyFileNotFoundOrWrongType {\r
-            get {\r
-                return ResourceManager.GetString("AssemblyFileNotFoundOrWrongType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The atomicComposition can no longer be changed because the atomicComposition has already been completed..\r
-        /// </summary>\r
-        internal static string AtomicComposition_AlreadyCompleted {\r
-            get {\r
-                return ResourceManager.GetString("AtomicComposition_AlreadyCompleted", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The atomicComposition is already contains an inner atomicComposition and cannot contain more than one atomicComposition at a time..\r
-        /// </summary>\r
-        internal static string AtomicComposition_AlreadyNested {\r
-            get {\r
-                return ResourceManager.GetString("AtomicComposition_AlreadyNested", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The atomicComposition contains another inner atomicComposition and cannot be changed until the that inner atomicComposition has been completed..\r
-        /// </summary>\r
-        internal static string AtomicComposition_PartOfAnotherAtomicComposition {\r
-            get {\r
-                return ResourceManager.GetString("AtomicComposition_PartOfAnotherAtomicComposition", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to No valid exports were found that match the constraint &apos;{0}&apos;, invalid exports may have been rejected..\r
-        /// </summary>\r
-        internal static string CardinalityMismatch_NoExports {\r
-            get {\r
-                return ResourceManager.GetString("CardinalityMismatch_NoExports", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to More than one export was found that matches the constraint &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string CardinalityMismatch_TooManyExports {\r
-            get {\r
-                return ResourceManager.GetString("CardinalityMismatch_TooManyExports", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Unknown Origin.\r
-        /// </summary>\r
-        internal static string CompositionElement_UnknownOrigin {\r
-            get {\r
-                return ResourceManager.GetString("CompositionElement_UnknownOrigin", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The composition remains unchanged. The changes were rejected because of the following error(s): {0}.\r
-        /// </summary>\r
-        internal static string CompositionException_ChangesRejected {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_ChangesRejected", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Element: {0}.\r
-        /// </summary>\r
-        internal static string CompositionException_ElementPrefix {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_ElementPrefix", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Resulting in:.\r
-        /// </summary>\r
-        internal static string CompositionException_ErrorPrefix {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_ErrorPrefix", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Unable to create an instance of the Metadata view &apos;{0}&apos; because a constructor could not be selected.  Ensure that the type implements a constructor which takes an argument of type IDictionary&lt;string, object&gt;..\r
-        /// </summary>\r
-        internal static string CompositionException_MetadataViewInvalidConstructor {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_MetadataViewInvalidConstructor", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The composition produced multiple composition errors, with {0:N0} root causes. The root causes are provided below..\r
-        /// </summary>\r
-        internal static string CompositionException_MultipleErrorsWithMultiplePaths {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_MultipleErrorsWithMultiplePaths", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to  {0} {1}.\r
-        /// </summary>\r
-        internal static string CompositionException_OriginFormat {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_OriginFormat", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to --&gt; .\r
-        /// </summary>\r
-        internal static string CompositionException_OriginSeparator {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_OriginSeparator", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to ).\r
-        /// </summary>\r
-        internal static string CompositionException_PathsCountSeparator {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_PathsCountSeparator", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Review the CompositionException.Errors property for more detailed information..\r
-        /// </summary>\r
-        internal static string CompositionException_ReviewErrorProperty {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_ReviewErrorProperty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The composition produced a single composition error, with {0:N0} root causes. The root causes are provided below..\r
-        /// </summary>\r
-        internal static string CompositionException_SingleErrorWithMultiplePaths {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_SingleErrorWithMultiplePaths", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The composition produced a single composition error. The root cause is provided below..\r
-        /// </summary>\r
-        internal static string CompositionException_SingleErrorWithSinglePath {\r
-            get {\r
-                return ResourceManager.GetString("CompositionException_SingleErrorWithSinglePath", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The catalog &apos;{0}&apos; could not load assembly &apos;{1}&apos;. {2}.\r
-        /// </summary>\r
-        internal static string CompositionTrace_Discovery_AssemblyLoadFailed {\r
-            get {\r
-                return ResourceManager.GetString("CompositionTrace_Discovery_AssemblyLoadFailed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ComposablePartDefinition &apos;{0}&apos; was ignored because it is an open generic type..\r
-        /// </summary>\r
-        internal static string CompositionTrace_Discovery_DefinitionContainsGenericParameters {\r
-            get {\r
-                return ResourceManager.GetString("CompositionTrace_Discovery_DefinitionContainsGenericParameters", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ComposablePartDefinition &apos;{0}&apos; was ignored because it contains no exports..\r
-        /// </summary>\r
-        internal static string CompositionTrace_Discovery_DefinitionContainsNoExports {\r
-            get {\r
-                return ResourceManager.GetString("CompositionTrace_Discovery_DefinitionContainsNoExports", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ComposablePartDefinition &apos;{0}&apos; was ignored because it was marked with PartNotDiscoverableAttribute..\r
-        /// </summary>\r
-        internal static string CompositionTrace_Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute {\r
-            get {\r
-                return ResourceManager.GetString("CompositionTrace_Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The member or parameter &apos;{0}&apos; is marked with multiple Import and ImportMany attributes. Only the first attribute encountered will be respected..\r
-        /// </summary>\r
-        internal static string CompositionTrace_Discovery_MemberMarkedWithMultipleImportAndImportMany {\r
-            get {\r
-                return ResourceManager.GetString("CompositionTrace_Discovery_MemberMarkedWithMultipleImportAndImportMany", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ComposablePartDefinition &apos;{0}&apos; has been rejected. {1}.\r
-        /// </summary>\r
-        internal static string CompositionTrace_Rejection_DefinitionRejected {\r
-            get {\r
-                return ResourceManager.GetString("CompositionTrace_Rejection_DefinitionRejected", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ComposablePartDefinition &apos;{0}&apos; that was previously rejected has been resurrected..\r
-        /// </summary>\r
-        internal static string CompositionTrace_Rejection_DefinitionResurrected {\r
-            get {\r
-                return ResourceManager.GetString("CompositionTrace_Rejection_DefinitionResurrected", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot cast the underlying exported value of type &apos;{0}&apos; to type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ContractMismatch_ExportedValueCannotBeCastToT {\r
-            get {\r
-                return ResourceManager.GetString("ContractMismatch_ExportedValueCannotBeCastToT", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Unable to create an Instance of the Metadata view &apos;{0}&apos; because the exporter exported the metadata  for the item &apos;{1}&apos; with the value &apos;{2}&apos; as type &apos;{3}&apos; but the view imports it as type &apos;{4}&apos;..\r
-        /// </summary>\r
-        internal static string ContractMismatch_InvalidCastOnMetadataField {\r
-            get {\r
-                return ResourceManager.GetString("ContractMismatch_InvalidCastOnMetadataField", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Unable to create an Instance of the Metadata view &apos;{0}&apos; because the exporter exported the metadata for the item &apos;{1}&apos; with a null value and null is not a valid value for type &apos;{2}&apos;..\r
-        /// </summary>\r
-        internal static string ContractMismatch_NullReferenceOnMetadataField {\r
-            get {\r
-                return ResourceManager.GetString("ContractMismatch_NullReferenceOnMetadataField", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Directory &apos;{0}&apos; could not be found..\r
-        /// </summary>\r
-        internal static string DirectoryNotFound {\r
-            get {\r
-                return ResourceManager.GetString("DirectoryNotFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Member or Type &apos;{0}&apos; contains multiple metadata entries with the name &apos;{1}&apos;. The metadata entries could be coming from the ExportMetadataAttribute or from a property of a custom metadata attribute. Either remove the duplicate entries or enable the metadata entry with name &apos;{1}&apos; to allow multiple entries via the IsMultiple property on ExportMetadataAttribute or AttributeUsage.AllowMultiple on custom metadata attributes..\r
-        /// </summary>\r
-        internal static string Discovery_DuplicateMetadataNameValues {\r
-            get {\r
-                return ResourceManager.GetString("Discovery_DuplicateMetadataNameValues", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Property &apos;{0}&apos; has type &apos;{1}&apos; which is an invalid metadata type. Metadata can only contain values with a type that is available to be embedded at compile-time into attributes. For more details of what types are valid reference section 17.1.3 in the C# specification..\r
-        /// </summary>\r
-        internal static string Discovery_MetadataContainsValueWithInvalidType {\r
-            get {\r
-                return ResourceManager.GetString("Discovery_MetadataContainsValueWithInvalidType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Member or Type &apos;{0}&apos; contains a metadata entry with the name &apos;{1}&apos;, which is a reserved metadata key name. Either remove this metadata entry or change the name associated with the entry..\r
-        /// </summary>\r
-        internal static string Discovery_ReservedMetadataNameUsed {\r
-            get {\r
-                return ResourceManager.GetString("Discovery_ReservedMetadataNameUsed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to {0} did not originate from the ExportDefinitions property on this ComposablePart or its ComposablePartDefinition..\r
-        /// </summary>\r
-        internal static string ExportDefinitionNotOnThisComposablePart {\r
-            get {\r
-                return ResourceManager.GetString("ExportDefinitionNotOnThisComposablePart", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to {0} did not originate from the ImportDefinitions property on this ComposablePart or its ComposablePartDefinition..\r
-        /// </summary>\r
-        internal static string ImportDefinitionNotOnThisComposablePart {\r
-            get {\r
-                return ResourceManager.GetString("ImportDefinitionNotOnThisComposablePart", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The composition failed because it did not complete within &apos;{0:N0}&apos; iterations. This is most likely caused by a cycle in the dependency graph of a part which is marked with a non-shared creation policy..\r
-        /// </summary>\r
-        internal static string ImportEngine_ComposeTookTooManyIterations {\r
-            get {\r
-                return ResourceManager.GetString("ImportEngine_ComposeTookTooManyIterations", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ComposablePart of type &apos;{0}&apos; cannot be recomposed because it is in an invalid state. It can only be recomposed if it has already been fully previewed or composed..\r
-        /// </summary>\r
-        internal static string ImportEngine_InvalidStateForRecomposition {\r
-            get {\r
-                return ResourceManager.GetString("ImportEngine_InvalidStateForRecomposition", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot activate part &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string ImportEngine_PartCannotActivate {\r
-            get {\r
-                return ResourceManager.GetString("ImportEngine_PartCannotActivate", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot get export &apos;{0}&apos; from part &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ImportEngine_PartCannotGetExportedValue {\r
-            get {\r
-                return ResourceManager.GetString("ImportEngine_PartCannotGetExportedValue", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot set import &apos;{0}&apos; on part &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ImportEngine_PartCannotSetImport {\r
-            get {\r
-                return ResourceManager.GetString("ImportEngine_PartCannotSetImport", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot compose part &apos;{0}&apos; because a cycle exists in the dependencies between the exports being composed. To break this cycle, consider changing some imports from constructor to property injection..\r
-        /// </summary>\r
-        internal static string ImportEngine_PartCycle {\r
-            get {\r
-                return ResourceManager.GetString("ImportEngine_PartCycle", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Change in exports prevented by non-recomposable import &apos;{0}&apos; on part &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ImportEngine_PreventedByExistingImport {\r
-            get {\r
-                return ResourceManager.GetString("ImportEngine_PreventedByExistingImport", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Could not finishing composing object of type &apos;{0}&apos;. The import &apos;{1}&apos; was not satisfied..\r
-        /// </summary>\r
-        internal static string ImportNotSetOnPart {\r
-            get {\r
-                return ResourceManager.GetString("ImportNotSetOnPart", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Internal error occurred. Additional information: &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string InternalExceptionMessage {\r
-            get {\r
-                return ResourceManager.GetString("InternalExceptionMessage", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Metadata can only contain values with a type that is available to be embedded at compile-time into attributes. For more details of what types are valid reference section 17.1.3 in the C# specification..\r
-        /// </summary>\r
-        internal static string InvalidMetadataValue {\r
-            get {\r
-                return ResourceManager.GetString("InvalidMetadataValue", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The Type &apos;{0}&apos; supplied is not a valid Metadata View..\r
-        /// </summary>\r
-        internal static string InvalidMetadataView {\r
-            get {\r
-                return ResourceManager.GetString("InvalidMetadataView", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;definition&apos; cannot be set after Activate has been called because ImportDefinition.IsRecomposable is false..\r
-        /// </summary>\r
-        internal static string InvalidOperation_DefinitionCannotBeRecomposed {\r
-            get {\r
-                return ResourceManager.GetString("InvalidOperation_DefinitionCannotBeRecomposed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to GetExportedValue cannot be called before prerequisite import &apos;{0}&apos; has been set..\r
-        /// </summary>\r
-        internal static string InvalidOperation_GetExportedValueBeforePrereqImportSet {\r
-            get {\r
-                return ResourceManager.GetString("InvalidOperation_GetExportedValueBeforePrereqImportSet", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A call to Compose occurred during a call to Compose on the same CompositionContainer object. Use the IsComposing property on CompositionContainer to ensure a composition is not already in progress before calling Compose..\r
-        /// </summary>\r
-        internal static string InvalidOperationReentrantCompose {\r
-            get {\r
-                return ResourceManager.GetString("InvalidOperationReentrantCompose", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The MetadataView &apos;{0}&apos; is invalid because property &apos;{1}&apos; has a property set method..\r
-        /// </summary>\r
-        internal static string InvalidSetterOnMetadataField {\r
-            get {\r
-                return ResourceManager.GetString("InvalidSetterOnMetadataField", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Accessors must not be null (Nothing in Visual Basic)..\r
-        /// </summary>\r
-        internal static string LazyMemberInfo_AccessorsNull {\r
-            get {\r
-                return ResourceManager.GetString("LazyMemberInfo_AccessorsNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A member of type &apos;{0}&apos; must have exactly a single accessor of type &apos;{0}&apos;.\r
-        /// </summary>\r
-        internal static string LazyMemberInfo_InvalidAccessorOnSimpleMember {\r
-            get {\r
-                return ResourceManager.GetString("LazyMemberInfo_InvalidAccessorOnSimpleMember", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to All event accessors must be methods..\r
-        /// </summary>\r
-        internal static string LazyMemberinfo_InvalidEventAccessors_AccessorType {\r
-            get {\r
-                return ResourceManager.GetString("LazyMemberinfo_InvalidEventAccessors_AccessorType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An event must have exactly three accessors..\r
-        /// </summary>\r
-        internal static string LazyMemberInfo_InvalidEventAccessors_Cardinality {\r
-            get {\r
-                return ResourceManager.GetString("LazyMemberInfo_InvalidEventAccessors_Cardinality", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to All property accessors must be methods..\r
-        /// </summary>\r
-        internal static string LazyMemberinfo_InvalidPropertyAccessors_AccessorType {\r
-            get {\r
-                return ResourceManager.GetString("LazyMemberinfo_InvalidPropertyAccessors_AccessorType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A property must have exactly two accessors..\r
-        /// </summary>\r
-        internal static string LazyMemberInfo_InvalidPropertyAccessors_Cardinality {\r
-            get {\r
-                return ResourceManager.GetString("LazyMemberInfo_InvalidPropertyAccessors_Cardinality", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A member must have at least one accessor..\r
-        /// </summary>\r
-        internal static string LazyMemberInfo_NoAccessors {\r
-            get {\r
-                return ResourceManager.GetString("LazyMemberInfo_NoAccessors", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The lazily evaluated value of type &apos;{0}&apos; passed to the ReflectionModelServices API as part of the argument &apos;{1}&apos; must not return null (Nothing in Visual Basic)..\r
-        /// </summary>\r
-        internal static string LazyServices_LazyResolvesToNull {\r
-            get {\r
-                return ResourceManager.GetString("LazyServices_LazyResolvesToNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to This export does not support the metadata item &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string MetadataItemNotSupported {\r
-            get {\r
-                return ResourceManager.GetString("MetadataItemNotSupported", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The {0} member must be overridden by a derived class..\r
-        /// </summary>\r
-        internal static string NotImplemented_NotOverriddenByDerived {\r
-            get {\r
-                return ResourceManager.GetString("NotImplemented_NotOverriddenByDerived", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Interface &apos;{0}&apos; is not a valid MetadataView; MetadataViews do not support non-public interfaces, and interfaces that contain members that are not properties..\r
-        /// </summary>\r
-        internal static string NotSupportedInterfaceMetadataView {\r
-            get {\r
-                return ResourceManager.GetString("NotSupportedInterfaceMetadataView", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The underlying dictionary is read-only..\r
-        /// </summary>\r
-        internal static string NotSupportedReadOnlyDictionary {\r
-            get {\r
-                return ResourceManager.GetString("NotSupportedReadOnlyDictionary", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to This property cannot be set after the object&apos;s public surface has been accessed..\r
-        /// </summary>\r
-        internal static string ObjectAlreadyInitialized {\r
-            get {\r
-                return ResourceManager.GetString("ObjectAlreadyInitialized", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to This object has not been initialized - the property &apos;{0}&apos; must be set..\r
-        /// </summary>\r
-        internal static string ObjectMustBeInitialized {\r
-            get {\r
-                return ResourceManager.GetString("ObjectMustBeInitialized", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Currently composing another batch in this ComposablePartExportProvider. Only one batch can be composed at a time..\r
-        /// </summary>\r
-        internal static string ReentrantCompose {\r
-            get {\r
-                return ResourceManager.GetString("ReentrantCompose", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot get the value of property &apos;{0}&apos;, because the member is not readable. The property must have an accessible getter..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ExportNotReadable {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ExportNotReadable", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An exception occurred while trying to get the value of property &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ExportThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ExportThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot populate the collection &apos;{0}&apos; because an exception occurred while calling the Add method on the type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportCollectionAddThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportCollectionAddThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot populate the collection &apos;{0}&apos; because an exception occurred while calling the Clear method on the type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportCollectionClearThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportCollectionClearThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot populate the collection &apos;{0}&apos; because an exception occurred while calling the default constructor on the type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportCollectionConstructionThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportCollectionConstructionThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot populate the collection &apos;{0}&apos; because an exception occurred while trying to access the collection value. If the collection is not IEnumerable&lt;T&gt; or T[] it must implement ICollection&lt;T&gt; and be either pre-initialized or be writable with a default constructor..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportCollectionGetThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportCollectionGetThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot populate the collection &apos;{0}&apos; because an exception occurred while reading the IsReadOnly property on the type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportCollectionIsReadOnlyThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportCollectionIsReadOnlyThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot populate the collection &apos;{0}&apos; because it does not implement ICollection&lt;T&gt; or is read-only. If the collection is not IEnumerable&lt;T&gt; or T[] it must implement ICollection&lt;T&gt; and be either pre-initialized or be writable with a default constructor..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportCollectionNotWritable {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportCollectionNotWritable", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot populate the value of enumerable member &apos;{0}&apos; because it is null (Nothing in Visual Basic). If the collection is not IEnumerable&lt;T&gt; or T[] it must implement ICollection&lt;T&gt; and be either pre-initialized or be writable with a default constructor..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportCollectionNull {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportCollectionNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The importing constructor on type &apos;{0}&apos; is using ImportManyAttribute on parameter &apos;{1}&apos; with a non-assignable type. On constructor parameters the ImportManyAttribute only supports importing into types T[] or IEnumerable&lt;T&gt;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The export &apos;{0}&apos; is not assignable to type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportNotAssignableFromExport {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportNotAssignableFromExport", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot set the value of &apos;{0}&apos; because the member is not writable. If the member is a property, it must have an accessible setter; otherwise, if it is a field, it must not be read-only..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportNotWritable {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportNotWritable", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An exception occurred while trying to set the value of property &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_ImportThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_ImportThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to ExportDefinition of type &apos;{0}&apos; cannot be used in this context. Only export definitions produced by the ReflectionModelServices.CreateExportDefinition are supported..\r
-        /// </summary>\r
-        internal static string ReflectionModel_InvalidExportDefinition {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_InvalidExportDefinition", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to ImportDefinition of type &apos;{0}&apos; cannot be used in this context. Only import definitions produced by the ReflectionModelServices.CreateImportDefinition are supported..\r
-        /// </summary>\r
-        internal static string ReflectionModel_InvalidImportDefinition {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_InvalidImportDefinition", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to ImportDefinition of type &apos;{0}&apos; cannot be used in this context. Only import definitions produced by the ReflectionModelServices.CreateImportDefinition based on members are supported. Use ReflectionModelServices.IsImportingParameter to determine whether a given import definition is based on a member or a parameter..\r
-        /// </summary>\r
-        internal static string ReflectionModel_InvalidMemberImportDefinition {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_InvalidMemberImportDefinition", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to ImportDefinition of type &apos;{0}&apos; cannot be used in this context. Only import definitions produced by the ReflectionModelServices.CreateImportDefinition based on parameters are supported. Use ReflectionModelServices.IsImportingParameter to determine whether a given import definition is based on a member or a parameter..\r
-        /// </summary>\r
-        internal static string ReflectionModel_InvalidParameterImportDefinition {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_InvalidParameterImportDefinition", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to ComposablePartDefinition of type &apos;{0}&apos; cannot be used in this context. Only part definitions produced by the ReflectionModelServices.CreatePartDefinition are supported..\r
-        /// </summary>\r
-        internal static string ReflectionModel_InvalidPartDefinition {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_InvalidPartDefinition", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot create an instance of type &apos;{0}&apos; because a constructor could not be selected for construction. Ensure that the type either has a default constructor, or a single constructor marked with the &apos;System.ComponentModel.Composition.ImportingConstructorAttribute&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_PartConstructorMissing {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_PartConstructorMissing", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An exception occurred while trying to create an instance of type &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_PartConstructorThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_PartConstructorThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An exception occurred while calling the &apos;OnImportsSatisfied&apos; method on type &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectionModel_PartOnImportsSatisfiedThrewException {\r
-            get {\r
-                return ResourceManager.GetString("ReflectionModel_PartOnImportsSatisfiedThrewException", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to {0} (Types=&apos;{1}&apos;)..\r
-        /// </summary>\r
-        internal static string TypeCatalog_DisplayNameFormat {\r
-            get {\r
-                return ResourceManager.GetString("TypeCatalog_DisplayNameFormat", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &lt;Empty&gt;.\r
-        /// </summary>\r
-        internal static string TypeCatalog_Empty {\r
-            get {\r
-                return ResourceManager.GetString("TypeCatalog_Empty", resourceCulture);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Strings.resx b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/Strings.resx
deleted file mode 100644 (file)
index db6341d..0000000
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<root>\r
-  <!-- \r
-    Microsoft ResX Schema \r
-    \r
-    Version 2.0\r
-    \r
-    The primary goals of this format is to allow a simple XML format \r
-    that is mostly human readable. The generation and parsing of the \r
-    various data types are done through the TypeConverter classes \r
-    associated with the data types.\r
-    \r
-    Example:\r
-    \r
-    ... ado.net/XML headers & schema ...\r
-    <resheader name="resmimetype">text/microsoft-resx</resheader>\r
-    <resheader name="version">2.0</resheader>\r
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>\r
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
-        <value>[base64 mime encoded serialized .NET Framework object]</value>\r
-    </data>\r
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>\r
-        <comment>This is a comment</comment>\r
-    </data>\r
-                \r
-    There are any number of "resheader" rows that contain simple \r
-    name/value pairs.\r
-    \r
-    Each data row contains a name, and value. The row also contains a \r
-    type or mimetype. Type corresponds to a .NET class that support \r
-    text/value conversion through the TypeConverter architecture. \r
-    Classes that don't support this are serialized and stored with the \r
-    mimetype set.\r
-    \r
-    The mimetype is used for serialized objects, and tells the \r
-    ResXResourceReader how to depersist the object. This is currently not \r
-    extensible. For a given mimetype the value must be set accordingly:\r
-    \r
-    Note - application/x-microsoft.net.object.binary.base64 is the format \r
-    that the ResXResourceWriter will generate, however the reader can \r
-    read any of the formats listed below.\r
-    \r
-    mimetype: application/x-microsoft.net.object.binary.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
-            : and then encoded with base64 encoding.\r
-    \r
-    mimetype: application/x-microsoft.net.object.soap.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
-            : and then encoded with base64 encoding.\r
-\r
-    mimetype: application/x-microsoft.net.object.bytearray.base64\r
-    value   : The object must be serialized into a byte array \r
-            : using a System.ComponentModel.TypeConverter\r
-            : and then encoded with base64 encoding.\r
-    -->\r
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
-    <xsd:element name="root" msdata:IsDataSet="true">\r
-      <xsd:complexType>\r
-        <xsd:choice maxOccurs="unbounded">\r
-          <xsd:element name="metadata">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" use="required" type="xsd:string" />\r
-              <xsd:attribute name="type" type="xsd:string" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="assembly">\r
-            <xsd:complexType>\r
-              <xsd:attribute name="alias" type="xsd:string" />\r
-              <xsd:attribute name="name" type="xsd:string" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="data">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="resheader">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-        </xsd:choice>\r
-      </xsd:complexType>\r
-    </xsd:element>\r
-  </xsd:schema>\r
-  <resheader name="resmimetype">\r
-    <value>text/microsoft-resx</value>\r
-  </resheader>\r
-  <resheader name="version">\r
-    <value>2.0</value>\r
-  </resheader>\r
-  <resheader name="reader">\r
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <resheader name="writer">\r
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <data name="ArgumentException_EmptyString" xml:space="preserve">\r
-    <value>'{0}' cannot be an empty string ("").</value>\r
-  </data>\r
-  <data name="ArgumentOutOfRange_InvalidEnum" xml:space="preserve">\r
-    <value>The value of argument '{0}' ({1}) is invalid for Enum type '{2}'.</value>\r
-  </data>\r
-  <data name="ArgumentValueType" xml:space="preserve">\r
-    <value>The argument was a value type which is not supported.</value>\r
-  </data>\r
-  <data name="Argument_AssemblyReflectionOnly" xml:space="preserve">\r
-    <value>'{0}' is a reflection-only assembly which is not supported.</value>\r
-  </data>\r
-  <data name="Argument_NullElement" xml:space="preserve">\r
-    <value>'{0}' cannot contain a null (Nothing in Visual Basic) element.</value>\r
-  </data>\r
-  <data name="AssemblyFileNotFoundOrWrongType" xml:space="preserve">\r
-    <value>Assembly file {0} is either not found or not a dll or exe file.</value>\r
-  </data>\r
-  <data name="CardinalityMismatch_NoExports" xml:space="preserve">\r
-    <value>No valid exports were found that match the constraint '{0}', invalid exports may have been rejected.</value>\r
-  </data>\r
-  <data name="CardinalityMismatch_TooManyExports" xml:space="preserve">\r
-    <value>More than one export was found that matches the constraint '{0}'.</value>\r
-  </data>\r
-  <data name="ImportEngine_ComposeTookTooManyIterations" xml:space="preserve">\r
-    <value>The composition failed because it did not complete within '{0:N0}' iterations. This is most likely caused by a cycle in the dependency graph of a part which is marked with a non-shared creation policy.</value>\r
-  </data>\r
-  <data name="ContractMismatch_ExportedValueCannotBeCastToT" xml:space="preserve">\r
-    <value>Cannot cast the underlying exported value of type '{0}' to type '{1}'.</value>\r
-  </data>\r
-  <data name="DirectoryNotFound" xml:space="preserve">\r
-    <value>Directory '{0}' could not be found.</value>\r
-  </data>\r
-  <data name="ReflectionModel_PartConstructorThrewException" xml:space="preserve">\r
-    <value>An exception occurred while trying to create an instance of type '{0}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ExportThrewException" xml:space="preserve">\r
-    <value>An exception occurred while trying to get the value of property '{0}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_PartOnImportsSatisfiedThrewException" xml:space="preserve">\r
-    <value>An exception occurred while calling the 'OnImportsSatisfied' method on type '{0}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportThrewException" xml:space="preserve">\r
-    <value>An exception occurred while trying to set the value of property '{0}'.</value>\r
-  </data>\r
-  <data name="ExportDefinitionNotOnThisComposablePart" xml:space="preserve">\r
-    <value>{0} did not originate from the ExportDefinitions property on this ComposablePart or its ComposablePartDefinition.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportCollectionNotWritable" xml:space="preserve">\r
-    <value>Cannot populate the collection '{0}' because it does not implement ICollection&lt;T&gt; or is read-only. If the collection is not IEnumerable&lt;T&gt; or T[] it must implement ICollection&lt;T&gt; and be either pre-initialized or be writable with a default constructor.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportCollectionNull" xml:space="preserve">\r
-    <value>Cannot populate the value of enumerable member '{0}' because it is null (Nothing in Visual Basic). If the collection is not IEnumerable&lt;T&gt; or T[] it must implement ICollection&lt;T&gt; and be either pre-initialized or be writable with a default constructor.</value>\r
-  </data>\r
-  <data name="ImportEngine_PartCycle" xml:space="preserve">\r
-    <value>Cannot compose part '{0}' because a cycle exists in the dependencies between the exports being composed. To break this cycle, consider changing some imports from constructor to property injection.</value>\r
-  </data>\r
-  <data name="ImportDefinitionNotOnThisComposablePart" xml:space="preserve">\r
-    <value>{0} did not originate from the ImportDefinitions property on this ComposablePart or its ComposablePartDefinition.</value>\r
-  </data>\r
-  <data name="ImportNotSetOnPart" xml:space="preserve">\r
-    <value>Could not finishing composing object of type '{0}'. The import '{1}' was not satisfied.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportNotWritable" xml:space="preserve">\r
-    <value>Cannot set the value of '{0}' because the member is not writable. If the member is a property, it must have an accessible setter; otherwise, if it is a field, it must not be read-only.</value>\r
-  </data>\r
-  <data name="InternalExceptionMessage" xml:space="preserve">\r
-    <value>Internal error occurred. Additional information: '{0}'.</value>\r
-  </data>\r
-  <data name="InvalidMetadataView" xml:space="preserve">\r
-    <value>The Type '{0}' supplied is not a valid Metadata View.</value>\r
-  </data>\r
-  <data name="InvalidOperationReentrantCompose" xml:space="preserve">\r
-    <value>A call to Compose occurred during a call to Compose on the same CompositionContainer object. Use the IsComposing property on CompositionContainer to ensure a composition is not already in progress before calling Compose.</value>\r
-  </data>\r
-  <data name="MetadataItemNotSupported" xml:space="preserve">\r
-    <value>This export does not support the metadata item '{0}'.</value>\r
-  </data>\r
-  <data name="NotSupportedInterfaceMetadataView" xml:space="preserve">\r
-    <value>Interface '{0}' is not a valid MetadataView; MetadataViews do not support non-public interfaces, and interfaces that contain members that are not properties.</value>\r
-  </data>\r
-  <data name="ReflectionModel_PartConstructorMissing" xml:space="preserve">\r
-    <value>Cannot create an instance of type '{0}' because a constructor could not be selected for construction. Ensure that the type either has a default constructor, or a single constructor marked with the 'System.ComponentModel.Composition.ImportingConstructorAttribute'.</value>\r
-  </data>\r
-  <data name="NotImplemented_NotOverriddenByDerived" xml:space="preserve">\r
-    <value>The {0} member must be overridden by a derived class.</value>\r
-  </data>\r
-  <data name="NotSupportedReadOnlyDictionary" xml:space="preserve">\r
-    <value>The underlying dictionary is read-only.</value>\r
-  </data>\r
-  <data name="ObjectAlreadyInitialized" xml:space="preserve">\r
-    <value>This property cannot be set after the object's public surface has been accessed.</value>\r
-  </data>\r
-  <data name="ObjectMustBeInitialized" xml:space="preserve">\r
-    <value>This object has not been initialized - the property '{0}' must be set.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportNotAssignableFromExport" xml:space="preserve">\r
-    <value>The export '{0}' is not assignable to type '{1}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ExportNotReadable" xml:space="preserve">\r
-    <value>Cannot get the value of property '{0}', because the member is not readable. The property must have an accessible getter.</value>\r
-  </data>\r
-  <data name="Argument_ElementReflectionOnlyType" xml:space="preserve">\r
-    <value>'{0}' contains a reflection-only type which is not supported.</value>\r
-  </data>\r
-  <data name="InvalidOperation_DefinitionCannotBeRecomposed" xml:space="preserve">\r
-    <value>'definition' cannot be set after Activate has been called because ImportDefinition.IsRecomposable is false.</value>\r
-  </data>\r
-  <data name="Argument_ExportsEmpty" xml:space="preserve">\r
-    <value>'exports' cannot be empty when ImportDefinition.ImportCardinality is ImportCardinality.ExactlyOne.</value>\r
-  </data>\r
-  <data name="Argument_ExportsTooMany" xml:space="preserve">\r
-    <value>'exports' cannot contain more than one element when ImportDefinition.ImportCardinality is ImportCardinality.ZeroOrOne or ImportCardinality.ExactlyOne.</value>\r
-  </data>\r
-  <data name="CompositionElement_UnknownOrigin" xml:space="preserve">\r
-    <value>Unknown Origin</value>\r
-  </data>\r
-  <data name="ImportEngine_PartCannotActivate" xml:space="preserve">\r
-    <value>Cannot activate part '{0}'.</value>\r
-  </data>\r
-  <data name="ImportEngine_PartCannotSetImport" xml:space="preserve">\r
-    <value>Cannot set import '{0}' on part '{1}'.</value>\r
-  </data>\r
-  <data name="ImportEngine_PartCannotGetExportedValue" xml:space="preserve">\r
-    <value>Cannot get export '{0}' from part '{1}'.</value>\r
-  </data>\r
-  <data name="TypeCatalog_Empty" xml:space="preserve">\r
-    <value>&lt;Empty&gt;</value>\r
-  </data>\r
-  <data name="InvalidOperation_GetExportedValueBeforePrereqImportSet" xml:space="preserve">\r
-    <value>GetExportedValue cannot be called before prerequisite import '{0}' has been set.</value>\r
-  </data>\r
-  <data name="CompositionException_ErrorPrefix" xml:space="preserve">\r
-    <value>Resulting in:</value>\r
-  </data>\r
-  <data name="CompositionException_MultipleErrorsWithMultiplePaths" xml:space="preserve">\r
-    <value>The composition produced multiple composition errors, with {0:N0} root causes. The root causes are provided below.</value>\r
-  </data>\r
-  <data name="CompositionException_ReviewErrorProperty" xml:space="preserve">\r
-    <value>Review the CompositionException.Errors property for more detailed information.</value>\r
-  </data>\r
-  <data name="CompositionException_SingleErrorWithMultiplePaths" xml:space="preserve">\r
-    <value>The composition produced a single composition error, with {0:N0} root causes. The root causes are provided below.</value>\r
-  </data>\r
-  <data name="CompositionException_SingleErrorWithSinglePath" xml:space="preserve">\r
-    <value>The composition produced a single composition error. The root cause is provided below.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportCollectionGetThrewException" xml:space="preserve">\r
-    <value>Cannot populate the collection '{0}' because an exception occurred while trying to access the collection value. If the collection is not IEnumerable&lt;T&gt; or T[] it must implement ICollection&lt;T&gt; and be either pre-initialized or be writable with a default constructor.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportCollectionAddThrewException" xml:space="preserve">\r
-    <value>Cannot populate the collection '{0}' because an exception occurred while calling the Add method on the type '{1}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportCollectionClearThrewException" xml:space="preserve">\r
-    <value>Cannot populate the collection '{0}' because an exception occurred while calling the Clear method on the type '{1}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportCollectionIsReadOnlyThrewException" xml:space="preserve">\r
-    <value>Cannot populate the collection '{0}' because an exception occurred while reading the IsReadOnly property on the type '{1}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportCollectionConstructionThrewException" xml:space="preserve">\r
-    <value>Cannot populate the collection '{0}' because an exception occurred while calling the default constructor on the type '{1}'.</value>\r
-  </data>\r
-  <data name="CompositionTrace_Discovery_MemberMarkedWithMultipleImportAndImportMany" xml:space="preserve">\r
-    <value>The member or parameter '{0}' is marked with multiple Import and ImportMany attributes. Only the first attribute encountered will be respected.</value>\r
-  </data>\r
-  <data name="Discovery_MetadataContainsValueWithInvalidType" xml:space="preserve">\r
-    <value>Property '{0}' has type '{1}' which is an invalid metadata type. Metadata can only contain values with a type that is available to be embedded at compile-time into attributes. For more details of what types are valid reference section 17.1.3 in the C# specification.</value>\r
-  </data>\r
-  <data name="Discovery_DuplicateMetadataNameValues" xml:space="preserve">\r
-    <value>Member or Type '{0}' contains multiple metadata entries with the name '{1}'. The metadata entries could be coming from the ExportMetadataAttribute or from a property of a custom metadata attribute. Either remove the duplicate entries or enable the metadata entry with name '{1}' to allow multiple entries via the IsMultiple property on ExportMetadataAttribute or AttributeUsage.AllowMultiple on custom metadata attributes.</value>\r
-  </data>\r
-  <data name="Discovery_ReservedMetadataNameUsed" xml:space="preserve">\r
-    <value>Member or Type '{0}' contains a metadata entry with the name '{1}', which is a reserved metadata key name. Either remove this metadata entry or change the name associated with the entry.</value>\r
-  </data>\r
-  <data name="ReflectionModel_InvalidExportDefinition" xml:space="preserve">\r
-    <value>ExportDefinition of type '{0}' cannot be used in this context. Only export definitions produced by the ReflectionModelServices.CreateExportDefinition are supported.</value>\r
-  </data>\r
-  <data name="ImportEngine_PreventedByExistingImport" xml:space="preserve">\r
-    <value>Change in exports prevented by non-recomposable import '{0}' on part '{1}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_InvalidImportDefinition" xml:space="preserve">\r
-    <value>ImportDefinition of type '{0}' cannot be used in this context. Only import definitions produced by the ReflectionModelServices.CreateImportDefinition are supported.</value>\r
-  </data>\r
-  <data name="ReflectionModel_InvalidPartDefinition" xml:space="preserve">\r
-    <value>ComposablePartDefinition of type '{0}' cannot be used in this context. Only part definitions produced by the ReflectionModelServices.CreatePartDefinition are supported.</value>\r
-  </data>\r
-  <data name="ArgumentOutOfRange_InvalidEnumInSet" xml:space="preserve">\r
-    <value>The value of argument '{0}' ({1}) is not supported. Allowed values are : '{2}'.</value>\r
-  </data>\r
-  <data name="ReflectionModel_InvalidMemberImportDefinition" xml:space="preserve">\r
-    <value>ImportDefinition of type '{0}' cannot be used in this context. Only import definitions produced by the ReflectionModelServices.CreateImportDefinition based on members are supported. Use ReflectionModelServices.IsImportingParameter to determine whether a given import definition is based on a member or a parameter.</value>\r
-  </data>\r
-  <data name="ReflectionModel_InvalidParameterImportDefinition" xml:space="preserve">\r
-    <value>ImportDefinition of type '{0}' cannot be used in this context. Only import definitions produced by the ReflectionModelServices.CreateImportDefinition based on parameters are supported. Use ReflectionModelServices.IsImportingParameter to determine whether a given import definition is based on a member or a parameter.</value>\r
-  </data>\r
-  <data name="LazyMemberInfo_AccessorsNull" xml:space="preserve">\r
-    <value>Accessors must not be null (Nothing in Visual Basic).</value>\r
-  </data>\r
-  <data name="LazyMemberInfo_InvalidAccessorOnSimpleMember" xml:space="preserve">\r
-    <value>A member of type '{0}' must have exactly a single accessor of type '{0}'</value>\r
-  </data>\r
-  <data name="LazyMemberinfo_InvalidEventAccessors_AccessorType" xml:space="preserve">\r
-    <value>All event accessors must be methods.</value>\r
-  </data>\r
-  <data name="LazyMemberInfo_InvalidEventAccessors_Cardinality" xml:space="preserve">\r
-    <value>An event must have exactly three accessors.</value>\r
-  </data>\r
-  <data name="LazyMemberinfo_InvalidPropertyAccessors_AccessorType" xml:space="preserve">\r
-    <value>All property accessors must be methods.</value>\r
-  </data>\r
-  <data name="LazyMemberInfo_InvalidPropertyAccessors_Cardinality" xml:space="preserve">\r
-    <value>A property must have exactly two accessors.</value>\r
-  </data>\r
-  <data name="LazyMemberInfo_NoAccessors" xml:space="preserve">\r
-    <value>A member must have at least one accessor.</value>\r
-  </data>\r
-  <data name="LazyServices_LazyResolvesToNull" xml:space="preserve">\r
-    <value>The lazily evaluated value of type '{0}' passed to the ReflectionModelServices API as part of the argument '{1}' must not return null (Nothing in Visual Basic).</value>\r
-  </data>\r
-  <data name="InvalidMetadataValue" xml:space="preserve">\r
-    <value>Metadata can only contain values with a type that is available to be embedded at compile-time into attributes. For more details of what types are valid reference section 17.1.3 in the C# specification.</value>\r
-  </data>\r
-  <data name="ContractMismatch_InvalidCastOnMetadataField" xml:space="preserve">\r
-    <value>Unable to create an Instance of the Metadata view '{0}' because the exporter exported the metadata  for the item '{1}' with the value '{2}' as type '{3}' but the view imports it as type '{4}'.</value>\r
-  </data>\r
-  <data name="ContractMismatch_NullReferenceOnMetadataField" xml:space="preserve">\r
-    <value>Unable to create an Instance of the Metadata view '{0}' because the exporter exported the metadata for the item '{1}' with a null value and null is not a valid value for type '{2}'.</value>\r
-  </data>\r
-  <data name="InvalidSetterOnMetadataField" xml:space="preserve">\r
-    <value>The MetadataView '{0}' is invalid because property '{1}' has a property set method.</value>\r
-  </data>\r
-  <data name="CompositionException_ChangesRejected" xml:space="preserve">\r
-    <value>The composition remains unchanged. The changes were rejected because of the following error(s): {0}</value>\r
-  </data>\r
-  <data name="ImportEngine_InvalidStateForRecomposition" xml:space="preserve">\r
-    <value>The ComposablePart of type '{0}' cannot be recomposed because it is in an invalid state. It can only be recomposed if it has already been fully previewed or composed.</value>\r
-  </data>\r
-  <data name="AtomicComposition_AlreadyCompleted" xml:space="preserve">\r
-    <value>The atomicComposition can no longer be changed because the atomicComposition has already been completed.</value>\r
-  </data>\r
-  <data name="AtomicComposition_PartOfAnotherAtomicComposition" xml:space="preserve">\r
-    <value>The atomicComposition contains another inner atomicComposition and cannot be changed until the that inner atomicComposition has been completed.</value>\r
-  </data>\r
-  <data name="AtomicComposition_AlreadyNested" xml:space="preserve">\r
-    <value>The atomicComposition is already contains an inner atomicComposition and cannot contain more than one atomicComposition at a time.</value>\r
-  </data>\r
-  <data name="ReentrantCompose" xml:space="preserve">\r
-    <value>Currently composing another batch in this ComposablePartExportProvider. Only one batch can be composed at a time.</value>\r
-  </data>\r
-  <data name="ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned" xml:space="preserve">\r
-    <value>The importing constructor on type '{0}' is using ImportManyAttribute on parameter '{1}' with a non-assignable type. On constructor parameters the ImportManyAttribute only supports importing into types T[] or IEnumerable&lt;T&gt;.</value>\r
-  </data>\r
-  <data name="CompositionException_ElementPrefix" xml:space="preserve">\r
-    <value>Element: {0}</value>\r
-  </data>\r
-  <data name="CompositionException_OriginSeparator" xml:space="preserve">\r
-    <value>--&gt; </value>\r
-  </data>\r
-  <data name="CompositionTrace_Rejection_DefinitionRejected" xml:space="preserve">\r
-    <value>The ComposablePartDefinition '{0}' has been rejected. {1}</value>\r
-  </data>\r
-  <data name="CompositionTrace_Rejection_DefinitionResurrected" xml:space="preserve">\r
-    <value>The ComposablePartDefinition '{0}' that was previously rejected has been resurrected.</value>\r
-  </data>\r
-  <data name="CompositionTrace_Discovery_AssemblyLoadFailed" xml:space="preserve">\r
-    <value>The catalog '{0}' could not load assembly '{1}'. {2}</value>\r
-  </data>\r
-  <data name="CompositionTrace_Discovery_DefinitionContainsGenericParameters" xml:space="preserve">\r
-    <value>The ComposablePartDefinition '{0}' was ignored because it is an open generic type.</value>\r
-  </data>\r
-  <data name="CompositionTrace_Discovery_DefinitionContainsNoExports" xml:space="preserve">\r
-    <value>The ComposablePartDefinition '{0}' was ignored because it contains no exports.</value>\r
-  </data>\r
-  <data name="CompositionTrace_Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute" xml:space="preserve">\r
-    <value>The ComposablePartDefinition '{0}' was ignored because it was marked with PartNotDiscoverableAttribute.</value>\r
-  </data>\r
-  <data name="CompositionException_MetadataViewInvalidConstructor" xml:space="preserve">\r
-    <value>Unable to create an instance of the Metadata view '{0}' because a constructor could not be selected.  Ensure that the type implements a constructor which takes an argument of type IDictionary&lt;string, object&gt;.</value>\r
-  </data>\r
-  <data name="CompositionException_PathsCountSeparator" xml:space="preserve">\r
-    <value>)</value>\r
-  </data>\r
-  <data name="CompositionException_OriginFormat" xml:space="preserve">\r
-    <value> {0} {1}</value>\r
-  </data>\r
-  <data name="TypeCatalog_DisplayNameFormat" xml:space="preserve">\r
-    <value>{0} (Types='{1}').</value>\r
-  </data>\r
-</root>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/SuppressMessages.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/SuppressMessages.cs
deleted file mode 100644 (file)
index dbe413b..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.ComponentModel.Composition.ReflectionModel")]\r
-[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System")]\r
-[assembly: SuppressMessage("Microsoft.MSInternal", "CA905:SystemNamespacesRequireApproval", Scope = "namespace", Target = "System.ComponentModel.Composition.ReflectionModel", Justification = "Approved by Framework")]\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/SuppressMessagesBaselined.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/SuppressMessagesBaselined.cs
deleted file mode 100644 (file)
index b2f62f7..0000000
+++ /dev/null
@@ -1,659 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-// The following are untriaged violations, do not add to this list unless you hit a bug in Code Analysis. Any explicitly \r
-// suppressed violations should either be applied against the member or type itself, or if raised against a namespace, \r
-// resource or assembly, placed in SuppressMessages.cs.\r
-\r
-// Code Analysis Bug: ValidateArgumentsOfPublicMethods should not fire on protected members\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateExportProvider.#GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-\r
-// Code Analysis Bug: ValidateArgumentsOfPublicMethods should not fire on usage of Requires.NotNull\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#AddExportedValue`1(System.ComponentModel.Composition.Hosting.CompositionBatch,System.String,!!0)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#AddPart(System.ComponentModel.Composition.Hosting.CompositionBatch,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#ComposeExportedValue`1(System.ComponentModel.Composition.Hosting.CompositionContainer,System.String,!!0)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#ComposeExportedValue`1(System.ComponentModel.Composition.Hosting.CompositionContainer,!!0)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#ComposeParts(System.ComponentModel.Composition.Hosting.CompositionContainer,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#SatisfyImportsOnce(System.ComponentModel.Composition.ICompositionService,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider+CatalogChangeProxy.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#SourceProvider")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartCatalog.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartException.#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#Compose(System.ComponentModel.Composition.Hosting.CompositionBatch)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExports(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.Export>)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExports`2(System.Collections.Generic.IEnumerable`1<System.Lazy`2<!!0,!!1>>)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExports`1(System.Collections.Generic.IEnumerable`1<System.Lazy`1<!!0>>)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.CompositionError.#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.CompositionError.#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.#IsConstraintSatisfiedBy(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#OnExportsChanged(System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#OnExportsChanging(System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#.ctor(System.ComponentModel.Composition.Hosting.ExportProvider,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#.ctor(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetExportingMember(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetImportingMember(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetImportingParameter(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetPartType(System.ComponentModel.Composition.Primitives.ComposablePartDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#IsDisposalRequired(System.ComponentModel.Composition.Primitives.ComposablePartDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#IsImportingParameter(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-\r
-// DevDiv 10: 583413 AsmMeta: No longer finds APTCA bit on assemblies \r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.Lazy`2", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.AttributedModelServices", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ChangeRejectedException", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.CompositionContractMismatchException", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.CompositionError", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.CompositionException", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.CreationPolicy", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ExportAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ExportMetadataAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ImportAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ImportCardinalityMismatchException", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ImportingConstructorAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ImportManyAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.InheritedExportAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.MetadataAttributeAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.PartCreationPolicyAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.PartMetadataAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.PartNotDiscoverableAttribute", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.AdaptingExportProvider", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.AggregateCatalog", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.AggregateExportProvider", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.AssemblyCatalog", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider",                        Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.CompositionBatch", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.CompositionConstants", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ExportedDelegate", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.ExportProvider", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.ImportEngine", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.Export", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ExportDefinition", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ComposablePart", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ComposablePartCatalog", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ComposablePartDefinition", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ComposablePartException", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ImportCardinality", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.Primitives.ImportDefinition", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2117:AptcaTypesShouldOnlyExtendAptcaBaseTypes", Scope = "type", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices", Justification = "Razzle mscorlib is not APTCA")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateCatalog.#.ctor(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartCatalog>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateCatalog.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateCatalog.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateExportProvider.#.ctor(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Hosting.ExportProvider>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateExportProvider.#.ctor(System.ComponentModel.Composition.Hosting.ExportProvider[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateExportProvider.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateExportProvider.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AggregateExportProvider.#GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AssemblyCatalog.#.ctor(System.Reflection.Assembly,System.ComponentModel.Composition.Primitives.ICompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AssemblyCatalog.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AssemblyCatalog.#GetDisplayName()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AssemblyCatalog.#InnerCatalog")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AssemblyCatalog.#LoadAssembly(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AssemblyCatalogDebuggerProxy.#.ctor(System.ComponentModel.Composition.Hosting.AssemblyCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Assumes+InternalErrorException.#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Assumes+InternalErrorException.#.ctor(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Assumes.#NotNullOrEmpty(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#AddCompleteAction(System.Action)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#AddRevertAction(System.Action)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#.ctor(System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#ContainsInnerAtomicComposition")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#CopyComplete()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#FinalComplete()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#SetValueInternal(System.Object,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#ThrowIfCompleteed()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#ThrowIfContainsInnerAtomicComposition()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicComposition.#TryGetValueInternal`1(System.Object,System.Boolean,!!0&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicCompositionExtensions.#AddCompleteActionAllowNull(System.ComponentModel.Composition.Hosting.AtomicComposition,System.Action)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.AtomicCompositionExtensions.#AddRevertActionAllowNull(System.ComponentModel.Composition.Hosting.AtomicComposition,System.Action)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedExportDefinition.#Metadata")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedModelDiscovery.#CreatePart(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedModelDiscovery.#GetImportDefinitionCreationInfo(System.ComponentModel.Composition.ReflectionModel.ReflectionItem,System.Reflection.ICustomAttributeProvider)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#AddExportedValue`1(System.ComponentModel.Composition.Hosting.CompositionBatch,System.String,!!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#AddExportedValue`1(System.ComponentModel.Composition.Hosting.CompositionBatch,!!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModelServices.#ComposeParts(System.ComponentModel.Composition.Hosting.CompositionContainer,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#.ctor(System.Type,System.ComponentModel.Composition.PartCreationPolicyAttribute,System.Boolean,System.ComponentModel.Composition.Primitives.ICompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#GetConstructor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#GetExportDefinitions()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#GetImportDefinitions()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#GetLazyPartType()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#HasExports()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#IsDisposalRequired")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#IsPartDiscoverable()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.#SelectPartConstructor(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.AttributeServices.#GetAttributes`1(System.Reflection.ICustomAttributeProvider)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.AttributeServices.#GetAttributes`1(System.Reflection.ICustomAttributeProvider,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.AttributeServices.#GetFirstAttribute`1(System.Reflection.ICustomAttributeProvider)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.AttributeServices.#GetFirstAttribute`1(System.Reflection.ICustomAttributeProvider,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.AttributeServices.#IsAttributeDefined`1(System.Reflection.ICustomAttributeProvider)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.AttributeServices.#IsAttributeDefined`1(System.Reflection.ICustomAttributeProvider,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider+CatalogChangeProxy.#.ctor(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider+CatalogChangeProxy.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider+CatalogChangeProxy.#Parts")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#.ctor(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#DetermineRejection(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#EnsureCanRun()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#EnsureCanSet`1(!!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#EnsureRunning()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#GetAtomicCompositionQuery(System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#GetComposablePart(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#GetSharedPart(System.ComponentModel.Composition.Primitives.ComposablePartDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#IsRejected(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#OnCatalogChanging(System.Object,System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#OnExportsChangingInternal(System.Object,System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#ReleasePart(System.Object,System.ComponentModel.Composition.Primitives.ComposablePart,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#SetConditionalReferenceForRecomposablePart(System.Object,System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#SourceProvider")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#UpdateAtomicCompositionQuery(System.ComponentModel.Composition.Hosting.AtomicComposition,System.Func`2<System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean>,System.ComponentModel.Composition.Hosting.CatalogExportProvider+AtomicCompositionQueryState)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CatalogExportProvider.#UpdateRejections(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ChangeRejectedException.#Message")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#AsArray`1(System.Collections.Generic.IEnumerable`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObject`1.#Add(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObject`1.#Clear()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObject`1.#.ctor(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObject`1.#IsReadOnly")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObjectList.#Add(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObjectList.#Clear()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObjectList.#.ctor(System.Collections.IList)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices+CollectionOfObjectList.#IsReadOnly")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#ConcatAllowingNull`1(System.Collections.Generic.IEnumerable`1<!!0>,System.Collections.Generic.IEnumerable`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#Copy`1(System.Collections.Generic.Stack`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#FastAny`1(System.Collections.Generic.IEnumerable`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#ForEach`1(System.Collections.Generic.IEnumerable`1<!!0>,System.Action`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#GetCardinality`1(System.Collections.Generic.IEnumerable`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#GetCollectionElementType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#GetCollectionWrapper(System.Type,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#GetEnumerableElementType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#ToReadOnlyCollection`1(System.Collections.Generic.IEnumerable`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.CollectionServices.#WhereNotNull`1(System.Collections.Generic.IEnumerable`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePart.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartCatalog.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartCatalog.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartCatalog.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs.#.ctor(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Add(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Changed")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Changing")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Clear()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#.ctor(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartCatalog>,System.Action`1<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>,System.Action`1<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Contains(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#CopyTo(System.ComponentModel.Composition.Primitives.ComposablePartCatalog[],System.Int32)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Count")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#GetEnumerator()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#HasChanged")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#OnChanged(System.Object,System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#OnChanging(System.Object,System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#OnContainedCatalogChanged(System.Object,System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#OnContainedCatalogChanging(System.Object,System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#RaiseChangedEvent(System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>>,System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#RaiseChangingEvent(System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>>,System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>>,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#Remove(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#SubscribeToCatalogNotifications(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#SubscribeToCatalogNotifications(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartCatalog>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#UnsubscribeFromCatalogNotifications(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartCatalogCollection.#UnsubscribeFromCatalogNotifications(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePartCatalog>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartCatalogDebuggerProxy.#.ctor(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartDefinition.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartException.#.ctor(System.ComponentModel.Composition.CompositionErrorId,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement,System.Exception)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartException.#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ComposablePartException.#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#.ctor(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#Compose(System.ComponentModel.Composition.Hosting.CompositionBatch)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#CreateExport(System.ComponentModel.Composition.Primitives.ComposablePart,System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#EnsureCanRun()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#EnsureCanSet`1(!!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#EnsureRunning()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#GetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#GetUpdatedPartsList(System.ComponentModel.Composition.Hosting.CompositionBatch)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#Recompose(System.ComponentModel.Composition.Hosting.CompositionBatch,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#SourceProvider")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ComposablePartExportProvider.#ThrowIfDisposed()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionBatch.#AddPart(System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionBatch.#.ctor(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ComposablePart>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionBatch.#PartsToAdd")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionBatch.#PartsToRemove")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionBatch.#RemovePart(System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionBatch+SingleExportComposablePart.#ImportDefinitions")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#.ctor(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Boolean,System.ComponentModel.Composition.Hosting.ExportProvider[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExport(System.ComponentModel.Composition.Primitives.Export)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExport`1(System.Lazy`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExports(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.Export>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExports`2(System.Collections.Generic.IEnumerable`1<System.Lazy`2<!!0,!!1>>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionContainer.#ReleaseExports`1(System.Collections.Generic.IEnumerable`1<System.Lazy`1<!!0>>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionContractMismatchException.#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionContractMismatchException.#.ctor(System.String,System.Exception)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.CompositionElement.#.ctor(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.CompositionElementDebuggerProxy.#.ctor(System.ComponentModel.Composition.Primitives.CompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.CompositionElementExtensions.#GetDisplayNameCore(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionError.#.ctor(System.ComponentModel.Composition.CompositionErrorId,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement,System.Exception)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionError.#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionError.#Create(System.ComponentModel.Composition.CompositionErrorId,System.ComponentModel.Composition.Primitives.ICompositionElement,System.Exception,System.String,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionError.#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionErrorDebuggerProxy.#.ctor(System.ComponentModel.Composition.CompositionError)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#BuildDefaultMessage()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#CalculatePaths(System.ComponentModel.Composition.CompositionException)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#.ctor(System.String,System.Exception,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.CompositionError>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#Message")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#VisitCompositionException(System.ComponentModel.Composition.CompositionException,System.ComponentModel.Composition.CompositionException+VisitContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#VisitError(System.ComponentModel.Composition.CompositionError,System.ComponentModel.Composition.CompositionException+VisitContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#VisitException(System.Exception,System.ComponentModel.Composition.CompositionException+VisitContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#WriteElementGraph(System.Text.StringBuilder,System.ComponentModel.Composition.Primitives.ICompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#WriteError(System.Text.StringBuilder,System.ComponentModel.Composition.CompositionError)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#WriteHeader(System.Text.StringBuilder,System.Int32,System.Int32)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#WritePath(System.Text.StringBuilder,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.CompositionError>,System.Int32)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException.#WritePaths(System.Text.StringBuilder,System.Collections.Generic.IEnumerable`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.CompositionError>>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock.#.ctor(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock+CompositionLockHolder.#.ctor(System.ComponentModel.Composition.Hosting.CompositionLock)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock+CompositionLockHolder.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock+EmptyLockHolder.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock.#EnterCompositionLock()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionLock.#ExitCompositionLock()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionResult.#Errors")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionResult`1.#Errors")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetContractNameFromExport(System.Reflection.MemberInfo,System.ComponentModel.Composition.ExportAttribute)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetContractNameFromImport(System.ComponentModel.Composition.IAttributedImport,System.ComponentModel.Composition.ReflectionModel.ImportType)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetContractTypeFromImport(System.ComponentModel.Composition.IAttributedImport,System.ComponentModel.Composition.ReflectionModel.ImportType)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetDefaultTypeFromMember(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetPartMetadataForType(System.Type,System.ComponentModel.Composition.CreationPolicy)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetRequiredMetadata(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetTypeIdentityFromExport(System.Reflection.MemberInfo,System.ComponentModel.Composition.ExportAttribute)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#GetTypeIdentityFromImport(System.ComponentModel.Composition.IAttributedImport,System.ComponentModel.Composition.ReflectionModel.ImportType)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#IsRecomposable(System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#IsValidAttributeType(System.Type,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices+MetadataList.#Add(System.Object,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices+MetadataList.#InferArrayType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices+MetadataList.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices+MetadataList.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices+MetadataList.#ToArray()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#TryContributeMetadataValue(System.Collections.Generic.IDictionary`2<System.String,System.Object>,System.String,System.Object,System.Type,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#TryExportMetadataForMember(System.Reflection.MemberInfo,System.Collections.Generic.IDictionary`2<System.String,System.Object>&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#TryFire`1(System.EventHandler`1<!!0>,System.Object,!!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#TryInvoke(System.Action)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.CompositionServices.#TryInvoke`1(System.Func`1<!!0>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.CompositionTrace.#AssemblyLoadFailed(System.ComponentModel.Composition.Hosting.DirectoryCatalog,System.String,System.Exception)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.CompositionTrace.#PartDefinitionRejected(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.ComponentModel.Composition.ChangeRejectedException)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#AndAlso`1(System.Linq.Expressions.Expression`1<System.Func`2<!!0,System.Boolean>>,System.Linq.Expressions.Expression`1<System.Func`2<!!0,System.Boolean>>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateConstraint(System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Type>>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateConstraint(System.String,System.String,System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Type>>,System.ComponentModel.Composition.CreationPolicy)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateContractConstraintBody(System.String,System.Linq.Expressions.ParameterExpression)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateCreationPolicyContraint(System.ComponentModel.Composition.CreationPolicy,System.Linq.Expressions.ParameterExpression)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateMetadataConstraintBody(System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Type>>,System.Linq.Expressions.ParameterExpression)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateMetadataContainsKeyExpression(System.Linq.Expressions.ParameterExpression,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateMetadataOfTypeExpression(System.Linq.Expressions.ParameterExpression,System.String,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateMetadataValueEqualsExpression(System.Linq.Expressions.ParameterExpression,System.Object,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ConstraintServices.#CreateTypeIdentityContraint(System.String,System.Linq.Expressions.ParameterExpression)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.#.ctor(System.String,System.String,System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.#IsConstraintSatisfiedBy(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.#MatchRequiredMatadata(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#FindArrayElementType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#FindGenericTypeName(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#GetGenericArity(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#GetTypeIdentity(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#GetTypeIdentityFromMethod(System.Reflection.MethodInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#TypeIdentityCache")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteArrayType(System.Text.StringBuilder,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteArrayTypeDimensions(System.Text.StringBuilder,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteByRefType(System.Text.StringBuilder,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteCustomModifiers(System.Text.StringBuilder,System.String,System.Type[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteGenericType(System.Text.StringBuilder,System.Type,System.Boolean,System.Collections.Generic.Queue`1<System.Type>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteGenericTypeName(System.Text.StringBuilder,System.Type,System.Boolean,System.Collections.Generic.Queue`1<System.Type>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteNonGenericType(System.Text.StringBuilder,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WritePointerType(System.Text.StringBuilder,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteType(System.Text.StringBuilder,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteTypeArgumentsString(System.Text.StringBuilder,System.Int32,System.Boolean,System.Collections.Generic.Queue`1<System.Type>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ContractNameServices.#WriteTypeWithNamespace(System.Text.StringBuilder,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ContractServices.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ContractServices.#TryCast(System.Type,System.Object,System.Object&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#Changed")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#Changing")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#DiffChanges(System.String[],System.String[],System.Collections.Generic.List`1<System.Tuple`2<System.String,System.ComponentModel.Composition.Hosting.AssemblyCatalog>>&,System.Collections.Generic.List`1<System.Tuple`2<System.String,System.ComponentModel.Composition.Hosting.AssemblyCatalog>>&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog+DirectoryCatalogDebuggerProxy.#Assemblies")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog+DirectoryCatalogDebuggerProxy.#.ctor(System.ComponentModel.Composition.Hosting.DirectoryCatalog)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#GetDisplayName()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#GetFiles()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#GetFullPath(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#Initialize(System.String,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#LoadedFiles")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#OnChanged(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#OnChanging(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.DirectoryCatalog.#Refresh()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.DisposableReflectionComposablePart.#System.IDisposable.Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.DisposableReflectionComposablePart.#ReleaseInstanceIfNecessary(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ErrorBuilder.#CreateImportCardinalityMismatch(System.ComponentModel.Composition.ImportCardinalityMismatchException,System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExceptionBuilder.#CreateContainsNullElement(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExceptionBuilder.#CreateDiscoveryException(System.String,System.String[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExceptionBuilder.#CreateExportDefinitionNotOnThisComposablePart(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExceptionBuilder.#CreateImportDefinitionNotOnThisComposablePart(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExceptionBuilder.#CreateNotOverriddenByDerived(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExceptionBuilder.#CreateObjectDisposed(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExceptionBuilder.#Format(System.String,System.String[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.Export.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.Export.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.Export.#.ctor(System.ComponentModel.Composition.Primitives.ExportDefinition,System.Func`1<System.Object>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.Export.#GetExportedValueCore()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.Export.#Value")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportAttribute.#.ctor(System.String,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ExportDefinition.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ExportDefinition.#.ctor(System.String,System.Collections.Generic.IDictionary`2<System.String,System.Object>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ExportedDelegate.#ConvertMethodInfoToFuncOrActionType(System.Reflection.MethodInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ExportedDelegate.#CreateDelegate(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ExportedDelegate.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ExportedDelegate.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ExportedDelegate.#.ctor(System.Object,System.Reflection.MethodInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ExportingMember.#EnsureReadable()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ExportingMember.#.ctor(System.ComponentModel.Composition.Primitives.ExportDefinition,System.ComponentModel.Composition.ReflectionModel.ReflectionMember)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ExportingMember.#GetExportedValue(System.Object,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportMetadataAttribute.#.ctor(System.String,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#BuildImportDefinition(System.Type,System.Type,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#ExportsChanged")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#ExportsChanging")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExportCore`2(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExportCore`1(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExportedValueCore`1(System.String,System.ComponentModel.Composition.Primitives.ImportCardinality)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExportedValuesCore`1(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExports(System.Type,System.Type,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExportsCore(System.Type,System.Type,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExportsCore`2(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#GetExportsCore`1(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportProvider.#TryGetExportsCore(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.Export>&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs.#ChangedContractNames")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs.#.ctor(System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#CreateSemiStronglyTypedExport`2(System.ComponentModel.Composition.Primitives.Export)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#CreateSemiStronglyTypedExportFactory(System.Type,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#CreateStronglyTypedExportFactory(System.Type,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#CreateStronglyTypedExportOfT`1(System.ComponentModel.Composition.Primitives.Export)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#CreateStronglyTypedExportOfTM`2(System.ComponentModel.Composition.Primitives.Export)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices+DisposableLazy`2.#System.IDisposable.Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices+DisposableLazy`1.#.ctor(System.Func`1<!0>,System.IDisposable)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices+DisposableLazy`1.#System.IDisposable.Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#GetExportedValueFromLazy`1(System.ComponentModel.Composition.Primitives.Export)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#IsDefaultMetadataViewType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ExportServices.#IsDictionaryConstructorViewType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#AddItemToLocalDictionary(System.Reflection.Emit.ILGenerator,System.Reflection.Emit.LocalBuilder,System.Object,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#AddLocalToLocalDictionary(System.Reflection.Emit.ILGenerator,System.Reflection.Emit.LocalBuilder,System.Object,System.Reflection.Emit.LocalBuilder)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#CreateGeneratorForPublicConstructor(System.Reflection.Emit.TypeBuilder,System.Type[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#GetExceptionDataAndStoreInLocal(System.Reflection.Emit.ILGenerator,System.Reflection.Emit.LocalBuilder,System.Reflection.Emit.LocalBuilder)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#IsBoxingRequiredForValue(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadDouble(System.Reflection.Emit.ILGenerator,System.Double)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadEnumerable(System.Reflection.Emit.ILGenerator,System.Collections.IEnumerable)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadFloat(System.Reflection.Emit.ILGenerator,System.Single)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadInt(System.Reflection.Emit.ILGenerator,System.Int32)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadLong(System.Reflection.Emit.ILGenerator,System.Int64)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadNull(System.Reflection.Emit.ILGenerator)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadString(System.Reflection.Emit.ILGenerator,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadTypeOf(System.Reflection.Emit.ILGenerator,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.GenerationServices.#LoadValue(System.Reflection.Emit.ILGenerator,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ImportAttribute.#.ctor(System.String,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ImportCardinalityMismatchException.#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ImportCardinalityMismatchException.#.ctor(System.String,System.Exception)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ImportDefinition.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ImportDefinition.#.ctor(System.String,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ImportDefinition.#IsConstraintSatisfiedBy(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ImportDefinition.#ToString()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#Dispose(System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+EngineContext.#AddPartManager(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+EngineContext.#Complete()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+EngineContext.#.ctor(System.ComponentModel.Composition.Hosting.ImportEngine,System.ComponentModel.Composition.Hosting.ImportEngine+EngineContext)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+EngineContext.#RemovePartManager(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#GetEngineContext(System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#GetPartManager(System.ComponentModel.Composition.Primitives.ComposablePart,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#.ctor(System.ComponentModel.Composition.Hosting.ExportProvider,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#InPrerequisiteLoop()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#OnExportsChanging(System.Object,System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+PartManager.#DisposeAllDependencies()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+PartManager.#GetImportedContractNames()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+PartManager.#GetSavedImport(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+PartManager.#.ctor(System.ComponentModel.Composition.Hosting.ImportEngine,System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+PartManager.#SetSavedImport(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Primitives.Export[],System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+PartManager.#State")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+PartManager.#UpdateDisposableDependencies(System.ComponentModel.Composition.Primitives.ImportDefinition,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.Export>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#PreviewImports(System.ComponentModel.Composition.Primitives.ComposablePart,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#AddIndexEntries(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#GetAffectedImports(System.ComponentModel.Composition.Primitives.ComposablePart,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#GetAffectedParts(System.Collections.Generic.IEnumerable`1<System.String>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#GetPartsImporting(System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#IsAffectedImport(System.ComponentModel.Composition.Primitives.ImportDefinition,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#RemoveIndexEntries(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine+RecompositionManager.#UpdateImportIndex()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#ReleaseImports(System.ComponentModel.Composition.Primitives.ComposablePart,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#SatisfyImports(System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#SatisfyImportsOnce(System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#StopSatisfyingImports(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#TryPreviewImportsStateMachine(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager,System.ComponentModel.Composition.Primitives.ComposablePart,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#TryRecomposeImport(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager,System.Boolean,System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#TryRecomposeImports(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#TrySatisfyImports(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager,System.ComponentModel.Composition.Primitives.ComposablePart,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#TrySatisfyImportsStateMachine(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager,System.ComponentModel.Composition.Primitives.ComposablePart)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.ImportEngine.#TrySatisfyImportSubset(System.ComponentModel.Composition.Hosting.ImportEngine+PartManager,System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ImportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ImportingConstructorAttribute.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingItem.#Cast(System.Type,System.ComponentModel.Composition.Primitives.Export)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingItem.#CastExportsToCollectionImportType(System.ComponentModel.Composition.Primitives.Export[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingItem.#.ctor(System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition,System.ComponentModel.Composition.ReflectionModel.ImportType)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingMember.#EnsureCollectionIsWritable(System.Collections.Generic.ICollection`1<System.Object>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingMember.#EnsureWritable()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingMember.#GetNormalizedCollection(System.Type,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingMember.#PopulateCollection(System.Collections.Generic.ICollection`1<System.Object>,System.Collections.IEnumerable)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingMember.#SetCollectionMemberValue(System.Object,System.Collections.IEnumerable)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportingMember.#SetSingleMemberValue(System.Object,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ImportManyAttribute.#.ctor(System.String,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportType.#CreateLazyType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportType.#GetStronglyTypedExport(System.ComponentModel.Composition.Primitives.Export)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportType.#.ctor(System.Type,System.ComponentModel.Composition.Primitives.ImportCardinality)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportType.#IsTypeAssignableCollectionType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ImportType+SpecificLazyType.#.ctor(System.Type,System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.Lazy`2.#.ctor(System.Func`1<!0>,!1)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.Lazy`2.#.ctor(System.Func`1<!0>,!1,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.Lazy`2.#.ctor(!1)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.Lazy`2.#.ctor(!1,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#AreAccessorsValid(System.Reflection.MemberTypes,System.Reflection.MemberInfo[],System.String&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#Equals(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#GetAccessors()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#GetHashCode()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#.ctor(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#.ctor(System.Reflection.MemberTypes,System.Reflection.MemberInfo[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#op_Inequality(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo.#op_Equality(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.LazyServices.#AsLazy`1(!!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.LazyServices.#GetNotNullValue`1(System.Lazy`1<!!0>,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Lock.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Lock.#EnterReadLock()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Lock.#EnterWriteLock()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Lock.#ExitReadLock()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Lock.#ExitWriteLock()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Lock.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataAttributeAttribute.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataServices.#GetValue`1(System.Collections.Generic.IDictionary`2<System.String,System.Object>,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewGenerator.#GenerateFieldAssignmentFromLocalValue(System.Reflection.Emit.ILGenerator,System.Reflection.Emit.LocalBuilder,System.Reflection.Emit.FieldBuilder)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewGenerator.#GenerateInterfaceViewProxyType(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewGenerator.#GenerateLocalAssignmentFromDefaultAttribute(System.Reflection.Emit.ILGenerator,System.ComponentModel.DefaultValueAttribute[],System.Reflection.Emit.LocalBuilder)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewGenerator.#GenerateLocalAssignmentFromFlag(System.Reflection.Emit.ILGenerator,System.Reflection.Emit.LocalBuilder,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewGenerator.#GenerateView(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewGenerator.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewProvider.#GetMetadataView`1(System.Collections.Generic.IDictionary`2<System.String,System.Object>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.MetadataViewProvider.#IsViewTypeValid(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.PartCreationPolicyAttribute.#.ctor(System.ComponentModel.Composition.CreationPolicy)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.PartMetadataAttribute.#.ctor(System.String,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.PartNotDiscoverableAttribute.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReadLock.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#Contains(System.Collections.Generic.KeyValuePair`2<!0,!1>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#ContainsKey(!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#CopyTo(System.Collections.Generic.KeyValuePair`2<!0,!1>[],System.Int32)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#Count")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#GetEnumerator()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<!0,!1>>.Add(System.Collections.Generic.KeyValuePair`2<!0,!1>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<!0,!1>>.Clear()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<!0,!1>>.Remove(System.Collections.Generic.KeyValuePair`2<!0,!1>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#System.Collections.Generic.IDictionary`2<!0,!1>.Add(!0,!1)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#System.Collections.Generic.IDictionary`2<!0,!1>.Remove(!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#System.Collections.IEnumerable.GetEnumerator()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#Keys")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#.ctor(System.Collections.Generic.IDictionary`2<!0,!1>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#Item[!0]")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#TryGetValue(!0,!1&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionary`2.#Values")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionaryDebuggerProxy`2.#Items")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.ReadOnlyDictionaryDebuggerProxy`2.#.ctor(Microsoft.Internal.Collections.ReadOnlyDictionary`2<!0,!1>)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#Activate()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#CachedInstance")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#CreateInstance(System.Reflection.ConstructorInfo,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#EnsureCardinality(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Primitives.Export[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#EnsureGettable()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#EnsureSettable(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#GetConstructorArguments()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#GetExportedValue(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#GetExportingMemberFromDefinition(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#GetImportingItemFromDefinition(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#GetInstanceActivatingIfNeeded()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#NotifyImportSatisfied()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#.ctor(System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#.ctor(System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#RequiresActivation()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#SetImport(System.ComponentModel.Composition.ReflectionModel.ImportingItem,System.ComponentModel.Composition.Primitives.Export[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#SetNonPrerequisiteImports()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#TryGetImportValue(System.ComponentModel.Composition.Primitives.ImportDefinition,System.Object&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart.#UseImportedValues`1(System.Collections.Generic.IEnumerable`1<!!0>,System.Action`3<System.ComponentModel.Composition.ReflectionModel.ImportingItem,!!0,System.Object>,System.Boolean)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition.#ExportDefinitions")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition.#GetConstructor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition.#ImportDefinitions")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition.#Metadata")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition.#.ctor(System.ComponentModel.Composition.ReflectionModel.IReflectionPartCreationInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionExtensions.#CreateReflectionProperty(System.Reflection.MethodInfo,System.Reflection.MethodInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionExtensions.#ToLazyMember(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionExtensions.#ToLazyMember(System.ComponentModel.Composition.ReflectionModel.ReflectionMember)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionExtensions.#ToReflectionProperty(System.Reflection.PropertyInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionExtensions.#ToReflectionWritableMember(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionField.#CanWrite")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionField.#GetValue(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionField.#RequiresInstance")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionField.#ReturnType")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionField.#SetValue(System.Object,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionItem.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionMember.#DeclaringType")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionMember.#Name")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionMemberExportDefinition.#GetDisplayName()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionMemberImportDefinition.#GetDisplayName()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionMethod.#RequiresInstance")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionMethod.#ReturnType")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetExportingMember(System.ComponentModel.Composition.Primitives.ExportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetImportingMember(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetImportingParameter(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#GetPartType(System.ComponentModel.Composition.Primitives.ComposablePartDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#IsDisposalRequired(System.ComponentModel.Composition.Primitives.ComposablePartDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices.#IsImportingParameter(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices+LazyExportDefinition.#Metadata")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices+ReflectionPartCreationInfo.#GetConstructor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices+ReflectionPartCreationInfo.#GetMetadata()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices+ReflectionPartCreationInfo.#.ctor(System.Lazy`1<System.Type>,System.Boolean,System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy`1<System.Collections.Generic.IDictionary`2<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionParameter.#GetDisplayName()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionParameter.#Name")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionParameter.#ReturnType")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionParameterImportDefinition.#GetDisplayName()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionParameterImportDefinition.#ToImportingItem()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#CanRead")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#CanWrite")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#GetValue(System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#Name")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#.ctor(System.Reflection.MethodInfo,System.Reflection.MethodInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#RequiresInstance")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#ReturnType")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionProperty.#SetValue(System.Object,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#GetAllProperties(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#GetDisplayName(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#GetDisplayName(System.Type,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#TryGetGenericInterfaceType(System.Type,System.Type,System.Type&)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Requires.#IsInMembertypeSet(System.Reflection.MemberTypes,System.String,System.Reflection.MemberTypes)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Requires.#NotNull`1(!!0,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Requires.#NotNullElements`1(System.Collections.Generic.IEnumerable`1<!!0>,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Requires.#NotNullElements`2(System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<!!0,!!1>>,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Requires.#NotNullOrEmpty(System.String,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.SerializableCompositionElement.#.ctor(System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Runtime.Serialization.SerializationServices.#GetValue`1(System.Runtime.Serialization.SerializationInfo,System.String)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.StringComparers.#ContractName")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.StringComparers.#MetadataKeyNames")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.TraceSourceTraceWriter.#CanWriteError")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.TraceSourceTraceWriter.#CanWriteInformation")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.TraceSourceTraceWriter.#CanWriteWarning")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.TraceSourceTraceWriter.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.TraceSourceTraceWriter.#WriteEvent(System.Diagnostics.TraceEventType,System.ComponentModel.Composition.Diagnostics.CompositionTraceId,System.String,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Diagnostics.TraceWriter.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#CreateIndex()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#GetCandidateParts(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#GetDisplayName()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#GetExports(System.ComponentModel.Composition.Primitives.ImportDefinition)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#GetTypesDisplay()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#PartsInternal")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Hosting.TypeCatalog.#.ctor(System.Collections.Generic.IEnumerable`1<System.Type>,System.ComponentModel.Composition.Primitives.ICompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.WeakReferenceCollection`1.#Add(!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.WeakReferenceCollection`1.#AliveItemsToList()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.WeakReferenceCollection`1.#CleanupDeadReferences()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.WeakReferenceCollection`1.#Clear()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.WeakReferenceCollection`1.#IndexOf(!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.WeakReferenceCollection`1.#Remove(!0)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.Collections.WeakReferenceCollection`1.#.ctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.WriteLock.#Dispose()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition.#ValidateRequiredMetadata()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.LazyExportDefinition.#Metadata")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#DemandMemberAccess(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#DemandMemberAccessIfNeeded(System.Type)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#DemandRestrictedMemberAccess(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#.cctor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#SafeCreateInstance(System.Type,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#SafeGetValue(System.Reflection.FieldInfo,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#SafeInvoke(System.Reflection.ConstructorInfo,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#SafeInvoke(System.Reflection.MethodInfo,System.Object,System.Object[])")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#SafeSetValue(System.Reflection.FieldInfo,System.Object,System.Object)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionInvoke.#UnsafePermissionSet(System.Reflection.Assembly)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionPartCreationInfo.#GetConstructor()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionPartCreationInfo.#GetMetadata()")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.ReflectionModel.ReflectionPartCreationInfo.#.ctor(System.Lazy`1<System.Type>,System.Boolean,System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy`1<System.Collections.Generic.IEnumerable`1<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy`1<System.Collections.Generic.IDictionary`2<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#Assembly(System.Reflection.MemberInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#IsVisible(System.Reflection.ConstructorInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#IsVisible(System.Reflection.FieldInfo)")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "Microsoft.Internal.ReflectionServices.#IsVisible(System.Reflection.MethodInfo)")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors", Scope = "type", Target = "System.ComponentModel.Composition.ChangeRejectedException")]\r
-[module: SuppressMessage("Microsoft.Usage", "CA2240:ImplementISerializableCorrectly", Scope = "type", Target = "System.ComponentModel.Composition.CompositionException")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors", Scope = "type", Target = "System.ComponentModel.Composition.CompositionException")]\r
-[module: SuppressMessage("Microsoft.Security", "CA2116:AptcaMethodsShouldOnlyCallAptcaMethods", Scope = "member", Target = "System.ComponentModel.Composition.CompositionException+CompositionExceptionData.#System.Runtime.Serialization.ISafeSerializationData.CompleteDeserialization(System.Object)")]\r
-\r
-\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/.gitattributes
deleted file mode 100644 (file)
index 8381eda..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/Lazy.cs -crlf
-/LazyOfTTMetadata.cs -crlf
-/Tuple.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/.gitattributes
deleted file mode 100644 (file)
index cd15fcf..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/AttributedModelServices.cs -crlf
-/ChangeRejectedException.cs -crlf
-/CompositionContractMismatchException.cs -crlf
-/CompositionError.cs -crlf
-/CompositionErrorDebuggerProxy.cs -crlf
-/CompositionErrorId.cs -crlf
-/CompositionException.cs -crlf
-/CompositionResult.cs -crlf
-/CompositionResultOfT.cs -crlf
-/ConstraintServices.cs -crlf
-/ContractNameServices.cs -crlf
-/CreationPolicy.cs -crlf
-/ErrorBuilder.cs -crlf
-/ExceptionBuilder.cs -crlf
-/ExportAttribute.cs -crlf
-/ExportCardinalityCheckResult.cs -crlf
-/ExportMetadataAttribute.cs -crlf
-/ExportServices.DisposableLazy.cs -crlf
-/ExportServices.cs -crlf
-/IAttributedImport.cs -crlf
-/ICompositionError.cs -crlf
-/ICompositionService.cs -crlf
-/IPartImportsSatisfiedNotification.cs -crlf
-/ImportAttribute.cs -crlf
-/ImportCardinalityMismatchException.cs -crlf
-/ImportManyAttribute.cs -crlf
-/ImportingConstructorAttribute.cs -crlf
-/InheritedExportAttribute.cs -crlf
-/MetadataAttributeAttribute.cs -crlf
-/MetadataServices.cs -crlf
-/MetadataViewGenerator.cs -crlf
-/MetadataViewProvider.cs -crlf
-/PartCreationPolicyAttribute.cs -crlf
-/PartCreatorOfT.cs -crlf
-/PartCreatorOfTTMetadata.cs -crlf
-/PartLifetimeContextOfT.cs -crlf
-/PartMetadataAttribute.cs -crlf
-/PartNotDiscoverableAttribute.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/.gitattributes
deleted file mode 100644 (file)
index 64069f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/AttributedExportDefinition.cs -crlf
-/AttributedModelDiscovery.cs -crlf
-/AttributedPartCreationInfo.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedExportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedExportDefinition.cs
deleted file mode 100644 (file)
index c06732a..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.AttributedModel\r
-{\r
-    internal class AttributedExportDefinition : ExportDefinition\r
-    {\r
-        private readonly AttributedPartCreationInfo _partCreationInfo;\r
-        private readonly MemberInfo _member;\r
-        private readonly ExportAttribute _exportAttribute;\r
-\r
-        private IDictionary<string, object> _metadata;\r
-\r
-        public AttributedExportDefinition(AttributedPartCreationInfo partCreationInfo, MemberInfo member, ExportAttribute exportAttribute)\r
-            : base(member.GetContractNameFromExport(exportAttribute), (IDictionary<string, object>)null)\r
-        {\r
-            Assumes.NotNull(partCreationInfo);\r
-            Assumes.NotNull(member);\r
-            Assumes.NotNull(exportAttribute);\r
-\r
-            this._partCreationInfo = partCreationInfo;\r
-            this._member = member;\r
-            this._exportAttribute = exportAttribute;\r
-        }\r
-\r
-        public override IDictionary<string, object> Metadata\r
-        {\r
-            get\r
-            {\r
-                if (this._metadata == null)\r
-                {\r
-                    IDictionary<string, object> metadata;\r
-                    this._member.TryExportMetadataForMember(out metadata);\r
-\r
-                    string typeIdentity = this._member.GetTypeIdentityFromExport(this._exportAttribute);\r
-                    metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, typeIdentity);\r
-\r
-                    var partMetadata = this._partCreationInfo.GetMetadata();\r
-                    if (partMetadata != null && partMetadata.ContainsKey(CompositionConstants.PartCreationPolicyMetadataName))\r
-                    {\r
-                        metadata.Add(CompositionConstants.PartCreationPolicyMetadataName, partMetadata[CompositionConstants.PartCreationPolicyMetadataName]);\r
-                    }\r
-\r
-                    this._metadata = metadata;\r
-                }\r
-                return this._metadata;\r
-            }\r
-        }\r
-    }\r
-    \r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedModelDiscovery.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedModelDiscovery.cs
deleted file mode 100644 (file)
index ed5fbb4..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Diagnostics;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.AttributedModel\r
-{\r
-    internal static class AttributedModelDiscovery\r
-    {\r
-        public static ComposablePartDefinition CreatePartDefinitionIfDiscoverable(Type type, ICompositionElement origin)\r
-        {\r
-            AttributedPartCreationInfo creationInfo = new AttributedPartCreationInfo(type, null, false, origin);\r
-            if (!creationInfo.IsPartDiscoverable())\r
-            {\r
-                return null;\r
-            }\r
-\r
-            return new ReflectionComposablePartDefinition(creationInfo);\r
-        }\r
-\r
-        public static ReflectionComposablePartDefinition CreatePartDefinition(Type type, PartCreationPolicyAttribute partCreationPolicy, bool ignoreConstructorImports, ICompositionElement origin)\r
-        {\r
-            Assumes.NotNull(type);\r
-\r
-            AttributedPartCreationInfo creationInfo = new AttributedPartCreationInfo(type, partCreationPolicy, ignoreConstructorImports, origin);\r
-\r
-            return new ReflectionComposablePartDefinition(creationInfo);\r
-        }\r
-\r
-        public static ReflectionComposablePart CreatePart(object attributedPart)\r
-        {\r
-            Assumes.NotNull(attributedPart);\r
-\r
-            // If given an instance then we want to pass the default composition options because we treat it as a shared part\r
-            // TODO: ICompositionElement Give this def an origin indicating that it was added directly to the ComposablePartExportProvider.\r
-\r
-            ReflectionComposablePartDefinition definition = AttributedModelDiscovery.CreatePartDefinition(attributedPart.GetType(), PartCreationPolicyAttribute.Shared, true, (ICompositionElement)null);\r
-\r
-            return new ReflectionComposablePart(definition, attributedPart);\r
-        }\r
-\r
-        public static ReflectionParameterImportDefinition CreateParameterImportDefinition(ParameterInfo parameter, ICompositionElement origin)\r
-        {\r
-            Requires.NotNull(parameter, "parameter");\r
-\r
-            ReflectionParameter reflectionParameter = parameter.ToReflectionParameter();\r
-            IAttributedImport attributedImport = AttributedModelDiscovery.GetAttributedImport(reflectionParameter, parameter);\r
-            ImportType importType = new ImportType(reflectionParameter.ReturnType, attributedImport.Cardinality);\r
-\r
-            if (importType.IsPartCreator)\r
-            {\r
-                return new PartCreatorParameterImportDefinition(\r
-                    new Lazy<ParameterInfo>(() => parameter),\r
-                    origin,\r
-                    new ContractBasedImportDefinition(\r
-                        attributedImport.GetContractNameFromImport(importType),\r
-                        attributedImport.GetTypeIdentityFromImport(importType),\r
-                        CompositionServices.GetRequiredMetadata(importType.MetadataViewType),\r
-                        attributedImport.Cardinality,\r
-                        false,\r
-                        true,\r
-                        CreationPolicy.NonShared));\r
-            }\r
-            else\r
-            {\r
-                return new ReflectionParameterImportDefinition(\r
-                    new Lazy<ParameterInfo>(() => parameter),\r
-                    attributedImport.GetContractNameFromImport(importType),\r
-                    attributedImport.GetTypeIdentityFromImport(importType),\r
-                    CompositionServices.GetRequiredMetadata(importType.MetadataViewType),\r
-                    attributedImport.Cardinality,\r
-                    attributedImport.RequiredCreationPolicy,\r
-                    origin);\r
-            }\r
-        }\r
-\r
-        public static ReflectionMemberImportDefinition CreateMemberImportDefinition(MemberInfo member, ICompositionElement origin)\r
-        {\r
-            Requires.NotNull(member, "member");\r
-\r
-            ReflectionWritableMember reflectionMember = member.ToReflectionWritableMember();\r
-            IAttributedImport attributedImport = AttributedModelDiscovery.GetAttributedImport(reflectionMember, member);\r
-            ImportType importType = new ImportType(reflectionMember.ReturnType, attributedImport.Cardinality);\r
-\r
-            if (importType.IsPartCreator)\r
-            {\r
-                return new PartCreatorMemberImportDefinition(\r
-                    new LazyMemberInfo(member),\r
-                    origin,\r
-                    new ContractBasedImportDefinition(\r
-                        attributedImport.GetContractNameFromImport(importType),\r
-                        attributedImport.GetTypeIdentityFromImport(importType),\r
-                        CompositionServices.GetRequiredMetadata(importType.MetadataViewType),\r
-                        attributedImport.Cardinality,\r
-                        attributedImport.AllowRecomposition,\r
-                        false,\r
-                        CreationPolicy.NonShared));\r
-            }\r
-            else\r
-            {\r
-                return new ReflectionMemberImportDefinition(\r
-                    new LazyMemberInfo(member),\r
-                    attributedImport.GetContractNameFromImport(importType),\r
-                    attributedImport.GetTypeIdentityFromImport(importType),\r
-                    CompositionServices.GetRequiredMetadata(importType.MetadataViewType),\r
-                    attributedImport.Cardinality,\r
-                    attributedImport.AllowRecomposition,\r
-                    attributedImport.RequiredCreationPolicy,\r
-                    origin);\r
-            }\r
-        }\r
-\r
-        private static IAttributedImport GetAttributedImport(ReflectionItem item, ICustomAttributeProvider attributeProvider)\r
-        {\r
-            IAttributedImport[] imports = attributeProvider.GetAttributes<IAttributedImport>(false);\r
-\r
-            // For constructor parameters they may not have an ImportAttribute\r
-            if (imports.Length == 0)\r
-            {\r
-                return new ImportAttribute();\r
-            }\r
-\r
-            if (imports.Length > 1)\r
-            {\r
-                CompositionTrace.MemberMarkedWithMultipleImportAndImportMany(item);\r
-            }\r
-\r
-            // Regardless of how many imports, always return the first one\r
-            return imports[0];\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedPartCreationInfo.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModel/AttributedPartCreationInfo.cs
deleted file mode 100644 (file)
index 9bc3d2f..0000000
+++ /dev/null
@@ -1,446 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Diagnostics;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.AttributedModel\r
-{\r
-    internal class AttributedPartCreationInfo : IReflectionPartCreationInfo\r
-    {\r
-        private readonly Type _type;\r
-        private readonly bool _ignoreConstructorImports = false;\r
-        private readonly ICompositionElement _origin;\r
-        private PartCreationPolicyAttribute _partCreationPolicy = null;\r
-        private ConstructorInfo _constructor;\r
-        private IEnumerable<ExportDefinition> _exports;\r
-        private IEnumerable<ImportDefinition> _imports;\r
-        private HashSet<string> _contractNamesOnNonInterfaces;\r
-\r
-        public AttributedPartCreationInfo(Type type, PartCreationPolicyAttribute partCreationPolicy, bool ignoreConstructorImports, ICompositionElement origin)\r
-        {\r
-            Assumes.NotNull(type);\r
-            this._type = type;\r
-            this._ignoreConstructorImports = ignoreConstructorImports;\r
-            this._partCreationPolicy = partCreationPolicy;\r
-            this._origin = origin;\r
-        }\r
-\r
-        public Type GetPartType()\r
-        {\r
-            return this._type;\r
-        }\r
-\r
-        public Lazy<Type> GetLazyPartType()\r
-        {\r
-            return new Lazy<Type>(this.GetPartType, false);\r
-        }\r
-\r
-        public ConstructorInfo GetConstructor()\r
-        {\r
-            if (this._constructor == null && !this._ignoreConstructorImports)\r
-            {\r
-                this._constructor = SelectPartConstructor(this._type);\r
-            }\r
-            return this._constructor;\r
-        }\r
-\r
-        public IDictionary<string, object> GetMetadata()\r
-        {\r
-            return this._type.GetPartMetadataForType(this.CreationPolicy);\r
-        }\r
-\r
-        public IEnumerable<ExportDefinition> GetExports()\r
-        {\r
-            DiscoverExportsAndImports();\r
-            return this._exports;\r
-        }\r
-\r
-        public IEnumerable<ImportDefinition> GetImports()\r
-        {\r
-            DiscoverExportsAndImports();\r
-            return this._imports;\r
-        }\r
-\r
-        public bool IsDisposalRequired\r
-        {\r
-            get\r
-            {\r
-                return typeof(IDisposable).IsAssignableFrom(this.GetPartType());\r
-            }\r
-        }\r
-\r
-        public bool IsPartDiscoverable()\r
-        {\r
-            if (this._type.IsAttributeDefined<PartNotDiscoverableAttribute>())\r
-            {\r
-                CompositionTrace.DefinitionMarkedWithPartNotDiscoverableAttribute(this._type);\r
-                return false;\r
-            }\r
-\r
-            if (this._type.ContainsGenericParameters)\r
-            {\r
-                CompositionTrace.DefinitionContainsGenericsParameters(this._type);\r
-                return false;\r
-            }\r
-\r
-            if (!HasExports())\r
-            {\r
-                CompositionTrace.DefinitionContainsNoExports(this._type);\r
-                return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private bool HasExports()\r
-        {\r
-            return GetExportMembers(this._type).Any() ||\r
-                   GetInheritedExports(this._type).Any();\r
-        }\r
-\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return this.GetDisplayName(); }\r
-        }\r
-\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return this._origin; }\r
-        }\r
-\r
-        public override string ToString()\r
-        {\r
-            return GetDisplayName();\r
-        }\r
-\r
-        private string GetDisplayName()\r
-        {\r
-            return this.GetPartType().GetDisplayName();\r
-        }\r
-\r
-        private CreationPolicy CreationPolicy\r
-        {\r
-            get\r
-            {\r
-                if (this._partCreationPolicy == null)\r
-                {\r
-                    this._partCreationPolicy = this._type.GetFirstAttribute<PartCreationPolicyAttribute>() ?? PartCreationPolicyAttribute.Default;\r
-                }\r
-                return this._partCreationPolicy.CreationPolicy;\r
-            }\r
-        }\r
-\r
-        private static ConstructorInfo SelectPartConstructor(Type type)\r
-        {\r
-            Assumes.NotNull(type);\r
-\r
-            if (type.IsAbstract)\r
-            {\r
-                return null;\r
-            }\r
-\r
-            // Only deal with non-static constructors\r
-            BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;\r
-\r
-            ConstructorInfo[] constructors = type.GetConstructors(flags);\r
-\r
-            // Should likely only happen for static or abstract types\r
-            if (constructors.Length == 0)\r
-            {\r
-                return null;\r
-            }\r
-\r
-            // Optimize single default constructor.\r
-            if (constructors.Length == 1 && constructors[0].GetParameters().Length == 0)\r
-            {\r
-                return constructors[0];\r
-            }\r
-\r
-            // Select the marked constructor if there is exactly one marked\r
-            IEnumerable<ConstructorInfo> importingConstructors = constructors.Where(\r
-                ctor => ctor.IsAttributeDefined<ImportingConstructorAttribute>());\r
-\r
-            switch (importingConstructors.GetCardinality())\r
-            {\r
-                case EnumerableCardinality.One:\r
-                    {\r
-                        return importingConstructors.First();\r
-                    }\r
-\r
-                case EnumerableCardinality.TwoOrMore:\r
-                    {\r
-                        // Return null, the part will error on instantiation.\r
-                        return null;\r
-                    }\r
-            }\r
-\r
-            // If there are no marked constructors then select the default constructor\r
-            IEnumerable<ConstructorInfo> defaultConstructors = constructors.Where(\r
-                ctor => ctor.GetParameters().Length == 0);\r
-\r
-            // There should only ever be zero or one default constructors  \r
-            return defaultConstructors.SingleOrDefault();\r
-        }\r
-\r
-        private void DiscoverExportsAndImports()\r
-        {\r
-            // NOTE : in most cases both of these will be null or not null at the same time\r
-            // the only situation when that is not the case is when there was a failure during the previous discovery\r
-            // and one of them ended up not being set. In that case we will force the discovery again so that the same exception is thrown.\r
-            if ((this._exports != null) && (this._imports != null))\r
-            {\r
-                return;\r
-            }\r
-\r
-            this._exports = GetExportDefinitions();\r
-            this._imports = GetImportDefinitions();\r
-        }\r
-\r
-        private IEnumerable<ExportDefinition> GetExportDefinitions()\r
-        {\r
-            List<ExportDefinition> exports = new List<ExportDefinition>();\r
-\r
-            this._contractNamesOnNonInterfaces = new HashSet<string>();\r
-\r
-            // GetExportMembers should only contain the type itself along with the members declared on it, \r
-            // it should not contain any base types, members on base types or interfaces on the type.\r
-            foreach (MemberInfo member in GetExportMembers(this._type))\r
-            {\r
-                foreach (ExportAttribute exportAttribute in member.GetAttributes<ExportAttribute>())\r
-                {\r
-                    var attributedExportDefinition = new AttributedExportDefinition(this, member, exportAttribute);\r
-\r
-                    if (exportAttribute.GetType() == CompositionServices.InheritedExportAttributeType)\r
-                    {\r
-                        // Any InheritedExports on the type itself are contributed during this pass \r
-                        // and we need to do the book keeping for those.\r
-                        if (!this._contractNamesOnNonInterfaces.Contains(attributedExportDefinition.ContractName))\r
-                        {\r
-                            exports.Add(new ReflectionMemberExportDefinition(member.ToLazyMember(), attributedExportDefinition, this));\r
-                            this._contractNamesOnNonInterfaces.Add(attributedExportDefinition.ContractName);\r
-                        }\r
-                    }\r
-                    else\r
-                    {\r
-                        exports.Add(new ReflectionMemberExportDefinition(member.ToLazyMember(), attributedExportDefinition, this));\r
-                    }\r
-                }\r
-            }\r
-\r
-            // GetInheritedExports should only contain InheritedExports on base types or interfaces.\r
-            // The order of types returned here is important because it is used as a \r
-            // priority list of which InhertedExport to choose if multiple exists with \r
-            // the same contract name. Therefore ensure that we always return the types\r
-            // in the hiearchy from most derived to the lowest base type, followed\r
-            // by all the interfaces that this type implements.\r
-            foreach (Type type in GetInheritedExports(this._type))\r
-            {\r
-                foreach (InheritedExportAttribute exportAttribute in type.GetAttributes<InheritedExportAttribute>())\r
-                {\r
-                    var attributedExportDefinition = new AttributedExportDefinition(this, type, exportAttribute);\r
-\r
-                    if (!this._contractNamesOnNonInterfaces.Contains(attributedExportDefinition.ContractName))\r
-                    {\r
-                        exports.Add(new ReflectionMemberExportDefinition(type.ToLazyMember(), attributedExportDefinition, this));\r
-\r
-                        if (!type.IsInterface)\r
-                        {\r
-                            this._contractNamesOnNonInterfaces.Add(attributedExportDefinition.ContractName);\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            this._contractNamesOnNonInterfaces = null; // No need to hold this state around any longer\r
-\r
-            return exports;\r
-        }\r
-\r
-        private IEnumerable<MemberInfo> GetExportMembers(Type type)\r
-        {\r
-            BindingFlags flags = BindingFlags.DeclaredOnly | BindingFlags.Public |\r
-                BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static;\r
-\r
-            // If the type is abstract only find local static exports\r
-            if (type.IsAbstract)\r
-            {\r
-                flags &= ~BindingFlags.Instance;\r
-            }\r
-            else if (IsExport(type))\r
-            {\r
-                yield return type;\r
-            }\r
-\r
-            // Walk the fields \r
-            foreach (var member in type.GetFields(flags))\r
-            {\r
-                if (IsExport(member))\r
-                {\r
-                    yield return member;\r
-                }\r
-            }\r
-\r
-            // Walk the properties \r
-            foreach (var member in type.GetProperties(flags))\r
-            {\r
-                if (IsExport(member))\r
-                {\r
-                    yield return member;\r
-                }\r
-            }\r
-\r
-            // Walk the methods \r
-            foreach (var member in type.GetMethods(flags))\r
-            {\r
-                if (IsExport(member))\r
-                {\r
-                    yield return member;\r
-                }\r
-            }\r
-        }\r
-\r
-        private IEnumerable<Type> GetInheritedExports(Type type)\r
-        {\r
-            // If the type is abstract we aren't interested in type level exports\r
-            if (type.IsAbstract)\r
-            {\r
-                yield break;\r
-            }\r
-\r
-            // The order of types returned here is important because it is used as a \r
-            // priority list of which InhertedExport to choose if multiple exists with \r
-            // the same contract name. Therefore ensure that we always return the types\r
-            // in the hiearchy from most derived to the lowest base type, followed\r
-            // by all the interfaces that this type implements.\r
-\r
-            Type currentType = type.BaseType;\r
-\r
-            if (currentType == null)\r
-            {\r
-                yield break;\r
-            }\r
-            \r
-            // Stopping at object instead of null to help with performance. It is a noticable performance\r
-            // gain (~5%) if we don't have to try and pull the attributes we know don't exist on object.\r
-            // We also need the null check in case we're passed a type that doesn't live in the runtime context.\r
-            while (currentType != null && currentType != CompositionServices.ObjectType)\r
-            {\r
-                if (IsInheritedExport(currentType))\r
-                {\r
-                    yield return currentType;\r
-                }\r
-                currentType = currentType.BaseType;\r
-            }\r
-\r
-            foreach (Type iface in type.GetInterfaces())\r
-            {\r
-                if (IsInheritedExport(iface))\r
-                {\r
-                    yield return iface;\r
-                }\r
-            }\r
-        }\r
-\r
-        private static bool IsExport(ICustomAttributeProvider attributeProvider)\r
-        {\r
-            return attributeProvider.IsAttributeDefined<ExportAttribute>(false);\r
-        }\r
-\r
-        private static bool IsInheritedExport(ICustomAttributeProvider attributedProvider)\r
-        {\r
-            return attributedProvider.IsAttributeDefined<InheritedExportAttribute>(false);\r
-        }\r
-\r
-        private IEnumerable<ImportDefinition> GetImportDefinitions()\r
-        {\r
-            List<ImportDefinition> imports = new List<ImportDefinition>();\r
-\r
-            foreach (MemberInfo member in GetImportMembers(this._type))\r
-            {\r
-                ReflectionMemberImportDefinition importDefinition = AttributedModelDiscovery.CreateMemberImportDefinition(member, this);\r
-                imports.Add(importDefinition);\r
-            }\r
-\r
-            var constructor = this.GetConstructor();\r
-\r
-            if (constructor != null)\r
-            {\r
-                foreach (ParameterInfo parameter in constructor.GetParameters())\r
-                {\r
-                    ReflectionParameterImportDefinition importDefinition = AttributedModelDiscovery.CreateParameterImportDefinition(parameter, this);\r
-                    imports.Add(importDefinition);\r
-                }\r
-            }\r
-\r
-            return imports;\r
-        }\r
-\r
-        private IEnumerable<MemberInfo> GetImportMembers(Type type)\r
-        {\r
-            if (type.IsAbstract)\r
-            {\r
-                yield break;\r
-            }\r
-\r
-            foreach (MemberInfo member in GetDeclaredOnlyImportMembers(type))\r
-            {\r
-                yield return member;\r
-            }\r
-\r
-            // Walk up the type chain until you hit object.\r
-            if (type.BaseType != null)\r
-            {\r
-                Type baseType = type.BaseType;\r
-\r
-                // Stopping at object instead of null to help with performance. It is a noticable performance\r
-                // gain (~5%) if we don't have to try and pull the attributes we know don't exist on object.\r
-                // We also need the null check in case we're passed a type that doesn't live in the runtime context.\r
-                while (baseType != null && baseType != CompositionServices.ObjectType)\r
-                {\r
-                    foreach (MemberInfo member in GetDeclaredOnlyImportMembers(baseType))\r
-                    {\r
-                        yield return member;\r
-                    }\r
-                    baseType = baseType.BaseType;\r
-                }\r
-            }\r
-        }\r
-\r
-        private IEnumerable<MemberInfo> GetDeclaredOnlyImportMembers(Type type)\r
-        {\r
-            BindingFlags flags = BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;\r
-\r
-            // Walk the fields \r
-            foreach (var member in type.GetFields(flags))\r
-            {\r
-                if (IsImport(member))\r
-                {\r
-                    yield return member;\r
-                }\r
-            }\r
-\r
-            // Walk the properties \r
-            foreach (var member in type.GetProperties(flags))\r
-            {\r
-                if (IsImport(member))\r
-                {\r
-                    yield return member;\r
-                }\r
-            }\r
-        }\r
-\r
-        private static bool IsImport(ICustomAttributeProvider attributeProvider)\r
-        {\r
-            return attributeProvider.IsAttributeDefined<IAttributedImport>(false);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModelServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/AttributedModelServices.cs
deleted file mode 100644 (file)
index b2be757..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Runtime.Serialization;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.Reflection;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using System.Collections.Generic;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public static class AttributedModelServices\r
-    {\r
-        [SuppressMessage("Microsoft.Design", "CA1004")]\r
-        public static TMetadataView GetMetadataView<TMetadataView>(IDictionary<string, object> metadata)\r
-        {\r
-            Requires.NotNull(metadata, "metadata");\r
-\r
-            return MetadataViewProvider.GetMetadataView<TMetadataView>(metadata);\r
-        }\r
-\r
-        public static ComposablePart CreatePart(object attributedPart)\r
-        {\r
-            Requires.NotNull(attributedPart, "attributedPart");\r
-            return AttributedModelDiscovery.CreatePart(attributedPart);\r
-        }\r
-\r
-        public static ComposablePartDefinition CreatePartDefinition(Type type, ICompositionElement origin)\r
-        {\r
-            Requires.NotNull(type, "type");\r
-            return AttributedModelServices.CreatePartDefinition(type, origin, false);\r
-        }\r
-\r
-        public static ComposablePartDefinition CreatePartDefinition(Type type, ICompositionElement origin, bool ensureIsDiscoverable)\r
-        {\r
-            Requires.NotNull(type, "type");\r
-            if (ensureIsDiscoverable)\r
-            {\r
-                return AttributedModelDiscovery.CreatePartDefinitionIfDiscoverable(type, origin);\r
-            }\r
-            else\r
-            {\r
-                return AttributedModelDiscovery.CreatePartDefinition(type, null, false, origin);\r
-            }\r
-        }\r
-\r
-        public static string GetTypeIdentity(Type type)\r
-        {\r
-            Requires.NotNull(type, "type");\r
-\r
-            return ContractNameServices.GetTypeIdentity(type);\r
-        }\r
-\r
-        public static string GetTypeIdentity(MethodInfo method)\r
-        {\r
-            Requires.NotNull(method, "method");\r
-\r
-            return ContractNameServices.GetTypeIdentityFromMethod(method);\r
-        }\r
-\r
-        public static string GetContractName(Type type)\r
-        {\r
-            return AttributedModelServices.GetTypeIdentity(type);\r
-        }\r
-\r
-        public static ComposablePart AddExportedValue<T>(this CompositionBatch batch, T exportedValue)\r
-        {\r
-            Requires.NotNull(batch, "batch");\r
-            string contractName = AttributedModelServices.GetContractName(typeof(T));\r
-\r
-            return batch.AddExportedValue<T>(contractName, exportedValue);\r
-        }\r
-\r
-        public static void ComposeExportedValue<T>(this CompositionContainer container, T exportedValue)\r
-        {\r
-            Requires.NotNull(container, "container");\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue<T>(exportedValue);\r
-            container.Compose(batch);\r
-        }\r
-\r
-        public static ComposablePart AddExportedValue<T>(this CompositionBatch batch, string contractName, T exportedValue)\r
-        {\r
-            Requires.NotNull(batch, "batch");\r
-\r
-            string typeIdentity = AttributedModelServices.GetTypeIdentity(typeof(T));\r
-\r
-            IDictionary<string, object> metadata = new Dictionary<string, object>();\r
-            metadata.Add(CompositionConstants.ExportTypeIdentityMetadataName, typeIdentity);\r
-\r
-            return batch.AddExport(new Export(contractName, metadata, () => exportedValue));\r
-        }\r
-\r
-        public static void ComposeExportedValue<T>(this CompositionContainer container, string contractName, T exportedValue)\r
-        {\r
-            Requires.NotNull(container, "container");\r
-\r
-            CompositionBatch batch = new CompositionBatch();\r
-            batch.AddExportedValue<T>(contractName, exportedValue);\r
-            container.Compose(batch);\r
-        }\r
-\r
-        public static ComposablePart AddPart(this CompositionBatch batch, object attributedPart)\r
-        {\r
-            Requires.NotNull(batch, "batch");\r
-            Requires.NotNull(attributedPart, "attributedPart");\r
-\r
-            ComposablePart part = AttributedModelServices.CreatePart(attributedPart);\r
-\r
-            batch.AddPart(part);\r
-\r
-            return part;\r
-        }\r
-\r
-        public static void ComposeParts(this CompositionContainer container, params object[] attributedParts)\r
-        {\r
-            Requires.NotNull(container, "container");\r
-            Requires.NotNullOrNullElements(attributedParts, "attributedParts");\r
-\r
-            CompositionBatch batch = new CompositionBatch(\r
-                attributedParts.Select(attributedPart => AttributedModelServices.CreatePart(attributedPart)).ToArray(),\r
-                Enumerable.Empty<ComposablePart>());\r
-\r
-            container.Compose(batch);\r
-        }\r
-     \r
-        /// <summary>\r
-        ///     Satisfies the imports of the specified attributed object exactly once and they will not\r
-        ///     ever be recomposed.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     The attributed object to set the imports.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="attributedPart"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will\r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ICompositionService"/> has been disposed of.\r
-        /// </exception>\r
-        public static ComposablePart SatisfyImportsOnce(this ICompositionService compositionService, object attributedPart)\r
-        {\r
-            Requires.NotNull(compositionService, "compositionService");\r
-            Requires.NotNull(attributedPart, "attributedPart");\r
-\r
-            ComposablePart part = AttributedModelServices.CreatePart(attributedPart);\r
-            compositionService.SatisfyImportsOnce(part);\r
-\r
-            return part;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ChangeRejectedException.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ChangeRejectedException.cs
deleted file mode 100644 (file)
index db81e13..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Globalization;\r
-using System.Security.Permissions;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     The exception that is thrown when one or more recoverable errors occur during\r
-    ///     composition which results in those changes being rejected.\r
-    /// </summary>\r
-    [Serializable]\r
-    public class ChangeRejectedException : CompositionException\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ChangeRejectedException"/> class.\r
-        /// </summary>\r
-        public ChangeRejectedException()\r
-            : this((string)null, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ChangeRejectedException"/> class.\r
-        /// </summary>\r
-        public ChangeRejectedException(string message)\r
-            : this(message, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ChangeRejectedException"/> class.\r
-        /// </summary>\r
-        public ChangeRejectedException(string message, Exception innerException)\r
-            : base(message, innerException, (IEnumerable<CompositionError>)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ChangeRejectedException"/> class.\r
-        /// </summary>\r
-        /// <param name="errors">List of errors that occured while applying the changes.</param>\r
-        public ChangeRejectedException(IEnumerable<CompositionError> errors)\r
-            : base((string)null, (Exception)null, errors)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets a message that describes the exception.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="ChangeRejectedException"/>.\r
-        /// </value>\r
-        public override string Message\r
-        {\r
-            get\r
-            {\r
-                return string.Format(CultureInfo.CurrentCulture, \r
-                    Strings.CompositionException_ChangesRejected,\r
-                    base.Message);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionContractMismatchException.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionContractMismatchException.cs
deleted file mode 100644 (file)
index f1a5f49..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Runtime.Serialization;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     The exception that is thrown when the underlying exported value or metadata of an \r
-    ///     <see cref="Lazy{T}"/> or <see cref="Lazy{T, TMetadataView}"/> object cannot be \r
-    ///     cast to <c>T</c> or <c>TMetadataView</c>, respectively.\r
-    /// </summary>\r
-    [Serializable]\r
-    public class CompositionContractMismatchException : Exception\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionContractMismatchException"/> class.\r
-        /// </summary>\r
-        public CompositionContractMismatchException()\r
-            : this((string)null, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionContractMismatchException"/> class \r
-        ///     with the specified error message.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionContractMismatchException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        public CompositionContractMismatchException(string message)\r
-            : this(message, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionContractMismatchException"/> class \r
-        ///     with the specified error message and exception that is the cause of the  \r
-        ///     exception.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionContractMismatchException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        /// <param name="innerException">\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="CompositionContractMismatchException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.InnerException"/> property to <see langword="null"/>.\r
-        /// </param>\r
-        public CompositionContractMismatchException(string message, Exception innerException)\r
-            : base(message, innerException)\r
-        {\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionContractMismatchException"/> class \r
-        ///     with the specified serialization data.\r
-        /// </summary>\r
-        /// <param name="info">\r
-        ///     The <see cref="SerializationInfo"/> that holds the serialized object data about the \r
-        ///     <see cref="CompositionContractMismatchException"/>.\r
-        /// </param>\r
-        /// <param name="context">\r
-        ///     The <see cref="StreamingContext"/> that contains contextual information about the \r
-        ///     source or destination.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="info"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="SerializationException">\r
-        ///     <paramref name="info"/> is missing a required value.\r
-        /// </exception>\r
-        /// <exception cref="InvalidCastException">\r
-        ///     <paramref name="info"/> contains a value that cannot be cast to the correct type.\r
-        /// </exception>\r
-        [System.Security.SecuritySafeCritical]\r
-        protected CompositionContractMismatchException(SerializationInfo info, StreamingContext context)\r
-            : base(info, context)\r
-        {\r
-        }\r
-\r
-#endif\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionError.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionError.cs
deleted file mode 100644 (file)
index d523750..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Globalization;\r
-using System.Security.Permissions;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Represents an error that occurs during composition in a <see cref="CompositionContainer"/>.\r
-    /// </summary>\r
-    [Serializable]\r
-    [DebuggerTypeProxy(typeof(CompositionErrorDebuggerProxy))]\r
-    public class CompositionError : ICompositionError\r
-    {\r
-        private readonly CompositionErrorId _id;\r
-        private readonly string _description;\r
-        private readonly Exception _exception;\r
-\r
-        private readonly ICompositionElement _element;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionError"/> class\r
-        ///     with the specified error message.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set the \r
-        ///     <see cref="Description"/> property to an empty string ("").\r
-        /// </param>\r
-        public CompositionError(string message)\r
-            : this(CompositionErrorId.Unknown, message, (ICompositionElement)null, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionError"/> class\r
-        ///     with the specified error message and composition element that is the\r
-        ///     cause of the composition error.\r
-        /// </summary>\r
-        /// <param name="element">\r
-        ///     The <see cref="ICompositionElement"/> that is the cause of the\r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="CompositionError.Element"/> property to \r
-        ///     <see langword="null"/>.\r
-        /// </param>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set the \r
-        ///     <see cref="Description"/> property to an empty string ("").\r
-        /// </param>\r
-        public CompositionError(string message, ICompositionElement element)\r
-            : this(CompositionErrorId.Unknown, message, element, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionError"/> class \r
-        ///     with the specified error message and exception that is the cause of the  \r
-        ///     composition error.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set the \r
-        ///     <see cref="Description"/> property to an empty string ("").\r
-        /// </param>\r
-        /// <param name="exception">\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="CompositionError.Exception"/> property to <see langword="null"/>.\r
-        /// </param>\r
-        public CompositionError(string message, Exception exception)\r
-            : this(CompositionErrorId.Unknown, message, (ICompositionElement)null, exception)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionError"/> class \r
-        ///     with the specified error message, and composition element and exception that \r
-        ///     is the cause of the composition error.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set the \r
-        ///     <see cref="Description"/> property to an empty string ("").\r
-        /// </param>\r
-        /// <param name="element">\r
-        ///     The <see cref="ICompositionElement"/> that is the cause of the\r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="CompositionError.Element"/> property to \r
-        ///     <see langword="null"/>.\r
-        /// </param>\r
-        /// <param name="exception">\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="CompositionError"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="CompositionError.Exception"/> property to <see langword="null"/>.\r
-        /// </param>\r
-        public CompositionError(string message, ICompositionElement element, Exception exception)\r
-            : this(CompositionErrorId.Unknown, message, element, exception)\r
-        {\r
-        }\r
-\r
-        internal CompositionError(CompositionErrorId id, string description, ICompositionElement element, Exception exception)\r
-        {\r
-            _id = id;\r
-            _description = description ?? string.Empty;\r
-            _element = element;\r
-            _exception = exception;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the composition element that is the cause of the error.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="ICompositionElement"/> that is the cause of the\r
-        ///     <see cref="CompositionError"/>. The default is <see langword="null"/>.\r
-        /// </value>\r
-        public ICompositionElement Element\r
-        {\r
-            get { return _element; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the message that describes the composition error.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing a message that describes the\r
-        ///     <see cref="CompositionError"/>.\r
-        /// </value>\r
-        public string Description\r
-        {\r
-            get { return _description; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the exception that is the underlying cause of the composition error.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="CompositionError"/>. The default is <see langword="null"/>.\r
-        /// </value>\r
-        public Exception Exception\r
-        {\r
-            get { return _exception; }\r
-        }\r
-\r
-        CompositionErrorId ICompositionError.Id\r
-        {\r
-            get { return _id; }\r
-        }\r
-\r
-        Exception ICompositionError.InnerException\r
-        {\r
-            get { return Exception; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a string representation of the composition error.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="String"/> containing the <see cref="Description"/> property.\r
-        /// </returns>\r
-        public override string ToString()\r
-        {\r
-            return this.Description;\r
-        }\r
-\r
-        internal static CompositionError Create(CompositionErrorId id, string format, params object[] parameters)\r
-        {\r
-            return Create(id, (ICompositionElement)null, (Exception)null, format, parameters);\r
-        }\r
-\r
-        internal static CompositionError Create(CompositionErrorId id, ICompositionElement element, string format, params object[] parameters)\r
-        {\r
-            return Create(id, element, (Exception)null, format, parameters);\r
-        }\r
-\r
-        internal static CompositionError Create(CompositionErrorId id, ICompositionElement element, Exception exception, string format, params object[] parameters)\r
-        {\r
-            return new CompositionError(id, string.Format(CultureInfo.CurrentCulture, format, parameters), element, exception);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionErrorDebuggerProxy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionErrorDebuggerProxy.cs
deleted file mode 100644 (file)
index eafbc0c..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal class CompositionErrorDebuggerProxy\r
-    {\r
-        private readonly CompositionError _error;\r
-\r
-        public CompositionErrorDebuggerProxy(CompositionError error)\r
-        {\r
-            Requires.NotNull(error, "error");\r
-\r
-            this._error = error;\r
-        }\r
-\r
-        public string Description\r
-        {\r
-            get { return this._error.Description; }\r
-        }\r
-\r
-        public Exception Exception\r
-        {\r
-            get { return this._error.Exception; }\r
-        }\r
-\r
-        public ICompositionElement Element\r
-        {\r
-            get { return this._error.Element; }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionErrorId.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionErrorId.cs
deleted file mode 100644 (file)
index b9eb3b6..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal enum CompositionErrorId : int\r
-    {\r
-        Unknown = 0,\r
-        InvalidExportMetadata,\r
-        RequiredMetadataNotFound,\r
-        UnsupportedExportType,\r
-        ImportNotSetOnPart,\r
-        ImportEngine_ComposeTookTooManyIterations,\r
-        ImportEngine_ImportCardinalityMismatch,\r
-        ImportEngine_PartCycle,\r
-        ImportEngine_PartCannotSetImport,\r
-        ImportEngine_PartCannotGetExportedValue,\r
-        ImportEngine_PartCannotActivate,\r
-        ImportEngine_PreventedByExistingImport,\r
-        ImportEngine_InvalidStateForRecomposition,\r
-        ReflectionModel_PartConstructorMissing,\r
-        ReflectionModel_PartConstructorThrewException,\r
-        ReflectionModel_PartOnImportsSatisfiedThrewException,\r
-        ReflectionModel_ExportNotReadable,\r
-        ReflectionModel_ExportThrewException,\r
-        ReflectionModel_ExportMethodTooManyParameters,\r
-        ReflectionModel_ImportNotWritable,\r
-        ReflectionModel_ImportThrewException,\r
-        ReflectionModel_ImportNotAssignableFromExport,        \r
-        ReflectionModel_ImportCollectionNull,\r
-        ReflectionModel_ImportCollectionNotWritable,\r
-        ReflectionModel_ImportCollectionConstructionThrewException,\r
-        ReflectionModel_ImportCollectionGetThrewException,\r
-        ReflectionModel_ImportCollectionIsReadOnlyThrewException,\r
-        ReflectionModel_ImportCollectionClearThrewException,\r
-        ReflectionModel_ImportCollectionAddThrewException,\r
-        ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionException.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionException.cs
deleted file mode 100644 (file)
index 39491ad..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Runtime.Serialization;\r
-using System.Security.Permissions;\r
-using System.Text;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-\r
-    /// <summary>\r
-    ///     The exception that is thrown when one or more errors occur during composition in \r
-    ///     a <see cref="CompositionContainer"/>.\r
-    /// </summary>\r
-    [Serializable]\r
-    public class CompositionException : Exception\r
-    {\r
-        const string ErrorsKey = "Errors";\r
-        private ReadOnlyCollection<CompositionError> _errors;\r
-\r
-#if CLR40 && !SILVERLIGHT\r
-        [Serializable]\r
-        private struct CompositionExceptionData : ISafeSerializationData\r
-        {\r
-            public CompositionError[] _errors;\r
-\r
-            void ISafeSerializationData.CompleteDeserialization(object obj)\r
-            {\r
-                CompositionException exception = obj as CompositionException;\r
-\r
-                exception._errors = new ReadOnlyCollection<CompositionError>(this._errors);\r
-            }\r
-        }\r
-#endif\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionException"/> class.\r
-        /// </summary>\r
-        public CompositionException()\r
-            : this((string)null, (Exception)null, (IEnumerable<CompositionError>)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionException"/> class \r
-        ///     with the specified error message.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        public CompositionException(string message)\r
-            : this(message, (Exception)null, (IEnumerable<CompositionError>)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionException"/> class \r
-        ///     with the specified error message and exception that is the cause of the  \r
-        ///     exception.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        /// <param name="innerException">\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.InnerException"/> property to <see langword="null"/>.\r
-        /// </param>\r
-        public CompositionException(string message, Exception innerException)\r
-            : this(message, innerException, (IEnumerable<CompositionError>)null)\r
-        {\r
-        }\r
-\r
-        internal CompositionException(CompositionError error)\r
-            : this(new CompositionError[] { error })\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionException"/> class \r
-        ///     with the specified errors.\r
-        /// </summary>\r
-        /// <param name="errors">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="CompositionError"/> objects\r
-        ///     representing the errors that are the cause of the \r
-        ///     <see cref="CompositionException"/>; or <see langword="null"/> to set the \r
-        ///     <see cref="Errors"/> property to an empty <see cref="IEnumerable{T}"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="errors"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        public CompositionException(IEnumerable<CompositionError> errors)\r
-            : this((string)null, (Exception)null, errors)\r
-        {\r
-        }\r
-\r
-        internal CompositionException(string message, Exception innerException, IEnumerable<CompositionError> errors)\r
-            : base(message, innerException)\r
-        {\r
-            Requires.NullOrNotNullElements(errors, "errors");\r
-#if CLR40 && !SILVERLIGHT\r
-            SerializeObjectState += delegate(object exception, SafeSerializationEventArgs eventArgs)\r
-            {\r
-                var data = new CompositionExceptionData();\r
-                if(this._errors != null)\r
-                {\r
-                    data._errors = this._errors.Select(error => new CompositionError(\r
-                        ((ICompositionError)error).Id, \r
-                        error.Description,\r
-                        error.Element.ToSerializableElement(),\r
-                        error.Exception)).ToArray();\r
-                }\r
-                else\r
-                {\r
-                    data._errors = new CompositionError[0];\r
-                }\r
-\r
-                eventArgs.AddSerializedState(data);\r
-            };\r
-#endif\r
-            _errors = new ReadOnlyCollection<CompositionError>(errors == null ? new CompositionError[0] : errors.ToArray<CompositionError>());\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the errors that are the cause of the exception.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="CompositionError"/> objects\r
-        ///     representing the errors that are the cause of the \r
-        ///     <see cref="CompositionException"/>.\r
-        /// </value>\r
-        public ReadOnlyCollection<CompositionError> Errors\r
-        {\r
-            get { return _errors; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets a message that describes the exception.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="CompositionException"/>.\r
-        /// </value>\r
-        public override string Message\r
-        {\r
-            [System.Security.SecuritySafeCritical]\r
-            get\r
-            {\r
-                if (this.Errors.Count == 0)\r
-                {   // If there are no errors, then we simply return base.Message, \r
-                    // which will either use the default Exception message, or if \r
-                    // one was specified; the user supplied message.\r
-\r
-                    return base.Message;\r
-                }\r
-\r
-                return BuildDefaultMessage();\r
-            }\r
-        }\r
-\r
-        private string BuildDefaultMessage()\r
-        {\r
-            IEnumerable<IEnumerable<CompositionError>> paths = CalculatePaths(this);\r
-\r
-            StringBuilder writer = new StringBuilder();\r
-\r
-            WriteHeader(writer, this.Errors.Count, paths.Count());\r
-            WritePaths(writer, paths);\r
-\r
-            return writer.ToString();\r
-        }\r
-\r
-        private static void WriteHeader(StringBuilder writer, int errorsCount, int pathCount)\r
-        {\r
-            if (errorsCount > 1 && pathCount > 1)\r
-            {\r
-                // The composition produced multiple composition errors, with {0} root causes. The root causes are provided below.\r
-                writer.AppendFormat(\r
-                     CultureInfo.CurrentCulture,\r
-                     Strings.CompositionException_MultipleErrorsWithMultiplePaths,\r
-                     pathCount);\r
-            }\r
-            else if (errorsCount == 1 && pathCount > 1)\r
-            {\r
-                // The composition produced a single composition error, with {0} root causes. The root causes are provided below.\r
-                writer.AppendFormat(\r
-                     CultureInfo.CurrentCulture,\r
-                     Strings.CompositionException_SingleErrorWithMultiplePaths,\r
-                     pathCount);\r
-            }\r
-            else\r
-            {\r
-                Assumes.IsTrue(errorsCount == 1);\r
-                Assumes.IsTrue(pathCount == 1);\r
-                \r
-                // The composition produced a single composition error. The root cause is provided below.\r
-                writer.AppendFormat(\r
-                     CultureInfo.CurrentCulture,\r
-                     Strings.CompositionException_SingleErrorWithSinglePath,\r
-                     pathCount);\r
-            }\r
-\r
-            writer.Append(' ');\r
-            writer.AppendLine(Strings.CompositionException_ReviewErrorProperty);\r
-        }\r
-\r
-        private static void WritePaths(StringBuilder writer, IEnumerable<IEnumerable<CompositionError>> paths)\r
-        {\r
-            int ordinal = 0;\r
-            foreach (IEnumerable<CompositionError> path in paths)\r
-            {\r
-                ordinal++;\r
-                WritePath(writer, path, ordinal);\r
-            }\r
-        }\r
-\r
-        private static void WritePath(StringBuilder writer, IEnumerable<CompositionError> path, int ordinal)\r
-        {\r
-            writer.AppendLine();\r
-            writer.Append(ordinal.ToString(CultureInfo.CurrentCulture));\r
-            writer.Append(Strings.CompositionException_PathsCountSeparator);\r
-            writer.Append(' ');\r
-\r
-            WriteError(writer, path.First());\r
-\r
-            foreach (CompositionError error in path.Skip(1))\r
-            {\r
-                writer.AppendLine();\r
-                writer.Append(Strings.CompositionException_ErrorPrefix);\r
-                writer.Append(' ');\r
-                WriteError(writer, error);\r
-            }\r
-        }\r
-\r
-        private static void WriteError(StringBuilder writer, CompositionError error)\r
-        {\r
-            writer.AppendLine(error.Description);\r
-\r
-            if (error.Element != null)\r
-            {\r
-                WriteElementGraph(writer, error.Element);\r
-            }\r
-        }\r
-\r
-        private static void WriteElementGraph(StringBuilder writer, ICompositionElement element)\r
-        {\r
-            // Writes the composition element and its origins in the format:\r
-            // Element: Export --> Part --> PartDefinition --> Catalog\r
-\r
-            writer.AppendFormat(CultureInfo.CurrentCulture, Strings.CompositionException_ElementPrefix, element.DisplayName);\r
-\r
-            while ((element = element.Origin) != null)\r
-            {\r
-                writer.AppendFormat(CultureInfo.CurrentCulture, Strings.CompositionException_OriginFormat, Strings.CompositionException_OriginSeparator, element.DisplayName);\r
-            }\r
-\r
-            writer.AppendLine();\r
-        }\r
-\r
-        private static IEnumerable<IEnumerable<CompositionError>> CalculatePaths(CompositionException exception)\r
-        {\r
-            List<IEnumerable<CompositionError>> paths = new List<IEnumerable<CompositionError>>();\r
-\r
-            VisitContext context = new VisitContext();\r
-            context.Path = new Stack<CompositionError>();\r
-            context.LeafVisitor = path =>\r
-            {\r
-                // Take a snapshot of the path\r
-                paths.Add(path.Copy());\r
-            };\r
-\r
-            VisitCompositionException(exception, context);\r
-\r
-            return paths;\r
-        }\r
-\r
-        private static void VisitCompositionException(CompositionException exception, VisitContext context)\r
-        {\r
-            foreach (CompositionError error in exception.Errors)\r
-            {\r
-                VisitError(error, context);\r
-            }\r
-\r
-            if (exception.InnerException != null)\r
-            {\r
-                VisitException(exception.InnerException, context);\r
-            }\r
-        }\r
-\r
-        private static void VisitError(CompositionError error, VisitContext context)\r
-        {\r
-            context.Path.Push(error);\r
-\r
-            if (error.Exception == null)\r
-            {   // This error is a root cause, so write \r
-                // out the stack from this point\r
-\r
-                context.LeafVisitor(context.Path);\r
-            }\r
-            else\r
-            {\r
-                VisitException(error.Exception, context);\r
-            }\r
-\r
-            context.Path.Pop();\r
-        }\r
-\r
-        private static void VisitException(Exception exception, VisitContext context)\r
-        {\r
-            CompositionException composition = exception as CompositionException;\r
-            if (composition != null)\r
-            {\r
-                VisitCompositionException(composition, context);\r
-            }\r
-            else\r
-            {\r
-                VisitError(new CompositionError(exception.Message, exception.InnerException), context);\r
-            }\r
-        }\r
-\r
-        private struct VisitContext\r
-        {\r
-            public Stack<CompositionError> Path;\r
-            public Action<Stack<CompositionError>> LeafVisitor;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionResult.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionResult.cs
deleted file mode 100644 (file)
index 3cdda71..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Linq;\r
-using Microsoft.Internal.Collections;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal struct CompositionResult\r
-    {\r
-        public static readonly CompositionResult SucceededResult = new CompositionResult();\r
-        private readonly IEnumerable<CompositionError> _errors;\r
-\r
-        public CompositionResult(params CompositionError[] errors)\r
-            : this((IEnumerable<CompositionError>)errors)\r
-        {            \r
-        }\r
-\r
-        public CompositionResult(IEnumerable<CompositionError> errors)\r
-        {\r
-            this._errors = errors;\r
-        }\r
-\r
-        public bool Succeeded\r
-        {\r
-            get { return this._errors == null || !this._errors.FastAny(); }\r
-        }\r
-\r
-        public IEnumerable<CompositionError> Errors\r
-        {\r
-            get { return this._errors ?? Enumerable.Empty<CompositionError>(); }\r
-        }\r
-\r
-        public CompositionResult MergeResult(CompositionResult result)\r
-        {\r
-            if (this.Succeeded)\r
-            {\r
-                return result;\r
-            }\r
-            if (result.Succeeded)\r
-            {\r
-                return this;\r
-            }\r
-            return MergeErrors(result._errors);\r
-        }\r
-\r
-        public CompositionResult MergeError(CompositionError error)\r
-        {\r
-            return MergeErrors(new CompositionError[] { error });\r
-        }\r
-\r
-        public CompositionResult MergeErrors(IEnumerable<CompositionError> errors)\r
-        {\r
-            return new CompositionResult(this._errors.ConcatAllowingNull(errors));\r
-        }\r
-\r
-        public CompositionResult<T> ToResult<T>(T value)\r
-        {\r
-            return new CompositionResult<T>(value, this._errors); \r
-        }\r
-\r
-        public void ThrowOnErrors()\r
-        {\r
-            ThrowOnErrors(null);\r
-        }\r
-\r
-        public void ThrowOnErrors(AtomicComposition atomicComposition)\r
-        {\r
-            if (!this.Succeeded)\r
-            {\r
-                if (atomicComposition == null)\r
-                {\r
-                    throw new CompositionException(this._errors);\r
-                }\r
-                else\r
-                {\r
-                    throw new ChangeRejectedException(this._errors);\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionResultOfT.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CompositionResultOfT.cs
deleted file mode 100644 (file)
index a891a84..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Linq;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal struct CompositionResult<T>\r
-    {\r
-        private readonly IEnumerable<CompositionError> _errors;\r
-        private readonly T _value;\r
-        \r
-        public CompositionResult(T value)\r
-            : this(value, (CompositionError[])null)\r
-        {\r
-        }\r
-\r
-        public CompositionResult(params CompositionError[] errors)\r
-            : this(default(T), (IEnumerable<CompositionError>)errors)\r
-        {\r
-        }\r
-\r
-        public CompositionResult(IEnumerable<CompositionError> errors)\r
-            : this(default(T), errors)\r
-        {\r
-        }\r
-\r
-        internal CompositionResult(T value, IEnumerable<CompositionError> errors)\r
-        {\r
-            this._errors = errors;\r
-            this._value = value;\r
-        }\r
-\r
-        public bool Succeeded\r
-        {\r
-            get { return this._errors == null || !this._errors.FastAny(); }\r
-        }\r
-\r
-        public IEnumerable<CompositionError> Errors\r
-        {\r
-            get { return this._errors ?? Enumerable.Empty<CompositionError>(); }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the value from the result, throwing a CompositionException if there are any errors.\r
-        /// </summary>\r
-        public T Value\r
-        {\r
-            get \r
-            {\r
-                ThrowOnErrors();\r
-\r
-                return this._value; \r
-            }\r
-        }\r
-\r
-        internal CompositionResult<TValue> ToResult<TValue>()\r
-        {\r
-            return new CompositionResult<TValue>(this._errors);\r
-        }\r
-\r
-        internal CompositionResult ToResult()\r
-        {\r
-            return new CompositionResult(this._errors);\r
-        }\r
-\r
-        private void ThrowOnErrors()\r
-        {\r
-            if (!this.Succeeded)\r
-            {\r
-                throw new CompositionException(this._errors);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ConstraintServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ConstraintServices.cs
deleted file mode 100644 (file)
index 9f321e8..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class ConstraintServices\r
-    {\r
-        // NOTE : these are here as Reflection member search is pretty expensive, and we want that to be done once.\r
-        // Also, making these static would cause this class to fail loading if we rename members of ExportDefinition.\r
-        private static readonly PropertyInfo _exportDefinitionContractNameProperty = typeof(ExportDefinition).GetProperty("ContractName");\r
-        private static readonly PropertyInfo _exportDefinitionMetadataProperty = typeof(ExportDefinition).GetProperty("Metadata");\r
-        private static readonly MethodInfo _metadataContainsKeyMethod = typeof(IDictionary<string, object>).GetMethod("ContainsKey");\r
-        private static readonly MethodInfo _metadataItemMethod = typeof(IDictionary<string, object>).GetMethod("get_Item");\r
-        private static readonly MethodInfo _metadataEqualsMethod = typeof(object).GetMethod("Equals", new Type[] { typeof(object) });\r
-        private static readonly MethodInfo _typeIsInstanceOfTypeMethod = typeof(Type).GetMethod("IsInstanceOfType");\r
-\r
-        public static Expression<Func<ExportDefinition, bool>> CreateConstraint(IEnumerable<KeyValuePair<string, Type>> requiredMetadata)\r
-        {\r
-            ParameterExpression parameter = Expression.Parameter(typeof(ExportDefinition), "exportDefinition");\r
-            Expression metadataConstraintBody = null;\r
-\r
-            if (requiredMetadata != null)\r
-            {\r
-                metadataConstraintBody = ConstraintServices.CreateMetadataConstraintBody(requiredMetadata, parameter);\r
-            }\r
-\r
-            if (metadataConstraintBody != null)\r
-            {\r
-                return Expression.Lambda<Func<ExportDefinition, bool>>(metadataConstraintBody, parameter);\r
-            }\r
-            \r
-            return null;\r
-        }\r
-\r
-        public static Expression<Func<ExportDefinition, bool>> CreateConstraint(string contractName, string requiredTypeIdentity, IEnumerable<KeyValuePair<string, Type>> requiredMetadata, CreationPolicy requiredCreationPolicy)\r
-        {\r
-            ParameterExpression parameter = Expression.Parameter(typeof(ExportDefinition), "exportDefinition");\r
-\r
-            Expression constraintBody = ConstraintServices.CreateContractConstraintBody(contractName, parameter);\r
-\r
-            if (!string.IsNullOrEmpty(requiredTypeIdentity))\r
-            {\r
-                Expression typeIdentityConstraintBody = ConstraintServices.CreateTypeIdentityContraint(requiredTypeIdentity, parameter);\r
-\r
-                constraintBody = Expression.AndAlso(constraintBody, typeIdentityConstraintBody);\r
-            }\r
-\r
-            if (requiredMetadata != null)\r
-            {\r
-                Expression metadataConstraintBody = ConstraintServices.CreateMetadataConstraintBody(requiredMetadata, parameter);\r
-                if (metadataConstraintBody != null)\r
-                {\r
-                    constraintBody = Expression.AndAlso(constraintBody, metadataConstraintBody);\r
-                }\r
-            }\r
-\r
-            if (requiredCreationPolicy != CreationPolicy.Any)\r
-            {\r
-                Expression policyConstraintBody = ConstraintServices.CreateCreationPolicyContraint(requiredCreationPolicy, parameter);\r
-\r
-                constraintBody = Expression.AndAlso(constraintBody, policyConstraintBody);\r
-            }\r
-\r
-            Expression<Func<ExportDefinition, bool>> constraint = Expression.Lambda<Func<ExportDefinition, bool>>(constraintBody, parameter);\r
-            return constraint;\r
-        }\r
-\r
-        private static Expression CreateContractConstraintBody(string contractName, ParameterExpression parameter)\r
-        {\r
-            Assumes.NotNull(parameter);\r
-\r
-            // export.ContractName=<contract>;\r
-            return Expression.Equal(\r
-                    Expression.Property(parameter, ConstraintServices._exportDefinitionContractNameProperty),\r
-                    Expression.Constant(contractName ?? string.Empty, typeof(string)));\r
-        }\r
-\r
-        private static Expression CreateMetadataConstraintBody(IEnumerable<KeyValuePair<string, Type>> requiredMetadata, ParameterExpression parameter)\r
-        {\r
-            Assumes.NotNull(requiredMetadata);\r
-            Assumes.NotNull(parameter);\r
-\r
-            Expression body = null;\r
-            foreach (KeyValuePair<string, Type> requiredMetadataItem in requiredMetadata)\r
-            {\r
-                // export.Metadata.ContainsKey(<metadataItem>)\r
-                Expression metadataItemExpression = CreateMetadataContainsKeyExpression(parameter, requiredMetadataItem.Key);\r
-\r
-                body = (body != null) ? Expression.AndAlso(body, metadataItemExpression) : metadataItemExpression;\r
-                body = Expression.AndAlso(body, CreateMetadataOfTypeExpression(parameter, requiredMetadataItem.Key, requiredMetadataItem.Value));\r
-            }\r
-\r
-            return body;\r
-        }\r
-\r
-        private static Expression CreateCreationPolicyContraint(CreationPolicy policy, ParameterExpression parameter)\r
-        {\r
-            Assumes.IsTrue(policy != CreationPolicy.Any);\r
-            Assumes.NotNull(parameter);\r
-\r
-            //    !definition.Metadata.ContainsKey(CompositionConstants.PartCreationPolicyMetadataName) ||\r
-            //        CreationPolicy.Any.Equals(definition.Metadata[CompositionConstants.PartCreationPolicyMetadataName]) ||\r
-            //        policy.Equals(definition.Metadata[CompositionConstants.PartCreationPolicyMetadataName]);\r
-\r
-            return  Expression.MakeBinary(ExpressionType.OrElse,\r
-                        Expression.MakeBinary(ExpressionType.OrElse,\r
-                            Expression.Not(CreateMetadataContainsKeyExpression(parameter, CompositionConstants.PartCreationPolicyMetadataName)),\r
-                            CreateMetadataValueEqualsExpression(parameter, CreationPolicy.Any, CompositionConstants.PartCreationPolicyMetadataName)),\r
-                        CreateMetadataValueEqualsExpression(parameter, policy, CompositionConstants.PartCreationPolicyMetadataName));\r
-        }\r
-\r
-        private static Expression CreateTypeIdentityContraint(string requiredTypeIdentity, ParameterExpression parameter)\r
-        {\r
-            Assumes.NotNull(requiredTypeIdentity);\r
-            Assumes.NotNull(parameter);\r
-\r
-            //    definition.Metadata.ContainsKey(CompositionServices.ExportTypeIdentity) &&\r
-            //        requiredTypeIdentity.Equals(definition.Metadata[CompositionConstants.ExportTypeIdentityMetadataName]);\r
-\r
-            return  Expression.MakeBinary(ExpressionType.AndAlso,\r
-                        CreateMetadataContainsKeyExpression(parameter, CompositionConstants.ExportTypeIdentityMetadataName),\r
-                        CreateMetadataValueEqualsExpression(parameter, requiredTypeIdentity, CompositionConstants.ExportTypeIdentityMetadataName));\r
-        }\r
-\r
-        private static Expression CreateMetadataContainsKeyExpression(ParameterExpression parameter, string constantKey)\r
-        {\r
-            Assumes.NotNull(parameter, constantKey);\r
-\r
-            // definition.Metadata.ContainsKey(constantKey)\r
-            return  Expression.Call(\r
-                        Expression.Property(parameter, ConstraintServices._exportDefinitionMetadataProperty),\r
-                        ConstraintServices._metadataContainsKeyMethod,\r
-                        Expression.Constant(constantKey));\r
-        }\r
-\r
-        private static Expression CreateMetadataOfTypeExpression(ParameterExpression parameter, string constantKey, Type constantType)\r
-        {\r
-            Assumes.NotNull(parameter, constantKey);\r
-            Assumes.NotNull(parameter, constantType);\r
-\r
-            // constantType.IsInstanceOfType(definition.Metadata[constantKey])\r
-            return Expression.Call(\r
-                            Expression.Constant(constantType, typeof(Type)),\r
-                            ConstraintServices._typeIsInstanceOfTypeMethod,\r
-                            Expression.Call(\r
-                                Expression.Property(parameter, ConstraintServices._exportDefinitionMetadataProperty),\r
-                                ConstraintServices._metadataItemMethod,\r
-                                Expression.Constant(constantKey))\r
-                            );\r
-        }\r
-\r
-        private static Expression CreateMetadataValueEqualsExpression(ParameterExpression parameter, object constantValue, string metadataName)\r
-        {\r
-            Assumes.NotNull(parameter, constantValue);\r
-\r
-            // constantValue.Equals(definition.Metadata[CompositionServices.PartCreationPolicyMetadataName])\r
-            return  Expression.Call(\r
-                        Expression.Constant(constantValue),\r
-                        ConstraintServices._metadataEqualsMethod,\r
-                        Expression.Call(\r
-                            Expression.Property(parameter, ConstraintServices._exportDefinitionMetadataProperty),\r
-                            ConstraintServices._metadataItemMethod,\r
-                            Expression.Constant(metadataName)));\r
-        }\r
-\r
-        public static Expression<Func<ExportDefinition, bool>> CreatePartCreatorConstraint(Expression<Func<ExportDefinition, bool>> baseConstraint, ImportDefinition productImportDefinition)\r
-        {\r
-            ParameterExpression exportDefinitionParameter = baseConstraint.Parameters[0];\r
-\r
-            // exportDefinition.Metadata\r
-            Expression metadataExpression = Expression.Property(exportDefinitionParameter, ConstraintServices._exportDefinitionMetadataProperty);\r
-\r
-            // exportDefinition.Metadata.ContainsKey("ProductDefinition")\r
-            Expression containsProductExpression = Expression.Call(\r
-                metadataExpression,\r
-                ConstraintServices._metadataContainsKeyMethod,\r
-                Expression.Constant(CompositionConstants.ProductDefinitionMetadataName));\r
-\r
-            // exportDefinition.Metadata["ProductDefinition"]\r
-            Expression productExportDefinitionExpression = Expression.Call(\r
-                    metadataExpression,\r
-                    ConstraintServices._metadataItemMethod,\r
-                    Expression.Constant(CompositionConstants.ProductDefinitionMetadataName));\r
-\r
-            // ProductImportDefinition.Contraint((ExportDefinition)exportDefinition.Metadata["ProductDefinition"])\r
-            Expression productMatchExpression =\r
-                Expression.Invoke(productImportDefinition.Constraint,\r
-                    Expression.Convert(productExportDefinitionExpression, typeof(ExportDefinition)));\r
-\r
-            // baseContraint(exportDefinition) &&\r
-            // exportDefinition.Metadata.ContainsKey("ProductDefinition") &&\r
-            // ProductImportDefinition.Contraint((ExportDefinition)exportDefinition.Metadata["ProductDefinition"])\r
-            Expression<Func<ExportDefinition, bool>> constraint =\r
-                 Expression.Lambda<Func<ExportDefinition, bool>>(\r
-                    Expression.AndAlso(\r
-                        baseConstraint.Body,\r
-                        Expression.AndAlso(\r
-                           containsProductExpression,\r
-                           productMatchExpression)),\r
-                    exportDefinitionParameter);\r
-\r
-            return constraint;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ContractNameServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ContractNameServices.cs
deleted file mode 100644 (file)
index 4285722..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using System.Text;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class ContractNameServices\r
-    {\r
-        const char NamespaceSeparator = '.';\r
-        const char ArrayOpeningBracket = '[';\r
-        const char ArrayClosingBracket = ']';\r
-        const char ArraySeparator = ',';\r
-        const char PointerSymbol = '*';\r
-        const char ReferenceSymbol = '&';\r
-        const char GenericArityBackQuote = '`';\r
-        const char NestedClassSeparator = '+';\r
-        const char ContractNameGenericOpeningBracket = '(';\r
-        const char ContractNameGenericClosingBracket = ')';\r
-        const char ContractNameGenericArgumentSeparator = ',';\r
-        const char CustomModifiersSeparator = ' ';\r
-\r
-        [ThreadStatic]\r
-        private static Dictionary<Type, string> typeIdentityCache;\r
-\r
-        private static Dictionary<Type, string> TypeIdentityCache\r
-        {\r
-            get\r
-            {\r
-                return typeIdentityCache = typeIdentityCache ?? new Dictionary<Type, string>();\r
-            }\r
-        }\r
-\r
-        internal static string GetTypeIdentity(Type type)\r
-        {\r
-            Assumes.NotNull(type);\r
-            string typeIdentity = null;\r
-\r
-            if (!TypeIdentityCache.TryGetValue(type, out typeIdentity))\r
-            {\r
-                if (!type.IsAbstract && type.IsSubclassOf(typeof(Delegate)))\r
-                {\r
-                    MethodInfo method = type.GetMethod("Invoke");\r
-                    typeIdentity = ContractNameServices.GetTypeIdentityFromMethod(method);\r
-                }\r
-                else\r
-                {\r
-                    StringBuilder typeIdentityStringBuilder = new StringBuilder();\r
-                    WriteTypeWithNamespace(typeIdentityStringBuilder, type);\r
-                    typeIdentity = typeIdentityStringBuilder.ToString();\r
-                }\r
-\r
-                TypeIdentityCache.Add(type, typeIdentity);\r
-            }\r
-\r
-            return typeIdentity;\r
-        }\r
-\r
-        internal static string GetTypeIdentityFromMethod(MethodInfo method)\r
-        {\r
-            StringBuilder methodNameStringBuilder = new StringBuilder();\r
-\r
-            WriteTypeWithNamespace(methodNameStringBuilder, method.ReturnType);\r
-\r
-            methodNameStringBuilder.Append("(");\r
-\r
-            ParameterInfo[] parameters = method.GetParameters();\r
-\r
-            for (int i = 0; i < parameters.Length; i++)\r
-            {\r
-                if (i != 0)\r
-                {\r
-                    methodNameStringBuilder.Append(",");\r
-                }\r
-\r
-                WriteTypeWithNamespace(methodNameStringBuilder, parameters[i].ParameterType);\r
-            }\r
-            methodNameStringBuilder.Append(")");\r
-\r
-            return methodNameStringBuilder.ToString();\r
-        }\r
-       \r
-        private static void WriteTypeWithNamespace(StringBuilder typeName, Type type)\r
-        {\r
-            // Writes type with namesapce\r
-            if (!string.IsNullOrEmpty(type.Namespace))\r
-            {\r
-                typeName.Append(type.Namespace);\r
-                typeName.Append(NamespaceSeparator);\r
-            }\r
-            WriteType(typeName, type);\r
-        }\r
-\r
-        private static void WriteType(StringBuilder typeName, Type type)\r
-        {\r
-            // Writes type name\r
-            if (type.IsGenericType)\r
-            {\r
-                //\r
-                // Reflection format stores all the generic arguments (including the ones for parent types) on the leaf type.\r
-                // These arguments are placed in a queue and are written out based on generic arity (`X) of each type\r
-                //\r
-                Queue<Type> genericTypeArguments = new Queue<Type>(type.GetGenericArguments());\r
-                WriteGenericType(typeName, type, type.IsGenericTypeDefinition, genericTypeArguments);\r
-                Assumes.IsTrue(genericTypeArguments.Count == 0, "Expecting genericTypeArguments queue to be empty.");\r
-            }\r
-            else\r
-            {\r
-                WriteNonGenericType(typeName, type);\r
-            }\r
-        }\r
-\r
-        private static void WriteNonGenericType(StringBuilder typeName, Type type)\r
-        {\r
-            //\r
-            // Writes non-generic type\r
-            //\r
-            if (type.DeclaringType != null)\r
-            {\r
-                WriteType(typeName, type.DeclaringType);\r
-                typeName.Append(NestedClassSeparator);\r
-            }\r
-            if (type.IsArray)\r
-            {\r
-                WriteArrayType(typeName, type);\r
-            }\r
-            else if (type.IsPointer)\r
-            {\r
-                WritePointerType(typeName, type);\r
-            }\r
-            else if (type.IsByRef)\r
-            {\r
-                WriteByRefType(typeName, type);\r
-            }\r
-            else\r
-            {\r
-                typeName.Append(type.Name);\r
-            }\r
-        }\r
-\r
-        private static void WriteArrayType(StringBuilder typeName, Type type)\r
-        {\r
-            //\r
-            // Writes array type  e.g <TypeName>[]\r
-            // Note that jagged arrays are stored in reverse order\r
-            // e.g. C#: Int32[][,]  Reflection: Int32[,][]\r
-            // we are following C# order for arrays\r
-            //\r
-            Type rootElementType = FindArrayElementType(type);\r
-            WriteType(typeName, rootElementType);\r
-            Type elementType = type;\r
-            do\r
-            {\r
-                WriteArrayTypeDimensions(typeName, elementType);\r
-            }\r
-            while ((elementType = elementType.GetElementType()) != null && elementType.IsArray);\r
-        }\r
-\r
-        private static void WritePointerType(StringBuilder typeName, Type type)\r
-        {\r
-            //\r
-            // Writes pointer type  e.g <TypeName>*\r
-            //\r
-            WriteType(typeName, type.GetElementType());\r
-            typeName.Append(PointerSymbol);\r
-        }\r
-\r
-        private static void WriteByRefType(StringBuilder typeName, Type type)\r
-        {\r
-            //\r
-            // Writes by ref type e.g <TypeName>&\r
-            //\r
-            WriteType(typeName, type.GetElementType());\r
-            typeName.Append(ReferenceSymbol);\r
-        }\r
-\r
-        private static void WriteArrayTypeDimensions(StringBuilder typeName, Type type)\r
-        {\r
-            //\r
-            // Writes array type dimensions e.g. [,,]\r
-            //\r
-            typeName.Append(ArrayOpeningBracket);\r
-            int rank = type.GetArrayRank();\r
-            for (int i = 1; i < rank; i++)\r
-            {\r
-                typeName.Append(ArraySeparator);\r
-            }\r
-            typeName.Append(ArrayClosingBracket);\r
-        }\r
-\r
-        private static void WriteGenericType(StringBuilder typeName, Type type, bool isDefinition, Queue<Type> genericTypeArguments)\r
-        {\r
-            //\r
-            // Writes generic type including parent generic types\r
-            // genericTypeArguments contains type arguments obtained from the most nested type\r
-            // isDefinition parameter indicates if we are dealing with generic type definition\r
-            //\r
-            if (type.DeclaringType != null)\r
-            {\r
-                if (type.DeclaringType.IsGenericType)\r
-                {\r
-                    WriteGenericType(typeName, type.DeclaringType, isDefinition, genericTypeArguments);\r
-                }\r
-                else\r
-                {\r
-                    WriteNonGenericType(typeName, type.DeclaringType);\r
-                }\r
-                typeName.Append(NestedClassSeparator);\r
-            }\r
-            WriteGenericTypeName(typeName, type, isDefinition, genericTypeArguments);\r
-        }\r
-\r
-        private static void WriteGenericTypeName(StringBuilder typeName, Type type, bool isDefinition, Queue<Type> genericTypeArguments)\r
-        {\r
-            //\r
-            // Writes generic type name, e.g. generic name and generic arguments\r
-            //\r
-            Assumes.IsTrue(type.IsGenericType, "Expecting type to be a generic type");\r
-            int genericArity = GetGenericArity(type);\r
-            string genericTypeName = FindGenericTypeName(type.GetGenericTypeDefinition().Name);\r
-            typeName.Append(genericTypeName);\r
-            WriteTypeArgumentsString(typeName, genericArity, isDefinition, genericTypeArguments);\r
-        }\r
-\r
-        private static void WriteTypeArgumentsString(StringBuilder typeName, int argumentsCount, bool isDefinition, Queue<Type> genericTypeArguments)\r
-        {\r
-            //\r
-            // Writes type arguments in brackets, e.g. (<contract_name1>, <contract_name2>, ...)\r
-            //\r
-            if (argumentsCount == 0)\r
-            {\r
-                return;\r
-            }\r
-            typeName.Append(ContractNameGenericOpeningBracket);\r
-            for (int i = 0; i < argumentsCount; i++)\r
-            {\r
-                Assumes.IsTrue(genericTypeArguments.Count > 0, "Expecting genericTypeArguments to contain at least one Type");\r
-                Type genericTypeArgument = genericTypeArguments.Dequeue();\r
-                if (!isDefinition)\r
-                {\r
-                    WriteTypeWithNamespace(typeName, genericTypeArgument);\r
-                }\r
-                typeName.Append(ContractNameGenericArgumentSeparator);\r
-            }\r
-            typeName.Remove(typeName.Length - 1, 1);\r
-            typeName.Append(ContractNameGenericClosingBracket);\r
-        }\r
-\r
-        //internal for testability\r
-        internal static void WriteCustomModifiers(StringBuilder typeName, string customKeyword, Type[] types)\r
-        {\r
-            //\r
-            // Writes custom modifiers in the format: customKeyword(<contract_name>,<contract_name>,...)\r
-            //\r
-            typeName.Append(CustomModifiersSeparator);\r
-            typeName.Append(customKeyword);\r
-            Queue<Type> typeArguments = new Queue<Type>(types);\r
-            WriteTypeArgumentsString(typeName, types.Length, false, typeArguments);\r
-            Assumes.IsTrue(typeArguments.Count == 0, "Expecting genericTypeArguments queue to be empty.");\r
-        }\r
-\r
-        private static Type FindArrayElementType(Type type)\r
-        {\r
-            //\r
-            // Gets array element type by calling GetElementType() until the element is not an array\r
-            //\r
-            Type elementType = type;\r
-            while ((elementType = elementType.GetElementType()) != null && elementType.IsArray) { }\r
-            return elementType;\r
-        }\r
-\r
-        private static string FindGenericTypeName(string genericName)\r
-        {\r
-            //\r
-            // Gets generic type name omitting the backquote and arity indicator\r
-            // List`1 -> List\r
-            // Arity indicator is returned as output parameter\r
-            //\r
-            int indexOfBackQuote = genericName.IndexOf(GenericArityBackQuote);\r
-            if (indexOfBackQuote > -1)\r
-            {\r
-                genericName = genericName.Substring(0, indexOfBackQuote);\r
-            }\r
-            return genericName;\r
-        }\r
-\r
-        private static int GetGenericArity(Type type)\r
-        {\r
-            if (type.DeclaringType == null)\r
-            {\r
-                return type.GetGenericArguments().Length;\r
-            }\r
-\r
-            // The generic arity is equal to the difference in the number of generic arguments\r
-            // from the type and the declaring type.\r
-\r
-            int delclaringTypeGenericArguments = type.DeclaringType.GetGenericArguments().Length;\r
-            int typeGenericArguments = type.GetGenericArguments().Length;\r
-\r
-            Assumes.IsTrue(typeGenericArguments >= delclaringTypeGenericArguments);\r
-\r
-            return typeGenericArguments - delclaringTypeGenericArguments;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CreationPolicy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/CreationPolicy.cs
deleted file mode 100644 (file)
index 5a8d4cb..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    /// Option placed on a type that controls when the <see cref="CompositionContainer"/> creates \r
-    /// a new instance of a <see cref="ComposablePart"/>.\r
-    /// </summary>\r
-    public enum CreationPolicy : int\r
-    {\r
-        /// <summary>\r
-        /// Let the <see cref="CompositionContainer"/> choose the most appropriate <see cref="CreationPolicy"/>\r
-        /// for the part given the current context. This is the default <see cref="CreationPolicy"/>, with\r
-        /// the <see cref="CompositionContainer"/> choosing <see cref="CreationPolicy.Shared"/> by default\r
-        /// unless the <see cref="ComposablePart"/> or importer requests <see cref="CreationPolicy.NonShared"/>.\r
-        /// </summary>\r
-        Any = 0,\r
-\r
-        /// <summary>\r
-        /// A single shared instance of the associated <see cref="ComposablePart"/> will be created\r
-        /// by the <see cref="CompositionContainer"/> and shared by all requestors.\r
-        /// </summary>\r
-        Shared = 1,\r
-\r
-        /// <summary>\r
-        /// A new non-shared instance of the associated <see cref="ComposablePart"/> will be created\r
-        /// by the <see cref="CompositionContainer"/> for every requestor.\r
-        /// </summary>\r
-        NonShared = 2,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/.gitattributes
deleted file mode 100644 (file)
index 8ab95b7..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-/CompositionTrace.cs -crlf
-/CompositionTraceId.cs -crlf
-/CompositionTraceSource.cs -crlf
-/SilverlightTraceWriter.cs -crlf
-/TraceSourceTraceWriter.cs -crlf
-/TraceWriter.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTrace.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTrace.cs
deleted file mode 100644 (file)
index ed0cb4b..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    internal static class CompositionTrace\r
-    {\r
-        internal static void PartDefinitionResurrected(ComposablePartDefinition definition)\r
-        {\r
-            Assumes.NotNull(definition);\r
-\r
-            if (CompositionTraceSource.CanWriteInformation)\r
-            {\r
-                CompositionTraceSource.WriteInformation(CompositionTraceId.Rejection_DefinitionResurrected, \r
-                                                        Strings.CompositionTrace_Rejection_DefinitionResurrected, \r
-                                                        definition.GetDisplayName());\r
-            }\r
-        }\r
-\r
-        internal static void PartDefinitionRejected(ComposablePartDefinition definition, ChangeRejectedException exception)\r
-        {\r
-            Assumes.NotNull(definition, exception);\r
-\r
-            if (CompositionTraceSource.CanWriteWarning)\r
-            {\r
-                CompositionTraceSource.WriteWarning(CompositionTraceId.Rejection_DefinitionRejected, \r
-                                                    Strings.CompositionTrace_Rejection_DefinitionRejected, \r
-                                                    definition.GetDisplayName(), \r
-                                                    exception.Message);\r
-            }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        internal static void AssemblyLoadFailed(DirectoryCatalog catalog, string fileName, Exception exception)\r
-        {\r
-            Assumes.NotNull(catalog, exception);\r
-            Assumes.NotNullOrEmpty(fileName);            \r
-\r
-            if (CompositionTraceSource.CanWriteWarning)\r
-            {\r
-                CompositionTraceSource.WriteWarning(CompositionTraceId.Discovery_AssemblyLoadFailed, \r
-                                                    Strings.CompositionTrace_Discovery_AssemblyLoadFailed, \r
-                                                    catalog.GetDisplayName(),\r
-                                                    fileName, \r
-                                                    exception.Message);\r
-            }\r
-        }\r
-\r
-#endif\r
-\r
-        internal static void DefinitionMarkedWithPartNotDiscoverableAttribute(Type type)\r
-        {\r
-            Assumes.NotNull(type);\r
-\r
-            if (CompositionTraceSource.CanWriteInformation)\r
-            {\r
-                CompositionTraceSource.WriteInformation(CompositionTraceId.Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute, \r
-                                                        Strings.CompositionTrace_Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute, \r
-                                                        type.GetDisplayName());\r
-            }\r
-        }\r
-\r
-        internal static void DefinitionContainsGenericsParameters(Type type)\r
-        {\r
-            Assumes.NotNull(type);\r
-\r
-            if (CompositionTraceSource.CanWriteInformation)\r
-            {\r
-                CompositionTraceSource.WriteInformation(CompositionTraceId.Discovery_DefinitionContainsGenericParameters,\r
-                                                        Strings.CompositionTrace_Discovery_DefinitionContainsGenericParameters,\r
-                                                        type.GetDisplayName());\r
-            }\r
-        }\r
-\r
-        internal static void DefinitionContainsNoExports(Type type)\r
-        {\r
-            Assumes.NotNull(type);\r
-\r
-            if (CompositionTraceSource.CanWriteInformation)\r
-            {\r
-                CompositionTraceSource.WriteInformation(CompositionTraceId.Discovery_DefinitionContainsNoExports,\r
-                                                        Strings.CompositionTrace_Discovery_DefinitionContainsNoExports,\r
-                                                        type.GetDisplayName());\r
-            }\r
-        }\r
-\r
-        internal static void MemberMarkedWithMultipleImportAndImportMany(ReflectionItem item)\r
-        {\r
-            Assumes.NotNull(item);\r
-\r
-            if (CompositionTraceSource.CanWriteError)\r
-            {\r
-                CompositionTraceSource.WriteError(CompositionTraceId.Discovery_MemberMarkedWithMultipleImportAndImportMany,\r
-                                                  Strings.CompositionTrace_Discovery_MemberMarkedWithMultipleImportAndImportMany,\r
-                                                  item.GetDisplayName());\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceId.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceId.cs
deleted file mode 100644 (file)
index 2fa8bcf..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    // NOTE: Do not change the trace ids of values that have already shipped, \r
-    // these leak out to TraceListerners which could take a dependency on them.\r
-    // This enum is a ushort deliberately, the maximum value of a trace id is 65535.\r
-    internal enum CompositionTraceId : ushort\r
-    {\r
-        // Rejection\r
-\r
-        Rejection_DefinitionRejected = 1,\r
-        Rejection_DefinitionResurrected = 2,\r
-\r
-        Discovery_AssemblyLoadFailed = 3,\r
-        Discovery_DefinitionMarkedWithPartNotDiscoverableAttribute = 4,\r
-        Discovery_DefinitionContainsGenericParameters = 5,\r
-        Discovery_DefinitionContainsNoExports = 6,\r
-        Discovery_MemberMarkedWithMultipleImportAndImportMany = 7,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceSource.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/CompositionTraceSource.cs
deleted file mode 100644 (file)
index bf5ba23..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    internal static class CompositionTraceSource\r
-    {\r
-#if SILVERLIGHT\r
-        private static readonly SilverlightTraceWriter Source = new SilverlightTraceWriter();\r
-#else\r
-        private static readonly TraceSourceTraceWriter Source = new TraceSourceTraceWriter();\r
-#endif\r
-\r
-        public static bool CanWriteInformation\r
-        {\r
-            get { return Source.CanWriteInformation; }\r
-        }\r
-\r
-        public static bool CanWriteWarning\r
-        {\r
-            get { return Source.CanWriteWarning; }\r
-        }\r
-\r
-        public static bool CanWriteError\r
-        {\r
-            get { return Source.CanWriteError; }\r
-        }\r
-\r
-        public static void WriteInformation(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            EnsureEnabled(CanWriteInformation);\r
-\r
-            Source.WriteInformation(traceId, format, arguments);\r
-        }\r
-\r
-        public static void WriteWarning(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            EnsureEnabled(CanWriteWarning);\r
-\r
-            Source.WriteWarning(traceId, format, arguments);\r
-        }\r
-\r
-        public static void WriteError(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            EnsureEnabled(CanWriteError);\r
-\r
-            Source.WriteError(traceId, format, arguments);\r
-        }\r
-\r
-        private static void EnsureEnabled(bool condition)\r
-        {\r
-            Assumes.IsTrue(condition, "To avoid unnecessary work when a trace level has not been enabled, check CanWriteXXX before calling this method.");\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/SilverlightTraceWriter.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/SilverlightTraceWriter.cs
deleted file mode 100644 (file)
index 11bfabd..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if SILVERLIGHT\r
-\r
-using System;\r
-using System.Diagnostics;\r
-using System.Globalization;\r
-using System.Text;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    internal sealed class SilverlightTraceWriter : TraceWriter\r
-    {\r
-        private static readonly string SourceName = "System.ComponentModel.Composition";\r
-\r
-        public override bool CanWriteInformation\r
-        {\r
-            get { return false; }\r
-        }\r
-\r
-        public override bool CanWriteWarning\r
-        {\r
-            get { return Debugger.IsLogging(); }\r
-        }\r
-\r
-        public override bool CanWriteError\r
-        {\r
-            get { return Debugger.IsLogging(); }\r
-        }\r
-\r
-        public override void WriteInformation(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            WriteEvent(TraceEventType.Information, traceId, format, arguments);\r
-        }\r
-\r
-        public override void WriteWarning(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            WriteEvent(TraceEventType.Warning, traceId, format, arguments);\r
-        }\r
-\r
-        public override void WriteError(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            WriteEvent(TraceEventType.Error, traceId, format, arguments);\r
-        }\r
-\r
-        private static void WriteEvent(TraceEventType eventType, CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            if (!Debugger.IsLogging())\r
-            {\r
-                return;\r
-            }\r
-\r
-            string logMessage = CreateLogMessage(eventType, traceId, format, arguments);\r
-            Debugger.Log(0, null, logMessage);\r
-        }\r
-\r
-        internal static string CreateLogMessage(TraceEventType eventType, CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            StringBuilder messageBuilder = new StringBuilder();\r
-\r
-            // Format taken from TraceListener.TraceEvent in full framework\r
-            messageBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0} {1}: {2} : ", \r
-                SourceName, eventType.ToString(), (int)traceId);\r
-\r
-            if (arguments == null)\r
-            {\r
-                messageBuilder.Append(format);\r
-            }\r
-            else\r
-            {\r
-                messageBuilder.AppendFormat(CultureInfo.InvariantCulture, format, arguments);\r
-            }\r
-\r
-            messageBuilder.AppendLine();\r
-\r
-            return messageBuilder.ToString();\r
-        }\r
-\r
-        // Copied from TraceEventType in full framework\r
-        internal enum TraceEventType\r
-        {\r
-            Error = 2,\r
-            Warning = 4,\r
-            Information = 8,\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceSourceTraceWriter.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceSourceTraceWriter.cs
deleted file mode 100644 (file)
index b9ada43..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Diagnostics;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    // Represents a trace writer that writes to a System.Diagnostics TraceSource\r
-    internal sealed class TraceSourceTraceWriter : TraceWriter\r
-    {\r
-        internal static readonly TraceSource Source = new TraceSource("System.ComponentModel.Composition", SourceLevels.Warning);\r
-\r
-        public override bool CanWriteInformation\r
-        {\r
-            get { return Source.Switch.ShouldTrace(TraceEventType.Information); }\r
-        }\r
-\r
-        public override bool CanWriteWarning\r
-        {\r
-            get { return Source.Switch.ShouldTrace(TraceEventType.Warning); }\r
-        }\r
-\r
-        public override bool CanWriteError\r
-        {\r
-            get { return Source.Switch.ShouldTrace(TraceEventType.Error); }\r
-        }\r
-\r
-        public override void WriteInformation(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            WriteEvent(TraceEventType.Information, traceId, format, arguments);\r
-        }\r
-\r
-        public override void WriteWarning(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            WriteEvent(TraceEventType.Warning, traceId, format, arguments);\r
-        }\r
-\r
-        public override void WriteError(CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            WriteEvent(TraceEventType.Error, traceId, format, arguments);\r
-        }\r
-\r
-        private static void WriteEvent(TraceEventType eventType, CompositionTraceId traceId, string format, params object[] arguments)\r
-        {\r
-            Source.TraceEvent(eventType, (int)traceId, format, arguments);\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceWriter.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Diagnostics/TraceWriter.cs
deleted file mode 100644 (file)
index da3415f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Diagnostics\r
-{\r
-    internal abstract class TraceWriter\r
-    {\r
-        public abstract bool CanWriteInformation\r
-        {\r
-            get;\r
-        }\r
-\r
-        public abstract bool CanWriteWarning\r
-        {\r
-            get;\r
-        }\r
-\r
-        public abstract bool CanWriteError\r
-        {\r
-            get;\r
-        }\r
-\r
-        public abstract void WriteInformation(CompositionTraceId traceId, string format, params object[] arguments);\r
-\r
-        public abstract void WriteWarning(CompositionTraceId traceId, string format, params object[] arguments);\r
-\r
-        public abstract void WriteError(CompositionTraceId traceId, string format, params object[] arguments);\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ErrorBuilder.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ErrorBuilder.cs
deleted file mode 100644 (file)
index 14ca133..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class ErrorBuilder\r
-    {\r
-        public static CompositionError PreventedByExistingImport(ComposablePart part, ImportDefinition import)\r
-        {\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_PreventedByExistingImport,\r
-                Strings.ImportEngine_PreventedByExistingImport,\r
-                import.ToElement().DisplayName,\r
-                part.ToElement().DisplayName);\r
-        }\r
-\r
-        public static CompositionError InvalidStateForRecompposition(ComposablePart part)\r
-        {\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_InvalidStateForRecomposition,\r
-                Strings.ImportEngine_InvalidStateForRecomposition,\r
-                part.ToElement().DisplayName);\r
-        }\r
-\r
-        public static CompositionError ComposeTookTooManyIterations(int maximumNumberOfCompositionIterations)\r
-        {\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_ComposeTookTooManyIterations,\r
-                Strings.ImportEngine_ComposeTookTooManyIterations,\r
-                maximumNumberOfCompositionIterations);\r
-        }\r
-\r
-        public static CompositionError CreateImportCardinalityMismatch(ImportCardinalityMismatchException exception, ImportDefinition definition)\r
-        {\r
-            Assumes.NotNull(exception, definition);\r
-\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_ImportCardinalityMismatch, \r
-                exception.Message,\r
-                definition.ToElement(), \r
-                (Exception)null);\r
-        }\r
-\r
-        public static CompositionError CreatePartCannotActivate(ComposablePart part, Exception innerException)\r
-        {\r
-            Assumes.NotNull(part, innerException);\r
-\r
-            ICompositionElement element = part.ToElement();\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_PartCannotActivate,\r
-                element,\r
-                innerException,\r
-                Strings.ImportEngine_PartCannotActivate,\r
-                element.DisplayName);\r
-        }\r
-\r
-        public static CompositionError CreatePartCannotSetImport(ComposablePart part, ImportDefinition definition, Exception innerException)\r
-        {\r
-            Assumes.NotNull(part, definition, innerException);\r
-\r
-            ICompositionElement element = definition.ToElement();\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_PartCannotSetImport,\r
-                element,\r
-                innerException,\r
-                Strings.ImportEngine_PartCannotSetImport,\r
-                element.DisplayName,\r
-                part.ToElement().DisplayName);\r
-        }\r
-\r
-        public static CompositionError CreateCannotGetExportedValue(ComposablePart part, ExportDefinition definition, Exception innerException)\r
-        {\r
-            Assumes.NotNull(part, definition, innerException);\r
-\r
-            ICompositionElement element = definition.ToElement();\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_PartCannotGetExportedValue,\r
-                element,\r
-                innerException,\r
-                Strings.ImportEngine_PartCannotGetExportedValue,\r
-                element.DisplayName,\r
-                part.ToElement().DisplayName);\r
-        }\r
-\r
-        public static CompositionError CreatePartCycle(ComposablePart part)\r
-        {\r
-            Assumes.NotNull(part);\r
-\r
-            ICompositionElement element = part.ToElement();\r
-            return CompositionError.Create(\r
-                CompositionErrorId.ImportEngine_PartCycle,\r
-                element,\r
-                Strings.ImportEngine_PartCycle,\r
-                element.DisplayName);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExceptionBuilder.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExceptionBuilder.cs
deleted file mode 100644 (file)
index ed42b30..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class ExceptionBuilder\r
-    {\r
-        public static Exception CreateDiscoveryException(string messageFormat, params string[] arguments)\r
-        {\r
-            // DiscoveryError (Dev10:602872): This should go through the discovery error reporting when \r
-            // we add a way to report discovery errors properly.\r
-            return new InvalidOperationException(Format(messageFormat, arguments));\r
-        }\r
-\r
-        public static ArgumentException CreateContainsNullElement(string parameterName)\r
-        {\r
-            Assumes.NotNull(parameterName);\r
-\r
-            string message = Format(Strings.Argument_NullElement, parameterName);\r
-\r
-            return new ArgumentException(message, parameterName);\r
-        }\r
-\r
-        public static ObjectDisposedException CreateObjectDisposed(object instance)\r
-        {\r
-            Assumes.NotNull(instance);\r
-\r
-            return new ObjectDisposedException(instance.GetType().ToString());\r
-        }\r
-\r
-        public static NotImplementedException CreateNotOverriddenByDerived(string memberName)\r
-        {\r
-            Assumes.NotNullOrEmpty(memberName);\r
-\r
-            string message = Format(Strings.NotImplemented_NotOverriddenByDerived, memberName);\r
-\r
-            return new NotImplementedException(message);\r
-        }\r
-\r
-        public static ArgumentException CreateExportDefinitionNotOnThisComposablePart(string parameterName)\r
-        {\r
-            Assumes.NotNullOrEmpty(parameterName);\r
-\r
-            string message = Format(Strings.ExportDefinitionNotOnThisComposablePart, parameterName);\r
-\r
-            return new ArgumentException(message, parameterName);\r
-        }\r
-\r
-        public static ArgumentException CreateImportDefinitionNotOnThisComposablePart(string parameterName)\r
-        {\r
-            Assumes.NotNullOrEmpty(parameterName);\r
-\r
-            string message = Format(Strings.ImportDefinitionNotOnThisComposablePart, parameterName);\r
-\r
-            return new ArgumentException(message, parameterName);\r
-        }\r
-\r
-        public static CompositionException CreateCannotGetExportedValue(ComposablePart part, ExportDefinition definition, Exception innerException)\r
-        {\r
-            Assumes.NotNull(part, definition, innerException);\r
-\r
-            return new CompositionException(\r
-                ErrorBuilder.CreateCannotGetExportedValue(part, definition, innerException));\r
-        }\r
-\r
-        private static string Format(string format, params string[] arguments)\r
-        {\r
-            return String.Format(CultureInfo.CurrentCulture, format, arguments);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportAttribute.cs
deleted file mode 100644 (file)
index 6882f92..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies that a type, property, field, or method provides a particular export.\r
-    /// </summary>\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, \r
-                    AllowMultiple = true, Inherited = false)]\r
-    public class ExportAttribute : Attribute\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type or member marked with this attribute under the default contract name.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the type of the \r
-        ///         property or field, or the type itself, that is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ExportAttribute()\r
-            : this((string)null, (Type)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type or member marked with this attribute under a contract name derived from the \r
-        ///     specified type.\r
-        /// </summary>\r
-        /// <param name="contractType">\r
-        ///     A <see cref="Type"/> of which to derive the contract name to export the type or \r
-        ///     member marked with this attribute, under; or <see langword="null"/> to use the \r
-        ///     default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on \r
-        ///         <paramref name="contractType"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the type of the \r
-        ///         property or field, or the type itself, that is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ExportAttribute(Type contractType) \r
-            : this((string)null, contractType)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type or member marked with this attribute under the specified contract name.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///      A <see cref="String"/> containing the contract name to export the type or member \r
-        ///      marked with this attribute, under; or <see langword="null"/> or an empty string \r
-        ///      ("") to use the default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the property or field \r
-        ///         type, or the type itself that this is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ExportAttribute(string contractName)\r
-            : this(contractName, (Type)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type or member marked with this attribute under the specified contract name.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///      A <see cref="String"/> containing the contract name to export the type or member \r
-        ///      marked with this attribute, under; or <see langword="null"/> or an empty string \r
-        ///      ("") to use the default contract name.\r
-        /// </param>\r
-        /// <param name="contractType">\r
-        ///     A <see cref="Type"/> of which to derive the contract name to export the type or \r
-        ///     member marked with this attribute, under; or <see langword="null"/> to use the \r
-        ///     default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the property or field \r
-        ///         type, or the type itself that this is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ExportAttribute(string contractName, Type contractType)\r
-        {\r
-            this.ContractName = contractName;\r
-            this.ContractType = contractType;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the contract name to export the type or member under.\r
-        /// </summary>\r
-        /// <value>\r
-        ///      A <see cref="String"/> containing the contract name to export the type or member \r
-        ///      marked with this attribute, under. The default value is an empty string ("").\r
-        /// </value>\r
-        public string ContractName { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Get the contract type that is exported by the member that this attribute is attached to.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="Type"/> of the export that is be provided. The default value is\r
-        ///     <see langword="null"/> which means that the type will be obtained by looking at the type on\r
-        ///     the member that this export is attached to. \r
-        /// </value>\r
-        public Type ContractType { get; private set; }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportCardinalityCheckResult.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportCardinalityCheckResult.cs
deleted file mode 100644 (file)
index 5786d48..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal enum ExportCardinalityCheckResult : int\r
-    {\r
-        Match,\r
-        NoExports,\r
-        TooManyExports\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportMetadataAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportMetadataAttribute.cs
deleted file mode 100644 (file)
index 67a38cb..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies metadata for a type, property, field, or method marked with the\r
-    ///     <see cref="ExportAttribute"/>.\r
-    /// </summary>\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Field, \r
-                    AllowMultiple = true, Inherited = false)]\r
-    public sealed class ExportMetadataAttribute : Attribute\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportMetadataAttribute"/> with the \r
-        ///     specified name and metadata value.\r
-        /// </summary>\r
-        /// <param name="name">\r
-        ///     A <see cref="String"/> containing the name of the metadata value; or \r
-        ///     <see langword="null"/> to set the <see cref="Name"/> property to an empty \r
-        ///     string ("").\r
-        /// </param>\r
-        /// <param name="value">\r
-        ///     An <see cref="object"/> containing the metadata value. This can be \r
-        ///     <see langword="null"/>.\r
-        /// </param>\r
-        public ExportMetadataAttribute(string name, object value)\r
-        {\r
-            this.Name = name ?? string.Empty;\r
-            this.Value = value;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the name of the metadata value.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing the name of the metadata value.\r
-        /// </value>\r
-        public string Name\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the metadata value.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="object"/> containing the metadata value.\r
-        /// </value>\r
-        public object Value\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public bool IsMultiple\r
-        {\r
-            get;\r
-            set;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportServices.DisposableLazy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportServices.DisposableLazy.cs
deleted file mode 100644 (file)
index af8dc0f..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using Microsoft.Internal;\r
-using System.Collections.Generic;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    partial class ExportServices\r
-    {\r
-        private sealed class DisposableLazy<T, TMetadataView> : Lazy<T, TMetadataView>, IDisposable\r
-        {\r
-            private IDisposable _disposable; \r
-\r
-            public DisposableLazy(Func<T> valueFactory, TMetadataView metadataView, IDisposable disposable)\r
-                : base(valueFactory, metadataView)\r
-            {\r
-                Assumes.NotNull(disposable);\r
-\r
-                this._disposable = disposable;\r
-            }\r
-\r
-            void IDisposable.Dispose()\r
-            {\r
-                this._disposable.Dispose();\r
-            }\r
-        }\r
-\r
-        private sealed class DisposableLazy<T> : Lazy<T>, IDisposable\r
-        {\r
-            private IDisposable _disposable;\r
-\r
-            public DisposableLazy(Func<T> valueFactory, IDisposable disposable)\r
-                : base(valueFactory)\r
-            {\r
-                Assumes.NotNull(disposable);\r
-\r
-                this._disposable = disposable;\r
-            }\r
-\r
-            void IDisposable.Dispose()\r
-            {\r
-                this._disposable.Dispose();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ExportServices.cs
deleted file mode 100644 (file)
index 9aa1195..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    // Provides helpers for creating and dealing with Exports\r
-    internal static partial class ExportServices\r
-    {\r
-        private static readonly MethodInfo _createStronglyTypedLazyOfTM = typeof(ExportServices).GetMethod("CreateStronglyTypedLazyOfTM", BindingFlags.NonPublic | BindingFlags.Static);\r
-        private static readonly MethodInfo _createStronglyTypedLazyOfT = typeof(ExportServices).GetMethod("CreateStronglyTypedLazyOfT", BindingFlags.NonPublic | BindingFlags.Static);\r
-        private static readonly MethodInfo _createSemiStronglyTypedLazy = typeof(ExportServices).GetMethod("CreateSemiStronglyTypedLazy", BindingFlags.NonPublic | BindingFlags.Static);\r
-        private static readonly MethodInfo _createStronglyTypedExportFactoryOfT = typeof(ExportServices).GetMethod("CreateStronglyTypedExportFactoryOfT", BindingFlags.NonPublic | BindingFlags.Static);\r
-        private static readonly MethodInfo _createStronglyTypedExportFactoryOfTM = typeof(ExportServices).GetMethod("CreateStronglyTypedExportFactoryOfTM", BindingFlags.NonPublic | BindingFlags.Static);\r
-\r
-        internal static readonly Type DefaultMetadataViewType = typeof(IDictionary<string, object>);\r
-        internal static readonly Type DefaultExportedValueType = typeof(object);\r
-\r
-        internal static bool IsDefaultMetadataViewType(Type metadataViewType)\r
-        {\r
-            Assumes.NotNull(metadataViewType);\r
-\r
-            // Consider all types that IDictionary<string, object> derives from, such\r
-            // as ICollection<KeyValuePair<TKey, TValue>>, IEnumerable<KeyValuePair<TKey, TValue>> \r
-            // and IEnumerable, as default metadata view\r
-            return metadataViewType.IsAssignableFrom(DefaultMetadataViewType);\r
-        }\r
-\r
-        internal static bool IsDictionaryConstructorViewType(Type metadataViewType)\r
-        {\r
-            Assumes.NotNull(metadataViewType);\r
-\r
-            // Does the view type have a constructor that is a Dictionary<string, object>\r
-            return metadataViewType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,\r
-                                                    Type.DefaultBinder,\r
-                                                    new Type[] { typeof(IDictionary<string, object>) },\r
-                                                    new ParameterModifier[0]) != null;\r
-        }\r
-\r
-        internal static Func<Export, object> CreateStronglyTypedLazyFactory(Type exportType, Type metadataViewType)\r
-        {\r
-            MethodInfo genericMethod = null;\r
-            if (metadataViewType != null)\r
-            {\r
-                genericMethod = _createStronglyTypedLazyOfTM.MakeGenericMethod(exportType ?? ExportServices.DefaultExportedValueType, metadataViewType);\r
-            }\r
-            else\r
-            {\r
-                genericMethod = _createStronglyTypedLazyOfT.MakeGenericMethod(exportType ?? ExportServices.DefaultExportedValueType);\r
-            }\r
-            Assumes.NotNull(genericMethod);\r
-            return (Func<Export, object>)Delegate.CreateDelegate(typeof(Func<Export, object>), genericMethod);\r
-        }\r
-\r
-        internal static Func<Export, Lazy<object, object>> CreateSemiStronglyTypedLazyFactory(Type exportType, Type metadataViewType)\r
-        {\r
-            MethodInfo genericMethod = _createSemiStronglyTypedLazy.MakeGenericMethod(\r
-                exportType ?? ExportServices.DefaultExportedValueType,\r
-                metadataViewType ?? ExportServices.DefaultMetadataViewType);\r
-            Assumes.NotNull(genericMethod);\r
-            return (Func<Export, Lazy<object, object>>)Delegate.CreateDelegate(typeof(Func<Export, Lazy<object,object>>), genericMethod);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]\r
-        internal static Lazy<T, M> CreateStronglyTypedLazyOfTM<T, M>(Export export)\r
-        {\r
-            IDisposable disposable = export as IDisposable;\r
-            if (disposable != null)\r
-            {\r
-                return new DisposableLazy<T, M>(\r
-                    () => ExportServices.GetCastedExportedValue<T>(export),\r
-                    AttributedModelServices.GetMetadataView<M>(export.Metadata),\r
-                    disposable);\r
-            }\r
-            else\r
-            {\r
-                return new Lazy<T, M>(\r
-                    () => ExportServices.GetCastedExportedValue<T>(export),\r
-                    AttributedModelServices.GetMetadataView<M>(export.Metadata),\r
-                    false);\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]\r
-        internal static Lazy<T> CreateStronglyTypedLazyOfT<T>(Export export)\r
-        {\r
-            IDisposable disposable = export as IDisposable;\r
-            if (disposable != null)\r
-            {\r
-                return new DisposableLazy<T>(\r
-                    () => ExportServices.GetCastedExportedValue<T>(export),\r
-                    disposable);\r
-            }\r
-            else\r
-            {\r
-                return new Lazy<T>(() => ExportServices.GetCastedExportedValue<T>(export), false);\r
-\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]\r
-        internal static Lazy<object, object> CreateSemiStronglyTypedLazy<T, M>(Export export)\r
-        {\r
-            IDisposable disposable = export as IDisposable;\r
-            if (disposable != null)\r
-            {\r
-                return new DisposableLazy<object, object>(\r
-                    () => ExportServices.GetCastedExportedValue<T>(export),\r
-                    AttributedModelServices.GetMetadataView<M>(export.Metadata),\r
-                    disposable);\r
-            }\r
-            else\r
-            {\r
-                return new Lazy<object, object>(\r
-                    () => ExportServices.GetCastedExportedValue<T>(export),\r
-                    AttributedModelServices.GetMetadataView<M>(export.Metadata),\r
-                    false\r
-                    );\r
-            }\r
-        }\r
-\r
-        internal static Func<Export, object> CreateStronglyTypedExportFactoryFactory(Type exportType, Type metadataType, ConstructorInfo constructor)\r
-        {\r
-            MethodInfo genericMethod = null;\r
-            if (metadataType == null)\r
-            {\r
-                 genericMethod = _createStronglyTypedExportFactoryOfT.MakeGenericMethod(exportType);\r
-            }\r
-            else\r
-            {\r
-                genericMethod = _createStronglyTypedExportFactoryOfTM.MakeGenericMethod(exportType, metadataType);\r
-            }\r
-            \r
-            Assumes.NotNull(genericMethod);\r
-            Func<Export, ConstructorInfo, object> exportFactoryFactory = (Func<Export, ConstructorInfo, object>)Delegate.CreateDelegate(typeof(Func<Export, ConstructorInfo, object>), genericMethod);\r
-            return (e) => exportFactoryFactory.Invoke(e, constructor);\r
-        }\r
-\r
-        private static Tuple<T, Action> GetExportLifetimeContextFromExport<T>(Export export)\r
-        {\r
-            T exportedValue;\r
-            Action disposeAction;\r
-            IDisposable disposable = null;\r
-\r
-            CatalogExportProvider.PartCreatorExport partCreatorExport = export as CatalogExportProvider.PartCreatorExport;\r
-\r
-            if (partCreatorExport != null)\r
-            {\r
-                // PartCreatorExport is the more optimized route\r
-                Export exportProduct = partCreatorExport.CreateExportProduct();\r
-                exportedValue = GetCastedExportedValue<T>(exportProduct);\r
-                disposable = exportProduct as IDisposable;\r
-            }\r
-            else\r
-            {\r
-                // If it comes from somewhere else we walk through the ComposablePartDefinition\r
-                var factoryPartDefinition = GetCastedExportedValue<ComposablePartDefinition>(export);\r
-                var part = factoryPartDefinition.CreatePart();\r
-                var exportDef = factoryPartDefinition.ExportDefinitions.Single();\r
-\r
-                exportedValue = CastExportedValue<T>(part.ToElement(), part.GetExportedValue(exportDef));\r
-                disposable = part as IDisposable;\r
-            }\r
-\r
-            if (disposable != null)\r
-            {\r
-                disposeAction = () => disposable.Dispose();\r
-            }\r
-            else\r
-            {\r
-                disposeAction = () => { };\r
-            }\r
-\r
-            return new Tuple<T, Action>(exportedValue, disposeAction);\r
-        }\r
-\r
-        private static object CreateStronglyTypedExportFactoryOfT<T>(Export export, ConstructorInfo constructor)\r
-        {\r
-            Func<Tuple<T, Action>> exportLifetimeContextCreator = () => ExportServices.GetExportLifetimeContextFromExport<T>(export);\r
-            return constructor.Invoke(new object[] { exportLifetimeContextCreator });\r
-        }\r
-\r
-        private static object CreateStronglyTypedExportFactoryOfTM<T, M>(Export export, ConstructorInfo constructor)\r
-        {\r
-            Func<Tuple<T, Action>> exportLifetimeContextCreator = () => ExportServices.GetExportLifetimeContextFromExport<T>(export);\r
-            return constructor.Invoke(new object[] { exportLifetimeContextCreator, AttributedModelServices.GetMetadataView<M>(export.Metadata) });\r
-        }\r
-\r
-        internal static T GetCastedExportedValue<T>(Export export)\r
-        {\r
-            return CastExportedValue<T>(export.ToElement(), export.Value);\r
-        }\r
-\r
-        internal static T CastExportedValue<T>(ICompositionElement element, object exportedValue)\r
-        {\r
-            object typedExportedValue = null;\r
-\r
-            bool succeeded = ContractServices.TryCast(typeof(T), exportedValue, out typedExportedValue);\r
-            if (!succeeded)\r
-            {\r
-                throw new CompositionContractMismatchException(string.Format(CultureInfo.CurrentCulture,\r
-                    Strings.ContractMismatch_ExportedValueCannotBeCastToT,\r
-                    element.DisplayName,\r
-                    typeof(T)));\r
-            }\r
-\r
-            return (T)typedExportedValue;\r
-        }\r
-        \r
-        internal static ExportCardinalityCheckResult CheckCardinality(ImportDefinition definition, IEnumerable<Export> exports)\r
-        {\r
-            EnumerableCardinality actualCardinality = exports.GetCardinality();\r
-\r
-            switch (actualCardinality)\r
-            {\r
-                case EnumerableCardinality.Zero:\r
-                    if (definition.Cardinality == ImportCardinality.ExactlyOne)\r
-                    {\r
-                        return ExportCardinalityCheckResult.NoExports;\r
-                    }\r
-                    break;\r
-\r
-                case EnumerableCardinality.TwoOrMore:\r
-                    if (definition.Cardinality.IsAtMostOne())\r
-                    {\r
-                        return ExportCardinalityCheckResult.TooManyExports;\r
-                    }\r
-                    break;\r
-\r
-                default:\r
-                    Assumes.IsTrue(actualCardinality == EnumerableCardinality.One);\r
-                    break;\r
-\r
-            }\r
-\r
-            return ExportCardinalityCheckResult.Match;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/.gitattributes
deleted file mode 100644 (file)
index 3fab40e..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/AggregateCatalog.cs -crlf
-/AggregateExportProvider.cs -crlf
-/AssemblyCatalog.cs -crlf
-/AssemblyCatalogDebuggerProxy.cs -crlf
-/AtomicComposition.cs -crlf
-/AtomicCompositionExtensions.cs -crlf
-/CatalogExportProvider.CatalogChangeProxy.cs -crlf
-/CatalogExportProvider.CatalogExport.cs -crlf
-/CatalogExportProvider.PartCreatorExport.cs -crlf
-/CatalogExportProvider.cs -crlf
-/ComposablePartCatalogChangeEventArgs.cs -crlf
-/ComposablePartCatalogCollection.cs -crlf
-/ComposablePartExportProvider.cs -crlf
-/CompositionBatch.SingleExportComposablePart.cs -crlf
-/CompositionBatch.cs -crlf
-/CompositionConstants.cs -crlf
-/CompositionContainer.cs -crlf
-/CompositionLock.cs -crlf
-/CompositionServices.cs -crlf
-/DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs -crlf
-/DirectoryCatalog.cs -crlf
-/ExportProvider.GetExportOverrides.cs -crlf
-/ExportProvider.cs -crlf
-/ExportsChangeEventArgs.cs -crlf
-/INotifyComposablePartCatalogChanged.cs -crlf
-/ImportEngine.EngineContext.cs -crlf
-/ImportEngine.PartManager.cs -crlf
-/ImportEngine.RecompositionManager.cs -crlf
-/ImportEngine.cs -crlf
-/TypeCatalog.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateCatalog.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateCatalog.cs
deleted file mode 100644 (file)
index aba9503..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     A mutable collection of <see cref="ComposablePartCatalog"/>s.  \r
-    /// </summary>\r
-    /// <remarks>\r
-    ///     This type is thread safe.\r
-    /// </remarks>\r
-    public class AggregateCatalog : ComposablePartCatalog, INotifyComposablePartCatalogChanged\r
-    {\r
-        private ComposablePartCatalogCollection _catalogs = null;\r
-        private volatile int _isDisposed = 0;\r
-        private IQueryable<ComposablePartDefinition> _partsQuery;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="AggregateCatalog"/> class.\r
-        /// </summary>\r
-        public AggregateCatalog()\r
-            : this((IEnumerable<ComposablePartCatalog>)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="AggregateCatalog"/> class \r
-        ///     with the specified catalogs.\r
-        /// </summary>\r
-        /// <param name="catalogs">\r
-        ///     An <see cref="Array"/> of <see cref="ComposablePartCatalog"/> objects to add to the \r
-        ///     <see cref="AggregateCatalog"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="catalogs"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="catalogs"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        public AggregateCatalog(params ComposablePartCatalog[] catalogs)\r
-            : this((IEnumerable<ComposablePartCatalog>)catalogs)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="AggregateCatalog"/> class\r
-        ///     with the specified catalogs.\r
-        /// </summary>\r
-        /// <param name="catalogs">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ComposablePartCatalog"/> objects to add\r
-        ///     to the <see cref="AggregateCatalog"/>; or <see langword="null"/> to \r
-        ///     create an <see cref="AggregateCatalog"/> that is empty.\r
-        /// </param>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="catalogs"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        public AggregateCatalog(IEnumerable<ComposablePartCatalog> catalogs)\r
-        {\r
-            Requires.NullOrNotNullElements(catalogs, "catalogs");\r
-\r
-            this._catalogs = new ComposablePartCatalogCollection(catalogs, this.OnChanged, this.OnChanging);\r
-            this._partsQuery = this._catalogs.AsQueryable().SelectMany(catalog => catalog.Parts);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog has changed.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changed\r
-        {\r
-            add\r
-            {\r
-                this._catalogs.Changed += value;\r
-            }\r
-            remove\r
-            {\r
-                this._catalogs.Changed -= value;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog has changing.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changing\r
-        {\r
-            add\r
-            {\r
-                this._catalogs.Changing += value;\r
-            }\r
-            remove\r
-            {\r
-                this._catalogs.Changing -= value;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the part definitions of the catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IQueryable{T}"/> of <see cref="ComposablePartDefinition"/> objects of the \r
-        ///     <see cref="AggregateCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="AggregateCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IQueryable<ComposablePartDefinition> Parts\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-                return this._partsQuery;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export definitions that match the constraint defined by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="ExportDefinition"/> objects to return.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1, T2}"/> containing the \r
-        ///     <see cref="ExportDefinition"/> objects and their associated \r
-        ///     <see cref="ComposablePartDefinition"/> for objects that match the constraint defined \r
-        ///     by <paramref name="definition"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="AggregateCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(ImportDefinition definition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            // delegate the query to each catalog and merge the results.\r
-            var exports = new List<Tuple<ComposablePartDefinition, ExportDefinition>>();\r
-            foreach (var catalog in this._catalogs)\r
-            {\r
-                foreach (var export in catalog.GetExports(definition))\r
-                {\r
-                    exports.Add(export);\r
-                }\r
-            }\r
-            return exports;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the underlying catalogs of the catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="ICollection{T}"/> of underlying <see cref="ComposablePartCatalog"/> objects\r
-        ///     of the <see cref="AggregateCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="AggregateCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public ICollection<ComposablePartCatalog> Catalogs\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-                return this._catalogs;\r
-            }\r
-        }\r
-\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            try\r
-            {\r
-                if (disposing)\r
-                {\r
-                    // NOTE : According to http://msdn.microsoft.com/en-us/library/4bw5ewxy.aspx, the warning is bogus when used with Interlocked API.\r
-#pragma warning disable 420\r
-                    if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-#pragma warning restore 420\r
-                    {\r
-                        this._catalogs.Dispose();\r
-                    }\r
-                }\r
-            }\r
-            finally\r
-            {\r
-                base.Dispose(disposing);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="INotifyComposablePartCatalogChanged.Changed"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ComposablePartCatalogChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnChanged(ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            this._catalogs.OnChanged(this, e);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="INotifyComposablePartCatalogChanged.Changing"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ComposablePartCatalogChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnChanging(ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            this._catalogs.OnChanging(this, e);\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed == 1)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateExportProvider.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AggregateExportProvider.cs
deleted file mode 100644 (file)
index 62bfe70..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public class AggregateExportProvider : ExportProvider , IDisposable\r
-    {\r
-        private ReadOnlyCollection<ExportProvider> _providers;\r
-        private volatile int _isDisposed = 0;\r
-\r
-        /// <summary>\r
-        /// Initializes a new instance of the <see cref="AggregateExportProvider"/> class.\r
-        /// </summary>\r
-        /// <param name="providers">The prioritized list of export providers.</param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The <see cref="AggregateExportProvider"/> will consult the providers in the order they have been specfied when \r
-        ///         executing <see cref="ExportProvider.GetExports(ImportDefinition,AtomicComposition)"/>. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The <see cref="AggregateExportProvider"/> does not take ownership of the specified providers. \r
-        ///         That is, it will not try to dispose of any of them when it gets disposed.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public AggregateExportProvider(params ExportProvider[] providers) \r
-            : this(providers.AsEnumerable())\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        /// Initializes a new instance of the <see cref="AggregateExportProvider"/> class.\r
-        /// </summary>\r
-        /// <param name="providers">The prioritized list of export providers. The providers are consulted in order in which they are supplied.</param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The <see cref="AggregateExportProvider"/> will consult the providers in the order they have been specfied when \r
-        ///         executing <see cref="ExportProvider.GetExports(ImportDefinition,AtomicComposition)"/>. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The <see cref="AggregateExportProvider"/> does not take ownership of the specified providers. \r
-        ///         That is, it will not try to dispose of any of them when it gets disposed.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public AggregateExportProvider(IEnumerable<ExportProvider> providers)\r
-        {\r
-            List<ExportProvider> providerList = new List<ExportProvider>();\r
-\r
-            if (providers != null)\r
-            {\r
-                // we are in the constructor, so there's no need to lock anything\r
-                foreach (var provider in providers)\r
-                {\r
-                    if (provider == null)\r
-                    {\r
-                        throw ExceptionBuilder.CreateContainsNullElement("providers");\r
-                    }\r
-\r
-                    providerList.Add(provider);\r
-\r
-                    provider.ExportsChanged += this.OnExportChangedInternal;\r
-                    provider.ExportsChanging += this.OnExportChangingInternal;\r
-                }\r
-            }\r
-\r
-            // this will always fully copy the array\r
-            this._providers = new ReadOnlyCollection<ExportProvider>(providerList);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.\r
-        /// </summary>\r
-        public void Dispose()\r
-        {\r
-            this.Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Releases unmanaged and - optionally - managed resources\r
-        /// </summary>\r
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>\r
-        protected virtual void Dispose(bool disposing)\r
-        {\r
-            if (disposing)\r
-            {\r
-                // NOTE : According to http://msdn.microsoft.com/en-us/library/4bw5ewxy.aspx, the warning is bogus when used with Interlocked API.\r
-#pragma warning disable 420\r
-                if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-#pragma warning restore 420\r
-                {\r
-                    this._providers.ForEach(provider =>\r
-                    {\r
-                        provider.ExportsChanged -= this.OnExportChangedInternal;\r
-                        provider.ExportsChanging -= this.OnExportChangingInternal;\r
-                    });\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the export providers which the aggregate export provider aggregates.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="ReadOnlyCollection{T}"/> of <see cref="ExportProvider"/> objects\r
-        ///     which the <see cref="AggregateExportProvider"/> aggregates.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="AggregateExportProvider"/> has been disposed of.\r
-        /// </exception>\r
-        public ReadOnlyCollection<ExportProvider> Providers\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                return this._providers;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns all exports that match the conditions of the specified import.\r
-        /// </summary>\r
-        /// <param name="definition">The <see cref="ImportDefinition"/> that defines the conditions of the\r
-        /// <see cref="Export"/> to get.</param>\r
-        /// <returns></returns>\r
-        /// <result>\r
-        /// An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects that match\r
-        /// the conditions defined by <see cref="ImportDefinition"/>, if found; otherwise, an\r
-        /// empty <see cref="IEnumerable{T}"/>.\r
-        /// </result>\r
-        /// <remarks>\r
-        ///    <note type="inheritinfo">\r
-        /// The implementers should not treat the cardinality-related mismatches as errors, and are not\r
-        /// expected to throw exceptions in those cases.\r
-        /// For instance, if the import requests exactly one export and the provider has no matching exports or more than one,\r
-        /// it should return an empty <see cref="IEnumerable{T}"/> of <see cref="Export"/>.\r
-        /// </note>\r
-        /// </remarks>\r
-        protected override IEnumerable<Export> GetExportsCore(ImportDefinition definition, AtomicComposition atomicComposition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            if (definition.Cardinality == ImportCardinality.ZeroOrMore)\r
-            {\r
-                var exports = new List<Export>();\r
-                foreach (var provider in this._providers)\r
-                {\r
-                    foreach (var export in provider.GetExports(definition, atomicComposition))\r
-                    {\r
-                        exports.Add(export);\r
-                    }\r
-                }\r
-                return exports;\r
-            }\r
-            else\r
-            {\r
-                IEnumerable<Export> allExports = Enumerable.Empty<Export>();\r
-\r
-                // if asked for "one or less", the prioriry is at play - the first provider that agrees to return the value \r
-                // which best complies with the request, wins.\r
-                foreach (ExportProvider provider in this._providers)\r
-                {\r
-                    IEnumerable<Export> exports;\r
-                    bool cardinalityCheckResult = provider.TryGetExports(definition, atomicComposition, out exports);\r
-                    bool anyExports = exports.FastAny();\r
-                    if (cardinalityCheckResult && anyExports)\r
-                    {\r
-                        // NOTE : if the provider returned nothing, we need to proceed, even if it indicated that the\r
-                        // cardinality is correct - when asked for "one or less", the provider might - correctly - \r
-                        // return an empty sequence, but we shouldn't be satisfied with that as providers down the list\r
-                        // might have a value we are interested in.\r
-                        return exports;\r
-                    }\r
-                    else\r
-                    {\r
-                        // TODO\r
-                        // This is a sneaky thing that we do - if in the end no provider returns the exports with the right cardinality\r
-                        // we simply return the aggregation of all exports they have restuned. This way the end result is still not waht we want\r
-                        // but no information is lost.\r
-                        // WE SHOULD fix this behavior, but this is ONLY possible if we can treat many exports as no exports for the sake of singles\r
-                        if (anyExports)\r
-                        {\r
-                            allExports = allExports.Concat(exports);\r
-                        }\r
-                    }\r
-                }\r
-\r
-                return allExports;\r
-            }\r
-        }\r
-\r
-        private void OnExportChangedInternal(object sender, ExportsChangeEventArgs e)\r
-        {\r
-            this.OnExportsChanged(e);\r
-        }\r
-\r
-        private void OnExportChangingInternal(object sender, ExportsChangeEventArgs e)\r
-        {\r
-            this.OnExportsChanging(e);\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed == 1)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs
deleted file mode 100644 (file)
index b1e079b..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.Security;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     An immutable ComposablePartCatalog created from a managed code assembly.\r
-    /// </summary>\r
-    /// <remarks>\r
-    ///     This type is thread safe.\r
-    /// </remarks>\r
-    [DebuggerTypeProxy(typeof(AssemblyCatalogDebuggerProxy))]\r
-    public class AssemblyCatalog : ComposablePartCatalog, ICompositionElement\r
-    {\r
-        private readonly object _thisLock = new object();\r
-        private readonly ICompositionElement _definitionOrigin;\r
-        private volatile Assembly _assembly = null;\r
-        private volatile TypeCatalog _innerCatalog = null;\r
-        private int _isDisposed = 0;\r
-\r
-#if !SILVERLIGHT\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="AssemblyCatalog"/> class \r
-        ///     with the specified code base.\r
-        /// </summary>\r
-        /// <param name="codeBase">\r
-        ///     A <see cref="String"/> containing the code base of the assembly containing the\r
-        ///     attributed <see cref="Type"/> objects to add to the <see cref="AssemblyCatalog"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="codeBase"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="codeBase"/> is a zero-length string, contains only white space, \r
-        ///     or contains one or more invalid characters as defined by <see cref="Path.InvalidPathChars"/>.\r
-        /// </exception>\r
-        /// <exception cref="PathTooLongException">\r
-        ///     The specified path, file name, or both exceed the system-defined maximum length. \r
-        /// </exception>\r
-        /// <exception cref="SecurityException">\r
-        ///     The caller does not have path discovery permission. \r
-        /// </exception>\r
-        /// <exception cref="FileNotFoundException">\r
-        ///     <paramref name="codeBase"/> is not found.\r
-        /// </exception>\r
-        /// <exception cref="FileLoadException ">\r
-        ///     <paramref name="codeBase"/> could not be loaded.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="codeBase"/> specified a directory.\r
-        /// </exception>\r
-        /// <exception cref="BadImageFormatException">\r
-        ///     <paramref name="codeBase"/> is not a valid assembly\r
-        ///     -or- \r
-        ///     Version 2.0 or later of the common language runtime is currently loaded \r
-        ///     and <paramref name="codeBase"/> was compiled with a later version. \r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     The assembly referenced by <paramref langword="codeBase"/> is loaded into the Load context.\r
-        /// </remarks>\r
-        public AssemblyCatalog(string codeBase)\r
-            : this(codeBase, (ICompositionElement)null)\r
-        {\r
-        }\r
-\r
-        internal AssemblyCatalog(string codeBase, ICompositionElement definitionOrigin)\r
-            : this(LoadAssembly(codeBase), definitionOrigin)\r
-        {\r
-        }\r
-\r
-#endif\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="AssemblyCatalog"/> class \r
-        ///     with the specified assembly.\r
-        /// </summary>\r
-        /// <param name="assembly">\r
-        ///     The <see cref="Assembly"/> containing the attributed <see cref="Type"/> objects to \r
-        ///     add to the <see cref="AssemblyCatalog"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="assembly"/> is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>    \r
-        ///     <paramref name="assembly"/> was loaded in the reflection-only context.\r
-        /// </exception>\r
-        public AssemblyCatalog(Assembly assembly)\r
-            : this(assembly, (ICompositionElement)null)\r
-        {\r
-        }\r
-\r
-        internal AssemblyCatalog(Assembly assembly, ICompositionElement definitionOrigin)\r
-        {\r
-            Requires.NotNull(assembly, "assembly");\r
-\r
-#if !SILVERLIGHT\r
-            if (assembly.ReflectionOnly)\r
-            {\r
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.Argument_AssemblyReflectionOnly, "assembly"), "assembly");\r
-            }\r
-#endif\r
-            this._assembly = assembly;\r
-            this._definitionOrigin = definitionOrigin ?? this;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the part definitions of the assembly catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IQueryable{T}"/> of <see cref="ComposablePartDefinition"/> objects of the \r
-        ///     <see cref="AssemblyCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="AssemblyCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IQueryable<ComposablePartDefinition> Parts\r
-        {\r
-            get\r
-            {\r
-                return this.InnerCatalog.Parts;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export definitions that match the constraint defined by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="ExportDefinition"/> objects to return.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1, T2}"/> containing the \r
-        ///     <see cref="ExportDefinition"/> objects and their associated \r
-        ///     <see cref="ComposablePartDefinition"/> for objects that match the constraint defined \r
-        ///     by <paramref name="definition"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePartCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/>, if no \r
-        ///         <see cref="ExportDefinition"/> match the conditions defined by \r
-        ///         <paramref name="definition"/>, return an empty <see cref="IEnumerable{T}"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        public override IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(ImportDefinition definition)\r
-        {\r
-            return this.InnerCatalog.GetExports(definition);\r
-        }\r
-\r
-        private TypeCatalog InnerCatalog\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                if (this._innerCatalog == null)\r
-                {\r
-                    lock (this._thisLock)\r
-                    {\r
-                        if (this._innerCatalog == null)\r
-                        {\r
-                            var catalog = new TypeCatalog(this._assembly.GetTypes(), _definitionOrigin);\r
-                            this._innerCatalog = catalog;\r
-                        }\r
-                    }\r
-                }\r
-                return this._innerCatalog;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the assembly containing the attributed types contained within the assembly\r
-        ///     catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="Assembly"/> containing the attributed <see cref="Type"/> objects\r
-        ///     contained within the <see cref="AssemblyCatalog"/>.\r
-        /// </value>\r
-        public Assembly Assembly\r
-        {\r
-            get { return this._assembly; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the display name of the assembly catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing a human-readable display name of the <see cref="AssemblyCatalog"/>.\r
-        /// </value>\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return this.GetDisplayName(); }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the composition element from which the assembly catalog originated.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     This property always returns <see langword="null"/>.\r
-        /// </value>\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return null; }\r
-        }\r
-\r
-\r
-        /// <summary>\r
-        ///     Returns a string representation of the assembly catalog.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="String"/> containing the string representation of the <see cref="AssemblyCatalog"/>.\r
-        /// </returns>\r
-        public override string ToString()\r
-        {\r
-            return this.GetDisplayName();\r
-        }\r
-\r
-        protected override void Dispose(bool disposing)\r
-        {                \r
-            try\r
-            {\r
-                if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-                {\r
-                    if (disposing)\r
-                    {\r
-                        if (this._innerCatalog != null)\r
-                        {\r
-                            this._innerCatalog.Dispose();\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-            finally\r
-            {\r
-                base.Dispose(disposing);\r
-            }\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed == 1)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-\r
-        private string GetDisplayName()\r
-        {\r
-            return string.Format(CultureInfo.CurrentCulture,\r
-                                "{0} (Assembly=\"{1}\")",   // NOLOC\r
-                                GetType().Name, \r
-                                this.Assembly.FullName);\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        private static Assembly LoadAssembly(string codeBase)\r
-        {\r
-            Requires.NotNullOrEmpty(codeBase, "codeBase");\r
-\r
-            AssemblyName assemblyName;\r
-\r
-            try\r
-            {\r
-                assemblyName = AssemblyName.GetAssemblyName(codeBase);\r
-            }\r
-            catch (ArgumentException)\r
-            {\r
-                assemblyName = new AssemblyName();\r
-                assemblyName.CodeBase = codeBase;\r
-            }\r
-\r
-            return Assembly.Load(assemblyName);            \r
-        }\r
-#endif\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalogDebuggerProxy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AssemblyCatalogDebuggerProxy.cs
deleted file mode 100644 (file)
index 86aa5fa..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    internal class AssemblyCatalogDebuggerProxy\r
-    {\r
-        private readonly AssemblyCatalog _catalog;\r
-\r
-        public AssemblyCatalogDebuggerProxy(AssemblyCatalog catalog)\r
-        {\r
-            Requires.NotNull(catalog, "catalog");\r
-\r
-            this._catalog = catalog;\r
-        }\r
-\r
-        public Assembly Assembly\r
-        {\r
-            get { return this._catalog.Assembly; }\r
-        }\r
-\r
-        public ReadOnlyCollection<ComposablePartDefinition> Parts\r
-        {\r
-            // NOTE: This shouldn't be cached, so that on every query of\r
-            // the current value of the underlying catalog is respected.\r
-            // We use ReadOnlyCollection as arrays do not have the \r
-            // appropriate debugger display attributes applied to them.\r
-            get { return this._catalog.Parts.ToReadOnlyCollection(); }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicComposition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicComposition.cs
deleted file mode 100644 (file)
index 4c027f7..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-using System;\r
-using System.Diagnostics;\r
-using System.Collections.Generic;\r
-using Microsoft.Internal;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    /// AtomicComposition provides lightweight atomicCompositional semantics to enable temporary\r
-    /// state to be managed for a series of nested atomicCompositions.  Each atomicComposition maintains\r
-    /// queryable state along with a sequence of actions necessary to complete the state when\r
-    /// the atomicComposition is no longer in danger of being rolled back.  State is completed or\r
-    /// rolled back when the atomicComposition is disposed, depending on the state of the\r
-    /// CompleteOnDipose property which defaults to false.  The using(...) pattern in C# is a\r
-    /// convenient mechanism for defining atomicComposition scopes.\r
-    /// \r
-    /// The least obvious aspects of AtomicComposition deal with nesting.\r
-    /// \r
-    /// Firstly, no complete actions are actually performed until the outermost atomicComposition is\r
-    /// completed.  Completeting or rolling back nested atomicCompositions serves only to change which\r
-    /// actions would be completed the outer atomicComposition.\r
-    /// \r
-    /// Secondly, state is added in the form of queries associated with an object key.  The\r
-    /// key represents a unique object the state is being held on behalf of.  The quieries are\r
-    /// accessed throught the Query methods which provide automatic chaining to execute queries\r
-    /// across the target atomicComposition and its inner atomicComposition as appropriate.\r
-    /// \r
-    /// Lastly, when a nested atomicComposition is created for a given outer the outer atomicComposition is locked.\r
-    /// It remains locked until the inner atomicComposition is disposed or completeed preventing the addition of\r
-    /// state, actions or other inner atomicCompositions.\r
-    /// </summary>\r
-    public class AtomicComposition : IDisposable\r
-    {\r
-        private readonly AtomicComposition _outerAtomicComposition;\r
-        private KeyValuePair<object, object>[] _values;\r
-        private int _valueCount = 0;\r
-        private List<Action> _completeActionList;\r
-        private List<Action> _revertActionList;\r
-        private bool _isDisposed = false;\r
-        private bool _isCompleted = false;\r
-        private bool _containsInnerAtomicComposition = false;\r
-\r
-        public AtomicComposition()\r
-            : this(null)\r
-        {\r
-        }\r
-\r
-        public AtomicComposition(AtomicComposition outerAtomicComposition)\r
-        {\r
-            // Lock the inner atomicComposition so that we can assume nothing changes except on\r
-            // the innermost scope, and thereby optimize the query path\r
-            if (outerAtomicComposition != null)\r
-            {\r
-                this._outerAtomicComposition = outerAtomicComposition;\r
-                this._outerAtomicComposition.ContainsInnerAtomicComposition = true;\r
-            }\r
-        }\r
-\r
-        public void SetValue(object key, object value)\r
-        {\r
-            ThrowIfDisposed();\r
-            ThrowIfCompleteed();\r
-            ThrowIfContainsInnerAtomicComposition();\r
-\r
-            Requires.NotNull(key, "key");\r
-\r
-            SetValueInternal(key, value);\r
-        }\r
-\r
-        public bool TryGetValue<T>(object key, out T value) \r
-        {\r
-            return TryGetValue(key, false, out value);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters")]\r
-        public bool TryGetValue<T>(object key, bool localAtomicCompositionOnly, out T value) \r
-        {\r
-            ThrowIfDisposed();\r
-            ThrowIfCompleteed();\r
-\r
-            Requires.NotNull(key, "key");\r
-\r
-            return TryGetValueInternal(key, localAtomicCompositionOnly, out value);\r
-        }\r
-\r
-        public void AddCompleteAction(Action completeAction)\r
-        {\r
-            ThrowIfDisposed();\r
-            ThrowIfCompleteed();\r
-            ThrowIfContainsInnerAtomicComposition();\r
-\r
-            Requires.NotNull(completeAction, "completeAction");\r
-\r
-            if (this._completeActionList == null)\r
-            {\r
-                this._completeActionList = new List<Action>();\r
-            }\r
-            this._completeActionList.Add(completeAction);\r
-        }\r
-\r
-        public void AddRevertAction(Action revertAction)\r
-        {\r
-            ThrowIfDisposed();\r
-            ThrowIfCompleteed();\r
-            ThrowIfContainsInnerAtomicComposition();\r
-\r
-            Requires.NotNull(revertAction, "revertAction");\r
-\r
-            if (this._revertActionList == null)\r
-            {\r
-                this._revertActionList = new List<Action>();\r
-            }\r
-            this._revertActionList.Add(revertAction);\r
-        }\r
-\r
-        public void Complete()\r
-        {\r
-            ThrowIfDisposed();\r
-            ThrowIfCompleteed();\r
-\r
-            if (this._outerAtomicComposition == null)\r
-            {   // Execute all the complete actions\r
-                FinalComplete();\r
-            }\r
-            else\r
-            {   // Copy the actions and state to the outer atomicComposition\r
-                CopyComplete();\r
-            }\r
-\r
-            this._isCompleted = true;\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        protected virtual void Dispose(bool disposing)\r
-        {\r
-            ThrowIfDisposed();\r
-            this._isDisposed = true;\r
-\r
-            if (this._outerAtomicComposition != null)\r
-            {\r
-                this._outerAtomicComposition.ContainsInnerAtomicComposition = false;\r
-            }\r
-\r
-            // Revert is always immediate and involves forgetting information and\r
-            // exceuting any appropriate revert actions\r
-            if (!this._isCompleted)\r
-            {\r
-                if (this._revertActionList != null)\r
-                {\r
-                    // Execute the revert actions in reverse order to ensure\r
-                    // everything incrementally rollsback its state.\r
-                    for (int i = this._revertActionList.Count - 1; i >= 0; i--)\r
-                    {\r
-                        Action action = this._revertActionList[i];\r
-                        action();\r
-                    }\r
-                    this._revertActionList = null;\r
-                }\r
-            }\r
-        }\r
-\r
-        private void FinalComplete()\r
-        {\r
-            // Completeting the outer most scope is easy, just execute all the actions\r
-            if (this._completeActionList != null)\r
-            {\r
-                foreach (Action action in this._completeActionList)\r
-                {\r
-                    action();\r
-                }\r
-                this._completeActionList = null;\r
-            }\r
-        }\r
-\r
-        private void CopyComplete()\r
-        {\r
-            Assumes.NotNull(this._outerAtomicComposition);\r
-\r
-            this._outerAtomicComposition.ContainsInnerAtomicComposition = false;\r
-\r
-            // Inner scopes are much odder, because completeting them means coalescing them into the\r
-            // outer scope - the complete or revert actions are deferred until the outermost scope completes\r
-            // or any intermediate rolls back\r
-            if (this._completeActionList != null)\r
-            {\r
-                foreach (Action action in this._completeActionList)\r
-                {\r
-                    this._outerAtomicComposition.AddCompleteAction(action);\r
-                }\r
-            }\r
-\r
-            if (this._revertActionList != null)\r
-            {\r
-                foreach (Action action in this._revertActionList)\r
-                {\r
-                    this._outerAtomicComposition.AddRevertAction(action);\r
-                }\r
-            }\r
-\r
-            // We can copy over existing atomicComposition entries because they're either already chained or\r
-            // overwrite by design and can now be completed or rolled back together\r
-            for (var index = 0; index < this._valueCount; index++)\r
-            {\r
-                this._outerAtomicComposition.SetValueInternal(\r
-                    this._values[index].Key, this._values[index].Value);\r
-            }\r
-        }\r
-\r
-        private bool ContainsInnerAtomicComposition\r
-        {\r
-            set\r
-            {\r
-                if (value == true && this._containsInnerAtomicComposition == true)\r
-                {\r
-                    throw new InvalidOperationException(Strings.AtomicComposition_AlreadyNested);\r
-                }\r
-                this._containsInnerAtomicComposition = value;\r
-            }\r
-        }\r
-\r
-        private bool TryGetValueInternal<T>(object key, bool localAtomicCompositionOnly, out T value) \r
-        {\r
-            for (var index = 0; index < this._valueCount; index++)\r
-            {\r
-                if (this._values[index].Key == key)\r
-                {\r
-                    value = (T)this._values[index].Value;\r
-                    return true;\r
-                }\r
-            }\r
-\r
-            // If there's no atomicComposition available then recurse until we hit the outermost\r
-            // scope, where upon we go ahead and return null\r
-            if (!localAtomicCompositionOnly && this._outerAtomicComposition != null)\r
-            {\r
-                return this._outerAtomicComposition.TryGetValueInternal<T>(key, localAtomicCompositionOnly, out value);\r
-            }\r
-\r
-            value = default(T);\r
-            return false;\r
-        }\r
-\r
-        private void SetValueInternal(object key, object value)\r
-        {\r
-            // Handle overwrites quickly\r
-            for (var index = 0; index < this._valueCount; index++)\r
-            {\r
-                if (this._values[index].Key == key)\r
-                {\r
-                    this._values[index] = new KeyValuePair<object,object>(key, value);\r
-                    return;\r
-                }\r
-            }\r
-\r
-            // Expand storage when needed\r
-            if (this._values == null || this._valueCount == this._values.Length)\r
-            {\r
-                var newQueries = new KeyValuePair<object, object>[this._valueCount == 0 ? 5 : this._valueCount * 2];\r
-                if (this._values != null)\r
-                {\r
-                    Array.Copy(this._values, newQueries, this._valueCount);\r
-                }\r
-                this._values = newQueries;\r
-            }\r
-\r
-            // Store a new entry\r
-            this._values[_valueCount] = new KeyValuePair<object, object>(key, value);\r
-            this._valueCount++;\r
-            return;\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void ThrowIfContainsInnerAtomicComposition()\r
-        {\r
-            if (this._containsInnerAtomicComposition)\r
-            {\r
-                throw new InvalidOperationException(Strings.AtomicComposition_PartOfAnotherAtomicComposition);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void ThrowIfCompleteed()\r
-        {\r
-            if (this._isCompleted)\r
-            {\r
-                throw new InvalidOperationException(Strings.AtomicComposition_AlreadyCompleted);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicCompositionExtensions.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/AtomicCompositionExtensions.cs
deleted file mode 100644 (file)
index 5756a0f..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;\r
-using System.Diagnostics;\r
-using System.Collections.Generic;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    internal static class AtomicCompositionExtensions\r
-    {\r
-        internal static T GetValueAllowNull<T>(this AtomicComposition atomicComposition, T defaultResultAndKey) where T : class\r
-        {\r
-            Assumes.NotNull(defaultResultAndKey);\r
-\r
-            return GetValueAllowNull<T>(atomicComposition, defaultResultAndKey, defaultResultAndKey);\r
-        }\r
-\r
-        internal static T GetValueAllowNull<T>(this AtomicComposition atomicComposition, object key, T defaultResult)\r
-        {\r
-            T result;\r
-            if (atomicComposition != null && atomicComposition.TryGetValue(key, out result))\r
-            {\r
-                return result;\r
-            }\r
-\r
-            return defaultResult;\r
-        }\r
-\r
-        internal static void AddRevertActionAllowNull(this AtomicComposition atomicComposition, Action action)\r
-        {\r
-            Assumes.NotNull(action);\r
-\r
-            if (atomicComposition == null)\r
-            {\r
-                action();\r
-            }\r
-            else\r
-            {\r
-                atomicComposition.AddRevertAction(action);\r
-            }\r
-        }\r
-\r
-        internal static void AddCompleteActionAllowNull(this AtomicComposition atomicComposition, Action action)\r
-        {\r
-            Assumes.NotNull(action);\r
-\r
-            if (atomicComposition == null)\r
-            {\r
-                action();\r
-            }\r
-            else\r
-            {\r
-                atomicComposition.AddCompleteAction(action);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogChangeProxy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogChangeProxy.cs
deleted file mode 100644 (file)
index d78db6d..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Runtime.CompilerServices;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class CatalogExportProvider : ExportProvider, IDisposable\r
-    {\r
-        private class CatalogChangeProxy : ComposablePartCatalog\r
-        {\r
-            private ComposablePartCatalog _originalCatalog;\r
-            private List<ComposablePartDefinition> _addedParts;\r
-            private HashSet<ComposablePartDefinition> _removedParts;\r
-\r
-            public CatalogChangeProxy(ComposablePartCatalog originalCatalog,\r
-                IEnumerable<ComposablePartDefinition> addedParts,\r
-                IEnumerable<ComposablePartDefinition> removedParts)\r
-            {\r
-                this._originalCatalog = originalCatalog;\r
-                this._addedParts = new List<ComposablePartDefinition>(addedParts);\r
-                this._removedParts = new HashSet<ComposablePartDefinition>(removedParts);\r
-            }\r
-\r
-            public override IQueryable<ComposablePartDefinition> Parts\r
-            {\r
-                get\r
-                {\r
-                    return this._originalCatalog.Parts.Concat(this._addedParts).Except(this._removedParts);\r
-                }\r
-            }\r
-\r
-            public override IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(\r
-                ImportDefinition definition)\r
-            {\r
-                Requires.NotNull(definition, "definition");\r
-\r
-                var originalExports = this._originalCatalog.GetExports(definition);\r
-                var trimmedExports = originalExports.Where(partAndExport =>\r
-                    !this._removedParts.Contains(partAndExport.Item1));\r
-\r
-                var addedExports = new List<Tuple<ComposablePartDefinition, ExportDefinition>>();\r
-                foreach (var part in this._addedParts)\r
-                {\r
-                    foreach (var export in part.ExportDefinitions)\r
-                    {\r
-                        if (definition.IsConstraintSatisfiedBy(export))\r
-                        {\r
-                            addedExports.Add(new Tuple<ComposablePartDefinition, ExportDefinition>(part, export));\r
-                        }\r
-                    }\r
-                }\r
-                return trimmedExports.Concat(addedExports);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogExport.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.CatalogExport.cs
deleted file mode 100644 (file)
index 0741cf3..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class CatalogExportProvider\r
-    {\r
-        private class CatalogExport : Export\r
-        {\r
-            protected readonly CatalogExportProvider _catalogExportProvider;\r
-            protected readonly ComposablePartDefinition _partDefinition;\r
-            protected readonly ExportDefinition _definition;\r
-            protected ComposablePart _part;\r
-\r
-            public CatalogExport(CatalogExportProvider catalogExportProvider,\r
-                ComposablePartDefinition partDefinition, ExportDefinition definition)\r
-            {\r
-                this._catalogExportProvider = catalogExportProvider;\r
-                this._partDefinition = partDefinition;\r
-                this._definition = definition;\r
-            }\r
-\r
-            public override ExportDefinition Definition\r
-            {\r
-                get\r
-                {\r
-                    return this._definition;\r
-                }\r
-            }\r
-\r
-            protected virtual bool IsSharedPart\r
-            {\r
-                get\r
-                {\r
-                    return true;\r
-                }\r
-            }\r
-\r
-            protected override object GetExportedValueCore()\r
-            {\r
-                ComposablePart part = this._catalogExportProvider.GetComposablePart(this._partDefinition, this.IsSharedPart);\r
-                object exportedValue = this._catalogExportProvider.GetExportedValue(part, this._definition, this.IsSharedPart);\r
-                this._part = part;\r
-\r
-                return exportedValue;\r
-            }\r
-\r
-            [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]\r
-            public static CatalogExport CreateExport(CatalogExportProvider catalogExportProvider,\r
-                ComposablePartDefinition partDefinition, ExportDefinition definition, CreationPolicy importCreationPolicy)\r
-            {\r
-                CreationPolicy partPolicy = partDefinition.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName);\r
-                bool isSharedPart = ShouldUseSharedPart(partPolicy, importCreationPolicy);\r
-\r
-                if (isSharedPart)\r
-                {\r
-                    return new CatalogExport(catalogExportProvider, partDefinition, definition);\r
-                }\r
-                else\r
-                {\r
-                    return new NonSharedCatalogExport(catalogExportProvider, partDefinition, definition);\r
-                }\r
-            }\r
-\r
-            private static bool ShouldUseSharedPart(CreationPolicy partPolicy, CreationPolicy importPolicy)\r
-            {\r
-                // Matrix that details which policy to use for a given part to satisfy a given import.\r
-                //                   Part.Any   Part.Shared  Part.NonShared\r
-                // Import.Any        Shared     Shared       NonShared\r
-                // Import.Shared     Shared     Shared       N/A\r
-                // Import.NonShared  NonShared  N/A          NonShared\r
-\r
-                switch (partPolicy)\r
-                {\r
-                    case CreationPolicy.Any:\r
-                        {\r
-                            if (importPolicy == CreationPolicy.Any ||\r
-                                importPolicy == CreationPolicy.Shared)\r
-                            {\r
-                                return true;\r
-                            }\r
-                            return false;\r
-                        }\r
-\r
-                    case CreationPolicy.NonShared:\r
-                        {\r
-                            Assumes.IsTrue(importPolicy != CreationPolicy.Shared);\r
-                            return false;\r
-                        }\r
-\r
-                    default:\r
-                        {\r
-                            Assumes.IsTrue(partPolicy == CreationPolicy.Shared);\r
-                            Assumes.IsTrue(importPolicy != CreationPolicy.NonShared);\r
-                            return true;\r
-                        }\r
-                }\r
-            }\r
-        }\r
-\r
-        private sealed class NonSharedCatalogExport : CatalogExport, IDisposable\r
-        {\r
-            public NonSharedCatalogExport(CatalogExportProvider catalogExportProvider,\r
-                ComposablePartDefinition partDefinition, ExportDefinition definition)\r
-                : base(catalogExportProvider, partDefinition, definition)\r
-            {\r
-            }\r
-\r
-            protected override bool IsSharedPart\r
-            {\r
-                get\r
-                {\r
-                    return false;\r
-                }\r
-            }\r
-\r
-            void IDisposable.Dispose()\r
-            {\r
-                if (this._part != null)\r
-                {\r
-                    this._catalogExportProvider.ReleasePart(this.Value, this._part, null);\r
-                    this._part = null;\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.PartCreatorExport.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.PartCreatorExport.cs
deleted file mode 100644 (file)
index 14d4a42..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Linq;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class CatalogExportProvider\r
-    {\r
-        internal class PartCreatorExport : Export\r
-        {\r
-            private readonly CatalogExportProvider _catalogExportProvider;\r
-            private readonly ComposablePartDefinition _partDefinition;\r
-            private readonly ExportDefinition _exportDefinition;\r
-            private ExportDefinition _partCreatorExportDefinition;\r
-            private PartCreatorPartDefinition _partCreatorPartDefinition;\r
-\r
-            public PartCreatorExport(CatalogExportProvider catalogExportProvider, ComposablePartDefinition partDefinition, ExportDefinition exportDefinition)\r
-            {\r
-                this._catalogExportProvider = catalogExportProvider;\r
-                this._partDefinition = partDefinition;\r
-                this._exportDefinition = exportDefinition;\r
-                this._partCreatorExportDefinition = new PartCreatorExportDefinition(this._exportDefinition);\r
-            }\r
-\r
-            public override ExportDefinition Definition\r
-            {\r
-                get { return this._partCreatorExportDefinition; }\r
-            }\r
-\r
-            protected override object GetExportedValueCore()\r
-            {\r
-                if (this._partCreatorPartDefinition == null)\r
-                {\r
-                    this._partCreatorPartDefinition = new PartCreatorPartDefinition(this);\r
-                }\r
-                return this._partCreatorPartDefinition;\r
-            }\r
-\r
-            public Export CreateExportProduct()\r
-            {\r
-                return new NonSharedCatalogExport(this._catalogExportProvider, this._partDefinition, this._exportDefinition);\r
-            }\r
-\r
-            private class PartCreatorPartDefinition : ComposablePartDefinition\r
-            {\r
-                private readonly PartCreatorExport _partCreatorExport;\r
-\r
-                public PartCreatorPartDefinition(PartCreatorExport partCreatorExport)\r
-                {\r
-                    this._partCreatorExport = partCreatorExport;\r
-                }\r
-\r
-                public override IEnumerable<ExportDefinition> ExportDefinitions\r
-                {\r
-                    get { return new ExportDefinition[] { this._partCreatorExport.Definition }; }\r
-                }\r
-\r
-                public override IEnumerable<ImportDefinition> ImportDefinitions\r
-                {\r
-                    get { return Enumerable.Empty<ImportDefinition>(); }\r
-                }\r
-\r
-                public ExportDefinition PartCreatorExportDefinition\r
-                {\r
-                    get { return this._partCreatorExport.Definition; }\r
-                }\r
-\r
-                public Export CreateProductExport()\r
-                {\r
-                    return this._partCreatorExport.CreateExportProduct();\r
-                }\r
-\r
-                public override ComposablePart CreatePart()\r
-                {\r
-                    return new PartCreatorPart(this);\r
-                }\r
-            }\r
-\r
-            private sealed class PartCreatorPart : ComposablePart, IDisposable\r
-            {\r
-                private readonly PartCreatorPartDefinition _definition;\r
-                private readonly Export _export;\r
-\r
-                public PartCreatorPart(PartCreatorPartDefinition definition)\r
-                {\r
-                    this._definition = definition;\r
-                    this._export = definition.CreateProductExport();\r
-                }\r
-\r
-                public override IEnumerable<ExportDefinition> ExportDefinitions\r
-                {\r
-                    get { return this._definition.ExportDefinitions; }\r
-                }\r
-\r
-                public override IEnumerable<ImportDefinition> ImportDefinitions\r
-                {\r
-                    get { return this._definition.ImportDefinitions; }\r
-                }\r
-\r
-                public override object GetExportedValue(ExportDefinition definition)\r
-                {\r
-                    if (definition != this._definition.PartCreatorExportDefinition)\r
-                    {\r
-                        throw ExceptionBuilder.CreateExportDefinitionNotOnThisComposablePart("definition");\r
-                    }\r
-\r
-                    return this._export.Value;\r
-                }\r
-\r
-                public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-                {\r
-                    throw ExceptionBuilder.CreateImportDefinitionNotOnThisComposablePart("definition");\r
-                }\r
-\r
-                public void Dispose()\r
-                {\r
-                    IDisposable disposable = this._export as IDisposable;\r
-\r
-                    if (disposable != null)\r
-                    {\r
-                        disposable.Dispose();\r
-                    }\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CatalogExportProvider.cs
deleted file mode 100644 (file)
index 5c00b5a..0000000
+++ /dev/null
@@ -1,816 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Diagnostics;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Runtime.CompilerServices;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class CatalogExportProvider : ExportProvider, IDisposable\r
-    {\r
-        private readonly CompositionLock _lock;\r
-        private Dictionary<ComposablePartDefinition, ComposablePart> _activatedParts = new Dictionary<ComposablePartDefinition, ComposablePart>();\r
-        private HashSet<ComposablePartDefinition> _rejectedParts = new HashSet<ComposablePartDefinition>();\r
-        private ConditionalWeakTable<object, List<ComposablePart>> _conditionalReferencesForRecomposableParts = new ConditionalWeakTable<object, List<ComposablePart>>();\r
-        private HashSet<IDisposable> _partsToDispose = new HashSet<IDisposable>();\r
-        private ComposablePartCatalog _catalog;\r
-        private volatile bool _isDisposed = false;\r
-        private volatile bool _isRunning = false;\r
-        private ExportProvider _sourceProvider;\r
-        private ImportEngine _importEngine;\r
-\r
-        /// <summary>\r
-        /// Initializes a new instance of the <see cref="CatalogExportProvider"/> class.\r
-        /// </summary>\r
-        /// <param name="catalog">\r
-        ///     The <see cref="ComposablePartCatalog"/> that the <see cref="CatalogExportProvider"/>\r
-        ///     uses to produce <see cref="Export"/> objects.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="catalog"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public CatalogExportProvider(ComposablePartCatalog catalog)\r
-            : this(catalog, false)\r
-        {\r
-        }\r
-\r
-        public CatalogExportProvider(ComposablePartCatalog catalog, bool isThreadSafe)\r
-        {\r
-            Requires.NotNull(catalog, "catalog");\r
-\r
-            this._catalog = catalog;\r
-\r
-            var notifyCatalogChanged = this._catalog as INotifyComposablePartCatalogChanged;\r
-            if (notifyCatalogChanged != null)\r
-            {\r
-                notifyCatalogChanged.Changing += this.OnCatalogChanging;\r
-            }\r
-\r
-            this._lock = new CompositionLock(isThreadSafe);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the composable part catalog that the provider users to \r
-        ///     produce exports.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="ComposablePartCatalog"/> that the \r
-        ///     <see cref="CatalogExportProvider"/>\r
-        ///     uses to produce <see cref="Export"/> objects.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        public ComposablePartCatalog Catalog\r
-        {\r
-            get\r
-            {\r
-                ThrowIfDisposed();\r
-\r
-                return this._catalog;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the export provider which provides the provider access to additional\r
-        ///     exports.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="ExportProvider"/> which provides the \r
-        ///     <see cref="CatalogExportProvider"/> access to additional\r
-        ///     <see cref="Export"/> objects. The default is <see langword="null"/>.\r
-        /// </value>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="value"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     This property has already been set.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     The methods on the <see cref="CatalogExportProvider"/> \r
-        ///     have already been accessed.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CatalogExportProvider"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     This property must be set before accessing any methods on the \r
-        ///     <see cref="CatalogExportProvider"/>.\r
-        /// </remarks>\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification="EnsureCanSet ensures that the property is set only once, Dispose is not required")]\r
-        public ExportProvider SourceProvider\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-                using (this._lock.LockStateForRead())\r
-                {\r
-                    return this._sourceProvider;\r
-                }\r
-            }\r
-            set\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                Requires.NotNull(value, "value");\r
-\r
-                ImportEngine newImportEngine = null;\r
-                bool isThrowing = true;\r
-                try\r
-                {\r
-                    newImportEngine = new ImportEngine(value, this._lock.IsThreadSafe);\r
-                    value.ExportsChanging += this.OnExportsChangingInternal;\r
-\r
-                    using (this._lock.LockStateForWrite())\r
-                    {\r
-                        this.EnsureCanSet(this._sourceProvider);\r
-\r
-                        this._sourceProvider = value;\r
-                        this._importEngine = newImportEngine;\r
-\r
-                        isThrowing = false;\r
-                    }\r
-                }\r
-                finally\r
-                {\r
-                    if (isThrowing)\r
-                    {\r
-                        value.ExportsChanging -= this.OnExportsChangingInternal;\r
-                        newImportEngine.Dispose();\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Releases unmanaged and - optionally - managed resources\r
-        /// </summary>\r
-        public void Dispose()\r
-        {\r
-            this.Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Releases unmanaged and - optionally - managed resources\r
-        /// </summary>\r
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>\r
-        protected virtual void Dispose(bool disposing)\r
-        {\r
-            if (disposing)\r
-            {\r
-                if (!this._isDisposed)\r
-                {\r
-                    bool disposeLock = false;\r
-                    INotifyComposablePartCatalogChanged catalogToUnsubscribeFrom = null;\r
-                    HashSet<IDisposable> partsToDispose = null;\r
-                    ExportProvider sourceProviderToUnsubscribeFrom = null;\r
-                    ImportEngine importEngineToDispose = null;\r
-\r
-                    try\r
-                    {\r
-                        using (this._lock.LockStateForWrite())\r
-                        {\r
-                            if (!this._isDisposed)\r
-                            {\r
-                                catalogToUnsubscribeFrom = this._catalog as INotifyComposablePartCatalogChanged;\r
-                                this._catalog = null;\r
-\r
-                                sourceProviderToUnsubscribeFrom = this._sourceProvider;\r
-                                this._sourceProvider = null;\r
-\r
-                                importEngineToDispose = this._importEngine;\r
-                                this._importEngine = null;\r
-\r
-                                partsToDispose = this._partsToDispose;\r
-                                this._partsToDispose = new HashSet<IDisposable>();\r
-                                this._activatedParts.Clear();\r
-                                this._conditionalReferencesForRecomposableParts = null;\r
-\r
-                                disposeLock = true;\r
-                                this._isDisposed = true;\r
-                            }\r
-                        }\r
-                    }\r
-                    finally\r
-                    {\r
-                        if (catalogToUnsubscribeFrom != null)\r
-                        {\r
-                            catalogToUnsubscribeFrom.Changing -= this.OnCatalogChanging;\r
-                        }\r
-\r
-                        if (sourceProviderToUnsubscribeFrom != null)\r
-                        {\r
-                            sourceProviderToUnsubscribeFrom.ExportsChanging -= this.OnExportsChangingInternal;\r
-                        }\r
-\r
-                        if (importEngineToDispose != null)\r
-                        {\r
-                            importEngineToDispose.Dispose();\r
-                        }\r
-\r
-                        if (partsToDispose != null)\r
-                        {\r
-                            foreach (var part in partsToDispose)\r
-                            {\r
-                                part.Dispose();\r
-                            }\r
-                        }\r
-\r
-                        if (disposeLock)\r
-                        {\r
-                            this._lock.Dispose();\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns all exports that match the conditions of the specified import.\r
-        /// </summary>\r
-        /// <param name="definition">The <see cref="ImportDefinition"/> that defines the conditions of the\r
-        /// <see cref="Export"/> to get.</param>\r
-        /// <returns></returns>\r
-        /// <result>\r
-        /// An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects that match\r
-        /// the conditions defined by <see cref="ImportDefinition"/>, if found; otherwise, an\r
-        /// empty <see cref="IEnumerable{T}"/>.\r
-        /// </result>\r
-        /// <remarks>\r
-        ///    <note type="inheritinfo">\r
-        /// The implementers should not treat the cardinality-related mismatches as errors, and are not\r
-        /// expected to throw exceptions in those cases.\r
-        /// For instance, if the import requests exactly one export and the provider has no matching exports or more than one,\r
-        /// it should return an empty <see cref="IEnumerable{T}"/> of <see cref="Export"/>.\r
-        /// </note>\r
-        /// </remarks>\r
-        protected override IEnumerable<Export> GetExportsCore(ImportDefinition definition, AtomicComposition atomicComposition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this.EnsureRunning();\r
-\r
-            // Use the version of the catalog appropriate to this atomicComposition\r
-            ComposablePartCatalog currentCatalog = atomicComposition.GetValueAllowNull(this._catalog);\r
-\r
-            IPartCreatorImportDefinition partCreatorDefinition = definition as IPartCreatorImportDefinition;\r
-            bool isPartCreator = false;\r
-\r
-            if (partCreatorDefinition != null)\r
-            {\r
-                definition = partCreatorDefinition.ProductImportDefinition;\r
-                isPartCreator = true;\r
-            }\r
-\r
-            CreationPolicy importPolicy = definition.GetRequiredCreationPolicy();\r
-\r
-            List<Export> exports = new List<Export>();\r
-            foreach (var partDefinitionAndExportDefinition in currentCatalog.GetExports(definition))\r
-            {\r
-                if (!IsRejected(partDefinitionAndExportDefinition.Item1, atomicComposition))\r
-                {\r
-                    if (isPartCreator)\r
-                    {\r
-                        exports.Add(new PartCreatorExport(this,\r
-                            partDefinitionAndExportDefinition.Item1,\r
-                            partDefinitionAndExportDefinition.Item2));\r
-                    }\r
-                    else\r
-                    {\r
-                        exports.Add(CatalogExport.CreateExport(this, \r
-                            partDefinitionAndExportDefinition.Item1, \r
-                            partDefinitionAndExportDefinition.Item2, \r
-                            importPolicy));\r
-                    }\r
-                }\r
-            }\r
-\r
-            return exports;\r
-        }\r
-\r
-        private void OnExportsChangingInternal(object sender, ExportsChangeEventArgs e)\r
-        {\r
-            UpdateRejections(e.AddedExports.Concat(e.RemovedExports), e.AtomicComposition);\r
-        }\r
-\r
-        private static ExportDefinition[] GetExportsFromPartDefinitions(IEnumerable<ComposablePartDefinition> partDefinitions)\r
-        {\r
-            List<ExportDefinition> exports = new List<ExportDefinition>();\r
-\r
-            foreach (var partDefinition in partDefinitions)\r
-            {\r
-                foreach (var export in partDefinition.ExportDefinitions)\r
-                {\r
-                    exports.Add(export);\r
-\r
-                    // While creating a PartCreatorExportDefinition for every changed definition may not be the most\r
-                    // efficient way to do this the PartCreatorExportDefinition is very efficient and doesn't do any\r
-                    // real work unless its metadata is pulled on. If this turns out to be a bottleneck then we\r
-                    // will need to start tracking all the PartCreator's we hand out and only send those which we \r
-                    // have handed out. In fact we could do the same thing for all the Exports if we wished but \r
-                    // that requires a cache management which we don't want to do at this point.\r
-                    exports.Add(new PartCreatorExportDefinition(export));\r
-                }\r
-            }\r
-\r
-            return exports.ToArray();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]\r
-        private void OnCatalogChanging(object sender, ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            using (var atomicComposition = new AtomicComposition(e.AtomicComposition))\r
-            {\r
-                // Save the preview catalog to use in place of the original while handling\r
-                // this event\r
-                atomicComposition.SetValue(this._catalog,\r
-                    new CatalogChangeProxy(this._catalog, e.AddedDefinitions, e.RemovedDefinitions));\r
-\r
-                IEnumerable<ExportDefinition> addedExports = GetExportsFromPartDefinitions(e.AddedDefinitions);\r
-                IEnumerable<ExportDefinition> removedExports = GetExportsFromPartDefinitions(e.RemovedDefinitions);\r
-\r
-                // Remove any parts based on eliminated definitions (in a atomicComposition-friendly\r
-                // fashion)\r
-                foreach (var definition in e.RemovedDefinitions)\r
-                {\r
-                    ComposablePart removedPart = null;\r
-                    bool removed = false;\r
-\r
-                    using (this._lock.LockStateForRead())\r
-                    {\r
-                        removed = this._activatedParts.TryGetValue(definition, out removedPart);\r
-                    }\r
-                    if (removed)\r
-                    {\r
-                        var capturedDefinition = definition;\r
-                        ReleasePart(null, removedPart, atomicComposition);\r
-                        atomicComposition.AddCompleteActionAllowNull(() =>\r
-                        {\r
-                            using (this._lock.LockStateForWrite())\r
-                            {\r
-                                this._activatedParts.Remove(capturedDefinition);\r
-                            }\r
-                        });\r
-                    }\r
-                }\r
-\r
-                UpdateRejections(addedExports.ConcatAllowingNull(removedExports), atomicComposition);\r
-\r
-                this.OnExportsChanging(\r
-                    new ExportsChangeEventArgs(addedExports, removedExports, atomicComposition));\r
-\r
-                atomicComposition.AddCompleteAction(() => this.OnExportsChanged(\r
-                    new ExportsChangeEventArgs(addedExports, removedExports, null)));\r
-\r
-                atomicComposition.Complete();\r
-            }\r
-        }\r
-\r
-        private ComposablePart GetComposablePart(ComposablePartDefinition partDefinition, bool isSharedPart)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this.EnsureRunning();\r
-\r
-            ComposablePart part;\r
-\r
-            if (isSharedPart)\r
-            {\r
-                part = GetSharedPart(partDefinition);\r
-            }\r
-            else\r
-            {\r
-                part = partDefinition.CreatePart();\r
-\r
-                IDisposable disposablePart = part as IDisposable;\r
-                if (disposablePart != null)\r
-                {\r
-                    using (this._lock.LockStateForWrite())\r
-                    {\r
-                        this._partsToDispose.Add(disposablePart);\r
-                    }\r
-                }\r
-            }\r
-\r
-            return part;\r
-        }\r
-\r
-        private ComposablePart GetSharedPart(ComposablePartDefinition partDefinition)\r
-        {\r
-            ComposablePart part;\r
-            bool found = false;\r
-\r
-            using (this._lock.LockStateForRead())\r
-            {\r
-                found = this._activatedParts.TryGetValue(partDefinition, out part);\r
-            }\r
-\r
-            if (!found)\r
-            {\r
-                ComposablePart newPart = partDefinition.CreatePart();\r
-\r
-                using (this._lock.LockStateForWrite())\r
-                {\r
-                    found = this._activatedParts.TryGetValue(partDefinition, out part);\r
-\r
-                    if (!found)\r
-                    {\r
-                        part = newPart;\r
-                        this._activatedParts.Add(partDefinition, part);\r
-                        IDisposable disposablePart = part as IDisposable;\r
-                        if (disposablePart != null)\r
-                        {\r
-                            this._partsToDispose.Add(disposablePart);\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            return part;\r
-        }\r
-\r
-        private object GetExportedValue(ComposablePart part, ExportDefinition export, bool isSharedPart)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this.EnsureRunning();\r
-\r
-            Assumes.NotNull(part, export);\r
-\r
-            object exportedValue = CompositionServices.GetExportedValueFromComposedPart(\r
-                this._importEngine, part, export);\r
-\r
-            // Only hold conditional references for recomposable non-shared parts because we are \r
-            // already holding strong references to the shared parts.\r
-            if (exportedValue != null && !isSharedPart && part.IsRecomposable())\r
-            {\r
-                SetConditionalReferenceForRecomposablePart(exportedValue, part);\r
-            }\r
-\r
-            return exportedValue;\r
-        }\r
-\r
-        private void ReleasePart(object exportedValue, ComposablePart part, AtomicComposition atomicComposition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this.EnsureRunning();\r
-\r
-            Assumes.NotNull(part);\r
-\r
-            this._importEngine.ReleaseImports(part, atomicComposition);\r
-\r
-            if (exportedValue != null)\r
-            {\r
-                atomicComposition.AddCompleteActionAllowNull(() =>\r
-                {\r
-                    using (this._lock.LockStateForWrite())\r
-                    {\r
-                        this._conditionalReferencesForRecomposableParts.Remove(exportedValue);\r
-                    }\r
-                });\r
-            }\r
-\r
-            IDisposable diposablePart = part as IDisposable;\r
-            if (diposablePart != null)\r
-            {\r
-                atomicComposition.AddCompleteActionAllowNull(() =>\r
-                {\r
-                    bool removed = false;\r
-                    using (this._lock.LockStateForWrite())\r
-                    {\r
-                        removed = this._partsToDispose.Remove(diposablePart);\r
-                    }\r
-                    if (removed)\r
-                    {\r
-                        diposablePart.Dispose();\r
-                    }\r
-                });\r
-            }\r
-        }\r
-\r
-        private void SetConditionalReferenceForRecomposablePart(object exportedValue, ComposablePart part)\r
-        {\r
-            Assumes.NotNull(exportedValue, part);\r
-\r
-            List<ComposablePart> partList;\r
-\r
-            using (this._lock.LockStateForWrite())\r
-            {\r
-                if (!this._conditionalReferencesForRecomposableParts.TryGetValue(exportedValue, out partList))\r
-                {\r
-                    partList = new List<ComposablePart>();\r
-                    this._conditionalReferencesForRecomposableParts.Add(exportedValue, partList);\r
-                }\r
-\r
-                // There is one really obscure case (one part exporting exact value multiple times) where\r
-                // the part may already be in the list but it isn't a scenario that is interesting so \r
-                // we simply always add. Later if we change this to support more than non-shared we may\r
-                // need to check if the part already exists to pervent adding it multiple times.\r
-                partList.Add(part);\r
-            }\r
-        }\r
-\r
-        private bool IsRejected(ComposablePartDefinition definition, AtomicComposition atomicComposition)\r
-        {\r
-            // Check to see if we're currently working on the definition in question.\r
-            // Recursive queries always answer optimistically, as if the definition hasn't\r
-            // been rejected - because if it is we can discard all decisions that were based\r
-            // on the faulty assumption in the first place.\r
-            var forceRejectionTest = false;\r
-            if (atomicComposition != null)\r
-            {\r
-                var atomicCompositionQuery = GetAtomicCompositionQuery(atomicComposition);\r
-                AtomicCompositionQueryState state = atomicCompositionQuery(definition);\r
-                switch (state)\r
-                {\r
-                    case AtomicCompositionQueryState.TreatAsRejected:\r
-                        return true;\r
-                    case AtomicCompositionQueryState.TreatAsValidated:\r
-                        return false;\r
-                    case AtomicCompositionQueryState.NeedsTesting:\r
-                        forceRejectionTest = true;\r
-                        break;\r
-                    default:\r
-                        Assumes.IsTrue(state == AtomicCompositionQueryState.Unknown);\r
-                        // Need to do the work to determine the state\r
-                        break;\r
-                }\r
-            }\r
-\r
-            if (!forceRejectionTest)\r
-            {\r
-                // Next, anything that has been activated is not rejected\r
-                using (this._lock.LockStateForRead())\r
-                {\r
-                    if (this._activatedParts.ContainsKey(definition))\r
-                    {\r
-                        return false;\r
-                    }\r
-\r
-                    // Last stop before doing the hard work: check a specific registry of rejected parts\r
-                    if (this._rejectedParts.Contains(definition))\r
-                    {\r
-                        return true;\r
-                    }\r
-                }\r
-            }\r
-\r
-            // Determine whether or not the definition's imports can be satisfied\r
-            return DetermineRejection(definition, atomicComposition);\r
-        }\r
-\r
-        private bool DetermineRejection(ComposablePartDefinition definition, AtomicComposition parentAtomicComposition)\r
-        {\r
-            ChangeRejectedException exception = null;\r
-\r
-            using (var localAtomicComposition = new AtomicComposition(parentAtomicComposition))\r
-            {\r
-                // The part definition we're currently working on is treated optimistically\r
-                // as if we know it hasn't been rejected.  This handles recursion, and if we\r
-                // later decide that it has been rejected we'll discard all nested progress so\r
-                // all side-effects of the mistake are erased.\r
-                //\r
-                // Note that this means that recursive failures that would be detected by the\r
-                // import engine are not discovered by rejection currently.  Loops among\r
-                // prerequisites, runaway import chains involving factories, and prerequisites\r
-                // that cannot be fully satisfied still result in runtime errors.  Doing\r
-                // otherwise would be possible but potentially expensive - and could be a v2\r
-                // improvement if deemed worthwhile.\r
-                UpdateAtomicCompositionQuery(localAtomicComposition,\r
-                    def => definition.Equals(def), AtomicCompositionQueryState.TreatAsValidated);\r
-\r
-                var newPart = definition.CreatePart();\r
-                try\r
-                {\r
-                    this._importEngine.PreviewImports(newPart, localAtomicComposition);\r
-\r
-                    // Reuse the partially-fleshed out part the next time we need a shared\r
-                    // instance to keep the expense of pre-validation to a minimum.  Note that\r
-                    // _activatedParts holds references to both shared and non-shared parts.\r
-                    // The non-shared parts will only be used for rejection purposes only but\r
-                    // the shared parts will be handed out when requested via GetExports as \r
-                    // well as be used for rejection purposes.\r
-                    localAtomicComposition.AddCompleteActionAllowNull(() =>\r
-                    {\r
-                        using (this._lock.LockStateForWrite())\r
-                        {\r
-                            if (!this._activatedParts.ContainsKey(definition))\r
-                            {\r
-                                this._activatedParts.Add(definition, newPart);\r
-                                IDisposable newDisposablePart = newPart as IDisposable;\r
-                                if (newDisposablePart != null)\r
-                                {\r
-                                    this._partsToDispose.Add(newDisposablePart);\r
-                                }\r
-                            }\r
-                        }\r
-                    });\r
-\r
-                    // Success! Complete any recursive work that was conditioned on this part's validation\r
-                    localAtomicComposition.Complete();\r
-\r
-                    return false;\r
-                }\r
-                catch (ChangeRejectedException ex)\r
-                {\r
-                    exception = ex;                    \r
-                }\r
-            }\r
-\r
-            // If we've reached this point then this part has been rejected so we need to \r
-            // record the rejection in our parent composition or execute it immediately if \r
-            // one doesn't exist.\r
-            parentAtomicComposition.AddCompleteActionAllowNull(() =>\r
-            {\r
-                using (this._lock.LockStateForWrite())\r
-                {\r
-                    this._rejectedParts.Add(definition);\r
-                }\r
-\r
-                CompositionTrace.PartDefinitionRejected(definition, exception);\r
-\r
-            });\r
-            if (parentAtomicComposition != null)\r
-            {\r
-                UpdateAtomicCompositionQuery(parentAtomicComposition,\r
-                    def => definition.Equals(def), AtomicCompositionQueryState.TreatAsRejected);\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private void UpdateRejections(IEnumerable<ExportDefinition> changedExports, AtomicComposition atomicComposition)\r
-        {\r
-            using (var localAtomicComposition = new AtomicComposition(atomicComposition))\r
-            {\r
-                // Reconsider every part definition that has been previously\r
-                // rejected to see if any of them can be added back.\r
-                var affectedRejections = new HashSet<ComposablePartDefinition>();\r
-                var atomicCompositionQuery = GetAtomicCompositionQuery(localAtomicComposition);\r
-\r
-                ComposablePartDefinition[] rejectedParts;\r
-                using (this._lock.LockStateForRead())\r
-                {\r
-                    rejectedParts = this._rejectedParts.ToArray();\r
-                }\r
-                foreach (var definition in rejectedParts)\r
-                {\r
-                    if (atomicCompositionQuery(definition) == AtomicCompositionQueryState.TreatAsValidated)\r
-                    {\r
-                        continue;\r
-                    }\r
-\r
-                    foreach (var import in definition.ImportDefinitions.Where(ImportEngine.IsRequiredImportForPreview))\r
-                    {\r
-                        if (changedExports.Any(export => import.IsConstraintSatisfiedBy(export)))\r
-                        {\r
-                            affectedRejections.Add(definition);\r
-                            break;\r
-                        }\r
-                    }\r
-                }\r
-                UpdateAtomicCompositionQuery(localAtomicComposition,\r
-                    def => affectedRejections.Contains(def), AtomicCompositionQueryState.NeedsTesting);\r
-\r
-                // Determine if any of the resurrectable parts is now available so that we can\r
-                // notify listeners of the exact changes to exports\r
-                var resurrectedExports = new List<ExportDefinition>();\r
-\r
-                foreach (var partDefinition in affectedRejections)\r
-                {\r
-                    if (!IsRejected(partDefinition, localAtomicComposition))\r
-                    {\r
-                        // Notify listeners of the newly available exports and\r
-                        // prepare to remove the rejected part from the list of rejections\r
-                        resurrectedExports.AddRange(partDefinition.ExportDefinitions);\r
-\r
-                        // Capture the local so that the closure below refers to the current definition\r
-                        // in the loop and not the value of 'partDefinition' when the closure executes\r
-                        var capturedPartDefinition = partDefinition;\r
-                        localAtomicComposition.AddCompleteAction(() =>\r
-                        {\r
-                            using (this._lock.LockStateForWrite())\r
-                            {\r
-                                this._rejectedParts.Remove(capturedPartDefinition);                                \r
-                            }\r
-\r
-                            CompositionTrace.PartDefinitionResurrected(capturedPartDefinition);\r
-                        });\r
-                    }\r
-                }\r
-\r
-                // Notify anyone sourcing exports that the resurrected exports have appeared\r
-                if (resurrectedExports.Any())\r
-                {\r
-                    this.OnExportsChanging(\r
-                        new ExportsChangeEventArgs(resurrectedExports, new ExportDefinition[0], localAtomicComposition));\r
-\r
-                    localAtomicComposition.AddCompleteAction(() => this.OnExportsChanged(\r
-                        new ExportsChangeEventArgs(resurrectedExports, new ExportDefinition[0], null)));\r
-                }\r
-\r
-                localAtomicComposition.Complete();\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///  EnsureCanRun must be called from within a lock.\r
-        /// </summary>\r
-        [DebuggerStepThrough]\r
-        private void EnsureCanRun()\r
-        {\r
-            if ((this._sourceProvider == null) || (this._importEngine == null))\r
-            {\r
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Strings.ObjectMustBeInitialized, "SourceProvider")); // NOLOC\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void EnsureRunning()\r
-        {\r
-            if (!this._isRunning)\r
-            {\r
-                using (this._lock.LockStateForWrite())\r
-                {\r
-                    if (!this._isRunning)\r
-                    {\r
-                        this.EnsureCanRun();\r
-                        this._isRunning = true;\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///  EnsureCanSet<T> must be called from within a lock.\r
-        /// </summary>\r
-        /// <typeparam name="T"></typeparam>\r
-        /// <param name="currentValue"></param>\r
-        [DebuggerStepThrough]\r
-        private void EnsureCanSet<T>(T currentValue)\r
-            where T : class\r
-        {\r
-            if ((this._isRunning) || (currentValue != null))\r
-            {\r
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Strings.ObjectAlreadyInitialized));\r
-            }\r
-        }\r
-\r
-        private Func<ComposablePartDefinition, AtomicCompositionQueryState> GetAtomicCompositionQuery(AtomicComposition atomicComposition)\r
-        {\r
-            Func<ComposablePartDefinition, AtomicCompositionQueryState> atomicCompositionQuery;\r
-            atomicComposition.TryGetValue(this, out atomicCompositionQuery);\r
-\r
-            if (atomicCompositionQuery == null)\r
-            {\r
-                return (definition) => AtomicCompositionQueryState.Unknown;\r
-            }\r
-\r
-            return atomicCompositionQuery;\r
-        }\r
-\r
-        private void UpdateAtomicCompositionQuery(\r
-            AtomicComposition atomicComposition,\r
-            Func<ComposablePartDefinition, bool> query,\r
-            AtomicCompositionQueryState state)\r
-        {\r
-            var parentQuery = GetAtomicCompositionQuery(atomicComposition);\r
-            Func<ComposablePartDefinition, AtomicCompositionQueryState> newQuery = definition =>\r
-            {\r
-                if (query(definition))\r
-                {\r
-                    return state;\r
-                }\r
-                return parentQuery(definition);\r
-            };\r
-\r
-            atomicComposition.SetValue(this, newQuery);\r
-        }\r
-\r
-        private enum AtomicCompositionQueryState\r
-        {\r
-            Unknown,\r
-            TreatAsRejected,\r
-            TreatAsValidated,\r
-            NeedsTesting\r
-        };\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogChangeEventArgs.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogChangeEventArgs.cs
deleted file mode 100644 (file)
index bbb20fe..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     Provides data for the <see cref="INotifyComposablePartCatalogChanged.Changed"/> and\r
-    ///     <see cref="INotifyComposablePartCatalogChanged.Changing"/> events.\r
-    /// </summary>\r
-    public class ComposablePartCatalogChangeEventArgs : EventArgs\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartCatalogChangeEventArgs"/>.\r
-        /// </summary>\r
-        /// <param name="addedDefinitions">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ComposablePartDefinition"/> objects that \r
-        ///     are being added to the <see cref="ComposablePartCatalog"/>.\r
-        /// </param>\r
-        /// <param name="removedDefinitions">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ComposablePartDefinition"/> objects that \r
-        ///     are being removed from the <see cref="ComposablePartCatalog"/>.\r
-        /// </param>\r
-        /// <param name="atomicComposition">\r
-        ///     A <see cref="AtomicComposition"/> representing all tentative changes that will\r
-        ///     be completed if the change is successful, or discarded if it is not. \r
-        ///     <see langword="null"/> if being applied outside a <see cref="AtomicComposition"/> \r
-        ///     or during a <see cref="INotifyComposablePartCatalogChanged.Changed"/> event.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="addedDefinitions"/> or <paramref name="removedDefinitions"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public ComposablePartCatalogChangeEventArgs(IEnumerable<ComposablePartDefinition> addedDefinitions,\r
-            IEnumerable<ComposablePartDefinition> removedDefinitions, AtomicComposition atomicComposition)\r
-        {\r
-            Requires.NotNull(addedDefinitions, "addedDefinitions");\r
-            Requires.NotNull(removedDefinitions, "removedDefinitions");\r
-\r
-            this.AddedDefinitions = addedDefinitions.AsArray();\r
-            this.RemovedDefinitions = removedDefinitions.AsArray();\r
-            this.AtomicComposition = atomicComposition;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the identifiers of the parts that have been added.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ComposablePartDefinition"/> objects that \r
-        ///     have been added to the <see cref="ComposablePartCatalog"/>.\r
-        /// </value>\r
-        public IEnumerable<ComposablePartDefinition> AddedDefinitions { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Gets the identifiers of the parts that have been removed.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ComposablePartDefinition"/> objects that \r
-        ///     have been removed from from the <see cref="ComposablePartCatalog"/>.\r
-        /// </value>\r
-        public IEnumerable<ComposablePartDefinition> RemovedDefinitions { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Gets the atomicComposition, if any, that this change applies to.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="AtomicComposition"/> that this set of changes applies too. \r
-        ///     It can be <see langword="null"/> if the changes are being applied outside a \r
-        ///     <see cref="AtomicComposition"/> or during a \r
-        ///     <see cref="INotifyComposablePartCatalogChanged.Changed"/> event.\r
-        ///     \r
-        ///     When the value is non-null it should be used to record temporary changed state\r
-        ///     and actions that will be executed when the atomicComposition is completeed.\r
-        /// </value>\r
-        public AtomicComposition AtomicComposition { get; private set; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogCollection.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartCatalogCollection.cs
deleted file mode 100644 (file)
index 466ab68..0000000
+++ /dev/null
@@ -1,420 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.ObjectModel;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-using System.Diagnostics;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     This class implements a threadsafe ICollection{T} of ComposablePartCatalog.\r
-    ///     It is exposed as an ICollection(ComposablePartCatalog)\r
-    ///     It is threadsafe, notifications are not marshalled using a SynchronizationContext.\r
-    ///     It is Disposable.\r
-    /// </summary>\r
-    internal class ComposablePartCatalogCollection : ICollection<ComposablePartCatalog>, INotifyComposablePartCatalogChanged, IDisposable\r
-    {\r
-        private readonly Lock _lock = new Lock();\r
-        private Action<ComposablePartCatalogChangeEventArgs> _onChanged;\r
-        private Action<ComposablePartCatalogChangeEventArgs> _onChanging;\r
-        private List<ComposablePartCatalog> _catalogs = new List<ComposablePartCatalog>();\r
-        private volatile bool _isCopyNeeded = false;\r
-        private volatile bool _isDisposed = false;\r
-        private bool _hasChanged = false;\r
-\r
-        public ComposablePartCatalogCollection(IEnumerable<ComposablePartCatalog> catalogs)\r
-            : this(catalogs, null, null)\r
-        {\r
-        }\r
-\r
-        public ComposablePartCatalogCollection(\r
-            IEnumerable<ComposablePartCatalog> catalogs,\r
-            Action<ComposablePartCatalogChangeEventArgs> onChanged,\r
-            Action<ComposablePartCatalogChangeEventArgs> onChanging)\r
-        {\r
-            catalogs = catalogs ?? Enumerable.Empty<ComposablePartCatalog>();\r
-            this._catalogs = new List<ComposablePartCatalog>(catalogs);\r
-            this._onChanged = onChanged;\r
-            this._onChanging = onChanging;\r
-\r
-            SubscribeToCatalogNotifications(catalogs);\r
-        }\r
-\r
-        public void Add(ComposablePartCatalog item)\r
-        {\r
-            Requires.NotNull(item, "item");\r
-\r
-            this.ThrowIfDisposed();\r
-\r
-            var addedParts = new Lazy<IEnumerable<ComposablePartDefinition>>(() => item.Parts.ToArray(), false);\r
-\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                this.RaiseChangingEvent(addedParts, null, atomicComposition);\r
\r
-                using (new WriteLock(this._lock))\r
-                {\r
-                    if (this._isCopyNeeded)\r
-                    {\r
-                        this._catalogs = new List<ComposablePartCatalog>(this._catalogs);\r
-                        this._isCopyNeeded = false;\r
-                    }\r
-                    this._hasChanged = true;\r
-                    this._catalogs.Add(item);\r
-                }\r
-                \r
-                this.SubscribeToCatalogNotifications(item);\r
-\r
-                // Complete after the catalog changes are written\r
-                atomicComposition.Complete();\r
-            }\r
-\r
-            this.RaiseChangedEvent(addedParts, null);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog has changed.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changed;\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog has changing.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changing;\r
-\r
-        public void Clear()\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            // No action is required if we are already empty\r
-            ComposablePartCatalog[] catalogs = null;\r
-            using (new ReadLock(this._lock))\r
-            {\r
-                if (this._catalogs.Count == 0)\r
-                {\r
-                    return;\r
-                }\r
-                catalogs = this._catalogs.ToArray();\r
-            }\r
-\r
-            //TODO-MT: This is pretty suspect - we can easily eliminate catalogs that aren't listed as being\r
-            // removed.  Then again, the idea of trying to mutate the catalog on two threads at the same time is pretty\r
-            // suspect to begin with.  When would that ever result in a meaningful composition?\r
-\r
-            // We are doing this outside of the lock, so it's possible that the catalog will continute propagating events from things\r
-            // we are about to unsubscribe from. Given the non-specificity of our event, in the worst case scenario we would simply fire \r
-            // unnecessary events.\r
-\r
-            var removedParts = new Lazy<IEnumerable<ComposablePartDefinition>>(() => catalogs.SelectMany(catalog => catalog.Parts).ToArray(), false);\r
-\r
-            // Validate the changes before applying them\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                this.RaiseChangingEvent(null, removedParts, atomicComposition);\r
-                this.UnsubscribeFromCatalogNotifications(catalogs);\r
-\r
-                using (new WriteLock(this._lock))\r
-                {\r
-                    this._catalogs = new List<ComposablePartCatalog>();\r
-\r
-                    this._isCopyNeeded = false;\r
-                    this._hasChanged = true;\r
-                }\r
-\r
-                // Complete after the catalog changes are written\r
-                atomicComposition.Complete();\r
-            }\r
-\r
-            this.RaiseChangedEvent(null, removedParts);\r
-        }\r
-\r
-        public bool Contains(ComposablePartCatalog item)\r
-        {\r
-            Requires.NotNull(item, "item");\r
-\r
-            this.ThrowIfDisposed();\r
-\r
-            using (new ReadLock(this._lock))\r
-            {\r
-                return this._catalogs.Contains(item);\r
-            }\r
-        }\r
-\r
-        public void CopyTo(ComposablePartCatalog[] array, int arrayIndex)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            using (new ReadLock(this._lock))\r
-            {\r
-                this._catalogs.CopyTo(array, arrayIndex);\r
-            }\r
-        }\r
-\r
-        public int Count\r
-        {\r
-            get \r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                using (new ReadLock(this._lock))\r
-                {\r
-                    return this._catalogs.Count;\r
-                }\r
-            }\r
-        }\r
-\r
-        public bool IsReadOnly\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                return false;\r
-            }\r
-        }\r
-\r
-        public bool Remove(ComposablePartCatalog item)\r
-        {\r
-            Requires.NotNull(item, "item");\r
-\r
-            this.ThrowIfDisposed();\r
-\r
-            using (new ReadLock(this._lock))\r
-            {\r
-                if (!this._catalogs.Contains(item))\r
-                {\r
-                    return false;\r
-                }\r
-            }\r
-\r
-            bool isSuccessfulRemoval = false;\r
-\r
-            var removedParts = new Lazy<IEnumerable<ComposablePartDefinition>>(() => item.Parts.ToArray(), false);\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                this.RaiseChangingEvent(null, removedParts, atomicComposition);\r
-\r
-                using (new WriteLock(this._lock))\r
-                {\r
-                    if (_isCopyNeeded)\r
-                    {\r
-                        this._catalogs = new List<ComposablePartCatalog>(this._catalogs);\r
-                        this._isCopyNeeded = false;\r
-                    }\r
-\r
-                    isSuccessfulRemoval = this._catalogs.Remove(item);\r
-                    if (isSuccessfulRemoval)\r
-                    {\r
-                        this._hasChanged = true;\r
-                    }\r
-                }\r
-\r
-                this.UnsubscribeFromCatalogNotifications(item);\r
-\r
-                // Complete after the catalog changes are written\r
-                atomicComposition.Complete();\r
-            }\r
-\r
-            this.RaiseChangedEvent(null, removedParts);\r
-\r
-            return isSuccessfulRemoval;\r
-        }\r
-\r
-        internal bool HasChanged\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                using (new ReadLock(this._lock))\r
-                {\r
-                    return this._hasChanged;\r
-                }\r
-            }\r
-        }\r
-\r
-        public IEnumerator<ComposablePartCatalog> GetEnumerator()\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            using (new ReadLock(this._lock))\r
-            {\r
-                IEnumerator<ComposablePartCatalog> enumerator = this._catalogs.GetEnumerator();\r
-                this._isCopyNeeded = true;\r
-                return enumerator;\r
-            }\r
-        }\r
-\r
-        IEnumerator IEnumerable.GetEnumerator()\r
-        {\r
-            return this.GetEnumerator();\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        protected virtual void Dispose(bool disposing)\r
-        {\r
-            if (disposing)\r
-            {\r
-                if (!this._isDisposed)\r
-                {\r
-                    bool disposeLock = false;\r
-                    IEnumerable<ComposablePartCatalog> catalogs = null;\r
-                    try\r
-                    {\r
-                        using (new WriteLock(this._lock))\r
-                        {\r
-                            if (!this._isDisposed)\r
-                            {\r
-                                disposeLock = true;\r
-\r
-                                catalogs = this._catalogs;\r
-                                this._catalogs = null;\r
-\r
-                                this._isDisposed = true;\r
-                            }\r
-                        }\r
-                    }\r
-                    finally\r
-                    {\r
-                        if (catalogs != null)\r
-                        {\r
-                            this.UnsubscribeFromCatalogNotifications(catalogs);\r
-                            catalogs.ForEach(catalog => catalog.Dispose());\r
-                        }\r
-\r
-                        if (disposeLock)\r
-                        {\r
-                            this._lock.Dispose();\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        private void RaiseChangedEvent(\r
-            Lazy<IEnumerable<ComposablePartDefinition>> addedDefinitions,\r
-            Lazy<IEnumerable<ComposablePartDefinition>> removedDefinitions)\r
-        {\r
-            if (this._onChanged == null || this.Changed == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            var added = (addedDefinitions == null ? Enumerable.Empty<ComposablePartDefinition>() : addedDefinitions.Value);\r
-            var removed = (removedDefinitions == null ? Enumerable.Empty<ComposablePartDefinition>() : removedDefinitions.Value);\r
-\r
-            this._onChanged.Invoke(new ComposablePartCatalogChangeEventArgs(added, removed, null));\r
-        }\r
-\r
-        public void OnChanged(object sender, ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            var changedEvent = this.Changed;\r
-            if (changedEvent != null)\r
-            {\r
-                changedEvent(sender, e);\r
-            }\r
-        }\r
-\r
-        private void RaiseChangingEvent(\r
-           Lazy<IEnumerable<ComposablePartDefinition>> addedDefinitions,\r
-           Lazy<IEnumerable<ComposablePartDefinition>> removedDefinitions,\r
-           AtomicComposition atomicComposition)\r
-        {\r
-            if (this._onChanging == null || this.Changing == null)\r
-            {\r
-                return;\r
-            }\r
-            var added = (addedDefinitions == null ? Enumerable.Empty<ComposablePartDefinition>() : addedDefinitions.Value);\r
-            var removed = (removedDefinitions == null ? Enumerable.Empty<ComposablePartDefinition>() : removedDefinitions.Value);\r
-\r
-            this._onChanging.Invoke(new ComposablePartCatalogChangeEventArgs(added, removed, atomicComposition));\r
-        }\r
-\r
-        public void OnChanging(object sender, ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            var changingEvent = this.Changing;\r
-            if (changingEvent != null)\r
-            {\r
-                changingEvent(sender, e);\r
-            }\r
-        }\r
-\r
-        private void OnContainedCatalogChanged(object sender, ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            if (this._onChanged == null || this.Changed == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            this._onChanged.Invoke(e);\r
-        }\r
-\r
-        private void OnContainedCatalogChanging(object sender, ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            if (this._onChanging == null || this.Changing == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            this._onChanging.Invoke(e);\r
-        }\r
-\r
-        private void SubscribeToCatalogNotifications(ComposablePartCatalog catalog)\r
-        {\r
-            INotifyComposablePartCatalogChanged notifyCatalog = catalog as INotifyComposablePartCatalogChanged;\r
-            if (notifyCatalog != null)\r
-            {\r
-                notifyCatalog.Changed += this.OnContainedCatalogChanged;\r
-                notifyCatalog.Changing += this.OnContainedCatalogChanging;\r
-            }\r
-        }\r
-\r
-        private void SubscribeToCatalogNotifications(IEnumerable<ComposablePartCatalog> catalogs)\r
-        {\r
-            foreach (var catalog in catalogs)\r
-            {\r
-                SubscribeToCatalogNotifications(catalog);\r
-            }\r
-        }\r
-\r
-        private void UnsubscribeFromCatalogNotifications(ComposablePartCatalog catalog)\r
-        {\r
-            INotifyComposablePartCatalogChanged notifyCatalog = catalog as INotifyComposablePartCatalogChanged;\r
-            if (notifyCatalog != null)\r
-            {\r
-                notifyCatalog.Changed -= this.OnContainedCatalogChanged;\r
-                notifyCatalog.Changing -= this.OnContainedCatalogChanging;\r
-            }\r
-        }\r
-\r
-        private void UnsubscribeFromCatalogNotifications(IEnumerable<ComposablePartCatalog> catalogs)\r
-        {\r
-            foreach (var catalog in catalogs)\r
-            {\r
-                UnsubscribeFromCatalogNotifications(catalog);\r
-            }\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartExportProvider.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ComposablePartExportProvider.cs
deleted file mode 100644 (file)
index e8c68ea..0000000
+++ /dev/null
@@ -1,396 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public class ComposablePartExportProvider : ExportProvider, IDisposable\r
-    {\r
-        private List<ComposablePart> _parts = new List<ComposablePart>();\r
-        private volatile bool _isDisposed = false;\r
-        private volatile bool _isRunning = false;\r
-        private CompositionLock _lock = null;\r
-        private ExportProvider _sourceProvider;\r
-        private ImportEngine _importEngine;\r
-        private volatile bool _currentlyComposing;\r
-\r
-        /// <summary>\r
-        /// Initializes a new instance of the <see cref="ComposablePartExportProvider"/> class.\r
-        /// </summary>\r
-        public ComposablePartExportProvider() : \r
-            this(false)\r
-        {\r
-        }\r
-\r
-        public ComposablePartExportProvider(bool isThreadSafe)\r
-        {\r
-            this._lock = new CompositionLock(isThreadSafe);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.\r
-        /// </summary>\r
-        public void Dispose()\r
-        {\r
-            this.Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Releases unmanaged and - optionally - managed resources\r
-        /// </summary>\r
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>\r
-        protected virtual void Dispose(bool disposing)\r
-        {\r
-            if (disposing)\r
-            {\r
-                if (!this._isDisposed)\r
-                {\r
-                    bool disposeLock = false;\r
-                    ImportEngine oldImportEngine = null;\r
-                    try\r
-                    {\r
-                        using (this._lock.LockStateForWrite())\r
-                        {\r
-                            if (!this._isDisposed)\r
-                            {\r
-                                oldImportEngine = this._importEngine;\r
-                                this._importEngine = null;\r
-                                this._sourceProvider = null;\r
-                                this._isDisposed = true;\r
-                                disposeLock = true;\r
-                            }\r
-                        }\r
-                    }\r
-                    finally\r
-                    {\r
-                        if (oldImportEngine != null)\r
-                        {\r
-                            oldImportEngine.Dispose();\r
-                        }\r
-\r
-                        if (disposeLock)\r
-                        {\r
-                            this._lock.Dispose();\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the export provider which provides the provider access to\r
-        ///     exports.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="ExportProvider"/> which provides the \r
-        ///     <see cref="ComposablePartExportProvider"/> access to <see cref="Export"/> objects. \r
-        ///     The default is <see langword="null"/>.\r
-        /// </value>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="value"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     This property has already been set.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     The methods on the <see cref="ComposablePartExportProvider"/> \r
-        ///     have already been accessed.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePartExportProvider"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     This property must be set before accessing any methods on the \r
-        ///     <see cref="ComposablePartExportProvider"/>.\r
-        /// </remarks>\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "EnsureCanSet ensures that the property is set only once, Dispose is not required")]\r
-        public ExportProvider SourceProvider\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                return this._sourceProvider;\r
-            }\r
-            set\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                Requires.NotNull(value, "value");\r
-                using (this._lock.LockStateForWrite())\r
-                {\r
-                    this.EnsureCanSet(this._sourceProvider);\r
-                    this._sourceProvider = value;\r
-                }\r
-\r
-                // This should be safe to do outside the lock, because only the first setter will ever win\r
-                // and others will throw\r
-                ImportEngine importEngine = new ImportEngine(this._sourceProvider, this._lock.IsThreadSafe);\r
-                Thread.MemoryBarrier();\r
-                this._importEngine = importEngine;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns all exports that match the conditions of the specified import.\r
-        /// </summary>\r
-        /// <param name="definition">The <see cref="ImportDefinition"/> that defines the conditions of the\r
-        /// <see cref="Export"/> to get.</param>\r
-        /// <returns></returns>\r
-        /// <result>\r
-        /// An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects that match\r
-        /// the conditions defined by <see cref="ImportDefinition"/>, if found; otherwise, an\r
-        /// empty <see cref="IEnumerable{T}"/>.\r
-        /// </result>\r
-        /// <remarks>\r
-        ///    <note type="inheritinfo">\r
-        /// The implementers should not treat the cardinality-related mismatches as errors, and are not\r
-        /// expected to throw exceptions in those cases.\r
-        /// For instance, if the import requests exactly one export and the provider has no matching exports or more than one,\r
-        /// it should return an empty <see cref="IEnumerable{T}"/> of <see cref="Export"/>.\r
-        /// </note>\r
-        /// </remarks>\r
-        protected override IEnumerable<Export> GetExportsCore(ImportDefinition definition, AtomicComposition atomicComposition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this.EnsureRunning();\r
-\r
-            // Determine whether there is a composition atomicComposition-specific list of parts to use,\r
-            // failing that use the usual list.  We never change the list of parts in place,\r
-            // but rather copy, change and write a new list atomically.  Therefore all we need\r
-            // to do here is to read the _parts member.\r
-            List<ComposablePart> parts = null;\r
-            using (this._lock.LockStateForRead())\r
-            {\r
-                parts = atomicComposition.GetValueAllowNull(this, this._parts);\r
-            }\r
-\r
-            if (parts.Count == 0)\r
-            {\r
-                return Enumerable.Empty<Export>();\r
-            }\r
-\r
-            List<Export> exports = new List<Export>();\r
-            foreach (var part in parts)\r
-            {\r
-                foreach (var exportDefinition in part.ExportDefinitions)\r
-                {\r
-                    if (definition.IsConstraintSatisfiedBy(exportDefinition))\r
-                    {\r
-                        exports.Add(this.CreateExport(part, exportDefinition));\r
-                    }\r
-                }\r
-            }\r
-            return exports;\r
-        }    \r
-\r
-        public void Compose(CompositionBatch batch)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this.EnsureRunning();\r
-\r
-            Requires.NotNull(batch, "batch");\r
-\r
-            // Quick exit test can be done prior to cloning since it's just an optimization, not a\r
-            // change in behavior\r
-            if ((batch.PartsToAdd.Count == 0) && (batch.PartsToRemove.Count == 0))\r
-            {\r
-                return;\r
-            }\r
-\r
-            CompositionResult result = CompositionResult.SucceededResult;\r
-\r
-            // Clone the batch, so that the external changes wouldn't happen half-way thorugh compose\r
-            // NOTE : this does not guarantee the atomicity of cloning, which is not the goal anyway, \r
-            // rather the fact that all subsequent calls will deal with an unchanging batch\r
-            batch = new CompositionBatch(batch.PartsToAdd, batch.PartsToRemove);\r
-\r
-            var newParts = GetUpdatedPartsList(batch);\r
-\r
-            // Allow only recursive calls from the import engine to see the changes until\r
-            // they've been verified ...\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                // Don't allow reentrant calls to compose during previewing to prevent\r
-                // corrupted state.\r
-                if (this._currentlyComposing)\r
-                {\r
-                    throw new InvalidOperationException(Strings.ReentrantCompose);\r
-                }\r
-\r
-                this._currentlyComposing = true;\r
-\r
-                try\r
-                {\r
-                    // In the meantime recursive calls need to be able to see the list as well\r
-                    atomicComposition.SetValue(this, newParts);\r
-\r
-                    // Recompose any existing imports effected by the these changes first so that\r
-                    // adapters, resurrected parts, etc. can all play their role in satisfying\r
-                    // imports for added parts\r
-                    this.Recompose(batch, atomicComposition);\r
-\r
-                    // Ensure that required imports can be satisfied\r
-                    foreach (ComposablePart part in batch.PartsToAdd)\r
-                    {\r
-                        // collect the result of previewing all the adds in the batch\r
-                        try\r
-                        {\r
-                            this._importEngine.PreviewImports(part, atomicComposition);\r
-                        }\r
-                        catch (ChangeRejectedException ex)\r
-                        {\r
-                            result = result.MergeResult(new CompositionResult(ex.Errors));\r
-                        }\r
-                    }\r
-\r
-                    result.ThrowOnErrors(atomicComposition);\r
-\r
-                    // Complete the new parts since they passed previewing.`\r
-                    using (this._lock.LockStateForWrite())\r
-                    {\r
-                        this._parts = newParts;\r
-                    }\r
-\r
-                    atomicComposition.Complete();\r
-                }\r
-                finally\r
-                {\r
-                    this._currentlyComposing = false;\r
-                }\r
-            }\r
-\r
-            // Satisfy Imports\r
-            // - Satisfy imports on all newly added component parts\r
-            foreach (ComposablePart part in batch.PartsToAdd)\r
-            {\r
-                result = result.MergeResult(CompositionServices.TryInvoke(() =>\r
-                    this._importEngine.SatisfyImports(part)));\r
-            }\r
-\r
-            // return errors\r
-            result.ThrowOnErrors();\r
-        }\r
-\r
-        private List<ComposablePart> GetUpdatedPartsList(CompositionBatch batch)\r
-        {\r
-            Assumes.NotNull(batch);\r
-\r
-            // Copy the current list of parts - we are about to modify it\r
-            // This is an OK thing to do as this is the only method that can modify the List AND Compose can\r
-            // only be executed on one thread at a time - thus two different threads cannot tramp over each other\r
-            List<ComposablePart> parts = null;\r
-            using (this._lock.LockStateForRead())\r
-            {\r
-                parts = this._parts.ToList(); // this copies the list\r
-            }\r
-\r
-            foreach (ComposablePart part in batch.PartsToAdd)\r
-            {\r
-                parts.Add(part);\r
-            }\r
-\r
-            foreach (ComposablePart part in batch.PartsToRemove)\r
-            {\r
-                parts.Remove(part);\r
-            }\r
-\r
-            return parts;\r
-        }\r
-\r
-        private void Recompose(CompositionBatch batch, AtomicComposition atomicComposition)\r
-        {\r
-            Assumes.NotNull(batch);\r
-\r
-            // Unregister any removed component parts\r
-            foreach (ComposablePart part in batch.PartsToRemove)\r
-            {\r
-                this._importEngine.ReleaseImports(part, atomicComposition);\r
-            }\r
-\r
-            // Recompose any imports effected by the these changes (the changes are\r
-            // observable through GetExports in the appropriate atomicComposition, thus we can fire\r
-            // the event\r
-            IEnumerable<ExportDefinition> addedExports = batch.PartsToAdd.Count != 0 ?\r
-                batch.PartsToAdd.SelectMany(part => part.ExportDefinitions).ToArray() :\r
-                new ExportDefinition[0];\r
-\r
-            IEnumerable<ExportDefinition> removedExports = batch.PartsToRemove.Count != 0 ?\r
-                batch.PartsToRemove.SelectMany(part => part.ExportDefinitions).ToArray() :\r
-                new ExportDefinition[0];\r
-\r
-            this.OnExportsChanging(\r
-                new ExportsChangeEventArgs(addedExports, removedExports, atomicComposition));\r
-\r
-            atomicComposition.AddCompleteAction(() => this.OnExportsChanged(\r
-                new ExportsChangeEventArgs(addedExports, removedExports, null)));\r
-        }\r
-\r
-        private Export CreateExport(ComposablePart part, ExportDefinition export)\r
-        {\r
-            return new Export(export, () => GetExportedValue(part, export));\r
-        }\r
-\r
-        private object GetExportedValue(ComposablePart part, ExportDefinition export)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this.EnsureRunning();\r
-\r
-            return CompositionServices.GetExportedValueFromComposedPart(this._importEngine, part, export);\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw new ObjectDisposedException(this.GetType().Name);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void EnsureCanRun()\r
-        {\r
-            if ((this._sourceProvider == null) || (this._importEngine == null))\r
-            {\r
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Strings.ObjectMustBeInitialized, "SourceProvider")); // NOLOC\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void EnsureRunning()\r
-        {\r
-            if (!this._isRunning)\r
-            {\r
-                using (this._lock.LockStateForWrite())\r
-                {\r
-                    if (!this._isRunning)\r
-                    {\r
-                        this.EnsureCanRun();\r
-                        this._isRunning = true;\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void EnsureCanSet<T>(T currentValue)\r
-            where T : class\r
-        {\r
-            if ((this._isRunning) || (currentValue != null))\r
-            {\r
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Strings.ObjectAlreadyInitialized));\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.SingleExportComposablePart.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.SingleExportComposablePart.cs
deleted file mode 100644 (file)
index a2d2f7a..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    partial class CompositionBatch\r
-    {\r
-        // Represents a part that exports a single export\r
-        private class SingleExportComposablePart : ComposablePart\r
-        {\r
-            private readonly Export _export;\r
-\r
-            public SingleExportComposablePart(Export export)\r
-            {\r
-                Assumes.NotNull(export);\r
-\r
-                this._export = export;\r
-            }\r
-\r
-            public override IDictionary<string, object> Metadata\r
-            {\r
-                get { return MetadataServices.EmptyMetadata; }\r
-            }\r
-\r
-            public override IEnumerable<ExportDefinition> ExportDefinitions\r
-            {\r
-                get { return new ExportDefinition[] { _export.Definition }; }\r
-            }\r
-\r
-            public override IEnumerable<ImportDefinition> ImportDefinitions\r
-            {\r
-                get { return Enumerable.Empty<ImportDefinition>(); }\r
-            }\r
-\r
-            public override object GetExportedValue(ExportDefinition definition)\r
-            {\r
-                Requires.NotNull(definition, "definition");\r
-\r
-                if (definition != _export.Definition)\r
-                {\r
-                    throw ExceptionBuilder.CreateExportDefinitionNotOnThisComposablePart("definition");\r
-                }\r
-\r
-                return _export.Value;\r
-            }\r
-\r
-            public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-            {\r
-                Requires.NotNull(definition, "definition");\r
-                Requires.NotNullOrNullElements(exports, "exports");\r
-\r
-                throw ExceptionBuilder.CreateImportDefinitionNotOnThisComposablePart("definition");\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionBatch.cs
deleted file mode 100644 (file)
index 62f0a4d..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using System.Collections.ObjectModel;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class CompositionBatch\r
-    {\r
-        private object _lock = new object();\r
-        private bool _copyNeededForAdd;\r
-        private bool _copyNeededForRemove;\r
-        private List<ComposablePart> _partsToAdd;\r
-        private ReadOnlyCollection<ComposablePart> _readOnlyPartsToAdd;\r
-        private List<ComposablePart> _partsToRemove;\r
-        private ReadOnlyCollection<ComposablePart> _readOnlyPartsToRemove;\r
-\r
-        /// <summary>\r
-        /// Initializes a new instance of the <see cref="CompositionBatch"/> class.\r
-        /// </summary>\r
-        public CompositionBatch() : \r
-            this(null, null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        /// Initializes a new instance of the <see cref="CompositionBatch"/> class.\r
-        /// </summary>\r
-        /// <param name="partsToAdd">The parts to add.</param>\r
-        /// <param name="partsToRemove">The parts to remove.</param>\r
-        public CompositionBatch(IEnumerable<ComposablePart> partsToAdd, IEnumerable<ComposablePart> partsToRemove)\r
-        {\r
-            this._partsToAdd = new List<ComposablePart>();\r
-            if (partsToAdd != null)\r
-            {\r
-                foreach (var part in partsToAdd)\r
-                {\r
-                    if (part == null)\r
-                    {\r
-                        throw ExceptionBuilder.CreateContainsNullElement("partsToAdd");\r
-                    }\r
-                    this._partsToAdd.Add(part);\r
-                }\r
-            }\r
-            this._readOnlyPartsToAdd = this._partsToAdd.AsReadOnly();\r
-\r
-            this._partsToRemove = new List<ComposablePart>();\r
-            if (partsToRemove != null)\r
-            {\r
-                foreach (var part in partsToRemove)\r
-                {\r
-                    if (part == null)\r
-                    {\r
-                        throw ExceptionBuilder.CreateContainsNullElement("partsToRemove");\r
-                    }\r
-                    this._partsToRemove.Add(part);\r
-                }\r
-            }\r
-            this._readOnlyPartsToRemove = this._partsToRemove.AsReadOnly();\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns the collection of parts that will be added.\r
-        /// </summary>\r
-        /// <value>The parts to be added.</value>\r
-        public ReadOnlyCollection<ComposablePart> PartsToAdd\r
-        {\r
-            get\r
-            {\r
-                lock (this._lock)\r
-                {\r
-                    this._copyNeededForAdd = true;\r
-                    return this._readOnlyPartsToAdd;\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns the collection of parts that will be removed.\r
-        /// </summary>\r
-        /// <value>The parts to be removed.</value>\r
-        public ReadOnlyCollection<ComposablePart> PartsToRemove\r
-        {\r
-            get\r
-            {\r
-                lock (this._lock)\r
-                {\r
-                    this._copyNeededForRemove = true;\r
-                    return this._readOnlyPartsToRemove;\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Adds the specified part to the <see cref="CompositionBatch"/>.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        /// The part.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="part"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public void AddPart(ComposablePart part)\r
-        {\r
-            Requires.NotNull(part, "part");\r
-            lock (this._lock)\r
-            {\r
-                if (this._copyNeededForAdd)\r
-                {\r
-                    this._partsToAdd = new List<ComposablePart>(this._partsToAdd);\r
-                    this._readOnlyPartsToAdd = this._partsToAdd.AsReadOnly();\r
-                    this._copyNeededForAdd = false;\r
-                }\r
-                this._partsToAdd.Add(part);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Removes the specified part from the <see cref="CompositionBatch"/>.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        /// The part.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="part"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public void RemovePart(ComposablePart part)\r
-        {\r
-            Requires.NotNull(part, "part");\r
-            lock (this._lock)\r
-            {\r
-                if (this._copyNeededForRemove)\r
-                {\r
-                    this._partsToRemove = new List<ComposablePart>(this._partsToRemove);\r
-                    this._readOnlyPartsToRemove = this._partsToRemove.AsReadOnly();\r
-                    this._copyNeededForRemove = false;\r
-                }\r
-                this._partsToRemove.Add(part);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Adds the specified export to the <see cref="CompositionBatch"/>.\r
-        /// </summary>\r
-        /// <param name="export">\r
-        ///     The <see cref="Export"/> to add to the <see cref="CompositionBatch"/>.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     A <see cref="ComposablePart"/> that can be used remove the <see cref="Export"/>\r
-        ///     from the <see cref="CompositionBatch"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="export"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <remarks>\r
-        /// </remarks>\r
-        public ComposablePart AddExport(Export export)\r
-        {\r
-            Requires.NotNull(export, "export");\r
-\r
-            ComposablePart part = new SingleExportComposablePart(export);\r
-\r
-            this.AddPart(part);\r
-\r
-            return part;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionConstants.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionConstants.cs
deleted file mode 100644 (file)
index e8cbaa1..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public static class CompositionConstants\r
-    {\r
-        private const string CompositionNamespace = "System.ComponentModel.Composition";\r
-\r
-        public const string PartCreationPolicyMetadataName = CompositionNamespace + ".CreationPolicy";\r
-        public const string ExportTypeIdentityMetadataName = "ExportTypeIdentity";\r
-        internal const string ProductDefinitionMetadataName = "ProductDefinition";\r
-\r
-        internal const string PartCreatorContractName = CompositionNamespace + ".Contracts.ExportFactory";\r
-        internal static readonly string PartCreatorTypeIdentity = AttributedModelServices.GetTypeIdentity(typeof(ComposablePartDefinition));\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionContainer.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionContainer.cs
deleted file mode 100644 (file)
index bdbd5c0..0000000
+++ /dev/null
@@ -1,410 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class CompositionContainer : ExportProvider, ICompositionService, IDisposable\r
-    {\r
-        private ImportEngine _importEngine;\r
-        private ComposablePartExportProvider _partExportProvider;\r
-        private AggregateExportProvider _aggregatingExportProvider;\r
-        private ExportProvider _rootProvider;\r
-        private CatalogExportProvider _catalogExportProvider;\r
-        private readonly ReadOnlyCollection<ExportProvider> _providers;\r
-        private volatile int _isDisposed = 0;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionContainer"/> class.\r
-        /// </summary>\r
-        public CompositionContainer()\r
-            : this((ComposablePartCatalog)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionContainer"/> class \r
-        ///     with the specified export providers.\r
-        /// </summary>\r
-        /// <param name="providers">\r
-        ///     A <see cref="Array"/> of <see cref="ExportProvider"/> objects which provide \r
-        ///     the <see cref="CompositionContainer"/> access to <see cref="Export"/> objects,\r
-        ///     or <see langword="null"/> to set <see cref="Providers"/> to an empty\r
-        ///     <see cref="ReadOnlyCollection{T}"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="providers"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        public CompositionContainer(params ExportProvider[] providers) : \r
-            this((ComposablePartCatalog)null, providers)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="CompositionContainer"/> class \r
-        ///     with the specified catalog and export providers.\r
-        /// </summary>\r
-        /// <param name="providers">\r
-        ///     A <see cref="Array"/> of <see cref="ExportProvider"/> objects which provide \r
-        ///     the <see cref="CompositionContainer"/> access to <see cref="Export"/> objects,\r
-        ///     or <see langword="null"/> to set <see cref="Providers"/> to an empty \r
-        ///     <see cref="ReadOnlyCollection{T}"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="providers"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        public CompositionContainer(ComposablePartCatalog catalog, params ExportProvider[] providers): \r
-            this(catalog, false, providers)\r
-        {\r
-        }\r
-\r
-        public CompositionContainer(ComposablePartCatalog catalog, bool isThreadSafe, params ExportProvider[] providers)\r
-        {\r
-            this._importEngine = new ImportEngine(this, isThreadSafe);\r
-            this._partExportProvider = new ComposablePartExportProvider(isThreadSafe);\r
-            this._partExportProvider.SourceProvider = this;\r
-            this._providers = new ReadOnlyCollection<ExportProvider>(providers != null ? (ExportProvider[])providers.Clone() : new ExportProvider[0]);\r
-\r
-            List<ExportProvider> providerList = new List<ExportProvider>();\r
-\r
-            providerList.Add(this._partExportProvider);\r
-\r
-            if (catalog != null)\r
-            {\r
-                this._catalogExportProvider = new CatalogExportProvider(catalog, isThreadSafe);\r
-                this._catalogExportProvider.SourceProvider = this;\r
-\r
-                providerList.Add(this._catalogExportProvider);\r
-            }\r
-\r
-            foreach (var provider in this._providers)\r
-            {\r
-                if (provider == null)\r
-                {\r
-                    throw ExceptionBuilder.CreateContainsNullElement("providers");\r
-                }\r
-                providerList.Add(provider);\r
-            }\r
-\r
-            // we only build the aggregating provider if necessary - that is, if we have more than one provider to aggregate\r
-            if (providerList.Count > 1)\r
-            {\r
-                this._aggregatingExportProvider = new AggregateExportProvider(providerList);\r
-                this._rootProvider = this._aggregatingExportProvider;\r
-            }\r
-            else\r
-            {\r
-                Assumes.IsTrue(providerList.Count == 1);\r
-                this._rootProvider = providerList[0];\r
-            }\r
-\r
-            this._rootProvider.ExportsChanged += this.OnExportsChangedInternal;\r
-            this._rootProvider.ExportsChanging += this.OnExportsChangingInternal;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the catalog which provides the container access to exports produced\r
-        ///     from composable parts.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="ComposablePartCatalog"/> which provides the \r
-        ///     <see cref="CompositionContainer"/> access to exports produced from\r
-        ///     <see cref="ComposablePart"/> objects. The default is <see langword="null"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        public ComposablePartCatalog Catalog\r
-        {\r
-            get \r
-            {\r
-                ThrowIfDisposed();\r
-\r
-                if (_catalogExportProvider != null)\r
-                {\r
-                    return _catalogExportProvider.Catalog;\r
-                }\r
-\r
-                return null;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the export providers which provide the container access to additional exports.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="ReadOnlyCollection{T}"/> of <see cref="ExportProvider"/> objects\r
-        ///     which provide the <see cref="CompositionContainer"/> access to additional\r
-        ///     <see cref="Export"/> objects. The default is an empty \r
-        ///     <see cref="ReadOnlyCollection{T}"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        public ReadOnlyCollection<ExportProvider> Providers\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                return this._providers;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.\r
-        /// </summary>\r
-        public void Dispose()\r
-        {\r
-            this.Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Releases unmanaged and - optionally - managed resources\r
-        /// </summary>\r
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>\r
-        protected virtual void Dispose(bool disposing)\r
-        {\r
-            if (disposing)\r
-            {\r
-                // NOTE : According to http://msdn.microsoft.com/en-us/library/4bw5ewxy.aspx, the warning is bogus when used with Interlocked API.\r
-#pragma warning disable 420\r
-                if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-#pragma warning restore 420\r
-                {\r
-                    this._rootProvider.ExportsChanged -= this.OnExportsChangedInternal;\r
-                    this._rootProvider.ExportsChanging -= this.OnExportsChangingInternal;\r
-                    if (this._aggregatingExportProvider != null)\r
-                    {\r
-                        this._aggregatingExportProvider.Dispose();\r
-                    }\r
-                    this._partExportProvider.Dispose();\r
-                    if (this._catalogExportProvider != null)\r
-                    {\r
-                        this._catalogExportProvider.Dispose();\r
-                    }\r
-                    this._importEngine.Dispose();   \r
-                }\r
-            }\r
-        }\r
-  \r
-        public void Compose(CompositionBatch batch)\r
-        {\r
-            Requires.NotNull(batch, "batch");\r
-\r
-            this.ThrowIfDisposed();\r
-            this._partExportProvider.Compose(batch);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Releases the <see cref="Export"/> from the <see cref="CompositionContainer"/>. The behavior\r
-        ///     may vary depending on the implementation of the <see cref="ExportProvider"/> that produced \r
-        ///     the <see cref="Export"/> instance. As a general rule non shared exports should be early \r
-        ///     released causing them to be detached from the container.\r
-        ///\r
-        ///     For example the <see cref="CatalogExportProvider"/> will only release \r
-        ///     an <see cref="Export"/> if it comes from a <see cref="ComposablePart"/> that was constructed\r
-        ///     under a <see cref="CreationPolicy.NonShared" /> context. Release in this context means walking\r
-        ///     the dependency chain of the <see cref="Export"/>s, detaching references from the container and \r
-        ///     calling Dispose on the <see cref="ComposablePart"/>s as needed. If the <see cref="Export"/> \r
-        ///     was constructed under a <see cref="CreationPolicy.Shared" /> context the \r
-        ///     <see cref="CatalogExportProvider"/> will do nothing as it may be in use by other requestors. \r
-        ///     Those will only be detached when the container is itself disposed.\r
-        /// </summary>\r
-        /// <param name="export"><see cref="Export"/> that needs to be released.</param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="export"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Performance", "CA1822")]\r
-        public void ReleaseExport(Export export)\r
-        {\r
-            Requires.NotNull(export, "export");\r
-\r
-            IDisposable dependency = export as IDisposable;\r
-\r
-            if (dependency != null)\r
-            {\r
-                dependency.Dispose();\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Releases the <see cref="Lazy{T}"/> from the <see cref="CompositionContainer"/>. The behavior\r
-        ///     may vary depending on the implementation of the <see cref="ExportProvider"/> that produced \r
-        ///     the <see cref="Export"/> instance. As a general rule non shared exports should be early \r
-        ///     released causing them to be detached from the container.\r
-        ///\r
-        ///     For example the <see cref="CatalogExportProvider"/> will only release \r
-        ///     an <see cref="Lazy{T}"/> if it comes from a <see cref="ComposablePart"/> that was constructed\r
-        ///     under a <see cref="CreationPolicy.NonShared" /> context. Release in this context means walking\r
-        ///     the dependency chain of the <see cref="Export"/>s, detaching references from the container and \r
-        ///     calling Dispose on the <see cref="ComposablePart"/>s as needed. If the <see cref="Export"/> \r
-        ///     was constructed under a <see cref="CreationPolicy.Shared" /> context the \r
-        ///     <see cref="CatalogExportProvider"/> will do nothing as it may be in use by other requestors. \r
-        ///     Those will only be detached when the container is itself disposed.\r
-        /// </summary>\r
-        /// <param name="export"><see cref="Export"/> that needs to be released.</param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="export"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Performance", "CA1822")]\r
-        public void ReleaseExport<T>(Lazy<T> export)\r
-        {\r
-            Requires.NotNull(export, "export");\r
-\r
-            IDisposable dependency = export as IDisposable;\r
-\r
-            if (dependency != null)\r
-            {\r
-                dependency.Dispose();\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Releases a set of <see cref="Export"/>s from the <see cref="CompositionContainer"/>. \r
-        ///     See also <see cref="ReleaseExport"/>.\r
-        /// </summary>\r
-        /// <param name="exports"><see cref="Export"/>s that need to be released.</param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="exports"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="exports"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        public void ReleaseExports(IEnumerable<Export> exports)\r
-        {\r
-            Requires.NotNullOrNullElements(exports, "exports");\r
-\r
-            foreach (Export export in exports)\r
-            {\r
-                this.ReleaseExport(export);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Releases a set of <see cref="Export"/>s from the <see cref="CompositionContainer"/>. \r
-        ///     See also <see cref="ReleaseExport"/>.\r
-        /// </summary>\r
-        /// <param name="exports"><see cref="Export"/>s that need to be released.</param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="exports"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="exports"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public void ReleaseExports<T>(IEnumerable<Lazy<T>> exports)\r
-        {\r
-            Requires.NotNullOrNullElements(exports, "exports");\r
-\r
-            foreach (Lazy<T> export in exports)\r
-            {\r
-                this.ReleaseExport(export);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Releases a set of <see cref="Export"/>s from the <see cref="CompositionContainer"/>. \r
-        ///     See also <see cref="ReleaseExport"/>.\r
-        /// </summary>\r
-        /// <param name="exports"><see cref="Export"/>s that need to be released.</param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="exports"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="exports"/> contains an element that is <see langword="null"/>.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public void ReleaseExports<T, TMetadataView>(IEnumerable<Lazy<T, TMetadataView>> exports)\r
-        {\r
-            Requires.NotNullOrNullElements(exports, "exports");\r
-\r
-            foreach (Lazy<T, TMetadataView> export in exports)\r
-            {\r
-                this.ReleaseExport(export);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Sets the imports of the specified composable part exactly once and they will not\r
-        ///     ever be recomposed.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     The <see cref="ComposablePart"/> to set the imports.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="part"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will\r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ICompositionService"/> has been disposed of.\r
-        /// </exception>\r
-        public void SatisfyImportsOnce(ComposablePart part)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            this._importEngine.SatisfyImportsOnce(part);\r
-        }\r
-\r
-        internal void OnExportsChangedInternal(object sender, ExportsChangeEventArgs e)\r
-        {\r
-            this.OnExportsChanged(e);\r
-        }\r
-\r
-        internal void OnExportsChangingInternal(object sender, ExportsChangeEventArgs e)\r
-        {\r
-            this.OnExportsChanging(e);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns all exports that match the conditions of the specified import.\r
-        /// </summary>\r
-        /// <param name="definition">The <see cref="ImportDefinition"/> that defines the conditions of the\r
-        /// <see cref="Export"/> to get.</param>\r
-        /// <returns></returns>\r
-        /// <result>\r
-        /// An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects that match\r
-        /// the conditions defined by <see cref="ImportDefinition"/>, if found; otherwise, an\r
-        /// empty <see cref="IEnumerable{T}"/>.\r
-        /// </result>\r
-        /// <remarks>\r
-        ///    <note type="inheritinfo">\r
-        /// The implementers should not treat the cardinality-related mismatches as errors, and are not\r
-        /// expected to throw exceptions in those cases.\r
-        /// For instance, if the import requests exactly one export and the provider has no matching exports or more than one,\r
-        /// it should return an empty <see cref="IEnumerable{T}"/> of <see cref="Export"/>.\r
-        /// </note>\r
-        /// </remarks>\r
-        protected override IEnumerable<Export> GetExportsCore(ImportDefinition definition, AtomicComposition atomicComposition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            IEnumerable<Export> exports = null;\r
-            this._rootProvider.TryGetExports(definition, atomicComposition, out exports);\r
-\r
-            return exports;\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed == 1)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionLock.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionLock.cs
deleted file mode 100644 (file)
index b3dd0ea..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#define SINGLETHREADEDLOCKENFORCEMENT\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.Runtime.CompilerServices;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    // This a a lock class that needs to be held in order to perform any mutation of the parts/parts state in the composition\r
-    // Today's implementation relies on the AppDomain-wide re-entrant lock for changes on the composition, and a narrow lock for changes in \r
-    // the state of the specific ImportEngine\r
-    // Today we make several assumptions to ensure thread-safety:\r
-    // 1. Each composition doesn't change lock affinity\r
-    // 2. Every part of the system that updates the status of the parts (in our case ImportEngine) needs to hold the same wide - lock\r
-    // 3. State of the import engine that gets accessed outside of the wide lock needs to be accessed in the context of the narrow lock\r
-    // 4. Narrow lock CAN be taken inside the wide lock\r
-    // 5. Wide lock CANNOT be taken inside the narrow lock\r
-    // 6. No 3rd party code will EVER get called inside the narrow lock\r
-    // Sadly, this means that we WILL be calling 3rd party code under a lock, but as long as the lock is re-entrant and they can't invoke us on anotehr thread\r
-    // we have no issue, other than potential overlocking\r
-    internal sealed class CompositionLock : IDisposable\r
-    {\r
-        // narrow lock\r
-        private readonly Lock _stateLock = null;\r
-        // wide lock\r
-        private static object _compositionLock = new object();\r
-\r
-        private int _isDisposed = 0;\r
-        private bool _isThreadSafe = false;\r
-\r
-        private static readonly EmptyLockHolder _EmptyLockHolder = new EmptyLockHolder();\r
-\r
-        public CompositionLock(bool isThreadSafe)\r
-        {\r
-            this._isThreadSafe = isThreadSafe;\r
-            if (isThreadSafe)\r
-            {\r
-                this._stateLock = new Lock();\r
-            }\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (this._isThreadSafe)\r
-            {\r
-                if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-                {\r
-                    this._stateLock.Dispose();\r
-                }\r
-            }\r
-        }\r
-\r
-        public bool IsThreadSafe\r
-        {\r
-            get\r
-            {\r
-                return this._isThreadSafe;\r
-            }\r
-        }\r
-\r
-        private void EnterCompositionLock()\r
-        {\r
-#pragma warning disable 618\r
-            if (this._isThreadSafe)\r
-            {\r
-                Monitor.Enter(_compositionLock);\r
-            }\r
-#pragma warning restore 618\r
-        }\r
-\r
-        private void ExitCompositionLock()\r
-        {\r
-            if (this._isThreadSafe)\r
-            {\r
-                Monitor.Exit(_compositionLock);\r
-            }\r
-        }\r
-\r
-        public IDisposable LockComposition()\r
-        {\r
-            if (this._isThreadSafe)\r
-            {\r
-                return new CompositionLockHolder(this);\r
-            }\r
-            else\r
-            {\r
-                return _EmptyLockHolder;\r
-            }\r
-        }\r
-\r
-        public IDisposable LockStateForRead()\r
-        {\r
-            if (this._isThreadSafe)\r
-            {\r
-                return new ReadLock(this._stateLock);\r
-            }\r
-            else\r
-            {\r
-                return _EmptyLockHolder;\r
-            }            \r
-        }\r
-\r
-        public IDisposable LockStateForWrite()\r
-        {\r
-            if (this._isThreadSafe)\r
-            {\r
-                return new WriteLock(this._stateLock);\r
-            }\r
-            else\r
-            {\r
-                return _EmptyLockHolder;\r
-            }   \r
-        }\r
-\r
-        // NOTE : this should NOT be changed to a struct as ImportEngine relies on it\r
-        public sealed class CompositionLockHolder : IDisposable\r
-        {\r
-            private CompositionLock _lock;\r
-            private int _isDisposed;\r
-\r
-            public CompositionLockHolder(CompositionLock @lock)\r
-            {\r
-                this._lock = @lock;\r
-\r
-                this._isDisposed = 0;\r
-                this._lock.EnterCompositionLock();\r
-            }\r
-\r
-            public void Dispose()\r
-            {\r
-                if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-                {\r
-                    this._lock.ExitCompositionLock();\r
-                }\r
-            }\r
-        }\r
-\r
-        private sealed class EmptyLockHolder : IDisposable\r
-        {\r
-            public void Dispose()\r
-            {\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/CompositionServices.cs
deleted file mode 100644 (file)
index 5a7d985..0000000
+++ /dev/null
@@ -1,522 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    internal static class CompositionServices\r
-    {\r
-        internal static readonly Type InheritedExportAttributeType = typeof(InheritedExportAttribute);\r
-        internal static readonly Type ExportAttributeType = typeof(ExportAttribute);\r
-        internal static readonly Type AttributeType = typeof(Attribute);\r
-        internal static readonly Type ObjectType = typeof(object);\r
-\r
-        private static readonly string[] reservedMetadataNames = new string[]\r
-        {\r
-            CompositionConstants.PartCreationPolicyMetadataName\r
-        };  \r
-\r
-        internal static Type GetDefaultTypeFromMember(this MemberInfo member)\r
-        {\r
-            Assumes.NotNull(member);\r
-\r
-            switch (member.MemberType)\r
-            {\r
-                case MemberTypes.Property:\r
-                    return ((PropertyInfo)member).PropertyType;\r
-\r
-                case MemberTypes.NestedType:\r
-                case MemberTypes.TypeInfo:\r
-                    return ((Type)member);\r
-\r
-                case MemberTypes.Field:\r
-                default:\r
-                    Assumes.IsTrue(member.MemberType == MemberTypes.Field);\r
-                    return ((FieldInfo)member).FieldType;\r
-            }\r
-        }\r
-\r
-        internal static string GetContractNameFromExport(this MemberInfo member, ExportAttribute export)\r
-        {\r
-            if (!string.IsNullOrEmpty(export.ContractName))\r
-            {\r
-                return export.ContractName;\r
-            }\r
-\r
-            if (export.ContractType != null)\r
-            {\r
-                return AttributedModelServices.GetContractName(export.ContractType);\r
-            }\r
-\r
-            if (member.MemberType == MemberTypes.Method)\r
-            {\r
-                return AttributedModelServices.GetTypeIdentity((MethodInfo)member);\r
-            }\r
-\r
-            return AttributedModelServices.GetContractName(member.GetDefaultTypeFromMember());\r
-        }\r
-\r
-        internal static string GetTypeIdentityFromExport(this MemberInfo member, ExportAttribute export)\r
-        {\r
-            if (export.ContractType != null)\r
-            {\r
-                return AttributedModelServices.GetTypeIdentity(export.ContractType);\r
-            }\r
-\r
-            if (member.MemberType == MemberTypes.Method)\r
-            {\r
-                return AttributedModelServices.GetTypeIdentity((MethodInfo)member);\r
-            }\r
-\r
-            return AttributedModelServices.GetTypeIdentity(member.GetDefaultTypeFromMember());\r
-        }\r
-\r
-        internal static Type GetContractTypeFromImport(this IAttributedImport import, ImportType importType)\r
-        {\r
-            if (import.ContractType != null)\r
-            {\r
-                return import.ContractType;\r
-            }\r
-\r
-            return importType.ContractType;\r
-        }\r
-\r
-        internal static string GetContractNameFromImport(this IAttributedImport import, ImportType importType)\r
-        {\r
-            if (!string.IsNullOrEmpty(import.ContractName))\r
-            {\r
-                return import.ContractName;\r
-            }\r
-\r
-            Type contractType = import.GetContractTypeFromImport(importType);\r
-\r
-            return AttributedModelServices.GetContractName(contractType); \r
-        }\r
-\r
-        internal static string GetTypeIdentityFromImport(this IAttributedImport import, ImportType importType)\r
-        {\r
-            Type contractType = import.GetContractTypeFromImport(importType);\r
-\r
-            // For our importers we treat object as not having a type identity\r
-            if (contractType == CompositionServices.ObjectType)\r
-            {\r
-                return null;\r
-            }\r
-\r
-            return AttributedModelServices.GetTypeIdentity(contractType); \r
-        }\r
-\r
-        internal static IDictionary<string, object> GetPartMetadataForType(this Type type, CreationPolicy creationPolicy)\r
-        {\r
-            IDictionary<string, object> dictionary = new Dictionary<string, object>(StringComparers.MetadataKeyNames);\r
-\r
-            if (creationPolicy != CreationPolicy.Any)\r
-            {\r
-                dictionary.Add(CompositionConstants.PartCreationPolicyMetadataName, creationPolicy);\r
-            }\r
-\r
-            foreach (PartMetadataAttribute partMetadata in type.GetAttributes<PartMetadataAttribute>())\r
-            {\r
-                if (reservedMetadataNames.Contains(partMetadata.Name, StringComparers.MetadataKeyNames) \r
-                    || dictionary.ContainsKey(partMetadata.Name))\r
-                {\r
-                    // Perhaps we should log an error here so that people know this value is being ignored.\r
-                    continue;\r
-                }\r
-\r
-                dictionary.Add(partMetadata.Name, partMetadata.Value);\r
-            }\r
-\r
-            if (dictionary.Count == 0)\r
-            {\r
-                return MetadataServices.EmptyMetadata;\r
-            }\r
-            else\r
-            {\r
-                return dictionary;\r
-            }\r
-        }\r
-\r
-        internal static void TryExportMetadataForMember(this MemberInfo member, out IDictionary<string, object> dictionary)\r
-        {\r
-            dictionary = new Dictionary<string, object>();\r
-\r
-            foreach (var attr in member.GetAttributes<Attribute>())\r
-            {\r
-                var provider = attr as ExportMetadataAttribute;\r
-\r
-                if (provider != null)\r
-                {\r
-                    if (reservedMetadataNames.Contains(provider.Name, StringComparers.MetadataKeyNames))\r
-                    {\r
-                        throw ExceptionBuilder.CreateDiscoveryException(Strings.Discovery_ReservedMetadataNameUsed, member.GetDisplayName(), provider.Name);\r
-                    }\r
-\r
-                    // we pass "null" for valueType which would make it inferred. We don;t have additional type information when metadata\r
-                    // goes through the ExportMetadataAttribute path\r
-                    if (!dictionary.TryContributeMetadataValue(provider.Name, provider.Value, null, provider.IsMultiple))\r
-                    {\r
-                        throw ExceptionBuilder.CreateDiscoveryException(Strings.Discovery_DuplicateMetadataNameValues, member.GetDisplayName(), provider.Name);\r
-                    }\r
-                }\r
-                else\r
-                {\r
-                    Type attrType = attr.GetType();\r
-                    if ((attrType != CompositionServices.ExportAttributeType) && attrType.IsAttributeDefined<MetadataAttributeAttribute>(true))\r
-                    {\r
-                        bool allowsMultiple = false;\r
-                        AttributeUsageAttribute usage = attrType.GetFirstAttribute<AttributeUsageAttribute>(true);\r
-\r
-                        if (usage != null)\r
-                        {\r
-                            allowsMultiple = usage.AllowMultiple;\r
-                        }\r
-\r
-                        foreach (PropertyInfo pi in attrType.GetProperties())\r
-                        {\r
-                            if (pi.DeclaringType == CompositionServices.ExportAttributeType || pi.DeclaringType == CompositionServices.AttributeType)\r
-                            {\r
-                                // Don't contribute metadata properies from the base attribute types.\r
-                                continue;\r
-                            }\r
-                 \r
-                            if (reservedMetadataNames.Contains(pi.Name, StringComparers.MetadataKeyNames))\r
-                            {\r
-                                throw ExceptionBuilder.CreateDiscoveryException(Strings.Discovery_ReservedMetadataNameUsed, member.GetDisplayName(), provider.Name);\r
-                            }\r
-\r
-                            object value = pi.GetValue(attr, null);\r
-\r
-                            if (value != null && !IsValidAttributeType(value.GetType()))\r
-                            {\r
-                                throw ExceptionBuilder.CreateDiscoveryException(Strings.Discovery_MetadataContainsValueWithInvalidType, pi.GetDisplayName(), value.GetType().GetDisplayName());\r
-                            }\r
-\r
-                            if (!dictionary.TryContributeMetadataValue(pi.Name, value, pi.PropertyType, allowsMultiple))\r
-                            {\r
-                                throw ExceptionBuilder.CreateDiscoveryException(Strings.Discovery_DuplicateMetadataNameValues, member.GetDisplayName(), pi.Name);\r
-                            }\r
-                    }\r
-                    }\r
-                }\r
-            }\r
-\r
-            // Need Keys.ToArray because we alter the dictionary in the loop\r
-            foreach (var key in dictionary.Keys.ToArray())\r
-            {\r
-                var list = dictionary[key] as MetadataList;\r
-                if (list != null)\r
-                {\r
-                    dictionary[key] = list.ToArray();\r
-                }\r
-            }\r
-\r
-            return;\r
-        }\r
-\r
-        private static bool TryContributeMetadataValue(this IDictionary<string, object> dictionary, string name, object value, Type valueType, bool allowsMultiple)\r
-        {\r
-            object metadataValue;\r
-            if (!dictionary.TryGetValue(name, out metadataValue))\r
-            {\r
-                if (allowsMultiple)\r
-                {\r
-                    var list = new MetadataList();\r
-                    list.Add(value, valueType);\r
-                    value = list;\r
-                }\r
-\r
-                dictionary.Add(name, value);\r
-            }\r
-            else\r
-            {\r
-                var list = metadataValue as MetadataList;\r
-                if (!allowsMultiple || list == null)\r
-                {\r
-                    // Either single value already found when should be multiple\r
-                    // or a duplicate name already exists\r
-                    dictionary.Remove(name);\r
-                    return false;\r
-                }\r
-\r
-                list.Add(value, valueType);\r
-            }\r
-            return true;\r
-        }\r
-\r
-        private class MetadataList\r
-        {\r
-            private Type _arrayType = null;\r
-            private bool _containsNulls = false;\r
-            private static readonly Type ObjectType = typeof(object);\r
-            private static readonly Type TypeType = typeof(Type);\r
-            private Collection<object> _innerList = new Collection<object>();\r
-\r
-            public void Add(object item, Type itemType)\r
-            {\r
-                this._containsNulls |= (item == null);\r
-\r
-                // if we've been passed typeof(object), we basically have no type inmformation\r
-                if (itemType == ObjectType)\r
-                {\r
-                    itemType = null;\r
-                }\r
-\r
-                // if we have no type information, get it from the item, if we can\r
-                if ((itemType == null) && (item != null))\r
-                {\r
-                    itemType = item.GetType();\r
-                }\r
-\r
-                // Types are special, because the are abstract classes, so if the item casts to Type, we assume System.Type\r
-                if (item is Type)\r
-                {\r
-                    itemType = TypeType;\r
-                }\r
-\r
-                // only try to call this if we got a meaningful type\r
-                if (itemType != null)\r
-                {\r
-                    this.InferArrayType(itemType);\r
-                }\r
-\r
-                this._innerList.Add(item);\r
-            }\r
-\r
-            private void InferArrayType(Type itemType)\r
-            {\r
-                Assumes.NotNull(itemType);\r
-\r
-                if (this._arrayType == null)\r
-                {\r
-                    // this is the first typed element we've been given, it sets the type of the array\r
-                    this._arrayType = itemType;\r
-                }\r
-                else\r
-                {\r
-                    // if there's a disagreement on the array type, we flip to Object\r
-                    // NOTE : we can try to do better in the future to find common base class, but given that we support very limited set of types\r
-                    // in metadata right now, it's a moot point\r
-                    if (this._arrayType != itemType)\r
-                    {\r
-                        this._arrayType = ObjectType;\r
-                    }\r
-                }\r
-            }\r
-\r
-            public Array ToArray()\r
-            {\r
-                if (this._arrayType == null)\r
-                {\r
-                    // if the array type has not been set, assume Object \r
-                    this._arrayType = ObjectType;\r
-                }\r
-                else if (this._containsNulls && this._arrayType.IsValueType)\r
-                {\r
-                    // if the array type is a value type and we have seen nulls, then assume Object\r
-                    this._arrayType = ObjectType;\r
-                }\r
-\r
-                Array array = Array.CreateInstance(this._arrayType, this._innerList.Count);\r
-\r
-                for(int i = 0; i < array.Length; i++)\r
-                {\r
-                    array.SetValue(this._innerList[i], i);\r
-                }\r
-                return array;\r
-            }\r
-        }\r
-\r
-        //UNDONE: Need to add these warnings somewhere...Dev10:472538 should address this.\r
-        //internal static CompositionResult MatchRequiredMetadata(this IDictionary<string, object> metadata, IEnumerable<string> requiredMetadata, string contractName)\r
-        //{\r
-        //    Assumes.IsTrue(metadata != null);\r
-\r
-        //    var result = CompositionResult.SucceededResult;\r
-\r
-        //    var missingMetadata = (requiredMetadata == null) ? null : requiredMetadata.Except<string>(metadata.Keys);\r
-        //    if (missingMetadata != null && missingMetadata.Any())\r
-        //    {\r
-        //        result = result.MergeIssue(\r
-        //            CompositionError.CreateIssueAsWarning(CompositionErrorId.RequiredMetadataNotFound,\r
-        //            Strings.RequiredMetadataNotFound,\r
-        //            contractName,\r
-        //            string.Join(", ", missingMetadata.ToArray())));\r
-\r
-        //        return new CompositionResult(false, result.Issues);\r
-        //    }\r
-\r
-        //    return result;\r
-        //}\r
-\r
-        internal static IEnumerable<KeyValuePair<string, Type>> GetRequiredMetadata(Type metadataViewType)\r
-        {\r
-            if ((metadataViewType == null) ||\r
-                ExportServices.IsDefaultMetadataViewType(metadataViewType) ||\r
-                ExportServices.IsDictionaryConstructorViewType(metadataViewType) ||\r
-                !metadataViewType.IsInterface)\r
-            {\r
-                return Enumerable.Empty<KeyValuePair<string, Type>>();\r
-            }\r
-\r
-            // A metadata view is required to be an Intrerface, and therefore only properties are allowed\r
-            List<PropertyInfo> properties = metadataViewType.GetAllProperties().\r
-                Where(property => property.GetFirstAttribute<DefaultValueAttribute>() == null).\r
-                ToList();\r
-\r
-            // NOTE : this is a carefully found balance between eager and delay-evaluation - the properties are filtered once and upfront\r
-            // whereas the key/Type pairs are created every time. The latter is fine as KVPs are structs and as such copied on access regardless.\r
-            // This also allows us to avoid creation of List<KVP> which - at least according to FxCop - leads to isues with NGEN\r
-            return properties.Select(property => new KeyValuePair<string, Type>(property.Name, property.PropertyType));\r
-        }\r
-\r
-        internal static object GetExportedValueFromComposedPart(ImportEngine engine, ComposablePart part, ExportDefinition definition)\r
-        {\r
-            try\r
-            {\r
-                engine.SatisfyImports(part);\r
-            }\r
-            catch (CompositionException ex)\r
-            {\r
-                throw ExceptionBuilder.CreateCannotGetExportedValue(part, definition, ex);\r
-            }\r
-\r
-            try\r
-            {\r
-                return part.GetExportedValue(definition);\r
-            }\r
-            catch (ComposablePartException ex)\r
-            {\r
-                throw ExceptionBuilder.CreateCannotGetExportedValue(part, definition, ex);\r
-            }\r
-        }\r
-        \r
-        internal static bool IsRecomposable(this ComposablePart part)\r
-        {\r
-            return part.ImportDefinitions.Any(import => import.IsRecomposable);\r
-        }\r
-\r
-        internal static CompositionResult<T> TryInvoke<T>(Func<T> action)\r
-        {\r
-            try\r
-            {\r
-                T value = action();\r
-                return new CompositionResult<T>(value);\r
-            }\r
-            catch (CompositionException ex)\r
-            {\r
-                return new CompositionResult<T>(ex.Errors);\r
-            }\r
-        }\r
-\r
-        internal static CompositionResult TryInvoke(Action action)\r
-        {\r
-            try\r
-            {\r
-                action();\r
-                return CompositionResult.SucceededResult;\r
-            }\r
-            catch (CompositionException ex)\r
-            {\r
-                return new CompositionResult(ex.Errors);\r
-            }\r
-        }\r
-\r
-        internal static CompositionResult TryFire<TEventArgs>(EventHandler<TEventArgs> _delegate, object sender, TEventArgs e)\r
-            where TEventArgs : EventArgs\r
-        {\r
-            CompositionResult result = CompositionResult.SucceededResult;\r
-            foreach (EventHandler<TEventArgs> _subscriber in _delegate.GetInvocationList())\r
-            {\r
-                try\r
-                {\r
-                    _subscriber.Invoke(sender, e);\r
-                }\r
-                catch (CompositionException ex)\r
-                {\r
-                    result = result.MergeErrors(ex.Errors);\r
-                }\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        internal static CreationPolicy GetRequiredCreationPolicy(this ImportDefinition definition)\r
-        {\r
-            ContractBasedImportDefinition contractDefinition = definition as ContractBasedImportDefinition;\r
-\r
-            if (contractDefinition != null)\r
-            {\r
-                return contractDefinition.RequiredCreationPolicy;\r
-            }\r
-\r
-            return CreationPolicy.Any;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a value indicating whether cardinality is \r
-        ///     <see cref="ImportCardinality.ZeroOrOne"/> or \r
-        ///     <see cref="ImportCardinality.ExactlyOne"/>.\r
-        /// </summary>\r
-        internal static bool IsAtMostOne(this ImportCardinality cardinality)\r
-        {\r
-            return cardinality == ImportCardinality.ZeroOrOne || cardinality == ImportCardinality.ExactlyOne;\r
-        }\r
-\r
-        private static bool IsValidAttributeType(Type type)\r
-        {\r
-            return IsValidAttributeType(type, true);\r
-        }\r
-\r
-        private static bool IsValidAttributeType(Type type, bool arrayAllowed)\r
-        {\r
-            Assumes.NotNull(type);\r
-            // Definitions of valid attribute type taken from C# 3.0 Specification section 17.1.3.\r
-\r
-            // One of the following types: bool, byte, char, double, float, int, long, sbyte, short, string, uint, ulong, ushort.\r
-            if (type.IsPrimitive)\r
-            {\r
-                return true;\r
-            }\r
-\r
-            if (type == typeof(string))\r
-            {\r
-                return true;\r
-            }\r
-\r
-            // An enum type, provided it has public accessibility and the types in which it is nested (if any) also have public accessibility \r
-            if (type.IsEnum && type.IsVisible)\r
-            {\r
-                return true;\r
-            }\r
-\r
-            if (typeof(Type).IsAssignableFrom(type))\r
-            {\r
-                return true;\r
-            }\r
-\r
-            // Single-dimensional arrays of the above types.\r
-            if (arrayAllowed && type.IsArray && \r
-                type.GetArrayRank() == 1 &&\r
-                IsValidAttributeType(type.GetElementType(), false))\r
-            {\r
-                return true;\r
-            }\r
-\r
-            return false;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs
deleted file mode 100644 (file)
index 074cf61..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    partial class DirectoryCatalog\r
-    {\r
-        internal class DirectoryCatalogDebuggerProxy\r
-        {\r
-            private readonly DirectoryCatalog _catalog;\r
-\r
-            public DirectoryCatalogDebuggerProxy(DirectoryCatalog catalog)\r
-            {\r
-                Requires.NotNull(catalog, "catalog");\r
-\r
-                this._catalog = catalog;\r
-            }\r
-\r
-            public ReadOnlyCollection<Assembly> Assemblies\r
-            {\r
-                get\r
-                {\r
-                    return this._catalog._assemblyCatalogs.Values.Select(catalog => catalog.Assembly)\r
-                                                                 .ToReadOnlyCollection();\r
-                }\r
-            }\r
-\r
-            public string SearchPattern\r
-            {\r
-                get { return this._catalog.SearchPattern; }\r
-            }\r
-\r
-            public string Path\r
-            {\r
-                get { return this._catalog._path; }\r
-            }\r
-\r
-            public string FullPath\r
-            {\r
-                get { return this._catalog._fullPath; }\r
-            }\r
-\r
-            public ReadOnlyCollection<string> LoadedFiles\r
-            {\r
-                get { return this._catalog._loadedFiles; }\r
-            }\r
-\r
-            public ReadOnlyCollection<ComposablePartDefinition> Parts\r
-            {\r
-                // NOTE: This shouldn't be cached, so that on every query of\r
-                // the current value of the underlying catalog is respected.\r
-                // We use ReadOnlyCollection as arrays do not have the \r
-                // appropriate debugger display attributes applied to them.\r
-                get { return this._catalog.Parts.ToReadOnlyCollection(); }\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs
deleted file mode 100644 (file)
index be49bdb..0000000
+++ /dev/null
@@ -1,542 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !SILVERLIGHT\r
-\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.ComponentModel.Composition.Diagnostics;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.IO;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-using IOPath = System.IO.Path;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    [DebuggerTypeProxy(typeof(DirectoryCatalogDebuggerProxy))]\r
-    public partial class DirectoryCatalog : ComposablePartCatalog, INotifyComposablePartCatalogChanged, ICompositionElement\r
-    {\r
-        private readonly Lock _thisLock = new Lock();\r
-        private ComposablePartCatalogCollection _catalogCollection;\r
-        private Dictionary<string, AssemblyCatalog> _assemblyCatalogs;\r
-        private volatile bool _isDisposed = false;\r
-        private string _path;\r
-        private string _fullPath;\r
-        private string _searchPattern;\r
-        private ReadOnlyCollection<string> _loadedFiles;\r
-        private IQueryable<ComposablePartDefinition> _partsQuery;\r
-\r
-        /// <summary>\r
-        ///     Creates a catalog of <see cref="ComposablePartDefinition"/>s based on all the *.dll files \r
-        ///     in the given directory path.\r
-        ///     \r
-        ///     Possible exceptions that can be thrown are any that <see cref="Directory.GetFiles(string, string)"/> or \r
-        ///     <see cref="Assembly.Load(AssemblyName)"/> can throw.\r
-        /// </summary>\r
-        /// <param name="path">\r
-        ///     Path to the directory to scan for assemblies to add to the catalog.\r
-        ///     The path needs to be absolute or relative to <see cref="AppDomain.BaseDirectory"/>\r
-        /// </param>\r
-        /// <exception cref="ArgumentException">\r
-        ///     If <paramref name="path"/> is a zero-length string, contains only white space, or \r
-        ///     contains one or more implementation-specific invalid characters.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="path"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="DirectoryNotFoundException">\r
-        ///     The specified <paramref name="path"/> is invalid (for example, it is on an unmapped drive). \r
-        /// </exception>\r
-        /// <exception cref="PathTooLongException">\r
-        ///     The specified <paramref name="path"/>, file name, or both exceed the system-defined maximum length. \r
-        ///     For example, on Windows-based platforms, paths must be less than 248 characters and file names must \r
-        ///     be less than 260 characters. \r
-        /// </exception>\r
-        /// <exception cref="UnauthorizedAccessException">\r
-        ///     The caller does not have the required permission. \r
-        /// </exception>\r
-        public DirectoryCatalog(string path) : this(path, "*.dll")\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Creates a catalog of <see cref="ComposablePartDefinition"/>s based on all the given searchPattern \r
-        ///     over the files in the given directory path.\r
-        ///     \r
-        ///     Possible exceptions that can be thrown are any that <see cref="Directory.GetFiles(string, string)"/> or \r
-        ///     <see cref="Assembly.Load(AssemblyName)"/> can throw.\r
-        /// </summary>\r
-        /// <param name="path">\r
-        ///     Path to the directory to scan for assemblies to add to the catalog.\r
-        ///     The path needs to be absolute or relative to <see cref="AppDomain.BaseDirectory"/>\r
-        /// </param>\r
-        /// <param name="searchPattern">\r
-        ///     Any valid searchPattern that <see cref="Directory.GetFiles(string, string)"/> will accept.\r
-        /// </param>\r
-        /// <exception cref="ArgumentException">\r
-        ///     If <paramref name="path"/> is a zero-length string, contains only white space, or \r
-        ///     contains one or more implementation-specific invalid characters. Or <paramref name="searchPattern"/> \r
-        ///     does not contain a valid pattern. \r
-        /// </exception>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="path"/> is <see langword="null"/> or <paramref name="searchPattern"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="DirectoryNotFoundException">\r
-        ///     The specified <paramref name="path"/> is invalid (for example, it is on an unmapped drive). \r
-        /// </exception>\r
-        /// <exception cref="PathTooLongException">\r
-        ///     The specified <paramref name="path"/>, file name, or both exceed the system-defined maximum length. \r
-        ///     For example, on Windows-based platforms, paths must be less than 248 characters and file names must \r
-        ///     be less than 260 characters. \r
-        /// </exception>\r
-        /// <exception cref="UnauthorizedAccessException">\r
-        ///     The caller does not have the required permission. \r
-        /// </exception>\r
-        public DirectoryCatalog(string path, string searchPattern)\r
-        {\r
-            Requires.NotNullOrEmpty(path, "path");\r
-            this.Initialize(path, searchPattern);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Translated absolute path of the path passed into the constructor of <see cref="DirectoryCatalog"/>. \r
-        /// </summary>\r
-        public string FullPath\r
-        {\r
-            get\r
-            {\r
-                return this._fullPath;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Set of files that have currently been loaded into the catalog.\r
-        /// </summary>\r
-        public ReadOnlyCollection<string> LoadedFiles\r
-        {\r
-            get\r
-            {\r
-                using (new ReadLock(this._thisLock))\r
-                {\r
-                    return this._loadedFiles;\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Path passed into the constructor of <see cref="DirectoryCatalog"/>.\r
-        /// </summary>\r
-        public string Path\r
-        {\r
-            get\r
-            {\r
-                return this._path;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the part definitions of the directory catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IQueryable{T}"/> of <see cref="ComposablePartDefinition"/> objects of the \r
-        ///     <see cref="DirectoryCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="DirectoryCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IQueryable<ComposablePartDefinition> Parts\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-                return this._partsQuery;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///   SearchPattern passed into the constructor of <see cref="DirectoryCatalog"/>, or the default *.dll.\r
-        /// </summary>\r
-        public string SearchPattern\r
-        {\r
-            get\r
-            {\r
-                return this._searchPattern;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog has changed.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changed;\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog has changing.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changing;\r
-\r
-        /// <summary>\r
-        /// Releases unmanaged and - optionally - managed resources\r
-        /// </summary>\r
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            try\r
-            {\r
-                if (disposing)\r
-                {\r
-                    if (!this._isDisposed)\r
-                    {\r
-                        bool disposeLock = false;\r
-                        ComposablePartCatalogCollection catalogs = null;\r
-\r
-                        try\r
-                        {\r
-                            using (new WriteLock(this._thisLock))\r
-                            {\r
-                                if (!this._isDisposed)\r
-                                {\r
-                                    disposeLock = true;\r
-                                    catalogs = this._catalogCollection;\r
-                                    this._catalogCollection = null;\r
-                                    this._assemblyCatalogs = null;\r
-                                    this._isDisposed = true;\r
-                                }\r
-                            }\r
-                        }\r
-                        finally\r
-                        {\r
-                            if (catalogs != null)\r
-                            {\r
-                                catalogs.Dispose();\r
-                            }\r
-\r
-                            if (disposeLock)\r
-                            {\r
-                                this._thisLock.Dispose();\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-            finally\r
-            {\r
-                base.Dispose(disposing);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export definitions that match the constraint defined by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="ExportDefinition"/> objects to return.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1, T2}"/> containing the \r
-        ///     <see cref="ExportDefinition"/> objects and their associated \r
-        ///     <see cref="ComposablePartDefinition"/> for objects that match the constraint defined \r
-        ///     by <paramref name="definition"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="DirectoryCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(ImportDefinition definition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            return this._catalogCollection.SelectMany(catalog => catalog.GetExports(definition));\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="INotifyComposablePartCatalogChanged.Changed"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ComposablePartCatalogChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnChanged(ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            EventHandler<ComposablePartCatalogChangeEventArgs> changedEvent = this.Changed;\r
-            if (changedEvent != null)\r
-            {\r
-                changedEvent(this, e);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="INotifyComposablePartCatalogChanged.Changing"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ComposablePartCatalogChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnChanging(ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            EventHandler<ComposablePartCatalogChangeEventArgs> changingEvent = this.Changing;\r
-            if (changingEvent != null)\r
-            {\r
-                changingEvent(this, e);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Refreshes the <see cref="ComposablePartDefinition"/>s with the latest files in the directory that match\r
-        ///     the searchPattern. If any files have been added they will be added to the catalog and if any files were\r
-        ///     removed they will be removed from the catalog. For files that have been removed keep in mind that the \r
-        ///     assembly cannot be unloaded from the process so <see cref="ComposablePartDefinition"/>s for those files\r
-        ///     will simply be removed from the catalog.\r
-        /// \r
-        ///     Possible exceptions that can be thrown are any that <see cref="Directory.GetFiles(string, string)"/> or \r
-        ///     <see cref="Assembly.Load(AssemblyName)"/> can throw.\r
-        /// </summary>\r
-        /// <exception cref="DirectoryNotFoundException">\r
-        ///     The specified <paramref name="path"/> has been removed since object construction.\r
-        /// </exception>\r
-        public void Refresh()\r
-        {\r
-            this.ThrowIfDisposed();\r
-            Assumes.NotNull(this._loadedFiles);\r
-\r
-            List<Tuple<string, AssemblyCatalog>> catalogsToAdd;\r
-            List<Tuple<string, AssemblyCatalog>> catalogsToRemove;\r
-            ComposablePartDefinition[] addedDefinitions;\r
-            ComposablePartDefinition[] removedDefinitions;\r
-            object changeReferenceObject;\r
-            string[] afterFiles;\r
-            string[] beforeFiles;\r
-\r
-            while (true)\r
-            {\r
-                afterFiles = this.GetFiles();\r
-\r
-                using (new ReadLock(this._thisLock))\r
-                {\r
-                    changeReferenceObject = this._loadedFiles;\r
-                    beforeFiles = this._loadedFiles.ToArray();\r
-                }\r
-\r
-                this.DiffChanges(beforeFiles, afterFiles, out catalogsToAdd, out catalogsToRemove);\r
-\r
-                // Don't go any further if there's no work to do\r
-                if (catalogsToAdd.Count == 0 && catalogsToRemove.Count == 0)\r
-                {\r
-                    return;\r
-                }\r
-\r
-                // Notify listeners to give them a preview before completeting the changes\r
-                addedDefinitions = catalogsToAdd\r
-                    .SelectMany(cat => cat.Item2.Parts)\r
-                    .ToArray<ComposablePartDefinition>();\r
-\r
-                removedDefinitions = catalogsToRemove\r
-                    .SelectMany(cat => cat.Item2.Parts)\r
-                    .ToArray<ComposablePartDefinition>();\r
-\r
-                using (var atomicComposition = new AtomicComposition())\r
-                {\r
-                    var changingArgs = new ComposablePartCatalogChangeEventArgs(addedDefinitions, removedDefinitions, atomicComposition);\r
-                    this.OnChanging(changingArgs);\r
-       \r
-                    // if the change went through then write the catalog changes\r
-                    using (new WriteLock(this._thisLock))\r
-                    {\r
-                        if (changeReferenceObject != this._loadedFiles)\r
-                        {\r
-                            // Someone updated the list while we were diffing so we need to try the diff again\r
-                            continue;\r
-                        }\r
-\r
-                        foreach (var catalogToAdd in catalogsToAdd)\r
-                        {\r
-                            this._assemblyCatalogs.Add(catalogToAdd.Item1, catalogToAdd.Item2);\r
-                            this._catalogCollection.Add(catalogToAdd.Item2);\r
-                        }\r
-\r
-                        foreach (var catalogToRemove in catalogsToRemove)\r
-                        {\r
-                            this._assemblyCatalogs.Remove(catalogToRemove.Item1);\r
-                            this._catalogCollection.Remove(catalogToRemove.Item2);\r
-                        }\r
-\r
-                        this._partsQuery = this._catalogCollection.AsQueryable().SelectMany(catalog => catalog.Parts);\r
-                        this._loadedFiles = afterFiles.ToReadOnlyCollection();\r
-\r
-                        // Lastly complete any changes added to the atomicComposition during the change event\r
-                        atomicComposition.Complete();\r
-\r
-                        // Break out of the while(true)\r
-                        break;\r
-                    } // WriteLock\r
-                } // AtomicComposition\r
-            }   // while (true)\r
-\r
-            var changedArgs = new ComposablePartCatalogChangeEventArgs(addedDefinitions, removedDefinitions, null);\r
-            this.OnChanged(changedArgs);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a string representation of the directory catalog.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="String"/> containing the string representation of the <see cref="DirectoryCatalog"/>.\r
-        /// </returns>\r
-        public override string ToString()\r
-        {\r
-            return GetDisplayName();\r
-        }\r
-\r
-        private AssemblyCatalog CreateAssemblyCatalogGuarded(string assemblyFilePath)\r
-        {\r
-            Exception exception = null;\r
-\r
-            try\r
-            {\r
-                return new AssemblyCatalog(assemblyFilePath, this);\r
-            }\r
-            catch (FileNotFoundException ex)\r
-            {   // Files should always exists but don't blow up here if they don't\r
-                exception = ex;\r
-            }\r
-            catch (FileLoadException ex)\r
-            {   // File was found but could not be loaded\r
-                exception = ex;\r
-            }\r
-            catch (BadImageFormatException ex)\r
-            {   // Dlls that contain native code are not loaded, but do not invalidate the Directory\r
-                exception = ex;\r
-            }\r
-            catch (ReflectionTypeLoadException ex)\r
-            {   // Dlls that have missing Managed dependencies are not loaded, but do not invalidate the Directory \r
-                exception = ex;\r
-            }\r
-\r
-            CompositionTrace.AssemblyLoadFailed(this, assemblyFilePath, exception);\r
-\r
-            return null;\r
-        }\r
-\r
-        private void DiffChanges(string[] beforeFiles, string[] afterFiles,\r
-            out List<Tuple<string, AssemblyCatalog>> catalogsToAdd,\r
-            out List<Tuple<string, AssemblyCatalog>> catalogsToRemove)\r
-        {\r
-            catalogsToAdd = new List<Tuple<string, AssemblyCatalog>>();\r
-            catalogsToRemove = new List<Tuple<string, AssemblyCatalog>>();\r
-\r
-            IEnumerable<string> filesToAdd = afterFiles.Except(beforeFiles);\r
-            foreach (string file in filesToAdd)\r
-            {\r
-                AssemblyCatalog catalog = CreateAssemblyCatalogGuarded(file);\r
-\r
-                if (catalog != null)\r
-                {\r
-                    catalogsToAdd.Add(new Tuple<string, AssemblyCatalog>(file, catalog));\r
-                }\r
-            }\r
-\r
-            IEnumerable<string> filesToRemove = beforeFiles.Except(afterFiles);\r
-            using (new ReadLock(this._thisLock))\r
-            {\r
-                foreach (string file in filesToRemove)\r
-                {\r
-                    AssemblyCatalog catalog;\r
-                    if (this._assemblyCatalogs.TryGetValue(file, out catalog))\r
-                    {\r
-                        catalogsToRemove.Add(new Tuple<string, AssemblyCatalog>(file, catalog));\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        private string GetDisplayName()\r
-        {\r
-            return string.Format(CultureInfo.CurrentCulture,\r
-                                "{0} (Path=\"{1}\")",   // NOLOC\r
-                                this.GetType().Name,\r
-                                this._path);\r
-        }\r
-\r
-        private string[] GetFiles()\r
-        {\r
-                       return Directory.GetFiles(this._fullPath, this._searchPattern);\r
-        }\r
-\r
-        private static string GetFullPath(string path)\r
-        {\r
-            if (!IOPath.IsPathRooted(path) && AppDomain.CurrentDomain.BaseDirectory != null)\r
-            {\r
-                path = IOPath.Combine(AppDomain.CurrentDomain.BaseDirectory, path);\r
-            }\r
-\r
-            return IOPath.GetFullPath(path);\r
-        }\r
-\r
-        private void Initialize(string path, string searchPattern)\r
-        {\r
-            this._path = path;\r
-            this._fullPath = GetFullPath(path);\r
-            this._searchPattern = searchPattern;\r
-            this._assemblyCatalogs = new Dictionary<string, AssemblyCatalog>();\r
-            this._catalogCollection = new ComposablePartCatalogCollection(null);\r
-\r
-            this._loadedFiles = GetFiles().ToReadOnlyCollection();\r
-\r
-            foreach (string file in this._loadedFiles)\r
-            {\r
-                AssemblyCatalog assemblyCatalog = null;\r
-                assemblyCatalog = CreateAssemblyCatalogGuarded(file);\r
-\r
-                if (assemblyCatalog != null)\r
-                {\r
-                    this._assemblyCatalogs.Add(file, assemblyCatalog);\r
-                    this._catalogCollection.Add(assemblyCatalog);\r
-                }\r
-            }\r
-            this._partsQuery = this._catalogCollection.AsQueryable().SelectMany(catalog => catalog.Parts);\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-       \r
-        /// <summary>\r
-        ///     Gets the display name of the directory catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing a human-readable display name of the <see cref="DirectoryCatalog"/>.\r
-        /// </value>\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return this.GetDisplayName(); }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the composition element from which the directory catalog originated.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     This property always returns <see langword="null"/>.\r
-        /// </value>\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return null; }\r
-        }\r
-    }\r
-}\r
-\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.GetExportOverrides.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.GetExportOverrides.cs
deleted file mode 100644 (file)
index 01f2175..0000000
+++ /dev/null
@@ -1,817 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using System.Collections.ObjectModel;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public abstract partial class ExportProvider\r
-    {\r
-        /// <summary>\r
-        ///     Returns the export with the contract name derived from the specified type parameter, \r
-        ///     throwing an exception if there is not exactly one matching export.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T}"/> object to return. The contract name is also \r
-        ///     derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <returns>\r
-        ///     The <see cref="Lazy{T}"/> object with the contract name derived from \r
-        ///     <typeparamref name="T"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The returned <see cref="Lazy{T}"/> object is an instance of \r
-        ///         <see cref="Lazy{T, TMetadataView}"/> underneath, where \r
-        ///         <c>TMetadataView</c>\r
-        ///         is <see cref="IDictionary{TKey, TValue}"/> and where <c>TKey</c> \r
-        ///         is <see cref="String"/> and <c>TValue</c> is <see cref="Object"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         There are zero <see cref="Lazy{T}"/> objects with the contract name derived \r
-        ///         from <typeparamref name="T"/> in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         There are more than one <see cref="Lazy{T}"/> objects with the contract name \r
-        ///         derived from <typeparamref name="T"/> in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        public Lazy<T> GetExport<T>()\r
-        {\r
-            return this.GetExport<T>((string)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export with the specified contract name, throwing an exception if there \r
-        ///     is not exactly one matching export.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T}"/> object to return.\r
-        /// </typeparam>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the <see cref="Lazy{T}"/> \r
-        ///     object to return; or <see langword="null"/> or an empty string ("") to use the \r
-        ///     default contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     The <see cref="Lazy{T}"/> object with the specified contract name.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The returned <see cref="Lazy{T}"/> object is an instance of \r
-        ///         <see cref="Lazy{T, TMetadataView}"/> underneath, where \r
-        ///         <c>TMetadataView</c>\r
-        ///         is <see cref="IDictionary{TKey, TValue}"/> and where <c>TKey</c> \r
-        ///         is <see cref="String"/> and <c>TValue</c> is <see cref="Object"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is compared using a case-sensitive, non-linguistic \r
-        ///         comparison using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         There are zero <see cref="Lazy{T}"/> objects with the specified contract name \r
-        ///         in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         There are more than one <see cref="Lazy{T}"/> objects with the specified contract\r
-        ///         name in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        public Lazy<T> GetExport<T>(string contractName)\r
-        {\r
-            return this.GetExportCore<T>(contractName);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export with the contract name derived from the specified type parameter, \r
-        ///     throwing an exception if there is not exactly one matching export.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T, TMetadataView}"/> object to return. The \r
-        ///     contract name is also derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <typeparam name="TMetadataView">\r
-        ///     The type of the metadata view of the <see cref="Lazy{T, TMetadataView}"/> object\r
-        ///     to return.\r
-        /// </typeparam>\r
-        /// <returns>\r
-        ///     The <see cref="Lazy{T, TMetadataView}"/> object with the contract name derived \r
-        ///     from <typeparamref name="T"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         There are zero <see cref="Lazy{T, TMetadataView}"/> objects with the contract \r
-        ///         name derived from <typeparamref name="T"/> in the \r
-        ///         <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         There are more than one <see cref="Lazy{T, TMetadataView}"/> objects with the \r
-        ///         contract name derived from <typeparamref name="T"/> in the \r
-        ///         <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     <typeparamref name="TMetadataView"/> is not a valid metadata view type.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        public Lazy<T, TMetadataView> GetExport<T, TMetadataView>()\r
-        {\r
-            return this.GetExport<T, TMetadataView>((string)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export with the specified contract name, throwing an exception if there \r
-        ///     is not exactly one matching export.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T, TMetadataView}"/> object to return.\r
-        /// </typeparam>\r
-        /// <typeparam name="TMetadataView">\r
-        ///     The type of the metadata view of the <see cref="Lazy{T, TMetadataView}"/> object\r
-        ///     to return.\r
-        /// </typeparam>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="Lazy{T, TMetadataView}"/> object to return; or <see langword="null"/> \r
-        ///     or an empty string ("") to use the default contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     The <see cref="Lazy{T, TMetadataView}"/> object with the specified contract name.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         There are zero <see cref="Lazy{T, TMetadataView}"/> objects with the \r
-        ///         specified contract name in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         There are more than one <see cref="Lazy{T, TMetadataView}"/> objects with the \r
-        ///         specified contract name in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     <typeparamref name="TMetadataView"/> is not a valid metadata view type.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        public Lazy<T, TMetadataView> GetExport<T, TMetadataView>(string contractName)\r
-        {\r
-            return this.GetExportCore<T, TMetadataView>(contractName);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exports with the specified contract name.\r
-        /// </summary>\r
-        /// <param name="type">\r
-        ///     The <see cref="Type"/> of the <see cref="Export"/> objects to return.\r
-        /// </param>\r
-        /// <param name="metadataViewType">\r
-        ///     The <see cref="Type"/> of the metadata view of the <see cref="Export"/> objects to\r
-        ///     return.\r
-        /// </param>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="Export"/> object to return; or <see langword="null"/> \r
-        ///     or an empty string ("") to use the default contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> containing the <see cref="Lazy{Object, Object}"/> objects \r
-        ///     with the specified contract name, if found; otherwise, an empty \r
-        ///     <see cref="IEnumerable{T}"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The returned <see cref="Export"/> objects are instances of \r
-        ///         <see cref="Lazy{T, TMetadataView}"/> underneath, where <c>T</c>\r
-        ///         is <paramref name="type"/> and <c>TMetadataView</c> is \r
-        ///         <paramref name="metadataViewType"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <paramref name="type"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="type"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     <paramref name="metadataViewType"/> is not a valid metadata view type.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006")]\r
-        public IEnumerable<Lazy<object, object>> GetExports(Type type, Type metadataViewType, string contractName)\r
-        {\r
-            IEnumerable<Export> exports = this.GetExportsCore(type, metadataViewType, contractName, ImportCardinality.ZeroOrMore);\r
-            Collection<Lazy<object, object>> result = new Collection<Lazy<object, object>>();\r
-\r
-            Func<Export, Lazy<object, object>> typedExportFactory = ExportServices.CreateSemiStronglyTypedLazyFactory(type, metadataViewType);\r
-            foreach (Export export in exports)\r
-            {\r
-                result.Add(typedExportFactory.Invoke(export));\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exports with the contract name derived from the specified type parameter.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T}"/> objects to return. The contract name is also \r
-        ///     derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> containing the <see cref="Lazy{T}"/> objects\r
-        ///     with the contract name derived from <typeparamref name="T"/>, if found; otherwise,\r
-        ///     an empty <see cref="IEnumerable{T}"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The returned <see cref="Lazy{T}"/> objects are instances of \r
-        ///         <see cref="Lazy{T, TMetadataView}"/> underneath, where \r
-        ///         <c>TMetadataView</c>\r
-        ///         is <see cref="IDictionary{TKey, TValue}"/> and where <c>TKey</c> \r
-        ///         is <see cref="String"/> and <c>TValue</c> is <see cref="Object"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006")]\r
-        public IEnumerable<Lazy<T>> GetExports<T>()\r
-        {\r
-            return this.GetExports<T>((string)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exports with the specified contract name.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T}"/> objects to return.\r
-        /// </typeparam>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the <see cref="Lazy{T}"/> \r
-        ///     objects to return; or <see langword="null"/> or an empty string ("") to use the \r
-        ///     default contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> containing the <see cref="Lazy{T}"/> objects\r
-        ///     with the specified contract name, if found; otherwise, an empty \r
-        ///     <see cref="IEnumerable{T}"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The returned <see cref="Lazy{T}"/> objects are instances of \r
-        ///         <see cref="Lazy{T, TMetadataView}"/> underneath, where \r
-        ///         <c>TMetadataView</c>\r
-        ///         is <see cref="IDictionary{TKey, TValue}"/> and where <c>TKey</c> \r
-        ///         is <see cref="String"/> and <c>TValue</c> is <see cref="Object"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006")]\r
-        public IEnumerable<Lazy<T>> GetExports<T>(string contractName)\r
-        {\r
-            return this.GetExportsCore<T>(contractName);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exports with the contract name derived from the specified type parameter.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T, TMetadataView}"/> objects to return. The \r
-        ///     contract name is also derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <typeparam name="TMetadataView">\r
-        ///     The type of the metadata view of the <see cref="Lazy{T, TMetadataView}"/> objects\r
-        ///     to return.\r
-        /// </typeparam>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> containing the \r
-        ///     <see cref="Lazy{T, TMetadataView}"/> objects with the contract name derived from \r
-        ///     <typeparamref name="T"/>, if found; otherwise, an empty \r
-        ///     <see cref="IEnumerable{T}"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     <typeparamref name="TMetadataView"/> is not a valid metadata view type.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006")]\r
-        public IEnumerable<Lazy<T, TMetadataView>> GetExports<T, TMetadataView>()\r
-        {\r
-            return this.GetExports<T, TMetadataView>((string)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exports with the specified contract name.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the <see cref="Lazy{T, TMetadataView}"/> objects to return. The \r
-        ///     contract name is also derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <typeparam name="TMetadataView">\r
-        ///     The type of the metadata view of the <see cref="Lazy{T, TMetadataView}"/> objects\r
-        ///     to return.\r
-        /// </typeparam>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="Lazy{T, TMetadataView}"/> objects to return; or <see langword="null"/> \r
-        ///     or an empty string ("") to use the default contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> containing the \r
-        ///     <see cref="Lazy{T, TMetadataView}"/> objects with the specified contract name if \r
-        ///     found; otherwise, an empty <see cref="IEnumerable{T}"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     <typeparamref name="TMetadataView"/> is not a valid metadata view type.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006")]\r
-        public IEnumerable<Lazy<T, TMetadataView>> GetExports<T, TMetadataView>(string contractName)\r
-        {\r
-            return this.GetExportsCore<T, TMetadataView>(contractName);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported value with the contract name derived from the specified type \r
-        ///     parameter, throwing an exception if there is not exactly one matching exported value.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the exported value to return. The contract name is also \r
-        ///     derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <returns>\r
-        ///     The exported <see cref="Object"/> with the contract name derived from \r
-        ///     <typeparamref name="T"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     The underlying exported value cannot be cast to <typeparamref name="T"/>.\r
-        /// </exception>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         There are zero exported values with the contract name derived from \r
-        ///         <typeparamref name="T"/> in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         There are more than one exported values with the contract name derived from\r
-        ///         <typeparamref name="T"/> in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        public T GetExportedValue<T>()\r
-        {\r
-            return this.GetExportedValue<T>((string)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported value with the specified contract name, throwing an exception \r
-        ///     if there is not exactly one matching exported value.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the exported value to return.\r
-        /// </typeparam>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the exported value to return,\r
-        ///     or <see langword="null"/> or an empty string ("") to use the default contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     The exported <see cref="Object"/> with the specified contract name.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     The underlying exported value cannot be cast to <typeparamref name="T"/>.\r
-        /// </exception>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         There are zero exported values with the specified contract name in the \r
-        ///         <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         There are more than one exported values with the specified contract name in the\r
-        ///         <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        public T GetExportedValue<T>(string contractName)\r
-        {\r
-            return this.GetExportedValueCore<T>(contractName, ImportCardinality.ExactlyOne);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported value with the contract name derived from the specified type \r
-        ///     parameter, throwing an exception if there is more than one matching exported value.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the exported value to return. The contract name is also \r
-        ///     derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <returns>\r
-        ///     The exported <see cref="Object"/> with the contract name derived from \r
-        ///     <typeparamref name="T"/>, if found; otherwise, the default value for\r
-        ///     <typeparamref name="T"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         If the exported value is not found, then this method returns the appropriate \r
-        ///         default value for <typeparamref name="T"/>; for example, 0 (zero) for integer \r
-        ///         types, <see langword="false"/> for Boolean types, and <see langword="null"/> \r
-        ///         for reference types.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     The underlying exported value cannot be cast to <typeparamref name="T"/>.\r
-        /// </exception>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         There are more than one exported values with the contract name derived from\r
-        ///         <typeparamref name="T"/> in the <see cref="CompositionContainer"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        public T GetExportedValueOrDefault<T>()\r
-        {\r
-            return this.GetExportedValueOrDefault<T>((string)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported value with the specified contract name, throwing an exception \r
-        ///     if there is more than one matching exported value.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the exported value to return.\r
-        /// </typeparam>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the exported value to return,\r
-        ///     or <see langword="null"/> or an empty string ("") to use the default contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     The exported <see cref="Object"/> with the specified contract name, if found; \r
-        ///     otherwise, the default value for <typeparamref name="T"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         If the exported value is not found, then this method returns the appropriate \r
-        ///         default value for <typeparamref name="T"/>; for example, 0 (zero) for integer \r
-        ///         types, <see langword="false"/> for Boolean types, and <see langword="null"/> \r
-        ///         for reference types.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     The underlying exported value cannot be cast to <typeparamref name="T"/>.\r
-        /// </exception>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     There are more than one exported values with the specified contract name in the\r
-        ///     <see cref="CompositionContainer"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        public T GetExportedValueOrDefault<T>(string contractName)\r
-        {\r
-            return this.GetExportedValueCore<T>(contractName, ImportCardinality.ZeroOrOne);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported values with the contract name derived from the specified type \r
-        ///     parameter.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the exported value to return. The contract name is also \r
-        ///     derived from this type parameter.\r
-        /// </typeparam>\r
-        /// <returns>\r
-        ///     An <see cref="Collection{T}"/> containing the exported values with the contract name \r
-        ///     derived from the specified type parameter, if found; otherwise, an empty \r
-        ///     <see cref="Collection{T}"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     One or more of the underlying exported values cannot be cast to \r
-        ///     <typeparamref name="T"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        public IEnumerable<T> GetExportedValues<T>()\r
-        {\r
-            return this.GetExportedValues<T>((string)null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported values with the specified contract name.\r
-        /// </summary>\r
-        /// <typeparam name="T">\r
-        ///     The type of the exported value to return.\r
-        /// </typeparam>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the exported values to \r
-        ///     return; or <see langword="null"/> or an empty string ("") to use the default \r
-        ///     contract name.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="Collection{T}"/> containing the exported values with the specified \r
-        ///     contract name, if found; otherwise, an empty <see cref="Collection{T}"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on <typeparamref name="T"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     One or more of the underlying exported values cannot be cast to \r
-        ///     <typeparamref name="T"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="CompositionContainer"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        public IEnumerable<T> GetExportedValues<T>(string contractName)\r
-        {\r
-            return this.GetExportedValuesCore<T>(contractName);\r
-        }\r
-\r
-        private IEnumerable<T> GetExportedValuesCore<T>(string contractName)\r
-        {\r
-            IEnumerable<Export> exports = this.GetExportsCore(typeof(T), (Type)null, contractName, ImportCardinality.ZeroOrMore);\r
-\r
-            Collection<T> result = new Collection<T>();\r
-            foreach (Export export in exports)\r
-            {\r
-                result.Add(ExportServices.GetCastedExportedValue<T>(export));\r
-            }\r
-            return result;\r
-        }\r
-\r
-        private T GetExportedValueCore<T>(string contractName, ImportCardinality cardinality)\r
-        {\r
-            Assumes.IsTrue(cardinality.IsAtMostOne());\r
-\r
-            Export export = this.GetExportsCore(typeof(T), (Type)null, contractName, cardinality).SingleOrDefault();\r
-\r
-            return (export != null) ? ExportServices.GetCastedExportedValue<T>(export) : default(T);\r
-        }\r
-\r
-        private IEnumerable<Lazy<T>> GetExportsCore<T>(string contractName)\r
-        {\r
-            IEnumerable<Export> exports = this.GetExportsCore(typeof(T), (Type)null, contractName, ImportCardinality.ZeroOrMore);\r
-\r
-            Collection<Lazy<T>> result = new Collection<Lazy<T>>();\r
-            foreach (Export export in exports)\r
-            {\r
-                result.Add(ExportServices.CreateStronglyTypedLazyOfT<T>(export));\r
-            }\r
-            return result;\r
-        }\r
-\r
-        private IEnumerable<Lazy<T, TMetadataView>> GetExportsCore<T, TMetadataView>(string contractName)\r
-        {\r
-            IEnumerable<Export> exports = this.GetExportsCore(typeof(T), typeof(TMetadataView), contractName, ImportCardinality.ZeroOrMore);\r
-\r
-            Collection<Lazy<T, TMetadataView>> result = new Collection<Lazy<T, TMetadataView>>();\r
-            foreach (Export export in exports)\r
-            {\r
-                result.Add(ExportServices.CreateStronglyTypedLazyOfTM<T, TMetadataView>(export));\r
-            }\r
-            return result;\r
-        }\r
-\r
-        private Lazy<T, TMetadataView> GetExportCore<T, TMetadataView>(string contractName)\r
-        {\r
-            Export export = this.GetExportsCore(typeof(T), typeof(TMetadataView), contractName, ImportCardinality.ExactlyOne).SingleOrDefault();\r
-\r
-            return (export != null) ? ExportServices.CreateStronglyTypedLazyOfTM<T, TMetadataView>(export) : null;\r
-        }\r
-\r
-        private Lazy<T> GetExportCore<T>(string contractName)\r
-        {\r
-            Export export = this.GetExportsCore(typeof(T), null, contractName, ImportCardinality.ExactlyOne).SingleOrDefault();\r
-\r
-            return (export != null) ? ExportServices.CreateStronglyTypedLazyOfT<T>(export) : null;\r
-        }\r
-\r
-        private IEnumerable<Export> GetExportsCore(Type type, Type metadataViewType, string contractName, ImportCardinality cardinality)\r
-        {\r
-            // Only 'type' cannot be null - the other parameters have sensible defaults.\r
-            Requires.NotNull(type, "type");\r
-\r
-            if (string.IsNullOrEmpty(contractName))\r
-            {\r
-                contractName = AttributedModelServices.GetContractName(type);\r
-            }\r
-\r
-            if (metadataViewType == null)\r
-            {\r
-                metadataViewType = ExportServices.DefaultMetadataViewType;\r
-            }\r
-\r
-            if (!MetadataViewProvider.IsViewTypeValid(metadataViewType))\r
-            {\r
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Strings.InvalidMetadataView, metadataViewType.Name));\r
-            }\r
-\r
-            ImportDefinition importDefinition = BuildImportDefinition(type, metadataViewType, contractName, cardinality);\r
-            return this.GetExports(importDefinition, null);\r
-        }\r
-\r
-        private static ImportDefinition BuildImportDefinition(Type type, Type metadataViewType, string contractName, ImportCardinality cardinality)\r
-        {\r
-            Assumes.NotNull(type, metadataViewType, contractName);\r
-\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata = CompositionServices.GetRequiredMetadata(metadataViewType);\r
-\r
-            string requiredTypeIdentity = null;\r
-            if (type != typeof(object))\r
-            {\r
-                requiredTypeIdentity = AttributedModelServices.GetTypeIdentity(type);\r
-            }\r
-\r
-            return new ContractBasedImportDefinition(contractName, requiredTypeIdentity, requiredMetadata, cardinality, false, true, CreationPolicy.Any);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportProvider.cs
deleted file mode 100644 (file)
index 015996e..0000000
+++ /dev/null
@@ -1,231 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     Defines the <see langword="abstract"/> base class for export providers, which provide\r
-    ///     methods for retrieving <see cref="Export"/> objects.\r
-    /// </summary>\r
-    public abstract partial class ExportProvider\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportProvider"/> class.\r
-        /// </summary>\r
-        protected ExportProvider()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Occurs when the exports in the <see cref="ExportProvider"/> have changed.\r
-        /// </summary>\r
-        public event EventHandler<ExportsChangeEventArgs> ExportsChanged;\r
-\r
-        /// <summary>\r
-        ///     Occurs when the exports in the <see cref="ExportProvider"/> are changing.\r
-        /// </summary>\r
-        public event EventHandler<ExportsChangeEventArgs> ExportsChanging;\r
-\r
-        /// <summary>\r
-        ///     Returns all exports that match the conditions of the specified import.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="Export"/> objects to get.\r
-        /// </param>\r
-        /// <result>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects that match \r
-        ///     the conditions defined by <see cref="ImportDefinition"/>, if found; otherwise, an \r
-        ///     empty <see cref="IEnumerable{T}"/>.\r
-        /// </result>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         <see cref="ImportDefinition.Cardinality"/> is <see cref="ImportCardinality.ExactlyOne"/> and \r
-        ///         there are zero <see cref="Export"/> objects that match the conditions of the specified \r
-        ///         <see cref="ImportDefinition"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         <see cref="ImportDefinition.Cardinality"/> is <see cref="ImportCardinality.ZeroOrOne"/> or \r
-        ///         <see cref="ImportCardinality.ExactlyOne"/> and there are more than one <see cref="Export"/> \r
-        ///         objects that match the conditions of the specified <see cref="ImportDefinition"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        public IEnumerable<Export> GetExports(ImportDefinition definition)\r
-        {\r
-            return GetExports(definition, null);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns all exports that match the conditions of the specified import.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="Export"/> objects to get.\r
-        /// </param>\r
-        /// <result>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects that match \r
-        ///     the conditions defined by <see cref="ImportDefinition"/>, if found; otherwise, an \r
-        ///     empty <see cref="IEnumerable{T}"/>.\r
-        /// </result>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ImportCardinalityMismatchException">\r
-        ///     <para>\r
-        ///         <see cref="ImportDefinition.Cardinality"/> is <see cref="ImportCardinality.ExactlyOne"/> and \r
-        ///         there are zero <see cref="Export"/> objects that match the conditions of the specified \r
-        ///         <see cref="ImportDefinition"/>.\r
-        ///     </para>\r
-        ///     -or-\r
-        ///     <para>\r
-        ///         <see cref="ImportDefinition.Cardinality"/> is <see cref="ImportCardinality.ZeroOrOne"/> or \r
-        ///         <see cref="ImportCardinality.ExactlyOne"/> and there are more than one <see cref="Export"/> \r
-        ///         objects that match the conditions of the specified <see cref="ImportDefinition"/>.\r
-        ///     </para>\r
-        /// </exception>\r
-        public IEnumerable<Export> GetExports(ImportDefinition definition, AtomicComposition atomicComposition)\r
-        {\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            IEnumerable<Export> exports;\r
-            ExportCardinalityCheckResult result = this.TryGetExportsCore(definition, atomicComposition, out exports);\r
-            switch(result)\r
-            {\r
-                case ExportCardinalityCheckResult.Match:\r
-                    return exports;\r
-                case ExportCardinalityCheckResult.NoExports:\r
-                    throw new ImportCardinalityMismatchException(string.Format(CultureInfo.CurrentCulture, Strings.CardinalityMismatch_NoExports, definition.Constraint.Body.ToString()));\r
-                default:\r
-                    Assumes.IsTrue(result == ExportCardinalityCheckResult.TooManyExports);\r
-                    throw new ImportCardinalityMismatchException(string.Format(CultureInfo.CurrentCulture, Strings.CardinalityMismatch_TooManyExports, definition.Constraint.Body.ToString()));\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns all exports that match the conditions of the specified import.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="Export"/> objects to get.\r
-        /// </param>\r
-        /// <param name="exports">\r
-        ///     When this method returns, contains an <see cref="IEnumerable{T}"/> of <see cref="Export"/> \r
-        ///     objects that match the conditions defined by <see cref="ImportDefinition"/>, if found; \r
-        ///     otherwise, an empty <see cref="IEnumerable{T}"/>.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     <see langword="true"/> if <see cref="ImportDefinition.Cardinality"/> is \r
-        ///     <see cref="ImportCardinality.ZeroOrOne"/> or <see cref="ImportCardinality.ZeroOrMore"/> and \r
-        ///     there are zero <see cref="Export"/> objects that match the conditions of the specified \r
-        ///     <see cref="ImportDefinition"/>. <see langword="true"/> if \r
-        ///     <see cref="ImportDefinition.Cardinality"/> is <see cref="ImportCardinality.ZeroOrOne"/> or \r
-        ///     <see cref="ImportCardinality.ExactlyOne"/> and there is exactly one <see cref="Export"/> \r
-        ///     that matches the conditions of the specified <see cref="ImportDefinition"/>; otherwise, \r
-        ///     <see langword="false"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public bool TryGetExports(ImportDefinition definition, AtomicComposition atomicComposition, out IEnumerable<Export> exports)\r
-        {\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            exports = null;\r
-            ExportCardinalityCheckResult result = this.TryGetExportsCore(definition, atomicComposition, out exports);\r
-            return (result == ExportCardinalityCheckResult.Match);\r
-        }\r
-    \r
-        /// <summary>\r
-        ///     Returns all exports that match the constraint defined by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="Export"/> objects to return.\r
-        /// </param>\r
-        /// <result>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects that match \r
-        ///     the conditions defined by <see cref="ImportDefinition"/>, if found; otherwise, an \r
-        ///     empty <see cref="IEnumerable{T}"/>.\r
-        /// </result>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this method should not treat cardinality-related mismatches \r
-        ///         as errors, and should not throw exceptions in those cases. For instance,\r
-        ///         if <see cref="ImportDefinition.Cardinality"/> is <see cref="ImportCardinality.ExactlyOne"/> \r
-        ///         and there are zero <see cref="Export"/> objects that match the conditions of the \r
-        ///         specified <see cref="ImportDefinition"/>, an <see cref="IEnumerable{T}"/> should be returned.\r
-        ///     </note>\r
-        /// </remarks>\r
-        protected abstract IEnumerable<Export> GetExportsCore(ImportDefinition definition, AtomicComposition atomicComposition);\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="ExportsChanged"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ExportsChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnExportsChanged(ExportsChangeEventArgs e)\r
-        {\r
-            EventHandler<ExportsChangeEventArgs> changedEvent = this.ExportsChanged;\r
-            if (changedEvent != null)\r
-            {\r
-                CompositionResult result = CompositionServices.TryFire(changedEvent, this, e);\r
-                result.ThrowOnErrors(e.AtomicComposition);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="ExportsChanging"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ExportsChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnExportsChanging(ExportsChangeEventArgs e)\r
-        {\r
-            EventHandler<ExportsChangeEventArgs> changingEvent = this.ExportsChanging;\r
-            if (changingEvent != null)\r
-            {\r
-                CompositionResult result = CompositionServices.TryFire(changingEvent, this, e);\r
-                result.ThrowOnErrors(e.AtomicComposition);\r
-            }\r
-        }\r
-\r
-        private ExportCardinalityCheckResult TryGetExportsCore(ImportDefinition definition, AtomicComposition atomicComposition, out IEnumerable<Export> exports)\r
-        {\r
-            Assumes.NotNull(definition);\r
-\r
-            exports = this.GetExportsCore(definition, atomicComposition);\r
-\r
-            if (exports == null)\r
-            {\r
-                exports = Enumerable.Empty<Export>();\r
-            }\r
-\r
-            var checkResult = ExportServices.CheckCardinality(definition, exports);\r
-\r
-            // Export providers treat >1 match as zero for cardinality 0-1 imports\r
-            // If this policy is moved we need to revisit the assumption that the\r
-            // ImportEngine made during previewing the only required imports to \r
-            // now also preview optional imports.\r
-            if (checkResult == ExportCardinalityCheckResult.TooManyExports &&\r
-                definition.Cardinality == ImportCardinality.ZeroOrOne)\r
-            {\r
-                checkResult = ExportCardinalityCheckResult.Match;\r
-                exports = Enumerable.Empty<Export>();\r
-            }\r
-\r
-            return checkResult;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportsChangeEventArgs.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ExportsChangeEventArgs.cs
deleted file mode 100644 (file)
index 58f962f..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Collections.ObjectModel;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     Provides data for the <see cref="ExportProvider.ExportsChanged"/> and \r
-    ///     <see cref="ExportProvider.ExportsChanging"/> events.\r
-    /// </summary>\r
-    public class ExportsChangeEventArgs : EventArgs\r
-    {\r
-        private IEnumerable<string> _changedContractNames = null;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportsChangeEventArgs"/> class with \r
-        ///     the specified changed export definitions.\r
-        /// </summary>\r
-        /// <param name="addedExports">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ExportDefinition"/>s of the exports\r
-        ///     that have been added.\r
-        /// </param>\r
-        /// <param name="removedExports">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ExportDefinition"/>s of the exports\r
-        ///     that have been removed.\r
-        /// </param>\r
-        /// <param name="atomicComposition">\r
-        ///     A <see cref="AtomicComposition"/> representing all tentative changes that will\r
-        ///     be completed if the change is successful, or discarded if it is not. \r
-        ///     <see langword="null"/> if being applied outside a <see cref="AtomicComposition"/> \r
-        ///     or during a <see cref="ExportProvider.ExportsChanged"/> event.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="addedExports"/> or <paramref name="removedExports"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public ExportsChangeEventArgs(IEnumerable<ExportDefinition> addedExports,\r
-                IEnumerable<ExportDefinition> removedExports, AtomicComposition atomicComposition)\r
-        {\r
-            Requires.NotNull(addedExports, "addedExports");\r
-            Requires.NotNull(removedExports, "removedExports");\r
-\r
-            this.AddedExports = addedExports.AsArray();\r
-            this.RemovedExports = removedExports.AsArray();\r
-            this.AtomicComposition = atomicComposition;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the export definitions for the exports that have been added.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IEnumerable{T}"/> of ExportDefinitions representing \r
-        ///     the exports that have been added to the <see cref="CompositionContainer"/>.\r
-        /// </value>\r
-        public IEnumerable<ExportDefinition> AddedExports { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Gets the export definitions for the exports that have been removed.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IEnumerable{T}"/> of ExportDefinitions representing \r
-        ///     the exports that have been added to the <see cref="CompositionContainer"/>.\r
-        /// </value>\r
-        public IEnumerable<ExportDefinition> RemovedExports { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Gets the contract names of the exports that have changed.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IEnumerable{T}"/> of strings representing the contract names of \r
-        ///     the exports that have changed in the <see cref="CompositionContainer"/>.\r
-        /// </value>\r
-        public IEnumerable<string> ChangedContractNames \r
-        {\r
-            get\r
-            {\r
-                if (this._changedContractNames == null)\r
-                {\r
-                    this._changedContractNames = this.AddedExports\r
-                        .Concat(this.RemovedExports)\r
-                        .Select(export => export.ContractName)\r
-                        .Distinct()\r
-                        .ToArray();\r
-                }\r
-                return this._changedContractNames;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the atomicComposition, if any, that this change applies to.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="AtomicComposition"/> that this set of changes applies too. \r
-        ///     \r
-        ///     It can be <see langword="null"/> if the changes are being applied outside a \r
-        ///     <see cref="AtomicComposition"/> or during a \r
-        ///     <see cref="ExportProvider.ExportsChanged"/> event.\r
-        ///     \r
-        ///     When the value is non-null it should be used to record temporary changed state\r
-        ///     and actions that will be executed when the atomicComposition is completeed.\r
-        /// </value>\r
-        public AtomicComposition AtomicComposition { get; private set; }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/INotifyComposablePartCatalogChanged.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/INotifyComposablePartCatalogChanged.cs
deleted file mode 100644 (file)
index 4e5f825..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     Notifications when a ComposablePartCatalog changes.\r
-    /// </summary>\r
-    public interface INotifyComposablePartCatalogChanged\r
-    {\r
-        event EventHandler<ComposablePartCatalogChangeEventArgs> Changed;\r
-        event EventHandler<ComposablePartCatalogChangeEventArgs> Changing;\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.EngineContext.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.EngineContext.cs
deleted file mode 100644 (file)
index 890b019..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.Runtime.CompilerServices;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class ImportEngine \r
-    {\r
-        /// <summary>\r
-        ///     Used to wrap the start and stop of enforcing export changes don't\r
-        ///     break required imports. This context is stored in a AtomicComposition.\r
-        /// </summary>\r
-        private class EngineContext\r
-        {\r
-            private ImportEngine _importEngine;\r
-            private List<PartManager> _addedPartManagers = new List<PartManager>();\r
-            private List<PartManager> _removedPartManagers = new List<PartManager>();\r
-            private EngineContext _parentEngineContext;\r
-\r
-            public EngineContext(ImportEngine importEngine, EngineContext parentEngineContext)\r
-            {\r
-                this._importEngine = importEngine;\r
-                this._parentEngineContext = parentEngineContext;\r
-            }\r
-\r
-            public void AddPartManager(PartManager part)\r
-            {\r
-                Assumes.NotNull(part);\r
-                if (!this._removedPartManagers.Remove(part))\r
-                {\r
-                    this._addedPartManagers.Add(part);\r
-                }\r
-            }\r
-\r
-            public void RemovePartManager(PartManager part)\r
-            {\r
-                Assumes.NotNull(part);\r
-                if (!this._addedPartManagers.Remove(part))\r
-                {\r
-                    this._removedPartManagers.Add(part);\r
-                }\r
-            }\r
-\r
-            public IEnumerable<PartManager> GetAddedPartManagers()\r
-            {\r
-                if (this._parentEngineContext != null)\r
-                {\r
-                    return this._addedPartManagers.ConcatAllowingNull(this._parentEngineContext.GetAddedPartManagers());\r
-                }\r
-                return this._addedPartManagers;\r
-            }\r
-\r
-            public IEnumerable<PartManager> GetRemovedPartManagers()\r
-            {\r
-                if (this._parentEngineContext != null)\r
-                {\r
-                    return this._removedPartManagers.ConcatAllowingNull(this._parentEngineContext.GetRemovedPartManagers());\r
-                }\r
-                return this._removedPartManagers;\r
-            }\r
-\r
-            public void Complete()\r
-            {\r
-                foreach (var partManager in this._addedPartManagers)\r
-                {\r
-                    this._importEngine.StartSatisfyingImports(partManager, null);\r
-                }\r
-\r
-                foreach (var partManager in this._removedPartManagers)\r
-                {\r
-                    this._importEngine.StopSatisfyingImports(partManager, null);\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.PartManager.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.PartManager.cs
deleted file mode 100644 (file)
index d092c67..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.Runtime.CompilerServices;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class ImportEngine\r
-    {\r
-        /// <summary>\r
-        ///     Used by the <see cref="ImportEngine"/> to manage the composition of a given part.\r
-        ///     It stores things like the list of disposable exports used to satisfy the imports as\r
-        ///     well as the caching of the exports discovered during previewing of a part.\r
-        /// </summary>\r
-        private class PartManager\r
-        {\r
-            private Dictionary<ImportDefinition, List<IDisposable>> _importedDisposableExports;\r
-            private Dictionary<ImportDefinition, Export[]> _importCache;\r
-            private string[] _importedContractNames;\r
-            private ComposablePart _part;\r
-            private ImportState _state = ImportState.NoImportsSatisfied;\r
-            private readonly ImportEngine _importEngine;\r
-\r
-            public PartManager(ImportEngine importEngine, ComposablePart part)\r
-            {\r
-                this._importEngine = importEngine;\r
-                this._part = part;\r
-            }\r
-\r
-            public ComposablePart Part\r
-            {\r
-                get\r
-                {\r
-                    return this._part;\r
-                }\r
-            }\r
-\r
-            public ImportState State\r
-            {\r
-                get\r
-                {\r
-                    using (this._importEngine._lock.LockStateForRead())\r
-                    {\r
-                        return this._state;\r
-                    }\r
-                }\r
-                set\r
-                {\r
-                    using (this._importEngine._lock.LockStateForWrite())\r
-                    {\r
-                        this._state = value;\r
-                    }\r
-                }\r
-            }\r
-\r
-            public bool TrackingImports { get; set; }\r
-\r
-            public IEnumerable<string> GetImportedContractNames()\r
-            {\r
-                if (this.Part == null)\r
-                {\r
-                    return Enumerable.Empty<string>();\r
-                }\r
-\r
-                if (this._importedContractNames == null)\r
-                {\r
-                    this._importedContractNames = this.Part.ImportDefinitions.Select(import => import.ContractName ?? ImportDefinition.EmptyContractName).Distinct().ToArray();\r
-                }\r
-                return this._importedContractNames;\r
-            }\r
-\r
-            public CompositionResult TrySetImport(ImportDefinition import, IEnumerable<Export> exports)\r
-            {\r
-                try\r
-                {\r
-                    this.Part.SetImport(import, exports);\r
-                    UpdateDisposableDependencies(import, exports);\r
-                    return CompositionResult.SucceededResult;\r
-                }\r
-                catch (CompositionException ex)\r
-                {   // Pulling on one of the exports failed\r
-\r
-                    return new CompositionResult(\r
-                        ErrorBuilder.CreatePartCannotSetImport(Part, import, ex));\r
-                }\r
-                catch (ComposablePartException ex)\r
-                {   // Type mismatch between export and import\r
-\r
-                    return new CompositionResult(\r
-                        ErrorBuilder.CreatePartCannotSetImport(Part, import, ex));\r
-                }\r
-            }\r
-\r
-            public void SetSavedImport(ImportDefinition import, Export[] exports, AtomicComposition atomicComposition)\r
-            {\r
-                if (atomicComposition != null)\r
-                {\r
-                    var savedExports = this.GetSavedImport(import);\r
-\r
-                    // Add a revert action to revert the stored exports\r
-                    // in the case that this atomicComposition gets rolled back.\r
-                    atomicComposition.AddRevertAction(() =>\r
-                        this.SetSavedImport(import, savedExports, null));\r
-                }\r
-\r
-                if (this._importCache == null)\r
-                {\r
-                    this._importCache = new Dictionary<ImportDefinition, Export[]>();\r
-                }\r
-\r
-                this._importCache[import] = exports;\r
-            }\r
-\r
-            public Export[] GetSavedImport(ImportDefinition import)\r
-            {\r
-                Export[] exports = null;\r
-                if (this._importCache != null)\r
-                {\r
-                    // We don't care about the return value we just want the exports\r
-                    // and if it isn't present we just return the initialized null value\r
-                    this._importCache.TryGetValue(import, out exports);\r
-                }\r
-                return exports;\r
-            }\r
-\r
-            public void ClearSavedImports()\r
-            {\r
-                this._importCache = null;\r
-            }\r
-\r
-            public CompositionResult TryOnComposed()\r
-            {\r
-                try\r
-                {\r
-                    this.Part.Activate();\r
-                    return CompositionResult.SucceededResult;\r
-                }\r
-                catch (ComposablePartException ex)\r
-                {   // Type failed to be constructed, imports could not be set, etc\r
-                    return new CompositionResult(\r
-                        ErrorBuilder.CreatePartCannotActivate(this.Part, ex));\r
-                }\r
-            }\r
-\r
-            public void UpdateDisposableDependencies(ImportDefinition import, IEnumerable<Export> exports)\r
-            {\r
-                // Determine if there are any new disposable exports, optimizing for the most\r
-                // likely case, which is that there aren't any\r
-                List<IDisposable> disposableExports = null;\r
-                foreach (var disposableExport in exports.OfType<IDisposable>())\r
-                {\r
-                    if (disposableExports == null)\r
-                    {\r
-                        disposableExports = new List<IDisposable>();\r
-                    }\r
-                    disposableExports.Add(disposableExport);\r
-                }\r
-\r
-                // Dispose any existing references previously set on this import\r
-                List<IDisposable> oldDisposableExports = null;\r
-                if (this._importedDisposableExports != null &&\r
-                    this._importedDisposableExports.TryGetValue(import, out oldDisposableExports))\r
-                {\r
-                    oldDisposableExports.ForEach(disposable => disposable.Dispose());\r
-\r
-                    // If there aren't any replacements, get rid of the old storage\r
-                    if (disposableExports == null)\r
-                    {\r
-                        this._importedDisposableExports.Remove(import);\r
-                        if (!this._importedDisposableExports.FastAny())\r
-                        {\r
-                            this._importedDisposableExports = null;\r
-                        }\r
-\r
-                        return;\r
-                    }\r
-                }\r
-\r
-                // Record the new collection\r
-                if (disposableExports != null)\r
-                {\r
-                    if (this._importedDisposableExports == null)\r
-                    {\r
-                        this._importedDisposableExports = new Dictionary<ImportDefinition, List<IDisposable>>();\r
-                    }\r
-                    this._importedDisposableExports[import] = disposableExports;\r
-                }\r
-            }\r
-\r
-            public void DisposeAllDependencies()\r
-            {\r
-                if (this._importedDisposableExports != null)\r
-                {\r
-                    IEnumerable<IDisposable> dependencies = this._importedDisposableExports.Values\r
-                        .SelectMany(exports => exports);\r
-\r
-                    this._importedDisposableExports = null;\r
-\r
-                    dependencies.ForEach(disposableExport => disposableExport.Dispose());\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.RecompositionManager.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.RecompositionManager.cs
deleted file mode 100644 (file)
index ff3eb19..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.Runtime.CompilerServices;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public partial class ImportEngine\r
-    {\r
-        /// <summary>\r
-        ///     Used by the <see cref="ImportEngine"/> to effiecently store and retrieve the list of parts\r
-        ///     that will be affected by changes to exports. This allows the <see cref="ImportEngine"/> to properly\r
-        ///     block breaking changes and also recompose imports as appropriate.\r
-        /// </summary>\r
-        private class RecompositionManager\r
-        {\r
-            private WeakReferenceCollection<PartManager> _partsToIndex = new WeakReferenceCollection<PartManager>();\r
-            private WeakReferenceCollection<PartManager> _partsToUnindex = new WeakReferenceCollection<PartManager>();\r
-            private Dictionary<string, WeakReferenceCollection<PartManager>> _partManagerIndex = new Dictionary<string, WeakReferenceCollection<PartManager>>();\r
-\r
-            public void AddPartToIndex(PartManager partManager)\r
-            {\r
-                this._partsToIndex.Add(partManager);\r
-            }\r
-\r
-            public void AddPartToUnindex(PartManager partManager)\r
-            {\r
-                this._partsToUnindex.Add(partManager);\r
-            }\r
-\r
-            public IEnumerable<PartManager> GetAffectedParts(IEnumerable<string> changedContractNames)\r
-            {\r
-                this.UpdateImportIndex();\r
-\r
-                List<PartManager> parts = new List<PartManager>();\r
-\r
-                parts.AddRange(GetPartsImporting(ImportDefinition.EmptyContractName));\r
-\r
-                foreach (string contractName in changedContractNames)\r
-                {\r
-                    parts.AddRange(GetPartsImporting(contractName));\r
-                }\r
-\r
-                return parts;\r
-            }\r
-\r
-            public static IEnumerable<ImportDefinition> GetAffectedImports(ComposablePart part, IEnumerable<ExportDefinition> changedExports)\r
-            {\r
-                return part.ImportDefinitions.Where(import => IsAffectedImport(import, changedExports));\r
-            }\r
-\r
-            private static bool IsAffectedImport(ImportDefinition import, IEnumerable<ExportDefinition> changedExports)\r
-            {\r
-                // This could be more efficient still if the export definitions were indexed by contract name,\r
-                // only worth revisiting if we need to squeeze more performance out of recomposition\r
-                foreach (var export in changedExports)\r
-                {\r
-                    if (import.IsConstraintSatisfiedBy(export))\r
-                    {\r
-                        return true;\r
-                    }\r
-                }\r
-               \r
-                return false;\r
-            }\r
-\r
-            public IEnumerable<PartManager> GetPartsImporting(string contractName)\r
-            {\r
-                WeakReferenceCollection<PartManager> partManagerList;\r
-                if (!this._partManagerIndex.TryGetValue(contractName, out partManagerList))\r
-                {\r
-                    return Enumerable.Empty<PartManager>();\r
-                }\r
-\r
-                return partManagerList.AliveItemsToList();\r
-            }\r
-\r
-            private void AddIndexEntries(PartManager partManager)\r
-            {\r
-                foreach (string contractName in partManager.GetImportedContractNames())\r
-                {\r
-                    WeakReferenceCollection<PartManager> indexEntries;\r
-                    if (!this._partManagerIndex.TryGetValue(contractName, out indexEntries))\r
-                    {\r
-                        indexEntries = new WeakReferenceCollection<PartManager>();\r
-                        this._partManagerIndex.Add(contractName, indexEntries);\r
-                    }\r
-\r
-                    if (!indexEntries.Contains(partManager))\r
-                    {\r
-                        indexEntries.Add(partManager);\r
-                    }\r
-                }\r
-            }\r
-\r
-            private void RemoveIndexEntries(PartManager partManager)\r
-            {\r
-                foreach (string contractName in partManager.GetImportedContractNames())\r
-                {\r
-                    WeakReferenceCollection<PartManager> indexEntries;\r
-                    if (this._partManagerIndex.TryGetValue(contractName, out indexEntries))\r
-                    {\r
-                        indexEntries.Remove(partManager);\r
-                        var aliveItems = indexEntries.AliveItemsToList();\r
-\r
-                        if (aliveItems.Count == 0)\r
-                        {\r
-                            this._partManagerIndex.Remove(contractName);\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            private void UpdateImportIndex()\r
-            {\r
-                var partsToIndex = this._partsToIndex.AliveItemsToList();\r
-                this._partsToIndex.Clear();\r
-\r
-                var partsToUnindex = this._partsToUnindex.AliveItemsToList();\r
-                this._partsToUnindex.Clear();\r
-\r
-                if (partsToIndex.Count == 0 && partsToUnindex.Count == 0)\r
-                {\r
-                    return;\r
-                }\r
-\r
-                foreach (var partManager in partsToIndex)\r
-                {\r
-                    var index = partsToUnindex.IndexOf(partManager);\r
-\r
-                    // If the same part is being added and removed we can ignore both\r
-                    if (index >= 0)\r
-                    {\r
-                        partsToUnindex[index] = null;\r
-                    }\r
-                    else\r
-                    {\r
-                        AddIndexEntries(partManager);\r
-                    }\r
-                }\r
-\r
-                foreach (var partManager in partsToUnindex)\r
-                {\r
-                    if (partManager != null)\r
-                    {\r
-                        RemoveIndexEntries(partManager);\r
-                    }\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/ImportEngine.cs
deleted file mode 100644 (file)
index 29bd329..0000000
+++ /dev/null
@@ -1,754 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.Runtime.CompilerServices;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    // This class guarantees thread-safety under the follwoing conditions:\r
-    // - Each composition is executed on a single thread\r
-    // - No recomposition ever takes place\r
-    // - The class is created with isThreadSafe=true\r
-    public partial class ImportEngine : ICompositionService, IDisposable\r
-    {\r
-        private const int MaximumNumberOfCompositionIterations = 100;\r
-\r
-        private volatile bool _isDisposed;\r
-        private ExportProvider _sourceProvider;\r
-        private Stack<PartManager> _recursionStateStack = new Stack<PartManager>();\r
-        private ConditionalWeakTable<ComposablePart, PartManager> _partManagers = new ConditionalWeakTable<ComposablePart, PartManager>();\r
-        private RecompositionManager _recompositionManager = new RecompositionManager();\r
-        private readonly CompositionLock _lock = null;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportEngine"/> class.\r
-        /// </summary>\r
-        /// <param name="sourceProvider">\r
-        ///     The <see cref="ExportProvider"/> which provides the \r
-        ///     <see cref="ImportEngine"/> access to <see cref="Export"/>s. \r
-        /// </param>\r
-        public ImportEngine(ExportProvider sourceProvider)\r
-            : this(sourceProvider, false)\r
-        {\r
-        }\r
-\r
-        public ImportEngine(ExportProvider sourceProvider, bool isThreadSafe)\r
-        {\r
-            Requires.NotNull(sourceProvider, "sourceProvider");\r
-\r
-            this._sourceProvider = sourceProvider;\r
-            this._sourceProvider.ExportsChanging += this.OnExportsChanging;\r
-            this._lock = new CompositionLock(isThreadSafe);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Previews all the required imports for the given <see cref="ComposablePart"/> to \r
-        ///     ensure they can all be satisified. The preview does not actually set the imports\r
-        ///     only ensures that they exist in the source provider. If the preview succeeds then\r
-        ///     the <see cref="ImportEngine"/> also enforces that changes to exports in the source\r
-        ///     provider will not break any of the required imports. If this enforcement needs to be\r
-        ///     lifted for this part then <see cref="ReleaseImports"/> needs to be called for this\r
-        ///     <see cref="ComposablePart"/>.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     The <see cref="ComposablePart"/> to preview the required imports.\r
-        /// </param>\r
-        /// <param name="atomicComposition"></param>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during previewing and <paramref name="atomicComposition"/> is null. \r
-        ///     <see cref="CompositionException.Errors"/> will contain a collection of errors that occurred.\r
-        ///     The pre-existing composition is in an unknown state, depending on the errors that occured.\r
-        /// </exception>\r
-        /// <exception cref="ChangeRejectedException">\r
-        ///     An error occurred during the previewing and <paramref name="atomicComposition"/> is not null.\r
-        ///     <see cref="CompositionException.Errors"/> will contain a collection of errors that occurred.\r
-        ///     The pre-existing composition remains in valid state.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ImportEngine"/> has been disposed of.\r
-        /// </exception>\r
-        public void PreviewImports(ComposablePart part, AtomicComposition atomicComposition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(part, "part");\r
-\r
-            // NOTE : this is a very intricate area threading-wise, please use caution when changing, otherwise state corruption or deadlocks will ensue\r
-            // The gist of what we are doing is as follows:\r
-            // We need to lock the composition, as we will proceed modifying our internal state. The tricky part is when we release the lock\r
-            // Due to the fact that some actions will take place AFTER we leave this method, we need to KEEP THAT LOCK HELD until the transation is commiited or rolled back\r
-            // This is the reason we CAN'T use "using here.\r
-            // Instead, if the transaction is present we will queue up the release of the lock, otherwise we will release it when we exit this method\r
-            // We add the "release" lock to BOTH Commit and Revert queues, because they are mutually exclusive, and we need to release the lock regardless.\r
-\r
-            // This will take the lock, if necesary\r
-            IDisposable compositionLockHolder = this._lock.IsThreadSafe ? this._lock.LockComposition() : null;\r
-            bool compositionLockTaken = (compositionLockHolder != null);\r
-            try\r
-            {\r
-                // revert actions are processed in the reverse order, so we have to add the "release lock" action now\r
-                if (compositionLockTaken && (atomicComposition != null))\r
-                {\r
-                    atomicComposition.AddRevertAction(() => compositionLockHolder.Dispose());\r
-                }\r
-\r
-                var partManager = GetPartManager(part, true);\r
-                var result = TryPreviewImportsStateMachine(partManager, part, atomicComposition);\r
-                result.ThrowOnErrors(atomicComposition);\r
-\r
-                StartSatisfyingImports(partManager, atomicComposition);\r
-\r
-                // Add the "release lock" to the commit actions\r
-                if (compositionLockTaken && (atomicComposition != null))\r
-                {\r
-                    atomicComposition.AddCompleteAction(() => compositionLockHolder.Dispose());\r
-                }\r
-            }\r
-            finally\r
-            {\r
-                // We haven't updated the queues, so we can release the lock now\r
-                if (compositionLockTaken && (atomicComposition == null))\r
-                {\r
-                    compositionLockHolder.Dispose();\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Satisfies the imports of the specified composable part. If the satisfy succeeds then\r
-        ///     the <see cref="ImportEngine"/> also enforces that changes to exports in the source\r
-        ///     provider will not break any of the required imports. If this enforcement needs to be\r
-        ///     lifted for this part then <see cref="ReleaseImports"/> needs to be called for this\r
-        ///     <see cref="ComposablePart"/>.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     The <see cref="ComposablePart"/> to set the imports.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="part"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will\r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ImportEngine"/> has been disposed of.\r
-        /// </exception>\r
-        public void SatisfyImports(ComposablePart part)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(part, "part");\r
-\r
-            // NOTE : the following two calls use the state lock\r
-            PartManager partManager = this.GetPartManager(part, true);\r
-            if (partManager.State == ImportState.Composed)\r
-            {\r
-                return;\r
-            }\r
-\r
-            using (this._lock.LockComposition())\r
-            {\r
-                var result = TrySatisfyImports(partManager, part, true);\r
-                result.ThrowOnErrors(); // throw CompositionException not ChangeRejectedException\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Sets the imports of the specified composable part exactly once and they will not\r
-        ///     ever be recomposed.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     The <see cref="ComposablePart"/> to set the imports.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="part"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will\r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ICompositionService"/> has been disposed of.\r
-        /// </exception>\r
-        public void SatisfyImportsOnce(ComposablePart part)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(part, "part");\r
-\r
-            // NOTE : the following two calls use the state lock\r
-            PartManager partManager = this.GetPartManager(part, true);\r
-            if (partManager.State == ImportState.Composed)\r
-            {\r
-                return;\r
-            }\r
-\r
-            using (this._lock.LockComposition())\r
-            {\r
-                var result = TrySatisfyImports(partManager, part, false);\r
-                result.ThrowOnErrors(); // throw CompositionException not ChangeRejectedException\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Removes any state stored in the <see cref="ImportEngine"/> for the associated \r
-        ///     <see cref="ComposablePart"/> and releases all the <see cref="Export"/>s used to \r
-        ///     satisfy the imports on the <see cref="ComposablePart"/>.\r
-        ///     \r
-        ///     Also removes the enforcement for changes that would break a required import on\r
-        ///     <paramref name="part"/>.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     The <see cref="ComposablePart"/> to release the imports on. \r
-        /// </param>\r
-        /// <param name="atomicComposition">\r
-        ///     The <see cref="AtomicComposition"/> that the release imports is running under.\r
-        /// </param>\r
-        public void ReleaseImports(ComposablePart part, AtomicComposition atomicComposition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(part, "part");\r
-\r
-            using (this._lock.LockComposition())\r
-            {\r
-                PartManager partManager = this.GetPartManager(part, false);\r
-                if (partManager != null)\r
-                {\r
-                    this.StopSatisfyingImports(partManager, atomicComposition);\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.\r
-        /// </summary>\r
-        public void Dispose()\r
-        {\r
-            this.Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Releases unmanaged and - optionally - managed resources\r
-        /// </summary>\r
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>\r
-        protected virtual void Dispose(bool disposing)\r
-        {\r
-            if (disposing)\r
-            {\r
-                if (!this._isDisposed)\r
-                {\r
-                    bool disposeLock = false;\r
-                    ExportProvider sourceProviderToUnsubscribeFrom = null;\r
-                    using (this._lock.LockStateForWrite())\r
-                    {\r
-                        if (!this._isDisposed)\r
-                        {\r
-                            sourceProviderToUnsubscribeFrom = this._sourceProvider;\r
-                            this._sourceProvider = null;\r
-                            this._recompositionManager = null;\r
-                            this._partManagers = null;\r
-                            this._isDisposed = true;\r
-                            disposeLock = true;\r
-                        }\r
-                    }\r
-\r
-                    if (sourceProviderToUnsubscribeFrom != null)\r
-                    {\r
-                        sourceProviderToUnsubscribeFrom.ExportsChanging -= this.OnExportsChanging;\r
-                    }\r
-\r
-                    if (disposeLock)\r
-                    {\r
-                        this._lock.Dispose();\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        private CompositionResult TryPreviewImportsStateMachine(PartManager partManager,\r
-            ComposablePart part, AtomicComposition atomicComposition)\r
-        {\r
-            var result = CompositionResult.SucceededResult;\r
-\r
-            if (partManager.State == ImportState.ImportsPreviewing)\r
-            {\r
-                // We shouldn't nomally ever hit this case but if we do \r
-                // then we should just error with a cycle error.\r
-                return new CompositionResult(ErrorBuilder.CreatePartCycle(part));\r
-            }\r
-\r
-            // Transition from NoImportsStatisified to ImportsPreviewed\r
-            if (partManager.State == ImportState.NoImportsSatisfied)\r
-            {\r
-                partManager.State = ImportState.ImportsPreviewing;\r
-\r
-                var requiredImports = part.ImportDefinitions.Where(IsRequiredImportForPreview);\r
-\r
-                // If this atomicComposition gets rolledback for any reason we need to reset our state\r
-                atomicComposition.AddRevertActionAllowNull(() => partManager.State = ImportState.NoImportsSatisfied);\r
-\r
-                result = result.MergeResult(\r
-                    this.TrySatisfyImportSubset(partManager, requiredImports, atomicComposition));\r
-\r
-                if (!result.Succeeded)\r
-                {\r
-                    partManager.State = ImportState.NoImportsSatisfied;\r
-                    return result;\r
-                }\r
-\r
-                partManager.State = ImportState.ImportsPreviewed;\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private CompositionResult TrySatisfyImportsStateMachine(PartManager partManager, ComposablePart part)\r
-        {\r
-            var result = CompositionResult.SucceededResult;\r
-\r
-            while (partManager.State < ImportState.Composed)\r
-            {\r
-                var previousState = partManager.State;\r
-\r
-                switch (partManager.State)\r
-                {\r
-                    // "ed" states which represent a some sort of steady state and will\r
-                    // attempt to do a state transition\r
-                    case ImportState.NoImportsSatisfied:\r
-                    case ImportState.ImportsPreviewed:\r
-                    {\r
-                        partManager.State = ImportState.PreExportImportsSatisfying;\r
-\r
-                        var prereqImports = part.ImportDefinitions.Where(import => import.IsPrerequisite);\r
-                        result = result.MergeResult(\r
-                            this.TrySatisfyImportSubset(partManager, prereqImports, null));\r
-\r
-                        partManager.State = ImportState.PreExportImportsSatisfied;\r
-                        break;\r
-                    }\r
-                    case ImportState.PreExportImportsSatisfied:\r
-                    {\r
-                        partManager.State = ImportState.PostExportImportsSatisfying;\r
-\r
-                        var requiredImports = part.ImportDefinitions.Where(import => !import.IsPrerequisite);\r
-                        \r
-                        result = result.MergeResult(\r
-                            this.TrySatisfyImportSubset(partManager, requiredImports, null));\r
-\r
-                        partManager.State = ImportState.PostExportImportsSatisfied;\r
-                        break;\r
-                    }\r
-                    case ImportState.PostExportImportsSatisfied:\r
-                    {\r
-                        partManager.State = ImportState.ComposedNotifying;\r
-\r
-                        partManager.ClearSavedImports();\r
-                        result = result.MergeResult(partManager.TryOnComposed());\r
-  \r
-                        partManager.State = ImportState.Composed;\r
-                        break;\r
-                    }\r
\r
-\r
-                    // "ing" states which represent some sort of cycle\r
-                    // These state should always return, error or not, instead of breaking\r
-                    case ImportState.ImportsPreviewing:\r
-                    {\r
-                        // We shouldn't nomally ever hit this case but if we do \r
-                        // then we should just error with a cycle error.\r
-                        return new CompositionResult(ErrorBuilder.CreatePartCycle(part));\r
-                    }\r
-                    case ImportState.PreExportImportsSatisfying:\r
-                    case ImportState.PostExportImportsSatisfying:\r
-                    {\r
-                        if (InPrerequisiteLoop())\r
-                        {\r
-                            return result.MergeError(ErrorBuilder.CreatePartCycle(part));\r
-                        }\r
-                        // Cycles in post export imports are allowed so just return in that case\r
-                        return result;\r
-                    }\r
-                    case ImportState.ComposedNotifying:\r
-                    {\r
-                        // We are currently notifying so don't notify again just return\r
-                        return result;\r
-                    }\r
-                }\r
-\r
-                // if an error occured while doing a state transition \r
-                if (!result.Succeeded)\r
-                {\r
-                    // revert to the previous state and return the error\r
-                    partManager.State = previousState;\r
-                    return result;\r
-                }\r
-            }\r
-            return result;\r
-        }\r
-\r
-        private CompositionResult TrySatisfyImports(PartManager partManager, ComposablePart part, bool shouldTrackImports)\r
-        {\r
-            Assumes.NotNull(part);\r
-\r
-            var result = CompositionResult.SucceededResult;\r
-\r
-            // get out if the part is already composed\r
-            if (partManager.State == ImportState.Composed)\r
-            {\r
-                return result;\r
-            }\r
-\r
-            // Track number of recursive iterations and throw an exception before the stack\r
-            // fills up and debugging the root cause becomes tricky\r
-            if (this._recursionStateStack.Count >= MaximumNumberOfCompositionIterations)\r
-            {\r
-                return result.MergeError(\r
-                    ErrorBuilder.ComposeTookTooManyIterations(MaximumNumberOfCompositionIterations));\r
-            }\r
-\r
-            // Maintain the stack to detect whether recursive loops cross prerequisites\r
-            this._recursionStateStack.Push(partManager);\r
-            try\r
-            {\r
-                result = result.MergeResult(\r
-                    TrySatisfyImportsStateMachine(partManager, part));\r
-            }\r
-            finally\r
-            {\r
-                this._recursionStateStack.Pop();\r
-            }\r
-\r
-            if (shouldTrackImports)\r
-            {\r
-                StartSatisfyingImports(partManager, null);\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private CompositionResult TrySatisfyImportSubset(PartManager partManager,\r
-            IEnumerable<ImportDefinition> imports, AtomicComposition atomicComposition)\r
-        {\r
-            CompositionResult result = CompositionResult.SucceededResult;\r
-\r
-            var part = partManager.Part;\r
-            foreach (ImportDefinition import in imports)\r
-            {\r
-                var exports = partManager.GetSavedImport(import);\r
-\r
-                if (exports == null)\r
-                {\r
-                    CompositionResult<IEnumerable<Export>> exportsResult = TryGetExports(\r
-                        this._sourceProvider, part, import, atomicComposition);\r
-\r
-                    if (!exportsResult.Succeeded)\r
-                    {\r
-                        result = result.MergeResult(exportsResult.ToResult());\r
-                        continue;\r
-                    }\r
-                    exports = exportsResult.Value.AsArray();\r
-                }\r
-\r
-                if (atomicComposition == null)\r
-                {\r
-                    result = result.MergeResult(\r
-                        partManager.TrySetImport(import, exports));\r
-                }\r
-                else\r
-                {\r
-                    partManager.SetSavedImport(import, exports, atomicComposition);\r
-                }\r
-            }\r
-            return result;\r
-        }\r
-\r
-        private void OnExportsChanging(object sender, ExportsChangeEventArgs e)\r
-        {\r
-            CompositionResult result = CompositionResult.SucceededResult;\r
-\r
-            // Prepare for the recomposition effort by minimizing the amount of work we'll have to do later\r
-            AtomicComposition atomicComposition = e.AtomicComposition;\r
-\r
-            IEnumerable<PartManager> affectedParts = this._recompositionManager.GetAffectedParts(e.ChangedContractNames);\r
-\r
-            // When in a atomicComposition account for everything that isn't yet reflected in the\r
-            // index\r
-            if (atomicComposition != null)\r
-            {\r
-                EngineContext engineContext;\r
-                if (atomicComposition.TryGetValue(this, out engineContext))\r
-                {\r
-                    // always added the new part managers to see if they will also be \r
-                    // affected by these changes\r
-                    affectedParts = affectedParts.ConcatAllowingNull(engineContext.GetAddedPartManagers())\r
-                        .Except(engineContext.GetRemovedPartManagers());\r
-                }\r
-            }\r
-\r
-            var changedExports = e.AddedExports.ConcatAllowingNull(e.RemovedExports);\r
-\r
-            foreach (var partManager in affectedParts)\r
-            {\r
-                result = result.MergeResult(this.TryRecomposeImports(partManager, changedExports, atomicComposition));\r
-            }\r
-\r
-            result.ThrowOnErrors(atomicComposition);\r
-        }\r
-\r
-        private CompositionResult TryRecomposeImports(PartManager partManager, \r
-            IEnumerable<ExportDefinition> changedExports, AtomicComposition atomicComposition)\r
-        {\r
-            var result = CompositionResult.SucceededResult;\r
-\r
-            switch (partManager.State)\r
-            {\r
-                case ImportState.ImportsPreviewed:\r
-                case ImportState.Composed:\r
-                    // Validate states to continue.\r
-                    break;\r
-\r
-                default:\r
-                {\r
-                    // All other states are invalid and for recomposition. \r
-                    return new CompositionResult(ErrorBuilder.InvalidStateForRecompposition(partManager.Part));\r
-                }\r
-            }\r
-\r
-            var affectedImports = RecompositionManager.GetAffectedImports(partManager.Part, changedExports);\r
-            bool partComposed = (partManager.State == ImportState.Composed);\r
-\r
-            bool recomposedImport = false;\r
-            foreach (var import in affectedImports)\r
-            {\r
-                result = result.MergeResult(\r
-                    TryRecomposeImport(partManager, partComposed, import, atomicComposition));\r
-\r
-                recomposedImport = true;\r
-            }\r
-\r
-            // Knowing that the part has already been composed before and that the only possible\r
-            // changes are to recomposable imports, we can safely go ahead and do this now or\r
-            // schedule it for later\r
-            if (result.Succeeded && recomposedImport && partComposed)\r
-            {\r
-                if (atomicComposition == null)\r
-                {\r
-                    result = result.MergeResult(partManager.TryOnComposed());\r
-                }\r
-                else\r
-                {\r
-                    atomicComposition.AddCompleteAction(() => partManager.TryOnComposed().ThrowOnErrors());\r
-                }\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private CompositionResult TryRecomposeImport(PartManager partManager, bool partComposed,\r
-            ImportDefinition import, AtomicComposition atomicComposition)\r
-        {\r
-            if (partComposed && !import.IsRecomposable)\r
-            {\r
-                return new CompositionResult(ErrorBuilder.PreventedByExistingImport(partManager.Part, import));\r
-            }\r
-\r
-            // During recomposition you must always requery with the new atomicComposition you cannot use any\r
-            // cached value in the part manager\r
-            var exportsResult = TryGetExports(this._sourceProvider, partManager.Part, import, atomicComposition);\r
-            if (!exportsResult.Succeeded)\r
-            {\r
-                return exportsResult.ToResult();\r
-            }\r
-            var exports = exportsResult.Value.AsArray();\r
-\r
-            if (partComposed)\r
-            {\r
-                // Knowing that the part has already been composed before and that the only possible\r
-                // changes are to recomposable imports, we can safely go ahead and do this now or\r
-                // schedule it for later\r
-                if (atomicComposition == null)\r
-                {\r
-                    return partManager.TrySetImport(import, exports);\r
-                }\r
-                else\r
-                {\r
-                    atomicComposition.AddCompleteAction(() => partManager.TrySetImport(import, exports).ThrowOnErrors());\r
-                }\r
-            }\r
-            else\r
-            {\r
-                partManager.SetSavedImport(import, exports, atomicComposition);\r
-            }\r
-\r
-            return CompositionResult.SucceededResult;\r
-        }\r
-\r
-        private void StartSatisfyingImports(PartManager partManager, AtomicComposition atomicComposition)\r
-        {\r
-            // When not running in a atomicCompositional state, schedule reindexing after ensuring\r
-            // that this isn't a redundant addition\r
-            if (atomicComposition == null)\r
-            {\r
-                if (!partManager.TrackingImports)\r
-                {\r
-                    partManager.TrackingImports = true;\r
-                    this._recompositionManager.AddPartToIndex(partManager);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                // While in a atomicCompositional state use a less efficient but effective means\r
-                // of achieving the same results\r
-                GetEngineContext(atomicComposition).AddPartManager(partManager);\r
-            }\r
-        }\r
-\r
-        private void StopSatisfyingImports(PartManager partManager, AtomicComposition atomicComposition)\r
-        {\r
-            // When not running in a atomicCompositional state, schedule reindexing after ensuring\r
-            // that this isn't a redundant removal\r
-            if (atomicComposition == null)\r
-            {\r
-                this._partManagers.Remove(partManager.Part);\r
-\r
-                // Take care of lifetime requirements\r
-                partManager.DisposeAllDependencies();\r
-\r
-                if (partManager.TrackingImports)\r
-                {\r
-                    partManager.TrackingImports = false;\r
-                    this._recompositionManager.AddPartToUnindex(partManager);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                // While in a atomicCompositional state use a less efficient but effective means\r
-                // of achieving the same results\r
-                GetEngineContext(atomicComposition).RemovePartManager(partManager);\r
-            }\r
-        }\r
-\r
-        private PartManager GetPartManager(ComposablePart part, bool createIfNotpresent)\r
-        {\r
-            PartManager partManager = null;\r
-            using (this._lock.LockStateForRead())\r
-            {\r
-                if (this._partManagers.TryGetValue(part, out partManager))\r
-                {\r
-                    return partManager;\r
-                }\r
-            }\r
-\r
-            if (createIfNotpresent)\r
-            {\r
-                using (this._lock.LockStateForWrite())\r
-                {\r
-                    if (!this._partManagers.TryGetValue(part, out partManager))\r
-                    {\r
-                        partManager = new PartManager(this, part);\r
-                        this._partManagers.Add(part, partManager);\r
-                    }\r
-                }\r
-            }\r
-            return partManager;\r
-        }\r
-\r
-\r
-        private EngineContext GetEngineContext(AtomicComposition atomicComposition)\r
-        {\r
-            Assumes.NotNull(atomicComposition);\r
-\r
-            EngineContext engineContext;\r
-            if (!atomicComposition.TryGetValue(this, true, out engineContext))\r
-            {\r
-                EngineContext parentContext;\r
-                atomicComposition.TryGetValue(this, false, out parentContext);\r
-                engineContext = new EngineContext(this, parentContext);\r
-                atomicComposition.SetValue(this, engineContext);\r
-                atomicComposition.AddCompleteAction(engineContext.Complete);\r
-            }\r
-            return engineContext;\r
-        }\r
-\r
-        private bool InPrerequisiteLoop()\r
-        {\r
-            PartManager firstPart = this._recursionStateStack.First();\r
-            PartManager lastPart = null;\r
-\r
-            foreach (PartManager testPart in this._recursionStateStack.Skip(1))\r
-            {\r
-                if (testPart.State == ImportState.PreExportImportsSatisfying)\r
-                {\r
-                    return true;\r
-                }\r
-\r
-                if (testPart == firstPart)\r
-                {\r
-                    lastPart = testPart;\r
-                    break;\r
-                }\r
-            }\r
-\r
-            // This should only be called when a loop has been detected - so it should always be on the stack\r
-            Assumes.IsTrue(lastPart == firstPart);\r
-            return false;\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-\r
-        private static CompositionResult<IEnumerable<Export>> TryGetExports(ExportProvider provider,\r
-            ComposablePart part, ImportDefinition definition, AtomicComposition atomicComposition)\r
-        {\r
-            try\r
-            {\r
-                var exports = provider.GetExports(definition, atomicComposition).AsArray();\r
-                return new CompositionResult<IEnumerable<Export>>(exports);\r
-            }\r
-            catch (ImportCardinalityMismatchException ex)\r
-            {\r
-                // Either not enough or too many exports that match the definition\r
-                CompositionException exception = new CompositionException(ErrorBuilder.CreateImportCardinalityMismatch(ex, definition));\r
-\r
-                return new CompositionResult<IEnumerable<Export>>(\r
-                    ErrorBuilder.CreatePartCannotSetImport(part, definition, exception));\r
-            }\r
-        }\r
-\r
-        internal static bool IsRequiredImportForPreview(ImportDefinition import)\r
-        {\r
-            return import.Cardinality == ImportCardinality.ExactlyOne;\r
-        }\r
-\r
-        // Ordering of this enum is important so be sure to use caution if you\r
-        // try to reorder them.\r
-        private enum ImportState\r
-        {\r
-            NoImportsSatisfied          = 0,\r
-            ImportsPreviewing           = 1,\r
-            ImportsPreviewed            = 2,\r
-            PreExportImportsSatisfying  = 3,\r
-            PreExportImportsSatisfied   = 4,\r
-            PostExportImportsSatisfying = 5,\r
-            PostExportImportsSatisfied  = 6,\r
-            ComposedNotifying           = 7,\r
-            Composed                    = 8,\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/TypeCatalog.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Hosting/TypeCatalog.cs
deleted file mode 100644 (file)
index cabc1e5..0000000
+++ /dev/null
@@ -1,347 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     An immutable ComposablePartCatalog created from a type array or a list of managed types.  This class is threadsafe.\r
-    ///     It is Disposable.\r
-    /// </summary>\r
-    [DebuggerTypeProxy(typeof(ComposablePartCatalogDebuggerProxy))]\r
-    public class TypeCatalog : ComposablePartCatalog, ICompositionElement\r
-    {\r
-        private readonly object _thisLock = new object();\r
-        private Type[] _types = null;\r
-        private volatile IQueryable<ComposablePartDefinition> _queryableParts;\r
-        private volatile bool _isDisposed = false;\r
-        private readonly ICompositionElement _definitionOrigin;\r
-        private readonly Lazy<IDictionary<string, List<ComposablePartDefinition>>> _contractPartIndex;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="TypeCatalog"/> class \r
-        ///     with the specified types.\r
-        /// </summary>\r
-        /// <param name="types">\r
-        ///     An <see cref="Array"/> of attributed <see cref="Type"/> objects to add to the \r
-        ///     <see cref="TypeCatalog"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="types"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="types"/> contains an element that is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="types"/> contains an element that was loaded in the Reflection-only context.\r
-        /// </exception>\r
-        public TypeCatalog(params Type[] types)\r
-            : this(types, (ICompositionElement)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="TypeCatalog"/> class\r
-        ///     with the specified types.\r
-        /// </summary>\r
-        /// <param name="types">\r
-        ///     An <see cref="IEnumerable{T}"/> of attributed <see cref="Type"/> objects to add \r
-        ///     to the <see cref="TypeCatalog"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="types"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="types"/> contains an element that is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="types"/> contains an element that was loaded in the reflection-only context.\r
-        /// </exception>\r
-        public TypeCatalog(IEnumerable<Type> types)\r
-            : this(types, (ICompositionElement)null)\r
-        {\r
-        }\r
-\r
-        internal TypeCatalog(IEnumerable<Type> types, ICompositionElement definitionOrigin)\r
-        {\r
-            Requires.NotNull(types, "types");\r
-\r
-            foreach (Type type in types)\r
-            {\r
-                if (type == null)\r
-                {\r
-                    throw ExceptionBuilder.CreateContainsNullElement("types");\r
-                }\r
-#if !SILVERLIGHT\r
-                if (type.Assembly.ReflectionOnly)\r
-                {\r
-                    throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.Argument_ElementReflectionOnlyType, "types"), "types");\r
-                }\r
-#endif\r
-            }\r
-\r
-            this._types = types.ToArray();\r
-            this._definitionOrigin = definitionOrigin ?? this;\r
-#if !SILVERLIGHT\r
-            this._contractPartIndex = new Lazy<IDictionary<string, List<ComposablePartDefinition>>>(this.CreateIndex, true);\r
-#else\r
-            this._contractPartIndex = new Lazy<IDictionary<string, List<ComposablePartDefinition>>>(this.CreateIndex);\r
-#endif\r
-\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the part definitions of the catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IQueryable{T}"/> of <see cref="ComposablePartDefinition"/> objects of the \r
-        ///     <see cref="TypeCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="TypeCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IQueryable<ComposablePartDefinition> Parts\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-\r
-                return this.PartsInternal;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the display name of the type catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing a human-readable display name of the <see cref="TypeCatalog"/>.\r
-        /// </value>\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return this.GetDisplayName(); }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the composition element from which the type catalog originated.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     This property always returns <see langword="null"/>.\r
-        /// </value>\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return null; }\r
-        }\r
-\r
-        private IQueryable<ComposablePartDefinition> PartsInternal\r
-        {\r
-            get\r
-            {\r
-                if (this._queryableParts == null)\r
-                {\r
-                    lock (this._thisLock)\r
-                    {\r
-                        if (this._queryableParts == null)\r
-                        {\r
-                            Assumes.NotNull(this._types);\r
-\r
-                            var collection = new List<ComposablePartDefinition>();\r
-                            foreach (Type type in this._types)\r
-                            {\r
-                                var definition = AttributedModelDiscovery.CreatePartDefinitionIfDiscoverable(type, _definitionOrigin);\r
-                                if (definition != null)\r
-                                {\r
-                                    collection.Add(definition);\r
-                                }\r
-                            }\r
-                            IQueryable<ComposablePartDefinition> queryableParts = collection.AsQueryable();\r
-                            Thread.MemoryBarrier();\r
-\r
-                            this._types = null;\r
-                            this._queryableParts = queryableParts;\r
-                        }\r
-                    }\r
-                }\r
-\r
-                return this._queryableParts;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export definitions that match the constraint defined by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="ExportDefinition"/> objects to return.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1, T2}"/> containing the \r
-        ///     <see cref="ExportDefinition"/> objects and their associated \r
-        ///     <see cref="ComposablePartDefinition"/> for objects that match the constraint defined \r
-        ///     by <paramref name="definition"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePartCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/>, if no \r
-        ///         <see cref="ExportDefinition"/> match the conditions defined by \r
-        ///         <paramref name="definition"/>, return an empty <see cref="IEnumerable{T}"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        public override IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(ImportDefinition definition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            IEnumerable<ComposablePartDefinition> candidateParts = this.GetCandidateParts(definition);\r
-            if (candidateParts == null)\r
-            {\r
-                return Enumerable.Empty<Tuple<ComposablePartDefinition, ExportDefinition>>();\r
-            }\r
-\r
-            var exports = new List<Tuple<ComposablePartDefinition, ExportDefinition>>();\r
-            foreach (var part in candidateParts)\r
-            {\r
-                foreach (var export in part.ExportDefinitions)\r
-                {\r
-                    if (definition.IsConstraintSatisfiedBy(export))\r
-                    {\r
-                        exports.Add(new Tuple<ComposablePartDefinition, ExportDefinition>(part, export));\r
-                    }\r
-                }\r
-            }\r
-            return exports;\r
-        }\r
-\r
-        private IEnumerable<ComposablePartDefinition> GetCandidateParts(ImportDefinition definition)\r
-        {\r
-            string contractName = definition.ContractName;\r
-\r
-            // Empty string represents a non-contract based import and thus the constraint needs\r
-            // to be applied to all the possible exports in this catalog.\r
-            if (string.IsNullOrEmpty(contractName))\r
-            {\r
-                return this.PartsInternal;\r
-            }\r
-\r
-            List<ComposablePartDefinition> candidateParts = null;\r
-            if (this._contractPartIndex.Value.TryGetValue(contractName, out candidateParts))\r
-            {\r
-                return candidateParts;\r
-            }\r
-            else\r
-            {\r
-                return null;\r
-            }\r
-        }\r
-\r
-        private IDictionary<string, List<ComposablePartDefinition>> CreateIndex()\r
-        {\r
-            Dictionary<string, List<ComposablePartDefinition>> index = new Dictionary<string, List<ComposablePartDefinition>>(StringComparers.ContractName);\r
-\r
-            foreach (var part in this.PartsInternal)\r
-            {\r
-                foreach (string contractName in part.ExportDefinitions.Select(export => export.ContractName).Distinct())\r
-                {\r
-                    List<ComposablePartDefinition> contractParts = null;\r
-                    if (!index.TryGetValue(contractName, out contractParts))\r
-                    {\r
-                        contractParts = new List<ComposablePartDefinition>();\r
-                        index.Add(contractName, contractParts);\r
-                    }\r
-                    contractParts.Add(part);\r
-                }\r
-            }\r
-            return index;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a string representation of the type catalog.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="String"/> containing the string representation of the <see cref="TypeCatalog"/>.\r
-        /// </returns>\r
-        public override string ToString()\r
-        {\r
-            return this.GetDisplayName();\r
-        }\r
-\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            if (disposing)\r
-            {\r
-                this._isDisposed = true;\r
-            }\r
-\r
-            base.Dispose(disposing);\r
-        }\r
-\r
-        private string GetDisplayName()\r
-        {\r
-            return String.Format(CultureInfo.CurrentCulture,\r
-                                Strings.TypeCatalog_DisplayNameFormat,\r
-                                this.GetType().Name,\r
-                                this.GetTypesDisplay());\r
-        }\r
-\r
-        private string GetTypesDisplay()\r
-        {\r
-            int count = this.PartsInternal.Count();\r
-            if (count == 0)\r
-            {\r
-                return Strings.TypeCatalog_Empty;\r
-            }\r
-\r
-            const int displayCount = 2;\r
-            StringBuilder builder = new StringBuilder();\r
-            foreach (ReflectionComposablePartDefinition definition in this.PartsInternal.Take(displayCount))\r
-            {\r
-                if (builder.Length > 0)\r
-                {\r
-                    builder.Append(CultureInfo.CurrentCulture.TextInfo.ListSeparator);\r
-                    builder.Append(" ");\r
-                }\r
-\r
-                builder.Append(definition.GetPartType().GetDisplayName());\r
-            }\r
-\r
-            if (count > displayCount)\r
-            {   // Add an elipse to indicate that there \r
-                // are more types than actually listed\r
-                builder.Append(CultureInfo.CurrentCulture.TextInfo.ListSeparator);\r
-                builder.Append(" ...");\r
-            }\r
-\r
-            return builder.ToString();\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/IAttributedImport.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/IAttributedImport.cs
deleted file mode 100644 (file)
index a2f9c16..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal interface IAttributedImport\r
-    {\r
-        string ContractName { get; }\r
-        Type ContractType { get; }\r
-        bool AllowRecomposition { get; }\r
-        CreationPolicy RequiredCreationPolicy { get; }\r
-        ImportCardinality Cardinality { get; }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ICompositionError.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ICompositionError.cs
deleted file mode 100644 (file)
index a31430f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    // Internal interface for providing access to the composition error\r
-    // identifier for an exception or error that participates in composition.\r
-    internal interface ICompositionError\r
-    {\r
-        CompositionErrorId Id\r
-        {\r
-            get;\r
-        }\r
-\r
-        ICompositionElement Element\r
-        {\r
-            get;\r
-        }\r
-\r
-        Exception InnerException\r
-        {\r
-            get;\r
-        }\r
-    } \r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ICompositionService.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ICompositionService.cs
deleted file mode 100644 (file)
index 45a4dd9..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Provides methods for composing <see cref="ComposablePart"/> objects.\r
-    /// </summary>\r
-    public interface ICompositionService\r
-    {\r
-        /// <summary>\r
-        ///     Sets the imports of the specified composable part exactly once and they will not\r
-        ///     ever be recomposed.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     The <see cref="ComposablePart"/> to set the imports.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="part"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will\r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ICompositionService"/> has been disposed of.\r
-        /// </exception>\r
-        void SatisfyImportsOnce(ComposablePart part);\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/IPartImportsSatisfiedNotification.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/IPartImportsSatisfiedNotification.cs
deleted file mode 100644 (file)
index 60d5920..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public interface IPartImportsSatisfiedNotification\r
-    {\r
-        void OnImportsSatisfied();\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportAttribute.cs
deleted file mode 100644 (file)
index b401527..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies that a property, field, or parameter imports a particular export.\r
-    /// </summary>\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes")]\r
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter,\r
-                    AllowMultiple = false, Inherited = false)]\r
-    public class ImportAttribute : Attribute, IAttributedImport\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportAttribute"/> class, importing the \r
-        ///     export with the default contract name.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the property, field, \r
-        ///         or parameter type that this is marked with this attribute.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ImportAttribute()\r
-            : this((string)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportAttribute"/> class, importing the\r
-        ///     export with the contract name derived from the specified type.\r
-        /// </summary>\r
-        /// <param name="contractType">\r
-        ///     A <see cref="Type"/> of which to derive the contract name of the export to import, or \r
-        ///     <see langword="null"/> to use the default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on \r
-        ///         <paramref name="contractType"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the property, field, \r
-        ///         or parameter type that is marked with this attribute.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ImportAttribute(Type contractType) \r
-            : this((string)null, contractType)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportAttribute"/> class, importing the\r
-        ///     export with the specified contract name.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///      A <see cref="String"/> containing the contract name of the export to import, or \r
-        ///      <see langword="null"/> or an empty string ("") to use the default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the property, field, \r
-        ///         or parameter type that is marked with this attribute.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ImportAttribute(string contractName)\r
-            : this(contractName, (Type)null)\r
-        {\r
-        }\r
-\r
-        public ImportAttribute(string contractName, Type contractType)\r
-        {\r
-            this.ContractName = contractName;\r
-            this.ContractType = contractType;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the contract name of the export to import.\r
-        /// </summary>\r
-        /// <value>\r
-        ///      A <see cref="String"/> containing the contract name of the export to import. The \r
-        ///      default value is an empty string ("").\r
-        /// </value>\r
-        public string ContractName { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Get the contract type of the export to import.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="Type"/> of the export that this import is expecting. The default value is\r
-        ///     <see langword="null"/> which means that the type will be obtained by looking at the type on\r
-        ///     the member that this import is attached to. If the type is <see cref="object"/> then the\r
-        ///     importer is delaring they can accept any exported type.\r
-        /// </value>\r
-        public Type ContractType { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets a value indicating whether the property, field or parameter will be set \r
-        ///     to its type's default value when an export with the contract name is not present in \r
-        ///     the container.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see langword="true"/> if the property, field or parameter will be set \r
-        ///     its type's default value when an export with the <see cref="ContractName"/> is not \r
-        ///     present in the <see cref="CompositionContainer"/>; otherwise, <see langword="false"/>. \r
-        ///     The default value is <see langword="false"/>.\r
-        /// </value>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default value of a property's, field's or parameter's type is \r
-        ///         <see langword="null"/> for reference types and 0 for numeric value types. For \r
-        ///         other value types, the default value will be each field of the value type \r
-        ///         initialized to zero, if the field is a value type or <see langword="null"/> if \r
-        ///         the field is a reference type.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public bool AllowDefault { get; set; }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets a value indicating whether the property or field will be recomposed\r
-        ///     when exports that provide the same contract that this import expects, have changed\r
-        ///     in the container. \r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see langword="true"/> if the property or field allows for recomposition when exports\r
-        ///     that provide the same <see cref="ContractName"/> are added or removed from the \r
-        ///     <see cref="CompositionContainer"/>; otherwise, <see langword="false"/>. \r
-        ///     The default value is <see langword="false"/>.\r
-        /// </value>\r
-        public bool AllowRecomposition { get; set; }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets a value indicating that the importer requires a specific \r
-        ///     <see cref="CreationPolicy"/> for the exports used to satisfy this import. T\r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see cref="CreationPolicy.Any"/> - default value, used if the importer doesn't \r
-        ///         require a specific <see cref="CreationPolicy"/>.\r
-        /// \r
-        ///     <see cref="CreationPolicy.Shared"/> - Requires that all exports used should be shared\r
-        ///         by everyone in the container.\r
-        /// \r
-        ///     <see cref="CreationPolicy.NonShared"/> - Requires that all exports used should be \r
-        ///         non-shared in a container and thus everyone gets their own instance.\r
-        /// </value>\r
-        public CreationPolicy RequiredCreationPolicy { get; set; }\r
-\r
-        ImportCardinality IAttributedImport.Cardinality\r
-        {\r
-            get\r
-            {\r
-                if (this.AllowDefault == true)\r
-                {\r
-                    return ImportCardinality.ZeroOrOne;\r
-                }\r
-                return ImportCardinality.ExactlyOne;\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportCardinalityMismatchException.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportCardinalityMismatchException.cs
deleted file mode 100644 (file)
index 9048f5c..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Runtime.Serialization;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     The exception that is thrown when the cardinality of a <see cref="ImportDefinition"/>\r
-    ///     does not match the cardinality of the <see cref="Export"/> objects available in an \r
-    ///     <see cref="ExportProvider"/>.\r
-    /// </summary>\r
-    [Serializable]\r
-    public class ImportCardinalityMismatchException : Exception\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportCardinalityMismatchException"/> class.\r
-        /// </summary>\r
-        public ImportCardinalityMismatchException()\r
-            : this((string)null, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportCardinalityMismatchException"/> class \r
-        ///     with the specified error message.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="ImportCardinalityMismatchException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        public ImportCardinalityMismatchException(string message)\r
-            : this(message, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportCardinalityMismatchException"/> class \r
-        ///     with the specified error message and exception that is the cause of the  \r
-        ///     exception.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="ImportCardinalityMismatchException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        /// <param name="innerException">\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="ImportCardinalityMismatchException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.InnerException"/> property to <see langword="null"/>.\r
-        /// </param>\r
-        public ImportCardinalityMismatchException(string message, Exception innerException)\r
-            : base(message, innerException)\r
-        {\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportCardinalityMismatchException"/> class \r
-        ///     with the specified serialization data.\r
-        /// </summary>\r
-        /// <param name="info">\r
-        ///     The <see cref="SerializationInfo"/> that holds the serialized object data about the \r
-        ///     <see cref="ImportCardinalityMismatchException"/>.\r
-        /// </param>\r
-        /// <param name="context">\r
-        ///     The <see cref="StreamingContext"/> that contains contextual information about the \r
-        ///     source or destination.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="info"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="SerializationException">\r
-        ///     <paramref name="info"/> is missing a required value.\r
-        /// </exception>\r
-        /// <exception cref="InvalidCastException">\r
-        ///     <paramref name="info"/> contains a value that cannot be cast to the correct type.\r
-        /// </exception>\r
-        [System.Security.SecuritySafeCritical]\r
-        protected ImportCardinalityMismatchException(SerializationInfo info, StreamingContext context)\r
-            : base(info, context)\r
-        {\r
-        }\r
-#endif //!SILVERLIGHT\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportManyAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportManyAttribute.cs
deleted file mode 100644 (file)
index 79f706f..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies that a property, field, or parameter imports a particular set of exports.\r
-    /// </summary>\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes")]\r
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter,\r
-                    AllowMultiple = false, Inherited = false)]\r
-    public class ImportManyAttribute : Attribute, IAttributedImport\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportManyAttribute"/> class, importing the \r
-        ///     set of exports with the default contract name.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the element\item type of \r
-        ///         theproperty, field, or parameter type that this is marked with this attribute.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ImportManyAttribute()\r
-            : this((string)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportManyAttribute"/> class, importing the\r
-        ///     set of exports with the contract name derived from the specified type.\r
-        /// </summary>\r
-        /// <param name="contractType">\r
-        ///     A <see cref="Type"/> of which to derive the contract name of the exports to import, or \r
-        ///     <see langword="null"/> to use the default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on \r
-        ///         <paramref name="contractType"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the property, field, \r
-        ///         or parameter type that is marked with this attribute.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ImportManyAttribute(Type contractType)\r
-            : this((string)null, contractType)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportManyAttribute"/> class, importing the\r
-        ///     set of exports with the specified contract name.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///      A <see cref="String"/> containing the contract name of the exports to import, or \r
-        ///      <see langword="null"/> or an empty string ("") to use the default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the property, field, \r
-        ///         or parameter type that is marked with this attribute.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public ImportManyAttribute(string contractName)\r
-            : this(contractName, (Type)null)\r
-        {\r
-        }\r
-\r
-        public ImportManyAttribute(string contractName, Type contractType)\r
-        {\r
-            this.ContractName = contractName;\r
-            this.ContractType = contractType;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the contract name of the exports to import.\r
-        /// </summary>\r
-        /// <value>\r
-        ///      A <see cref="String"/> containing the contract name of the exports to import. The \r
-        ///      default value is an empty string ("").\r
-        /// </value>\r
-        public string ContractName { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Get the contract type of the export to import.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="Type"/> of the export that this import is expecting. The default value is\r
-        ///     <see langword="null"/> which means that the type will be obtained by looking at the type on\r
-        ///     the member that this import is attached to. If the type is <see cref="object"/> then the\r
-        ///     importer is delaring they can accept any exported type.\r
-        /// </value>\r
-        public Type ContractType { get; private set; }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets a value indicating whether the property or field will be recomposed\r
-        ///     when exports that provide the same contract that this import expects, have changed\r
-        ///     in the container. \r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see langword="true"/> if the property or field allows for recomposition when exports\r
-        ///     that provide the same <see cref="ContractName"/> are added or removed from the \r
-        ///     <see cref="CompositionContainer"/>; otherwise, <see langword="false"/>. \r
-        ///     The default value is <see langword="false"/>.\r
-        /// </value>\r
-        public bool AllowRecomposition { get; set; }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets a value indicating that the importer requires a specific \r
-        ///     <see cref="CreationPolicy"/> for the exports used to satisfy this import. T\r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see cref="CreationPolicy.Any"/> - default value, used if the importer doesn't \r
-        ///         require a specific <see cref="CreationPolicy"/>.\r
-        /// \r
-        ///     <see cref="CreationPolicy.Shared"/> - Requires that all exports used should be shared\r
-        ///         by everyone in the container.\r
-        /// \r
-        ///     <see cref="CreationPolicy.NonShared"/> - Requires that all exports used should be \r
-        ///         non-shared in a container and thus everyone gets their own instance.\r
-        /// </value>\r
-        public CreationPolicy RequiredCreationPolicy { get; set; }\r
-\r
-        ImportCardinality IAttributedImport.Cardinality\r
-        {\r
-            get { return ImportCardinality.ZeroOrMore; }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportingConstructorAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ImportingConstructorAttribute.cs
deleted file mode 100644 (file)
index 2263316..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies that a constructor should be used when constructing an attributed part.\r
-    /// </summary>\r
-    /// <remarks>\r
-    ///     By default, only a default parameter-less constructor, if available, is used to \r
-    ///     construct an attributed part. Use this attribute to indicate that a specific constructor \r
-    ///     should be used.\r
-    /// </remarks>\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes")]\r
-    [AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]\r
-    public class ImportingConstructorAttribute : Attribute\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportingConstructorAttribute"/> class.\r
-        /// </summary>\r
-        public ImportingConstructorAttribute()\r
-        {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/InheritedExportAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/InheritedExportAttribute.cs
deleted file mode 100644 (file)
index ab42dfa..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies that a type or interface that provides a particular export.\r
-    /// </summary>\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = true, Inherited = true)]\r
-    public class InheritedExportAttribute : ExportAttribute\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type marked with this attribute under the default contract name.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the type itself, \r
-        ///         that is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public InheritedExportAttribute()\r
-            : this((string)null, (Type)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type marked with this attribute under a contract name derived from the specified type.\r
-        /// </summary>\r
-        /// <param name="contractType">\r
-        ///     A <see cref="Type"/> of which to derive the contract name to export the type  \r
-        ///     marked with this attribute, under; or <see langword="null"/> to use the \r
-        ///     default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on \r
-        ///         <paramref name="contractType"/>.\r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on the type of the \r
-        ///         itself, that is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public InheritedExportAttribute(Type contractType)\r
-            : this((string)null, contractType)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type or member marked with this attribute under the specified contract name.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///      A <see cref="String"/> containing the contract name to export the type \r
-        ///      marked with this attribute, under; or <see langword="null"/> or an empty string \r
-        ///      ("") to use the default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on \r
-        ///         the type itself that this is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public InheritedExportAttribute(string contractName)\r
-            : this(contractName, (Type)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportAttribute"/> class, exporting the\r
-        ///     type or member marked with this attribute under the specified contract name.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///      A <see cref="String"/> containing the contract name to export the type \r
-        ///      marked with this attribute, under; or <see langword="null"/> or an empty string \r
-        ///      ("") to use the default contract name.\r
-        /// </param>\r
-        /// <param name="contractType">\r
-        ///     A <see cref="Type"/> of which to derive the contract name to export the type  \r
-        ///     marked with this attribute, under; or <see langword="null"/> to use the \r
-        ///     default contract name.\r
-        /// </param>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         The default contract name is the result of calling \r
-        ///         <see cref="AttributedModelServices.GetContractName(Type)"/> on \r
-        ///         the type itself that this is marked with this attribute. \r
-        ///     </para>\r
-        ///     <para>\r
-        ///         The contract name is compared using a case-sensitive, non-linguistic comparison \r
-        ///         using <see cref="StringComparer.Ordinal"/>.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public InheritedExportAttribute(string contractName, Type contractType)\r
-            : base(contractName, contractType)\r
-        {\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataAttributeAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataAttributeAttribute.cs
deleted file mode 100644 (file)
index 59aad48..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies that an attribute can be used to provide metadata for a type, property, field,\r
-    ///     or method marked with the <see cref="ExportAttribute"/>.\r
-    /// </summary>\r
-    [AttributeUsage(AttributeTargets.Class,\r
-                    AllowMultiple=false, Inherited=true)]\r
-    public sealed class MetadataAttributeAttribute : Attribute\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="MetadataAttributeAttribute"/> class.\r
-        /// </summary>\r
-        public MetadataAttributeAttribute()\r
-        {\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataServices.cs
deleted file mode 100644 (file)
index 6446c66..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class MetadataServices\r
-    {\r
-        public static readonly IDictionary<string, object> EmptyMetadata = new ReadOnlyDictionary<string, object>(null);\r
-\r
-        public static IDictionary<string, object> AsReadOnly(this IDictionary<string, object> metadata)\r
-        {\r
-            if (metadata == null)\r
-            {\r
-                return EmptyMetadata;\r
-            }\r
-\r
-            if (metadata is ReadOnlyDictionary<string, object>)\r
-            {\r
-                return metadata;\r
-            }\r
-\r
-            return new ReadOnlyDictionary<string, object>(metadata);\r
-        }\r
-\r
-        public static T GetValue<T>(this IDictionary<string, object> metadata, string key)\r
-        {\r
-            Assumes.NotNull(metadata, "metadata");\r
-\r
-            object untypedValue = true;\r
-            if (!metadata.TryGetValue(key, out untypedValue))\r
-            {\r
-                return default(T);\r
-            }\r
-\r
-            if (untypedValue is T)\r
-            {\r
-                return (T)untypedValue;\r
-            }\r
-            else\r
-            {\r
-                return default(T);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs
deleted file mode 100644 (file)
index e582774..0000000
+++ /dev/null
@@ -1,321 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-using System.Reflection.Emit;\r
-using System.Collections;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    // // Assume TMetadataView is\r
-    // //interface Foo\r
-    // //{\r
-    // //    public typeRecord1 Record1 { get; }\r
-    // //    public typeRecord2 Record2 { get; }\r
-    // //    public typeRecord3 Record3 { get; }\r
-    // //    public typeRecord4 Record4 { get; }\r
-    // //}\r
-    // // The class to be generated will look approximately like:\r
-    // public class __Foo__MedataViewProxy : TMetadataView\r
-    // {\r
-    //     public __Foo__MedataViewProxy (IDictionary<string, object> metadata)\r
-    //     {\r
-    //         if(metadata == null)\r
-    //         {\r
-    //             throw InvalidArgumentException("metadata");\r
-    //         }\r
-    //         try\r
-    //         {\r
-    //              Record1 = (typeRecord1)Record1;\r
-    //              Record2 = (typeRecord1)Record2;\r
-    //              Record3 = (typeRecord1)Record3;\r
-    //              Record4 = (typeRecord1)Record4;\r
-    //          }\r
-    //          catch(InvalidCastException ice)\r
-    //          {\r
-    //              //Annotate exception .Data with diagnostic info\r
-    //          }\r
-    //          catch(NulLReferenceException ice)\r
-    //          {\r
-    //              //Annotate exception .Data with diagnostic info\r
-    //          }\r
-    //     }\r
-    //     // Interface\r
-    //     public typeRecord1 Record1 { get; }\r
-    //     public typeRecord2 Record2 { get; }\r
-    //     public typeRecord3 Record3 { get; }\r
-    //     public typeRecord4 Record4 { get; }\r
-    // }\r
-    internal static class MetadataViewGenerator\r
-    {\r
-        public const string MetadataViewType       = "MetadataViewType";\r
-        public const string MetadataItemKey        = "MetadataItemKey";\r
-        public const string MetadataItemTargetType = "MetadataItemTargetType";\r
-        public const string MetadataItemSourceType = "MetadataItemSourceType";\r
-        public const string MetadataItemValue      = "MetadataItemValue";\r
-\r
-        private static Lock _lock = new Lock();\r
-        private static Dictionary<Type, Type> _proxies = new Dictionary<Type, Type>();\r
-\r
-        private static AssemblyName ProxyAssemblyName = new AssemblyName(string.Format(CultureInfo.InvariantCulture, "MetadataViewProxies_{0}", Guid.NewGuid()));\r
-        private static AssemblyBuilder ProxyAssemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(ProxyAssemblyName, AssemblyBuilderAccess.Run);\r
-        private static ModuleBuilder ProxyModuleBuilder = ProxyAssemblyBuilder.DefineDynamicModule("MetadataViewProxiesModule");\r
-        private static Type[] CtorArgumentTypes = new Type[] { typeof(IDictionary<string, object>) };\r
-        private static MethodInfo _mdvDictionaryTryGet = CtorArgumentTypes[0].GetMethod("TryGetValue");\r
-        private static readonly MethodInfo ObjectGetType = typeof(object).GetMethod("GetType", Type.EmptyTypes);\r
-\r
-        public static Type GenerateView(Type viewType)\r
-        {\r
-            Assumes.NotNull(viewType);\r
-            Assumes.IsTrue(viewType.IsInterface);\r
-\r
-            Type proxyType;\r
-            bool foundProxy;\r
-\r
-            using (new ReadLock(_lock))\r
-            {\r
-                foundProxy = _proxies.TryGetValue(viewType, out proxyType);\r
-            }\r
-\r
-            // No factory exists\r
-            if(!foundProxy)\r
-            {\r
-                // Try again under a write lock if still none generate the proxy\r
-                using (new WriteLock(_lock))\r
-                {\r
-                    foundProxy = _proxies.TryGetValue(viewType, out proxyType);\r
-\r
-                    if (!foundProxy)\r
-                    {\r
-                        proxyType = GenerateInterfaceViewProxyType(viewType);\r
-                        Assumes.NotNull(proxyType);\r
-\r
-                        _proxies.Add(viewType, proxyType);\r
-                    }\r
-                }\r
-            }\r
-            return proxyType;\r
-        }\r
-\r
-        private static void GenerateLocalAssignmentFromDefaultAttribute(this ILGenerator IL, DefaultValueAttribute[] attrs, LocalBuilder local)\r
-        {\r
-            if (attrs.Length > 0)\r
-            {\r
-                DefaultValueAttribute defaultAttribute = attrs[0];\r
-                IL.LoadValue(defaultAttribute.Value);\r
-                if ((defaultAttribute.Value != null) && (defaultAttribute.Value.GetType().IsValueType))\r
-                {\r
-                    IL.Emit(OpCodes.Box, defaultAttribute.Value.GetType());\r
-                }\r
-                IL.Emit(OpCodes.Stloc, local);\r
-            }\r
-        }\r
-\r
-        private static void GenerateFieldAssignmentFromLocalValue(this ILGenerator IL, LocalBuilder local, FieldBuilder field)\r
-        {\r
-            IL.Emit(OpCodes.Ldarg_0);\r
-            IL.Emit(OpCodes.Ldloc, local);\r
-            IL.Emit(field.FieldType.IsValueType ? OpCodes.Unbox_Any : OpCodes.Castclass, field.FieldType);\r
-            IL.Emit(OpCodes.Stfld, field);\r
-        }\r
-\r
-        private static void GenerateLocalAssignmentFromFlag(this ILGenerator IL, LocalBuilder local, bool flag)\r
-        {\r
-            IL.Emit(flag ? OpCodes.Ldc_I4_1 : OpCodes.Ldc_I4_0);\r
-            IL.Emit(OpCodes.Stloc, local);\r
-        }\r
-\r
-        // This must be called with _readerWriterLock held for Write\r
-        private static Type GenerateInterfaceViewProxyType(Type viewType)\r
-        {\r
-            // View type is an interface let's cook an implementation\r
-            Type proxyType;\r
-            TypeBuilder proxyTypeBuilder;\r
-            Type[] interfaces = { viewType };\r
-\r
-            proxyTypeBuilder = ProxyModuleBuilder.DefineType(\r
-                string.Format(CultureInfo.InvariantCulture, "_proxy_{0}_{1}", viewType.FullName, Guid.NewGuid()),\r
-                TypeAttributes.Public,\r
-                typeof(object),\r
-                interfaces);\r
-\r
-            // Implement Constructor\r
-            ILGenerator proxyCtorIL = proxyTypeBuilder.CreateGeneratorForPublicConstructor(CtorArgumentTypes);\r
-            LocalBuilder exception = proxyCtorIL.DeclareLocal(typeof(Exception));\r
-            LocalBuilder exceptionData = proxyCtorIL.DeclareLocal(typeof(IDictionary));\r
-            LocalBuilder sourceType = proxyCtorIL.DeclareLocal(typeof(Type));\r
-            LocalBuilder value = proxyCtorIL.DeclareLocal(typeof(object));\r
-            LocalBuilder usesExportedMD = proxyCtorIL.DeclareLocal(typeof(bool));\r
-\r
-            Label tryConstructView = proxyCtorIL.BeginExceptionBlock();\r
-\r
-            // Implement interface properties\r
-            foreach (PropertyInfo propertyInfo in viewType.GetAllProperties())\r
-            {\r
-                string fieldName = string.Format(CultureInfo.InvariantCulture, "_{0}_{1}", propertyInfo.Name, Guid.NewGuid());\r
-\r
-                // Cache names and type for exception\r
-                string propertyName = string.Format(CultureInfo.InvariantCulture, "{0}", propertyInfo.Name);\r
-\r
-                Type[] propertyTypeArguments = new Type[] { propertyInfo.PropertyType };\r
-                Type[] optionalModifiers = null;\r
-                Type[] requiredModifiers = null;\r
-\r
-#if !SILVERLIGHT\r
-                // PropertyInfo does not support GetOptionalCustomModifiers and GetRequiredCustomModifiers on Silverlight\r
-                optionalModifiers = propertyInfo.GetOptionalCustomModifiers();\r
-                requiredModifiers = propertyInfo.GetRequiredCustomModifiers();\r
-                Array.Reverse(optionalModifiers);\r
-                Array.Reverse(requiredModifiers);\r
-#endif\r
-                // Generate field\r
-                FieldBuilder proxyFieldBuilder = proxyTypeBuilder.DefineField(\r
-                    fieldName,\r
-                    propertyInfo.PropertyType,\r
-                    FieldAttributes.Private);\r
-\r
-                // Generate property\r
-                PropertyBuilder proxyPropertyBuilder = proxyTypeBuilder.DefineProperty(\r
-                    propertyName,\r
-                    PropertyAttributes.None,\r
-                    propertyInfo.PropertyType,\r
-                    propertyTypeArguments);\r
-\r
-                // Generate constructor code for retrieving the metadata value and setting the field\r
-                Label tryCastValue = proxyCtorIL.BeginExceptionBlock();\r
-                Label innerTryCastValue;\r
-\r
-                DefaultValueAttribute[] attrs = propertyInfo.GetAttributes<DefaultValueAttribute>(false);\r
-                if(attrs.Length > 0)\r
-                {\r
-                    innerTryCastValue = proxyCtorIL.BeginExceptionBlock();\r
-                }\r
-\r
-                // In constructor set the backing field with the value from the dictionary\r
-                Label doneGettingDefaultValue = proxyCtorIL.DefineLabel();\r
-                GenerateLocalAssignmentFromFlag(proxyCtorIL, usesExportedMD, true);\r
-\r
-                proxyCtorIL.Emit(OpCodes.Ldarg_1);\r
-                proxyCtorIL.Emit(OpCodes.Ldstr, propertyInfo.Name);\r
-                proxyCtorIL.Emit(OpCodes.Ldloca, value);\r
-                proxyCtorIL.Emit(OpCodes.Callvirt, _mdvDictionaryTryGet);\r
-                proxyCtorIL.Emit(OpCodes.Brtrue, doneGettingDefaultValue);\r
-\r
-                proxyCtorIL.GenerateLocalAssignmentFromFlag(usesExportedMD, false);\r
-                proxyCtorIL.GenerateLocalAssignmentFromDefaultAttribute(attrs, value);\r
-\r
-                proxyCtorIL.MarkLabel(doneGettingDefaultValue);\r
-                proxyCtorIL.GenerateFieldAssignmentFromLocalValue(value, proxyFieldBuilder);\r
-                proxyCtorIL.Emit(OpCodes.Leave, tryCastValue);\r
-\r
-                // catch blocks for innerTryCastValue start here\r
-                if (attrs.Length > 0)\r
-                {\r
-                    proxyCtorIL.BeginCatchBlock(typeof(InvalidCastException));\r
-                    {\r
-                        Label notUsesExportedMd = proxyCtorIL.DefineLabel();\r
-                        proxyCtorIL.Emit(OpCodes.Ldloc, usesExportedMD);\r
-                        proxyCtorIL.Emit(OpCodes.Brtrue, notUsesExportedMd);\r
-                        proxyCtorIL.Emit(OpCodes.Rethrow);\r
-                        proxyCtorIL.MarkLabel(notUsesExportedMd);\r
-                        proxyCtorIL.GenerateLocalAssignmentFromDefaultAttribute(attrs, value);\r
-                        proxyCtorIL.GenerateFieldAssignmentFromLocalValue(value, proxyFieldBuilder);\r
-                    }\r
-                    proxyCtorIL.EndExceptionBlock();\r
-                }\r
-\r
-                // catch blocks for tryCast start here\r
-                proxyCtorIL.BeginCatchBlock(typeof(NullReferenceException));\r
-                {\r
-                    proxyCtorIL.Emit(OpCodes.Stloc, exception);\r
-\r
-                    proxyCtorIL.GetExceptionDataAndStoreInLocal(exception, exceptionData);\r
-                    proxyCtorIL.AddItemToLocalDictionary(exceptionData, MetadataItemKey, propertyName);\r
-                    proxyCtorIL.AddItemToLocalDictionary(exceptionData, MetadataItemTargetType, propertyInfo.PropertyType);\r
-                    proxyCtorIL.Emit(OpCodes.Rethrow);\r
-                }\r
-\r
-                proxyCtorIL.BeginCatchBlock(typeof(InvalidCastException));\r
-                {\r
-                    proxyCtorIL.Emit(OpCodes.Stloc, exception);\r
-\r
-                    proxyCtorIL.GetExceptionDataAndStoreInLocal(exception, exceptionData);\r
-                    proxyCtorIL.AddItemToLocalDictionary(exceptionData, MetadataItemKey, propertyName);\r
-                    proxyCtorIL.AddItemToLocalDictionary(exceptionData, MetadataItemTargetType, propertyInfo.PropertyType);\r
-                    proxyCtorIL.Emit(OpCodes.Rethrow);\r
-                }\r
-\r
-                proxyCtorIL.EndExceptionBlock();\r
-\r
-                if (propertyInfo.CanWrite)\r
-                {\r
-                    // The MetadataView '{0}' is invalid because property '{1}' has a property set method.\r
-                    throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture,\r
-                        Strings.InvalidSetterOnMetadataField,\r
-                        viewType,\r
-                        propertyName));\r
-                }\r
-                if (propertyInfo.CanRead)\r
-                {\r
-                    // Generate "get" method implementation.\r
-                    MethodBuilder getMethodBuilder = proxyTypeBuilder.DefineMethod(\r
-                        string.Format(CultureInfo.InvariantCulture, "get_{0}", propertyName),\r
-                        MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.SpecialName | MethodAttributes.NewSlot | MethodAttributes.Virtual | MethodAttributes.Final,\r
-                        CallingConventions.HasThis,\r
-                        propertyInfo.PropertyType,\r
-                        requiredModifiers,\r
-                        optionalModifiers,\r
-                        Type.EmptyTypes, null, null);\r
-\r
-                    proxyTypeBuilder.DefineMethodOverride(getMethodBuilder, propertyInfo.GetGetMethod());\r
-                    ILGenerator getMethodIL = getMethodBuilder.GetILGenerator();\r
-                    getMethodIL.Emit(OpCodes.Ldarg_0);\r
-                    getMethodIL.Emit(OpCodes.Ldfld, proxyFieldBuilder);\r
-                    getMethodIL.Emit(OpCodes.Ret);\r
-\r
-                    proxyPropertyBuilder.SetGetMethod(getMethodBuilder);\r
-                }\r
-            }\r
-\r
-            proxyCtorIL.Emit(OpCodes.Leave, tryConstructView);\r
-\r
-            // catch blocks for constructView start here\r
-            proxyCtorIL.BeginCatchBlock(typeof(NullReferenceException));\r
-            {\r
-                proxyCtorIL.Emit(OpCodes.Stloc, exception);\r
-\r
-                proxyCtorIL.GetExceptionDataAndStoreInLocal(exception, exceptionData);\r
-                proxyCtorIL.AddItemToLocalDictionary(exceptionData, MetadataViewType, viewType);\r
-                proxyCtorIL.Emit(OpCodes.Rethrow);\r
-            }\r
-            proxyCtorIL.BeginCatchBlock(typeof(InvalidCastException));\r
-            {\r
-                proxyCtorIL.Emit(OpCodes.Stloc, exception);\r
-\r
-                proxyCtorIL.GetExceptionDataAndStoreInLocal(exception, exceptionData);\r
-                proxyCtorIL.Emit(OpCodes.Ldloc, value);\r
-                proxyCtorIL.Emit(OpCodes.Call, ObjectGetType);\r
-                proxyCtorIL.Emit(OpCodes.Stloc, sourceType);\r
-                proxyCtorIL.AddItemToLocalDictionary(exceptionData, MetadataViewType, viewType);\r
-                proxyCtorIL.AddLocalToLocalDictionary(exceptionData, MetadataItemSourceType, sourceType);\r
-                proxyCtorIL.AddLocalToLocalDictionary(exceptionData, MetadataItemValue, value);\r
-                proxyCtorIL.Emit(OpCodes.Rethrow);\r
-            }\r
-            proxyCtorIL.EndExceptionBlock();\r
-\r
-            // Finished implementing interface and constructor\r
-            proxyCtorIL.Emit(OpCodes.Ret);\r
-            proxyType = proxyTypeBuilder.CreateType();\r
-\r
-            return proxyType;\r
-        }\r
-             \r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs
deleted file mode 100644 (file)
index 8e22770..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.Text;\r
-using Microsoft.Internal;\r
-using System.Globalization;\r
-using System.Runtime.InteropServices;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    internal static class MetadataViewProvider\r
-    {\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]\r
-        public static TMetadataView GetMetadataView<TMetadataView>(IDictionary<string, object> metadata)\r
-        {\r
-            Type metadataViewType = typeof(TMetadataView);\r
-\r
-            // If the Metadata dictionary is cast compatible with the passed in type\r
-            if (metadataViewType.IsAssignableFrom(typeof(IDictionary<string, object>)))\r
-            {\r
-                return (TMetadataView)metadata;\r
-            }\r
-            // otherwise is it a metadata view\r
-            else\r
-            {\r
-                Type proxyType;\r
-                if (metadataViewType.IsInterface)\r
-                {\r
-                    try\r
-                    {\r
-                        proxyType = MetadataViewGenerator.GenerateView(metadataViewType);\r
-                    }\r
-                    catch (TypeLoadException ex)\r
-                    {\r
-                        throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, Strings.NotSupportedInterfaceMetadataView, metadataViewType.FullName), ex);\r
-                    }\r
-                }\r
-                else\r
-                {\r
-                    proxyType = metadataViewType;\r
-                }\r
-\r
-                // Now we have the type for the proxy create it\r
-                try\r
-                {\r
-                    return (TMetadataView)proxyType.SafeCreateInstance(metadata);\r
-                }\r
-                catch (MissingMethodException ex)\r
-                {\r
-                    // Unable to create an Instance of the Metadata view '{0}' because a constructor could not be selected.  Ensure that the type implements a constructor which takes an argument of type IDictionary<string, object>.\r
-                    throw new CompositionContractMismatchException(string.Format(CultureInfo.CurrentCulture,\r
-                        Strings.CompositionException_MetadataViewInvalidConstructor,\r
-                        proxyType.AssemblyQualifiedName), ex);\r
-                }\r
-                catch (TargetInvocationException ex)\r
-                {\r
-                    //Unwrap known failures that we want to present as CompositionContractMismatchException\r
-                    if(metadataViewType.IsInterface)\r
-                    {\r
-                        if(ex.InnerException.GetType() == typeof(InvalidCastException))\r
-                        {\r
-                            // Unable to create an Instance of the Metadata view {0} because the exporter exported the metadata for the item {1} with the value {2} as type {3} but the view imports it as type {4}.\r
-                            throw new CompositionContractMismatchException(string.Format(CultureInfo.CurrentCulture, \r
-                                Strings.ContractMismatch_InvalidCastOnMetadataField,\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataViewType],\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataItemKey],\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataItemValue],\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataItemSourceType],\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataItemTargetType]), ex);\r
-                        }\r
-                        else if (ex.InnerException.GetType() == typeof(NullReferenceException))\r
-                        {\r
-                            // Unable to create an Instance of the Metadata view {0} because the exporter exported the metadata for the item {1} with a null value and null is not a valid value for type {2}.\r
-                            throw new CompositionContractMismatchException(string.Format(CultureInfo.CurrentCulture,\r
-                                Strings.ContractMismatch_NullReferenceOnMetadataField,\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataViewType],\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataItemKey],\r
-                                ex.InnerException.Data[MetadataViewGenerator.MetadataItemTargetType]), ex);\r
-                        }\r
-                    }\r
-                    throw;\r
-                }\r
-            }\r
-        }\r
-\r
-        public static bool IsViewTypeValid(Type metadataViewType)\r
-        {\r
-            Assumes.NotNull(metadataViewType);\r
-\r
-            // If the Metadata dictionary is cast compatible with the passed in type\r
-            if (ExportServices.IsDefaultMetadataViewType(metadataViewType)\r
-            ||  metadataViewType.IsInterface\r
-            ||  ExportServices.IsDictionaryConstructorViewType(metadataViewType))\r
-            {\r
-                return true;\r
-            }\r
-\r
-            return false;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreationPolicyAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreationPolicyAttribute.cs
deleted file mode 100644 (file)
index 844fb39..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies <see cref="CreationPolicy"/> for a given <see cref="ComposablePart" />.\r
-    /// </summary>\r
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]\r
-    public sealed class PartCreationPolicyAttribute : Attribute\r
-    {\r
-        internal static PartCreationPolicyAttribute Default = new PartCreationPolicyAttribute(CreationPolicy.Any);\r
-        internal static PartCreationPolicyAttribute Shared = new PartCreationPolicyAttribute(CreationPolicy.Shared);\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="PartCreationPolicyAttribute"/> class.\r
-        /// </summary>\r
-        public PartCreationPolicyAttribute(CreationPolicy creationPolicy)\r
-        {\r
-            this.CreationPolicy = creationPolicy;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets a value indicating the creation policy of the attributed part.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     One of the <see cref="CreationPolicy"/> values indicating the creation policy of the \r
-        ///     attributed part. The default is \r
-        ///     <see cref="System.ComponentModel.Composition.CreationPolicy.Any"/>.\r
-        /// </value>\r
-        public CreationPolicy CreationPolicy { get; private set; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfT.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfT.cs
deleted file mode 100644 (file)
index 37198b1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.Internal;\r
-\r
-#if SILVERLIGHT\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public class PartCreator<T>\r
-    {\r
-        private readonly Func<PartLifetimeContext<T>> _creator;\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public PartCreator(Func<PartLifetimeContext<T>> creator)\r
-        {\r
-            Requires.NotNull(creator, "creator");\r
-            this._creator = creator;\r
-        }\r
-\r
-        public PartLifetimeContext<T> CreatePart()\r
-        {\r
-            return this._creator();\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfTTMetadata.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartCreatorOfTTMetadata.cs
deleted file mode 100644 (file)
index c352adf..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-#if SILVERLIGHT\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public class PartCreator<T, TMetadata> : PartCreator<T>\r
-    {\r
-        private readonly TMetadata _metadata;\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public PartCreator(Func<PartLifetimeContext<T>> creator, TMetadata metadata)\r
-            : base(creator)\r
-        {\r
-            this._metadata = metadata;\r
-        }\r
-\r
-        public TMetadata Metadata\r
-        {\r
-            get { return this._metadata; }\r
-        }\r
-    }\r
-}\r
-\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartLifetimeContextOfT.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartLifetimeContextOfT.cs
deleted file mode 100644 (file)
index 75aea43..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-#if SILVERLIGHT\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public sealed class PartLifetimeContext<T> : IDisposable\r
-    {\r
-        private readonly T _exportedValue;\r
-        private readonly Action _dispose;\r
-\r
-        public PartLifetimeContext(T exportedValue, Action dispose)\r
-        {\r
-            this._exportedValue = exportedValue;\r
-            this._dispose = dispose;\r
-        }\r
-\r
-        public T ExportedValue \r
-        {\r
-            get { return this._exportedValue; }\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            this._dispose();\r
-        }\r
-    }\r
-}\r
-\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartMetadataAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartMetadataAttribute.cs
deleted file mode 100644 (file)
index a700a29..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Specifies metadata for a type to be used as a <see cref="ComposablePartDefinition"/> and\r
-    ///     <see cref="ComposablePart"/>.\r
-    /// </summary>\r
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]\r
-    public sealed class PartMetadataAttribute : Attribute\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="PartMetadataAttribute"/> with the \r
-        ///     specified name and metadata value.\r
-        /// </summary>\r
-        /// <param name="name">\r
-        ///     A <see cref="String"/> containing the name of the metadata value; or \r
-        ///     <see langword="null"/> to use an empty string ("").\r
-        /// </param>\r
-        /// <param name="value">\r
-        ///     An <see cref="object"/> containing the metadata value. This can be \r
-        ///     <see langword="null"/>.\r
-        /// </param>\r
-        public PartMetadataAttribute(string name, object value)\r
-        {\r
-            this.Name = name ?? string.Empty;\r
-            this.Value = value;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the name of the metadata value.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing the name of the metadata value.\r
-        /// </value>\r
-        public string Name\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the metadata value.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="object"/> containing the metadata value.\r
-        /// </value>\r
-        public object Value\r
-        {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartNotDiscoverableAttribute.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/PartNotDiscoverableAttribute.cs
deleted file mode 100644 (file)
index 1436a6a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    /// <summary>\r
-    ///     Place on a type that should not be discovered as a <see cref="ComposablePart" /> in\r
-    ///     a <see cref="ComposablePartCatalog" />.\r
-    /// </summary>\r
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]\r
-    public sealed class PartNotDiscoverableAttribute : Attribute\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="PartNotDiscoverableAttribute"/> class.\r
-        /// </summary>\r
-        public PartNotDiscoverableAttribute()\r
-        {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/.gitattributes
deleted file mode 100644 (file)
index 5aa9b2a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/ComposablePart.cs -crlf
-/ComposablePartCatalog.cs -crlf
-/ComposablePartCatalogDebuggerProxy.cs -crlf
-/ComposablePartDefinition.cs -crlf
-/ComposablePartException.cs -crlf
-/CompositionElement.cs -crlf
-/CompositionElementDebuggerProxy.cs -crlf
-/CompositionElementExtensions.cs -crlf
-/ContractBasedImportDefinition.cs -crlf
-/Export.cs -crlf
-/ExportDefinition.cs -crlf
-/ExportedDelegate.cs -crlf
-/ICompositionElement.cs -crlf
-/IPartCreatorImportDefinition.cs -crlf
-/ImportCardinality.cs -crlf
-/ImportDefinition.cs -crlf
-/SerializableCompositionElement.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePart.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePart.cs
deleted file mode 100644 (file)
index 3b74eec..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Defines the <see langword="abstract"/> base class for composable parts, which \r
-    ///     import and produce exported values.\r
-    /// </summary>\r
-    public abstract class ComposablePart\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePart"/> class.\r
-        /// </summary>\r
-        protected ComposablePart()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the export definitions that describe the exported values provided by the part.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ExportDefinition"/> objects describing\r
-        ///     the exported values provided by the <see cref="ComposablePart"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePart"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             If the <see cref="ComposablePart"/> was created from a \r
-        ///             <see cref="ComposablePartDefinition"/>, this property should return the result of \r
-        ///             <see cref="ComposablePartDefinition.ExportDefinitions"/>.\r
-        ///         </note>\r
-        ///      </para>\r
-        ///      <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             Overriders of this property should never return <see langword="null"/>.\r
-        ///             If the <see cref="ComposablePart"/> does not have exports, return an empty \r
-        ///             <see cref="IEnumerable{T}"/> instead.\r
-        ///         </note>\r
-        ///     </para>\r
-        /// </remarks>\r
-        public abstract IEnumerable<ExportDefinition> ExportDefinitions { get; }\r
-\r
-        /// <summary>\r
-        ///     Gets the import definitions that describe the imports required by the part.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ImportDefinition"/> objects describing\r
-        ///     the imports required by the <see cref="ComposablePart"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePart"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             If the <see cref="ComposablePart"/> was created from a \r
-        ///             <see cref="ComposablePartDefinition"/>, this property should return the result of \r
-        ///             <see cref="ComposablePartDefinition.ImportDefinitions"/>.\r
-        ///         </note>\r
-        ///      </para>\r
-        ///      <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             Overrides of this property should never return <see langword="null"/>.\r
-        ///             If the <see cref="ComposablePart"/> does not have imports, return an empty \r
-        ///             <see cref="IEnumerable{T}"/> instead.\r
-        ///         </note>\r
-        ///     </para>\r
-        /// </remarks>\r
-        public abstract IEnumerable<ImportDefinition> ImportDefinitions { get; }\r
-\r
-        /// <summary>\r
-        ///     Gets the metadata of the part.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IDictionary{TKey, TValue}"/> containing the metadata of the \r
-        ///     <see cref="ComposablePart"/>. The default is an empty, read-only\r
-        ///     <see cref="IDictionary{TKey, TValue}"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePart"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             If the <see cref="ComposablePart"/> was created from a \r
-        ///             <see cref="ComposablePartDefinition"/>, this property should return the result of \r
-        ///             <see cref="ComposablePartDefinition.Metadata"/>.\r
-        ///         </note>\r
-        ///      </para>\r
-        ///      <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             Overriders of this property should return a read-only\r
-        ///             <see cref="IDictionary{TKey, TValue}"/> object with a case-sensitive, \r
-        ///             non-linguistic comparer, such as <see cref="StringComparer.Ordinal"/>, \r
-        ///             and should never return <see langword="null"/>. If the \r
-        ///             <see cref="ComposablePart"/> does not contain metadata, return an \r
-        ///             empty <see cref="IDictionary{TKey, TValue}"/> instead.\r
-        ///         </note>\r
-        ///      </para>\r
-        /// </remarks>\r
-        public virtual IDictionary<string, object> Metadata\r
-        {\r
-            get \r
-            {\r
-                return MetadataServices.EmptyMetadata; \r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Called by the composition engine when all required imports on the part have been\r
-        ///     satisfied.\r
-        /// </summary>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePart"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="ComposablePartException">\r
-        ///     An error occurred activating the <see cref="ComposablePart"/>.\r
-        /// </exception>\r
-        public virtual void Activate()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the exported value described by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     One of the <see cref="ExportDefinition"/> objects from the \r
-        ///     <see cref="ExportDefinitions"/> property describing the exported value\r
-        ///     to return.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     The exported value described by <paramref name="definition"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="definition"/> did not originate from the <see cref="ExportDefinitions"/>\r
-        ///     property on the <see cref="ComposablePart"/>.\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     One or more pre-requisite imports, indicated by <see cref="ImportDefinition.IsPrerequisite"/>,\r
-        ///     have not been set.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePart"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="ComposablePartException">\r
-        ///     An error occurred getting the exported value described by the <see cref="ExportDefinition"/>.\r
-        /// </exception>\r
-        public abstract object GetExportedValue(ExportDefinition definition);\r
-\r
-        /// <summary>\r
-        ///     Sets the import described by the specified definition with the specified exports.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     One of the <see cref="ImportDefinition"/> objects from the \r
-        ///     <see cref="ImportDefinitions"/> property describing the import to be set.\r
-        /// </param>\r
-        /// <param name="exports">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Export"/> objects of which \r
-        ///     to set the import described by <paramref name="definition"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="exports"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="definition"/> did not originate from the <see cref="ImportDefinitions"/>\r
-        ///     property on the <see cref="ComposablePart"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="exports"/> contains an element that is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="exports"/> is empty and <see cref="ImportDefinition.Cardinality"/> is \r
-        ///     <see cref="ImportCardinality.ExactlyOne"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="exports"/> contains more than one element and \r
-        ///     <see cref="ImportDefinition.Cardinality"/> is <see cref="ImportCardinality.ZeroOrOne"/> or \r
-        ///     <see cref="ImportCardinality.ExactlyOne"/>.\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     <see cref="Activate"/> has been previously called and \r
-        ///     <see cref="ImportDefinition.IsRecomposable"/> is <see langword="false"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePart"/> has been disposed of.\r
-        /// </exception>\r
-        /// <exception cref="ComposablePartException">\r
-        ///     An error occurred setting the import described by the <see cref="ImportDefinition"/>.\r
-        /// </exception>\r
-        public abstract void SetImport(ImportDefinition definition, IEnumerable<Export> exports);\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalog.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalog.cs
deleted file mode 100644 (file)
index 22fe9a2..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Diagnostics;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Defines the <see langword="abstract"/> base class for composable part catalogs, which produce\r
-    ///     and return <see cref="ComposablePartDefinition"/> objects.\r
-    /// </summary>\r
-    /// <remarks>\r
-    ///     This type is thread safe.\r
-    /// </remarks>\r
-    [DebuggerTypeProxy(typeof(ComposablePartCatalogDebuggerProxy))]\r
-    public abstract class ComposablePartCatalog : IDisposable\r
-    {\r
-        private bool _isDisposed;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartCatalog"/> class.\r
-        /// </summary>\r
-        protected ComposablePartCatalog()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the part definitions of the catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IQueryable{T}"/> of <see cref="ComposablePartDefinition"/> objects of the \r
-        ///     <see cref="ComposablePartCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePartCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        public abstract IQueryable<ComposablePartDefinition> Parts \r
-        { \r
-            get; \r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export definitions that match the constraint defined by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="ExportDefinition"/> objects to return.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1, T2}"/> containing the \r
-        ///     <see cref="ExportDefinition"/> objects and their associated \r
-        ///     <see cref="ComposablePartDefinition"/> for objects that match the constraint defined \r
-        ///     by <paramref name="definition"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="ComposablePartCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/>, if no \r
-        ///         <see cref="ExportDefinition"/> match the conditions defined by \r
-        ///         <paramref name="definition"/>, return an empty <see cref="IEnumerable{T}"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public virtual IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(ImportDefinition definition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            var exports = new List<Tuple<ComposablePartDefinition, ExportDefinition>>();\r
-            foreach (var part in this.Parts)\r
-            {\r
-                foreach (var export in part.ExportDefinitions)\r
-                {\r
-                    if (definition.IsConstraintSatisfiedBy(export))\r
-                    {\r
-                        exports.Add(new Tuple<ComposablePartDefinition, ExportDefinition>(part, export));\r
-                    }\r
-                }\r
-            }\r
-            return exports;\r
-\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Releases the unmanaged resources used by the <see cref="ComposablePartCatalog"/> and \r
-        ///     optionally releases the managed resources.\r
-        /// </summary>\r
-        /// <param name="disposing">\r
-        ///     <see langword="true"/> to release both managed and unmanaged resources; \r
-        ///     <see langword="false"/> to release only unmanaged resources.\r
-        /// </param>\r
-        public void Dispose()\r
-        {\r
-            Dispose(true);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        protected virtual void Dispose(bool disposing) \r
-        {\r
-            this._isDisposed = true;\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalogDebuggerProxy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartCatalogDebuggerProxy.cs
deleted file mode 100644 (file)
index 3d5f72a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.ObjectModel;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    // This proxy is needed to pretty up ComposablePartCatalog.Parts; IQueryable<T> \r
-    // instances are not displayed in a very friendly way in the debugger.\r
-    internal class ComposablePartCatalogDebuggerProxy\r
-    {\r
-        private readonly ComposablePartCatalog _catalog;\r
-\r
-        public ComposablePartCatalogDebuggerProxy(ComposablePartCatalog catalog) \r
-        {\r
-            Requires.NotNull(catalog, "catalog");\r
-\r
-            this._catalog = catalog;\r
-        }\r
-\r
-        public ReadOnlyCollection<ComposablePartDefinition> Parts\r
-        {\r
-            // NOTE: This shouldn't be cached, so that on every query of\r
-            // the current value of the underlying catalog is respected.\r
-            // We use ReadOnlyCollection as arrays do not have the \r
-            // appropriate debugger display attributes applied to them.\r
-            get { return this._catalog.Parts.ToReadOnlyCollection(); }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartDefinition.cs
deleted file mode 100644 (file)
index 979022a..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Defines the <see langword="abstract"/> base class for composable part definitions, which \r
-    ///     describe, and allow the creation of, <see cref="ComposablePart"/> objects.\r
-    /// </summary>\r
-    public abstract class ComposablePartDefinition\r
-    {\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartDefinition"/> class.\r
-        /// </summary>\r
-        protected ComposablePartDefinition()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the export definitions that describe the exported values provided by parts \r
-        ///     created by the definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ExportDefinition"/> objects describing\r
-        ///     the exported values provided by <see cref="ComposablePart"/> objects created by the \r
-        ///     <see cref="ComposablePartDefinition"/>.\r
-        /// </value>\r
-        /// <remarks>\r
-         ///     <note type="inheritinfo">\r
-        ///         Overrides of this property should never return <see langword="null"/>.\r
-        ///         If the <see cref="ComposablePart"/> objects created by the \r
-        ///         <see cref="ComposablePartDefinition"/> do not provide exported values, return \r
-        ///         an empty <see cref="IEnumerable{T}"/> instead.\r
-        ///     </note>\r
-        /// </remarks>\r
-        public abstract IEnumerable<ExportDefinition> ExportDefinitions { get; }\r
-\r
-        /// <summary>\r
-        ///     Gets the import definitions that describe the imports required by parts created \r
-        ///     by the definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="ImportDefinition"/> objects describing\r
-        ///     the imports required by <see cref="ComposablePart"/> objects created by the \r
-        ///     <see cref="ComposablePartDefinition"/>.\r
-        /// </value>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/>.\r
-        ///         If the <see cref="ComposablePart"/> objects created by the \r
-        ///         <see cref="ComposablePartDefinition"/> do not have imports, return an empty \r
-        ///         <see cref="IEnumerable{T}"/> instead.\r
-        ///     </note>\r
-        /// </remarks>\r
-        public abstract IEnumerable<ImportDefinition> ImportDefinitions { get; }\r
-\r
-        /// <summary>\r
-        ///     Gets the metadata of the definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IDictionary{TKey, TValue}"/> containing the metadata of the \r
-        ///     <see cref="ComposablePartDefinition"/>. The default is an empty, read-only\r
-        ///     <see cref="IDictionary{TKey, TValue}"/>.\r
-        /// </value>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             Overriders of this property should return a read-only\r
-        ///             <see cref="IDictionary{TKey, TValue}"/> object with a case-sensitive, \r
-        ///             non-linguistic comparer, such as <see cref="StringComparer.Ordinal"/>, \r
-        ///             and should never return <see langword="null"/>. If the \r
-        ///             <see cref="ComposablePartDefinition"/> does contain metadata, \r
-        ///             return an empty <see cref="IDictionary{TKey, TValue}"/> instead.\r
-        ///         </note>\r
-        ///     </para>\r
-        /// </remarks>\r
-        public virtual IDictionary<string, object> Metadata \r
-        {\r
-            get { return MetadataServices.EmptyMetadata; } \r
-        }\r
-\r
-        /// <summary>\r
-        ///     Creates a new instance of a part that the definition describes.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     The created <see cref="ComposablePart"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             Derived types overriding this method should return a new instance of a \r
-        ///             <see cref="ComposablePart"/> on every invoke and should never return \r
-        ///             <see langword="null"/>.\r
-        ///         </note>\r
-        ///     </para>\r
-        /// </remarks>\r
-        public abstract ComposablePart CreatePart();\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartException.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ComposablePartException.cs
deleted file mode 100644 (file)
index 2f05593..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Runtime.Serialization;\r
-using System.Security.Permissions;\r
-using Microsoft.Internal;\r
-\r
-#if !SILVERLIGHT\r
-using Microsoft.Internal.Runtime.Serialization;\r
-#endif\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     The exception that is thrown when an error occurs when calling methods on a\r
-    ///     <see cref="ComposablePart"/>.\r
-    /// </summary>\r
-    [Serializable]\r
-    public class ComposablePartException : Exception, ICompositionError\r
-    {\r
-        private readonly CompositionErrorId _id;\r
-        private readonly ICompositionElement _element;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartException"/> class.\r
-        /// </summary>\r
-        public ComposablePartException()\r
-            : this(CompositionErrorId.Unknown, (string)null, (ICompositionElement)null, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartException"/> class \r
-        ///     with the specified error message.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        /// <param name="element">\r
-        ///     The <see cref="ICompositionElement"/> that is the cause of the\r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="ComposablePartException.Element"/> property to \r
-        ///     <see langword="null"/>.\r
-        /// </param>\r
-        public ComposablePartException(string message)\r
-            : this(CompositionErrorId.Unknown, message, (ICompositionElement)null, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartException"/> class \r
-        ///     with the specified error message and composition element that is the cause of\r
-        ///     the exception.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        public ComposablePartException(string message, ICompositionElement element)\r
-            : this(CompositionErrorId.Unknown, message, element, (Exception)null)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartException"/> class \r
-        ///     with the specified error message and exception that is the cause of the  \r
-        ///     exception.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        /// <param name="innerException">\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.InnerException"/> property to <see langword="null"/>.\r
-        /// </param>\r
-        public ComposablePartException(string message, Exception innerException)\r
-            : this(CompositionErrorId.Unknown, message, (ICompositionElement)null, innerException)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartException"/> class \r
-        ///     with the specified error message, and composition element and exception that \r
-        ///     are the cause of the exception.\r
-        /// </summary>\r
-        /// <param name="message">\r
-        ///     A <see cref="String"/> containing a message that describes the \r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.Message"/> property to its default value.\r
-        /// </param>\r
-        /// <param name="element">\r
-        ///     The <see cref="ICompositionElement"/> that is the cause of the\r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="ComposablePartException.Element"/> property to \r
-        ///     <see langword="null"/>.\r
-        /// </param>\r
-        /// <param name="innerException">\r
-        ///     The <see cref="Exception"/> that is the underlying cause of the \r
-        ///     <see cref="ComposablePartException"/>; or <see langword="null"/> to set\r
-        ///     the <see cref="Exception.InnerException"/> property to <see langword="null"/>.\r
-        /// </param>\r
-        public ComposablePartException(string message, ICompositionElement element, Exception innerException)\r
-            : this(CompositionErrorId.Unknown, message, element, innerException)\r
-        {\r
-        }\r
-\r
-        internal ComposablePartException(CompositionErrorId id, string message)\r
-            : this(id, message, (ICompositionElement)null, (Exception)null)\r
-        {\r
-        }\r
-\r
-        internal ComposablePartException(CompositionErrorId id, string message, Exception exception)\r
-            : this(id, message, (ICompositionElement)null, exception)\r
-        {\r
-        }\r
-\r
-        internal ComposablePartException(CompositionErrorId id, string message, ICompositionElement element)\r
-            : this(id, message, (ICompositionElement)element, (Exception)null)\r
-        {\r
-        }\r
-\r
-        internal ComposablePartException(CompositionErrorId id, string message, ICompositionElement element, Exception innerException)\r
-            : base(message, innerException)\r
-        {\r
-            _id = id;\r
-            _element = element;\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ComposablePartException"/> class \r
-        ///     with the specified serialization data.\r
-        /// </summary>\r
-        /// <param name="info">\r
-        ///     The <see cref="SerializationInfo"/> that holds the serialized object data about the \r
-        ///     <see cref="ComposablePartException"/>.\r
-        /// </param>\r
-        /// <param name="context">\r
-        ///     The <see cref="StreamingContext"/> that contains contextual information about the \r
-        ///     source or destination.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="info"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="SerializationException">\r
-        ///     <paramref name="info"/> is missing a required value.\r
-        /// </exception>\r
-        /// <exception cref="InvalidCastException">\r
-        ///     <paramref name="info"/> contains a value that cannot be cast to the correct type.\r
-        /// </exception>\r
-        [System.Security.SecuritySafeCritical]\r
-        protected ComposablePartException(SerializationInfo info, StreamingContext context)\r
-            : base(info, context)\r
-        {\r
-            _id = info.GetValue<CompositionErrorId>("Id");\r
-            _element = info.GetValue<ICompositionElement>("Element");\r
-        }\r
-\r
-#endif\r
-\r
-        /// <summary>\r
-        ///     Gets the composition element that is the cause of the exception.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     The <see cref="ICompositionElement"/> that is the cause of the\r
-        ///     <see cref="ComposablePartException"/>. The default is <see langword="null"/>.\r
-        /// </value>\r
-        public ICompositionElement Element\r
-        {\r
-            get { return _element; }\r
-        }\r
-\r
-        CompositionErrorId ICompositionError.Id\r
-        {\r
-            get { return _id; }\r
-        }\r
-\r
-#if !SILVERLIGHT\r
-\r
-        /// <summary>\r
-        ///     Gets the serialization data of the exception.\r
-        /// </summary>\r
-        /// <param name="info">\r
-        ///     The <see cref="SerializationInfo"/> that holds the serialized object data about the \r
-        ///     <see cref="ComposablePartException"/>.\r
-        /// </param>\r
-        /// <param name="context">\r
-        ///     The <see cref="StreamingContext"/> that contains contextual information about the \r
-        ///     source or destination.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="info"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        [System.Security.SecurityCritical]\r
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)\r
-        {\r
-            base.GetObjectData(info, context);\r
-\r
-            info.AddValue("Id", _id);\r
-            info.AddValue("Element", _element.ToSerializableElement());\r
-        }\r
-\r
-#endif\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElement.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElement.cs
deleted file mode 100644 (file)
index 4cb34de..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    // Represents the ICompositionElement placeholder for an \r
-    // object that does not implement ICompositionElement\r
-    [DebuggerTypeProxy(typeof(CompositionElementDebuggerProxy))]\r
-    [Serializable]\r
-    internal class CompositionElement : SerializableCompositionElement\r
-    {\r
-        private static readonly ICompositionElement UnknownOrigin = new SerializableCompositionElement(Strings.CompositionElement_UnknownOrigin, (ICompositionElement)null);\r
-        private readonly object _underlyingObject;\r
-\r
-        public CompositionElement(object underlyingObject)\r
-            : base(underlyingObject.ToString(), UnknownOrigin)\r
-        {\r
-            this._underlyingObject = underlyingObject;\r
-        }\r
-\r
-        public object UnderlyingObject\r
-        {\r
-            get { return _underlyingObject; }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementDebuggerProxy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementDebuggerProxy.cs
deleted file mode 100644 (file)
index 9a12a7d..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    // Because the debugger displays only the members available on ICompositionElement \r
-    // when viewing CompositionError.Element in the watch and data tips windows, we \r
-    // need this proxy so that the underlying object wrapped by the CompositionElement \r
-    // placeholder is displayed by default.\r
-    internal class CompositionElementDebuggerProxy\r
-    {\r
-        private readonly CompositionElement _element;\r
-\r
-        public CompositionElementDebuggerProxy(CompositionElement element) \r
-        {\r
-            Requires.NotNull(element, "element");\r
-\r
-            this._element = element;\r
-        }\r
-\r
-        public string DisplayName\r
-        {\r
-            get { return this._element.DisplayName; }\r
-        }\r
-\r
-        public ICompositionElement Origin\r
-        {\r
-            get { return this._element.Origin; }\r
-        }\r
-\r
-        public object UnderlyingObject\r
-        {\r
-            get { return this._element.UnderlyingObject; }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementExtensions.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/CompositionElementExtensions.cs
deleted file mode 100644 (file)
index 62fe967..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    internal static class CompositionElementExtensions\r
-    {\r
-#if !SILVERLIGHT\r
-        public static ICompositionElement ToSerializableElement(this ICompositionElement element)\r
-        {\r
-            return SerializableCompositionElement.FromICompositionElement(element);\r
-        }\r
-#endif\r
-        public static ICompositionElement ToElement(this Export export)\r
-        {\r
-            // First try the export\r
-            ICompositionElement element = export as ICompositionElement;\r
-            if (element != null)\r
-            {\r
-                return element;\r
-            }\r
-\r
-            // Otherwise, try the definition\r
-            return ToElement(export.Definition);\r
-        }\r
-\r
-        public static ICompositionElement ToElement(this ExportDefinition definition)\r
-        {\r
-            return ToElementCore(definition);\r
-        }\r
-\r
-        public static ICompositionElement ToElement(this ImportDefinition definition)\r
-        {\r
-            return ToElementCore(definition);\r
-        }\r
-\r
-        public static ICompositionElement ToElement(this ComposablePart part)\r
-        {\r
-            return ToElementCore(part);\r
-        }\r
-\r
-        public static ICompositionElement ToElement(this ComposablePartDefinition definition)\r
-        {\r
-            return ToElementCore(definition);\r
-        }\r
-\r
-        public static string GetDisplayName(this ComposablePartDefinition definition)\r
-        {\r
-            return GetDisplayNameCore(definition);\r
-        }\r
-\r
-        public static string GetDisplayName(this ComposablePartCatalog catalog)\r
-        {\r
-            return GetDisplayNameCore(catalog);\r
-        }\r
-\r
-        private static string GetDisplayNameCore(object value)\r
-        {\r
-            ICompositionElement element = value as ICompositionElement;\r
-            if (element != null)\r
-            {\r
-                return element.DisplayName;\r
-            }\r
-\r
-            return value.ToString();\r
-        }\r
-\r
-        private static ICompositionElement ToElementCore(object value)\r
-        {\r
-            ICompositionElement element = value as ICompositionElement;\r
-            if (element != null)\r
-            {\r
-                return element;\r
-            }\r
-\r
-            return new CompositionElement(value);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ContractBasedImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ContractBasedImportDefinition.cs
deleted file mode 100644 (file)
index 010fad1..0000000
+++ /dev/null
@@ -1,309 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Linq;\r
-using System.Linq.Expressions;\r
-using Microsoft.Internal;\r
-using System.Globalization;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Represents a contract name and metadata-based import \r
-    ///     required by a <see cref="ComposablePart"/> object.\r
-    /// </summary>\r
-    public class ContractBasedImportDefinition : ImportDefinition\r
-    {\r
-        // Unlike contract name, required metadata has a sensible default; set it to an empty \r
-        // enumerable, so that derived definitions only need to override ContractName by default.\r
-        private readonly IEnumerable<KeyValuePair<string, Type>> _requiredMetadata = Enumerable.Empty<KeyValuePair<string, Type>>();\r
-        private Expression<Func<ExportDefinition, bool>> _constraint;\r
-        private readonly CreationPolicy _requiredCreationPolicy = CreationPolicy.Any;\r
-        private readonly string _requiredTypeIdentity = null;\r
-        private bool _isRequiredMetadataValidated = false;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ContractBasedImportDefinition"/> class.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Derived types calling this constructor can optionally override the \r
-        ///         <see cref="ImportDefinition.ContractName"/>, <see cref="RequiredTypeIdentity"/>,\r
-        ///         <see cref="RequiredMetadata"/>, <see cref="ImportDefinition.Cardinality"/>, \r
-        ///         <see cref="ImportDefinition.IsPrerequisite"/>, <see cref="ImportDefinition.IsRecomposable"/> \r
-        ///         and <see cref="RequiredCreationPolicy"/> properties.\r
-        ///     </note>\r
-        /// </remarks>\r
-        protected ContractBasedImportDefinition()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ContractBasedImportDefinition"/> class \r
-        ///     with the specified contract name, required metadataq, cardinality, value indicating \r
-        ///     if the import definition is recomposable and a value indicating if the import definition \r
-        ///     is a prerequisite.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="Export"/> required by the <see cref="ContractBasedImportDefinition"/>.\r
-        /// </param>\r
-        /// <param name="requiredTypeIdentity">\r
-        ///     The type identity of the export type expected. Use <see cref="AttributedModelServices.GetTypeIdentity(Type)"/>\r
-        ///     to generate a type identity for a given type. If no specific type is required pass <see langword="null"/>.\r
-        /// </param>\r
-        /// <param name="requiredMetadata">\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="String"/> objects containing\r
-        ///     the metadata names of the <see cref="Export"/> required by the \r
-        ///     <see cref="ContractBasedImportDefinition"/>; or <see langword="null"/> to\r
-        ///     set the <see cref="RequiredMetadata"/> property to an empty <see cref="IEnumerable{T}"/>.\r
-        /// </param>\r
-        /// <param name="cardinality">\r
-        ///     One of the <see cref="ImportCardinality"/> values indicating the \r
-        ///     cardinality of the <see cref="Export"/> objects required by the\r
-        ///     <see cref="ContractBasedImportDefinition"/>.\r
-        /// </param>\r
-        /// <param name="isRecomposable">\r
-        ///     <see langword="true"/> if the <see cref="ContractBasedImportDefinition"/> can be satisfied \r
-        ///     multiple times throughout the lifetime of a <see cref="ComposablePart"/>, otherwise, \r
-        ///     <see langword="false"/>.\r
-        /// </param>\r
-        /// <param name="isPrerequisite">\r
-        ///     <see langword="true"/> if the <see cref="ContractBasedImportDefinition"/> is required to be \r
-        ///     satisfied before a <see cref="ComposablePart"/> can start producing exported \r
-        ///     objects; otherwise, <see langword="false"/>.\r
-        /// </param>\r
-        /// <param name="requiredCreationPolicy">\r
-        ///     A value indicating that the importer requires a specific <see cref="CreationPolicy"/> for \r
-        ///     the exports used to satisfy this import. If no specific <see cref="CreationPolicy"/> is needed\r
-        ///     pass the default <see cref="CreationPolicy.Any"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="contractName"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="contractName"/> is an empty string ("").\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="requiredMetadata"/> contains an element that is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="cardinality"/> is not one of the <see cref="ImportCardinality"/> \r
-        ///     values.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public ContractBasedImportDefinition(string contractName, string requiredTypeIdentity, IEnumerable<KeyValuePair<string, Type>> requiredMetadata, \r
-            ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite, CreationPolicy requiredCreationPolicy)\r
-            : base(contractName, cardinality, isRecomposable, isPrerequisite)\r
-        {\r
-            Requires.NotNullOrEmpty(contractName, "contractName");\r
-\r
-            this._requiredTypeIdentity = requiredTypeIdentity;\r
-\r
-            if (requiredMetadata != null)\r
-            {\r
-                this._requiredMetadata = requiredMetadata;\r
-            }\r
-\r
-            this._requiredCreationPolicy = requiredCreationPolicy;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     The type identity of the export type expected.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="string"/> that is generated by <see cref="AttributedModelServices.GetTypeIdentity(Type)"/>\r
-        ///     on the type that this import expects. If the value is <see langword="null"/> then this import\r
-        ///     doesn't expect a particular type.\r
-        /// </value>\r
-        public virtual string RequiredTypeIdentity\r
-        {\r
-            get { return this._requiredTypeIdentity; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the metadata names of the export required by the import definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IEnumerable{T}"/> of pairs of metadata keys and types of the <see cref="Export"/> required by the \r
-        ///     <see cref="ContractBasedImportDefinition"/>. The default is an empty \r
-        ///     <see cref="IEnumerable{T}"/>.\r
-        /// </value>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/>\r
-        ///         or return an <see cref="IEnumerable{T}"/> that contains an element that is\r
-        ///         <see langword="null"/>. If the definition does not contain required metadata, \r
-        ///         return an empty <see cref="IEnumerable{T}"/> instead.\r
-        ///     </note>\r
-        /// </remarks>\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public virtual IEnumerable<KeyValuePair<string, Type>> RequiredMetadata\r
-        {\r
-            get\r
-            {\r
-                // NOTE : unlike other arguments, we validate this one as late as possible, because its validation may lead to type loading\r
-                this.ValidateRequiredMetadata();\r
-\r
-                return this._requiredMetadata;\r
-            }\r
-        }\r
-\r
-        private void ValidateRequiredMetadata()\r
-        {\r
-            if (!this._isRequiredMetadataValidated)\r
-            {\r
-                foreach (KeyValuePair<string, Type> metadataItem in this._requiredMetadata)\r
-                {\r
-                    if ((metadataItem.Key == null) || (metadataItem.Value == null))\r
-                    {\r
-                        throw new InvalidOperationException(\r
-                            string.Format(CultureInfo.CurrentCulture, Strings.Argument_NullElement, "requiredMetadata"));\r
-                    }\r
-                }\r
-                this._isRequiredMetadataValidated = true;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets a value indicating that the importer requires a specific \r
-        ///     <see cref="CreationPolicy"/> for the exports used to satisfy this import. T\r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see cref="CreationPolicy.Any"/> - default value, used if the importer doesn't \r
-        ///         require a specific <see cref="CreationPolicy"/>.\r
-        /// \r
-        ///     <see cref="CreationPolicy.Shared"/> - Requires that all exports used should be shared\r
-        ///         by everyone in the container.\r
-        /// \r
-        ///     <see cref="CreationPolicy.NonShared"/> - Requires that all exports used should be \r
-        ///         non-shared in a container and thus everyone gets their own instance.\r
-        /// </value>\r
-        public virtual CreationPolicy RequiredCreationPolicy\r
-        {\r
-            get { return this._requiredCreationPolicy; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets an expression that defines conditions that must be matched for the import \r
-        ///     described by the import definition to be satisfied.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="Expression{TDelegate}"/> containing a <see cref="Func{T, TResult}"/> \r
-        ///     that defines the conditions that must be matched for the \r
-        ///     <see cref="ImportDefinition"/> to be satisfied by an <see cref="Export"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         This property returns an expression that defines conditions based on the \r
-        ///         <see cref="ImportDefinition.ContractName"/>, <see cref="RequiredTypeIdentity"/>, \r
-        ///         <see cref="RequiredMetadata"/>, and <see cref="RequiredCreationPolicy"/>\r
-        ///         properties. \r
-        ///     </para>\r
-        /// </remarks>\r
-        public override Expression<Func<ExportDefinition, bool>> Constraint\r
-        {   \r
-            get\r
-            {\r
-                if (this._constraint == null)\r
-                {\r
-                    this._constraint = ConstraintServices.CreateConstraint(this.ContractName, this.RequiredTypeIdentity, this.RequiredMetadata, this.RequiredCreationPolicy);\r
-                }\r
-\r
-                return this._constraint;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Executes an optimized version of the contraint given by the <see cref="Constraint"/> property\r
-        /// </summary>\r
-        /// <param name="exportDefinition">\r
-        ///     A definition for a <see cref="Export"/> used to determine if it satisfies the\r
-        ///     requirements for this <see cref="ImportDefinition"/>.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     <see langword="True"/> if the <see cref="Export"/> satisfies the requirements for\r
-        ///     this <see cref="ImportDefinition"/>, otherwise returns <see langword="False"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overrides of this method can provide a more optimized execution of the \r
-        ///         <see cref="Constraint"/> property but the result should remain consistent.\r
-        ///     </note>\r
-        /// </remarks>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="exportDefinition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public override bool IsConstraintSatisfiedBy(ExportDefinition exportDefinition)\r
-        {\r
-            Requires.NotNull(exportDefinition, "exportDefinition");\r
-\r
-            if (!StringComparers.ContractName.Equals(this.ContractName, exportDefinition.ContractName))\r
-            {\r
-                return false;\r
-            }\r
-\r
-            return MatchRequiredMatadata(exportDefinition);\r
-        }\r
-\r
-        private bool MatchRequiredMatadata(ExportDefinition definition)\r
-        {\r
-            if (!string.IsNullOrEmpty(this.RequiredTypeIdentity))\r
-            {\r
-                string exportTypeIdentity = definition.Metadata.GetValue<string>(CompositionConstants.ExportTypeIdentityMetadataName);\r
-\r
-                if (!StringComparers.ContractName.Equals(this.RequiredTypeIdentity, exportTypeIdentity))\r
-                {\r
-                    return false;\r
-                }\r
-            }\r
-\r
-            foreach (KeyValuePair<string, Type> metadataItem in this.RequiredMetadata)\r
-            {\r
-                string metadataKey = metadataItem.Key;\r
-                Type metadataValueType = metadataItem.Value;\r
-\r
-                object metadataValue = null;\r
-                if (!definition.Metadata.TryGetValue(metadataKey, out metadataValue))\r
-                {\r
-                    return false;\r
-                }\r
-\r
-                if (metadataValue != null)\r
-                {\r
-                    // the metadata value is not null, we can rely on IsInstanceOfType to do the right thing\r
-                    if (!metadataValueType.IsInstanceOfType(metadataValue))\r
-                    {\r
-                        return false;\r
-                    }\r
-                }\r
-                else\r
-                {\r
-                    // this is an unfortunate special case - typeof(object).IsInstanceofType(null) == false\r
-                    // basically nulls are not considered valid values for anything\r
-                    // We want them to match anything that is a reference type\r
-                    if (metadataValueType.IsValueType)\r
-                    {\r
-                        // this is a pretty expensive check, but we only invoke it when metadata values are null, which is very rare\r
-                        return false;\r
-                    }\r
-                }\r
-            }\r
-\r
-            if (this.RequiredCreationPolicy == CreationPolicy.Any)\r
-            {\r
-                return true;\r
-            }\r
-\r
-            CreationPolicy exportPolicy = definition.Metadata.GetValue<CreationPolicy>(CompositionConstants.PartCreationPolicyMetadataName);\r
-            return exportPolicy == CreationPolicy.Any ||\r
-                   exportPolicy == this.RequiredCreationPolicy;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/Export.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/Export.cs
deleted file mode 100644 (file)
index 8beaa09..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Diagnostics.CodeAnalysis;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Represents an export. That is, a type that is made up of a delay-created exported value \r
-    ///     and metadata that describes that object.\r
-    /// </summary>\r
-    public class Export\r
-    {\r
-        private readonly ExportDefinition _definition;\r
-        private readonly Func<object> _exportedValueGetter;\r
-        private static readonly object _EmptyValue = new object();\r
-        private volatile object _exportedValue = Export._EmptyValue;\r
-        \r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="Export"/> class.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Derived types calling this constructor must override <see cref="Definition"/>\r
-        ///         and <see cref="GetExportedValueCore"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        protected Export()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="Export"/> class \r
-        ///     with the specified contract name and exported value getter.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="Export"/>.\r
-        /// </param>\r
-        /// <param name="exportedValueGetter">\r
-        ///     A <see cref="Func{T}"/> that is called to create the exported value of the \r
-        ///     <see cref="Export"/>. This allows the creation of the object to be delayed\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="contractName"/> is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="exportedValueGetter"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="contractName"/> is an empty string ("").\r
-        /// </exception>\r
-        public Export(string contractName, Func<object> exportedValueGetter)\r
-            : this(new ExportDefinition(contractName, (IDictionary<string, object>)null), exportedValueGetter)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="Export"/> class \r
-        ///     with the specified contract name, metadata and exported value getter.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="Export"/>.\r
-        /// </param>\r
-        /// <param name="metadata">\r
-        ///     An <see cref="IDictionary{TKey, TValue}"/> containing the metadata of the \r
-        ///     <see cref="Export"/>; or <see langword="null"/> to set the \r
-        ///     <see cref="Metadata"/> property to an empty, read-only \r
-        ///     <see cref="IDictionary{TKey, TValue}"/>.\r
-        /// </param>\r
-        /// <param name="exportedValueGetter">\r
-        ///     A <see cref="Func{T}"/> that is called to create the exported value of the \r
-        ///     <see cref="Export"/>. This allows the creation of the object to be delayed.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="contractName"/> is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="exportedValueGetter"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="contractName"/> is an empty string ("").\r
-        /// </exception>\r
-        public Export(string contractName, IDictionary<string, object> metadata, Func<object> exportedValueGetter) \r
-            : this(new ExportDefinition(contractName, metadata), exportedValueGetter)\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="Export"/> class \r
-        ///     with the specified export definition and exported value getter.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     An <see cref="ExportDefinition"/> that describes the contract that the \r
-        ///     <see cref="Export"/> satisfies.\r
-        /// </param>\r
-        /// <param name="exportedValueGetter">\r
-        ///     A <see cref="Func{T}"/> that is called to create the exported value of the \r
-        ///     <see cref="Export"/>. This allows the creation of the object to be delayed. \r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        ///     <para>\r
-        ///         -or-\r
-        ///     </para>\r
-        ///     <paramref name="exportedValueGetter"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public Export(ExportDefinition definition, Func<object> exportedValueGetter)\r
-        {\r
-            Requires.NotNull(definition, "definition");\r
-            Requires.NotNull(exportedValueGetter, "exportedValueGetter");\r
-\r
-            this._definition = definition;\r
-            this._exportedValueGetter = exportedValueGetter;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the definition that describes the contract that the export satisfies.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="ExportDefinition"/> that describes the contract that \r
-        ///     the <see cref="Export"/> satisfies.\r
-        /// </value>\r
-        /// <exception cref="NotImplementedException">\r
-        ///     This property was not overridden by a derived class.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return\r
-        ///         <see langword="null"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        public virtual ExportDefinition Definition\r
-        {\r
-            get \r
-            {\r
-                if (_definition != null)\r
-                {\r
-                    return _definition;\r
-                }\r
-\r
-                throw ExceptionBuilder.CreateNotOverriddenByDerived("Definition");\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the metadata of the export.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IDictionary{TKey, TValue}"/> containing the metadata of the \r
-        ///     <see cref="Export"/>.\r
-        /// </value>\r
-        /// <exception cref="NotImplementedException">\r
-        ///     The <see cref="Definition"/> property was not overridden by a derived class.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         This property returns the value of <see cref="ExportDefinition.Metadata"/>\r
-        ///         of the <see cref="Definition"/> property.\r
-        ///     </para>\r
-        /// </remarks>\r
-        public IDictionary<string, object> Metadata\r
-        {\r
-            get { return Definition.Metadata; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported value of the export.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     The exported <see cref="Object"/> of the <see cref="Export"/>.\r
-        /// </returns>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     The current instance is an instance of <see cref="Lazy{T}"/> and the underlying \r
-        ///     exported value cannot be cast to <c>T</c>.\r
-        /// </exception>\r
-        /// <exception cref="NotImplementedException">\r
-        ///     The <see cref="GetExportedValueCore"/> method was not overridden by a derived class.\r
-        /// </exception>\r
-        public object Value\r
-        {\r
-            get\r
-            {\r
-                // NOTE : the logic below guarantees that the value will be set exactly once. It DOES NOT, however, guarantee that GetExportedValueCore() will be executed\r
-                // more than once, as locking would be required for that. The said locking is problematic, as we can't reliable call 3rd party code under a lock.\r
-                if (this._exportedValue == Export._EmptyValue)\r
-                {\r
-                    object exportedValue = this.GetExportedValueCore();\r
-\r
-                    // NOTE : According to http://msdn.microsoft.com/en-us/library/4bw5ewxy.aspx, the warning is bogus when used with Interlocked API.\r
-#pragma warning disable 420\r
-                    Interlocked.CompareExchange(ref this._exportedValue, exportedValue, Export._EmptyValue);\r
-#pragma warning restore 420\r
-                }\r
-\r
-                return this._exportedValue;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the exported value of the export.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     The exported <see cref="Object"/> of the <see cref="Export"/>.\r
-        /// </returns>\r
-        /// <exception cref="CompositionException">\r
-        ///     An error occurred during composition. <see cref="CompositionException.Errors"/> will \r
-        ///     contain a collection of errors that occurred.\r
-        /// </exception>\r
-        /// <exception cref="CompositionContractMismatchException">\r
-        ///     The current instance is an instance of <see cref="Lazy{T}"/> and the underlying \r
-        ///     exported value cannot be cast to <c>T</c>.\r
-        /// </exception>\r
-        /// <exception cref="NotImplementedException">\r
-        ///     The method was not overridden by a derived class.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this method should never return\r
-        ///         <see langword="null"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]\r
-        protected virtual object GetExportedValueCore()\r
-        {\r
-            if (this._exportedValueGetter != null)\r
-            {\r
-                return this._exportedValueGetter.Invoke();\r
-            }\r
-\r
-            throw ExceptionBuilder.CreateNotOverriddenByDerived("GetExportedValueCore");\r
-        }\r
-    }   \r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportDefinition.cs
deleted file mode 100644 (file)
index f4bf829..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Describes the contract that an <see cref="Export"/> object satisfies.\r
-    /// </summary>\r
-    public class ExportDefinition\r
-    {\r
-        // Unlike contract name, metadata has a sensible default; set it to an empty bag, \r
-        // so that derived definitions only need to override ContractName by default.\r
-        private readonly IDictionary<string, object> _metadata = MetadataServices.EmptyMetadata;\r
-        private readonly string _contractName;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportDefinition"/> class.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Derived types calling this constructor must override <see cref="ContractName"/>\r
-        ///         and optionally, <see cref="Metadata"/>. By default, <see cref="Metadata"/>\r
-        ///         returns an empty, read-only dictionary.\r
-        ///     </note>\r
-        /// </remarks>\r
-        protected ExportDefinition()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ExportDefinition"/> class with \r
-        ///     the specified contract name and metadata.\r
-        /// </summary>\r
-        /// <param name="contractName">\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="ExportDefinition"/>.\r
-        /// </param>\r
-        /// <param name="metadata">\r
-        ///     An <see cref="IDictionary{TKey, TValue}"/> containing the metadata of the \r
-        ///     <see cref="ExportDefinition"/>; or <see langword="null"/> to set the \r
-        ///     <see cref="Metadata"/> property to an empty, read-only \r
-        ///     <see cref="IDictionary{TKey, TValue}"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="contractName"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="contractName"/> is an empty string ("").\r
-        /// </exception>\r
-        public ExportDefinition(string contractName, IDictionary<string, object> metadata)\r
-        {\r
-            Requires.NotNullOrEmpty(contractName, "contractName");\r
-\r
-            _contractName = contractName;\r
-\r
-            if (metadata != null)\r
-            {\r
-                _metadata = metadata.AsReadOnly();\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the contract name of the export definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing the contract name of the \r
-        ///     <see cref="ExportDefinition"/>.\r
-        /// </value>\r
-        /// <exception cref="NotImplementedException">\r
-        ///     The property was not overridden by a derived class.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/> \r
-        ///         or an empty string ("").\r
-        ///     </note>\r
-        /// </remarks>\r
-        public virtual string ContractName\r
-        {\r
-            get \r
-            {\r
-                if (_contractName != null)\r
-                {\r
-                    return _contractName;\r
-                }\r
-\r
-                throw ExceptionBuilder.CreateNotOverriddenByDerived("ContractName");\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the metadata of the export definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     An <see cref="IDictionary{TKey, TValue}"/> containing the metadata of the \r
-        ///     <see cref="ExportDefinition"/>. The default is an empty, read-only\r
-        ///     <see cref="IDictionary{TKey, TValue}"/>.\r
-        /// </value>\r
-        /// <remarks>\r
-        ///     <para>\r
-        ///         <note type="inheritinfo">\r
-        ///             Overriders of this property should return a read-only\r
-        ///             <see cref="IDictionary{TKey, TValue}"/> object with a case-sensitive, \r
-        ///             non-linguistic comparer, such as <see cref="StringComparer.Ordinal"/>, \r
-        ///             and should never return <see langword="null"/>.\r
-        ///             If the <see cref="ExportDefinition"/> does not contain metadata \r
-        ///             return an empty <see cref="IDictionary{TKey, TValue}"/> instead.\r
-        ///         </note>\r
-        ///     </para>\r
-        /// </remarks>\r
-        public virtual IDictionary<string, object> Metadata\r
-        {\r
-            get { return _metadata; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a string representation of the export definition.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="String"/> containing the value of the <see cref="ContractName"/> property.\r
-        /// </returns>\r
-        public override string ToString()\r
-        {\r
-            return this.ContractName;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportedDelegate.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ExportedDelegate.cs
deleted file mode 100644 (file)
index d6bc629..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    [SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix")]\r
-    public class ExportedDelegate\r
-    {\r
-        private object _instance;\r
-        private MethodInfo _method;\r
-\r
-        protected ExportedDelegate() { }\r
-#if !SILVERLIGHT\r
-        [System.Security.SecurityCritical]\r
-#endif\r
-        public ExportedDelegate(object instance, MethodInfo method)\r
-        {\r
-            Requires.NotNull(method, "method");\r
-\r
-            this._instance = instance;\r
-            this._method = method;\r
-        }\r
-\r
-        public virtual Delegate CreateDelegate(Type delegateType) \r
-        {\r
-            Requires.NotNull(delegateType, "delegateType");\r
-\r
-            if (delegateType == typeof(Delegate) || delegateType == typeof(MulticastDelegate))\r
-            {\r
-                Type funcOrAction = ConvertMethodInfoToFuncOrActionType(this._method);\r
-\r
-                if (funcOrAction != null)\r
-                {\r
-                    delegateType = funcOrAction;\r
-                }\r
-                else\r
-                {\r
-                    return null;\r
-                }\r
-            }\r
-\r
-            return Delegate.CreateDelegate(delegateType, this._instance, this._method, false);\r
-        }\r
-\r
-        private static Type[] _funcTypes = \r
-        { \r
-            typeof(Func<>), typeof(Func<,>), typeof(Func<,,>), typeof(Func<,,,>), typeof(Func<,,,,>) \r
-#if CLR40 && !SILVERLIGHT\r
-            , typeof(Func<,,,,,>), typeof(Func<,,,,,,>), typeof(Func<,,,,,,,>), typeof(Func<,,,,,,,,>)\r
-#endif \r
-        };\r
-\r
-        private static Type[] _actionTypes = \r
-        { \r
-            typeof(Action), typeof(Action<>), typeof(Action<,>), typeof(Action<,,>), typeof(Action<,,,>) \r
-#if CLR40 && !SILVERLIGHT\r
-            , typeof(Action<,,,,>), typeof(Action<,,,,,>), typeof(Action<,,,,,,>), typeof(Action<,,,,,,,>)\r
-#endif\r
-        };\r
-\r
-        private static Type ConvertMethodInfoToFuncOrActionType(MethodInfo method)\r
-        {\r
-            ParameterInfo[] parameters = method.GetParameters();\r
-\r
-            bool isVoid = method.ReturnType == typeof(void);\r
-            Type[] typeArray = isVoid ? _actionTypes : _funcTypes;\r
-\r
-            if (parameters.Length >= typeArray.Length)\r
-            {\r
-                return null;\r
-            }\r
-\r
-            Type[] genericArgTypes = new Type[parameters.Length + (isVoid ? 0 : 1)];\r
-\r
-            for (int i = 0; i < parameters.Length; i++)\r
-            {\r
-                genericArgTypes[i] = parameters[i].ParameterType;\r
-            }\r
-\r
-            if (!isVoid)\r
-            {\r
-                genericArgTypes[parameters.Length] = method.ReturnType;\r
-            }\r
-\r
-            Type delegateType = typeArray[parameters.Length].IsGenericType ?\r
-                typeArray[parameters.Length].MakeGenericType(genericArgTypes) :\r
-                typeArray[parameters.Length];\r
-\r
-            return delegateType;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ICompositionElement.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ICompositionElement.cs
deleted file mode 100644 (file)
index 6c4863e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Represents an element that participates in composition.\r
-    /// </summary>\r
-    public interface ICompositionElement\r
-    {\r
-        /// <summary>\r
-        ///     Gets the display name of the composition element.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing a human-readable display name of the <see cref="ICompositionElement"/>.\r
-        /// </value>\r
-        /// <remarks>\r
-        ///     <note type="implementnotes">\r
-        ///         Implementors of this property should never return <see langword="null"/> or an empty \r
-        ///         string ("").\r
-        ///     </note>\r
-        /// </remarks>\r
-        string DisplayName\r
-        {\r
-            get;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the composition element from which the current composition element\r
-        ///     originated.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="ICompositionElement"/> from which the current \r
-        ///     <see cref="ICompositionElement"/> originated, or <see langword="null"/> \r
-        ///     if the <see cref="ICompositionElement"/> is the root composition element.\r
-        /// </value>\r
-        ICompositionElement Origin\r
-        {\r
-            get;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/IPartCreatorImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/IPartCreatorImportDefinition.cs
deleted file mode 100644 (file)
index 307481c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    internal interface IPartCreatorImportDefinition\r
-    {\r
-        ContractBasedImportDefinition ProductImportDefinition { get; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportCardinality.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportCardinality.cs
deleted file mode 100644 (file)
index d59dc9b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Indicates the cardinality of the <see cref="Export"/> objects required by an <see cref="ImportDefinition"/>.\r
-    /// </summary>\r
-    public enum ImportCardinality\r
-    {\r
-        /// <summary>\r
-        ///     Zero or one <see cref="Export"/> objects are required by an <see cref="ImportDefinition"/>.\r
-        /// </summary>\r
-        ZeroOrOne = 0,\r
-\r
-        /// <summary>\r
-        ///     Exactly one <see cref="Export"/> object is required by an <see cref="ImportDefinition"/>.\r
-        /// </summary>\r
-        ExactlyOne = 1,\r
-\r
-        /// <summary>\r
-        ///     Zero or more <see cref="Export"/> objects are required by an <see cref="ImportDefinition"/>.\r
-        /// </summary>\r
-        ZeroOrMore = 2,\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/ImportDefinition.cs
deleted file mode 100644 (file)
index 9c81b51..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq.Expressions;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    /// <summary>\r
-    ///     Represents an import required by a <see cref="ComposablePart"/> object.\r
-    /// </summary>\r
-    public class ImportDefinition\r
-    {\r
-        internal static readonly string EmptyContractName = string.Empty;\r
-        private readonly Expression<Func<ExportDefinition, bool>> _constraint;\r
-        private readonly ImportCardinality _cardinality = ImportCardinality.ExactlyOne;\r
-        private readonly string _contractName = EmptyContractName;\r
-        private readonly bool _isRecomposable;\r
-        private readonly bool _isPrerequisite = true;\r
-        private Func<ExportDefinition, bool> _compiledConstraint;\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportDefinition"/> class.\r
-        /// </summary>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Derived types calling this constructor must override the <see cref="Constraint"/> \r
-        ///         property, and optionally, the <see cref="Cardinality"/>, <see cref="IsPrerequisite"/> \r
-        ///         and <see cref="IsRecomposable"/> \r
-        ///         properties.\r
-        ///     </note>\r
-        /// </remarks>\r
-        protected ImportDefinition()\r
-        {\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Initializes a new instance of the <see cref="ImportDefinition"/> class \r
-        ///     with the specified constraint, cardinality, value indicating if the import \r
-        ///     definition is recomposable and a value indicating if the import definition \r
-        ///     is a prerequisite.\r
-        /// </summary>\r
-        /// <param name="constraint">\r
-        ///     A <see cref="Expression{TDelegate}"/> containing a <see cref="Func{T, TResult}"/> \r
-        ///     that defines the conditions that must be matched for the <see cref="ImportDefinition"/> \r
-        ///     to be satisfied by an <see cref="Export"/>.\r
-        /// </param>\r
-        /// <param name="contractName">\r
-        ///     The contract name of the export that this import is interested in. The contract name\r
-        ///     property is used as guidance and not automatically enforced in the constraint. If \r
-        ///     the contract name is a required in the constraint then it should be added to the constraint\r
-        ///     by the caller of this constructor.\r
-        /// </param>\r
-        /// <param name="cardinality">\r
-        ///     One of the <see cref="ImportCardinality"/> values indicating the \r
-        ///     cardinality of the <see cref="Export"/> objects required by the\r
-        ///     <see cref="ImportDefinition"/>.\r
-        /// </param>\r
-        /// <param name="isRecomposable">\r
-        ///     <see langword="true"/> if the <see cref="ImportDefinition"/> can be satisfied \r
-        ///     multiple times throughout the lifetime of a <see cref="ComposablePart"/>, otherwise, \r
-        ///     <see langword="false"/>.\r
-        /// </param>\r
-        /// <param name="isPrerequisite">\r
-        ///     <see langword="true"/> if the <see cref="ImportDefinition"/> is required to be \r
-        ///     satisfied before a <see cref="ComposablePart"/> can start producing exported \r
-        ///     objects; otherwise, <see langword="false"/>.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="constraint"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="cardinality"/> is not one of the <see cref="ImportCardinality"/> \r
-        ///     values.\r
-        /// </exception>\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public ImportDefinition(Expression<Func<ExportDefinition, bool>> constraint, string contractName, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-            : this(contractName, cardinality, isRecomposable, isPrerequisite)\r
-        {\r
-            Requires.NotNull(constraint, "constraint");\r
-\r
-            this._constraint = constraint;\r
-        }\r
-\r
-        internal ImportDefinition(string contractName, ImportCardinality cardinality, bool isRecomposable, bool isPrerequisite)\r
-        {\r
-            if (\r
-                (cardinality != ImportCardinality.ExactlyOne) &&\r
-                (cardinality != ImportCardinality.ZeroOrMore) &&\r
-                (cardinality != ImportCardinality.ZeroOrOne)\r
-                )\r
-            {\r
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.ArgumentOutOfRange_InvalidEnum, "cardinality", cardinality, typeof(ImportCardinality).Name), "cardinality");\r
-            }\r
-\r
-            this._contractName = contractName ?? EmptyContractName;\r
-            this._cardinality = cardinality;\r
-            this._isRecomposable = isRecomposable;\r
-            this._isPrerequisite = isPrerequisite;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the contract name of the export required by the import definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="String"/> containing the contract name of the <see cref="Export"/> \r
-        ///     required by the <see cref="ContractBasedImportDefinition"/>. This property should\r
-        ///     return <see cref="String.Empty"/> for imports that do not require a specific \r
-        ///     contract name.\r
-        /// </value>\r
-        public virtual string ContractName\r
-        {\r
-            get { return this._contractName; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the cardinality of the exports required by the import definition.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     One of the <see cref="ImportCardinality"/> values indicating the \r
-        ///     cardinality of the <see cref="Export"/> objects required by the\r
-        ///     <see cref="ImportDefinition"/>. The default is \r
-        ///     <see cref="ImportCardinality.ExactlyOne"/>\r
-        /// </value>\r
-        public virtual ImportCardinality Cardinality\r
-        {\r
-            get { return this._cardinality; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets an expression that defines conditions that must be matched for the import \r
-        ///     described by the import definition to be satisfied.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="Expression{TDelegate}"/> containing a <see cref="Func{T, TResult}"/> \r
-        ///     that defines the conditions that must be matched for the \r
-        ///     <see cref="ImportDefinition"/> to be satisfied by an <see cref="Export"/>.\r
-        /// </returns>\r
-        /// <exception cref="NotImplementedException">\r
-        ///     The property was not overridden by a derived class.\r
-        /// </exception>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overriders of this property should never return <see langword="null"/>.\r
-        ///     </note>\r
-        /// </remarks>\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public virtual Expression<Func<ExportDefinition, bool>> Constraint\r
-        {\r
-            get\r
-            {\r
-                if (this._constraint != null)\r
-                {\r
-                    return this._constraint;\r
-                }\r
-\r
-                throw ExceptionBuilder.CreateNotOverriddenByDerived("Constraint");\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets a value indicating whether the import definition is required to be \r
-        ///     satisfied before a part can start producing exported values.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see langword="true"/> if the <see cref="ImportDefinition"/> is required to be \r
-        ///     satisfied before a <see cref="ComposablePart"/> can start producing exported \r
-        ///     objects; otherwise, <see langword="false"/>. The default is <see langword="true"/>.\r
-        /// </value>\r
-        public virtual bool IsPrerequisite\r
-        {\r
-            get { return this._isPrerequisite; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets a value indicating whether the import definition can be satisfied multiple times.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     <see langword="true"/> if the <see cref="ImportDefinition"/> can be satisfied \r
-        ///     multiple times throughout the lifetime of a <see cref="ComposablePart"/>, otherwise, \r
-        ///     <see langword="false"/>. The default is <see langword="false"/>.\r
-        /// </value>\r
-        public virtual bool IsRecomposable\r
-        {\r
-            get { return this._isRecomposable; }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Executes of the constraint provided by the <see cref="Constraint"/> property\r
-        ///     against a given <see cref="ExportDefinition"/> to determine if this \r
-        ///     <see cref="ImportDefinition"/> can be satisfied by the given <see cref="Export"/>.\r
-        /// </summary>\r
-        /// <param name="exportDefinition">\r
-        ///     A definition for a <see cref="Export"/> used to determine if it satisfies the\r
-        ///     requirements for this <see cref="ImportDefinition"/>.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     <see langword="True"/> if the <see cref="Export"/> satisfies the requirements for\r
-        ///     this <see cref="ImportDefinition"/>, otherwise returns <see langword="False"/>.\r
-        /// </returns>\r
-        /// <remarks>\r
-        ///     <note type="inheritinfo">\r
-        ///         Overrides of this method can provide a more optimized execution of the \r
-        ///         <see cref="Constraint"/> property but the result should remain consistent.\r
-        ///     </note>\r
-        /// </remarks>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="exportDefinition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        public virtual bool IsConstraintSatisfiedBy(ExportDefinition exportDefinition)\r
-        {\r
-            Requires.NotNull(exportDefinition, "exportDefinition");\r
-\r
-            if (this._compiledConstraint == null)\r
-            {\r
-                this._compiledConstraint = this.Constraint.Compile();\r
-            }\r
-\r
-            return this._compiledConstraint.Invoke(exportDefinition);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns a string representation of the import definition.\r
-        /// </summary>\r
-        /// <returns>\r
-        ///     A <see cref="String"/> containing the value of the <see cref="Constraint"/> property.\r
-        /// </returns>\r
-        public override string ToString()\r
-        {\r
-            return this.Constraint.Body.ToString();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/SerializableCompositionElement.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/Primitives/SerializableCompositionElement.cs
deleted file mode 100644 (file)
index f84d5a1..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.Primitives\r
-{\r
-    // As most objects that implement ICompositionElement (such as Export, ComposablePart, \r
-    // ComposablePartCatalog, etc) are not serializable, this class is used as a serializable \r
-    // placeholder for these types when ICompositionElement is used within serializable types,\r
-    // such as CompositionException, CompositionIssue, etc.\r
-    [Serializable]\r
-    internal class SerializableCompositionElement : ICompositionElement\r
-    {\r
-        private readonly string _displayName;\r
-        private readonly ICompositionElement _origin;\r
-\r
-        public SerializableCompositionElement(string displayName, ICompositionElement origin)\r
-        {\r
-#if !SILVERLIGHT\r
-            Assumes.IsTrue(origin == null || origin.GetType().IsSerializable);\r
-#endif\r
-            this._displayName = displayName ?? string.Empty;\r
-            this._origin = origin;\r
-        }\r
-\r
-        public string DisplayName\r
-        {\r
-            get { return this._displayName; }\r
-        }\r
-\r
-        public ICompositionElement Origin\r
-        {\r
-            get { return this._origin; }\r
-        }\r
-\r
-        public override string ToString()\r
-        {\r
-            return this.DisplayName;\r
-        }\r
-\r
-        public static ICompositionElement FromICompositionElement(ICompositionElement element)\r
-        {\r
-            if (element == null)\r
-            {   // Null is always serializable   \r
-\r
-                return null;\r
-            }\r
-\r
-            ICompositionElement origin = FromICompositionElement(element.Origin);\r
-\r
-            // Otherwise, we need to create a serializable wrapper\r
-            return new SerializableCompositionElement(element.DisplayName, origin);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/.gitattributes
deleted file mode 100644 (file)
index 8fcb7fb..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/DisposableReflectionComposablePart.cs -crlf
-/ExportingMember.cs -crlf
-/IReflectionPartCreationInfo.cs -crlf
-/ImportType.cs -crlf
-/ImportingItem.cs -crlf
-/ImportingMember.cs -crlf
-/ImportingParameter.cs -crlf
-/LazyMemberInfo.cs -crlf
-/PartCreatorExportDefinition.cs -crlf
-/PartCreatorMemberImportDefinition.cs -crlf
-/PartCreatorParameterImportDefinition.cs -crlf
-/ReflectionComposablePart.cs -crlf
-/ReflectionComposablePartDefinition.cs -crlf
-/ReflectionExtensions.cs -crlf
-/ReflectionField.cs -crlf
-/ReflectionImportDefinition.cs -crlf
-/ReflectionItem.cs -crlf
-/ReflectionItemType.cs -crlf
-/ReflectionMember.cs -crlf
-/ReflectionMemberExportDefinition.cs -crlf
-/ReflectionMemberImportDefinition.cs -crlf
-/ReflectionMethod.cs -crlf
-/ReflectionModelServices.cs -crlf
-/ReflectionParameter.cs -crlf
-/ReflectionParameterImportDefinition.cs -crlf
-/ReflectionProperty.cs -crlf
-/ReflectionType.cs -crlf
-/ReflectionWritableMember.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/DisposableReflectionComposablePart.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/DisposableReflectionComposablePart.cs
deleted file mode 100644 (file)
index c6b9854..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-\r
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal sealed class DisposableReflectionComposablePart : ReflectionComposablePart, IDisposable\r
-    {\r
-        private volatile int _isDisposed = 0;\r
-\r
-        public DisposableReflectionComposablePart(ReflectionComposablePartDefinition definition)\r
-            : base(definition)\r
-        {\r
-        }\r
-\r
-        protected override void ReleaseInstanceIfNecessary(object instance)\r
-        {\r
-            IDisposable disposable = instance as IDisposable;\r
-            if (disposable != null)\r
-            {\r
-                disposable.Dispose();\r
-            }\r
-        }\r
-\r
-        protected override void EnsureRunning()\r
-        {\r
-            base.EnsureRunning();\r
-            if (this._isDisposed == 1)\r
-            {\r
-                throw ExceptionBuilder.CreateObjectDisposed(this);\r
-            }\r
-        }\r
-\r
-        void IDisposable.Dispose()\r
-        {\r
-            // NOTE : According to http://msdn.microsoft.com/en-us/library/4bw5ewxy.aspx, the warning is bogus when used with Interlocked API.\r
-#pragma warning disable 420\r
-            if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-#pragma warning restore 420\r
-            {\r
-                this.ReleaseInstanceIfNecessary(this.CachedInstance);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ExportingMember.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ExportingMember.cs
deleted file mode 100644 (file)
index 5276e7a..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ExportingMember\r
-    {\r
-        private readonly ExportDefinition _definition;\r
-        private readonly ReflectionMember _member;\r
-        private object _cachedValue = null;\r
-        private volatile bool _isValueCached = false;\r
-\r
-        public ExportingMember(ExportDefinition definition, ReflectionMember member)\r
-        {\r
-            Assumes.NotNull(definition, member);\r
-\r
-            this._definition = definition;\r
-            this._member = member;\r
-        }\r
-\r
-        public bool RequiresInstance\r
-        {\r
-            get { return _member.RequiresInstance; }\r
-        }\r
-\r
-        public ExportDefinition Definition\r
-        {\r
-            get { return _definition; }\r
-        }\r
-\r
-        public object GetExportedValue(object instance, object @lock)\r
-        {\r
-            this.EnsureReadable();\r
-\r
-            if (!this._isValueCached)\r
-            {\r
-                object exportedValue;\r
-                try\r
-                {\r
-                    exportedValue = this._member.GetValue(instance);\r
-                }\r
-                catch (TargetInvocationException exception)\r
-                {   // Member threw an exception. Avoid letting this \r
-                    // leak out as a 'raw' unhandled exception, instead,\r
-                    // we'll add some context and rethrow.\r
-\r
-                    throw new ComposablePartException(\r
-                        CompositionErrorId.ReflectionModel_ExportThrewException,\r
-                        String.Format(CultureInfo.CurrentCulture,\r
-                            Strings.ReflectionModel_ExportThrewException,\r
-                            this._member.GetDisplayName()),\r
-                        Definition.ToElement(),\r
-                        exception.InnerException);\r
-                }\r
-\r
-                lock (@lock)\r
-                {\r
-                    if (!this._isValueCached)\r
-                    {\r
-                        this._cachedValue = exportedValue;\r
-                        Thread.MemoryBarrier();\r
-\r
-                        this._isValueCached = true;\r
-                    }\r
-                }\r
-            }\r
-\r
-            return this._cachedValue;\r
-        }\r
-\r
-        private void EnsureReadable()\r
-        {\r
-            if (!this._member.CanRead)\r
-            {   // Property does not have a getter\r
-\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ExportNotReadable,\r
-                    String.Format(CultureInfo.CurrentCulture, \r
-                        Strings.ReflectionModel_ExportNotReadable,\r
-                        this._member.GetDisplayName()),\r
-                    Definition.ToElement());\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/IReflectionPartCreationInfo.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/IReflectionPartCreationInfo.cs
deleted file mode 100644 (file)
index ac2a31a..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Reflection;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal interface IReflectionPartCreationInfo : ICompositionElement\r
-    {\r
-        Type GetPartType();\r
-        Lazy<Type> GetLazyPartType();\r
-        ConstructorInfo GetConstructor();\r
-        IDictionary<string, object> GetMetadata();\r
-        IEnumerable<ExportDefinition> GetExports();\r
-        IEnumerable<ImportDefinition> GetImports();\r
-        bool IsDisposalRequired { get; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportType.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportType.cs
deleted file mode 100644 (file)
index 60da83d..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    // Describes the import type of a Reflection-based import definition\r
-    internal class ImportType\r
-    {\r
-        private static readonly Type LazyOfTType = typeof(Lazy<>);\r
-        private static readonly Type LazyOfTMType = typeof(Lazy<,>);\r
-        private const string ExportFactoryTypeName = "System.ComponentModel.Composition.ExportFactory";\r
-\r
-        private readonly Type _type;\r
-        private readonly bool _isAssignableCollectionType;\r
-        private readonly Type _contractType;\r
-        private Func<Export, object> _castSingleValue;\r
-\r
-        public ImportType(Type type, ImportCardinality cardinality)\r
-        {\r
-            Assumes.NotNull(type);\r
-\r
-            this._type = type;\r
-            this._contractType = type;\r
-\r
-            if (cardinality == ImportCardinality.ZeroOrMore)\r
-            {\r
-                this._isAssignableCollectionType = IsTypeAssignableCollectionType(type);\r
-                this._contractType = CheckForCollection(type);\r
-            }\r
-\r
-            this._contractType = CheckForLazyAndPartCreator(this._contractType);\r
-        }\r
-\r
-        public bool IsAssignableCollectionType\r
-        {\r
-            get { return this._isAssignableCollectionType; }\r
-        }\r
-\r
-        public Type ElementType { get; private set; }\r
-\r
-        public Type ActualType\r
-        {\r
-            get { return this._type; }\r
-        }\r
-\r
-        public bool IsPartCreator { get; private set; }\r
-\r
-        public Type ContractType { get { return this._contractType; } }\r
-\r
-        public Func<Export, object> CastExport { get { return this._castSingleValue; } }\r
-\r
-        public Type MetadataViewType { get; private set; }\r
-\r
-        private Type CheckForCollection(Type type)\r
-        {\r
-            this.ElementType = CollectionServices.GetEnumerableElementType(type);\r
-            if (this.ElementType != null)\r
-            {\r
-                return this.ElementType;\r
-            }\r
-            return type;\r
-        }\r
-\r
-        private Type CheckForLazyAndPartCreator(Type type)\r
-        {\r
-            if (type.IsGenericType)\r
-            {\r
-                Type genericType = type.GetGenericTypeDefinition();\r
-                Type[] arguments = type.GetGenericArguments();\r
-\r
-                if (genericType == LazyOfTType)\r
-                {\r
-                    this._castSingleValue = ExportServices.CreateStronglyTypedLazyFactory(arguments[0], null);\r
-                    return arguments[0];\r
-                }\r
-\r
-                if (genericType == LazyOfTMType)\r
-                {\r
-                    this.MetadataViewType = arguments[1];\r
-                    this._castSingleValue = ExportServices.CreateStronglyTypedLazyFactory(arguments[0], arguments[1]);\r
-                    return arguments[0];\r
-                }\r
-\r
-                if (\r
-                    type.FullName.StartsWith(ExportFactoryTypeName, StringComparison.Ordinal) && \r
-                    ((arguments.Length == 1) || (arguments.Length == 2)))\r
-                {\r
-                    // Func<Tuple<T, Action>>\r
-                    Type exportLifetimeContextCreatorType = typeof(Func<>).MakeGenericType(typeof(Tuple<,>).MakeGenericType(arguments[0], typeof(Action)));\r
-                    ConstructorInfo constructor = null;\r
-\r
-                    if (arguments.Length == 1)\r
-                    {\r
-                        constructor = type.GetConstructor(new Type[] { exportLifetimeContextCreatorType });\r
-                    }\r
-                    else\r
-                    {\r
-                        Assumes.IsTrue(arguments.Length == 2);\r
-                        constructor = type.GetConstructor(new Type[] { exportLifetimeContextCreatorType, arguments[1] });\r
-                    }\r
-\r
-                    if (constructor != null)\r
-                    {\r
-                        this.IsPartCreator = true;\r
-                        if (arguments.Length == 1)\r
-                        {\r
-                            this._castSingleValue = ExportServices.CreateStronglyTypedExportFactoryFactory(arguments[0], null, constructor);\r
-                        }\r
-                        else\r
-                        {\r
-                            Assumes.IsTrue(arguments.Length == 2);\r
-                            this._castSingleValue = ExportServices.CreateStronglyTypedExportFactoryFactory(arguments[0], arguments[1], constructor);\r
-                            this.MetadataViewType = arguments[1];\r
-                        }\r
-\r
-                        return arguments[0];\r
-                    }\r
-                }\r
-            }\r
-\r
-            return type;\r
-        }\r
-\r
-        private static bool IsTypeAssignableCollectionType(Type type)\r
-        {\r
-            if (type.IsArray || CollectionServices.IsEnumerableOfT(type))\r
-            {\r
-                return true;\r
-            }\r
-\r
-            return false;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingItem.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingItem.cs
deleted file mode 100644 (file)
index 3b07368..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Linq;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal abstract class ImportingItem\r
-    {\r
-        private readonly ContractBasedImportDefinition _definition;\r
-        private readonly ImportType _importType;\r
-\r
-        protected ImportingItem(ContractBasedImportDefinition definition, ImportType importType)\r
-        {\r
-            Assumes.NotNull(definition);\r
-\r
-            this._definition = definition;\r
-            this._importType = importType;\r
-        }\r
-\r
-        public ContractBasedImportDefinition Definition\r
-        {\r
-            get { return this._definition; }\r
-        }\r
-\r
-        public ImportType ImportType\r
-        {\r
-            get { return this._importType; }\r
-        }\r
-\r
-        public object CastExportsToImportType(Export[] exports)\r
-        {\r
-            if (this.Definition.Cardinality == ImportCardinality.ZeroOrMore)\r
-            {\r
-                return CastExportsToCollectionImportType(exports);\r
-            }\r
-            else\r
-            {\r
-                return CastExportsToSingleImportType(exports);\r
-            }\r
-        }\r
-\r
-        private object CastExportsToCollectionImportType(Export[] exports)\r
-        {\r
-            Assumes.NotNull(exports);\r
-\r
-            // Element type could be null if the actually import type of the member is not a collection\r
-            // This particular case will end up failing when we set the member.\r
-            Type elementType = this.ImportType.ElementType ?? typeof(object);\r
-\r
-            Array array = Array.CreateInstance(elementType, exports.Length);\r
-\r
-            for (int i = 0; i < array.Length; i++)\r
-            {\r
-                object value = CastSingleExportToImportType(elementType, exports[i]);\r
-\r
-                array.SetValue(value, i);\r
-            }\r
-\r
-            return array;\r
-        }\r
-\r
-        private object CastExportsToSingleImportType(Export[] exports)\r
-        {\r
-            Assumes.NotNull(exports);\r
-            Assumes.IsTrue(exports.Length < 2);\r
-\r
-            if (exports.Length == 0)\r
-            {   \r
-                return null;\r
-            }\r
-\r
-            return CastSingleExportToImportType(this.ImportType.ActualType, exports[0]);\r
-        }\r
-\r
-        private object CastSingleExportToImportType(Type type, Export export)\r
-        {\r
-            if (this.ImportType.CastExport != null)\r
-            {\r
-                return this.ImportType.CastExport(export);\r
-            }\r
-\r
-            return Cast(type, export);\r
-        }\r
-\r
-        private object Cast(Type type, Export export)\r
-        {\r
-            // TODO: Need to catch CompositionException to provide\r
-            // additional information about what member we're setting\r
-            // and the current dependency graph.\r
-            object value = export.Value;\r
-\r
-            object result;\r
-            if (!ContractServices.TryCast(type, value, out result))\r
-            {\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ImportNotAssignableFromExport,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_ImportNotAssignableFromExport,\r
-                        export.ToElement().DisplayName,\r
-                        type.FullName),\r
-                    this.Definition.ToElement());\r
-            }\r
-\r
-            return result;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingMember.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingMember.cs
deleted file mode 100644 (file)
index 6e5cffe..0000000
+++ /dev/null
@@ -1,253 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Collections.Generic;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ImportingMember : ImportingItem\r
-    {\r
-        private readonly ReflectionWritableMember _member;\r
-\r
-        public ImportingMember(ContractBasedImportDefinition definition, ReflectionWritableMember member, ImportType importType)\r
-            : base(definition, importType)\r
-        {\r
-            Assumes.NotNull(definition, member);\r
-\r
-            this._member = member;\r
-        }\r
-\r
-        public void SetExportedValue(object instance, object value)\r
-        {\r
-            if (RequiresCollectionNormalization())\r
-            {\r
-                this.SetCollectionMemberValue(instance, (IEnumerable)value);\r
-            }\r
-            else\r
-            {\r
-                this.SetSingleMemberValue(instance, value);\r
-            }\r
-        }\r
-\r
-        private bool RequiresCollectionNormalization()\r
-        {\r
-            if (this.Definition.Cardinality != ImportCardinality.ZeroOrMore)\r
-            {   // If we're not looking at a collection import, then don't \r
-                // 'normalize' the collection.\r
-\r
-                return false;\r
-            }\r
-\r
-            if (this._member.CanWrite && this.ImportType.IsAssignableCollectionType)\r
-            {   // If we can simply replace the entire value of the property/field, then \r
-                // we don't need to 'normalize' the collection.\r
-\r
-                return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private void SetSingleMemberValue(object instance, object value)\r
-        {\r
-            EnsureWritable();\r
-\r
-            try\r
-            {\r
-                this._member.SetValue(instance, value);\r
-            }\r
-            catch (TargetInvocationException exception)\r
-            {   // Member threw an exception. Avoid letting this \r
-                // leak out as a 'raw' unhandled exception, instead,\r
-                // we'll add some context and rethrow.\r
-\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ImportThrewException,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_ImportThrewException,\r
-                        this._member.GetDisplayName()),\r
-                    Definition.ToElement(),\r
-                    exception.InnerException);\r
-            }\r
-        }\r
-\r
-        private void EnsureWritable()\r
-        {\r
-            if (!this._member.CanWrite)\r
-            {   // Property does not have a setter, or \r
-                // field is marked as read-only.\r
-\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ImportNotWritable,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_ImportNotWritable,\r
-                        this._member.GetDisplayName()),\r
-                        Definition.ToElement());\r
-            }\r
-        }\r
-\r
-        private void SetCollectionMemberValue(object instance, IEnumerable values)\r
-        {\r
-            Assumes.NotNull(values);\r
-\r
-            ICollection<object> collection = null;\r
-            Type itemType = CollectionServices.GetCollectionElementType(this.ImportType.ActualType);\r
-            if (itemType != null)\r
-            {\r
-                collection = GetNormalizedCollection(itemType, instance);\r
-            }\r
-\r
-            EnsureCollectionIsWritable(collection);\r
-            PopulateCollection(collection, values);\r
-        }\r
-\r
-        private ICollection<object> GetNormalizedCollection(Type itemType, object instance)\r
-        {\r
-            Assumes.NotNull(itemType);\r
-\r
-            object collectionObject = null;\r
-\r
-            if (this._member.CanRead)\r
-            {\r
-                try\r
-                {\r
-                    collectionObject = this._member.GetValue(instance);\r
-                }\r
-                catch (TargetInvocationException exception)\r
-                {\r
-                    throw new ComposablePartException(\r
-                        CompositionErrorId.ReflectionModel_ImportCollectionGetThrewException,\r
-                        String.Format(CultureInfo.CurrentCulture,\r
-                            Strings.ReflectionModel_ImportCollectionGetThrewException,\r
-                            this._member.GetDisplayName()),\r
-                        this.Definition.ToElement(),\r
-                        exception.InnerException);\r
-                }\r
-            }\r
-\r
-            if (collectionObject == null)\r
-            {\r
-                ConstructorInfo constructor = this.ImportType.ActualType.GetConstructor(Type.EmptyTypes);\r
-\r
-                // If it contains a default public constructor create a new instance.\r
-                if (constructor != null)\r
-                {\r
-                    try\r
-                    {\r
-                        collectionObject = constructor.SafeInvoke();\r
-                    }\r
-                    catch (TargetInvocationException exception)\r
-                    {\r
-                        throw new ComposablePartException(\r
-                            CompositionErrorId.ReflectionModel_ImportCollectionConstructionThrewException,\r
-                            String.Format(CultureInfo.CurrentCulture,\r
-                                Strings.ReflectionModel_ImportCollectionConstructionThrewException,\r
-                                this._member.GetDisplayName(),\r
-                                this.ImportType.ActualType.FullName),\r
-                            this.Definition.ToElement(),\r
-                            exception.InnerException);\r
-                    }\r
-\r
-                    SetSingleMemberValue(instance, collectionObject);\r
-                }\r
-            }\r
-\r
-            if (collectionObject == null)\r
-            {\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ImportCollectionNull,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_ImportCollectionNull,\r
-                        this._member.GetDisplayName()),\r
-                    this.Definition.ToElement());\r
-            }\r
-\r
-            return CollectionServices.GetCollectionWrapper(itemType, collectionObject);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]\r
-        private void EnsureCollectionIsWritable(ICollection<object> collection)\r
-        {\r
-            bool isReadOnly = true;\r
-                \r
-            try\r
-            {\r
-                if (collection != null)\r
-                {\r
-                    isReadOnly = collection.IsReadOnly;\r
-                }\r
-            }\r
-            catch (Exception exception)\r
-            {\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ImportCollectionIsReadOnlyThrewException,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_ImportCollectionIsReadOnlyThrewException,\r
-                        this._member.GetDisplayName(),\r
-                        collection.GetType().FullName),\r
-                    this.Definition.ToElement(),\r
-                    exception);\r
-            }\r
-\r
-            if (isReadOnly)\r
-            {\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ImportCollectionNotWritable,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_ImportCollectionNotWritable,\r
-                        this._member.GetDisplayName()),\r
-                    this.Definition.ToElement());\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]\r
-        private void PopulateCollection(ICollection<object> collection, IEnumerable values)\r
-        {\r
-            Assumes.NotNull(collection, values);\r
-\r
-            try\r
-            {\r
-                collection.Clear();\r
-            }\r
-            catch (Exception exception)\r
-            {\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_ImportCollectionClearThrewException,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_ImportCollectionClearThrewException,\r
-                        this._member.GetDisplayName(),\r
-                        collection.GetType().FullName),\r
-                    this.Definition.ToElement(),\r
-                    exception);\r
-            }\r
-\r
-            foreach (object value in values)\r
-            {\r
-                try\r
-                {\r
-                    collection.Add(value);\r
-                }\r
-                catch (Exception exception)\r
-                {\r
-                    throw new ComposablePartException(\r
-                        CompositionErrorId.ReflectionModel_ImportCollectionAddThrewException,\r
-                        String.Format(CultureInfo.CurrentCulture,\r
-                            Strings.ReflectionModel_ImportCollectionAddThrewException,\r
-                            this._member.GetDisplayName(),\r
-                            collection.GetType().FullName),\r
-                        this.Definition.ToElement(),\r
-                        exception);\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingParameter.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ImportingParameter.cs
deleted file mode 100644 (file)
index a454189..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ImportingParameter : ImportingItem\r
-    {\r
-        public ImportingParameter(ContractBasedImportDefinition definition, ImportType importType)\r
-            : base(definition, importType)\r
-        {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/LazyMemberInfo.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/LazyMemberInfo.cs
deleted file mode 100644 (file)
index 6b492cf..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    public struct LazyMemberInfo\r
-    {\r
-        private readonly MemberTypes _memberType;\r
-        private MemberInfo[] _accessors;\r
-        private readonly Func<MemberInfo[]> _accessorsCreator;\r
-\r
-        public LazyMemberInfo(MemberInfo member)\r
-        {\r
-            Requires.NotNull(member, "member");\r
-            EnsureSupportedMemberType(member.MemberType, "member");\r
-\r
-            this._accessorsCreator = null;\r
-            this._memberType = member.MemberType;\r
-            \r
-            switch(this._memberType)\r
-            {\r
-                case MemberTypes.Property:\r
-                    PropertyInfo property = (PropertyInfo)member;\r
-                    Assumes.NotNull(property);\r
-                    this._accessors = new MemberInfo[] { property.GetGetMethod(true), property.GetSetMethod(true) };\r
-                    break;\r
-                case MemberTypes.Event:\r
-                    EventInfo event_ = (EventInfo)member;\r
-                    this._accessors = new MemberInfo[] { event_.GetRaiseMethod(true), event_.GetAddMethod(true), event_.GetRemoveMethod(true) };\r
-                    break;\r
-                default:\r
-                    this._accessors = new MemberInfo[] { member };\r
-                    break;\r
-            }\r
-        }\r
-\r
-        public LazyMemberInfo(MemberTypes memberType, params MemberInfo[] accessors)\r
-        {\r
-            EnsureSupportedMemberType(memberType, "memberType");\r
-            Requires.NotNull(accessors, "accessors");\r
-            \r
-            string errorMessage;\r
-            if (!LazyMemberInfo.AreAccessorsValid(memberType, accessors, out errorMessage))\r
-            {\r
-                throw new ArgumentException(errorMessage, "accessors");\r
-            }\r
-\r
-            this._memberType = memberType;\r
-            this._accessors = accessors;\r
-            this._accessorsCreator = null;\r
-        }\r
-\r
-        public LazyMemberInfo(MemberTypes memberType, Func<MemberInfo[]> accessorsCreator)\r
-        {\r
-            EnsureSupportedMemberType(memberType, "memberType");\r
-            Requires.NotNull(accessorsCreator, "accessorsCreator");\r
-\r
-            this._memberType = memberType;\r
-            this._accessors = null;\r
-            this._accessorsCreator = accessorsCreator;\r
-        }\r
-\r
-        public MemberTypes MemberType\r
-        {\r
-            get { return this._memberType; }\r
-        }\r
-\r
-        public MemberInfo[] GetAccessors()\r
-        {\r
-            if ((this._accessors == null) && (this._accessorsCreator != null))\r
-            {\r
-                MemberInfo[] accessors = this._accessorsCreator.Invoke();\r
-\r
-                string errorMessage;\r
-                if (!LazyMemberInfo.AreAccessorsValid(this.MemberType, accessors, out errorMessage))\r
-                {\r
-                    throw new InvalidOperationException(errorMessage);\r
-                }\r
-\r
-                this._accessors = accessors;\r
-            }\r
-\r
-            return this._accessors;\r
-        }\r
-\r
-        public override int GetHashCode()\r
-        {\r
-            if (this._accessorsCreator != null)\r
-            {\r
-                return this.MemberType.GetHashCode() ^ this._accessorsCreator.GetHashCode();\r
-            }\r
-            else\r
-            {\r
-                Assumes.NotNull(this._accessors);\r
-                Assumes.NotNull(this._accessors[0]);\r
-                return this.MemberType.GetHashCode() ^ this._accessors[0].GetHashCode();\r
-            }\r
-        }\r
-\r
-        public override bool Equals(object obj)\r
-        {\r
-            LazyMemberInfo that = (LazyMemberInfo)obj;\r
-\r
-            // Difefrent member types mean different members\r
-            if (this._memberType != that._memberType)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            // if any of the lazy memebers create accessors in a delay-loaded fashion, we simply compare the creators\r
-            if ((this._accessorsCreator != null) || (that._accessorsCreator != null))\r
-            {\r
-                return object.Equals(this._accessorsCreator, that._accessorsCreator);\r
-            }\r
-\r
-            // we are dealing with explicitly passed accessors in both cases\r
-            Assumes.NotNull(this._accessors);\r
-            Assumes.NotNull(that._accessors);\r
-            return this._accessors.SequenceEqual(that._accessors);\r
-        }\r
-\r
-        public static bool operator ==(LazyMemberInfo left, LazyMemberInfo right)\r
-        {\r
-            return left.Equals(right);\r
-        }\r
-\r
-        public static bool operator !=(LazyMemberInfo left, LazyMemberInfo right)\r
-        {\r
-            return !left.Equals(right);\r
-        }\r
-\r
-        private static void EnsureSupportedMemberType(MemberTypes memberType, string argument)\r
-        {\r
-            MemberTypes supportedTypes = MemberTypes.TypeInfo | MemberTypes.NestedType | MemberTypes.Constructor | MemberTypes.Field | MemberTypes.Method | MemberTypes.Property | MemberTypes.Event;\r
-            Requires.IsInMembertypeSet(memberType, argument, supportedTypes);\r
-        }\r
-\r
-        private static bool AreAccessorsValid(MemberTypes memberType, MemberInfo[] accessors, out string errorMessage)\r
-        {\r
-            errorMessage = string.Empty;\r
-            if (accessors == null)\r
-            {\r
-                errorMessage = Strings.LazyMemberInfo_AccessorsNull;\r
-                return false;\r
-            }\r
-\r
-            if (accessors.All(accessor => accessor == null))\r
-            {\r
-                errorMessage = Strings.LazyMemberInfo_NoAccessors;\r
-                return false;\r
-            }\r
-\r
-            switch (memberType)\r
-            {\r
-                case MemberTypes.Property:\r
-                    if (accessors.Length != 2)\r
-                    {\r
-                        errorMessage = Strings.LazyMemberInfo_InvalidPropertyAccessors_Cardinality;\r
-                        return false;\r
-                    }\r
-\r
-                    if (accessors.Where(accessor => (accessor != null) && (accessor.MemberType != MemberTypes.Method)).Any())\r
-                    {\r
-                        errorMessage = Strings.LazyMemberinfo_InvalidPropertyAccessors_AccessorType;\r
-                        return false;\r
-                    }\r
-\r
-                    break;\r
-\r
-                case MemberTypes.Event:\r
-                    if (accessors.Length != 3)\r
-                    {\r
-                        errorMessage = Strings.LazyMemberInfo_InvalidEventAccessors_Cardinality;\r
-                        return false;\r
-                    }\r
-\r
-                    if (accessors.Where(accessor => (accessor != null) && (accessor.MemberType != MemberTypes.Method)).Any())\r
-                    {\r
-                        errorMessage = Strings.LazyMemberinfo_InvalidPropertyAccessors_AccessorType;\r
-                        return false;\r
-                    }\r
-\r
-                    break;\r
-\r
-                default:\r
-                    if (\r
-                        (accessors.Length != 1) ||\r
-                        ((accessors.Length == 1) && (accessors[0].MemberType != memberType)))\r
-                    {\r
-                        errorMessage = string.Format(CultureInfo.CurrentCulture, Strings.LazyMemberInfo_InvalidAccessorOnSimpleMember, memberType);\r
-                        return false;\r
-                    }\r
-                   \r
-                    break;\r
-            }\r
-            return true;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorExportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorExportDefinition.cs
deleted file mode 100644 (file)
index 2b13544..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class PartCreatorExportDefinition : ExportDefinition\r
-    {\r
-        private readonly ExportDefinition _productDefinition;\r
-        private IDictionary<string, object> _metadata;\r
-\r
-        public PartCreatorExportDefinition(ExportDefinition productDefinition)\r
-            : base()\r
-        {\r
-            this._productDefinition = productDefinition;\r
-        }\r
-\r
-        public override string ContractName\r
-        {\r
-            get\r
-            {\r
-                return CompositionConstants.PartCreatorContractName;\r
-            }\r
-        }\r
-\r
-        public override IDictionary<string, object> Metadata\r
-        {\r
-            get\r
-            {\r
-                if (this._metadata == null)\r
-                {\r
-                    var metadata = new Dictionary<string, object>(this._productDefinition.Metadata);\r
-                    metadata[CompositionConstants.ExportTypeIdentityMetadataName] = CompositionConstants.PartCreatorTypeIdentity;\r
-                    metadata[CompositionConstants.ProductDefinitionMetadataName] = this._productDefinition;\r
-\r
-                    this._metadata = metadata.AsReadOnly();\r
-                }\r
-                return this._metadata;\r
-            }\r
-        }\r
-\r
-        internal static bool IsProductConstraintSatisfiedBy(ImportDefinition productImportDefinition, ExportDefinition exportDefinition)\r
-        {\r
-            object productValue = null;\r
-            if (exportDefinition.Metadata.TryGetValue(CompositionConstants.ProductDefinitionMetadataName, out productValue))\r
-            {\r
-                ExportDefinition productDefinition = productValue as ExportDefinition;\r
-\r
-                if (productDefinition != null)\r
-                {\r
-                    return productImportDefinition.IsConstraintSatisfiedBy(productDefinition);\r
-                }\r
-            }\r
-\r
-            return false;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorMemberImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorMemberImportDefinition.cs
deleted file mode 100644 (file)
index 8eb3963..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq.Expressions;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class PartCreatorMemberImportDefinition : ReflectionMemberImportDefinition, IPartCreatorImportDefinition\r
-    {\r
-        private readonly ContractBasedImportDefinition _productImportDefinition;\r
-\r
-        public PartCreatorMemberImportDefinition(\r
-            LazyMemberInfo importingLazyMember,\r
-            ICompositionElement origin,\r
-            ContractBasedImportDefinition productImportDefinition)\r
-            : base(importingLazyMember, CompositionConstants.PartCreatorContractName, CompositionConstants.PartCreatorTypeIdentity,\r
-                productImportDefinition.RequiredMetadata, productImportDefinition.Cardinality, productImportDefinition.IsRecomposable, CreationPolicy.Any, origin)\r
-        {\r
-            Assumes.NotNull(productImportDefinition);\r
-            this._productImportDefinition = productImportDefinition;\r
-        }\r
-\r
-        public ContractBasedImportDefinition ProductImportDefinition { get { return this._productImportDefinition; } }\r
-\r
-        public override bool IsConstraintSatisfiedBy(ExportDefinition exportDefinition)\r
-        {\r
-            if (!base.IsConstraintSatisfiedBy(exportDefinition))\r
-            {\r
-                return false;\r
-            }\r
-\r
-            return PartCreatorExportDefinition.IsProductConstraintSatisfiedBy(this._productImportDefinition, exportDefinition);\r
-        }\r
-\r
-        public override Expression<Func<ExportDefinition, bool>> Constraint\r
-        {\r
-            get\r
-            {\r
-                return ConstraintServices.CreatePartCreatorConstraint(base.Constraint, this._productImportDefinition);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorParameterImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/PartCreatorParameterImportDefinition.cs
deleted file mode 100644 (file)
index df498e2..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq.Expressions;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class PartCreatorParameterImportDefinition : ReflectionParameterImportDefinition, IPartCreatorImportDefinition\r
-    {\r
-        private readonly ContractBasedImportDefinition _productImportDefinition;\r
-\r
-        public PartCreatorParameterImportDefinition(\r
-            Lazy<ParameterInfo> importingLazyParameter,\r
-            ICompositionElement origin,\r
-            ContractBasedImportDefinition productImportDefinition)\r
-            : base(importingLazyParameter, CompositionConstants.PartCreatorContractName, CompositionConstants.PartCreatorTypeIdentity,\r
-                productImportDefinition.RequiredMetadata, productImportDefinition.Cardinality, CreationPolicy.Any, origin)\r
-        {\r
-            Assumes.NotNull(productImportDefinition);\r
-            this._productImportDefinition = productImportDefinition;\r
-        }\r
-\r
-        public ContractBasedImportDefinition ProductImportDefinition { get { return this._productImportDefinition; } }\r
-\r
-        public override bool IsConstraintSatisfiedBy(ExportDefinition exportDefinition)\r
-        {\r
-            if (!base.IsConstraintSatisfiedBy(exportDefinition))\r
-            {\r
-                return false;\r
-            }\r
-            return PartCreatorExportDefinition.IsProductConstraintSatisfiedBy(this._productImportDefinition, exportDefinition);\r
-        }\r
-\r
-        public override Expression<Func<ExportDefinition, bool>> Constraint\r
-        {\r
-            get\r
-            {\r
-                return ConstraintServices.CreatePartCreatorConstraint(base.Constraint, this._productImportDefinition);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePart.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePart.cs
deleted file mode 100644 (file)
index 908b99b..0000000
+++ /dev/null
@@ -1,565 +0,0 @@
-\r
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    // This \r
-    internal class ReflectionComposablePart : ComposablePart, ICompositionElement\r
-    {\r
-        private readonly ReflectionComposablePartDefinition _definition;\r
-        private readonly Dictionary<ImportDefinition, object> _importValues = new Dictionary<ImportDefinition, object>();\r
-        private readonly Dictionary<ImportDefinition, ImportingItem> _importsCache = new Dictionary<ImportDefinition, ImportingItem>();\r
-        private readonly Dictionary<ExportDefinition, ExportingMember> _exportsCache = new Dictionary<ExportDefinition, ExportingMember>();\r
-        private bool _invokeImportsSatisfied = true;\r
-        private bool _invokingImportsSatisfied = false;\r
-        private bool _initialCompositionComplete = false;\r
-        private volatile object _cachedInstance;\r
-        private object _lock = new object();\r
-\r
-        public ReflectionComposablePart(ReflectionComposablePartDefinition definition)\r
-        {\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            this._definition = definition;\r
-        }\r
-\r
-        public ReflectionComposablePart(ReflectionComposablePartDefinition definition, object attributedPart)\r
-        {\r
-            Requires.NotNull(definition, "definition");\r
-            Requires.NotNull(attributedPart, "attributedPart");\r
-\r
-            this._definition = definition;\r
-\r
-            if (attributedPart is ValueType)\r
-            {\r
-                throw new ArgumentException(Strings.ArgumentValueType, "attributedPart");\r
-            }\r
-            this._cachedInstance = attributedPart;\r
-        }\r
-\r
-        protected virtual void EnsureRunning()\r
-        {\r
-        }\r
-\r
-        protected virtual void ReleaseInstanceIfNecessary(object instance)\r
-        {\r
-        }\r
-\r
-        protected object CachedInstance\r
-        {\r
-            get\r
-            {\r
-                lock (this._lock)\r
-                {\r
-                    return this._cachedInstance;\r
-                }\r
-            }\r
-        }\r
-\r
-        public ReflectionComposablePartDefinition Definition\r
-        {\r
-            get \r
-            {\r
-                this.EnsureRunning();\r
-                return this._definition; \r
-            }\r
-        }\r
-\r
-        public override IDictionary<string, object> Metadata\r
-        {\r
-            get\r
-            {\r
-                this.EnsureRunning();\r
-                return this.Definition.Metadata;\r
-            }\r
-        }\r
-\r
-        public sealed override IEnumerable<ImportDefinition> ImportDefinitions\r
-        {\r
-            get\r
-            {\r
-                this.EnsureRunning();\r
-                return this.Definition.ImportDefinitions;\r
-            }\r
-        }\r
-\r
-        public sealed override IEnumerable<ExportDefinition> ExportDefinitions\r
-        {\r
-            get\r
-            {\r
-                this.EnsureRunning();\r
-                return this.Definition.ExportDefinitions;\r
-            }\r
-        }\r
-\r
-\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return GetDisplayName(); }\r
-        }\r
-\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return Definition; }\r
-        }\r
-\r
-        // This is the ONLY method which is not executed under the ImportEngine composition lock.\r
-        // We need to protect all state that is accesses\r
-        public override object GetExportedValue(ExportDefinition definition)\r
-        {\r
-            // given the implementation of the ImportEngine, this iwll be called under a lock if the part is still being composed\r
-            // This is only called outside of the lock when the part is fully composed\r
-            // based on that we only protect:\r
-            // _exportsCache - and thus all calls to GetExportingMemberFromDefinition\r
-            // access to _importValues\r
-            // access to _initialCompositionComplete\r
-            // access to _instance\r
-            this.EnsureRunning();\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            ExportingMember member = null;\r
-            lock (this._lock)\r
-            {\r
-                member = GetExportingMemberFromDefinition(definition);\r
-                if (member == null)\r
-                {\r
-                    throw ExceptionBuilder.CreateExportDefinitionNotOnThisComposablePart("definition");\r
-                }\r
-                this.EnsureGettable();\r
-            }\r
-\r
-            return this.GetExportedValue(member);\r
-        }\r
-\r
-        public override void SetImport(ImportDefinition definition, IEnumerable<Export> exports)\r
-        {\r
-            this.EnsureRunning();\r
-\r
-            Requires.NotNull(definition, "definition");\r
-            Requires.NotNull(exports, "exports");\r
-\r
-            ImportingItem item = GetImportingItemFromDefinition(definition);\r
-            if (item == null)\r
-            {\r
-                throw ExceptionBuilder.CreateImportDefinitionNotOnThisComposablePart("definition");\r
-            }\r
-\r
-            EnsureSettable(definition);\r
-\r
-            // Avoid walking over exports many times\r
-            Export[] exportsAsArray = exports.AsArray();\r
-            EnsureCardinality(definition, exportsAsArray);\r
-\r
-            SetImport(item, exportsAsArray);\r
-        }\r
-\r
-        public override void Activate()\r
-        {\r
-            this.EnsureRunning();\r
-\r
-            this.SetNonPrerequisiteImports();\r
-\r
-            // Whenever we are composed/recomposed notify the instance\r
-            this.NotifyImportSatisfied();\r
-\r
-            lock (this._lock)\r
-            {\r
-                this._initialCompositionComplete = true;\r
-            }\r
-        }\r
-\r
-        public override string ToString()\r
-        {\r
-            return this.GetDisplayName();\r
-        }\r
-\r
-        private object GetExportedValue(ExportingMember member)\r
-        {\r
-            object instance = null;\r
-            if (member.RequiresInstance)\r
-            {   // Only activate the instance if we actually need to\r
-\r
-                instance = this.GetInstanceActivatingIfNeeded();\r
-            }\r
-\r
-            return member.GetExportedValue(instance, this._lock);\r
-        }\r
-\r
-        private void SetImport(ImportingItem item, Export[] exports)\r
-        {\r
-            object value = item.CastExportsToImportType(exports);\r
-\r
-            lock (this._lock)\r
-            {\r
-                this._invokeImportsSatisfied = true;\r
-                this._importValues[item.Definition] = value;\r
-            }\r
-        }\r
-\r
-        private object GetInstanceActivatingIfNeeded()\r
-        {\r
-            if (this._cachedInstance != null)\r
-            {\r
-                return this._cachedInstance;\r
-            }\r
-            else\r
-            {\r
-                ConstructorInfo constructor = null;\r
-                object[] arguments = null;\r
-                // determine whether activation is required, and collect necessary information for activation\r
-                // we need to do that under a lock\r
-                lock (this._lock)\r
-                {\r
-                    if (!this.RequiresActivation())\r
-                    {\r
-                        return null;\r
-                    }\r
-\r
-                    constructor = this.Definition.GetConstructor();\r
-                    if (constructor == null)\r
-                    {\r
-                        throw new ComposablePartException(\r
-                            CompositionErrorId.ReflectionModel_PartConstructorMissing,\r
-                            String.Format(CultureInfo.CurrentCulture,\r
-                                Strings.ReflectionModel_PartConstructorMissing,\r
-                                this.Definition.GetPartType().FullName),\r
-                            this.Definition.ToElement());\r
-                    }\r
-                    arguments = this.GetConstructorArguments();\r
-                }\r
-\r
-                // create instance outside of the lock\r
-                object createdInstance = this.CreateInstance(constructor, arguments);\r
-\r
-                // set the created instance\r
-                lock (this._lock)\r
-                {\r
-                    if (this._cachedInstance == null)\r
-                    {\r
-                        this._cachedInstance = createdInstance;\r
-                        createdInstance = null;\r
-                    }\r
-                }\r
-\r
-                // if the instance has been already set\r
-                if (createdInstance == null)\r
-                {\r
-                    this.ReleaseInstanceIfNecessary(createdInstance);\r
-                }\r
-            }\r
-\r
-            return this._cachedInstance;\r
-        }\r
-\r
-        private object[] GetConstructorArguments()\r
-        {\r
-            ReflectionParameterImportDefinition[] parameterImports = this.ImportDefinitions.OfType<ReflectionParameterImportDefinition>().ToArray();\r
-            object[] arguments = new object[parameterImports.Length];\r
-\r
-            this.UseImportedValues(\r
-                parameterImports,\r
-                (import, definition, value) =>\r
-                {\r
-                    if (definition.Cardinality == ImportCardinality.ZeroOrMore && !import.ImportType.IsAssignableCollectionType)\r
-                    {\r
-                        throw new ComposablePartException(\r
-                            CompositionErrorId.ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned,\r
-                            String.Format(CultureInfo.CurrentCulture,\r
-                                Strings.ReflectionModel_ImportManyOnParameterCanOnlyBeAssigned,\r
-                                this.Definition.GetPartType().FullName,\r
-                                definition.ImportingLazyParameter.Value.Name),\r
-                            this.Definition.ToElement());\r
-                    }\r
-\r
-                    arguments[definition.ImportingLazyParameter.Value.Position] = value;\r
-                },\r
-                true);\r
-\r
-            return arguments;\r
-        }\r
-\r
-        // alwayc called under a lock\r
-        private bool RequiresActivation()\r
-        {\r
-            // If we have any imports then we need activation\r
-            // (static imports are not supported)\r
-            if (this.ImportDefinitions.Any())\r
-            {\r
-                return true;\r
-            }\r
-\r
-            // If we have any instance exports, then we also \r
-            // need activation.\r
-            return this.ExportDefinitions.Any(definition =>\r
-            {\r
-                ExportingMember member = GetExportingMemberFromDefinition(definition);\r
-\r
-                return member.RequiresInstance;\r
-            });\r
-        }\r
-\r
-        // this is called under a lock\r
-        private void EnsureGettable()\r
-        {\r
-            // If we're already composed then we know that \r
-            // all pre-req imports have been satisfied\r
-            if (_initialCompositionComplete)\r
-            {\r
-                return;\r
-            }\r
-\r
-            // Make sure all pre-req imports have been set\r
-            foreach (ImportDefinition definition in ImportDefinitions.Where(definition => definition.IsPrerequisite))\r
-            {\r
-                if (!this._importValues.ContainsKey(definition))\r
-                {\r
-                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture,\r
-                                                            Strings.InvalidOperation_GetExportedValueBeforePrereqImportSet,\r
-                                                            definition.ToElement().DisplayName));\r
-                }\r
-            }\r
-        }\r
-\r
-        private void EnsureSettable(ImportDefinition definition)\r
-        {\r
-            lock (this._lock)\r
-            {\r
-                if (this._initialCompositionComplete && !definition.IsRecomposable)\r
-                {\r
-                    throw new InvalidOperationException(Strings.InvalidOperation_DefinitionCannotBeRecomposed);\r
-                }\r
-            }\r
-        }\r
-\r
-        private static void EnsureCardinality(ImportDefinition definition, Export[] exports)\r
-        {\r
-            Requires.NullOrNotNullElements(exports, "exports");\r
-\r
-            ExportCardinalityCheckResult result = ExportServices.CheckCardinality(definition, exports);\r
-\r
-            switch (result)\r
-            {\r
-                case ExportCardinalityCheckResult.NoExports:\r
-                    throw new ArgumentException(Strings.Argument_ExportsEmpty, "exports");\r
-\r
-                case ExportCardinalityCheckResult.TooManyExports:\r
-                    throw new ArgumentException(Strings.Argument_ExportsTooMany, "exports");\r
-\r
-                default:\r
-                    Assumes.IsTrue(result == ExportCardinalityCheckResult.Match);\r
-                    break;\r
-            }\r
-        }\r
-\r
-        private object CreateInstance(ConstructorInfo constructor, object[] arguments)\r
-        { \r
-            Exception exception = null;\r
-            object instance = null;\r
-\r
-            try\r
-            {\r
-                instance = constructor.SafeInvoke(arguments);\r
-            }\r
-            catch (TypeInitializationException ex) \r
-            { \r
-                exception = ex; \r
-            }\r
-            catch (TargetInvocationException ex)\r
-            {\r
-                exception = ex.InnerException;\r
-            }\r
-            \r
-            if (exception != null)\r
-            {\r
-                throw new ComposablePartException(\r
-                    CompositionErrorId.ReflectionModel_PartConstructorThrewException,\r
-                    String.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ReflectionModel_PartConstructorThrewException,\r
-                        Definition.GetPartType().FullName),\r
-                    Definition.ToElement(),\r
-                    exception);\r
-            }\r
-\r
-            return instance;\r
-        }\r
-\r
-        private void SetNonPrerequisiteImports()\r
-        {\r
-            IEnumerable<ImportDefinition> members = this.ImportDefinitions.Where(import => !import.IsPrerequisite);\r
-\r
-            // NOTE: Dev10 484204 The validation is turned off for post imports because of it broke declarative composition\r
-            this.UseImportedValues(members, SetExportedValueForImport, false);\r
-        }\r
-\r
-        private void SetExportedValueForImport(ImportingItem import, ImportDefinition definition, object value)\r
-        {\r
-            ImportingMember importMember = (ImportingMember)import;\r
-\r
-            object instance = this.GetInstanceActivatingIfNeeded();\r
-\r
-            importMember.SetExportedValue(instance, value);\r
-        }\r
-\r
-        private void UseImportedValues<TImportDefinition>(IEnumerable<TImportDefinition> definitions, Action<ImportingItem, TImportDefinition, object> useImportValue, bool errorIfMissing)\r
-            where TImportDefinition : ImportDefinition\r
-        {\r
-            var result = CompositionResult.SucceededResult;\r
-\r
-            foreach (var definition in definitions)\r
-            {\r
-                ImportingItem import = GetImportingItemFromDefinition(definition);\r
-\r
-                object value;\r
-                if (!TryGetImportValue(definition, out value))\r
-                {\r
-                    if (!errorIfMissing)\r
-                    {\r
-                        continue;\r
-                    }\r
-\r
-                    if (definition.Cardinality == ImportCardinality.ExactlyOne)\r
-                    {\r
-                        var error = CompositionError.Create(\r
-                            CompositionErrorId.ImportNotSetOnPart,\r
-                            Strings.ImportNotSetOnPart,\r
-                            this.Definition.GetPartType().FullName,\r
-                            definition.ToString());\r
-                        result = result.MergeError(error);\r
-                        continue;\r
-                    }\r
-                    else\r
-                    {\r
-                        value = import.CastExportsToImportType(new Export[0]);\r
-                    }\r
-                }\r
-\r
-                useImportValue(import, definition, value);\r
-            }\r
-\r
-            result.ThrowOnErrors();\r
-        }\r
-\r
-        private bool TryGetImportValue(ImportDefinition definition, out object value)\r
-        {\r
-            lock (this._lock)\r
-            {\r
-                if (this._importValues.TryGetValue(definition, out value))\r
-                {\r
-                    this._importValues.Remove(definition);\r
-                    return true;\r
-                }\r
-            }\r
-\r
-            value = null;\r
-            return false;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]\r
-        private void NotifyImportSatisfied()\r
-        {\r
-            if (this._invokeImportsSatisfied && !this._invokingImportsSatisfied)\r
-            {\r
-                IPartImportsSatisfiedNotification notify = this.GetInstanceActivatingIfNeeded() as IPartImportsSatisfiedNotification;\r
-                if (notify != null)\r
-                {\r
-                    try\r
-                    {\r
-                        // Reentrancy on composition notifications is allowed, so set this first to avoid \r
-                        // an infinte loop of notifications.\r
-                        this._invokingImportsSatisfied = true;\r
-\r
-                        notify.OnImportsSatisfied();\r
-                    }\r
-                    catch (Exception exception)\r
-                    {\r
-                        throw new ComposablePartException(\r
-                            CompositionErrorId.ReflectionModel_PartOnImportsSatisfiedThrewException,\r
-                            String.Format(CultureInfo.CurrentCulture,\r
-                                Strings.ReflectionModel_PartOnImportsSatisfiedThrewException,\r
-                                Definition.GetPartType().FullName),\r
-                            Definition.ToElement(),\r
-                            exception);\r
-                    }\r
-                    finally\r
-                    {\r
-                        this._invokingImportsSatisfied = false;\r
-                    }\r
-\r
-                    this._invokeImportsSatisfied = false;\r
-                }\r
-            }\r
-        }\r
-\r
-        // this is always called under a lock\r
-        private ExportingMember GetExportingMemberFromDefinition(ExportDefinition definition)\r
-        {\r
-            ExportingMember result;\r
-            if (!_exportsCache.TryGetValue(definition, out result))\r
-            {\r
-                result = GetExportingMember(definition);\r
-                if (result != null)\r
-                {\r
-                    _exportsCache[definition] = result;\r
-                }\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private ImportingItem GetImportingItemFromDefinition(ImportDefinition definition)\r
-        {\r
-            ImportingItem result;\r
-            if (!_importsCache.TryGetValue(definition, out result))\r
-            {\r
-                result = GetImportingItem(definition);\r
-                if (result != null)\r
-                {\r
-                    _importsCache[definition] = result;\r
-                }\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private static ImportingItem GetImportingItem(ImportDefinition definition)\r
-        {\r
-            ReflectionImportDefinition reflectionDefinition = definition as ReflectionImportDefinition;\r
-            if (reflectionDefinition != null)\r
-            {\r
-                return reflectionDefinition.ToImportingItem();\r
-            }\r
-\r
-            // Don't recognize it\r
-            return null;\r
-        }\r
-\r
-        private static ExportingMember GetExportingMember(ExportDefinition definition)\r
-        {\r
-            ReflectionMemberExportDefinition exportDefinition = definition as ReflectionMemberExportDefinition;\r
-            if (exportDefinition != null)\r
-            {\r
-                return exportDefinition.ToExportingMember();\r
-            }\r
-\r
-            // Don't recognize it\r
-            return null;\r
-        }\r
-\r
-        private string GetDisplayName()\r
-        {\r
-            return this.Definition.GetPartType().GetDisplayName();\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartDefinition.cs
deleted file mode 100644 (file)
index 347fa2e..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Linq;\r
-using System.Reflection;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ReflectionComposablePartDefinition : ComposablePartDefinition, ICompositionElement\r
-    {\r
-        private readonly IReflectionPartCreationInfo _creationInfo;\r
-\r
-        private volatile IEnumerable<ImportDefinition> _imports;\r
-        private volatile IEnumerable<ExportDefinition> _exports;\r
-        private volatile IDictionary<string, object> _metadata;\r
-        private volatile ConstructorInfo _constructor;\r
-        private object _lock = new object();\r
-\r
-        public ReflectionComposablePartDefinition(IReflectionPartCreationInfo creationInfo)\r
-        {\r
-            Assumes.NotNull(creationInfo);\r
-            this._creationInfo = creationInfo;\r
-        }\r
-\r
-        public Type GetPartType()\r
-        {\r
-            return this._creationInfo.GetPartType();\r
-        }\r
-\r
-        public Lazy<Type> GetLazyPartType()\r
-        {\r
-            return this._creationInfo.GetLazyPartType();\r
-        }\r
-\r
-        public ConstructorInfo GetConstructor()\r
-        {\r
-            if (this._constructor == null)\r
-            {\r
-                ConstructorInfo constructor = this._creationInfo.GetConstructor();\r
-                lock (this._lock)\r
-                {\r
-                    if (this._constructor == null)\r
-                    {\r
-                        this._constructor = constructor;\r
-                    }\r
-                }\r
-            }\r
-\r
-            return this._constructor;\r
-        }\r
-\r
-        public override IEnumerable<ExportDefinition> ExportDefinitions\r
-        {\r
-            get\r
-            {\r
-                if (this._exports == null)\r
-                {\r
-                    ExportDefinition[] exports = this._creationInfo.GetExports().ToArray();\r
-                    lock (this._lock)\r
-                    {\r
-                        if (this._exports == null)\r
-                        {\r
-                            this._exports = exports;\r
-                        }\r
-                    }\r
-                }\r
-                return this._exports;\r
-            }\r
-        }\r
-\r
-        public override IEnumerable<ImportDefinition> ImportDefinitions\r
-        {\r
-            get\r
-            {\r
-                if (this._imports == null)\r
-                {\r
-                    ImportDefinition[] imports = this._creationInfo.GetImports().ToArray();\r
-                    lock (this._lock)\r
-                    {\r
-                        if (this._imports == null)\r
-                        {\r
-                            this._imports = imports;\r
-                        }\r
-                    }\r
-                }\r
-                return this._imports;\r
-            }\r
-        }\r
-\r
-        public override IDictionary<string, object> Metadata\r
-        {\r
-            get\r
-            {\r
-                if (this._metadata == null)\r
-                {\r
-                    IDictionary<string, object> metadata = this._creationInfo.GetMetadata().AsReadOnly();\r
-                    lock (this._lock)\r
-                    {\r
-                        if (this._metadata == null)\r
-                        {\r
-                            this._metadata = metadata;\r
-                        }\r
-                    }\r
-                }\r
-                return this._metadata;\r
-            }\r
-        }\r
-\r
-        internal bool IsDisposalRequired\r
-        {\r
-            get\r
-            {\r
-                return this._creationInfo.IsDisposalRequired;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]\r
-        public override ComposablePart CreatePart()\r
-        {\r
-            if (this.IsDisposalRequired)\r
-            {\r
-                return new DisposableReflectionComposablePart(this);\r
-            }\r
-            else\r
-            {\r
-                return new ReflectionComposablePart(this);\r
-            }\r
-        }\r
-\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return this._creationInfo.DisplayName; }\r
-        }\r
-\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return this._creationInfo.Origin; }\r
-        }\r
-\r
-        public override string ToString()\r
-        {\r
-            return this._creationInfo.DisplayName;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionExtensions.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionExtensions.cs
deleted file mode 100644 (file)
index 47a3b97..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-using System.Collections.Generic;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal static class ReflectionExtensions\r
-    {\r
-        public static ReflectionMember ToReflectionMember(this LazyMemberInfo lazyMember)\r
-        {\r
-            MemberInfo[] accessors = lazyMember.GetAccessors();\r
-            MemberTypes memberType = lazyMember.MemberType;\r
-\r
-            switch (memberType)\r
-            {\r
-                case MemberTypes.Field:\r
-                    Assumes.IsTrue(accessors.Length == 1);\r
-                    return ((FieldInfo)accessors[0]).ToReflectionField();\r
-\r
-                case MemberTypes.Property:\r
-                    Assumes.IsTrue(accessors.Length == 2);\r
-                    return ReflectionExtensions.CreateReflectionProperty((MethodInfo)accessors[0], (MethodInfo)accessors[1]);\r
-\r
-                case MemberTypes.NestedType:\r
-                case MemberTypes.TypeInfo:\r
-                    return ((Type)accessors[0]).ToReflectionType();\r
-\r
-                default:\r
-                    Assumes.IsTrue(memberType == MemberTypes.Method);\r
-                    return ((MethodInfo)accessors[0]).ToReflectionMethod();\r
-            }\r
-        }\r
-\r
-        public static LazyMemberInfo ToLazyMember(this ReflectionMember reflectionMember)\r
-        {\r
-            Assumes.NotNull(reflectionMember);\r
-\r
-            if (reflectionMember.ItemType == ReflectionItemType.Property)\r
-            {\r
-                ReflectionProperty reflectionProperty = reflectionMember as ReflectionProperty;\r
-                Assumes.NotNull(reflectionProperty);\r
-\r
-                MemberInfo[] accessors = new MemberInfo[] { reflectionProperty.UnderlyingGetMethod, reflectionProperty.UnderlyingSetMethod };\r
-                return new LazyMemberInfo(MemberTypes.Property, accessors);\r
-            }\r
-            else\r
-            {\r
-                return new LazyMemberInfo(reflectionMember.UnderlyingMember.MemberType, reflectionMember.UnderlyingMember);\r
-            }\r
-        }\r
-\r
-        public static LazyMemberInfo ToLazyMember(this MemberInfo member)\r
-        {\r
-            Assumes.NotNull(member);\r
-\r
-            if (member.MemberType == MemberTypes.Property)\r
-            {\r
-                PropertyInfo property = member as PropertyInfo;\r
-                Assumes.NotNull(property);\r
-\r
-                MemberInfo[] accessors = new MemberInfo[] { property.GetGetMethod(true), property.GetSetMethod(true)};\r
-                return new LazyMemberInfo(MemberTypes.Property, accessors);\r
-            }\r
-            else\r
-            {\r
-                return new LazyMemberInfo(member);\r
-            }\r
-        }\r
-\r
-        public static ReflectionWritableMember ToReflectionWriteableMember(this LazyMemberInfo lazyMember)\r
-        {\r
-            Assumes.IsTrue((lazyMember.MemberType == MemberTypes.Field) || (lazyMember.MemberType == MemberTypes.Property));\r
-\r
-            ReflectionWritableMember reflectionMember = lazyMember.ToReflectionMember() as ReflectionWritableMember;\r
-            Assumes.NotNull(reflectionMember);\r
-\r
-            return reflectionMember;\r
-        }\r
-\r
-\r
-        public static ReflectionProperty ToReflectionProperty(this PropertyInfo property)\r
-        {\r
-            Assumes.NotNull(property);\r
-            return CreateReflectionProperty(property.GetGetMethod(true), property.GetSetMethod(true));\r
-        }\r
-\r
-        public static ReflectionProperty CreateReflectionProperty(MethodInfo getMethod, MethodInfo setMethod)\r
-        {\r
-            Assumes.IsTrue(getMethod != null || setMethod != null);\r
-\r
-            return new ReflectionProperty(getMethod, setMethod);\r
-        }\r
-\r
-        public static ReflectionParameter ToReflectionParameter(this ParameterInfo parameter)\r
-        {\r
-            Assumes.NotNull(parameter);\r
-            return new ReflectionParameter(parameter);\r
-        }\r
-\r
-        public static ReflectionMethod ToReflectionMethod(this MethodInfo method)\r
-        {\r
-            Assumes.NotNull(method);\r
-            return new ReflectionMethod(method);\r
-        }\r
-\r
-        public static ReflectionField ToReflectionField(this FieldInfo field)\r
-        {\r
-            Assumes.NotNull(field);\r
-            return new ReflectionField(field);\r
-        }\r
-\r
-        public static ReflectionType ToReflectionType(this Type type)\r
-        {\r
-            Assumes.NotNull(type);\r
-            return new ReflectionType(type);\r
-        }\r
-\r
-        public static ReflectionWritableMember ToReflectionWritableMember(this MemberInfo member)\r
-        {\r
-            Assumes.NotNull(member);\r
-            if (member.MemberType == MemberTypes.Property)\r
-            {\r
-                return ((PropertyInfo)member).ToReflectionProperty();\r
-            }\r
-\r
-            return ((FieldInfo)member).ToReflectionField();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionField.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionField.cs
deleted file mode 100644 (file)
index 3887936..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ReflectionField : ReflectionWritableMember\r
-    {\r
-        private readonly FieldInfo _field;\r
-\r
-        public ReflectionField(FieldInfo field)\r
-        {\r
-            Assumes.NotNull(field);\r
-\r
-            this._field = field;\r
-        }\r
-\r
-        public FieldInfo UndelyingField\r
-        {\r
-            get { return this._field; }\r
-        }\r
-\r
-        public override MemberInfo UnderlyingMember\r
-        {\r
-            get { return this.UndelyingField; }\r
-        }\r
-\r
-        public override bool CanRead\r
-        {\r
-            get { return true; }\r
-        }\r
-\r
-        public override bool CanWrite\r
-        {\r
-            get { return !this.UndelyingField.IsInitOnly; }\r
-        }\r
-\r
-        public override bool RequiresInstance\r
-        {\r
-            get { return !this.UndelyingField.IsStatic; }\r
-        }\r
-\r
-        public override Type ReturnType\r
-        {\r
-            get { return this.UndelyingField.FieldType; }\r
-        }\r
-\r
-        public override ReflectionItemType ItemType\r
-        {\r
-            get { return ReflectionItemType.Field; }\r
-        }\r
-\r
-        public override object GetValue(object instance)\r
-        {\r
-            return this.UndelyingField.SafeGetValue(instance);\r
-        }\r
-\r
-        public override void SetValue(object instance, object value)\r
-        {\r
-            this.UndelyingField.SafeSetValue(instance, value);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionImportDefinition.cs
deleted file mode 100644 (file)
index 95f61bc..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal abstract class ReflectionImportDefinition : ContractBasedImportDefinition, ICompositionElement\r
-    {\r
-        private readonly ICompositionElement _origin;\r
-\r
-        public ReflectionImportDefinition(\r
-            string contractName, \r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-            ImportCardinality cardinality, \r
-            bool isRecomposable, \r
-            bool isPrerequisite, \r
-            CreationPolicy requiredCreationPolicy,\r
-            ICompositionElement origin) \r
-            : base(contractName, requiredTypeIdentity, requiredMetadata, cardinality, isRecomposable, isPrerequisite, requiredCreationPolicy)\r
-        {\r
-            this._origin = origin;\r
-        }\r
-\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return this.GetDisplayName(); }\r
-        }\r
-\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return this._origin; }\r
-        }\r
-\r
-        public override string ToString()\r
-        {\r
-            return this.GetDisplayName();\r
-        }\r
-\r
-        public abstract ImportingItem ToImportingItem();\r
-\r
-        protected abstract string GetDisplayName();\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItem.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItem.cs
deleted file mode 100644 (file)
index 97420f1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal abstract class ReflectionItem\r
-    {\r
-        public abstract string Name { get; }\r
-        public abstract string GetDisplayName();\r
-        public abstract Type ReturnType { get; }\r
-        public abstract ReflectionItemType ItemType { get; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItemType.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionItemType.cs
deleted file mode 100644 (file)
index 2607fec..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal enum ReflectionItemType : int\r
-    {\r
-        Parameter = 0,\r
-        Field = 1,\r
-        Property = 2,\r
-        Method = 3,\r
-        Type = 4,\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMember.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMember.cs
deleted file mode 100644 (file)
index 9ccbc4d..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal abstract class ReflectionMember : ReflectionItem\r
-    {\r
-        public abstract bool CanRead\r
-        {\r
-            get;\r
-        }\r
-        \r
-        public Type DeclaringType\r
-        {\r
-            get { return this.UnderlyingMember.DeclaringType; }\r
-        }\r
-\r
-        public override string Name\r
-        {\r
-            get { return this.UnderlyingMember.Name; }\r
-        }\r
-\r
-        public override string GetDisplayName()\r
-        {\r
-            return this.UnderlyingMember.GetDisplayName();\r
-        }\r
-\r
-        public abstract bool RequiresInstance\r
-        {\r
-            get;\r
-        }\r
-\r
-        public abstract MemberInfo UnderlyingMember { get; }\r
-\r
-        public abstract object GetValue(object instance);\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberExportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberExportDefinition.cs
deleted file mode 100644 (file)
index ac81434..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ReflectionMemberExportDefinition : ExportDefinition, ICompositionElement\r
-    {\r
-        private readonly LazyMemberInfo _member;\r
-        private readonly ExportDefinition _exportDefinition;\r
-        private readonly ICompositionElement _origin;\r
-        private IDictionary<string, object> _metadata;\r
-\r
-        public ReflectionMemberExportDefinition(LazyMemberInfo member, ExportDefinition exportDefinition, ICompositionElement origin)\r
-        {\r
-            Assumes.NotNull(exportDefinition);\r
-\r
-            this._member = member;\r
-            this._exportDefinition = exportDefinition;\r
-            this._origin = origin;\r
-        }\r
-\r
-        public override string ContractName\r
-        {\r
-            get { return this._exportDefinition.ContractName; }\r
-        }\r
-\r
-        public LazyMemberInfo ExportingLazyMember\r
-        {\r
-            get { return this._member; }\r
-        }\r
-\r
-        public override IDictionary<string, object> Metadata\r
-        {\r
-            get\r
-            {\r
-                if (this._metadata == null)\r
-                {\r
-                    var metadata = this._exportDefinition.Metadata ?? MetadataServices.EmptyMetadata;\r
-                    this._metadata = metadata.AsReadOnly();\r
-                }\r
-                return this._metadata;\r
-            }\r
-        }\r
-\r
-        string ICompositionElement.DisplayName\r
-        {\r
-            get { return this.GetDisplayName(); }\r
-        }\r
-\r
-        ICompositionElement ICompositionElement.Origin\r
-        {\r
-            get { return this._origin; }\r
-        }\r
-\r
-        public override string ToString()\r
-        {\r
-            return this.GetDisplayName();\r
-        }\r
-\r
-        public ExportingMember ToExportingMember()\r
-        {\r
-            return new ExportingMember(this, this.ToReflectionMember());\r
-        }\r
-\r
-        private ReflectionMember ToReflectionMember()\r
-        {\r
-            return this.ExportingLazyMember.ToReflectionMember();\r
-        }\r
-\r
-        private string GetDisplayName()\r
-        {\r
-            return string.Format(CultureInfo.CurrentCulture,\r
-                   "{0} (ContractName=\"{1}\")",    // NOLOC\r
-                   this.ToReflectionMember().GetDisplayName(),\r
-                   this.ContractName);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinition.cs
deleted file mode 100644 (file)
index af179fb..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using Microsoft.Internal.Collections;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ReflectionMemberImportDefinition : ReflectionImportDefinition\r
-    {\r
-        private LazyMemberInfo _importingLazyMember;\r
-\r
-        public ReflectionMemberImportDefinition(\r
-            LazyMemberInfo importingLazyMember,\r
-            string contractName, \r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-            ImportCardinality cardinality, \r
-            bool isRecomposable, \r
-            CreationPolicy requiredCreationPolicy,\r
-            ICompositionElement origin) \r
-            : base(contractName, requiredTypeIdentity, requiredMetadata, cardinality, isRecomposable, false, requiredCreationPolicy, origin)\r
-        {\r
-            Assumes.NotNull(contractName);\r
-\r
-            this._importingLazyMember = importingLazyMember;\r
-        }\r
-\r
-        public override ImportingItem ToImportingItem()\r
-        {\r
-            ReflectionWritableMember member = this.ImportingLazyMember.ToReflectionWriteableMember();\r
-            return new ImportingMember(this, member, new ImportType(member.ReturnType, this.Cardinality));\r
-        }\r
-\r
-        public LazyMemberInfo ImportingLazyMember\r
-        {\r
-            get { return this._importingLazyMember; } \r
-        }\r
-\r
-        protected override string GetDisplayName()\r
-        {\r
-            return string.Format(\r
-                CultureInfo.CurrentCulture,\r
-                "{0} (ContractName=\"{1}\")",    // NOLOC\r
-                this.ImportingLazyMember.ToReflectionMember().GetDisplayName(),\r
-                this.ContractName);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMethod.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionMethod.cs
deleted file mode 100644 (file)
index 9dd963d..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal partial class ReflectionMethod : ReflectionMember\r
-    {\r
-        private readonly MethodInfo _method;\r
-\r
-        public ReflectionMethod(MethodInfo method)\r
-        {\r
-            Assumes.NotNull(method);\r
-\r
-            this._method = method;\r
-        }\r
-\r
-        public MethodInfo UnderlyingMethod\r
-        {\r
-            get { return this._method; }\r
-        }\r
-\r
-        public override MemberInfo UnderlyingMember\r
-        {\r
-            get { return this.UnderlyingMethod; }\r
-        }\r
-\r
-        public override bool CanRead\r
-        {\r
-            get { return true; }\r
-        }\r
-\r
-        public override bool RequiresInstance\r
-        {\r
-            get { return !this.UnderlyingMethod.IsStatic; }\r
-        }\r
-\r
-        public override Type ReturnType\r
-        {\r
-            get { return this.UnderlyingMethod.ReturnType; }\r
-        }\r
-\r
-        public override ReflectionItemType ItemType\r
-        {\r
-            get { return ReflectionItemType.Method; }\r
-        }\r
-\r
-        public override object GetValue(object instance)\r
-        {\r
-            return SafeCreateExportedDelegate(instance, _method);\r
-        }\r
-#if !SILVERLIGHT\r
-        [System.Security.SecuritySafeCritical]\r
-#endif\r
-        private static ExportedDelegate SafeCreateExportedDelegate(object instance, MethodInfo method)\r
-        {\r
-            // We demand member access in place of the [SecurityCritical] \r
-            // attribute on ExportDelegate constructor\r
-            ReflectionInvoke.DemandMemberAccessIfNeeded(method);\r
-\r
-            return new ExportedDelegate(instance, method);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServices.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServices.cs
deleted file mode 100644 (file)
index 72cd0f8..0000000
+++ /dev/null
@@ -1,444 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-#if !SILVERLIGHT\r
-    [System.Security.SecurityCritical]\r
-#endif\r
-    public static class ReflectionModelServices\r
-    {\r
-        public static Lazy<Type> GetPartType(ComposablePartDefinition partDefinition)\r
-        {\r
-            Requires.NotNull(partDefinition, "partDefinition");\r
-\r
-            ReflectionComposablePartDefinition reflectionPartDefinition = partDefinition as ReflectionComposablePartDefinition;\r
-            if (reflectionPartDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidPartDefinition, partDefinition.GetType()),\r
-                    "partDefinition");\r
-            }\r
-\r
-            return reflectionPartDefinition.GetLazyPartType();\r
-        }\r
-\r
-        public static bool IsDisposalRequired(ComposablePartDefinition partDefinition)\r
-        {\r
-            Requires.NotNull(partDefinition, "partDefinition");\r
-\r
-            ReflectionComposablePartDefinition reflectionPartDefinition = partDefinition as ReflectionComposablePartDefinition;\r
-            if (reflectionPartDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidPartDefinition, partDefinition.GetType()),\r
-                    "partDefinition");\r
-            }\r
-\r
-            return reflectionPartDefinition.IsDisposalRequired;\r
-        }\r
-\r
-        public static LazyMemberInfo GetExportingMember(ExportDefinition exportDefinition)\r
-        {\r
-            Requires.NotNull(exportDefinition, "exportDefinition");\r
-\r
-            ReflectionMemberExportDefinition reflectionExportDefinition = exportDefinition as ReflectionMemberExportDefinition;\r
-            if (reflectionExportDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidExportDefinition, exportDefinition.GetType()),\r
-                    "exportDefinition");\r
-            }\r
-\r
-            return reflectionExportDefinition.ExportingLazyMember;\r
-        }\r
-\r
-        public static LazyMemberInfo GetImportingMember(ImportDefinition importDefinition)\r
-        {\r
-            Requires.NotNull(importDefinition, "importDefinition");\r
-\r
-            ReflectionMemberImportDefinition reflectionMemberImportDefinition = importDefinition as ReflectionMemberImportDefinition;\r
-            if (reflectionMemberImportDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidMemberImportDefinition, importDefinition.GetType()),\r
-                    "importDefinition");\r
-            }\r
-\r
-            return reflectionMemberImportDefinition.ImportingLazyMember;\r
-        }\r
-\r
-        public static Lazy<ParameterInfo> GetImportingParameter(ImportDefinition importDefinition)\r
-        {\r
-            Requires.NotNull(importDefinition, "importDefinition");\r
-\r
-            ReflectionParameterImportDefinition reflectionParameterImportDefinition = importDefinition as ReflectionParameterImportDefinition;\r
-            if (reflectionParameterImportDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidParameterImportDefinition, importDefinition.GetType()),\r
-                    "importDefinition");\r
-            }\r
-\r
-            return reflectionParameterImportDefinition.ImportingLazyParameter;\r
-        }\r
-\r
-        public static bool IsImportingParameter(ImportDefinition importDefinition)\r
-        {\r
-            Requires.NotNull(importDefinition, "importDefinition");\r
-\r
-            ReflectionImportDefinition reflectionImportDefinition = importDefinition as ReflectionImportDefinition;\r
-            if (reflectionImportDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidImportDefinition, importDefinition.GetType()),\r
-                    "importDefinition");\r
-            }\r
-\r
-            return (importDefinition is ReflectionParameterImportDefinition);\r
-        }\r
-\r
-        internal static bool IsExportFactoryImportDefinition(ImportDefinition importDefinition)\r
-        {\r
-            Requires.NotNull(importDefinition, "importDefinition");\r
-\r
-            ReflectionImportDefinition reflectionImportDefinition = importDefinition as ReflectionImportDefinition;\r
-            if (reflectionImportDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidImportDefinition, importDefinition.GetType()),\r
-                    "importDefinition");\r
-            }\r
-\r
-            return (importDefinition is IPartCreatorImportDefinition);\r
-        }\r
-\r
-        internal static ContractBasedImportDefinition GetPartCreatorProductImportDefinition(ImportDefinition importDefinition)\r
-        {\r
-            Requires.NotNull(importDefinition, "importDefinition");\r
-\r
-            IPartCreatorImportDefinition partCreatorImportDefinition = importDefinition as IPartCreatorImportDefinition;\r
-            if (partCreatorImportDefinition == null)\r
-            {\r
-                throw new ArgumentException(\r
-                    string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidImportDefinition, importDefinition.GetType()),\r
-                    "importDefinition");\r
-            }\r
-\r
-            return partCreatorImportDefinition.ProductImportDefinition;\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public static ComposablePartDefinition CreatePartDefinition(\r
-            Lazy<Type> partType,\r
-            bool isDisposalRequired,\r
-            Lazy<IEnumerable<ImportDefinition>> imports,\r
-            Lazy<IEnumerable<ExportDefinition>> exports,\r
-            Lazy<IDictionary<string, object>> metadata,\r
-            ICompositionElement origin)\r
-        {\r
-            Requires.NotNull(partType, "partType");\r
-\r
-            return new ReflectionComposablePartDefinition(\r
-                new ReflectionPartCreationInfo(\r
-                    partType,\r
-                    isDisposalRequired,\r
-                    imports,\r
-                    exports,\r
-                    metadata,\r
-                    origin));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public static ExportDefinition CreateExportDefinition(\r
-            LazyMemberInfo exportingMember,\r
-            string contractName,\r
-            Lazy<IDictionary<string, object>> metadata,\r
-            ICompositionElement origin)\r
-        {\r
-            Requires.NotNullOrEmpty(contractName, "contractName");\r
-            Requires.IsInMembertypeSet(exportingMember.MemberType, "exportingMember", MemberTypes.Field | MemberTypes.Property | MemberTypes.NestedType | MemberTypes.TypeInfo | MemberTypes.Method);\r
-\r
-            return new ReflectionMemberExportDefinition(\r
-                exportingMember,\r
-                new LazyExportDefinition(contractName, metadata),\r
-                origin);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public static ContractBasedImportDefinition CreateImportDefinition(\r
-            LazyMemberInfo importingMember,\r
-            string contractName,\r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-            ImportCardinality cardinality,\r
-            bool isRecomposable,\r
-            CreationPolicy requiredCreationPolicy,\r
-            ICompositionElement origin)\r
-        {\r
-            return CreateImportDefinition(importingMember, contractName, requiredTypeIdentity, requiredMetadata, cardinality, isRecomposable, requiredCreationPolicy, false, origin);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        internal static ContractBasedImportDefinition CreateImportDefinition(\r
-            LazyMemberInfo importingMember,\r
-            string contractName,\r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-            ImportCardinality cardinality,\r
-            bool isRecomposable,\r
-            CreationPolicy requiredCreationPolicy,\r
-            bool isExportFactory,\r
-            ICompositionElement origin)\r
-        {\r
-            Requires.NotNullOrEmpty(contractName, "contractName");\r
-            Requires.IsInMembertypeSet(importingMember.MemberType, "importingMember", MemberTypes.Property | MemberTypes.Field);\r
-\r
-            if (isExportFactory)\r
-            {\r
-                return new PartCreatorMemberImportDefinition(\r
-                    importingMember,\r
-                    origin,\r
-                    new ContractBasedImportDefinition(\r
-                        contractName,\r
-                        requiredTypeIdentity,\r
-                        requiredMetadata,\r
-                        cardinality,\r
-                        isRecomposable,\r
-                        false,\r
-                        CreationPolicy.NonShared));\r
-            }\r
-            else\r
-            {\r
-                return new ReflectionMemberImportDefinition(\r
-                    importingMember,\r
-                    contractName,\r
-                    requiredTypeIdentity,\r
-                    requiredMetadata,\r
-                    cardinality,\r
-                    isRecomposable,\r
-                    requiredCreationPolicy,\r
-                    origin);\r
-            }\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        public static ContractBasedImportDefinition CreateImportDefinition(\r
-            Lazy<ParameterInfo> parameter,\r
-            string contractName,\r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-            ImportCardinality cardinality,\r
-            CreationPolicy requiredCreationPolicy,\r
-            ICompositionElement origin)\r
-        {\r
-            return CreateImportDefinition(parameter, contractName, requiredTypeIdentity, requiredMetadata, cardinality, requiredCreationPolicy, false, origin);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]\r
-        internal static ContractBasedImportDefinition CreateImportDefinition(\r
-            Lazy<ParameterInfo> parameter,\r
-            string contractName,\r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string, Type>> requiredMetadata,\r
-            ImportCardinality cardinality,\r
-            CreationPolicy requiredCreationPolicy,\r
-            bool isExportFactory,\r
-            ICompositionElement origin)\r
-        {\r
-            Requires.NotNull(parameter, "parameter");\r
-            Requires.NotNullOrEmpty(contractName, "contractName");\r
-\r
-            if (isExportFactory)\r
-            {\r
-                return new PartCreatorParameterImportDefinition(\r
-                    parameter,\r
-                    origin,\r
-                    new ContractBasedImportDefinition(\r
-                        contractName,\r
-                        requiredTypeIdentity,\r
-                        requiredMetadata,\r
-                        cardinality,\r
-                        false,\r
-                        true,\r
-                        CreationPolicy.NonShared));\r
-            }\r
-            else\r
-            {\r
-                return new ReflectionParameterImportDefinition(\r
-                    parameter,\r
-                    contractName,\r
-                    requiredTypeIdentity,\r
-                    requiredMetadata,\r
-                    cardinality,\r
-                    requiredCreationPolicy,\r
-                    origin);\r
-            }\r
-        }\r
-    }\r
-        internal class ReflectionPartCreationInfo : IReflectionPartCreationInfo\r
-        {\r
-            private readonly Lazy<Type> _partType;\r
-            private readonly Lazy<IEnumerable<ImportDefinition>> _imports;\r
-            private readonly Lazy<IEnumerable<ExportDefinition>> _exports;\r
-            private readonly Lazy<IDictionary<string, object>> _metadata;\r
-            private readonly ICompositionElement _origin;\r
-            private ConstructorInfo _constructor;\r
-            private bool _isDisposalRequired;\r
-\r
-            public ReflectionPartCreationInfo(\r
-                Lazy<Type> partType,\r
-                bool isDisposalRequired,\r
-                Lazy<IEnumerable<ImportDefinition>> imports,\r
-                Lazy<IEnumerable<ExportDefinition>> exports,\r
-                Lazy<IDictionary<string, object>> metadata,\r
-                ICompositionElement origin)\r
-            {\r
-                Assumes.NotNull(partType);\r
-\r
-                this._partType = partType;\r
-                this._isDisposalRequired = isDisposalRequired;\r
-                this._imports = imports;\r
-                this._exports = exports;\r
-                this._metadata = metadata;\r
-                this._origin = origin;\r
-            }\r
-\r
-            public Type GetPartType()\r
-            {\r
-                return this._partType.GetNotNullValue("type");\r
-            }\r
-\r
-            public Lazy<Type> GetLazyPartType()\r
-            {\r
-                return this._partType;\r
-            }\r
-\r
-            public ConstructorInfo GetConstructor()\r
-            {\r
-                if (this._constructor == null)\r
-                {\r
-                    ConstructorInfo[] constructors = null;\r
-                    constructors = this.GetImports()\r
-                        .OfType<ReflectionParameterImportDefinition>()\r
-                        .Select(parameterImport => parameterImport.ImportingLazyParameter.Value.Member)\r
-                        .OfType<ConstructorInfo>()\r
-                        .Distinct()\r
-                        .ToArray();\r
-\r
-                    if (constructors.Length == 1)\r
-                    {\r
-                        this._constructor = constructors[0];\r
-                    }\r
-                    else if (constructors.Length == 0)\r
-                    {\r
-                        this._constructor = this.GetPartType().GetConstructor(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, null, Type.EmptyTypes, null);\r
-                    }\r
-                }\r
-                return this._constructor;\r
-            }\r
-\r
-            public bool IsDisposalRequired\r
-            {\r
-                get\r
-                {\r
-                    return this._isDisposalRequired;\r
-                }\r
-            }\r
-\r
-            public IDictionary<string, object> GetMetadata()\r
-            {\r
-                return (this._metadata != null) ? this._metadata.Value : null;\r
-            }\r
-\r
-            public IEnumerable<ExportDefinition> GetExports()\r
-            {\r
-                if (this._exports == null)\r
-                {\r
-                    yield break;\r
-                }\r
-\r
-                IEnumerable<ExportDefinition> exports = this._exports.Value;\r
-\r
-                if (exports == null)\r
-                {\r
-                    yield break;\r
-                }\r
-\r
-                foreach (ExportDefinition export in exports)\r
-                {\r
-                    ReflectionMemberExportDefinition reflectionExport = export as ReflectionMemberExportDefinition;\r
-                    if (reflectionExport == null)\r
-                    {\r
-                        throw new InvalidOperationException(\r
-                            string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidExportDefinition, export.GetType()));\r
-                    }\r
-                    yield return reflectionExport;\r
-                }\r
-            }\r
-\r
-            public IEnumerable<ImportDefinition> GetImports()\r
-            {\r
-                if (this._imports == null)\r
-                {\r
-                    yield break;\r
-                }\r
-\r
-                IEnumerable<ImportDefinition> imports = this._imports.Value;\r
-\r
-                if (imports == null)\r
-                {\r
-                    yield break;\r
-                }\r
-\r
-                foreach (ImportDefinition import in imports)\r
-                {\r
-                    ReflectionImportDefinition reflectionImport = import as ReflectionImportDefinition;\r
-                    if (reflectionImport == null)\r
-                    {\r
-                        throw new InvalidOperationException(\r
-                            string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidMemberImportDefinition, import.GetType()));\r
-                    }\r
-                    yield return reflectionImport;\r
-                }\r
-            }\r
-\r
-            public string DisplayName\r
-            {\r
-                get { return this.GetPartType().GetDisplayName(); }\r
-            }\r
-\r
-            public ICompositionElement Origin\r
-            {\r
-                get { return this._origin; }\r
-            }\r
-        }\r
-\r
-        internal class LazyExportDefinition : ExportDefinition\r
-        {\r
-            private readonly Lazy<IDictionary<string, object>> _metadata;\r
-\r
-            public LazyExportDefinition(string contractName, Lazy<IDictionary<string, object>> metadata)\r
-                : base(contractName, (IDictionary<string, object>)null)\r
-            {\r
-                this._metadata = metadata;\r
-            }\r
-\r
-            public override IDictionary<string, object> Metadata\r
-            {\r
-                get\r
-                {\r
-                    return this._metadata.Value;\r
-                }\r
-            }\r
-        }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameter.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameter.cs
deleted file mode 100644 (file)
index 7531247..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ReflectionParameter : ReflectionItem\r
-    {\r
-        private readonly ParameterInfo _parameter;\r
-\r
-        public ReflectionParameter(ParameterInfo parameter)\r
-        {\r
-            Assumes.NotNull(parameter);\r
-\r
-            this._parameter = parameter;\r
-        }\r
-\r
-        public ParameterInfo UnderlyingParameter\r
-        {\r
-            get { return this._parameter; }\r
-        }\r
-\r
-        public override string Name\r
-        {\r
-            get { return this.UnderlyingParameter.Name; }\r
-        }\r
-\r
-        public override string GetDisplayName()\r
-        {\r
-            return string.Format(\r
-                CultureInfo.CurrentCulture,\r
-                "{0} (Parameter=\"{1}\")",  // NOLOC\r
-                this.UnderlyingParameter.Member.GetDisplayName(),\r
-                this.UnderlyingParameter.Name);\r
-        }\r
-\r
-        public override Type ReturnType\r
-        {\r
-            get { return this.UnderlyingParameter.ParameterType; }\r
-        }\r
-\r
-        public override ReflectionItemType ItemType\r
-        {\r
-            get { return ReflectionItemType.Parameter; }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameterImportDefinition.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionParameterImportDefinition.cs
deleted file mode 100644 (file)
index 93e6238..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.ComponentModel.Composition.ReflectionModel;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ReflectionParameterImportDefinition : ReflectionImportDefinition\r
-    {\r
-        private Lazy<ParameterInfo> _importingLazyParameter;\r
-\r
-        public ReflectionParameterImportDefinition(\r
-            Lazy<ParameterInfo> importingLazyParameter,\r
-            string contractName, \r
-            string requiredTypeIdentity,\r
-            IEnumerable<KeyValuePair<string,Type>> requiredMetadata,\r
-            ImportCardinality cardinality, \r
-            CreationPolicy requiredCreationPolicy,\r
-            ICompositionElement origin) \r
-            : base(contractName, requiredTypeIdentity, requiredMetadata, cardinality, false, true, requiredCreationPolicy, origin)\r
-        {\r
-            Assumes.NotNull(importingLazyParameter);\r
-\r
-            this._importingLazyParameter = importingLazyParameter;\r
-        }\r
-\r
-        public override ImportingItem ToImportingItem()\r
-        {\r
-            return new ImportingParameter(this, new ImportType(this.ImportingLazyParameter.GetNotNullValue("parameter").ParameterType, this.Cardinality));\r
-        }\r
-\r
-        public Lazy<ParameterInfo> ImportingLazyParameter\r
-        {\r
-            get { return this._importingLazyParameter; }\r
-        }\r
-\r
-        protected override string GetDisplayName()\r
-        {\r
-            ParameterInfo parameter = this.ImportingLazyParameter.GetNotNullValue("parameter");\r
-            return string.Format(\r
-                CultureInfo.CurrentCulture,\r
-                "{0} (Parameter=\"{1}\", ContractName=\"{2}\")",  // NOLOC\r
-                parameter.Member.GetDisplayName(),\r
-                parameter.Name,                \r
-                this.ContractName);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionProperty.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionProperty.cs
deleted file mode 100644 (file)
index af62622..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    // Instead of representing properties as an actual PropertyInfo, we need to \r
-    // represent them as two MethodInfo objects one for each accessor. This is so \r
-    // that cached attribute part can go from a metadata token -> XXXInfo without \r
-    // needing to walk all members of a particular type. Unfortunately, (probably \r
-    // because you never see one of them in an IL stream), Reflection does not allow \r
-    // you to go from a metadata token -> PropertyInfo like it does with types, \r
-    // fields, and methods.\r
-\r
-    internal class ReflectionProperty : ReflectionWritableMember\r
-    {\r
-        private readonly MethodInfo _getMethod;\r
-        private readonly MethodInfo _setMethod;\r
-\r
-        public ReflectionProperty(MethodInfo getMethod, MethodInfo setMethod)\r
-        {\r
-            Assumes.IsTrue(getMethod != null || setMethod != null);\r
-\r
-            this._getMethod = getMethod;\r
-            this._setMethod = setMethod;\r
-        }\r
-\r
-        public override MemberInfo UnderlyingMember\r
-        {\r
-            get { return this.UnderlyingGetMethod ?? this.UnderlyingSetMethod; }\r
-        }\r
-\r
-        public override bool CanRead\r
-        {\r
-            get { return this.UnderlyingGetMethod != null; }\r
-        }\r
-\r
-        public override bool CanWrite\r
-        {\r
-            get { return this.UnderlyingSetMethod != null; }\r
-        }\r
-\r
-        public MethodInfo UnderlyingGetMethod\r
-        {\r
-            get { return this._getMethod; }\r
-        }\r
-\r
-        public MethodInfo UnderlyingSetMethod\r
-        {\r
-            get { return this._setMethod; }\r
-        }\r
-\r
-        public override string Name\r
-        {\r
-            get\r
-            {\r
-                MethodInfo method = this.UnderlyingGetMethod ?? this.UnderlyingSetMethod;\r
-\r
-                string name = method.Name;\r
-\r
-                Assumes.IsTrue(name.Length > 4);\r
-\r
-                // Remove 'get_' or 'set_'\r
-                return name.Substring(4);\r
-            }\r
-        }\r
-\r
-        public override string GetDisplayName()\r
-        {\r
-            return ReflectionServices.GetDisplayName(this.DeclaringType, this.Name);\r
-        }\r
-\r
-        public override bool RequiresInstance\r
-        {\r
-            get\r
-            {\r
-                MethodInfo method = this.UnderlyingGetMethod ?? this.UnderlyingSetMethod;\r
-\r
-                return !method.IsStatic;\r
-            }\r
-        }\r
-\r
-        public override Type ReturnType\r
-        {\r
-            get\r
-            {\r
-                if (this.UnderlyingGetMethod != null)\r
-                {\r
-                    return this.UnderlyingGetMethod.ReturnType;\r
-                }\r
-\r
-                ParameterInfo[] parameters = this.UnderlyingSetMethod.GetParameters();\r
-\r
-                Assumes.IsTrue(parameters.Length > 0);\r
-\r
-                return parameters[parameters.Length - 1].ParameterType;\r
-            }\r
-        }\r
-\r
-        public override ReflectionItemType ItemType\r
-        {\r
-            get { return ReflectionItemType.Property; }\r
-        }\r
-\r
-        public override object GetValue(object instance)\r
-        {\r
-            Assumes.NotNull(this._getMethod);\r
-\r
-            return this.UnderlyingGetMethod.SafeInvoke(instance);\r
-        }\r
-\r
-        public override void SetValue(object instance, object value)\r
-        {\r
-            Assumes.NotNull(this._setMethod);\r
-\r
-            this.UnderlyingSetMethod.SafeInvoke(instance, value);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionType.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionType.cs
deleted file mode 100644 (file)
index 6d754d5..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.AttributedModel;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-using System.Threading;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal class ReflectionType : ReflectionMember\r
-    {\r
-        private Type _type;\r
-\r
-        public ReflectionType(Type type)\r
-        {\r
-            Assumes.NotNull(type);\r
-\r
-            this._type = type;\r
-        }\r
-\r
-        public override MemberInfo UnderlyingMember\r
-        {\r
-            get { return this._type; }\r
-        }\r
-\r
-        public Type UnderlyingType\r
-        {\r
-            get { return this._type; }\r
-        }\r
-\r
-        public override bool CanRead\r
-        {\r
-            get { return true; }\r
-        }\r
-\r
-        public override bool RequiresInstance\r
-        {\r
-            get { return true; }\r
-        }\r
-\r
-        public override Type ReturnType\r
-        {\r
-            get { return this._type; }\r
-        }\r
-\r
-        public override ReflectionItemType ItemType\r
-        {\r
-            get { return ReflectionItemType.Type; }\r
-        }\r
-\r
-        public override object GetValue(object instance)\r
-        {\r
-            return instance;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionWritableMember.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/ComponentModel/Composition/ReflectionModel/ReflectionWritableMember.cs
deleted file mode 100644 (file)
index 7640b3b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Reflection;\r
-using Microsoft.Internal;\r
-\r
-namespace System.ComponentModel.Composition.ReflectionModel\r
-{\r
-    internal abstract class ReflectionWritableMember : ReflectionMember\r
-    {\r
-        public abstract bool CanWrite\r
-        {\r
-            get;\r
-        }\r
-\r
-        public abstract void SetValue(object instance, object value);\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/Lazy.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/Lazy.cs
deleted file mode 100644 (file)
index 6d3b11a..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !CLR40\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-namespace System\r
-{\r
-    public class Lazy<T>\r
-    {\r
-        private T _value = default(T);\r
-        private volatile bool _isValueCreated = false;\r
-        private Func<T> _valueFactory = null;\r
-        private object _lock;\r
-\r
-        public Lazy()\r
-            : this(() => Activator.CreateInstance<T>())\r
-        {\r
-        }\r
-\r
-        public Lazy(bool isThreadSafe)\r
-            : this(() => Activator.CreateInstance<T>(), isThreadSafe)\r
-        {\r
-        }\r
-\r
-        public Lazy(Func<T> valueFactory):\r
-            this(valueFactory, true)\r
-        {\r
-        }\r
-\r
-        public Lazy(Func<T> valueFactory, bool isThreadSafe)\r
-        {\r
-            Requires.NotNull(valueFactory, "valueFactory");\r
-            if(isThreadSafe)\r
-            {\r
-                this._lock = new object();\r
-            }\r
-\r
-            this._valueFactory = valueFactory;\r
-        }\r
-\r
-\r
-        public T Value\r
-        {\r
-            get\r
-            {\r
-                if (!this._isValueCreated)\r
-                {\r
-                    if(this._lock != null)\r
-                    {\r
-                        Monitor.Enter(this._lock);\r
-                    }\r
-\r
-                    try\r
-                    {\r
-                        T value = this._valueFactory.Invoke();\r
-                        this._valueFactory = null;\r
-                        Thread.MemoryBarrier();\r
-                        this._value = value;\r
-                        this._isValueCreated = true;\r
-                    }\r
-                    finally\r
-                    {\r
-                        if(this._lock != null)\r
-                        {\r
-                            Monitor.Exit(this._lock);\r
-                        }\r
-                    }\r
-                }\r
-                return this._value;\r
-            }\r
-        }\r
-    }\r
-}\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/LazyOfTTMetadata.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/LazyOfTTMetadata.cs
deleted file mode 100644 (file)
index 287babe..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace System\r
-{\r
-#if CLR40 && !SILVERLIGHT\r
-    [Serializable]\r
-#endif\r
-    public class Lazy<T, TMetadata> : Lazy<T>\r
-    {\r
-        private TMetadata _metadata;\r
-\r
-        public Lazy(Func<T> valueFactory, TMetadata metadata) : \r
-            base(valueFactory)\r
-        {\r
-            this._metadata = metadata;\r
-        }\r
-\r
-        public Lazy(TMetadata metadata) :\r
-            base()\r
-        {\r
-            this._metadata = metadata;\r
-        }\r
-\r
-\r
-        public Lazy(TMetadata metadata, bool isThreadSafe) : \r
-            base(isThreadSafe)\r
-        {\r
-            this._metadata = metadata;\r
-        }\r
-\r
-        public Lazy(Func<T> valueFactory, TMetadata metadata, bool isThreadSafe) :\r
-            base(valueFactory, isThreadSafe)\r
-        {\r
-            this._metadata = metadata;\r
-        }\r
-\r
-        public TMetadata Metadata\r
-        {\r
-            get\r
-            {\r
-                return this._metadata;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/Tuple.cs b/mcs/class/System.ComponentModel.Composition/src/ComponentModel/System/Tuple.cs
deleted file mode 100644 (file)
index 03a4828..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if !CLR40\r
-using System;\r
-\r
-namespace System\r
-{\r
-    // This is a very minimalistic implementation of Tuple'2 that allows us\r
-    // to compile and work on versions of .Net eariler then 4.0.\r
-    public struct Tuple<TItem1, TItem2>\r
-    {\r
-        public Tuple(TItem1 item1, TItem2 item2)\r
-        {\r
-            this = new Tuple<TItem1, TItem2>();\r
-            this.Item1 = item1;\r
-            this.Item2 = item2;\r
-        }\r
-\r
-        public TItem1 Item1 { get; private set; }\r
-        public TItem2 Item2 { get; private set; }\r
-\r
-        public override bool Equals(object obj)\r
-        {\r
-            if (obj is Tuple<TItem1, TItem2>)\r
-            {\r
-                Tuple<TItem1, TItem2> that = (Tuple<TItem1, TItem2>)obj;\r
-                return object.Equals(this.Item1, that.Item1) && object.Equals(this.Item2, that.Item2);\r
-            }\r
-            else\r
-            {\r
-                return false;\r
-            }\r
-        }\r
-\r
-        public override int GetHashCode()\r
-        {\r
-            return ((this.Item1 != null) ? this.Item1.GetHashCode() : 0) ^ ((this.Item2 != null) ? this.Item2.GetHashCode() : 0);\r
-        }\r
-\r
-        public static bool operator ==(Tuple<TItem1, TItem2> left, Tuple<TItem1, TItem2> right)\r
-        {\r
-            return left.Equals(right);\r
-        }\r
-\r
-        public static bool operator !=(Tuple<TItem1, TItem2> left, Tuple<TItem1, TItem2> right)\r
-        {\r
-            return !left.Equals(right);\r
-        }\r
-    }\r
-}\r
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/.gitattributes
deleted file mode 100644 (file)
index 76da6c3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/AssemblyInfo.cs -crlf
-/Strings.Designer.cs -crlf
-/Strings.resx -crlf
-/SuppressMessages.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/AssemblyInfo.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/AssemblyInfo.cs
deleted file mode 100644 (file)
index 50e0aec..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-//------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-//------------------------------------------------------------\r
-[assembly: System.CLSCompliant(true)]\r
-[assembly: System.Reflection.AssemblyTitle("System.ComponentModel.Composition.Initialization")]\r
-[assembly: System.Reflection.AssemblyCopyright("(c) Microsoft Corporation. All rights reserved.")]\r
-[assembly: System.Reflection.AssemblyVersion("2010.02.11")]\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Composition.Initialization.csproj b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Composition.Initialization.csproj
deleted file mode 100644 (file)
index c9e17ab..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">\r
-    <CodeAnalysisRuleSet>Migrated rules for Composition.Initialization.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules />\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <OutputPath>..\..\bin</OutputPath>\r
-    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>\r
-    <NoWarn>1570;1572;1573;1591;1699</NoWarn>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <ProjectClrTypes>FULLCLR;SILVERLIGHT</ProjectClrTypes>\r
-    <ProductVersion>10.0.20805</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <OutputType>Library</OutputType>\r
-    <AssemblyName>System.ComponentModel.Composition.Initialization</AssemblyName>\r
-    <RootNamespace>System.ComponentModel.Composition.Initialization</RootNamespace>\r
-    <DocumentationFile>$(OutputPath)\System.ComponentModel.Composition.Initialization.xml</DocumentationFile>\r
-    <ProjectGuid>{A497DC28-0A3B-4BAD-B964-B8B436686D98}</ProjectGuid>\r
-    <PublishUrl>publish\</PublishUrl>\r
-    <Install>true</Install>\r
-    <InstallFrom>Disk</InstallFrom>\r
-    <UpdateEnabled>false</UpdateEnabled>\r
-    <UpdateMode>Foreground</UpdateMode>\r
-    <UpdateInterval>7</UpdateInterval>\r
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
-    <UpdatePeriodically>false</UpdatePeriodically>\r
-    <UpdateRequired>false</UpdateRequired>\r
-    <MapFileExtensions>true</MapFileExtensions>\r
-    <ApplicationRevision>0</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
-    <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <UseApplicationTrust>false</UseApplicationTrust>\r
-    <BootstrapperEnabled>true</BootstrapperEnabled>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <NoStdLib>true</NoStdLib>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib" />\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="System.Net" />\r
-    <Reference Include="System.Xml" />\r
-    <ProjectReference Include="..\ComponentModel\ComponentModel.csproj">\r
-      <Project>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</Project>\r
-      <Name>ComponentModel</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup Condition="'$(IsSilverLight)' == 'true'">\r
-    <Reference Include="System.Windows" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionHost.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionInitializer.AssemblyList.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionInitializer.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DeploymentCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\Package.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="Strings.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>Strings.resx</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="SuppressMessages.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportFactoryOfT.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportFactoryOfTTMetadata.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportLifetimeContextOfT.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings.resx">\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
-      <Visible>False</Visible>\r
-      <ProductName>Windows Installer 3.1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />\r
-</Project>\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Composition.InitializationSL.csproj b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Composition.InitializationSL.csproj
deleted file mode 100644 (file)
index 27a77b8..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">\r
-    <CodeAnalysisRuleSet>Migrated rules for Composition.Initialization.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules />\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <IsSilverlight>true</IsSilverlight>\r
-    <DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>\r
-    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>\r
-    <OutputPath>..\..\bin\SL</OutputPath>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <NoWarn>1570;1572;1573;1591;1699</NoWarn>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <ProjectClrTypes>FULLCLR;SILVERLIGHT</ProjectClrTypes>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <OutputType>Library</OutputType>\r
-    <AssemblyName>System.ComponentModel.Composition.Initialization</AssemblyName>\r
-    <RootNamespace>System.ComponentModel.Composition.Initialization</RootNamespace>\r
-    <DocumentationFile>$(OutputPath)\System.ComponentModel.Composition.Initialization.xml</DocumentationFile>\r
-    <ProjectGuid>{A497DC28-0A3B-4BAD-B964-B8B436686D98}</ProjectGuid>\r
-    <PublishUrl>publish\</PublishUrl>\r
-    <Install>true</Install>\r
-    <InstallFrom>Disk</InstallFrom>\r
-    <UpdateEnabled>false</UpdateEnabled>\r
-    <UpdateMode>Foreground</UpdateMode>\r
-    <UpdateInterval>7</UpdateInterval>\r
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
-    <UpdatePeriodically>false</UpdatePeriodically>\r
-    <UpdateRequired>false</UpdateRequired>\r
-    <MapFileExtensions>true</MapFileExtensions>\r
-    <ApplicationRevision>0</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
-    <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <UseApplicationTrust>false</UseApplicationTrust>\r
-    <BootstrapperEnabled>true</BootstrapperEnabled>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <NoStdLib>true</NoStdLib>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="mscorlib" />\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="System.Net" />\r
-    <Reference Include="System.Xml" />\r
-    <ProjectReference Include="..\ComponentModel\ComponentModelSL.csproj">\r
-      <Project>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</Project>\r
-      <Name>ComponentModelSL</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup Condition="'$(IsSilverLight)' == 'true'">\r
-    <Reference Include="System.Windows" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionHost.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionInitializer.AssemblyList.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\CompositionInitializer.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\DeploymentCatalog.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\Hosting\Package.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="Strings.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>Strings.resx</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="SuppressMessages.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportFactoryOfT.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportFactoryOfTTMetadata.cs" />\r
-    <Compile Include="System\ComponentModel\Composition\ExportLifetimeContextOfT.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings.resx">\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
-      <Visible>False</Visible>\r
-      <ProductName>Windows Installer 3.1</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />\r
-  <ProjectExtensions>\r
-    <VisualStudio>\r
-      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">\r
-        <SilverlightProjectProperties />\r
-      </FlavorProperties>\r
-    </VisualStudio>\r
-  </ProjectExtensions>\r
-</Project>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/.gitattributes
deleted file mode 100644 (file)
index 3dc648d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/Lock.Reader.cs -crlf
-/Lock.Writer.cs -crlf
-/Lock.cs -crlf
-/Requires.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.Reader.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.Reader.cs
deleted file mode 100644 (file)
index 3f81a68..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal struct ReadLock : IDisposable\r
-    {\r
-        private readonly Lock _lock;\r
-        private int _isDisposed;\r
-\r
-        public ReadLock(Lock @lock)\r
-        {\r
-            this._isDisposed = 0;\r
-            this._lock = @lock;\r
-            this._lock.EnterReadLock();\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-            {\r
-                this._lock.ExitReadLock();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.Writer.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.Writer.cs
deleted file mode 100644 (file)
index e9d7088..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal struct WriteLock : IDisposable\r
-    {\r
-        private readonly Lock _lock;\r
-        private int _isDisposed;\r
-\r
-        public WriteLock(Lock @lock)\r
-        {\r
-            this._isDisposed = 0;\r
-            this._lock = @lock;\r
-            this._lock.EnterWriteLock();\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-            {\r
-                this._lock.ExitWriteLock();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Lock.cs
deleted file mode 100644 (file)
index 7cd7ac2..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal sealed class Lock : IDisposable\r
-    {\r
-#if (!SILVERLIGHT)\r
-        private ReaderWriterLockSlim _thisLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);\r
-        private int _isDisposed = 0;\r
-        public void EnterReadLock()\r
-        {\r
-            this._thisLock.EnterReadLock();\r
-        }\r
-\r
-        public void EnterWriteLock()\r
-        {\r
-            this._thisLock.EnterWriteLock();\r
-        }\r
-\r
-        public void ExitReadLock()\r
-        {\r
-            this._thisLock.ExitReadLock();\r
-        }\r
-\r
-        public void ExitWriteLock()\r
-        {\r
-            this._thisLock.ExitWriteLock();\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (Interlocked.CompareExchange(ref this._isDisposed, 1, 0) == 0)\r
-            {\r
-                this._thisLock.Dispose();\r
-            }\r
-        }\r
-\r
-#else\r
-        // ReaderWriterLockSlim is not yet implemented on SilverLight\r
-        // Satisfies our requirements until it is implemented\r
-        object _thisLock = new object();\r
-\r
-        public Lock()\r
-        {\r
-        }\r
-\r
-        public void EnterReadLock()\r
-        {\r
-            Monitor.Enter(this._thisLock);\r
-        }\r
-\r
-        public void EnterWriteLock()\r
-        {\r
-            Monitor.Enter(this._thisLock);\r
-        }\r
-\r
-        public void ExitReadLock()\r
-        {\r
-            Monitor.Exit(this._thisLock);\r
-        }\r
-\r
-        public void ExitWriteLock()\r
-        {\r
-            Monitor.Exit(this._thisLock);\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-        }\r
-#endif\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Requires.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Microsoft/Internal/Requires.cs
deleted file mode 100644 (file)
index c7c2d31..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Generic;\r
-using System.Diagnostics;\r
-using System.Linq;\r
-using System.Globalization;\r
-using System.Reflection;\r
-using System.ComponentModel.Composition;\r
-using System.Text;\r
-\r
-namespace Microsoft.Internal\r
-{\r
-    internal static class Requires\r
-    {\r
-        [DebuggerStepThrough]\r
-        public static void NotNull<T>(T value, string parameterName) \r
-            where T : class\r
-        {\r
-            if (value == null)\r
-            {\r
-                throw new ArgumentNullException(parameterName);\r
-            }\r
-        }\r
-\r
-        [DebuggerStepThrough]\r
-        public static void NotNullOrEmpty(string value, string parameterName)\r
-        {\r
-            NotNull(value, parameterName);\r
-\r
-            if (value.Length == 0)\r
-            {\r
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.ArgumentException_EmptyString, parameterName), parameterName);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Strings.Designer.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Strings.Designer.cs
deleted file mode 100644 (file)
index 9fe4543..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-//------------------------------------------------------------------------------\r
-// <auto-generated>\r
-//     This code was generated by a tool.\r
-//     Runtime Version:4.0.21114.1\r
-//\r
-//     Changes to this file may cause incorrect behavior and will be lost if\r
-//     the code is regenerated.\r
-// </auto-generated>\r
-//------------------------------------------------------------------------------\r
-\r
-namespace System.ComponentModel.Composition {\r
-    using System;\r
-    \r
-    \r
-    /// <summary>\r
-    ///   A strongly-typed resource class, for looking up localized strings, etc.\r
-    /// </summary>\r
-    // This class was auto-generated by the StronglyTypedResourceBuilder\r
-    // class via a tool like ResGen or Visual Studio.\r
-    // To add or remove a member, edit your .ResX file then rerun ResGen\r
-    // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    internal class Strings {\r
-        \r
-        private static global::System.Resources.ResourceManager resourceMan;\r
-        \r
-        private static global::System.Globalization.CultureInfo resourceCulture;\r
-        \r
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]\r
-        internal Strings() {\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Returns the cached ResourceManager instance used by this class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Resources.ResourceManager ResourceManager {\r
-            get {\r
-                if (object.ReferenceEquals(resourceMan, null)) {\r
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.ComponentModel.Composition.Initialization.Strings", typeof(Strings).Assembly);\r
-                    resourceMan = temp;\r
-                }\r
-                return resourceMan;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Overrides the current thread's CurrentUICulture property for all\r
-        ///   resource lookups using this strongly typed resource class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Globalization.CultureInfo Culture {\r
-            get {\r
-                return resourceCulture;\r
-            }\r
-            set {\r
-                resourceCulture = value;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to &apos;{0}&apos; cannot be an empty string (&quot;&quot;)..\r
-        /// </summary>\r
-        internal static string ArgumentException_EmptyString {\r
-            get {\r
-                return ResourceManager.GetString("ArgumentException_EmptyString", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot call SatisfyImports on a object of type &apos;{0}&apos; because it is marked with one or more ExportAttributes..\r
-        /// </summary>\r
-        internal static string ArgumentException_TypeHasExports {\r
-            get {\r
-                return ResourceManager.GetString("ArgumentException_TypeHasExports", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Catalog is trying to transition to an invalid state. Occurs when you call DownloadAsync more than once or CancelAsync is called at an incorrect time..\r
-        /// </summary>\r
-        internal static string InvalidOperationException_DeploymentCatalogInvalidStateChange {\r
-            get {\r
-                return ResourceManager.GetString("InvalidOperationException_DeploymentCatalogInvalidStateChange", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The package downloaded successfully but an error occurred while reading the contents of the package. See the inner exception for more details..\r
-        /// </summary>\r
-        internal static string InvalidOperationException_ErrorReadingXap {\r
-            get {\r
-                return ResourceManager.GetString("InvalidOperationException_ErrorReadingXap", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The container has already been initialized either by another call to InitializeContainer or by someone causing the default container to be constructed. Ensure that InitializeContainer is one of the first things that happens in the application host to ensure that it is ready for the first composition..\r
-        /// </summary>\r
-        internal static string InvalidOperationException_GlobalContainerAlreadyInitialized {\r
-            get {\r
-                return ResourceManager.GetString("InvalidOperationException_GlobalContainerAlreadyInitialized", resourceCulture);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Strings.resx b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/Strings.resx
deleted file mode 100644 (file)
index b451d64..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<root>\r
-       <!-- \r
-               Microsoft ResX Schema\r
-\r
-               Version 1.3\r
-\r
-               The primary goals of this format is to allow a simple XML format \r
-               that is mostly human readable. The generation and parsing of the \r
-               various data types are done through the TypeConverter classes \r
-               associated with the data types.\r
-\r
-               Example:\r
-\r
-               ... ado.net/XML headers & schema ...\r
-               <resheader name="resmimetype">text/microsoft-resx</resheader>\r
-               <resheader name="version">1.3</resheader>\r
-               <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
-               <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
-               <data name="Name1">this is my long string</data>\r
-               <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
-               <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
-                       [base64 mime encoded serialized .NET Framework object]\r
-               </data>\r
-               <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-                       [base64 mime encoded string representing a byte array form of the .NET Framework object]\r
-               </data>\r
-\r
-               There are any number of "resheader" rows that contain simple \r
-               name/value pairs.\r
-\r
-               Each data row contains a name, and value. The row also contains a\r
-               type or mimetype. Type corresponds to a .NET class that support \r
-               text/value conversion through the TypeConverter architecture. \r
-               Classes that don't support this are serialized and stored with the \r
-               mimetype set.\r
-\r
-               The mimetype is used for serialized objects, and tells the \r
-               ResXResourceReader how to depersist the object. This is currently not \r
-               extensible. For a given mimetype the value must be set accordingly:\r
-\r
-               Note - application/x-microsoft.net.object.binary.base64 is the format \r
-               that the ResXResourceWriter will generate, however the reader can   \r
-               read any of the formats listed below.\r
-\r
-               mimetype: application/x-microsoft.net.object.binary.base64\r
-               value   : The object must be serialized with \r
-                       : System.Serialization.Formatters.Binary.BinaryFormatter\r
-                       : and then encoded with base64 encoding.\r
-\r
-               mimetype: application/x-microsoft.net.object.soap.base64\r
-               value   : The object must be serialized with \r
-                       : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
-                       : and then encoded with base64 encoding.\r
-\r
-               mimetype: application/x-microsoft.net.object.bytearray.base64\r
-               value   : The object must be serialized into a byte array \r
-                       : using a System.ComponentModel.TypeConverter\r
-                       : and then encoded with base64 encoding.\r
-       -->\r
-       \r
-       <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
-               <xsd:element name="root" msdata:IsDataSet="true">\r
-                       <xsd:complexType>\r
-                               <xsd:choice maxOccurs="unbounded">\r
-                                       <xsd:element name="data">\r
-                                               <xsd:complexType>\r
-                                                       <xsd:sequence>\r
-                                                               <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                                                               <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
-                                                       </xsd:sequence>\r
-                                                       <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />\r
-                                                       <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
-                                                       <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
-                                               </xsd:complexType>\r
-                                       </xsd:element>\r
-                                       <xsd:element name="resheader">\r
-                                               <xsd:complexType>\r
-                                                       <xsd:sequence>\r
-                                                               <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                                                       </xsd:sequence>\r
-                                                       <xsd:attribute name="name" type="xsd:string" use="required" />\r
-                                               </xsd:complexType>\r
-                                       </xsd:element>\r
-                               </xsd:choice>\r
-                       </xsd:complexType>\r
-               </xsd:element>\r
-       </xsd:schema>\r
-       <resheader name="resmimetype">\r
-               <value>text/microsoft-resx</value>\r
-       </resheader>\r
-       <resheader name="version">\r
-               <value>1.3</value>\r
-       </resheader>\r
-       <resheader name="reader">\r
-               <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-       </resheader>\r
-       <resheader name="writer">\r
-               <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-       </resheader>\r
-  <data name="ArgumentException_TypeHasExports" xml:space="preserve">\r
-    <value>Cannot call SatisfyImports on a object of type '{0}' because it is marked with one or more ExportAttributes.</value>\r
-  </data>\r
-  <data name="InvalidOperationException_GlobalContainerAlreadyInitialized" xml:space="preserve">\r
-    <value>The container has already been initialized either by another call to InitializeContainer or by someone causing the default container to be constructed. Ensure that InitializeContainer is one of the first things that happens in the application host to ensure that it is ready for the first composition.</value>\r
-  </data>\r
-  <data name="ArgumentException_EmptyString" xml:space="preserve">\r
-    <value>'{0}' cannot be an empty string ("").</value>\r
-  </data>\r
-  <data name="InvalidOperationException_DeploymentCatalogInvalidStateChange" xml:space="preserve">\r
-    <value>Catalog is trying to transition to an invalid state. Occurs when you call DownloadAsync more than once or CancelAsync is called at an incorrect time.</value>\r
-  </data>\r
-  <data name="InvalidOperationException_ErrorReadingXap" xml:space="preserve">\r
-    <value>The package downloaded successfully but an error occurred while reading the contents of the package. See the inner exception for more details.</value>\r
-  </data>\r
-</root>
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/SuppressMessages.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/SuppressMessages.cs
deleted file mode 100644 (file)
index 76dc008..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-\r
-[module: SuppressMessage("Microsoft.MSInternal", "CA905:SystemNamespacesRequireApproval", Scope = "namespace", Target = "System.ComponentModel.Composition.Hosting")]\r
-[module: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.ComponentModel.Composition.Hosting")]
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/.gitattributes
deleted file mode 100644 (file)
index af342c3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-/CompositionInitializer.AssemblyList.cs -crlf
-/CompositionInitializer.cs -crlf
-/ExportFactoryOfT.cs -crlf
-/ExportFactoryOfTTMetadata.cs -crlf
-/ExportLifetimeContextOfT.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/CompositionInitializer.AssemblyList.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/CompositionInitializer.AssemblyList.cs
deleted file mode 100644 (file)
index 6e83472..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.Reflection;\r
-using System.Windows;\r
-using System.Windows.Resources;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public static partial class CompositionInitializer\r
-    {\r
-        // This method is the only Silverlight specific code dependency in CompositionHost\r
-        private static List<Assembly> GetAssemblyList()\r
-        {\r
-            var assemblies = new List<Assembly>();\r
-\r
-            // While this may seem like somewhat of a hack, walking the AssemblyParts in the active \r
-            // deployment object is the only way to get the list of assemblies loaded by the XAP. \r
-            foreach (AssemblyPart ap in Deployment.Current.Parts)\r
-            {\r
-                StreamResourceInfo sri = Application.GetResourceStream(new Uri(ap.Source, UriKind.Relative));\r
-                if (sri != null)\r
-                {\r
-                    // Keep in mind that calling Load on an assembly that is already loaded will\r
-                    // be a no-op and simply return the already loaded assembly object.\r
-                    Assembly assembly = ap.Load(sri.Stream);\r
-                    assemblies.Add(assembly);\r
-                }\r
-            }\r
-\r
-            return assemblies;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/CompositionInitializer.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/CompositionInitializer.cs
deleted file mode 100644 (file)
index 1416b6e..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Hosting;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Globalization;\r
-using System.Linq;\r
-using System.Reflection;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public static partial class CompositionInitializer\r
-    {\r
-        /// <summary>\r
-        ///     Will satisfy the imports on a object instance based on a <see cref="CompositionContainer"/>\r
-        ///     registered with the <see cref="CompositionHost"/>. By default if no <see cref="CompositionContainer"/>\r
-        ///     is registered the first time this is called it will be initialized to a catalog\r
-        ///     that contains all the assemblies loaded by the initial application XAP.\r
-        /// </summary>\r
-        /// <param name="attributedPart">\r
-        ///     Object instance that contains <see cref="ImportAttribute"/>s that need to be satisfied.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="instance"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="instance"/> contains <see cref="ExportAttribute"/>s applied on its type.\r
-        /// </exception>\r
-        /// <exception cref="ChangeRejectedException">\r
-        ///     One or more of the imports on the object instance could not be satisfied.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     One or more of the imports on the object instance caused an error while composing.\r
-        /// </exception>\r
-        public static void SatisfyImports(object attributedPart)\r
-        {\r
-            if (attributedPart == null)\r
-            {\r
-                throw new ArgumentNullException("attributedPart");\r
-            }\r
-            ComposablePart part = AttributedModelServices.CreatePart(attributedPart);\r
-            CompositionInitializer.SatisfyImports(part);\r
-        }\r
-\r
-\r
-        /// <summary>\r
-        ///     Will satisfy the imports on a part based on a <see cref="CompositionContainer"/>\r
-        ///     registered with the <see cref="CompositionHost"/>. By default if no <see cref="CompositionContainer"/>\r
-        ///     is registered the first time this is called it will be initialized to a catalog\r
-        ///     that contains all the assemblies loaded by the initial application XAP.\r
-        /// </summary>\r
-        /// <param name="part">\r
-        ///     Part with imports that need to be satisfied.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="instance"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ArgumentException">\r
-        ///     <paramref name="instance"/> contains <see cref="ExportAttribute"/>s applied on its type.\r
-        /// </exception>\r
-        /// <exception cref="ChangeRejectedException">\r
-        ///     One or more of the imports on the object instance could not be satisfied.\r
-        /// </exception>\r
-        /// <exception cref="CompositionException">\r
-        ///     One or more of the imports on the object instance caused an error while composing.\r
-        /// </exception>\r
-        public static void SatisfyImports(ComposablePart part)\r
-        {\r
-            if (part == null)\r
-            {\r
-                throw new ArgumentNullException("part");\r
-            }\r
-\r
-            var batch = new CompositionBatch();\r
-\r
-            batch.AddPart(part);\r
-\r
-            if (part.ExportDefinitions.Any())\r
-            {\r
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,\r
-                        Strings.ArgumentException_TypeHasExports, part.ToString()), "part");\r
-            }\r
-\r
-            CompositionContainer container = null;\r
-\r
-            // Ignoring return value because we don't need to know if we created it or not\r
-            CompositionHost.TryGetOrCreateContainer(_createContainer, out container);\r
-\r
-            container.Compose(batch);\r
-        }\r
-\r
-        private static Func<CompositionContainer> _createContainer = CreateCompositionContainer;\r
-        private static CompositionContainer CreateCompositionContainer()\r
-        {\r
-            var assemblyCatalogs = GetAssemblyList()\r
-                .Select<Assembly, ComposablePartCatalog>(assembly => new AssemblyCatalog(assembly));\r
-\r
-            var aggCatalog = new AggregateCatalog(assemblyCatalogs);\r
-\r
-            return new CompositionContainer(aggCatalog);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportFactoryOfT.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportFactoryOfT.cs
deleted file mode 100644 (file)
index 1ee6628..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using Microsoft.Internal;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public class ExportFactory<T>\r
-    {\r
-        private Func<Tuple<T, Action>> _exportLifetimeContextCreator;\r
-\r
-        public ExportFactory(Func<Tuple<T, Action>> exportLifetimeContextCreator)\r
-        {\r
-            if (exportLifetimeContextCreator == null)\r
-            {\r
-                throw new ArgumentNullException("exportLifetimeContextCreator");\r
-            }\r
-\r
-            this._exportLifetimeContextCreator = exportLifetimeContextCreator;\r
-        }\r
-\r
-        public ExportLifetimeContext<T> CreateExport()\r
-        {\r
-            Tuple<T, Action> untypedLifetimeContext = this._exportLifetimeContextCreator.Invoke();\r
-            return new ExportLifetimeContext<T>(untypedLifetimeContext.Item1, untypedLifetimeContext.Item2);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportFactoryOfTTMetadata.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportFactoryOfTTMetadata.cs
deleted file mode 100644 (file)
index feb4097..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public class ExportFactory<T, TMetadata> : ExportFactory<T>\r
-    {\r
-        private readonly TMetadata _metadata;\r
-\r
-        public ExportFactory(Func<Tuple<T, Action>> exportLifetimeContextCreator, TMetadata metadata)\r
-            : base(exportLifetimeContextCreator)\r
-        {\r
-            this._metadata = metadata;\r
-        }\r
-\r
-        public TMetadata Metadata\r
-        {\r
-            get { return this._metadata; }\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportLifetimeContextOfT.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/ExportLifetimeContextOfT.cs
deleted file mode 100644 (file)
index f1182da..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-\r
-namespace System.ComponentModel.Composition\r
-{\r
-    public sealed class ExportLifetimeContext<T> : IDisposable\r
-    {\r
-        private readonly T _value;\r
-        private readonly Action _disposeAction;\r
-\r
-        public ExportLifetimeContext(T value, Action disposeAction)\r
-        {\r
-            this._value = value;\r
-            this._disposeAction = disposeAction;\r
-        }\r
-\r
-        public T Value\r
-        {\r
-            get\r
-            {\r
-                return this._value;\r
-            }\r
-        }\r
-\r
-        public void Dispose()\r
-        {\r
-            if (this._disposeAction != null)\r
-            {\r
-                this._disposeAction.Invoke();\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/.gitattributes b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/.gitattributes
deleted file mode 100644 (file)
index 2dacd9d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/CompositionHost.cs -crlf
-/DeploymentCatalog.cs -crlf
-/Package.cs -crlf
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/CompositionHost.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/CompositionHost.cs
deleted file mode 100644 (file)
index 33d65fd..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Globalization;\r
-using System.Threading;\r
-using System.ComponentModel.Composition.Primitives;\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    public static class CompositionHost\r
-    {\r
-        // Field is internal only to assist in testing\r
-        internal static CompositionContainer _container = null;\r
-        private static object _lockObject = new object();\r
-\r
-        /// <summary>\r
-        ///     This method can be used to initialize the global container used by <see cref="CompositionInitializer.SatisfyImports(object)"/>\r
-        ///     in case where the default container doesn't provide enough flexibility. \r
-        ///     \r
-        ///     If this method is needed it should be called exactly once and as early as possible in the application host. It will need\r
-        ///     to be called before the first call to <see cref="CompositionInitializer.SatisfyImports(object)"/>\r
-        /// </summary>\r
-        /// <param name="container">\r
-        ///     <see cref="CompositionContainer"/> that should be used instead of the default global container.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="container"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     Either <see cref="Initialize(CompositionContainer)" /> or <see cref="Initialize(ComposablePartCatalog[])" /> has already been called or someone has already made use of the global \r
-        ///     container via <see cref="CompositionInitializer.SatisfyImports(object)"/>. In either case you need to ensure that it \r
-        ///     is called only once and that it is called early in the application host startup code.\r
-        /// </exception>\r
-        public static void Initialize(CompositionContainer container)\r
-        {\r
-            if (container == null)\r
-            {\r
-                throw new ArgumentNullException("container");\r
-            }\r
-\r
-            CompositionContainer globalContainer = null;\r
-            bool alreadyCreated = TryGetOrCreateContainer(() => container, out globalContainer);\r
-\r
-            if (alreadyCreated)\r
-            {\r
-                throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, \r
-                    Strings.InvalidOperationException_GlobalContainerAlreadyInitialized));\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     This method can be used to initialize the global container used by <see cref="CompositionInitializer.SatisfyImports(object)"/>\r
-        ///     in case where the default container doesn't provide enough flexibility. \r
-        ///     \r
-        ///     If this method is needed it should be called exactly once and as early as possible in the application host. It will need\r
-        ///     to be called before the first call to <see cref="CompositionInitializer.SatisfyImports(object)"/>\r
-        /// </summary>\r
-        /// <param name="catalogs">\r
-        ///     An array of <see cref="ComposablePartCatalog"/> that should be used to initialize the <see cref="CompositionContainer"/> with.\r
-        /// </param>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="catalogs"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="InvalidOperationException">\r
-        ///     Either <see cref="Initialize(CompositionContainer)" /> or <see cref="Initialize(ComposablePartCatalog[])" />has already been called or someone has already made use of the global \r
-        ///     container via <see cref="CompositionInitializer.SatisfyImports(object)"/>. In either case you need to ensure that it \r
-        ///     is called only once and that it is called early in the application host startup code.\r
-        /// </exception>\r
-        public static CompositionContainer Initialize(params ComposablePartCatalog[] catalogs)\r
-        {\r
-            AggregateCatalog aggregateCatalog = new AggregateCatalog(catalogs);\r
-            CompositionContainer container = new CompositionContainer(aggregateCatalog);\r
-            try\r
-            {\r
-                CompositionHost.Initialize(container);\r
-            }\r
-            catch\r
-            {\r
-                container.Dispose();\r
-\r
-                // NOTE : this is important, as this prevents the disposal of the catalogs passed as input arguments\r
-                aggregateCatalog.Catalogs.Clear();\r
-                aggregateCatalog.Dispose();\r
-\r
-                throw;\r
-            }\r
-\r
-            return container;\r
-        }\r
-\r
-\r
-\r
-        internal static bool TryGetOrCreateContainer(Func<CompositionContainer> createContainer, out CompositionContainer globalContainer)\r
-        {\r
-            bool alreadyCreated = true;\r
-            if (_container == null)\r
-            {\r
-                var container = createContainer.Invoke();\r
-                lock (_lockObject)\r
-                {\r
-                    if (_container == null)\r
-                    {\r
-                        Thread.MemoryBarrier();\r
-                        _container = container;\r
-                        alreadyCreated = false;\r
-                    }\r
-                }\r
-            }\r
-            globalContainer = _container;\r
-            return alreadyCreated;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/DeploymentCatalog.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/DeploymentCatalog.cs
deleted file mode 100644 (file)
index e6042b1..0000000
+++ /dev/null
@@ -1,420 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition.Primitives;\r
-using System.Linq;\r
-using System.Net;\r
-using System.Reflection;\r
-using System.Threading;\r
-using Microsoft.Internal;\r
-\r
-#if (SILVERLIGHT)\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    /// Implements a MEF catalog that supports Asynchronous download of Silverlast Xap files.\r
-    /// </summary>\r
-    public class DeploymentCatalog : ComposablePartCatalog, INotifyComposablePartCatalogChanged\r
-    {\r
-        static class State\r
-        {\r
-            public const int Created = 0;\r
-            public const int Initialized = 1000;\r
-            public const int DownloadStarted = 2000;\r
-            public const int DownloadCompleted = 3000;\r
-            public const int DownloadCancelled = 4000;\r
-        }\r
-\r
-        private Lock _lock = new Lock();\r
-        private volatile bool _isDisposed = false;\r
-        private Uri _uri = null;\r
-        private int _state = State.Created;\r
-        private AggregateCatalog _catalogCollection = new AggregateCatalog();\r
-        private WebClient _webClient = null;\r
-\r
-        /// <summary>\r
-        /// Construct a Deployment catalog with the parts from the main Xap.\r
-        /// </summary>\r
-        public DeploymentCatalog()\r
-        {\r
-            this.DiscoverParts(Package.CurrentAssemblies);\r
-            this._state = State.Initialized;\r
-        }\r
-\r
-        /// <summary>\r
-        /// Construct a Deployment catalog with a string form relative uri.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A relative Uri to the Download Xap file\r
-        ///     <see cref="DeploymentCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ArgumentException">\r
-        ///     The argument is null or an empty string.\r
-        /// </exception>\r
-        public DeploymentCatalog(string uriRelative)\r
-        {\r
-            Requires.NotNullOrEmpty(uriRelative, "uriRelative");\r
-            this._uri = new Uri(uriRelative, UriKind.Relative);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Construct a Deployment catalog with the parts from uri.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A Uri to the Download Xap file\r
-        ///     <see cref="System.Uri"/>.\r
-        /// </value>\r
-        /// <exception cref="ArgumentException">\r
-        ///     The argument is null.\r
-        /// </exception>\r
-        public DeploymentCatalog(Uri uri)\r
-        {\r
-            Requires.NotNull<Uri>(uri, "uri");\r
-            this._uri = uri;\r
-        }\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog has changed.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changed;\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Catalog is changing.\r
-        /// </summary>\r
-        public event EventHandler<ComposablePartCatalogChangeEventArgs> Changing;\r
-\r
-        /// <summary>\r
-        /// Notify when the download has been completed.\r
-        /// </summary>\r
-        public event EventHandler<AsyncCompletedEventArgs> DownloadCompleted;\r
-\r
-        /// <summary>\r
-        /// Notify when the contents of the Progress of the download has changed.\r
-        /// </summary>\r
-        public event EventHandler<DownloadProgressChangedEventArgs> DownloadProgressChanged;\r
-       \r
-        /// <summary>\r
-        /// Retrieve or create the WebClient.\r
-        /// </summary>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="DeploymentCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        private WebClient WebClient\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-                if(this._webClient == null)\r
-                {\r
-                    Interlocked.CompareExchange<WebClient>(ref this._webClient, new WebClient(), null);\r
-                }\r
-                return this._webClient;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///     Gets the part definitions of the Deployment catalog.\r
-        /// </summary>\r
-        /// <value>\r
-        ///     A <see cref="IQueryable{T}"/> of <see cref="ComposablePartDefinition"/> objects of the \r
-        ///     <see cref="DeploymentCatalog"/>.\r
-        /// </value>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="DeploymentCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IQueryable<ComposablePartDefinition> Parts\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-                return this._catalogCollection.Parts;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Gets the Uri of this catalog\r
-        /// </summary>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="DeploymentCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public Uri Uri\r
-        {\r
-            get\r
-            {\r
-                this.ThrowIfDisposed();\r
-                return this._uri;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// </summary>\r
-        /// <param name="assemblies">\r
-        /// </param>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="DeploymentCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        private void DiscoverParts(IEnumerable<Assembly> assemblies)\r
-        {\r
-            this.ThrowIfDisposed();\r
-\r
-            var addedDefinitions = new List<ComposablePartDefinition>();\r
-            var addedCatalogs = new Dictionary<string, ComposablePartCatalog>();\r
-            using(new ReadLock(this._lock))\r
-            {\r
-                foreach (var assembly in assemblies)\r
-                {\r
-                    if (addedCatalogs.ContainsKey(assembly.FullName)) \r
-                    {\r
-                        // Nothing to do because the assembly has already been added.\r
-                        continue;\r
-                    }\r
-\r
-                    var catalog = new AssemblyCatalog(assembly);\r
-                    addedDefinitions.AddRange(catalog.Parts);\r
-                    addedCatalogs.Add(assembly.FullName, catalog);\r
-                }\r
-            }\r
-\r
-            // Generate notifications\r
-            using (var atomicComposition = new AtomicComposition())\r
-            {\r
-                var changingArgs = new ComposablePartCatalogChangeEventArgs(addedDefinitions, Enumerable.Empty<ComposablePartDefinition>(), atomicComposition);\r
-                this.OnChanging(changingArgs);\r
-\r
-                using (new WriteLock(this._lock))\r
-                {\r
-                    foreach (var item in addedCatalogs)\r
-                    {\r
-                        this._catalogCollection.Catalogs.Add(item.Value);\r
-                    }\r
-                }\r
-                atomicComposition.Complete();\r
-            }\r
-\r
-            var changedArgs = new ComposablePartCatalogChangeEventArgs(addedDefinitions, Enumerable.Empty<ComposablePartDefinition>(), null);\r
-            this.OnChanged(changedArgs);\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Returns the export definitions that match the constraint defined by the specified definition.\r
-        /// </summary>\r
-        /// <param name="definition">\r
-        ///     The <see cref="ImportDefinition"/> that defines the conditions of the \r
-        ///     <see cref="ExportDefinition"/> objects to return.\r
-        /// </param>\r
-        /// <returns>\r
-        ///     An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1, T2}"/> containing the \r
-        ///     <see cref="ExportDefinition"/> objects and their associated \r
-        ///     <see cref="ComposablePartDefinition"/> for objects that match the constraint defined \r
-        ///     by <paramref name="definition"/>.\r
-        /// </returns>\r
-        /// <exception cref="ArgumentNullException">\r
-        ///     <paramref name="definition"/> is <see langword="null"/>.\r
-        /// </exception>\r
-        /// <exception cref="ObjectDisposedException">\r
-        ///     The <see cref="DeploymentCatalog"/> has been disposed of.\r
-        /// </exception>\r
-        public override IEnumerable<Tuple<ComposablePartDefinition, ExportDefinition>> GetExports(ImportDefinition definition)\r
-        {\r
-            this.ThrowIfDisposed();\r
-            Requires.NotNull(definition, "definition");\r
-\r
-            return this._catalogCollection.GetExports(definition);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Cancel the async operation.\r
-        /// </summary>\r
-        public void CancelAsync()\r
-        {\r
-            ThrowIfDisposed();\r
-            MutateStateOrThrow(State.DownloadCancelled, State.DownloadStarted);\r
-            this.WebClient.CancelAsync();\r
-        }\r
-\r
-        /// <summary>\r
-        /// Begin the asynchronous download.\r
-        /// </summary>\r
-        public void DownloadAsync()\r
-        {\r
-            ThrowIfDisposed();\r
-\r
-            if (Interlocked.CompareExchange(ref this._state, State.DownloadStarted, State.Created) == State.Created)\r
-            {\r
-                // Created with Downloadable content do download\r
-                this.WebClient.OpenReadCompleted += new OpenReadCompletedEventHandler(HandleOpenReadCompleted);\r
-                this.WebClient.DownloadProgressChanged += new DownloadProgressChangedEventHandler(HandleDownloadProgressChanged);\r
-                this.WebClient.OpenReadAsync(Uri, this);\r
-            }\r
-            else\r
-            {\r
-                // Created with LocalAssemblies \r
-                MutateStateOrThrow(State.DownloadCompleted, State.Initialized);\r
-\r
-                this.OnDownloadCompleted(new AsyncCompletedEventArgs(null, false, this));\r
-            }\r
-        }\r
-\r
-        void HandleDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)\r
-        {\r
-            EventHandler<DownloadProgressChangedEventArgs> downloadProgressChangedEvent = this.DownloadProgressChanged;\r
-            if (downloadProgressChangedEvent != null)\r
-            {\r
-                downloadProgressChangedEvent(this, e);\r
-            }\r
-        }\r
-\r
-        private void HandleOpenReadCompleted(object sender, OpenReadCompletedEventArgs e)\r
-        {\r
-            Exception error = e.Error;\r
-            bool cancelled = e.Cancelled;\r
-\r
-            // Possible valid current states are DownloadStarted and DownloadCancelled.\r
-            int currentState = Interlocked.CompareExchange(ref this._state, State.DownloadCompleted, State.DownloadStarted);\r
-\r
-            if (currentState != State.DownloadStarted)\r
-            {\r
-                cancelled = true;\r
-            }\r
-\r
-            if (error == null && !cancelled)\r
-            {\r
-                try\r
-                {\r
-                    var assemblies = Package.LoadPackagedAssemblies(e.Result);\r
-                    this.DiscoverParts(assemblies);\r
-                }\r
-                catch (Exception ex)\r
-                {\r
-                    error = new InvalidOperationException(Strings.InvalidOperationException_ErrorReadingXap, ex);\r
-                }\r
-            }\r
-\r
-            this.OnDownloadCompleted(new AsyncCompletedEventArgs(error, cancelled, this));\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="INotifyComposablePartCatalogChanged.Changed"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ComposablePartCatalogChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnChanged(ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            EventHandler<ComposablePartCatalogChangeEventArgs> changedEvent = this.Changed;\r
-            if (changedEvent != null)\r
-            {\r
-                changedEvent(this, e);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="INotifyComposablePartCatalogChanged.Changing"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ComposablePartCatalogChangeEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnChanging(ComposablePartCatalogChangeEventArgs e)\r
-        {\r
-            EventHandler<ComposablePartCatalogChangeEventArgs> changingEvent = this.Changing;\r
-            if (changingEvent != null)\r
-            {\r
-                changingEvent(this, e);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="DownloadCompleted"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="AsyncCompletedEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnDownloadCompleted(AsyncCompletedEventArgs e)\r
-        {\r
-            EventHandler<AsyncCompletedEventArgs> downloadCompletedEvent = this.DownloadCompleted;\r
-            if (downloadCompletedEvent != null)\r
-            {\r
-                downloadCompletedEvent(this, e);\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Raises the <see cref="DownloadProgressChanged"/> event.\r
-        /// </summary>\r
-        /// <param name="e">\r
-        ///     An <see cref="ProgressChangedEventArgs"/> containing the data for the event.\r
-        /// </param>\r
-        protected virtual void OnDownloadProgressChanged(DownloadProgressChangedEventArgs e)\r
-        {\r
-            EventHandler<DownloadProgressChangedEventArgs> downloadProgressChangedEvent = this.DownloadProgressChanged;\r
-            if (downloadProgressChangedEvent != null)\r
-            {\r
-                downloadProgressChangedEvent(this, e);\r
-            }\r
-        }\r
-\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            try\r
-            {\r
-                if (disposing)\r
-                {\r
-                    if (!this._isDisposed)\r
-                    {\r
-                        AggregateCatalog catalogs = null;\r
-                        bool disposeLock = false;\r
-                        try\r
-                        {\r
-                            using (new WriteLock(this._lock))\r
-                            {\r
-                                if (!this._isDisposed)\r
-                                {\r
-                                    disposeLock = true;\r
-                                    catalogs = this._catalogCollection;\r
-                                    this._catalogCollection = null;\r
-                                    this._isDisposed = true;\r
-                                }\r
-                            }\r
-                        }\r
-                        finally\r
-                        {\r
-                            if (catalogs != null)\r
-                            {\r
-                                catalogs.Dispose();\r
-                            }\r
-\r
-                            if (disposeLock)\r
-                            {\r
-                                this._lock.Dispose();\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-            finally\r
-            {\r
-                base.Dispose(disposing);\r
-            }\r
-        }\r
-\r
-        private void ThrowIfDisposed()\r
-        {\r
-            if (this._isDisposed)\r
-            {\r
-                throw new ObjectDisposedException(this.GetType().ToString()); \r
-            }\r
-        }\r
-\r
-        private void MutateStateOrThrow(int toState, int fromState)\r
-        {\r
-            int currentState = Interlocked.CompareExchange(ref this._state, toState, fromState);\r
-            if(currentState != fromState)\r
-            {\r
-                throw new InvalidOperationException(Strings.InvalidOperationException_DeploymentCatalogInvalidStateChange);\r
-            }\r
-        }\r
-    }\r
-}\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/Package.cs b/mcs/class/System.ComponentModel.Composition/src/Composition.Initialization/System/ComponentModel/Composition/Hosting/Package.cs
deleted file mode 100644 (file)
index a91e594..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-// -----------------------------------------------------------------------\r
-// Copyright (c) Microsoft Corporation.  All rights reserved.\r
-// -----------------------------------------------------------------------\r
-#if(SILVERLIGHT)\r
-using System;\r
-using System.Collections.Generic;\r
-using System.IO;\r
-using System.Net;\r
-using System.Reflection;\r
-using System.Windows;\r
-using System.Windows.Resources;\r
-using System.Xml;\r
-using System.ComponentModel;\r
-\r
-namespace System.ComponentModel.Composition.Hosting\r
-{\r
-    /// <summary>\r
-    ///     Helper functions for accessing the Silverlight manifest\r
-    /// </summary>\r
-    internal static class Package\r
-    {\r
-        /// <summary>\r
-        ///     Retrieves The current list of assemblies for the application XAP load. Depends on the Deployment.Current property being setup and\r
-        ///     so can only be accessed after the Application object has be completely constructed.\r
-        ///     No caching occurs at this level.\r
-        /// </summary>\r
-        public static IEnumerable<Assembly> CurrentAssemblies\r
-        {\r
-            get\r
-            {\r
-                var assemblies = new List<Assembly>();\r
-\r
-                // While this may seem like somewhat of a hack, walking the AssemblyParts in the active \r
-                // deployment object is the only way to get the list of assemblies loaded by the initial XAP. \r
-                foreach (AssemblyPart ap in Deployment.Current.Parts)\r
-                {\r
-                    StreamResourceInfo sri = Application.GetResourceStream(new Uri(ap.Source, UriKind.Relative));\r
-                    if (sri != null)\r
-                    {\r
-                        // Keep in mind that calling Load on an assembly that is already loaded will\r
-                        // be a no-op and simply return the already loaded assembly object.\r
-                        Assembly assembly = ap.Load(sri.Stream);\r
-                        assemblies.Add(assembly);\r
-                    }\r
-                }\r
-\r
-                return assemblies;\r
-            }\r
-        }\r
-\r
-\r
-        public static IEnumerable<Assembly> LoadPackagedAssemblies(Stream packageStream)\r
-        {\r
-            List<Assembly> assemblies = new List<Assembly>();\r
-            StreamResourceInfo packageStreamInfo = new StreamResourceInfo(packageStream, null);\r
-\r
-            IEnumerable<AssemblyPart> parts = GetDeploymentParts(packageStreamInfo);\r
-\r
-            foreach (AssemblyPart ap in parts)\r
-            {\r
-                StreamResourceInfo sri = Application.GetResourceStream(\r
-                    packageStreamInfo, new Uri(ap.Source, UriKind.Relative));\r
-\r
-                assemblies.Add(ap.Load(sri.Stream));\r
-            }\r
-            packageStream.Close();\r
-            return assemblies;\r
-        }\r
-\r
-        /// <summary>\r
-        ///     Only reads AssemblyParts and does not support external parts (aka Platform Extensions or TPEs).\r
-        /// </summary>\r
-        private static IEnumerable<AssemblyPart> GetDeploymentParts(StreamResourceInfo xapStreamInfo)\r
-        {\r
-            Uri manifestUri = new Uri("AppManifest.xaml", UriKind.Relative);\r
-            StreamResourceInfo manifestStreamInfo = Application.GetResourceStream(xapStreamInfo, manifestUri);\r
-            List<AssemblyPart> assemblyParts = new List<AssemblyPart>();\r
-\r
-            // The code assumes the following format in AppManifest.xaml\r
-            //<Deployment ... >\r
-            //  <Deployment.Parts>\r
-            //    <AssemblyPart x:Name="A" Source="A.dll" />\r
-            //    <AssemblyPart x:Name="B" Source="B.dll" />\r
-            //      ...\r
-            //    <AssemblyPart x:Name="Z" Source="Z.dll" />\r
-            //  </Deployment.Parts>\r
-            //</Deployment>\r
-            if (manifestStreamInfo != null)\r
-            {\r
-                Stream manifestStream = manifestStreamInfo.Stream;\r
-                using (XmlReader reader = XmlReader.Create(manifestStream))\r
-                {\r
-                    if (reader.ReadToFollowing("AssemblyPart"))\r
-                    {\r
-                        do\r
-                        {\r
-                            string source = reader.GetAttribute("Source");\r
-\r
-                            if (source != null)\r
-                            {\r
-                                assemblyParts.Add(new AssemblyPart() { Source = source });\r
-                            }\r
-                        }\r
-                        while (reader.ReadToNextSibling("AssemblyPart"));\r
-                    }\r
-                }\r
-            }\r
-\r
-            return assemblyParts;\r
-        }\r
-    }\r
-}\r
-#endif\r
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/DataAnnotationsResources.cs b/mcs/class/System.ComponentModel.DataAnnotations/DataAnnotationsResources.cs
new file mode 100644 (file)
index 0000000..5ff50e1
--- /dev/null
@@ -0,0 +1,59 @@
+namespace System.ComponentModel.DataAnnotations.Resources
+{
+static class DataAnnotationsResources
+{
+       public const string ArgumentIsNullOrWhitespace = "ArgumentIsNullOrWhitespace";
+       public const string AssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties = "AssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties";
+       public const string AttributeStore_Unknown_Property = "AttributeStore_Unknown_Property";
+       public const string Common_PropertyNotFound = "Common_PropertyNotFound";
+       public const string CompareAttribute_MustMatch = "CompareAttribute_MustMatch";
+       public const string CompareAttribute_UnknownProperty = "CompareAttribute_UnknownProperty";
+       public const string CreditCardAttribute_Invalid = "CreditCardAttribute_Invalid";
+       public const string CustomValidationAttribute_Method_Must_Return_ValidationResult = "CustomValidationAttribute_Method_Must_Return_ValidationResult";
+       public const string CustomValidationAttribute_Method_Not_Found = "CustomValidationAttribute_Method_Not_Found";
+       public const string CustomValidationAttribute_Method_Required = "CustomValidationAttribute_Method_Required";
+       public const string CustomValidationAttribute_Method_Signature = "CustomValidationAttribute_Method_Signature";
+       public const string CustomValidationAttribute_Type_Conversion_Failed = "CustomValidationAttribute_Type_Conversion_Failed";
+       public const string CustomValidationAttribute_Type_Must_Be_Public = "CustomValidationAttribute_Type_Must_Be_Public";
+       public const string CustomValidationAttribute_ValidationError = "{0} is not valid.";
+       public const string CustomValidationAttribute_ValidatorType_Required = "CustomValidationAttribute_ValidatorType_Required";
+       public const string DataTypeAttribute_EmptyDataTypeString = "DataTypeAttribute_EmptyDataTypeString";
+       public const string DisplayAttribute_PropertyNotSet = "The {0} property has not been set.  Use the {1} method to get the value.";
+       public const string EmailAddressAttribute_Invalid = "EmailAddressAttribute_Invalid";
+       public const string EnumDataTypeAttribute_TypeCannotBeNull = "EnumDataTypeAttribute_TypeCannotBeNull";
+       public const string EnumDataTypeAttribute_TypeNeedsToBeAnEnum = "EnumDataTypeAttribute_TypeNeedsToBeAnEnum";
+       public const string FileExtensionsAttribute_Invalid = "FileExtensionsAttribute_Invalid";
+       public const string LocalizableString_LocalizationFailed = "Cannot retrieve property '{0}' because localization failed. Type '{1}' is not public or does not contain a public static string property with the name '{2}'.";
+       public const string MaxLengthAttribute_InvalidMaxLength = "MaxLengthAttribute_InvalidMaxLength";
+       public const string MaxLengthAttribute_ValidationError = "MaxLengthAttribute_ValidationError";
+       public const string MetadataTypeAttribute_TypeCannotBeNull = "MetadataTypeAttribute_TypeCannotBeNull";
+       public const string MinLengthAttribute_InvalidMinLength = "MinLengthAttribute_InvalidMinLength";
+       public const string MinLengthAttribute_ValidationError = "MinLengthAttribute_ValidationError";
+       public const string PhoneAttribute_Invalid = "PhoneAttribute_Invalid";
+       public const string RangeAttribute_ArbitraryTypeNotIComparable = "RangeAttribute_ArbitraryTypeNotIComparable";
+       public const string RangeAttribute_MinGreaterThanMax = "RangeAttribute_MinGreaterThanMax";
+       public const string RangeAttribute_Must_Set_Min_And_Max = "RangeAttribute_Must_Set_Min_And_Max";
+       public const string RangeAttribute_Must_Set_Operand_Type = "RangeAttribute_Must_Set_Operand_Type";
+       public const string RangeAttribute_ValidationError = "The field {0} must be between {1} and {2}.";
+       public const string RegexAttribute_ValidationError = "The field {0} must match the regular expression {1}.";
+       public const string RegularExpressionAttribute_Empty_Pattern = "The pattern must be set to a valid regular expression.";
+       public const string RequiredAttribute_ValidationError = "RequiredAttribute_ValidationError";
+       public const string StringLengthAttribute_InvalidMaxLength = "StringLengthAttribute_InvalidMaxLength";
+       public const string StringLengthAttribute_ValidationError = "The field {0} must be a string with a maximum length of {1}.";
+       public const string StringLengthAttribute_ValidationErrorIncludingMinimum = "StringLengthAttribute_ValidationErrorIncludingMinimum";
+       public const string UIHintImplementation_ControlParameterKeyIsNotAString = "UIHintImplementation_ControlParameterKeyIsNotAString";
+       public const string UIHintImplementation_ControlParameterKeyIsNull = "UIHintImplementation_ControlParameterKeyIsNull";
+       public const string UIHintImplementation_ControlParameterKeyOccursMoreThanOnce = "UIHintImplementation_ControlParameterKeyOccursMoreThanOnce";
+       public const string UIHintImplementation_NeedEvenNumberOfControlParameters = "UIHintImplementation_NeedEvenNumberOfControlParameters";
+       public const string UrlAttribute_Invalid = "UrlAttribute_Invalid";
+       public const string ValidationAttribute_Cannot_Set_ErrorMessage_And_Resource = "ValidationAttribute_Cannot_Set_ErrorMessage_And_Resource";
+       public const string ValidationAttribute_IsValid_NotImplemented = "ValidationAttribute_IsValid_NotImplemented";
+       public const string ValidationAttribute_NeedBothResourceTypeAndResourceName = "ValidationAttribute_NeedBothResourceTypeAndResourceName";
+       public const string ValidationAttribute_ResourcePropertyNotStringType = "ValidationAttribute_ResourcePropertyNotStringType";
+       public const string ValidationAttribute_ResourceTypeDoesNotHaveProperty = "ValidationAttribute_ResourceTypeDoesNotHaveProperty";
+       public const string ValidationAttribute_ValidationError = "The field {0} is invalid.";
+       public const string ValidationContextServiceContainer_ItemAlreadyExists = "ValidationContextServiceContainer_ItemAlreadyExists";
+       public const string Validator_InstanceMustMatchValidationContextInstance = "Validator_InstanceMustMatchValidationContextInstance";
+       public const string Validator_Property_Value_Wrong_Type = "Validator_Property_Value_Wrong_Type";
+}
+}
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_2_0.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_2_0.csproj
deleted file mode 100644 (file)
index 004785c..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F3112064-6311-48A9-992B-A68DD3C62133}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.DataAnnotations</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociatedMetadataTypePropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociatedMetadataTypeTypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociatedMetadataTypeTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociationAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ConcurrencyCheckAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ControlParameters.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\CustomValidationAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DataType.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DataTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DisplayAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DisplayColumnAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DisplayFormatAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\EditableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\EnumDataTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\IValidatableObject.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\MetadataTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\RangeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\RegularExpressionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\RequiredAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ScaffoldColumnAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ScaffoldTableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\StringLengthAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\UIHintAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ValidationAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ValidationException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_0.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_0.csproj
deleted file mode 100644 (file)
index 1bcf43c..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{82CAAC49-507E-446E-A6FB-2C875E8F2C4E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.DataAnnotations</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociatedMetadataTypePropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociatedMetadataTypeTypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociatedMetadataTypeTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\AssociationAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ConcurrencyCheckAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ControlParameters.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\CustomValidationAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DataType.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DataTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DisplayAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DisplayColumnAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\DisplayFormatAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\EditableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\EnumDataTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\FilterUIHintAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\IValidatableObject.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\KeyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\MetadataTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\RangeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\RegularExpressionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\RequiredAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ScaffoldColumnAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ScaffoldTableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\StringLengthAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\TimestampAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\UIHintAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ValidationAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ValidationAttributeCollectionExtensions.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ValidationContext.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ValidationException.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\ValidationResult.cs" />\r
-    <Compile Include="System.ComponentModel.DataAnnotations\Validator.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_2_0.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 6d9dde4..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AE2FDFD3-791C-4B7F-AC47-46926705614B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ComponentModel.DataAnnotations-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.DataAnnotations_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\AssociatedMetadataTypeTypeDescriptionProviderTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\AssociationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CompareAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CreditCardAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CustomValidationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\DisplayAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\EmailAddressAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\EnumDataTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\FileExtensionsAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\FilterUIHintAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\PhoneAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RangeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RegularExpressionAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RequiredAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\StringLengthAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\UIHintAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationContextTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationResultTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidatorTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0.csproj">\r
-      <Project>{F3112064-6311-48A9-992B-A68DD3C62133}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_4_0.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_4_0.csproj
deleted file mode 100644 (file)
index bf7fded..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6AF2102B-5842-4069-8C1C-10FDE5340860}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ComponentModel.DataAnnotations-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.DataAnnotations_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\AssociatedMetadataTypeTypeDescriptionProviderTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\AssociationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CompareAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CreditCardAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CustomValidationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\DisplayAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\EmailAddressAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\EnumDataTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\FileExtensionsAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\FilterUIHintAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\PhoneAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RangeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RegularExpressionAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RequiredAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\StringLengthAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\UIHintAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationContextTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationResultTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidatorTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0.csproj">\r
-      <Project>{82CAAC49-507E-446E-A6FB-2C875E8F2C4E}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ColumnAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ColumnAttribute.cs
deleted file mode 100644 (file)
index c015d65..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// ColumnAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
-       public class ColumnAttribute : Attribute
-       {
-               public ColumnAttribute ()
-               {
-               }
-               
-               public ColumnAttribute (string name)
-               {
-                       Name = name;
-               }
-               
-               public string Name { get; private set; }
-               
-               public int Order { get; set; }
-               
-               public string TypeName { get; set; }
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ComplexTypeAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ComplexTypeAttribute.cs
deleted file mode 100644 (file)
index a3796e0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// ComplexTypeAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       [AttributeUsageAttribute (AttributeTargets.Class, AllowMultiple = false)]
-       public class ComplexTypeAttribute : Attribute
-       {
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedAttribute.cs
deleted file mode 100644 (file)
index ad3cdab..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// DatabaseGeneratedAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       [AttributeUsageAttribute (AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
-       public class DatabaseGeneratedAttribute : Attribute
-       {
-               public DatabaseGeneratedAttribute (DatabaseGeneratedOption databaseGeneratedOption)
-               {
-                       DatabaseGeneratedOption = databaseGeneratedOption;
-               }
-
-               public DatabaseGeneratedOption DatabaseGeneratedOption { get; private set; }
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedOption.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedOption.cs
deleted file mode 100644 (file)
index 051c606..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// DatabaseGeneratedOption.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       public enum DatabaseGeneratedOption
-       {
-               None,
-               Identity,
-               Computed
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.cs
deleted file mode 100644 (file)
index 9a3d008..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// ForeignKeyAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
-       public class ForeignKeyAttribute : Attribute
-       {
-               public ForeignKeyAttribute (string name)
-               {
-                       Name = name;
-               }
-               
-               public string Name { get; private set; }
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/InversePropertyAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/InversePropertyAttribute.cs
deleted file mode 100644 (file)
index 155a3b9..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// InversePropertyAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
-       public class InversePropertyAttribute : Attribute
-       {
-               public InversePropertyAttribute (string property)
-               {
-                       Property = property;
-               }
-               
-               public string Property { get; private set; }
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/NotMappedAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/NotMappedAttribute.cs
deleted file mode 100644 (file)
index 5d66ccc..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// NotMappedAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       [AttributeUsageAttribute (AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
-       public class NotMappedAttribute : Attribute
-       {
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/TableAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.Schema/TableAttribute.cs
deleted file mode 100644 (file)
index 65f7912..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// TableAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations.Schema
-{
-       [AttributeUsageAttribute(AttributeTargets.Class, AllowMultiple = false)]
-       public class TableAttribute : Attribute
-       {
-               public TableAttribute (string name)
-               {
-                       Name = name;
-               }
-               
-               public string Name { get; private set; }
-               
-               public string Schema { get; set; }
-       }
-}
-
-#endif
\ No newline at end of file
index 7fdb746ad048ce544386d8535fa02fb8d11ea50f..df43b5ed4b0ea1c6086e902041c4ebaa903608b2 100644 (file)
@@ -2,29 +2,52 @@
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
 Assembly/AssemblyInfo.cs
-System.ComponentModel.DataAnnotations/AssociatedMetadataTypePropertyDescriptor.cs
-System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs
-System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
-System.ComponentModel.DataAnnotations/AssociationAttribute.cs
-System.ComponentModel.DataAnnotations/ControlParameters.cs
-System.ComponentModel.DataAnnotations/ConcurrencyCheckAttribute.cs
-System.ComponentModel.DataAnnotations/CustomValidationAttribute.cs
-System.ComponentModel.DataAnnotations/DataType.cs
-System.ComponentModel.DataAnnotations/DataTypeAttribute.cs
-System.ComponentModel.DataAnnotations/DisplayAttribute.cs
-System.ComponentModel.DataAnnotations/DisplayColumnAttribute.cs
-System.ComponentModel.DataAnnotations/DisplayFormatAttribute.cs
-System.ComponentModel.DataAnnotations/EditableAttribute.cs
-System.ComponentModel.DataAnnotations/EnumDataTypeAttribute.cs
-System.ComponentModel.DataAnnotations/IValidatableObject.cs
-System.ComponentModel.DataAnnotations/MetadataTypeAttribute.cs
-System.ComponentModel.DataAnnotations/RangeAttribute.cs
-System.ComponentModel.DataAnnotations/RegularExpressionAttribute.cs
-System.ComponentModel.DataAnnotations/RequiredAttribute.cs
-System.ComponentModel.DataAnnotations/ScaffoldColumnAttribute.cs
-System.ComponentModel.DataAnnotations/ScaffoldTableAttribute.cs
-System.ComponentModel.DataAnnotations/StringLengthAttribute.cs
-System.ComponentModel.DataAnnotations/UIHintAttribute.cs
-System.ComponentModel.DataAnnotations/UrlAttribute.cs
-System.ComponentModel.DataAnnotations/ValidationAttribute.cs
-System.ComponentModel.DataAnnotations/ValidationException.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociationAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/BindableTypeAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/CompareAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/ConcurrencyCheckAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/CreditCardAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/CustomValidationAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/DataType.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/DataTypeAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/DisplayAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/DisplayColumnAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/DisplayFormatAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/EditableAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/EmailAddressAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/EnumDataTypeAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/FileExtensionsAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/FilterUIHintAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/IValidatableObject.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/KeyAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/LocalizableString.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/MaxLengthAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/MetadataPropertyDescriptorWrapper.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/MetadataTypeAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/MinLengthAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/PhoneAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/RangeAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/RegularExpressionAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/RequiredAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/ScaffoldAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/ColumnAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/ComplexTypeAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/DatabaseGeneratedAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/DatabaseGeneratedOption.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/ForeignKeyAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/InversePropertyAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/NotMappedAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Schema/TableAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/StringLengthAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/TimestampAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/UIHintAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/UrlAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/ValidationAttribute.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/ValidationAttributeStore.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/ValidationContext.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/ValidationException.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/ValidationResult.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/Validator.cs
+DataAnnotationsResources.cs
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypePropertyDescriptor.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypePropertyDescriptor.cs
deleted file mode 100644 (file)
index 2c1b013..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// AssociatedMetadataTypeTypeDescriptionProvider.cs
-//
-// Author:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// Copyright (C) 2009 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.
-//
-#if !MOBILE
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       class AssociatedMetadataTypePropertyDescriptor : ReflectionPropertyDescriptor
-       {
-               MemberInfo metaTypeMember;
-               
-               public AssociatedMetadataTypePropertyDescriptor (PropertyInfo typeProperty, MemberInfo metaTypeMember)
-                       : base (typeProperty)
-               {
-                       this.metaTypeMember = metaTypeMember;
-               }
-               
-               protected override void FillAttributes (IList attributeList)
-               {
-                       base.FillAttributes (attributeList);
-                       if (metaTypeMember == null)
-                               return;
-                       
-                       object[] attributes = metaTypeMember.GetCustomAttributes (false);
-                       if (attributes == null || attributes.Length == 0)
-                               return;
-
-                       foreach (object o in attributes) {
-                               var attr = o as Attribute;
-                               if (attr == null)
-                                       continue;
-
-                               attributeList.Add (attr);
-                       }
-               }
-       }
-}
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
deleted file mode 100644 (file)
index 212999a..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// AssociatedMetadataTypeTypeDescriptionProvider.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.
-//
-#if !MOBILE
-using System;
-using System.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       public class AssociatedMetadataTypeTypeDescriptionProvider : TypeDescriptionProvider
-       {
-               Type type;
-               Type associatedMetadataType;
-               
-               public AssociatedMetadataTypeTypeDescriptionProvider (Type type)
-               {
-                       if (type == null)
-                               throw new ArgumentNullException ("type");
-                       
-                       this.type = type;
-               }
-
-               public AssociatedMetadataTypeTypeDescriptionProvider (Type type, Type associatedMetadataType)
-               {
-                       if (type == null)
-                               throw new ArgumentNullException ("type");
-                       if (associatedMetadataType == null)
-                               throw new ArgumentNullException ("associatedMetadataType");
-                       
-                       this.type = type;
-                       this.associatedMetadataType = associatedMetadataType;
-               }
-
-               public override ICustomTypeDescriptor GetTypeDescriptor (Type objectType, object instance)
-               {
-                       return new AssociatedMetadataTypeTypeDescriptor (base.GetTypeDescriptor (objectType, instance), type, associatedMetadataType);
-               }
-       }
-}
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs
deleted file mode 100644 (file)
index 12307ff..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-// AssociatedMetadataTypeTypeDescriptionProvider.cs
-//
-// Author:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// Copyright (C) 2009 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.
-//
-#if !MOBILE
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       class AssociatedMetadataTypeTypeDescriptor : CustomTypeDescriptor
-       {
-               Type type;
-               Type associatedMetadataType;
-               bool associatedMetadataTypeChecked;
-               PropertyDescriptorCollection properties;
-               
-               Type AssociatedMetadataType {
-                       get {
-                               if (!associatedMetadataTypeChecked && associatedMetadataType == null)
-                                       associatedMetadataType = FindMetadataType ();
-
-                               return associatedMetadataType;
-                       }
-               }
-               
-               public AssociatedMetadataTypeTypeDescriptor (ICustomTypeDescriptor parent, Type type)
-                       : this (parent, type, null)
-               {
-               }
-
-               public AssociatedMetadataTypeTypeDescriptor (ICustomTypeDescriptor parent, Type type, Type associatedMetadataType)
-                       : base (parent)
-               {
-                       this.type = type;
-                       this.associatedMetadataType = associatedMetadataType;
-               }
-
-               void CopyAttributes (object[] from, List <Attribute> to)
-               {
-                       foreach (object o in from) {
-                               Attribute a = o as Attribute;
-                               if (a == null)
-                                       continue;
-
-                               to.Add (a);
-                       }
-               }
-               
-               public override AttributeCollection GetAttributes ()
-               {
-                       var attributes = new List <Attribute> ();
-                       CopyAttributes (type.GetCustomAttributes (true), attributes);
-                       
-                       Type metaType = AssociatedMetadataType;
-                       if (metaType != null) 
-                               CopyAttributes (metaType.GetCustomAttributes (true), attributes);
-                       
-                       return new AttributeCollection (attributes.ToArray ());
-               }
-
-               public override PropertyDescriptorCollection GetProperties ()
-               {
-                       // Code partially copied from TypeDescriptor.TypeInfo.GetProperties
-                       if (properties != null)
-                                return properties;
-
-                       Dictionary <string, MemberInfo> metaMembers = null;
-                        var propertiesHash = new Dictionary <string, bool> (); // name - null
-                        var propertiesList = new List <AssociatedMetadataTypePropertyDescriptor> ();
-                        Type currentType = type;
-                       Type metaType = AssociatedMetadataType;
-
-                       if (metaType != null) {
-                               metaMembers = new Dictionary <string, MemberInfo> ();
-                               MemberInfo[] members = metaType.GetMembers (BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly);
-
-                               foreach (MemberInfo member in members) {
-                                       switch (member.MemberType) {
-                                               case MemberTypes.Field:
-                                               case MemberTypes.Property:
-                                                       break;
-
-                                               default:
-                                                       continue;
-                                       }
-
-                                       string name = member.Name;
-                                       if (metaMembers.ContainsKey (name))
-                                               continue;
-
-                                       metaMembers.Add (name, member);
-                               }
-                       }
-                       
-                        // Getting properties type by type, because in the case of a property in the child type, where
-                        // the "new" keyword is used and also the return type is changed Type.GetProperties returns 
-                        // also the parent property. 
-                        // 
-                        // Note that we also have to preserve the properties order here.
-                        // 
-                        while (currentType != null && currentType != typeof (object)) {
-                                PropertyInfo[] props = currentType.GetProperties (BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly);
-                                foreach (PropertyInfo property in props) {
-                                       string propName = property.Name;
-                                       
-                                        if (property.GetIndexParameters ().Length == 0 && property.CanRead && !propertiesHash.ContainsKey (propName)) {
-                                               MemberInfo metaMember;
-
-                                               if (metaMembers != null)
-                                                       metaMembers.TryGetValue (propName, out metaMember);
-                                               else
-                                                       metaMember = null;
-                                                propertiesList.Add (new AssociatedMetadataTypePropertyDescriptor (property, metaMember));
-                                                propertiesHash.Add (propName, true);
-                                        }
-                                }
-                                currentType = currentType.BaseType;
-                        }
-
-                        properties = new PropertyDescriptorCollection ((PropertyDescriptor[]) propertiesList.ToArray (), true);
-                        return properties;
-               }
-               
-               Type FindMetadataType ()
-               {
-                       associatedMetadataTypeChecked = true;
-                       if (type == null)
-                               return null;
-                       
-                       object[] attrs = type.GetCustomAttributes (typeof (MetadataTypeAttribute), true);
-                       if (attrs == null || attrs.Length == 0)
-                               return null;
-
-                       var attr = attrs [0] as MetadataTypeAttribute;
-                       if (attr == null)
-                               return null;
-
-                       return attr.MetadataClassType;
-               }
-       }
-}
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociationAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/AssociationAttribute.cs
deleted file mode 100644 (file)
index 7624c60..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// AssociationAttribute.cs
-//
-// Authors:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// 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.
-//
-#if NET_4_0
-using System;
-using System.Collections.Generic;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-       public sealed class AssociationAttribute : Attribute
-       {
-               static readonly char[] keySplitChars = { ',' };
-               
-               IEnumerable <string> otherKeyMembers;
-               IEnumerable <string> thisKeyMembers;
-               
-               public bool IsForeignKey { get; set; }
-               public string Name { get; private set; }
-               public string OtherKey { get; private set; }
-               
-               public IEnumerable<string> OtherKeyMembers {
-                       get {
-                               if (otherKeyMembers == null)
-                                       otherKeyMembers = GetKeyMembers (OtherKey);
-
-                               return otherKeyMembers;
-                       }
-               }
-               
-               public string ThisKey { get; private set; }
-               
-               public IEnumerable<string> ThisKeyMembers {
-                       get {
-                               if (thisKeyMembers == null)
-                                       thisKeyMembers = GetKeyMembers (ThisKey);
-
-                               return thisKeyMembers;
-                       }
-               }
-               
-               public AssociationAttribute (string name, string thisKey, string otherKey)
-               {
-                       this.Name = name;
-                       this.ThisKey = thisKey;
-                       this.OtherKey = otherKey;
-               }
-
-               IEnumerable <string> GetKeyMembers (string key)
-               {
-                       // .NET emulation
-                       if (key == null)
-                               throw new NullReferenceException (".NET emulation");
-
-                       string nows = key.Replace (" ", String.Empty);
-                       if (nows.Length == 0)
-                               return new string[] { String.Empty };
-                                       
-                       return nows.Split (keySplitChars);
-               }
-       }
-}
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ChangeLog b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ChangeLog
deleted file mode 100644 (file)
index 1bfd423..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-2010-05-26  Marek Habersack  <mhabersack@novell.com>
-
-       * ValidationAttribute.cs: cope with null/empty ErrorMessageString
-       in FormatErrorMessage
-
-2010-05-12  Marek Habersack  <mhabersack@novell.com>
-
-       * ValidationException.cs: partially implemented
-
-       * ValidationAttribute.cs: implemented
-
-       * RequiredAttribute.cs: implemented. Fixes bug #604100
-
-       * AssociationAttribute.cs, ConcurrencyCheckAttribute.cs,
-       CustomValidationAttribute.cs, EditableAttribute.cs,
-       EnumDataTypeAttribute.cs, IValidatableObject.cs,
-       ValidationContext.cs, ValidationResult.cs: added
-
-2009-09-15  Marek Habersack  <mhabersack@novell.com>
-
-       * DataTypeAttribute.cs: implemented GetDataTypeName
-
-2009-06-23  Marek Habersack  <mhabersack@novell.com>
-
-       * ValidationAttribute.cs: error message must not ever be empty.
-
-       * UIHintAttribute.cs: do not throw NIEX from the constructor.
-
-       * DataTypeAttribute.cs: implemented correct DisplayFormat
-       intialization for DataType.Time.
-
-       * AssociatedMetadataTypeTypeDescriptor.cs: implemented retrieving
-       attributes of the associated metadata type, as well as merging of
-       attribute collections between metadata and main type properties.
-
-       * AssociatedMetadataTypePropertyDescriptor.cs: added. Helper class
-       which merges attributes from the metadata type (if any) with those
-       associated with property from the "main" type.
-
-2009-04-23  Marek Habersack  <mhabersack@novell.com>
-
-       * AssociatedMetadataTypeTypeDescriptor.cs: added - doesn't add any
-       real functionality yet.
-
-       * AssociatedMetadataTypeTypeDescriptionProvider.cs: implemented
-       all the methods.
-
-2008-10-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-       * AssociatedMetadataTypeTypeDescriptionProvider.cs
-         DataType.cs
-         DataTypeAttribute.cs
-         DisplayColumnAttribute.cs
-         DisplayFormatAttribute.cs
-         MetadataTypeAttribute.cs
-         RangeAttribute.cs
-         RegularExpressionAttribute.cs
-         RequiredAttribute.cs
-         ScaffoldColumnAttribute.cs
-         ScaffoldTableAttribute.cs
-         StringLengthAttribute.cs
-         UIHintAttribute.cs
-         ValidationAttribute.cs
-         ValidationException.cs: initial checkin. mostly stubs.
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CompareAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CompareAttribute.cs
deleted file mode 100644 (file)
index afec3c9..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// CompareAttribute.cs
-//
-// Authors:
-//     Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com)
-// Copyright (C) 2013 Pablo Ruiz García
-//
-// 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.
-//
-
-#if NET_4_5
-
-using System;
-using System.Linq;
-using System.Globalization;
-using System.ComponentModel;
-using System.Collections.Generic;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class CompareAttribute : ValidationAttribute
-       {
-               private const string DefaultErrorMessage = "'{0}' and '{1}' do not match.";
-               private const string NonExistingPropertyErrorMessage = "Could not find a property named {0}.";
-               private string _otherProperty;
-               private string _otherPropertyDisplayName;
-
-               public CompareAttribute (string otherProperty)
-                       : base (() => DefaultErrorMessage)
-               {
-                       if (string.IsNullOrEmpty (otherProperty))
-                               throw new ArgumentNullException ("otherProperty");
-
-                       _otherProperty = otherProperty;
-               }
-
-               public string OtherProperty { get { return _otherProperty; } }
-               public string OtherPropertyDisplayName { get { return _otherPropertyDisplayName; } }
-               public override bool RequiresValidationContext { get { return true; } }
-
-               private IEnumerable<Attribute> GetPropertyAttributes (Type type, string propertyName)
-               {
-#if MOBILE
-                       return TypeDescriptor.GetProperties (type).Find (propertyName, false).Attributes.OfType<Attribute> ();
-#else
-                       // Using AMTTDP seems the way to go to be able to relay on attributes declared
-                       // by means of associated classes not directly decorating the property.
-                       // See: http://msdn.microsoft.com/en-us/library/system.componentmodel.dataannotations.associatedmetadatatypetypedescriptionprovider.aspx
-                       return new AssociatedMetadataTypeTypeDescriptionProvider (type)
-                               .GetTypeDescriptor (type)
-                               .GetProperties ()
-                               .Find (propertyName, false)
-                               .Attributes.OfType<Attribute> ();
-#endif
-               }
-
-               private void ResolveOtherPropertyDisplayName (ValidationContext context)
-               {
-                       if (_otherPropertyDisplayName == null)
-                       {
-                               // NOTE: From my own tests, it seems MS.NET looksup displayName from various sources, what follows
-                               //       is a best guess from my on tests, however, I am probably missing some corner cases. (pruiz)
-                               var attributes = GetPropertyAttributes (context.ObjectType, _otherProperty);
-                               var displayAttr = attributes.FirstOrDefault (x => x is DisplayAttribute) as DisplayAttribute;
-                               var displayNameAttr = attributes.FirstOrDefault (x => x is DisplayNameAttribute) as DisplayNameAttribute;
-
-                               if (displayAttr != null) _otherPropertyDisplayName = displayAttr.GetName ();
-                               else if (displayNameAttr != null) _otherPropertyDisplayName = displayNameAttr.DisplayName;
-                               _otherPropertyDisplayName = _otherProperty;
-                       }
-               }
-
-               public override string FormatErrorMessage (string name)
-               {
-                       var oname = string.IsNullOrEmpty (_otherPropertyDisplayName) ? _otherProperty : _otherPropertyDisplayName;
-                       return string.Format (ErrorMessageString, name, oname);
-               }
-
-               protected override ValidationResult IsValid(object value, ValidationContext context)
-               {
-                       var property = context.ObjectType.GetProperty (_otherProperty);
-
-                       if (property == null) {
-                               string message = string.Format (NonExistingPropertyErrorMessage, _otherProperty);
-                               return new ValidationResult (message);
-                       }
-
-                       // XXX: Could not find a better place to call this, as this is 
-                       //      the only place we have access to a ValidationContext. (pruiz)
-                       ResolveOtherPropertyDisplayName (context);
-
-                       return object.Equals (property.GetValue (context.ObjectInstance, null), value) ? null
-                               : new ValidationResult (FormatErrorMessage (context.DisplayName));
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ConcurrencyCheckAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ConcurrencyCheckAttribute.cs
deleted file mode 100644 (file)
index 6d5cdc7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// ConcurrencyCheckAttribute.cs
-//
-// Authors:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// 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.
-//
-#if NET_4_0
-using System;
-using System.Collections.Generic;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-       public sealed class ConcurrencyCheckAttribute : Attribute
-       {
-               public ConcurrencyCheckAttribute ()
-               {
-               }
-       }
-}
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ControlParameters.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ControlParameters.cs
deleted file mode 100644 (file)
index 98f7c5a..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// ControlParameters.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.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.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       sealed class ControlParameters : IEquatable<ControlParameters>
-       {
-               Dictionary<string, object> dictionary;
-               readonly object[] parameters;
-
-               public ControlParameters (object[] parameters)
-               {
-                       this.parameters = parameters;
-               }
-
-               public Dictionary<string, object> Dictionary {
-                       get {
-                               return dictionary ?? (dictionary = CreateDictionary ());
-                       }
-               }
-
-               public bool Equals (ControlParameters other)
-               {
-                       if (parameters == null || other.parameters == null)
-                               return ReferenceEquals (parameters, other.parameters);
-
-                       if (parameters.Length != other.parameters.Length)
-                               return false;
-
-                       try {
-                               return Dictionary.OrderBy (l => l.Key).SequenceEqual (other.Dictionary.OrderBy (l => l.Key));
-                       } catch (InvalidOperationException) {
-                               return false;
-                       }
-               }
-
-               Dictionary<string, object> CreateDictionary ()
-               {
-                       if (parameters == null || parameters.Length == 0) {
-                               return new Dictionary<string, object> (0);
-                       }
-
-                       if (parameters.Length % 2 != 0)
-                               throw new InvalidOperationException ();
-
-                       var dict = new Dictionary<string, object> ();                   
-                       for (int i = 0; i < parameters.Length; ) {
-                               var key = parameters [i++] as string;
-                               if (key == null)
-                                       throw new InvalidOperationException ();
-
-                               try {
-                                       dict.Add (key, parameters[i++]);
-                               } catch (System.ArgumentException) {
-                                       throw new InvalidOperationException ();
-                               }
-                       }
-
-                       return dict;
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CreditCardAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CreditCardAttribute.cs
deleted file mode 100644 (file)
index 66fdc90..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// CreditCardAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//      Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
-// Copyright (C) 2013 Pablo Ruiz García
-//
-// 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.
-//
-
-#if NET_4_5
-
-using System;
-using System.Linq;
-using System.Globalization;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class CreditCardAttribute : DataTypeAttribute
-       {
-               private const string DefaultErrorMessage = "The {0} field is not a valid credit card number.";
-
-               public CreditCardAttribute ()
-                       : base(DataType.CreditCard)
-               {
-                       // XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
-                       base.ErrorMessage = DefaultErrorMessage;
-               }
-
-               public override bool IsValid(object value)
-               {
-                       if (value == null)
-                               return true;
-
-                       if (string.IsNullOrEmpty(value as string))
-                               return false;
-
-                       // Remove any invalid characters..
-                       var creditCardNumber = (value as string).Replace("-", "").Replace(" ", "");
-
-                       if (creditCardNumber.Any (x => !Char.IsDigit (x)))
-                               return false;
-
-                       // Performan a Luhn-based check against credit card number.
-                       //
-                       // See: http://en.wikipedia.org/wiki/Luhn_algorithm
-                       // See: http://rosettacode.org/wiki/Luhn_test_of_credit_card_numbers
-
-                       return true;    
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CustomValidationAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/CustomValidationAttribute.cs
deleted file mode 100644 (file)
index 618dd88..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// CustomValidationAttribute.cs
-//
-// Authors:
-//     Marek Habersack <grendel@twistedcode.net>
-//
-// Copyright (C) 2010-2011 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.
-//
-#if NET_4_0
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = true)]
-       public sealed class CustomValidationAttribute : ValidationAttribute
-       {
-               Tuple <string, Type> typeId;
-               MethodInfo validationMethod;
-               bool validationMethodChecked;
-               bool validationMethodSignatureValid;
-               int validationMethodParamCount;
-               
-               public string Method { get; private set; }
-
-               public override object TypeId {
-                       get { return typeId; }
-               }
-               
-               public Type ValidatorType { get; private set; }
-               
-               public CustomValidationAttribute (Type validatorType, string method)
-               {
-                       this.ValidatorType = validatorType;
-                       this.Method = method;
-                       this.typeId = new Tuple <string, Type> (method, validatorType);
-               }
-
-               public override string FormatErrorMessage (string name)
-               {
-                       ThrowIfAttributeNotWellFormed ();
-                       return String.Format ("{0} is not valid.", name);
-               }
-
-               // LAMESPEC: MSDN doesn't document it at all, but corcompare shows it in the type
-               protected override ValidationResult IsValid (object value, ValidationContext validationContext)
-               {
-                       ThrowIfAttributeNotWellFormed ();
-                       object[] p;
-                               
-                       if (validationMethodParamCount == 2)
-                               p = new object [] {value, validationContext};
-                       else
-                               p = new object [] {value};
-                       try {
-                               return validationMethod.Invoke (null, p) as ValidationResult;
-                       } catch (TargetInvocationException ex) {
-                               if (ex.InnerException != null)
-                                       throw ex.InnerException;
-                               throw;
-                       }
-               }
-
-               void ThrowIfAttributeNotWellFormed ()
-               {
-                       Type type = ValidatorType;
-                       if (type == null)
-                               throw new InvalidOperationException ("The CustomValidationAttribute.ValidatorType was not specified.");
-
-                       if (type.IsNotPublic)
-                               throw new InvalidOperationException (String.Format ("The custom validation type '{0}' must be public.", type.Name));
-
-                       string method = Method;
-                       if (String.IsNullOrEmpty (method))
-                               throw new InvalidOperationException ("The CustomValidationAttribute.Method was not specified.");
-
-                       if (validationMethod == null) {
-                               if (!validationMethodChecked) {
-                                       validationMethod = type.GetMethod (method, BindingFlags.Public | BindingFlags.Static);
-                                       validationMethodChecked = true;
-                               }
-                               
-                               if (validationMethod == null)
-                                       throw new InvalidOperationException (
-                                               String.Format ("The CustomValidationAttribute method '{0}' does not exist in type '{1}' or is not public and static.",
-                                                              method, type.Name));
-
-                               if (!typeof (ValidationResult).IsAssignableFrom (validationMethod.ReturnType))
-                                       throw new InvalidOperationException (String.Format ("The CustomValidationAttribute method '{0}' in type '{1}' must return System.ComponentModel.DataAnnotations.ValidationResult.  Use System.ComponentModel.DataAnnotations.ValidationResult.Success to represent success.", method, type.Name));
-
-                               validationMethodSignatureValid = true;
-                               ParameterInfo[] parameters = validationMethod.GetParameters ();
-                               if (parameters == null)
-                                       validationMethodSignatureValid = false;
-                               else {
-                                       validationMethodParamCount = parameters.Length;
-                                       switch (validationMethodParamCount) {
-                                               case 1:
-                                                       break;
-
-                                               case 2:
-                                                       if (parameters [1].ParameterType != typeof (ValidationContext))
-                                                               validationMethodSignatureValid = false;
-                                                       break;
-
-                                               default:
-                                                       validationMethodSignatureValid = false;
-                                                       break;
-                                       }
-                               }
-                       }
-                       
-                       if (!validationMethodSignatureValid)
-                               throw new InvalidOperationException (String.Format ("The CustomValidationAttribute method '{0}' in type '{1}' must match the expected signature: public static ValidationResult MethodTwo(object value, ValidationContext context).  The value can be strongly typed.  The ValidationContext parameter is optional.", method, type.Name));
-                       
-               }
-       }
-}
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataType.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataType.cs
deleted file mode 100644 (file)
index 5ad56e7..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// DataType.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008-2011 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.
-//
-
-namespace System.ComponentModel.DataAnnotations
-{
-       public enum DataType
-       {
-               Custom,
-               DateTime,
-               Date,
-               Time,
-               Duration,
-               PhoneNumber,
-               Currency,
-               Text,
-               Html,
-               MultilineText,
-               EmailAddress,
-               Password,
-               Url,
-#if NET_4_0
-               ImageUrl,
-#endif
-#if NET_4_5
-               CreditCard,
-               PostalCode,
-               Upload
-#endif
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataTypeAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataTypeAttribute.cs
deleted file mode 100644 (file)
index 3a373db..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// DataTypeAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//     Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2008 Novell Inc. http://novell.com
-// Copyright (C) 2013 Pablo Ruiz García
-//
-// 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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-#if NET_4_0
-       [AttributeUsage (AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false)]
-#else
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-#endif
-       public class DataTypeAttribute : ValidationAttribute
-       {
-               public DataTypeAttribute (DataType dataType)
-               {
-                       DataType = dataType;
-
-                       DisplayFormatAttribute displayFormat;
-                       switch (dataType) {
-                               case DataType.Time:
-                                       displayFormat = new DisplayFormatAttribute ();
-                                       displayFormat.ApplyFormatInEditMode = true;
-                                       displayFormat.ConvertEmptyStringToNull = true;
-                                       displayFormat.DataFormatString = "{0:t}";
-#if NET_4_0
-                                       displayFormat.HtmlEncode = true;
-#endif
-                                       break;
-                               case DataType.Date:
-                                       displayFormat = new DisplayFormatAttribute ();
-                                       displayFormat.ApplyFormatInEditMode = true;
-                                       displayFormat.ConvertEmptyStringToNull = true;
-                                       displayFormat.DataFormatString = "{0:d}";
-#if NET_4_0
-                                       displayFormat.HtmlEncode = true;
-#endif
-                                       break;
-                               case DataType.Currency:
-                                       displayFormat = new DisplayFormatAttribute ();
-                                       displayFormat.ApplyFormatInEditMode = false;
-                                       displayFormat.ConvertEmptyStringToNull = true;
-                                       displayFormat.DataFormatString = "{0:C}";
-#if NET_4_0
-                                       displayFormat.HtmlEncode = true;
-#endif
-                                       break;
-
-                               default:
-                                       displayFormat = null;
-                                       break;
-                       }
-
-                       DisplayFormat = displayFormat;
-               }
-
-               public DataTypeAttribute (string customDataType)
-               {
-                       CustomDataType = customDataType;
-               }
-
-               public string CustomDataType { get; private set; }
-               public DataType DataType { get; private set; }
-               public DisplayFormatAttribute DisplayFormat { get; protected set; }
-
-               public virtual string GetDataTypeName ()
-               {
-                       DataType dt = DataType;
-                       if (dt == DataType.Custom)
-                               return CustomDataType;
-
-                       return dt.ToString ();
-               }
-
-               public override bool IsValid (object value)
-               {
-                       // Returns alwasy true  
-                       // See: http://msdn.microsoft.com/en-us/library/cc679235.aspx
-                       return true;
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayAttribute.cs
deleted file mode 100644 (file)
index ffdd5bd..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// DisplayAttribute.cs
-//
-// Author:
-//     David Stone <david@gixug.com>
-//
-// Copyright (C) 2010 David Stone
-//
-//
-// 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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-#if NET_4_0
-       [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Method, AllowMultiple = false)]
-       public sealed class DisplayAttribute : Attribute
-       {
-               public Type ResourceType { get; set; }
-
-               public string Description { get; set; }
-               public string GroupName { get; set; }
-               public string Name { get; set; }
-               public string ShortName { get; set; }
-               public string Prompt { get; set; }
-
-               const string property_not_set_message = "The {0} property has not been set.  Use the Get{0} method to get the value.";
-               const string localization_failed_message = "Cannot retrieve property '{0}' because localization failed. Type '{1} is not public or does not contain a public static string property with the name '{2}'.";
-
-               bool? _autoGenerateField;
-               public bool AutoGenerateField {
-                       get {
-                               if (!_autoGenerateField.HasValue) {
-                                       throw new InvalidOperationException (string.Format (property_not_set_message, "AutoGenerateField"));
-                               }
-                               
-                               return _autoGenerateField.Value;
-                       }
-                       set { _autoGenerateField = value; }
-               }
-
-               bool? _autoGenerateFilter;
-               public bool AutoGenerateFilter {
-                       get {
-                               if (_autoGenerateFilter == null) {
-                                       throw new InvalidOperationException (string.Format (property_not_set_message, "AutoGenerateFilter"));
-                               }
-                               
-                               return _autoGenerateFilter.Value;
-                       }
-                       set { _autoGenerateFilter = value; }
-               }
-
-               int? _order;
-               public int Order {
-                       get {
-                               if (_order == null)
-                                       throw new InvalidOperationException (string.Format (property_not_set_message, "Order"));
-                                       
-                               return _order.Value;
-                       }
-                       set { _order = value; }
-               }
-
-               private string GetLocalizedString (string propertyName, string key)
-               {
-                       // If we don't have a resource or a key, go ahead and fall back on the key
-                       if (ResourceType == null || key == null)
-                               return key;
-                       
-                       var property = ResourceType.GetProperty (key);
-                       
-                       // Strings are only valid if they are public static strings
-                       var isValid = false;
-                       if (ResourceType.IsVisible && property != null && property.PropertyType == typeof(string)) {
-                               var getter = property.GetGetMethod ();
-                               
-                               // Gotta have a public static getter on the property
-                               if (getter != null && getter.IsStatic && getter.IsPublic) {
-                                       isValid = true;
-                               }
-                       }
-                       
-                       // If it's not valid, go ahead and throw an InvalidOperationException
-                       if (!isValid) {
-                               var message = string.Format (localization_failed_message, propertyName, ResourceType.ToString (), key);
-                               throw new InvalidOperationException (message);
-                       }
-                       
-                       return (string)property.GetValue (null, null);
-                       
-               }
-
-               #region Consumer Methods
-               public bool? GetAutoGenerateField ()
-               {
-                       return _autoGenerateField;
-               }
-
-               public bool? GetAutoGenerateFilter ()
-               {
-                       return _autoGenerateFilter;
-               }
-               
-               public int? GetOrder ()
-               {
-                       return _order;
-               }
-
-               public string GetName ()
-               {
-                       return GetLocalizedString ("Name", Name);
-               }
-
-               public string GetShortName ()
-               {
-                       // Short name falls back on Name if the short name isn't set
-                       return GetLocalizedString ("ShortName", ShortName) ?? GetName ();
-               }
-
-               public string GetDescription ()
-               {
-                       return GetLocalizedString ("Description", Description);
-               }
-
-               public string GetPrompt ()
-               {
-                       return GetLocalizedString ("Prompt", Prompt);
-               }
-               
-               public string GetGroupName ()
-               {
-                       return GetLocalizedString ("GroupName", GroupName);
-               }
-               
-               #endregion
-               
-       }
-#endif
-}
-
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayColumnAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayColumnAttribute.cs
deleted file mode 100644 (file)
index 301ee94..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// DisplayColumnAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
-       public class DisplayColumnAttribute : Attribute
-       {
-               public DisplayColumnAttribute (string displayColumn)
-                       : this (displayColumn, null)
-               {
-               }
-
-               public DisplayColumnAttribute (string displayColumn, string sortColumn)
-                       : this (displayColumn, sortColumn, false)
-               {
-               }
-
-               public DisplayColumnAttribute (string displayColumn, string sortColumn, bool sortDescending)
-               {
-                       DisplayColumn = displayColumn;
-                       SortColumn = sortColumn;
-                       SortDescending = sortDescending;
-               }
-
-               public string DisplayColumn { get; private set; }
-               public string SortColumn { get; private set; }
-               public bool SortDescending { get; private set; }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayFormatAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DisplayFormatAttribute.cs
deleted file mode 100644 (file)
index 4c48a83..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// DisplayFormatAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-       public class DisplayFormatAttribute : Attribute
-       {
-               public bool ApplyFormatInEditMode { get; set; }
-               public bool ConvertEmptyStringToNull { get; set; }
-               public string DataFormatString { get; set; }
-               public string NullDisplayText { get; set; }
-#if NET_4_0
-               public bool HtmlEncode { get; set; }
-#endif
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EditableAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EditableAttribute.cs
deleted file mode 100644 (file)
index abfba99..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// EditableAttribute.cs
-//
-// Authors:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// 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.
-//
-#if NET_4_0
-using System;
-using System.Collections.Generic;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-       public sealed class EditableAttribute : Attribute
-       {
-               public bool AllowEdit { get; private set; }
-               public bool AllowInitialValue { get; set; }
-               
-               public EditableAttribute (bool allowEdit)
-               {
-                       this.AllowEdit = allowEdit;
-               }
-       }
-}
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EmailAddressAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EmailAddressAttribute.cs
deleted file mode 100644 (file)
index 5d79b92..0000000
+++ /dev/null
@@ -1,313 +0,0 @@
-//
-// EmailAddressAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//      Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
-// Copyright (C) 2013 Pablo Ruiz García
-//
-// 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.
-//
-
-#if NET_4_5
-
-using System;
-using System.Globalization;
-using System.Text.RegularExpressions;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class EmailAddressAttribute : DataTypeAttribute
-       {
-               private const string DefaultErrorMessage = "The {0} field is not a valid e-mail address.";
-               const string AtomCharacters = "!#$%&'*+-/=?^_`{|}~";
-
-               static bool IsLetterOrDigit (char c)
-               {
-                       return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9');
-               }
-
-               static bool IsAtom (char c)
-               {
-                       return IsLetterOrDigit (c) || AtomCharacters.IndexOf (c) != -1;
-               }
-
-               static bool IsDomain (char c)
-               {
-                       return IsLetterOrDigit (c) || c == '-';
-               }
-
-               static bool SkipAtom (string text, ref int index)
-               {
-                       int startIndex = index;
-
-                       while (index < text.Length && IsAtom (text[index]))
-                               index++;
-
-                       return index > startIndex;
-               }
-
-               static bool SkipSubDomain (string text, ref int index)
-               {
-                       if (!IsDomain (text[index]) || text[index] == '-')
-                               return false;
-
-                       index++;
-
-                       while (index < text.Length && IsDomain (text[index]))
-                               index++;
-
-                       return true;
-               }
-
-               static bool SkipDomain (string text, ref int index)
-               {
-                       if (!SkipSubDomain (text, ref index))
-                               return false;
-
-                       while (index < text.Length && text[index] == '.') {
-                               index++;
-
-                               if (index == text.Length)
-                                       return false;
-
-                               if (!SkipSubDomain (text, ref index))
-                                       return false;
-                       }
-
-                       return true;
-               }
-
-               static bool SkipQuoted (string text, ref int index)
-               {
-                       bool escaped = false;
-
-                       // skip over leading '"'
-                       index++;
-
-                       while (index < text.Length) {
-                               if (text[index] == (byte) '\\') {
-                                       escaped = !escaped;
-                               } else if (!escaped) {
-                                       if (text[index] == (byte) '"')
-                                               break;
-                               } else {
-                                       escaped = false;
-                               }
-
-                               index++;
-                       }
-
-                       if (index >= text.Length || text[index] != (byte) '"')
-                               return false;
-
-                       index++;
-
-                       return true;
-               }
-
-               static bool SkipWord (string text, ref int index)
-               {
-                       if (text[index] == (byte) '"')
-                               return SkipQuoted (text, ref index);
-
-                       return SkipAtom (text, ref index);
-               }
-
-               static bool SkipIPv4Literal (string text, ref int index)
-               {
-                       int groups = 0;
-
-                       while (index < text.Length && groups < 4) {
-                               int startIndex = index;
-                               int value = 0;
-
-                               while (index < text.Length && text[index] >= '0' && text[index] <= '9') {
-                                       value = (value * 10) + (text[index] - '0');
-                                       index++;
-                               }
-
-                               if (index == startIndex || index - startIndex > 3 || value > 255)
-                                       return false;
-
-                               groups++;
-
-                               if (groups < 4 && index < text.Length && text[index] == '.')
-                                       index++;
-                       }
-
-                       return groups == 4;
-               }
-
-               static bool IsHexDigit (char c)
-               {
-                       return (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f') || (c >= '0' && c <= '9');
-               }
-
-               // This needs to handle the following forms:
-               //
-               // IPv6-addr = IPv6-full / IPv6-comp / IPv6v4-full / IPv6v4-comp
-               // IPv6-hex  = 1*4HEXDIG
-               // IPv6-full = IPv6-hex 7(":" IPv6-hex)
-               // IPv6-comp = [IPv6-hex *5(":" IPv6-hex)] "::" [IPv6-hex *5(":" IPv6-hex)]
-               //             ; The "::" represents at least 2 16-bit groups of zeros
-               //             ; No more than 6 groups in addition to the "::" may be
-               //             ; present
-               // IPv6v4-full = IPv6-hex 5(":" IPv6-hex) ":" IPv4-address-literal
-               // IPv6v4-comp = [IPv6-hex *3(":" IPv6-hex)] "::"
-               //               [IPv6-hex *3(":" IPv6-hex) ":"] IPv4-address-literal
-               //             ; The "::" represents at least 2 16-bit groups of zeros
-               //             ; No more than 4 groups in addition to the "::" and
-               //             ; IPv4-address-literal may be present
-               static bool SkipIPv6Literal (string text, ref int index)
-               {
-                       bool compact = false;
-                       int colons = 0;
-
-                       while (index < text.Length) {
-                               int startIndex = index;
-
-                               while (index < text.Length && IsHexDigit (text[index]))
-                                       index++;
-
-                               if (index >= text.Length)
-                                       break;
-
-                               if (index > startIndex && colons > 2 && text[index] == '.') {
-                                       // IPv6v4
-                                       index = startIndex;
-
-                                       if (!SkipIPv4Literal (text, ref index))
-                                               return false;
-
-                                       break;
-                               }
-
-                               int count = index - startIndex;
-                               if (count > 4)
-                                       return false;
-
-                               if (text[index] != ':')
-                                       break;
-
-                               startIndex = index;
-                               while (index < text.Length && text[index] == ':')
-                                       index++;
-
-                               count = index - startIndex;
-                               if (count > 2)
-                                       return false;
-
-                               if (count == 2) {
-                                       if (compact)
-                                               return false;
-
-                                       compact = true;
-                                       colons += 2;
-                               } else {
-                                       colons++;
-                               }
-                       }
-
-                       if (colons < 2)
-                               return false;
-
-                       if (compact)
-                               return colons < 6;
-
-                       return colons < 7;
-               }
-
-               static bool Validate (string email)
-               {
-                       int index = 0;
-
-                       if (email.Length == 0)
-                               return false;
-
-                       if (!SkipWord (email, ref index) || index >= email.Length)
-                               return false;
-
-                       while (index < email.Length && email[index] == '.') {
-                               index++;
-
-                               if (!SkipWord (email, ref index) || index >= email.Length)
-                                       return false;
-                       }
-
-                       if (index + 1 >= email.Length || email[index++] != '@')
-                               return false;
-
-                       if (email[index] != '[') {
-                               // domain
-                               if (!SkipDomain (email, ref index))
-                                       return false;
-
-                               return index == email.Length;
-                       }
-
-                       // address literal
-                       index++;
-
-                       // we need at least 8 more characters
-                       if (index + 8 >= email.Length)
-                               return false;
-
-                       var ipv6 = email.Substring (index, 5);
-                       if (ipv6.ToLowerInvariant () == "ipv6:") {
-                               index += "IPv6:".Length;
-                               if (!SkipIPv6Literal (email, ref index))
-                                       return false;
-                       } else {
-                               if (!SkipIPv4Literal (email, ref index))
-                                       return false;
-                       }
-
-                       if (index >= email.Length || email[index++] != ']')
-                               return false;
-
-                       return index == email.Length;
-               }
-
-               public EmailAddressAttribute ()
-                       : base(DataType.EmailAddress)
-               {
-                       // XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
-                       base.ErrorMessage = DefaultErrorMessage;
-               }
-
-               public override bool IsValid(object value)
-               {
-                       if (value == null)
-                               return true;
-
-                       string email = value as string;
-                       if (email == null)
-                               return false;
-
-                       return Validate (email);
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EnumDataTypeAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/EnumDataTypeAttribute.cs
deleted file mode 100644 (file)
index a0efa1e..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// EnumDataTypeAttribute.cs
-//
-// Authors:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// 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.
-//
-#if NET_4_0
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public sealed class EnumDataTypeAttribute : DataTypeAttribute
-       {
-               public Type EnumType { get; private set; }
-               
-               public EnumDataTypeAttribute (Type enumType)
-                       : base (DataType.Custom)
-               {
-                       this.EnumType = enumType;
-               }
-
-               public override bool IsValid (object value)
-               {
-                       Type type = EnumType;
-
-                       if (!type.IsEnum)
-                               throw new InvalidOperationException (
-                                       String.Format ("The type '{0}' needs to represent an enumeration type.", type.FullName)
-                               );
-
-                       if (value == null)
-                               return true;
-
-                       Type valueType = value.GetType ();
-                       if (valueType.IsEnum && valueType != type)
-                               return false;
-
-                       string s = value as string;
-                       if (s != null && s.Length == 0)
-                               return true;
-                       
-                       if (s != null && (valueType == typeof (bool) || valueType == typeof (char) || valueType == typeof (float)))
-                               return false;
-
-                       object o;
-
-                       if (s != null) {
-                               try {
-                                       o = Enum.Parse (type, s);
-                               } catch {
-                                       return false;
-                               }
-                       } else if (valueType.IsEnum)
-                               o = value;
-                       else {
-                               try {
-                                       o = Enum.ToObject (type, value);
-                               } catch {
-                                       return false;
-                               }
-                       }
-
-                       object[] attrs = type.GetCustomAttributes (typeof (FlagsAttribute), true);
-                       if (attrs != null && attrs.Length > 0) {
-                               string sval = Convert.ChangeType (o, Enum.GetUnderlyingType (type), CultureInfo.InvariantCulture).ToString ();
-
-                               // This looks weird, but what happens here is that if we have a
-                               // mismatch, the above type change will make sval equal o.ToString
-                               // () and if we have a match, then sval will be string
-                               // representation of the enum member's value. So, if we have an
-                               // enum:
-                               //
-                               // [Flags]
-                               // enum Test
-                               // {
-                               //     One = 1,
-                               //     Two = 2
-                               // }
-                               //
-                               // And the passed value was 3, then o.ToString () == "One, Two" and
-                               // sval == "3". If the passed value was 33, though, o.ToString () ==
-                               // "33" and sval == "33" - thus we DON'T have a match.
-                               return !sval.Equals (o.ToString ());
-                       }
-                       
-                       return Enum.IsDefined (type, o);
-               }
-       }
-}
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/FileExtensionsAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/FileExtensionsAttribute.cs
deleted file mode 100644 (file)
index de9c384..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// FileExtensionAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//      Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
-// Copyright (C) 2013 Pablo Ruiz García
-//
-// 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.
-//
-
-#if NET_4_5
-
-using System;
-using System.Linq;
-using System.Globalization;
-using System.Text.RegularExpressions;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       // See: http://msdn.microsoft.com/en-us/library/system.componentmodel.dataannotations.fileextensionsattribute.aspx
-
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class FileExtensionsAttribute : DataTypeAttribute
-       {
-               private const string DefaultErrorMessage = "The {0} field only accepts files with the following extensions: {1}.";
-               private const string DefaultExtensions = "png,jpg,jpeg,gif";
-
-               public FileExtensionsAttribute ()
-                       : base (DataType.Upload)
-               {
-                       // XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
-                       base.ErrorMessage = DefaultErrorMessage;
-                       this.Extensions = DefaultExtensions;
-               }
-
-               public string Extensions { get; set; }
-
-               private string[] GetExtensionList ()
-               {
-                       return (Extensions ?? "").Split (',');
-               }
-
-               private string GetExtension (string filename)
-               {
-                       var parts = filename.Split ('.');
-                       return parts.Length > 0 ? parts [parts.Length - 1] : "";
-               }
-
-               public override string FormatErrorMessage (string name)
-               {
-                       var extensions = GetExtensionList().Aggregate ((cur, next) => cur + ", " + next);
-                       return string.Format (ErrorMessageString, name, extensions);
-               }
-
-               public override bool IsValid(object value)
-               {
-                       if (value == null)
-                               return true;
-
-                       if (value is string)
-                       {
-                               var str = value as string;
-                               var ext = GetExtension (str);
-                               return GetExtensionList ().Any (x => string.Equals (x, ext, StringComparison.InvariantCultureIgnoreCase));
-                       }
-
-                       return false;
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/FilterUIHintAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/FilterUIHintAttribute.cs
deleted file mode 100644 (file)
index 870e409..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// FilterUIHintAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_0
-
-using System.Runtime.CompilerServices;
-using System.Collections.Generic;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
-       public sealed class FilterUIHintAttribute : Attribute
-       {
-               readonly ControlParameters controlParameters;
-
-               public FilterUIHintAttribute (string filterUIHint)
-                       : this (filterUIHint, null, null)
-               {
-               }
-
-               public FilterUIHintAttribute (string filterUIHint, string presentationLayer)
-                       : this (filterUIHint, presentationLayer, null)
-               {
-               }
-
-               public FilterUIHintAttribute (string filterUIHint, string presentationLayer, params object[] controlParameters)
-               {
-                       FilterUIHint = filterUIHint;
-                       PresentationLayer = presentationLayer;  
-                       this.controlParameters = new ControlParameters (controlParameters);
-               }
-
-               public IDictionary<string, object> ControlParameters {
-                       get {
-                               return controlParameters.Dictionary;
-                       }
-               }
-               
-               public string FilterUIHint { get; private set; }
-
-               public string PresentationLayer { get; private set; }
-
-               public override object TypeId {
-                       get {
-                               return this;
-                       }
-               }
-
-               public override int GetHashCode ()
-               {
-                       return RuntimeHelpers.GetHashCode (FilterUIHint) ^
-                               RuntimeHelpers.GetHashCode (PresentationLayer);
-               }
-
-               public override bool Equals (object obj)
-               {
-                       var fha = obj as FilterUIHintAttribute;
-                       if (fha == null)
-                               return false;
-
-                       return fha.FilterUIHint == FilterUIHint && 
-                               fha.PresentationLayer == PresentationLayer &&
-                               fha.controlParameters.Equals (controlParameters);
-               }
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/IValidatableObject.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/IValidatableObject.cs
deleted file mode 100644 (file)
index cf68fc3..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// IValidatableObject.cs
-//
-// Authors:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// 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.
-//
-#if NET_4_0
-using System;
-using System.Collections.Generic;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       public interface IValidatableObject
-       {
-               IEnumerable<ValidationResult> Validate (ValidationContext validationContext);
-       }
-}
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/KeyAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/KeyAttribute.cs
deleted file mode 100644 (file)
index 37cde19..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// KeyAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_0
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-       public sealed class KeyAttribute : Attribute
-       {
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MaxLengthAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MaxLengthAttribute.cs
deleted file mode 100644 (file)
index 84fab2a..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// MaxLengthAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//     Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-using System.Globalization;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class MaxLengthAttribute : ValidationAttribute
-       {
-               private const string DefaultErrorMessage = "The field {0} must be a string or array type with a maximum length of '{1}'.";
-               private const string InvalidLengthErrorMessage = "MaxLengthAttribute must have a Length value that is greater than zero. " +
-                                                                "Use MaxLength() without parameters to indicate that the string or array can have the maximum allowable length.";
-               private bool _maxLength = true;
-
-               public MaxLengthAttribute ()
-                       : base (() => DefaultErrorMessage)
-               {
-               }
-               
-               public MaxLengthAttribute (int length)
-                       : this ()
-               {
-                       Length = length;
-                       _maxLength = false;
-               }
-               
-               public int Length { get; private set; }
-
-               public override string FormatErrorMessage (string name)
-               {
-                       return string.Format (ErrorMessageString, name, Length);
-               }
-
-               public override bool IsValid (object value)
-               {
-                       // See: http://msdn.microsoft.com/en-us/library/gg696614.aspx
-
-                       if (this.Length == 0 || this.Length < -1)
-                               throw new InvalidOperationException (InvalidLengthErrorMessage);
-
-                       // Weird, but using 'MaxLength' with no length seems to be valid
-                       // and we should be returning true, and not throwing. (pablo)
-                       if (value != null && !_maxLength) {
-
-                               if (value is string) {
-                                       return (value as string).Length <= this.Length;
-                               }
-
-                               if (value is Array) {
-                                       return (value as Array).Length <= this.Length;
-                               }
-
-                               // NOTE: from my tests, MS.NET does not support IEnumerable as value. :(
-                       }
-
-                       return true;
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MetadataTypeAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MetadataTypeAttribute.cs
deleted file mode 100644 (file)
index 4fdae6c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// MetadataTypeAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Class, AllowMultiple = false)]
-       public sealed class MetadataTypeAttribute : Attribute
-       {
-               public MetadataTypeAttribute (Type metadataClassType)
-               {
-                       MetadataClassType = metadataClassType;
-               }
-
-               public Type MetadataClassType { get; private set; }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MinLengthAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/MinLengthAttribute.cs
deleted file mode 100644 (file)
index ff30f76..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// MinLengthAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//      Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-using System;
-using System.Globalization;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class MinLengthAttribute : ValidationAttribute
-       {
-               private const string DefaultErrorMessage = "The field {0} must be a string or array type with a minimum length of '{1}'.";
-               private const string InvalidLengthErrorMessage = "MinLengthAttribute must have a Length value that is zero or greater.";
-
-               public MinLengthAttribute ()
-               {
-               }
-
-               public MinLengthAttribute (int length)
-               {
-                       Length = length;
-               }
-
-               public int Length { get; private set; }
-
-               public override string FormatErrorMessage (string name)
-               {
-                       return string.Format (ErrorMessageString, name, Length);
-               }
-
-               public override bool IsValid (object value)
-               {
-                       if (this.Length < 0)
-                               throw new InvalidOperationException (InvalidLengthErrorMessage);
-
-                       if (value != null) {
-
-                               if (value is string) {
-                                       return (value as string).Length >= this.Length;
-                               }
-
-                               if (value is Array) {
-                                       return (value as Array).Length >= this.Length;
-                               }
-
-                               // NOTE: from my tests, MS.NET does not support IEnumerable as value. :(
-                       }
-
-                       return true;
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/PhoneAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/PhoneAttribute.cs
deleted file mode 100644 (file)
index 58cec3b..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// PhoneAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//      Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
-// Copyright (C) 2013 Pablo Ruiz García
-//
-// 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.
-//
-
-#if NET_4_5
-
-using System;
-using System.Globalization;
-using System.Text.RegularExpressions;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class PhoneAttribute : DataTypeAttribute
-       {
-               private const string DefaultErrorMessage = "The {0} field is not a valid phone number.";
-               private const string _regexStr = @"^\+?(\d[\d-. ]+)?(\([\d-. ]+\))?[\d-. ]+\d$";
-               private static Regex _regex = new Regex (_regexStr, RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
-               public PhoneAttribute ()
-                       : base(DataType.PhoneNumber)
-               {
-                       // XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
-                       base.ErrorMessage = DefaultErrorMessage;
-               }
-
-               public override bool IsValid(object value)
-               {
-                       if (value == null)
-                               return true;
-
-                       if (value is string)
-                       {
-                               var str = value as string;
-                               return !string.IsNullOrEmpty(str) ? _regex.IsMatch(str) : false;
-                       }
-
-                       return false;
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RangeAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RangeAttribute.cs
deleted file mode 100644 (file)
index 9bf5266..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-// RangeAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.Globalization;
-using System.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-#if NET_4_0
-       [AttributeUsage (AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
-#else
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-#endif
-       public class RangeAttribute : ValidationAttribute
-       {
-               Func <object, bool> comparer;
-               TypeConverter cvt;
-
-               public object Maximum { get; private set; }
-               public object Minimum { get; private set; }
-               public Type OperandType { get; private set; }
-
-               IComparable MaximumComparable {
-                       get { return Maximum as IComparable; }
-               }
-
-               IComparable MinimumComparable {
-                       get { return Minimum as IComparable; }
-               }
-               
-               RangeAttribute ()
-                       : base (GetDefaultErrorMessage)
-               {
-               }
-               
-               public RangeAttribute (double minimum, double maximum) : this ()
-               {
-                       Minimum = minimum;
-                       Maximum = maximum;
-                       OperandType = typeof (double);
-               }
-
-               public RangeAttribute (int minimum, int maximum) : this ()
-               {
-                       Minimum = minimum;
-                       Maximum = maximum;
-                       OperandType = typeof (int);
-               }
-
-               public RangeAttribute (Type type, string minimum, string maximum) : this ()
-               {
-#if !NET_4_0
-                       if (type == null)
-                               throw new ArgumentNullException ("type");
-#endif
-                       OperandType = type;
-                       Minimum = minimum;
-                       Maximum = maximum;
-#if !NET_4_0
-                       comparer = SetupComparer ();
-#endif
-               }
-
-               static string GetDefaultErrorMessage ()
-               {
-                       return "The field {0} must be between {1} and {2}.";
-               }
-               
-               public override string FormatErrorMessage (string name)
-               {
-                       if (comparer == null)
-                               comparer = SetupComparer ();
-
-                       return String.Format (ErrorMessageString, name, Minimum, Maximum);
-               }
-
-               // LAMESPEC: does not throw ValidationException when value is out of range
-               public override bool IsValid (object value)
-               {
-                       if (comparer == null)
-                               comparer = SetupComparer ();
-                       
-                       if (value == null)
-                               return true;
-
-                       string s = value as string;
-                       if (s != null && s.Length == 0)
-                               return true;
-                       
-                       try {
-                               if (comparer != null)
-                                       return comparer (value);
-
-                               return false;
-                       } catch (FormatException) {
-                               return false;
-                       } catch (InvalidCastException) {
-                               return false;
-                       }
-               }
-
-               Func <object, bool> SetupComparer ()
-               {
-                       Type ot = OperandType;
-
-                       object min = Minimum, max = Maximum;
-#if NET_4_0
-                       if (min == null || max == null)
-                               throw new InvalidOperationException ("The minimum and maximum values must be set.");
-#endif
-                       if (min is int)
-                               return new Func <object, bool> (CompareInt);
-
-                       if (min is double)
-                               return new Func <object, bool> (CompareDouble);
-                       
-                       if (ot == null)
-                               throw new InvalidOperationException ("The OperandType must be set when strings are used for minimum and maximum values.");
-                       
-                       if (!typeof(IComparable).IsAssignableFrom (ot)) {
-#if NET_4_0
-                               string message = String.Format ("The type {0} must implement System.IComparable", ot.FullName);
-                               throw new InvalidOperationException (message);
-#else
-                               throw new ArgumentException ("object");
-#endif
-                       }
-                       
-                       string smin = min as string, smax = max as string;
-                       cvt = TypeDescriptor.GetConverter (ot);
-                       Minimum = cvt.ConvertFromString (smin);
-                       Maximum = cvt.ConvertFromString (smax);
-
-                       return new Func <object, bool> (CompareArbitrary);
-               }
-
-               bool CompareInt (object value)
-               {
-                       int cv = Convert.ToInt32 (value);
-
-                       return MinimumComparable.CompareTo (cv) <= 0 && MaximumComparable.CompareTo (cv) >= 0;
-               }
-
-               bool CompareDouble (object value)
-               {
-                       double cv = Convert.ToDouble (value);
-                       
-                       return MinimumComparable.CompareTo (cv) <= 0 && MaximumComparable.CompareTo (cv) >= 0;
-               }
-
-               bool CompareArbitrary (object value)
-               {
-                       object cv;
-                       if (value != null && value.GetType () == OperandType)
-                               cv = value;
-                       else if (cvt != null)
-                               cv = cvt.ConvertFrom (value);
-                       else
-                               cv = null;
-                       
-                       return MinimumComparable.CompareTo (cv) <= 0 && MaximumComparable.CompareTo (cv) >= 0;
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RegularExpressionAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RegularExpressionAttribute.cs
deleted file mode 100644 (file)
index d4d3041..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// RegularExpressionAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//  Antoine Cailliau <a.cailliau@maximux.net>
-//
-// Copyright (C) 2008 Novell Inc. http://novell.com
-// Copyright (C) 20011 Maximux Scris. http://maximux.net
-//
-
-//
-// 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.Globalization;
-using System.ComponentModel;
-using System.Text.RegularExpressions;
-
-namespace System.ComponentModel.DataAnnotations
-{
-
-#if NET_4_0
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field|AttributeTargets.Parameter, AllowMultiple = false)]
-#else
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]      
-#endif
-       public class RegularExpressionAttribute : ValidationAttribute
-       {
-               public RegularExpressionAttribute (string pattern)
-                       : base(GetDefaultErrorMessage)
-               {
-                       if (pattern == null)
-                               throw new ArgumentNullException("pattern");
-                       Pattern = pattern;
-               }
-
-               public string Pattern { get; private set; }
-
-               static string GetDefaultErrorMessage ()
-               {
-                       return "The field {0} must match the regular expression {1}.";
-               }
-               
-               public override string FormatErrorMessage (string name)
-               {
-                       return string.Format (ErrorMessageString, name, Pattern);
-               }
-
-               // LAMESPEC: does not throw ValidationException when value does not match the regular expression
-               public override bool IsValid (object value)
-               {
-                       if (value == null) 
-                               return true;
-                       
-                       string str = (string) value;
-                       Regex regex = new Regex(Pattern);
-                       return regex.IsMatch(str);
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RequiredAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RequiredAttribute.cs
deleted file mode 100644 (file)
index da77782..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// RequiredAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008-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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-#if NET_4_0
-       [AttributeUsage (AttributeTargets.Parameter|AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-#else
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-#endif
-       public class RequiredAttribute : ValidationAttribute
-       {
-#if NET_4_0
-               public bool AllowEmptyStrings { get; set; }
-#endif
-
-               public override bool IsValid (object value)
-               {
-                       if (value == null)
-                               return false;
-
-                       string s = value as string;
-                       if (s != null
-#if NET_4_0
-                           && !AllowEmptyStrings
-#endif
-                       )
-                               return s.Length > 0;
-
-                       return true;
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ScaffoldColumnAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ScaffoldColumnAttribute.cs
deleted file mode 100644 (file)
index c893658..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// RequiredAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-       public class ScaffoldColumnAttribute : Attribute
-       {
-               public ScaffoldColumnAttribute (bool scaffold)
-               {
-                       Scaffold = scaffold;
-               }
-
-               [MonoTODO]
-               public bool Scaffold { get; private set; }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ScaffoldTableAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ScaffoldTableAttribute.cs
deleted file mode 100644 (file)
index 505f775..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// RequiredAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Class, AllowMultiple = false)]
-       public class ScaffoldTableAttribute : Attribute
-       {
-               public ScaffoldTableAttribute (bool scaffold)
-               {
-                       Scaffold = scaffold;
-               }
-
-               [MonoTODO]
-               public bool Scaffold { get; private set; }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/StringLengthAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/StringLengthAttribute.cs
deleted file mode 100644 (file)
index 20a59e7..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// StringLengthAttribute.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//     Marek Habersack <grendel@twistedcode.net>
-//
-// Copyright (C) 2008-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.Globalization;
-using System.ComponentModel;
-
-namespace System.ComponentModel.DataAnnotations
-{
-#if NET_4_0
-       [AttributeUsage (AttributeTargets.Parameter|AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-#else
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
-#endif
-       public class StringLengthAttribute : ValidationAttribute
-       {
-               public int MaximumLength { get; private set; }
-#if NET_4_0
-               public int MinimumLength { get; set; }
-#endif
-               public StringLengthAttribute (int maximumLength)
-                       : base (GetDefaultErrorMessage)
-               {
-#if !NET_4_0
-                       if (maximumLength < 0)
-                               throw new ArgumentOutOfRangeException ("maximumLength", String.Format ("Actual value was {0}", maximumLength));
-#endif
-                       MaximumLength = maximumLength;
-               }
-
-               static string GetDefaultErrorMessage ()
-               {
-                       return "The field {0} must be a string with a maximum length of {1}.";
-               }
-
-               public override string FormatErrorMessage (string name)
-               {
-#if NET_4_0
-                       return String.Format (ErrorMessageString, name, MaximumLength, MinimumLength);
-#else
-                       return String.Format (ErrorMessageString, name, MaximumLength);
-#endif
-               }
-
-               public override bool IsValid (object value)
-               {
-                       if (value == null)
-                               return true;
-
-                       string str = (string)value;
-                       int max = MaximumLength;
-#if NET_4_0
-                       int min = MinimumLength;
-
-                       // LAMESPEC: documented to throw ArgumentOutOfRangeException
-                       if (max < 0)
-                               throw new InvalidOperationException ("The maximum length must be a nonnegative integer.");
-
-                       if (min > max)
-                               throw new InvalidOperationException (
-                                       String.Format ("The maximum value '{0}' must be greater than or equal to the minimum value '{1}'.",
-                                                      max, min)
-                               );
-
-                       int len = str.Length;
-                       return len <= max && len >= min;
-#else                  
-                       return str.Length <= max;
-#endif
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/TimestampAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/TimestampAttribute.cs
deleted file mode 100644 (file)
index 4d67b9c..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// TimestampAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//      Pablo Ruiz García <pablo.ruiz@gmail.com>
-//
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
-// Copyright (C) 2013 Pablo Ruiz García
-//
-// 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.
-//
-
-#if NET_4_0
-
-using System;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public class TimestampAttribute : Attribute
-       {
-       }
-}
-
-#endif
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/UIHintAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/UIHintAttribute.cs
deleted file mode 100644 (file)
index ec6e115..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// UIHintAttribute.cs
-//
-// Authors:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2008 Novell Inc. http://novell.com
-// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.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.Generic;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = true)]
-       public class UIHintAttribute : Attribute
-       {
-               readonly ControlParameters controlParameters;
-
-               public UIHintAttribute (string uiHint)
-                       : this (uiHint, null)
-               {
-               }
-
-               public UIHintAttribute (string uiHint, string presentationLayer)
-                       : this (uiHint, presentationLayer, null)
-               {
-               }
-
-               public UIHintAttribute (string uiHint, string presentationLayer, params object [] controlParameters)
-               {
-                       UIHint = uiHint;
-                       PresentationLayer = presentationLayer;
-                       this.controlParameters = new ControlParameters (controlParameters);
-               }
-
-               public IDictionary<string, object> ControlParameters {
-                       get {
-                               return controlParameters.Dictionary;
-                       }
-               }
-
-               public string PresentationLayer { get; private set; }
-
-               public string UIHint { get; private set; }
-
-#if NET_4_0
-               public override object TypeId {
-                       get {
-                               return this;
-                       }
-               }
-#endif
-
-               public override int GetHashCode ()
-               {
-                       return RuntimeHelpers.GetHashCode (UIHint) ^
-                               RuntimeHelpers.GetHashCode (PresentationLayer);
-               }
-
-               public override bool Equals (object obj)
-               {
-                       var ha = obj as UIHintAttribute;
-                       if (ha == null)
-                               return false;
-
-                       return ha.UIHint == UIHint && 
-                               ha.PresentationLayer == PresentationLayer &&
-                               ha.controlParameters.Equals (controlParameters);
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/UrlAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/UrlAttribute.cs
deleted file mode 100644 (file)
index 4fa0dec..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// UrlAttribute.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2014 Xamarin Inc (http://www.xamarin.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.
-//
-
-#if NET_4_5
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-       public sealed class UrlAttribute : DataTypeAttribute
-       {
-               public UrlAttribute ()
-                       : base (DataType.Url)
-               {
-               }
-
-               public override bool IsValid (object value)
-               {
-                       if (value == null)
-                               return true;
-
-                       var s = value as string;
-                       return s != null && Uri.IsWellFormedUriString (s, UriKind.Absolute);
-               }
-       }
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationAttribute.cs
deleted file mode 100644 (file)
index d95ff90..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-//
-// ValidationAttribute.cs
-//
-// Authors:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//     Marek Habersack <mhabersack@novell.com>
-//
-// Copyright (C) 2008-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.ComponentModel;
-using System.Reflection;
-using System.Globalization;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       public abstract class ValidationAttribute : Attribute
-       {
-               const string DEFAULT_ERROR_MESSAGE = "The field {0} is invalid.";
-#if NET_4_0
-               object nestedCallLock = new object ();
-               bool nestedCall;
-#else
-               string errorMessageResourceName;
-               string errorMessageString;
-               Type errorMessageResourceType;
-#endif
-               string errorMessage;
-               string fallbackErrorMessage;
-               Func <string> errorMessageAccessor;
-               
-               protected ValidationAttribute ()
-               {
-               }
-
-               protected ValidationAttribute (Func<string> errorMessageAccessor)
-               {
-                       this.errorMessageAccessor = errorMessageAccessor;
-               }
-
-               protected ValidationAttribute (string errorMessage)
-               {
-                       fallbackErrorMessage = errorMessage;
-               }
-
-               public virtual string FormatErrorMessage (string name)
-               {
-                       string format = ErrorMessageString;
-                       if (String.IsNullOrEmpty (format))
-                               return String.Empty;
-
-                       return String.Format (ErrorMessageString, name);
-               }
-#if NET_4_0
-               public string ErrorMessage {
-                       get { return errorMessage; }
-                       set {
-                               errorMessage = value;
-                               if (errorMessage != null)
-                                       errorMessageAccessor = null;
-                       }
-               }
-               public string ErrorMessageResourceName { get; set; }
-               public Type ErrorMessageResourceType { get; set; }
-#else
-               public string ErrorMessage {
-                       get { return errorMessage; }
-
-                       set {
-#if !NET_4_0
-                               if (errorMessage != null)
-                                       throw new InvalidOperationException ("This property can be set only once.");
-#endif
-                               if (String.IsNullOrEmpty (value))
-                                       throw new ArgumentException ("Value cannot be null or empty.", "value");
-
-                               if (errorMessageResourceName != null || errorMessageResourceType != null)
-                                       throw new InvalidOperationException ("This property cannot be set because the attribute is already in the resource mode.");
-                               
-                               errorMessage = value;
-                       }
-               }
-
-               public string ErrorMessageResourceName {
-                       get { return errorMessageResourceName; }
-                       
-                       set {
-                               if (errorMessageResourceName != null)
-                                       throw new InvalidOperationException ("This property can be set only once.");
-
-                               if (String.IsNullOrEmpty (value))
-                                       throw new ArgumentException ("Value cannot be null or empty.", "value");
-
-                               errorMessageResourceName = value;
-                               if (errorMessageResourceType != null)
-                                       errorMessageString = GetStringFromResourceAccessor ();
-                       }
-               }
-
-               public Type ErrorMessageResourceType {
-                       get { return errorMessageResourceType; }
-                       set {
-                               errorMessageResourceType = value;
-                               if (!String.IsNullOrEmpty (errorMessageResourceName))
-                                       errorMessageString = GetStringFromResourceAccessor ();
-                       }
-               }
-#endif         
-               protected string ErrorMessageString {
-                       get { return GetStringFromResourceAccessor (); }
-               }
-
-#if NET_4_5
-               // See: http://msdn.microsoft.com/en-us/library/system.componentmodel.dataannotations.validationattribute.requiresvalidationcontext.aspx
-               public virtual bool RequiresValidationContext { get { return false; } }
-#endif
-
-#if NET_4_0
-               NotImplementedException NestedNIEX ()
-               {
-                       return new NotImplementedException ("IsValid(object value) has not been implemented by this class.  The preferred entry point is GetValidationResult() and classes should override IsValid(object value, ValidationContext context).");
-               }
-               
-               //
-               // This is the weirdest (to be gentle) idea ever... The IsValid (object) overload
-               // throws the NIEX when it is called from the default IsValid (object,
-               // ValidationContext) overload, but not when directly. And the reverse situation is
-               // true as well. That means, the calls detect the "nested" calls and that we need to
-               // protect the nestedCall flag... ugh
-               //
-               public virtual bool IsValid (object value)
-               {
-                       lock (nestedCallLock) {
-                               if (nestedCall)
-                                       throw NestedNIEX ();
-                               try {
-                                       nestedCall = true;
-                                       return IsValid (value, null) == ValidationResult.Success;
-                               } finally {
-                                       nestedCall = false;
-                               }
-                       }
-               }
-
-               protected virtual ValidationResult IsValid (object value, ValidationContext validationContext)
-               {
-                       lock (nestedCallLock) {
-                               if (nestedCall)
-                                       throw NestedNIEX ();
-                               
-                               try {
-                                       nestedCall = true;
-                                       if (!IsValid (value)) {
-                                               // .NET emulation
-                                               if (validationContext == null)
-                                                       throw new NullReferenceException (".NET emulation.");
-                                               string memberName = validationContext.MemberName;
-                                               return new ValidationResult (FormatErrorMessage (validationContext.DisplayName), memberName != null ? new string[] { memberName } : new string[] {});
-                                       }
-                               } finally {
-                                       nestedCall = false;
-                               }
-                       }
-
-                       return ValidationResult.Success;
-               }
-#else
-               public abstract bool IsValid (object value);
-#endif
-
-#if NET_4_0
-               public ValidationResult GetValidationResult (object value, ValidationContext validationContext)
-               {
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       ValidationResult ret = IsValid (value, validationContext);
-                       if (ret != null && String.IsNullOrEmpty (ret.ErrorMessage))
-                               ret.ErrorMessage = FormatErrorMessage (validationContext.DisplayName);
-                               
-                       return ret;
-               }
-#endif
-               string GetStringFromResourceAccessor ()
-               {
-                       string resourceName = ErrorMessageResourceName;
-                       Type resourceType = ErrorMessageResourceType;
-                       string errorMessage = ErrorMessage;
-
-                       if (resourceName != null && errorMessage != null)
-                               throw new InvalidOperationException ("Either ErrorMessage or ErrorMessageResourceName must be set, but not both.");
-                       
-                       if (resourceType == null ^ resourceName == null)
-                               throw new InvalidOperationException ("Both ErrorMessageResourceType and ErrorMessageResourceName must be set on this attribute.");
-
-                       
-                       
-                       if (resourceType != null) {
-                               PropertyInfo pi = resourceType.GetProperty (resourceName, BindingFlags.Public | BindingFlags.Static);
-                               if (pi == null || !pi.CanRead)
-                                       throw new InvalidOperationException (
-                                               String.Format ("Resource type '{0}' does not have an accessible static property named '{1}'.",
-                                                              resourceType, resourceName)
-                                       );
-
-                               if (pi.PropertyType != typeof (string))
-                                       throw new InvalidOperationException (
-                                               String.Format ("The property '{0}' on resource type '{1}' is not a string type.",
-                                                              resourceName, resourceType)
-                                       );
-                               
-                               return pi.GetValue (null, null) as string;
-                       }
-                       
-                       if (errorMessage == null) {
-                               if (errorMessageAccessor != null)
-                                       return errorMessageAccessor ();
-                               
-                               if (fallbackErrorMessage != null)
-                                       return fallbackErrorMessage;
-                               else
-                                       return DEFAULT_ERROR_MESSAGE;
-                       }
-                       
-                       return errorMessage;
-               }
-#if NET_4_0
-               public void Validate (object value, ValidationContext validationContext)
-               {
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       ValidationResult result = IsValid (value, validationContext);
-                       if (result != null) {
-                               string message = result.ErrorMessage;
-                               if (message == null)
-                                       message = FormatErrorMessage (validationContext.DisplayName);
-                               
-                               throw new ValidationException (message, this, value);
-                       }
-               }
-#endif
-               public void Validate (object value, string name)
-               {
-                       if (!IsValid (value))
-                               throw new ValidationException (FormatErrorMessage (name), this, value);
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationAttributeCollectionExtensions.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationAttributeCollectionExtensions.cs
deleted file mode 100644 (file)
index 9dec319..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Authors:
-//      Marek Habersack <grendel@twistedcode.net>
-//
-// Copyright (C) 2011 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.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       static class ValidationAttributeCollectionExtensions
-       {
-               public static void Validate <TAttribute> (this AttributeCollection attributes, object value, ValidationContext validationContext,
-                                                         ICollection <ValidationResult> validationResults, ref bool valid)
-                       where TAttribute: ValidationAttribute
-               {
-                       if (attributes == null || attributes == AttributeCollection.Empty || attributes.Count <= 0)
-                               return;
-
-                       ValidationResult result;
-                       foreach (TAttribute attr in attributes.OfType <TAttribute> ()) {
-                               result = attr.GetValidationResult (value, validationContext);
-                               if (result != ValidationResult.Success) {
-                                       valid = false;
-                                       if (validationResults != null)
-                                               validationResults.Add (result);
-                               }
-                       }
-               }
-
-               public static void ValidateExcept <TAttribute> (this AttributeCollection attributes, object value, ValidationContext validationContext,
-                                                               ICollection <ValidationResult> validationResults, ref bool valid)
-                       where TAttribute: ValidationAttribute
-               {
-                       if (attributes == null || attributes == AttributeCollection.Empty || attributes.Count <= 0)
-                               return;
-
-                       ValidationResult result;
-                       ValidationAttribute vattr;
-                       foreach (Attribute attr in attributes) {
-                               if (attr is TAttribute)
-                                       continue;
-                               vattr = attr as ValidationAttribute;
-                               if (vattr == null)
-                                       continue;                               
-
-                               result = vattr.GetValidationResult (value, validationContext);
-                               if (result != ValidationResult.Success) {
-                                       valid = false;
-                                       if (validationResults != null)
-                                               validationResults.Add (result);
-                               }
-                       }
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationContext.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationContext.cs
deleted file mode 100644 (file)
index f39c4a4..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// ValidationContext.cs
-//
-// Authors:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// 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.Generic;
-using System.ComponentModel.Design;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       public sealed class ValidationContext : IServiceProvider
-       {
-               public string DisplayName { get; set; }
-               public IDictionary <object, object> Items { get; private set; }
-               public string MemberName { get; set; }
-               public object ObjectInstance { get; private set; }
-               public Type ObjectType { get; private set; }
-               public IServiceContainer ServiceContainer { get; private set; }
-               
-               public ValidationContext (object instance, IServiceProvider serviceProvider, IDictionary<object, object> items)
-               {
-                       if (instance == null)
-                               throw new ArgumentNullException ("instance");
-                       
-                       ObjectInstance = instance;
-                       ObjectType = instance.GetType ();
-                       if (items != null)
-                               Items = new Dictionary <object, object> (items);
-                       else
-                               Items = new Dictionary <object, object> ();
-                       
-                       DisplayName = instance.GetType ().Name;
-
-                       // LAMESPEC: MSDN says vc.ServiceContainer should be initialized with the passed container if it implements 
-                       // the IServiceContainer interface - not the case, though.
-                       //
-                       // IServiceContainer container = serviceProvider as IServiceContainer;
-                       // if (container != null)
-                       //      ServiceContainer = container;
-                       // else
-                       ServiceContainer = new ValidationContextServiceContainer ();
-               }
-               
-#if NET_4_5
-               public ValidationContext (object instance)
-                       : this (instance, null, null)
-               {
-               }
-               
-               public ValidationContext (object instance, IDictionary<object, object> items)
-                       : this (instance, null, items)
-               {
-               }
-
-               // FIXME: According to MSDN, this should be defined in
-               //        4.5, Silverlight and PCL
-               [MonoTODO]
-               public void InitializeServiceProvider (
-                       Func<Type, Object> serviceProvider)
-               {
-                       throw new NotImplementedException ();
-               }
-#endif
-               
-               public object GetService (Type serviceType)
-               {
-                       return ServiceContainer.GetService (serviceType);
-               }
-
-               sealed class ValidationContextServiceContainer : IServiceContainer
-               {
-                       Dictionary <Type, object> services = new Dictionary <Type, object> ();
-                       
-                       public void AddService (Type serviceType, ServiceCreatorCallback callback, bool promote)
-                       {
-                               AddService (serviceType, (object)callback, promote);
-                       }
-
-                       public void AddService (Type serviceType, ServiceCreatorCallback callback)
-                       {
-                               AddService (serviceType, callback, false);
-                       }
-
-                       public void AddService (Type serviceType, object serviceInstance, bool promote)
-                       {
-                               if (serviceType == null)
-                                       throw new ArgumentNullException ("serviceType");
-                               
-                               if (services.ContainsKey (serviceType))
-                                       throw new ArgumentException (
-                                               String.Format ("A service of type '{0}' already exists in the container.", serviceType)
-                                       );
-
-                               services.Add (serviceType, serviceInstance);
-                       }
-
-                       public void AddService (Type serviceType, object serviceInstance)
-                       {
-                               AddService (serviceType, serviceInstance, false);
-                       }
-
-                       public void RemoveService (Type serviceType, bool promote)
-                       {
-                               if (serviceType == null)
-                                       throw new ArgumentNullException ("serviceType");
-                               
-                               if (!services.ContainsKey (serviceType))
-                                       return;
-
-                               services.Remove (serviceType);
-                       }
-
-                       public void RemoveService (Type serviceType)
-                       {
-                               RemoveService (serviceType, false);
-                       }
-
-                       public object GetService (Type serviceType)
-                       {
-                               if (serviceType == null)
-                                       throw new ArgumentNullException ("serviceType");
-                               
-                               object o;
-                               if (!services.TryGetValue (serviceType, out o))
-                                       return null;
-
-                               var cb = o as ServiceCreatorCallback;
-                               if (cb != null)
-                                       return cb (this, serviceType);
-
-                               return o;
-                       }
-               }
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationException.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationException.cs
deleted file mode 100644 (file)
index f12507a..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// ValidationException.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008-2011 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.ComponentModel;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       [Serializable]
-       public class ValidationException : Exception
-       {
-               public ValidationException ()
-               {
-               }
-               public ValidationException (string message)
-                       : base (message)
-               {
-               }
-               public ValidationException (string message, Exception innerException)
-                       : base (message, innerException)
-               {
-               }
-
-               public ValidationException (string errorMessage, ValidationAttribute validatingAttribute, object value)
-                       : base (errorMessage)
-               {
-                       ValidationAttribute = validatingAttribute;
-                       Value = value;
-               }
-
-               protected ValidationException (SerializationInfo info, StreamingContext context)
-                       : base (info, context)
-               {
-                       throw new NotImplementedException ();
-               }
-#if NET_4_0
-               public ValidationException (ValidationResult validationResult, ValidationAttribute validatingAttribute, object value)
-                       : this (validationResult != null ? validationResult.ErrorMessage : null, validatingAttribute, value)
-               {
-                       this.ValidationResult = validationResult;
-               }
-
-               public ValidationResult ValidationResult { get; private set; }
-#endif
-               public ValidationAttribute ValidationAttribute { get; private set; }
-               public object Value { get; private set; }
-
-#if !NET_4_5
-               [SecurityPermission (SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
-               public override void GetObjectData (SerializationInfo info, StreamingContext context)
-               {
-                       throw new NotImplementedException ();
-               }
-#endif
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationResult.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationResult.cs
deleted file mode 100644 (file)
index 50afd21..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// ValidationResult.cs
-//
-// Authors:
-//     Marek Habersack <mhabersack@novell.com>
-//
-// 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.Generic;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       public class ValidationResult
-       {
-               public static readonly ValidationResult Success = null; // it is supposed to be null
-
-               public string ErrorMessage { get; set; }
-               public IEnumerable<string> MemberNames { get; private set; }
-               
-               public ValidationResult (string errorMessage)
-               : this (errorMessage, new string[] {})
-                       
-               {
-               }
-
-               protected ValidationResult (ValidationResult validationResult)
-               {
-               }
-
-               public ValidationResult (string errorMessage, IEnumerable<string> memberNames)
-               {
-                       ErrorMessage = errorMessage;
-                       if (memberNames != null)
-                               MemberNames = memberNames;
-                       else
-                               MemberNames = new string[] {};
-               }
-
-#if NET_4_5
-               public override string ToString ()
-               {
-                       // See: http://msdn.microsoft.com/en-us/library/system.componentmodel.dataannotations.validationresult.tostring.aspx
-                       if (!string.IsNullOrEmpty (ErrorMessage))
-                               return ErrorMessage;
-
-                       return base.ToString ();
-               }
-#endif
-       }
-}
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/Validator.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/Validator.cs
deleted file mode 100644 (file)
index 18f98fe..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Authors:
-//      Marek Habersack <grendel@twistedcode.net>
-//
-// Copyright (C) 2011 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.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-
-namespace System.ComponentModel.DataAnnotations
-{
-       // TODO: we could probably use some kind of type cache here
-       public static class Validator
-       {
-               public static bool TryValidateObject (object instance, ValidationContext validationContext, ICollection <ValidationResult> validationResults)
-               {
-                       return TryValidateObject (instance, validationContext, validationResults, false);
-               }
-
-               public static bool TryValidateObject (object instance, ValidationContext validationContext, ICollection <ValidationResult> validationResults, bool validateAllProperties)
-               {
-                       if (instance == null)
-                               throw new ArgumentNullException ("instance");
-
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       if (!Object.ReferenceEquals (instance, validationContext.ObjectInstance))
-                               throw new ArgumentException ("The instance provided must match the ObjectInstance on the ValidationContext supplied.", "instance");
-
-                       bool valid = true;
-                       Type instanceType = instance.GetType ();
-                       TypeDescriptor.GetAttributes (instanceType).Validate <ValidationAttribute> (instance, validationContext, validationResults, ref valid);
-                       
-                       PropertyDescriptorCollection properties = TypeDescriptor.GetProperties (instance);
-                       if (properties != PropertyDescriptorCollection.Empty && properties.Count > 0) {
-                               foreach (PropertyDescriptor pdesc in properties) {
-                                       object value = pdesc.GetValue (instance);
-                                       ValidateProperty (pdesc, value, validationContext, validationResults, validateAllProperties, ref valid);
-                               }
-                       }
-                       
-                       return valid;
-               }
-
-               static void ValidateProperty (PropertyDescriptor pdesc, object value, ValidationContext validationContext, ICollection <ValidationResult> validationResults,
-                                             bool validateAll, ref bool valid)
-               {
-                       AttributeCollection attributes = pdesc.Attributes;
-                       attributes.Validate <RequiredAttribute> (value, validationContext, validationResults, ref valid);
-                       if (validateAll)
-                               attributes.ValidateExcept <RequiredAttribute> (value, validationContext, validationResults, ref valid);
-               }
-               
-               static PropertyDescriptor GetProperty (Type type, string propertyName, object value)
-               {
-                       if (String.IsNullOrEmpty (propertyName))
-                               throw new ArgumentNullException ("propertyName");
-
-                       PropertyDescriptorCollection properties = TypeDescriptor.GetProperties (type);
-                       PropertyDescriptor pdesc = null;
-                       if (properties != PropertyDescriptorCollection.Empty && properties.Count > 0)
-                               pdesc = properties.Find (propertyName, false);
-
-                       if (pdesc == null)
-                               throw new ArgumentException (String.Format ("The type '{0}' does not contain a public property named '{1}'.", type.Name, propertyName), "propertyName");
-
-                       Type valueType = value == null ? null : value.GetType ();
-                       Type propertyType = pdesc.PropertyType;
-                       bool invalidType = false;
-
-                       if (valueType == null)
-                               invalidType = (propertyType.IsValueType && Nullable.GetUnderlyingType(propertyType) == null);
-                       else
-                               invalidType = !propertyType.IsAssignableFrom(valueType);
-                       
-                       if (invalidType)
-                               throw new ArgumentException (String.Format ("The value of property '{0}' must be of type '{1}'.", propertyName, propertyType.FullName), "propertyName");
-                       
-                       return pdesc;
-               }
-               
-               public static bool TryValidateProperty (object value, ValidationContext validationContext, ICollection <ValidationResult> validationResults)
-               {
-                       // LAMESPEC: value can be null, validationContext must not
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       PropertyDescriptor pdesc = GetProperty (validationContext.ObjectType, validationContext.MemberName, value);
-
-                       bool valid = true;
-                       ValidateProperty (pdesc, value, validationContext, validationResults, true, ref valid);
-
-                       return valid;
-               }
-
-               public static bool TryValidateValue (object value, ValidationContext validationContext, ICollection<ValidationResult> validationResults,
-                                                    IEnumerable <ValidationAttribute> validationAttributes)
-               {
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       ValidationResult result;
-                       
-                       // It appears .NET makes this call before checking whether
-                       // validationAttributes is null...
-                       ValidationAttribute vattr = validationAttributes.FirstOrDefault <ValidationAttribute> (attr => attr is RequiredAttribute);
-                       if (vattr != null) {
-                               result = vattr.GetValidationResult (value, validationContext);
-                               if (result != ValidationResult.Success) {
-                                       if (validationResults != null)
-                                               validationResults.Add (result);
-                                       return false;
-                               }
-                       }
-
-                       if (validationAttributes == null)
-                               return true;
-
-                       bool valid = true;
-                       foreach (ValidationAttribute attr in validationAttributes) {
-                               if (attr == null || (attr is RequiredAttribute))
-                                       continue;
-                               
-                               result = attr.GetValidationResult (value, validationContext);
-                               if (result != ValidationResult.Success) {
-                                       valid = false;
-                                       if (validationResults != null)
-                                               validationResults.Add (result);
-                               }
-                       }
-                       
-                       return valid;
-               }
-
-               public static void ValidateObject (object instance, ValidationContext validationContext)
-               {
-                       ValidateObject (instance, validationContext, false);
-               }
-
-               public static void ValidateObject (object instance, ValidationContext validationContext, bool validateAllProperties)
-               {
-                       if (instance == null)
-                               throw new ArgumentNullException ("instance");
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       var validationResults = new List <ValidationResult> ();
-                       if (TryValidateObject (instance, validationContext, validationResults, validateAllProperties))
-                               return;
-
-                       ValidationResult result = validationResults.Count > 0 ? validationResults [0] : null;
-                       throw new ValidationException (result, null, instance);
-               }
-
-               public static void ValidateProperty (object value, ValidationContext validationContext)
-               {
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       var validationResults = new List <ValidationResult> ();
-                       if (TryValidateProperty (value, validationContext, validationResults))
-                               return;
-
-                       ValidationResult result = validationResults.Count > 0 ? validationResults [0] : null;
-                       throw new ValidationException (result, null, value);
-               }
-
-               public static void ValidateValue (object value, ValidationContext validationContext, IEnumerable <ValidationAttribute> validationAttributes)
-               {
-                       if (validationContext == null)
-                               throw new ArgumentNullException ("validationContext");
-
-                       var validationResults = new List <ValidationResult> ();
-                       if (TryValidateValue (value, validationContext, validationResults, validationAttributes))
-                               return;
-
-                       ValidationResult result = validationResults.Count > 0 ? validationResults [0] : null;
-                       throw new ValidationException (result, null, value);
-               }
-       }
-}
index 67ed9dac2838569db0ad35c9e20250bd796767a3..846ee326176cf4aaa46dd69ba1421be78055a3af 100644 (file)
@@ -46,14 +46,12 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        var sla = new CreditCardAttribute ();
 
                        Assert.IsTrue (sla.IsValid (null), "#A1-1");
-                       Assert.IsFalse (sla.IsValid (String.Empty), "#A1-2");
+                       Assert.IsTrue (sla.IsValid (String.Empty), "#A1-2");
                        Assert.IsFalse (sla.IsValid ("string"), "#A1-3");
                        Assert.IsTrue (sla.IsValid ("378282246310005"), "#A1-4");
                        Assert.IsTrue (sla.IsValid ("3782-8224-6310-005"), "#A1-5");
                        Assert.IsTrue (sla.IsValid ("371449635398431"), "#A-6");
-#if false
                        Assert.IsFalse (sla.IsValid ("371449635498431"), "#A-6b");
-#endif
                        Assert.IsFalse (sla.IsValid (true), "#A1-7");
                        Assert.IsFalse (sla.IsValid (DateTime.Now), "#A1-8");
                }
index 0753fde5a6995dd5a868b4c329fb6854efe989c9..3d54000c5dd8ab3c0ff2daa9a909a4c49d05b1ab 100644 (file)
@@ -71,7 +71,7 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
        public class DisplayAttributeTests
        {
                const string property_not_set_message = "The {0} property has not been set.  Use the Get{0} method to get the value.";
-               const string localization_failed_message = "Cannot retrieve property '{0}' because localization failed. Type '{1} is not public or does not contain a public static string property with the name '{2}'.";
+               const string localization_failed_message = "Cannot retrieve property '{0}' because localization failed. Type '{1}' is not public or does not contain a public static string property with the name '{2}'.";
        
                [Test]
                public void StringProperties_ReturnLiteralValues_Success()
index 09350cde8fda4bed66a18cdf15273dfb0cbce995..552e3eae6a44da5ba82b9dfc5e24f6604f6a0b9b 100644 (file)
@@ -50,11 +50,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        "$A12345@example.com",
                        "!def!xyz%abc@example.com",
                        "_somename@example.com",
-                       "valid.ipv4.addr@[123.1.72.10]",
-                       "valid.ipv6.addr@[IPv6:0::1]",
-                       "valid.ipv6.addr@[IPv6:2607:f0d0:1002:51::4]",
-                       "valid.ipv6.addr@[IPv6:fe80::230:48ff:fe33:bc33]",
-                       "valid.ipv6v4.addr@[IPv6:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:127.0.0.1]",
                };
 
                static readonly object[] InvalidAddresses = new object[] {
@@ -69,6 +64,12 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        "invalid@[127.0.0.1.]",
                        "invalid@[127.0.0.1].",
                        "invalid@[127.0.0.1]x",
+
+                       "valid.ipv4.addr@[123.1.72.10]",
+                       "valid.ipv6.addr@[IPv6:0::1]",
+                       "valid.ipv6.addr@[IPv6:2607:f0d0:1002:51::4]",
+                       "valid.ipv6.addr@[IPv6:fe80::230:48ff:fe33:bc33]",
+                       "valid.ipv6v4.addr@[IPv6:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:127.0.0.1]",
                };
 
                [Test]
index 6577839650226a09905c65264a3c74aa051a92a4..163e1a738b76aae3e4cc8d342826aabe86e96488 100644 (file)
@@ -90,26 +90,29 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.IsTrue (rea.IsValid (null), "Null does not match [A-Za-z].");
                        Assert.IsTrue (rea.IsValid ("A"), "'A' does not match [A-Za-z].");
                        Assert.IsTrue (rea.IsValid ("a"), "'a' does not match [A-Za-z].");
-                       Assert.IsTrue (rea.IsValid ("Bz"), "'Bz' does not match [A-Za-z].");
-                       Assert.IsTrue (rea.IsValid ("string"), "'string' does not match [A-Za-z].");
-                       Assert.IsFalse (rea.IsValid (String.Empty), "Empty string matches [A-Za-z].");
+                       Assert.IsFalse (rea.IsValid ("Bz"), "'Bz' does not match [A-Za-z].");
+                       Assert.IsFalse (rea.IsValid ("string"), "'string' does not match [A-Za-z].");
+                       Assert.IsTrue (rea.IsValid (String.Empty), "Empty string matches [A-Za-z].");
                        Assert.IsFalse (rea.IsValid ("0123456789"), "'0123456789' matches [A-Za-z].");
                        Assert.IsFalse (rea.IsValid ("0123456789"), "'0123456789A' matches [A-Za-z].");
-                       AssertExtensions.Throws<InvalidCastException> (() => {
-                               rea.IsValid (123);
-                       }, "Casting does not fails");
-                       AssertExtensions.Throws<InvalidCastException> (() => {
-                               rea.IsValid (DateTime.Now);
-                       }, "Casting does not fails");
+                       Assert.IsFalse (rea.IsValid (123), "Casting does not fails");
+                       Assert.IsFalse (rea.IsValid (DateTime.Now), "Casting does not fails");
 
                        rea = new RegularExpressionAttributePoker ("");
-                       Assert.IsTrue (rea.IsValid (null), "null does not match empty pattern");
-                       Assert.IsTrue (rea.IsValid (String.Empty), "empty string does not match empty pattern");
-                       Assert.IsTrue (rea.IsValid ("string"), "'string' does not match empty pattern");
+
+                       AssertExtensions.Throws<InvalidOperationException> (() => {
+                               rea.IsValid (null);
+                       }, "null does not match empty pattern");
+
+                       AssertExtensions.Throws<InvalidOperationException> (() => {
+                               rea.IsValid (String.Empty);
+                       }, "empty string does not match empty pattern");
+
+                       AssertExtensions.Throws<InvalidOperationException> (() => {
+                               rea.IsValid ("string");
+                       }, "'string' does not match empty pattern");
                        
-                       AssertExtensions.Throws<ArgumentNullException> (() => {
-                               rea = new RegularExpressionAttributePoker (null);
-                       }, "Null pattern allowed");
+                       rea = new RegularExpressionAttributePoker (null);
                }
        }
 }
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/mobile_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/mobile_System.ComponentModel.DataAnnotations.dll.sources
deleted file mode 100644 (file)
index 3de14f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include net_4_5_System.ComponentModel.DataAnnotations.dll.sources
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/mobile_static_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/mobile_static_System.ComponentModel.DataAnnotations.dll.sources
deleted file mode 100644 (file)
index 3de14f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include net_4_5_System.ComponentModel.DataAnnotations.dll.sources
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations.dll.sources
deleted file mode 100644 (file)
index 3de14f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include net_4_5_System.ComponentModel.DataAnnotations.dll.sources
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/monotouch_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/monotouch_System.ComponentModel.DataAnnotations.dll.sources
deleted file mode 100644 (file)
index 3de14f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include net_4_5_System.ComponentModel.DataAnnotations.dll.sources
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/net_4_0_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/net_4_0_System.ComponentModel.DataAnnotations.dll.sources
deleted file mode 100644 (file)
index a5a9a9d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#include System.ComponentModel.DataAnnotations.dll.sources
-
-System.ComponentModel.DataAnnotations/FilterUIHintAttribute.cs
-System.ComponentModel.DataAnnotations/KeyAttribute.cs
-System.ComponentModel.DataAnnotations/TimestampAttribute.cs
-System.ComponentModel.DataAnnotations/ValidationAttributeCollectionExtensions.cs
-System.ComponentModel.DataAnnotations/ValidationContext.cs
-System.ComponentModel.DataAnnotations/ValidationResult.cs
-System.ComponentModel.DataAnnotations/Validator.cs
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/net_4_5_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/net_4_5_System.ComponentModel.DataAnnotations.dll.sources
deleted file mode 100644 (file)
index 49e068c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#include net_4_0_System.ComponentModel.DataAnnotations.dll.sources
-
-System.ComponentModel.DataAnnotations/MinLengthAttribute.cs
-System.ComponentModel.DataAnnotations/MaxLengthAttribute.cs
-System.ComponentModel.DataAnnotations/CreditCardAttribute.cs
-System.ComponentModel.DataAnnotations/EmailAddressAttribute.cs
-System.ComponentModel.DataAnnotations/PhoneAttribute.cs
-System.ComponentModel.DataAnnotations/FileExtensionsAttribute.cs
-System.ComponentModel.DataAnnotations/CompareAttribute.cs
-System.ComponentModel.DataAnnotations.Schema/ColumnAttribute.cs
-System.ComponentModel.DataAnnotations.Schema/ComplexTypeAttribute.cs
-System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedAttribute.cs
-System.ComponentModel.DataAnnotations.Schema/DatabaseGeneratedOption.cs
-System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.cs
-System.ComponentModel.DataAnnotations.Schema/InversePropertyAttribute.cs
-System.ComponentModel.DataAnnotations.Schema/NotMappedAttribute.cs
-System.ComponentModel.DataAnnotations.Schema/TableAttribute.cs
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/xammac_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/xammac_System.ComponentModel.DataAnnotations.dll.sources
deleted file mode 100644 (file)
index 3de14f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include net_4_5_System.ComponentModel.DataAnnotations.dll.sources
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install-net_2_0.csproj b/mcs/class/System.Configuration.Install/System.Configuration.Install-net_2_0.csproj
deleted file mode 100644 (file)
index 2c42625..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C8B650EA-042C-4352-8224-03F759A682C6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration.Install</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Configuration.Install\AssemblyInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\ComponentInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\IManagedInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallContext.cs" />\r
-    <Compile Include="System.Configuration.Install\Installer.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallerCollection.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallEventArgs.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallEventHandler.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallException.cs" />\r
-    <Compile Include="System.Configuration.Install\ManagedInstallerClass.cs" />\r
-    <Compile Include="System.Configuration.Install\TransactedInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\UninstallAction.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_0.csproj b/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_0.csproj
deleted file mode 100644 (file)
index cc5eed3..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{29529439-51F1-4953-8A5D-7ED8F7EB8FDB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration.Install</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Configuration.Install\AssemblyInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\ComponentInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\IManagedInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallContext.cs" />\r
-    <Compile Include="System.Configuration.Install\Installer.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallerCollection.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallEventArgs.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallEventHandler.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallException.cs" />\r
-    <Compile Include="System.Configuration.Install\ManagedInstallerClass.cs" />\r
-    <Compile Include="System.Configuration.Install\TransactedInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\UninstallAction.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Configuration/System.Configuration-net_2_0.csproj b/mcs/class/System.Configuration/System.Configuration-net_2_0.csproj
deleted file mode 100644 (file)
index 6c2ede7..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2695A2F2-2271-423D-8E0D-553DAB84E917}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Configuration.Internal\DelegatingConfigHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigErrorInfo.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigSystem.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigurationManagerHelper.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigurationManagerInternal.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigClientHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigConfigurationFactory.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigRecord.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigRoot.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigSettingsFactory.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigSystem.cs" />\r
-    <Compile Include="System.Configuration.Internal\InternalConfigEventArgs.cs" />\r
-    <Compile Include="System.Configuration.Internal\InternalConfigEventHandler.cs" />\r
-    <Compile Include="System.Configuration.Internal\StreamChangeCallback.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderBase.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderCollection.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderException.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\CallbackValidator.cs" />\r
-    <Compile Include="System.Configuration\CallbackValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\ClientConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\CommaDelimitedStringCollection.cs" />\r
-    <Compile Include="System.Configuration\CommaDelimitedStringCollectionConverter.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigInfo.cs" />\r
-    <Compile Include="System.Configuration\Configuration.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationAllowDefinition.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationAllowExeDefinition.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationCollectionAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationConverterBase.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementCollectionType.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementProperty.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationErrorsException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationFileMap.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLocation.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLocationCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLockCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationManager.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPermission.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPermissionAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationProperty.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyOptions.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationRemoveElement.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveEventArgs.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveEventHandler.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveMode.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionGroup.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionGroupCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationUserLevel.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationValidatorBase.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlTextReader.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringSettings.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringSettingsCollection.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringsSection.cs" />\r
-    <Compile Include="System.Configuration\ContextInformation.cs" />\r
-    <Compile Include="System.Configuration\DefaultSection.cs" />\r
-    <Compile Include="System.Configuration\DefaultValidator.cs" />\r
-    <Compile Include="System.Configuration\DpapiProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\ElementInformation.cs" />\r
-    <Compile Include="System.Configuration\ExeConfigurationFileMap.cs" />\r
-    <Compile Include="System.Configuration\ExeContext.cs" />\r
-    <Compile Include="System.Configuration\GenericEnumConverter.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSection.cs" />\r
-    <Compile Include="System.Configuration\InfiniteIntConverter.cs" />\r
-    <Compile Include="System.Configuration\InfiniteTimeSpanConverter.cs" />\r
-    <Compile Include="System.Configuration\IntegerValidator.cs" />\r
-    <Compile Include="System.Configuration\IntegerValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationFactory.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationHost.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationRoot.cs" />\r
-    <Compile Include="System.Configuration\KeyValueConfigurationCollection.cs" />\r
-    <Compile Include="System.Configuration\KeyValueConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\KeyValueInternalCollection.cs" />\r
-    <Compile Include="System.Configuration\LongValidator.cs" />\r
-    <Compile Include="System.Configuration\LongValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\NameValueConfigurationCollection.cs" />\r
-    <Compile Include="System.Configuration\NameValueConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Configuration\PositiveTimeSpanValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\PropertyInformation.cs" />\r
-    <Compile Include="System.Configuration\PropertyInformationCollection.cs" />\r
-    <Compile Include="System.Configuration\PropertyValueOrigin.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfiguration.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationSection.cs" />\r
-    <Compile Include="System.Configuration\ProtectedProviderSettings.cs" />\r
-    <Compile Include="System.Configuration\ProviderSettings.cs" />\r
-    <Compile Include="System.Configuration\ProviderSettingsCollection.cs" />\r
-    <Compile Include="System.Configuration\RegexStringValidator.cs" />\r
-    <Compile Include="System.Configuration\RegexStringValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\RsaProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\SectionGroupInfo.cs" />\r
-    <Compile Include="System.Configuration\SectionInfo.cs" />\r
-    <Compile Include="System.Configuration\SectionInformation.cs" />\r
-    <Compile Include="System.Configuration\StringValidator.cs" />\r
-    <Compile Include="System.Configuration\StringValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\SubclassTypeValidator.cs" />\r
-    <Compile Include="System.Configuration\SubclassTypeValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanMinutesConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanMinutesOrInfiniteConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanSecondsConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanSecondsOrInfiniteConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanValidator.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\TypeNameConverter.cs" />\r
-    <Compile Include="System.Configuration\ValidatorCallback.cs" />\r
-    <Compile Include="System.Configuration\WhiteSpaceTrimStringConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-1.csproj">\r
-      <Project>{5A1ED72C-ADAB-4396-AB03-D0E26AA91E90}</Project>\r
-      <Name>System\System-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0.csproj">\r
-      <Project>{E89F34AB-7AE2-41CA-B891-C8D1C9F02EB8}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Configuration/System.Configuration-net_4_0.csproj b/mcs/class/System.Configuration/System.Configuration-net_4_0.csproj
deleted file mode 100644 (file)
index d7a7a69..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Configuration.Internal\DelegatingConfigHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigErrorInfo.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigSystem.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigurationManagerHelper.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigurationManagerInternal.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigClientHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigConfigurationFactory.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigRecord.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigRoot.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigSettingsFactory.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigSystem.cs" />\r
-    <Compile Include="System.Configuration.Internal\InternalConfigEventArgs.cs" />\r
-    <Compile Include="System.Configuration.Internal\InternalConfigEventHandler.cs" />\r
-    <Compile Include="System.Configuration.Internal\StreamChangeCallback.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderBase.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderCollection.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderException.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\CallbackValidator.cs" />\r
-    <Compile Include="System.Configuration\CallbackValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\ClientConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\CommaDelimitedStringCollection.cs" />\r
-    <Compile Include="System.Configuration\CommaDelimitedStringCollectionConverter.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigInfo.cs" />\r
-    <Compile Include="System.Configuration\Configuration.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationAllowDefinition.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationAllowExeDefinition.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationCollectionAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationConverterBase.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementCollectionType.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementProperty.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationErrorsException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationFileMap.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLocation.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLocationCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLockCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationManager.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPermission.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPermissionAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationProperty.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyOptions.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationRemoveElement.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveEventArgs.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveEventHandler.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveMode.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionGroup.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionGroupCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationUserLevel.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationValidatorBase.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlTextReader.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringSettings.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringSettingsCollection.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringsSection.cs" />\r
-    <Compile Include="System.Configuration\ContextInformation.cs" />\r
-    <Compile Include="System.Configuration\DefaultSection.cs" />\r
-    <Compile Include="System.Configuration\DefaultValidator.cs" />\r
-    <Compile Include="System.Configuration\DpapiProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\ElementInformation.cs" />\r
-    <Compile Include="System.Configuration\ExeConfigurationFileMap.cs" />\r
-    <Compile Include="System.Configuration\ExeContext.cs" />\r
-    <Compile Include="System.Configuration\GenericEnumConverter.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSection.cs" />\r
-    <Compile Include="System.Configuration\InfiniteIntConverter.cs" />\r
-    <Compile Include="System.Configuration\InfiniteTimeSpanConverter.cs" />\r
-    <Compile Include="System.Configuration\IntegerValidator.cs" />\r
-    <Compile Include="System.Configuration\IntegerValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationFactory.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationHost.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationRoot.cs" />\r
-    <Compile Include="System.Configuration\KeyValueConfigurationCollection.cs" />\r
-    <Compile Include="System.Configuration\KeyValueConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\KeyValueInternalCollection.cs" />\r
-    <Compile Include="System.Configuration\LongValidator.cs" />\r
-    <Compile Include="System.Configuration\LongValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\NameValueConfigurationCollection.cs" />\r
-    <Compile Include="System.Configuration\NameValueConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Configuration\PositiveTimeSpanValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\PropertyInformation.cs" />\r
-    <Compile Include="System.Configuration\PropertyInformationCollection.cs" />\r
-    <Compile Include="System.Configuration\PropertyValueOrigin.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfiguration.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationSection.cs" />\r
-    <Compile Include="System.Configuration\ProtectedProviderSettings.cs" />\r
-    <Compile Include="System.Configuration\ProviderSettings.cs" />\r
-    <Compile Include="System.Configuration\ProviderSettingsCollection.cs" />\r
-    <Compile Include="System.Configuration\RegexStringValidator.cs" />\r
-    <Compile Include="System.Configuration\RegexStringValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\RsaProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\SectionGroupInfo.cs" />\r
-    <Compile Include="System.Configuration\SectionInfo.cs" />\r
-    <Compile Include="System.Configuration\SectionInformation.cs" />\r
-    <Compile Include="System.Configuration\StringValidator.cs" />\r
-    <Compile Include="System.Configuration\StringValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\SubclassTypeValidator.cs" />\r
-    <Compile Include="System.Configuration\SubclassTypeValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanMinutesConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanMinutesOrInfiniteConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanSecondsConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanSecondsOrInfiniteConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanValidator.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\TypeNameConverter.cs" />\r
-    <Compile Include="System.Configuration\ValidatorCallback.cs" />\r
-    <Compile Include="System.Configuration\WhiteSpaceTrimStringConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-1.csproj">\r
-      <Project>{C8452C42-726B-4C74-A086-00AFBC162B9A}</Project>\r
-      <Name>System\System-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0.csproj">\r
-      <Project>{86DD6F16-A480-4248-AE96-301B2F973CD7}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Configuration/System.Configuration-tests-net_2_0.csproj b/mcs/class/System.Configuration/System.Configuration-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 9ac1884..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5C13CE48-3692-4869-8205-730A86C0BE0F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Configuration-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Configuration.Provider\ProviderBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration.Provider\ProviderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\AppSettingsSectionTest.cs" />    
-    <Compile Include="Test\System.Configuration\CallbackValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\CommaDelimitedStringCollectionConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\CommaDelimitedStringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationErrorsExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationLockCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationManagerTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationPermissionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationPropertyTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSaveTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSectionGroupTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConnectionStringSettingsTest.cs" />\r
-    <Compile Include="Test\System.Configuration\DefaultValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ExeConfigurationFileMapTest.cs" />\r
-    <Compile Include="Test\System.Configuration\GenericEnumConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\InfiniteIntConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\InfiniteTimeSpanConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\IntegerValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\KeyValueConfigurationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\KeyValueConfigurationElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\LongValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\PositiveTimeSpanValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\RegexStringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\StringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SubclassTypeValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanMinutesConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanMinutesOrInfiniteConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanSecondsConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanSecondsOrInfiniteConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TypeNameConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\WhiteSpaceTrimStringConverterTest.cs" />\r
-    <Compile Include="Test\Util\TestLabel.cs" />\r
-    <Compile Include="Test\Util\TestUtil.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-1.csproj">\r
-      <Project>{5A1ED72C-ADAB-4396-AB03-D0E26AA91E90}</Project>\r
-      <Name>System\System-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0.csproj">\r
-      <Project>{E89F34AB-7AE2-41CA-B891-C8D1C9F02EB8}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Configuration/System.Configuration-tests-net_4_0.csproj b/mcs/class/System.Configuration/System.Configuration-tests-net_4_0.csproj
deleted file mode 100644 (file)
index b6816be..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6F7A1231-B56F-4282-ADA8-6A3AA18DBA31}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Configuration-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Configuration.Provider\ProviderBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration.Provider\ProviderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\AppSettingsSectionTest.cs" />
-    <Compile Include="Test\System.Configuration\CallbackValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\CommaDelimitedStringCollectionConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\CommaDelimitedStringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationErrorsExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationLockCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationManagerTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationPermissionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationPropertyTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSaveTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSectionGroupTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConnectionStringSettingsTest.cs" />\r
-    <Compile Include="Test\System.Configuration\DefaultValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ExeConfigurationFileMapTest.cs" />\r
-    <Compile Include="Test\System.Configuration\GenericEnumConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\InfiniteIntConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\InfiniteTimeSpanConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\IntegerValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\KeyValueConfigurationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\KeyValueConfigurationElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\LongValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\PositiveTimeSpanValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\RegexStringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\StringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SubclassTypeValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanMinutesConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanMinutesOrInfiniteConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanSecondsConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanSecondsOrInfiniteConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TypeNameConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\WhiteSpaceTrimStringConverterTest.cs" />\r
-    <Compile Include="Test\Util\TestLabel.cs" />\r
-    <Compile Include="Test\Util\TestUtil.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-1.csproj">\r
-      <Project>{C8452C42-726B-4C74-A086-00AFBC162B9A}</Project>\r
-      <Name>System\System-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0.csproj">\r
-      <Project>{86DD6F16-A480-4248-AE96-301B2F973CD7}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index eeca6391a148100f8f228a3eaf03059b546f4320..3480ca910981bf637ad374df4cb3879be7ad9a45 100644 (file)
@@ -4,7 +4,8 @@ include ../../build/rules.make
 
 LIBRARY = System.Core.dll
 
-LIB_MCS_FLAGS = -d:INSIDE_SYSCORE -d:LIBC /r:System.dll -unsafe
+REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,PFX_LEGACY_3_5
+LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) -d:INSIDE_SYSCORE -d:LIBC /r:System.dll -unsafe
 
 ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
diff --git a/mcs/class/System.Core/ReferenceSources/SR.cs b/mcs/class/System.Core/ReferenceSources/SR.cs
new file mode 100644 (file)
index 0000000..ad05d3d
--- /dev/null
@@ -0,0 +1,55 @@
+//
+// SR.cs: Manually collected resource strings for ReferenceSources
+//
+// Authors:
+//     Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright (C) 2014 Xamarin Inc (http://www.xamarin.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.
+//
+
+partial class SR
+{
+       public const string MoreThanOneMatch = "MoreThanOneMatch";
+       public const string NoElements = "NoElements";
+       public const string PLINQ_CommonEnumerator_Current_NotStarted = "PLINQ_CommonEnumerator_Current_NotStarted";
+       public const string PLINQ_DisposeRequested = "PLINQ_DisposeRequested";
+       public const string PLINQ_EnumerationPreviouslyFailed = "PLINQ_EnumerationPreviouslyFailed";
+       public const string PLINQ_ExternalCancellationRequested = "PLINQ_ExternalCancellationRequested";
+       public const string ParallelEnumerable_BinaryOpMustUseAsParallel = "ParallelEnumerable_BinaryOpMustUseAsParallel";
+       public const string ParallelEnumerable_WithCancellation_TokenSourceDisposed = "ParallelEnumerable_WithCancellation_TokenSourceDisposed";
+       public const string ParallelEnumerable_WithMergeOptions_InvalidOptions = "ParallelEnumerable_WithMergeOptions_InvalidOptions";
+       public const string ParallelEnumerable_WithQueryExecutionMode_InvalidMode = "ParallelEnumerable_WithQueryExecutionMode_InvalidMode";
+       public const string ParallelPartitionable_IncorretElementCount = "ParallelPartitionable_IncorretElementCount";
+       public const string ParallelPartitionable_NullElement = "ParallelPartitionable_NullElement";
+       public const string ParallelPartitionable_NullReturn = "ParallelPartitionable_NullReturn";
+       public const string ParallelQuery_DuplicateDOP = "ParallelQuery_DuplicateDOP";
+       public const string ParallelQuery_DuplicateExecutionMode = "The WithExecutionMode operator may be used at most once in a query.";
+       public const string ParallelQuery_DuplicateMergeOptions = "ParallelQuery_DuplicateMergeOptions";
+       public const string ParallelQuery_DuplicateTaskScheduler = "ParallelQuery_DuplicateTaskScheduler";
+       public const string ParallelQuery_DuplicateWithCancellation = "ParallelQuery_DuplicateWithCancellation";
+       public const string ParallelQuery_InvalidAsOrderedCall = "AsOrdered may only be called on the result of AsParallel, ParallelEnumerable.Range, or ParallelEnumerable.Repeat.";
+       public const string ParallelQuery_InvalidNonGenericAsOrderedCall = "ParallelQuery_InvalidNonGenericAsOrderedCall";
+       public const string ParallelQuery_PartitionerNotOrderable = "ParallelQuery_PartitionerNotOrderable";
+       public const string PartitionerQueryOperator_NullPartition = "PartitionerQueryOperator_NullPartition";
+       public const string PartitionerQueryOperator_NullPartitionList = "PartitionerQueryOperator_NullPartitionList";
+       public const string PartitionerQueryOperator_WrongNumberOfPartitions = "PartitionerQueryOperator_WrongNumberOfPartitions";
+}
diff --git a/mcs/class/System.Core/ReferenceSources/Set.cs b/mcs/class/System.Core/ReferenceSources/Set.cs
new file mode 100644 (file)
index 0000000..533a914
--- /dev/null
@@ -0,0 +1,113 @@
+// Extracted from ../../../external/referencesource/System.Core/System/Linq/Enumerable.cs
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace System.Linq
+{
+    internal class Set<TElement>
+    {
+        int[] buckets;
+        Slot[] slots;
+        int count;
+        int freeList;
+        IEqualityComparer<TElement> comparer;
+
+        public Set() : this(null) { }
+
+        public Set(IEqualityComparer<TElement> comparer) {
+            if (comparer == null) comparer = EqualityComparer<TElement>.Default;
+            this.comparer = comparer;
+            buckets = new int[7];
+            slots = new Slot[7];
+            freeList = -1;
+        }
+
+        // If value is not in set, add it and return true; otherwise return false
+        public bool Add(TElement value) {
+            return !Find(value, true);
+        }
+
+        // Check whether value is in set
+        public bool Contains(TElement value) {
+            return Find(value, false);
+        }
+
+        // If value is in set, remove it and return true; otherwise return false
+        public bool Remove(TElement value) {
+            int hashCode = InternalGetHashCode(value);
+            int bucket = hashCode % buckets.Length;
+            int last = -1;
+            for (int i = buckets[bucket] - 1; i >= 0; last = i, i = slots[i].next) {
+                if (slots[i].hashCode == hashCode && comparer.Equals(slots[i].value, value)) {
+                    if (last < 0) {
+                        buckets[bucket] = slots[i].next + 1;
+                    }
+                    else {
+                        slots[last].next = slots[i].next;
+                    }
+                    slots[i].hashCode = -1;
+                    slots[i].value = default(TElement);
+                    slots[i].next = freeList;
+                    freeList = i;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        bool Find(TElement value, bool add) {
+            int hashCode = InternalGetHashCode(value);
+            for (int i = buckets[hashCode % buckets.Length] - 1; i >= 0; i = slots[i].next) {
+                if (slots[i].hashCode == hashCode && comparer.Equals(slots[i].value, value)) return true;
+            }
+            if (add) {
+                int index;
+                if (freeList >= 0) {
+                    index = freeList;
+                    freeList = slots[index].next;
+                }
+                else {
+                    if (count == slots.Length) Resize();
+                    index = count;
+                    count++;
+                }
+                int bucket = hashCode % buckets.Length;
+                slots[index].hashCode = hashCode;
+                slots[index].value = value;
+                slots[index].next = buckets[bucket] - 1;
+                buckets[bucket] = index + 1;
+            }
+            return false;
+        }
+
+        void Resize() {
+            int newSize = checked(count * 2 + 1);
+            int[] newBuckets = new int[newSize];
+            Slot[] newSlots = new Slot[newSize];
+            Array.Copy(slots, 0, newSlots, 0, count);
+            for (int i = 0; i < count; i++) {
+                int bucket = newSlots[i].hashCode % newSize;
+                newSlots[i].next = newBuckets[bucket] - 1;
+                newBuckets[bucket] = i + 1;
+            }
+            buckets = newBuckets;
+            slots = newSlots;
+        }
+
+        internal int InternalGetHashCode(TElement value)
+        {
+            //[....] DevDivBugs 171937. work around comparer implementations that throw when passed null
+            return (value == null) ? 0 : comparer.GetHashCode(value) & 0x7FFFFFFF;
+        }
+
+        internal struct Slot
+        {
+            internal int hashCode;
+            internal TElement value;
+            internal int next;
+        }
+    }
+}
\ No newline at end of file
diff --git a/mcs/class/System.Core/System.Core-net_2_0.csproj b/mcs/class/System.Core/System.Core-net_2_0.csproj
deleted file mode 100644 (file)
index d4bcfd9..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;INSIDE_SYSCORE;LIBC;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSCORE;LIBC;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />\r
-    <Compile Include="System.Collections.Generic\HashSet.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />\r
-    <Compile Include="System.IO\HandleInheritability.cs" />\r
-    <Compile Include="System.Linq.Expressions\BinaryExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ConditionalExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ConstantExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ElementInit.cs" />\r
-    <Compile Include="System.Linq.Expressions\EmitContext.cs" />\r
-    <Compile Include="System.Linq.Expressions\Expression.cs" />\r
-    <Compile Include="System.Linq.Expressions\Expression_T.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionPrinter.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionTransformer.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionType.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionVisitor.cs" />\r
-    <Compile Include="System.Linq.Expressions\Extensions.cs" />\r
-    <Compile Include="System.Linq.Expressions\InvocationExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\LambdaExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ListInitExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberAssignment.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberBinding.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberBindingType.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberInitExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberListBinding.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberMemberBinding.cs" />\r
-    <Compile Include="System.Linq.Expressions\MethodCallExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\NewArrayExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\NewExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ParameterExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\TypeBinaryExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\UnaryExpression.cs" />\r
-    <Compile Include="System.Linq\Check.cs" />\r
-    <Compile Include="System.Linq\Enumerable.cs" />\r
-    <Compile Include="System.Linq\Grouping.cs" />\r
-    <Compile Include="System.Linq\IGrouping.cs" />\r
-    <Compile Include="System.Linq\ILookup_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedEnumerable_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryable.cs" />\r
-    <Compile Include="System.Linq\IQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryProvider.cs" />\r
-    <Compile Include="System.Linq\Lookup.cs" />\r
-    <Compile Include="System.Linq\OrderedEnumerable.cs" />\r
-    <Compile Include="System.Linq\OrderedSequence.cs" />\r
-    <Compile Include="System.Linq\Queryable.cs" />\r
-    <Compile Include="System.Linq\QueryableEnumerable.cs" />\r
-    <Compile Include="System.Linq\QueryableTransformer.cs" />\r
-    <Compile Include="System.Linq\QuickSort.cs" />\r
-    <Compile Include="System.Linq\SortContext.cs" />\r
-    <Compile Include="System.Linq\SortDirection.cs" />\r
-    <Compile Include="System.Linq\SortSequenceContext.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DynamicAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExecutionScope.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IStrongBox.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StrongBox_T.cs" />\r
-    <Compile Include="System.Security.Cryptography\Aes.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesManaged.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Threading\LockRecursionException.cs" />\r
-    <Compile Include="System.Threading\LockRecursionPolicy.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlim.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlimExtensions.cs" />\r
-    <Compile Include="System.Threading\ThreadLockState.cs" />\r
-    <Compile Include="System\Actions.cs" />\r
-    <Compile Include="System\Funcs.cs" />\r
-    <Compile Include="System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="System\TimeZoneInfo.AdjustmentRule.cs" />\r
-    <Compile Include="System\TimeZoneInfo.cs" />\r
-    <Compile Include="System\TimeZoneInfo.TransitionTime.cs" />\r
-    <Compile Include="System\TimeZoneNotFoundException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Core/System.Core-net_4_0.csproj b/mcs/class/System.Core/System.Core-net_4_0.csproj
deleted file mode 100644 (file)
index bf38254..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSite.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteOps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ConvertBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CreateInstanceBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObjectBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoClass.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IDynamicMetaObjectProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IInvokeOnGetBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\RuleCache.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UnaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UpdateDelegates.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BlockExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\CatchBlock.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConditionalExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConstantExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugInfoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugViewWriter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DefaultExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DynamicExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ElementInit.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.DebuggerProxy.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionVisitor.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelTarget.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LambdaExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LoopExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberAssignment.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberListBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberMemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MethodCallExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewArrayExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ParameterExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\RuntimeVariablesExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchCase.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SymbolDocumentInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeBinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\UnaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AnalyzedTree.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AssemblyGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\BoundConstants.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Closure.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.Storage.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ConstantCheck.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DebugInfoGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ExpressionQuoter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\HoistedLocals.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ILGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\KeyedQueue.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LabelInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Address.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Binary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.ControlFlow.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Expressions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Lambda.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Logical.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Statements.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Unary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\OffsetTrackingILGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\RuntimeVariableList.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Set.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Bindings.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Temps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolDocumentGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolGuids.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\VariableBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CacheDict.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CollectionExtensions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ContractUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ExceptionFactory.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\Helpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\IRuntimeVariables.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyCollectionBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyDictionary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReferenceEqualityComparer.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />\r
-    <Compile Include="System.Collections.Generic\HashSet.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileAccess.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileOptions.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileRights.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileSecurity.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewAccessor.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />\r
-    <Compile Include="System.IO\HandleInheritability.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionTransformer.cs" />\r
-    <Compile Include="System.Linq.Expressions\Extensions.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryBaseNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryCastNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryChildNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryConcatNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryDefaultEmptyNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryGroupByNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryHeadWorkerNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryJoinNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryMuxNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOptionNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderByNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderedStreamNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderGuardNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryReverseNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectManyNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySetNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStartNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStreamNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryWhereNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryZipNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\SetInclusion.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\WrapHelper.cs" />\r
-    <Compile Include="System.Linq.Parallel\AggregationList.cs" />\r
-    <Compile Include="System.Linq.Parallel\ConcurrentGrouping.cs" />\r
-    <Compile Include="System.Linq.Parallel\ConcurrentLookup.cs" />\r
-    <Compile Include="System.Linq.Parallel\INodeVisitor.cs" />\r
-    <Compile Include="System.Linq.Parallel\IVisitableNode.cs" />\r
-    <Compile Include="System.Linq.Parallel\OrderingEnumerator.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelExecuter.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelPartitioner.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelQueryEnumerator.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelQuickSort.cs" />\r
-    <Compile Include="System.Linq.Parallel\QueryCheckerVisitor.cs" />\r
-    <Compile Include="System.Linq.Parallel\QueryIsOrderedVisitor.cs" />\r
-    <Compile Include="System.Linq.Parallel\QueryOptions.cs" />\r
-    <Compile Include="System.Linq.Parallel\RangeList.cs" />\r
-    <Compile Include="System.Linq.Parallel\RepeatList.cs" />\r
-    <Compile Include="System.Linq.Parallel\ReverseList.cs" />\r
-    <Compile Include="System.Linq.Parallel\StripPartitioner.cs" />\r
-    <Compile Include="System.Linq.Parallel\TemporaryArea.cs" />\r
-    <Compile Include="System.Linq\Check.cs" />\r
-    <Compile Include="System.Linq\Enumerable.cs" />\r
-    <Compile Include="System.Linq\EnumerableExecutor.cs" />\r
-    <Compile Include="System.Linq\EnumerableExecutor_T.cs" />\r
-    <Compile Include="System.Linq\EnumerableQuery.cs" />\r
-    <Compile Include="System.Linq\EnumerableQuery_T.cs" />\r
-    <Compile Include="System.Linq\Grouping.cs" />\r
-    <Compile Include="System.Linq\IGrouping.cs" />\r
-    <Compile Include="System.Linq\ILookup_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedEnumerable_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryable.cs" />\r
-    <Compile Include="System.Linq\IQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryProvider.cs" />\r
-    <Compile Include="System.Linq\Lookup.cs" />\r
-    <Compile Include="System.Linq\OrderedEnumerable.cs" />\r
-    <Compile Include="System.Linq\OrderedParallelQuery.cs" />\r
-    <Compile Include="System.Linq\OrderedSequence.cs" />\r
-    <Compile Include="System.Linq\ParallelEnumerable.cs" />\r
-    <Compile Include="System.Linq\ParallelExecutionMode.cs" />\r
-    <Compile Include="System.Linq\ParallelMergeOptions.cs" />\r
-    <Compile Include="System.Linq\ParallelQuery.cs" />\r
-    <Compile Include="System.Linq\Queryable.cs" />\r
-    <Compile Include="System.Linq\QueryableEnumerable.cs" />\r
-    <Compile Include="System.Linq\QueryableTransformer.cs" />\r
-    <Compile Include="System.Linq\QuickSort.cs" />\r
-    <Compile Include="System.Linq\SortContext.cs" />\r
-    <Compile Include="System.Linq\SortDirection.cs" />\r
-    <Compile Include="System.Linq\SortSequenceContext.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DynamicAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IStrongBox.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StrongBox_T.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesManaged.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskExtensions.cs" />\r
-    <Compile Include="System.Threading\LockRecursionException.cs" />\r
-    <Compile Include="System.Threading\LockRecursionPolicy.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlim.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlimExtensions.cs" />\r
-    <Compile Include="System.Threading\ThreadLockState.cs" />\r
-    <Compile Include="System\Actions.cs" />\r
-    <Compile Include="System\Funcs.cs" />\r
-    <Compile Include="System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="System\TimeZoneInfo.AdjustmentRule.cs" />\r
-    <Compile Include="System\TimeZoneInfo.cs" />\r
-    <Compile Include="System\TimeZoneInfo.TransitionTime.cs" />\r
-    <Compile Include="System\TimeZoneNotFoundException.cs" />\r
-    <Compile Include="System\Util.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Core/System.Core-plaincore-net_2_0.csproj b/mcs/class/System.Core/System.Core-plaincore-net_2_0.csproj
deleted file mode 100644 (file)
index 274b4fb..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F0743710-AB7C-4019-A13A-07AE79F514E4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0/plaincore</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;INSIDE_SYSCORE;LIBC;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSCORE;LIBC;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />\r
-    <Compile Include="System.Collections.Generic\HashSet.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />\r
-    <Compile Include="System.IO\HandleInheritability.cs" />\r
-    <Compile Include="System.Linq.Expressions\BinaryExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ConditionalExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ConstantExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ElementInit.cs" />\r
-    <Compile Include="System.Linq.Expressions\EmitContext.cs" />\r
-    <Compile Include="System.Linq.Expressions\Expression.cs" />\r
-    <Compile Include="System.Linq.Expressions\Expression_T.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionPrinter.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionTransformer.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionType.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionVisitor.cs" />\r
-    <Compile Include="System.Linq.Expressions\Extensions.cs" />\r
-    <Compile Include="System.Linq.Expressions\InvocationExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\LambdaExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ListInitExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberAssignment.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberBinding.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberBindingType.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberInitExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberListBinding.cs" />\r
-    <Compile Include="System.Linq.Expressions\MemberMemberBinding.cs" />\r
-    <Compile Include="System.Linq.Expressions\MethodCallExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\NewArrayExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\NewExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\ParameterExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\TypeBinaryExpression.cs" />\r
-    <Compile Include="System.Linq.Expressions\UnaryExpression.cs" />\r
-    <Compile Include="System.Linq\Check.cs" />\r
-    <Compile Include="System.Linq\Enumerable.cs" />\r
-    <Compile Include="System.Linq\Grouping.cs" />\r
-    <Compile Include="System.Linq\IGrouping.cs" />\r
-    <Compile Include="System.Linq\ILookup_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedEnumerable_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryable.cs" />\r
-    <Compile Include="System.Linq\IQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryProvider.cs" />\r
-    <Compile Include="System.Linq\Lookup.cs" />\r
-    <Compile Include="System.Linq\OrderedEnumerable.cs" />\r
-    <Compile Include="System.Linq\OrderedSequence.cs" />\r
-    <Compile Include="System.Linq\Queryable.cs" />\r
-    <Compile Include="System.Linq\QueryableEnumerable.cs" />\r
-    <Compile Include="System.Linq\QueryableTransformer.cs" />\r
-    <Compile Include="System.Linq\QuickSort.cs" />\r
-    <Compile Include="System.Linq\SortContext.cs" />\r
-    <Compile Include="System.Linq\SortDirection.cs" />\r
-    <Compile Include="System.Linq\SortSequenceContext.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DynamicAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExecutionScope.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IStrongBox.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StrongBox_T.cs" />\r
-    <Compile Include="System.Security.Cryptography\Aes.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesManaged.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Threading\LockRecursionException.cs" />\r
-    <Compile Include="System.Threading\LockRecursionPolicy.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlim.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlimExtensions.cs" />\r
-    <Compile Include="System.Threading\ThreadLockState.cs" />\r
-    <Compile Include="System\Actions.cs" />\r
-    <Compile Include="System\Funcs.cs" />\r
-    <Compile Include="System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="System\TimeZoneInfo.AdjustmentRule.cs" />\r
-    <Compile Include="System\TimeZoneInfo.cs" />\r
-    <Compile Include="System\TimeZoneInfo.TransitionTime.cs" />\r
-    <Compile Include="System\TimeZoneNotFoundException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_2_0.csproj">\r
-      <Project>{AAA3F683-244C-40EF-8EF8-A95938862A44}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-bare-net_2_0.csproj">\r
-      <Project>{5459507F-DC25-401C-A2F4-D5ECAC3A34E6}</Project>\r
-      <Name>System\System-bare-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Posix/Mono.Posix-net_2_0.csproj">\r
-      <Project>{2CA4E20E-76B6-4A2D-B121-39C558BB6E28}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Core/System.Core-plaincore-net_4_0.csproj b/mcs/class/System.Core/System.Core-plaincore-net_4_0.csproj
deleted file mode 100644 (file)
index 4055d75..0000000
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2D5DF73B-C3E5-40E6-94DA-EE49231F1FB4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0/plaincore</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSite.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteOps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ConvertBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CreateInstanceBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObjectBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoClass.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IDynamicMetaObjectProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IInvokeOnGetBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\RuleCache.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UnaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UpdateDelegates.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BlockExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\CatchBlock.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConditionalExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConstantExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugInfoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugViewWriter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DefaultExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DynamicExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ElementInit.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.DebuggerProxy.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionVisitor.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelTarget.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LambdaExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LoopExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberAssignment.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberListBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberMemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MethodCallExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewArrayExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ParameterExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\RuntimeVariablesExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchCase.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SymbolDocumentInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeBinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\UnaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AnalyzedTree.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AssemblyGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\BoundConstants.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Closure.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.Storage.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ConstantCheck.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DebugInfoGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ExpressionQuoter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\HoistedLocals.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ILGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\KeyedQueue.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LabelInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Address.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Binary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.ControlFlow.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Expressions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Lambda.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Logical.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Statements.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Unary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\OffsetTrackingILGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\RuntimeVariableList.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Set.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Bindings.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Temps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolDocumentGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolGuids.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\VariableBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CacheDict.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CollectionExtensions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ContractUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ExceptionFactory.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\Helpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\IRuntimeVariables.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyCollectionBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyDictionary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReferenceEqualityComparer.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />\r
-    <Compile Include="System.Collections.Generic\HashSet.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileAccess.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileOptions.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileRights.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileSecurity.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewAccessor.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />\r
-    <Compile Include="System.IO\HandleInheritability.cs" />\r
-    <Compile Include="System.Linq.Expressions\ExpressionTransformer.cs" />\r
-    <Compile Include="System.Linq.Expressions\Extensions.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryBaseNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryCastNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryChildNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryConcatNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryDefaultEmptyNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryGroupByNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryHeadWorkerNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryJoinNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryMuxNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOptionNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderByNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderedStreamNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderGuardNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryReverseNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectManyNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySetNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStartNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStreamNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryWhereNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryZipNode.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\SetInclusion.cs" />\r
-    <Compile Include="System.Linq.Parallel.QueryNodes\WrapHelper.cs" />\r
-    <Compile Include="System.Linq.Parallel\AggregationList.cs" />\r
-    <Compile Include="System.Linq.Parallel\ConcurrentGrouping.cs" />\r
-    <Compile Include="System.Linq.Parallel\ConcurrentLookup.cs" />\r
-    <Compile Include="System.Linq.Parallel\INodeVisitor.cs" />\r
-    <Compile Include="System.Linq.Parallel\IVisitableNode.cs" />\r
-    <Compile Include="System.Linq.Parallel\OrderingEnumerator.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelExecuter.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelPartitioner.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelQueryEnumerator.cs" />\r
-    <Compile Include="System.Linq.Parallel\ParallelQuickSort.cs" />\r
-    <Compile Include="System.Linq.Parallel\QueryCheckerVisitor.cs" />\r
-    <Compile Include="System.Linq.Parallel\QueryIsOrderedVisitor.cs" />\r
-    <Compile Include="System.Linq.Parallel\QueryOptions.cs" />\r
-    <Compile Include="System.Linq.Parallel\RangeList.cs" />\r
-    <Compile Include="System.Linq.Parallel\RepeatList.cs" />\r
-    <Compile Include="System.Linq.Parallel\ReverseList.cs" />\r
-    <Compile Include="System.Linq.Parallel\StripPartitioner.cs" />\r
-    <Compile Include="System.Linq.Parallel\TemporaryArea.cs" />\r
-    <Compile Include="System.Linq\Check.cs" />\r
-    <Compile Include="System.Linq\Enumerable.cs" />\r
-    <Compile Include="System.Linq\EnumerableExecutor.cs" />\r
-    <Compile Include="System.Linq\EnumerableExecutor_T.cs" />\r
-    <Compile Include="System.Linq\EnumerableQuery.cs" />\r
-    <Compile Include="System.Linq\EnumerableQuery_T.cs" />\r
-    <Compile Include="System.Linq\Grouping.cs" />\r
-    <Compile Include="System.Linq\IGrouping.cs" />\r
-    <Compile Include="System.Linq\ILookup_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedEnumerable_T.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable.cs" />\r
-    <Compile Include="System.Linq\IOrderedQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryable.cs" />\r
-    <Compile Include="System.Linq\IQueryable_T.cs" />\r
-    <Compile Include="System.Linq\IQueryProvider.cs" />\r
-    <Compile Include="System.Linq\Lookup.cs" />\r
-    <Compile Include="System.Linq\OrderedEnumerable.cs" />\r
-    <Compile Include="System.Linq\OrderedParallelQuery.cs" />\r
-    <Compile Include="System.Linq\OrderedSequence.cs" />\r
-    <Compile Include="System.Linq\ParallelEnumerable.cs" />\r
-    <Compile Include="System.Linq\ParallelExecutionMode.cs" />\r
-    <Compile Include="System.Linq\ParallelMergeOptions.cs" />\r
-    <Compile Include="System.Linq\ParallelQuery.cs" />\r
-    <Compile Include="System.Linq\Queryable.cs" />\r
-    <Compile Include="System.Linq\QueryableEnumerable.cs" />\r
-    <Compile Include="System.Linq\QueryableTransformer.cs" />\r
-    <Compile Include="System.Linq\QuickSort.cs" />\r
-    <Compile Include="System.Linq\SortContext.cs" />\r
-    <Compile Include="System.Linq\SortDirection.cs" />\r
-    <Compile Include="System.Linq\SortSequenceContext.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DynamicAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IStrongBox.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StrongBox_T.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesManaged.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskExtensions.cs" />\r
-    <Compile Include="System.Threading\LockRecursionException.cs" />\r
-    <Compile Include="System.Threading\LockRecursionPolicy.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlim.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLockSlimExtensions.cs" />\r
-    <Compile Include="System.Threading\ThreadLockState.cs" />\r
-    <Compile Include="System\Actions.cs" />\r
-    <Compile Include="System\Funcs.cs" />\r
-    <Compile Include="System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="System\TimeZoneInfo.AdjustmentRule.cs" />\r
-    <Compile Include="System\TimeZoneInfo.cs" />\r
-    <Compile Include="System\TimeZoneInfo.TransitionTime.cs" />\r
-    <Compile Include="System\TimeZoneNotFoundException.cs" />\r
-    <Compile Include="System\Util.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_0.csproj">\r
-      <Project>{5889848E-305B-4B11-B3B1-A25761DAFE45}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-secxml-net_4_0.csproj">\r
-      <Project>{ED114F49-84B3-4EF9-80EC-90D4EEF7FF8E}</Project>\r
-      <Name>System\System-secxml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_0.csproj">\r
-      <Project>{98213707-7F8B-4D75-B5C7-DDF75BAB3534}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Core/System.Core-tests-net_2_0.csproj b/mcs/class/System.Core/System.Core-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 85d3407..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{25672EF9-2390-404D-AD04-A009C8DFEBFB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>bin\Debug\System.Core-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;INSIDE_SYSCORE;LIBC;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSCORE;LIBC;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\HashAlgorithmTest.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA1Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA256Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA384Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA512Test.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\HashSetTest.cs" />\r
-    <Compile Include="Test\System.IO.MemoryMappedFiles\MemoryMappedFileTest.cs" />\r
-    <Compile Include="Test\System.IO.Pipes\PipeSecurityTest.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Add.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_AddChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_And.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_AndAlso.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ArrayIndex.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ArrayLength.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Bind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Call.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Coalesce.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Condition.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Constant.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Convert.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Divide.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ElementInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Equal.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ExclusiveOr.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Field.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_GreaterThan.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_GreaterThanOrEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Invoke.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Lambda.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LeftShift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LessThan.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LessThanOrEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Lift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ListBind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ListInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MakeBinary.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MemberBind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MemberInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Modulo.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Multiply.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MultiplyChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Negate.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_New.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NewArrayBounds.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NewArrayInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Not.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NotEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Or.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_OrElse.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Power.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Property.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_PropertyOrField.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Quote.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_RightShift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Subtract.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_SubtractChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_TypeAs.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_TypeIs.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_UnaryPlus.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Utils.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableAsQueryableTest.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableFixture.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableMoreTest.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableTest.cs" />\r
-    <Compile Include="Test\System.Linq\LookupTest.cs" />\r
-    <Compile Include="Test\System.Linq\ParallelEnumerableTests.cs" />\r
-    <Compile Include="Test\System.Linq\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\DynamicAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CngAlgorithmGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CngAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MD5CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskExtensionsTests.cs" />\r
-    <Compile Include="Test\System.Threading\ReaderWriterLockSlimTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfo.AdjustmentRuleTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfo.TransitionTimeTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfoTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Core/System.Core-tests-net_4_0.csproj b/mcs/class/System.Core/System.Core-tests-net_4_0.csproj
deleted file mode 100644 (file)
index c79aa90..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1B22CF44-569E-4724-B67C-D8C2229ED67A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>bin\Debug\System.Core-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\HashAlgorithmTest.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA1Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA256Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA384Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA512Test.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\HashSetTest.cs" />\r
-    <Compile Include="Test\System.IO.MemoryMappedFiles\MemoryMappedFileTest.cs" />\r
-    <Compile Include="Test\System.IO.Pipes\PipeSecurityTest.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Add.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_AddChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_And.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_AndAlso.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ArrayIndex.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ArrayLength.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Bind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Call.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Coalesce.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Condition.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Constant.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Convert.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Divide.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ElementInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Equal.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ExclusiveOr.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Field.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_GreaterThan.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_GreaterThanOrEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Invoke.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Lambda.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LeftShift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LessThan.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LessThanOrEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Lift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ListBind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ListInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MakeBinary.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MemberBind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MemberInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Modulo.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Multiply.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MultiplyChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Negate.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_New.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NewArrayBounds.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NewArrayInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Not.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NotEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Or.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_OrElse.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Power.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Property.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_PropertyOrField.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Quote.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_RightShift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Subtract.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_SubtractChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_TypeAs.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_TypeIs.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_UnaryPlus.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Utils.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableAsQueryableTest.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableFixture.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableMoreTest.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableTest.cs" />\r
-    <Compile Include="Test\System.Linq\LookupTest.cs" />\r
-    <Compile Include="Test\System.Linq\ParallelEnumerableTests.cs" />\r
-    <Compile Include="Test\System.Linq\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\DynamicAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CngAlgorithmGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CngAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MD5CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskExtensionsTests.cs" />\r
-    <Compile Include="Test\System.Threading\ReaderWriterLockSlimTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfo.AdjustmentRuleTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfo.TransitionTimeTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfoTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 80b1e3fa33691c69dfa450388790d9c54b1b3ff9..157b53c8be37a1a82d57c585c710975749a28eee 100644 (file)
@@ -2765,14 +2765,14 @@ namespace System.Linq
                {
                        Check.Source (source);
 
+                       if (count <= 0)
+                               return EmptyOf<TSource>.Instance;
+
                        return CreateTakeIterator (source, count);
                }
 
                static IEnumerable<TSource> CreateTakeIterator<TSource> (IEnumerable<TSource> source, int count)
                {
-                       if (count <= 0)
-                               yield break;
-
                        int counter = 0;
                        foreach (TSource element in source) {
                                yield return element;
index 72285cc0dabadf6032c97d63bafac2674df74c65..8805dfe898213aad2f9c123b06af58043c192a02 100644 (file)
@@ -539,7 +539,8 @@ namespace System {
                                        lock (_lock) {
                                                if (defaultZone != null)
                                                        return defaultZone;
-                                               return defaultZone = GetTimeZone ("Local", GetDefaultTimeZoneName ());
+                                               var id  = GetDefaultTimeZoneName ();
+                                               return defaultZone = GetTimeZone (id, id);
                                        }
                                }
                        }
index 354b47a2a064188a19b2a44c4d31f1dec64308c9..2b36c15e30f42f69854085c2aff296cf21bd0974 100644 (file)
@@ -116,7 +116,14 @@ namespace System
                        using (Stream stream = GetMonoTouchData (null)) {
                                return BuildFromStream ("Local", stream);
                        }
-#elif LIBC
+#else
+                       if (IsWindows && LocalZoneKey != null) {
+                               string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
+                               name = TrimSpecial (name);
+                               if (name != null)
+                                       return TimeZoneInfo.FindSystemTimeZoneById (name);
+                       }
+
                        var tz = Environment.GetEnvironmentVariable ("TZ");
                        if (tz != null) {
                                if (tz == String.Empty)
@@ -137,15 +144,6 @@ namespace System
                                        return null;
                                }
                        }
-#else
-                       if (IsWindows && LocalZoneKey != null) {
-                               string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
-                               name = TrimSpecial (name);
-                               if (name != null)
-                                       return TimeZoneInfo.FindSystemTimeZoneById (name);
-                       }
-
-                       return null;
 #endif
                }
 
@@ -426,12 +424,6 @@ namespace System
                                return FromRegistryKey(id, key);
                        }
 #endif
-#if MONODROID
-                       var timeZoneInfo = AndroidTimeZones.GetTimeZone (id, id);
-                       if (timeZoneInfo == null)
-                               throw new TimeZoneNotFoundException ();
-                       return timeZoneInfo;
-#else
                        // Local requires special logic that already exists in the Local property (bug #326)
                        if (id == "Local")
                                return Local;
@@ -439,12 +431,16 @@ namespace System
                        using (Stream stream = GetMonoTouchData (id)) {
                                return BuildFromStream (id, stream);
                        }
+#elif MONODROID
+                       var timeZoneInfo = AndroidTimeZones.GetTimeZone (id, id);
+                       if (timeZoneInfo == null)
+                               throw new TimeZoneNotFoundException ();
+                       return timeZoneInfo;
 #elif LIBC
                        string filepath = Path.Combine (TimeZoneDirectory, id);
                        return FindSystemTimeZoneByFileName (id, filepath);
 #else
                        throw new NotImplementedException ();
-#endif
 #endif
                }
 
index 1cf514c7aab2be8561e47bf776e30175b6f5a33e..19bfe4856cdb59ddeefd570d6eae23ff03e4f73e 100644 (file)
@@ -627,7 +627,7 @@ namespace MonoTests.System.Linq {
                        // Contains<TSource> (TSource)
                        Assert.IsTrue (data.Contains (2));
                        for (int i = 0; i < 50; ++i)
-                               Console.WriteLine (icoll.Contains (0));//Console.WriteLine (data.Contains (0));
+                               icoll.Contains (i);//Console.WriteLine (data.Contains (0));
                        IsFalse (data.Contains (0), data);
 
                        // Contains<TSource> (TSource, IEqualityComparer<TSource>)
index 6629133fc3d39204bc59de9893b5a9b7bda7bef3..d9fac1818d3704bc36d573df94e71dbab5d698f5 100644 (file)
@@ -313,7 +313,7 @@ namespace MonoTests.System.Linq
                        int [] data = {0, 1, 2, 3, 4, 5};
                        int [] result = {3, 4, 5};
 
-                       AssertAreSame (result, data.AsReallyParallel ().AsOrdered ().Skip (3).ToArray ());
+                       AssertAreSame (result, data.AsParallel ().AsOrdered ().Skip (3).ToArray ());
                }
                
                [Test]
@@ -322,7 +322,7 @@ namespace MonoTests.System.Linq
                        int [] data = {0, 1, 2, 3, 4, 5};
                        int [] result = {3, 4, 5};
 
-                       AssertAreSame (result, data.AsReallyParallel ().AsOrdered ().Skip (3));
+                       AssertAreSame (result, data.AsParallel ().AsOrdered ().Skip (3));
                }
 
                [Test]
@@ -331,7 +331,7 @@ namespace MonoTests.System.Linq
                        int [] data = {0, 1, 2, 3, 4, 5};
                        int [] result = {3, 4, 5};
 
-                       AssertAreSame (result, data.AsReallyParallel ().AsOrdered ().SkipWhile (i => i < 3));
+                       AssertAreSame (result, data.AsParallel ().AsOrdered ().SkipWhile (i => i < 3));
                }
 
                [Test]
@@ -340,7 +340,7 @@ namespace MonoTests.System.Linq
                        int [] data = {0, 1, 2, 3, 4, 5};
                        int [] result = {0, 1, 2};
 
-                       AssertAreSame (result, data.AsReallyParallel ().AsOrdered ().Take (3));
+                       AssertAreSame (result, data.AsParallel ().AsOrdered ().Take (3));
                }
 
                [Test]
@@ -349,7 +349,7 @@ namespace MonoTests.System.Linq
                        int [] data = {0, 1, 2, 3, 4, 5};
                        int [] result = {0, 1, 2};
 
-                       AssertAreSame (result, data.AsReallyParallel ().AsOrdered ().TakeWhile (i => i < 3));
+                       AssertAreSame (result, data.AsParallel ().AsOrdered ().TakeWhile (i => i < 3));
                }
 
                [Test]
@@ -371,7 +371,7 @@ namespace MonoTests.System.Linq
                        IEnumerable<int> expected = initial.SelectMany ((i) => Enumerable.Range (1, i));
 
                        ParallelTestHelper.Repeat (() => {
-                                       var actual = initial.AsReallyParallel ().AsOrdered ().SelectMany ((i) => Enumerable.Range (1, i));
+                                       var actual = initial.AsParallel ().AsOrdered ().SelectMany ((i) => Enumerable.Range (1, i));
                                        AssertAreSame (expected, actual);
                                });
                }
@@ -381,7 +381,7 @@ namespace MonoTests.System.Linq
                {
                        int [] data = {1, 2, 3};
 
-                       Assert.AreEqual (3, data.AsReallyParallel ().AsOrdered ().Last ());
+                       Assert.AreEqual (3, data.AsParallel ().AsOrdered ().Last ());
                }
 
                [Test]
@@ -389,7 +389,7 @@ namespace MonoTests.System.Linq
                {
                        int [] data = {};
 
-                       Assert.AreEqual (default (int), data.AsReallyParallel ().AsOrdered ().LastOrDefault ());
+                       Assert.AreEqual (default (int), data.AsParallel ().AsOrdered ().LastOrDefault ());
                }
 
                [Test]
@@ -397,7 +397,7 @@ namespace MonoTests.System.Linq
                {
                        int [] data = {1, 2, 3};
 
-                       Assert.AreEqual (1, data.AsReallyParallel ().AsOrdered ().First ());
+                       Assert.AreEqual (1, data.AsParallel ().AsOrdered ().First ());
                }
 
                [Test]
@@ -405,7 +405,7 @@ namespace MonoTests.System.Linq
                {
                        int [] data = {};
 
-                       Assert.AreEqual (default (int), data.AsReallyParallel ().AsOrdered ().FirstOrDefault ());
+                       Assert.AreEqual (default (int), data.AsParallel ().AsOrdered ().FirstOrDefault ());
                }
                
                [Test]
@@ -414,8 +414,8 @@ namespace MonoTests.System.Linq
                        int [] data = {0, 1, 2, 3, 4};
                        int [] result = {4, 3, 2, 1, 0};
 
-                       AssertAreSame (result, ((IEnumerable<int>)data).Select ((i) => i).AsReallyParallel ().AsOrdered ().Reverse ());
-                       AssertAreSame (result, ParallelEnumerable.Range (0, 5).AsReallyParallel ().AsOrdered ().Reverse ());
+                       AssertAreSame (result, ((IEnumerable<int>)data).Select ((i) => i).AsParallel ().AsOrdered ().Reverse ());
+                       AssertAreSame (result, ParallelEnumerable.Range (0, 5).AsParallel ().AsOrdered ().Reverse ());
                }
                
                [Test]
@@ -561,9 +561,9 @@ namespace MonoTests.System.Linq
                public void ElementAtTestCase()
                {
                        //ParallelTestHelper.Repeat (() => {
-                                       Assert.AreEqual(1, baseEnumerable.AsReallyParallel ().AsOrdered ().ElementAt(0), "#1");
-                                       Assert.AreEqual(51, baseEnumerable.AsReallyParallel ().AsOrdered ().ElementAt(50), "#2");
-                                       Assert.AreEqual(489, baseEnumerable.AsReallyParallel ().AsOrdered ().ElementAt(488), "#3");
+                                       Assert.AreEqual(1, baseEnumerable.AsParallel ().AsOrdered ().ElementAt(0), "#1");
+                                       Assert.AreEqual(51, baseEnumerable.AsParallel ().AsOrdered ().ElementAt(50), "#2");
+                                       Assert.AreEqual(489, baseEnumerable.AsParallel ().AsOrdered ().ElementAt(488), "#3");
                        //});
                }
 
@@ -591,12 +591,11 @@ namespace MonoTests.System.Linq
                {
                        var items = new [] { 1, 2, 3 };
                        var items2 = new [] { 1, 2, 3, 4 };
-                       var actual = items.AsReallyParallel ().Join (items2.AsReallyParallel (), i => i, i => i, (e1, e2) => e1 + e2);
+                       var actual = items.AsReallyParallel ().Join (items2.AsParallel (), i => i, i => i, (e1, e2) => e1 + e2);
                        AreEquivalent (new[] { 2, 4, 6 }, actual);
                }
 
                [Test]
-               [Category ("NotWorking")] // Deadlocks randomly
                public void TestGroupBy ()
                {
                        int num = 100;
@@ -624,12 +623,12 @@ namespace MonoTests.System.Linq
                public void TakeTestCase()
                {
                        ParallelTestHelper.Repeat (() => {
-                               ParallelQuery<int> async_res = baseEnumerable.AsReallyParallel ().AsOrdered ().Take(800);
+                               ParallelQuery<int> async_res = baseEnumerable.AsParallel ().AsOrdered ().Take(800);
                                IEnumerable<int> sync = baseEnumerable.Take(800);
 
                                AreEquivalent(sync, async_res);
 
-                               async_res = baseEnumerable.AsReallyParallel ().AsOrdered ().Take(100);
+                               async_res = baseEnumerable.AsParallel ().AsOrdered ().Take(100);
                                sync = baseEnumerable.Take(100);
 
                                AreEquivalent(sync, async_res);
@@ -656,7 +655,7 @@ namespace MonoTests.System.Linq
                public void SkipTestCase()
                {
                        ParallelTestHelper.Repeat (() => {
-                               ParallelQuery<int> async_res = baseEnumerable.AsReallyParallel ().AsOrdered().Skip (800);
+                               ParallelQuery<int> async_res = baseEnumerable.AsParallel ().AsOrdered().Skip (800);
                                IEnumerable<int> sync = baseEnumerable.Skip (800);
                                
                                AreEquivalent (sync, async_res);
@@ -778,14 +777,14 @@ namespace MonoTests.System.Linq
 
                        int [] result = {0, 1, 2};
 
-                       var array = coll.AsReallyParallel ().AsOrdered().ToArray ();
+                       var array = coll.AsParallel ().AsOrdered().ToArray ();
 
                        AssertAreSame (result, array);
                        AssertIsOrdered (array, result.Length);
 
                        Assert.AreEqual (typeof (int []), array.GetType ());
 
-                       array = Enumerable.Range (1, 100).Select ((i) => i).AsReallyParallel ().AsOrdered().ToArray ();
+                       array = Enumerable.Range (1, 100).Select ((i) => i).AsParallel ().AsOrdered().ToArray ();
                        result = Enumerable.Range (1, 100).ToArray ();
 
                        AssertAreSame (result, array);
@@ -897,12 +896,12 @@ namespace MonoTests.System.Linq
                        var data2 = new int[] { 1, 2, 4 };
                        var data3 = new int[] { 1, 2, 3, 4 };
 
-                       Assert.IsTrue (data1.AsReallyParallel ().SequenceEqual (data1.AsReallyParallel ()));
-                       Assert.IsTrue (data2.AsReallyParallel ().SequenceEqual (data2.AsReallyParallel ()));
-                       Assert.IsTrue (data3.AsReallyParallel ().SequenceEqual (data3.AsReallyParallel ()));
-                       Assert.IsFalse (data1.AsReallyParallel ().SequenceEqual (data2.AsReallyParallel ()));
-                       Assert.IsFalse (data1.AsReallyParallel ().SequenceEqual (data3.AsReallyParallel ()));
-                       Assert.IsFalse (data2.AsReallyParallel ().SequenceEqual (data3.AsReallyParallel ()));
+                       Assert.IsTrue (data1.AsParallel ().SequenceEqual (data1.AsParallel ()));
+                       Assert.IsTrue (data2.AsParallel ().SequenceEqual (data2.AsParallel ()));
+                       Assert.IsTrue (data3.AsParallel ().SequenceEqual (data3.AsParallel ()));
+                       Assert.IsFalse (data1.AsParallel ().SequenceEqual (data2.AsParallel ()));
+                       Assert.IsFalse (data1.AsParallel ().SequenceEqual (data3.AsParallel ()));
+                       Assert.IsFalse (data2.AsParallel ().SequenceEqual (data3.AsParallel ()));
                }
 
                [Test]
index aef9fffbb55ea934a8231c8678d1538a2f61d40a..8e2c31745047e5cf74f3a6a1b3bb7bd33462b164 100644 (file)
@@ -401,9 +401,14 @@ namespace MonoTests.System.Threading
                {
                        var v = new ReaderWriterLockSlim ();
                        int local = 10;
+                       int ready_count = 0;
+                       int entered_count = 0;
+                       const int thread_count = 10;
 
-                       var r = from i in Enumerable.Range (1, 10) select new Thread (() => {
+                       var r = from i in Enumerable.Range (1, thread_count) select new Thread (() => {
+                               Interlocked.Increment (ref ready_count);
                                v.EnterReadLock ();
+                               Interlocked.Increment (ref entered_count);
 
                                Assert.AreEqual (11, local);
                        });
@@ -415,12 +420,16 @@ namespace MonoTests.System.Threading
                                t.Start ();
                        }
 
-                       Thread.Sleep (200);
+                       while (ready_count != thread_count)
+                               Thread.Sleep (10);
+
+                       /* Extra up to 2s of sleep to ensure all threads got the chance to enter the lock */
+                       for (int i = 0; i < 200 && v.WaitingReadCount != thread_count; ++i)
+                               Thread.Sleep (10);
                        local = 11;
 
-                       // FIXME: Don't rely on Thread.Sleep (200)
                        Assert.AreEqual (0, v.WaitingWriteCount, "in waiting write");
-                       Assert.AreEqual (10, v.WaitingReadCount, "in waiting read");
+                       Assert.AreEqual (thread_count, v.WaitingReadCount, "in waiting read");
                        Assert.AreEqual (0, v.WaitingUpgradeCount, "in waiting upgrade");
                        v.ExitWriteLock ();
 
index 4f5e43d10427d4e18429b5a89ffdae232a0bd3e4..7406bccf12b6e1c5eab91cbf408fbbebae73655b 100644 (file)
@@ -1,10 +1 @@
-#include System.Core.dll.sources
-
-../../build/common/Consts.cs
-../../build/common/Locale.cs
-../../build/common/MonoTODOAttribute.cs
-../Mono.Security/Mono.Security.Cryptography/CryptoTools.cs
-../Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs
-../corlib/System.Threading/AtomicBoolean.cs
-../corlib/System.Collections.Generic/CollectionDebuggerView.cs
-../corlib/System.Collections/HashPrimeNumbers.cs
+#include net_4_0_System.Core.dll.sources
index 10e86231252605c39a1131a359ee7047e9b7199c..61ec3815c6a662c11303ce399e59900c91325c5e 100644 (file)
@@ -40,56 +40,10 @@ System.Threading/LockRecursionPolicy.cs
 System.Threading/ReaderWriterLockSlim.cs
 System.Threading/ThreadLockState.cs
 System.Threading/ReaderWriterLockSlimExtensions.cs
-System.Linq.Parallel.QueryNodes/QueryBaseNode.cs
-System.Linq.Parallel.QueryNodes/QueryCastNode.cs
-System.Linq.Parallel.QueryNodes/QueryChildNode.cs
-System.Linq.Parallel.QueryNodes/QueryConcatNode.cs
-System.Linq.Parallel.QueryNodes/QueryDefaultEmptyNode.cs
-System.Linq.Parallel.QueryNodes/QueryGroupByNode.cs
-System.Linq.Parallel.QueryNodes/QueryHeadWorkerNode.cs
-System.Linq.Parallel.QueryNodes/QueryJoinNode.cs
-System.Linq.Parallel.QueryNodes/QueryMuxNode.cs
-System.Linq.Parallel.QueryNodes/QueryOptionNode.cs
-System.Linq.Parallel.QueryNodes/QueryOrderByNode.cs
-System.Linq.Parallel.QueryNodes/QueryOrderGuardNode.cs
-System.Linq.Parallel.QueryNodes/QueryOrderedStreamNode.cs
-System.Linq.Parallel.QueryNodes/QueryReverseNode.cs
-System.Linq.Parallel.QueryNodes/QuerySelectManyNode.cs
-System.Linq.Parallel.QueryNodes/QuerySelectNode.cs
-System.Linq.Parallel.QueryNodes/QuerySetNode.cs
-System.Linq.Parallel.QueryNodes/QueryStartNode.cs
-System.Linq.Parallel.QueryNodes/QueryStreamNode.cs
-System.Linq.Parallel.QueryNodes/QueryWhereNode.cs
-System.Linq.Parallel.QueryNodes/QueryZipNode.cs
-System.Linq.Parallel.QueryNodes/SetInclusion.cs
-System.Linq.Parallel.QueryNodes/WrapHelper.cs
-System.Linq.Parallel/AggregationList.cs
-System.Linq.Parallel/ConcurrentGrouping.cs
-System.Linq.Parallel/ConcurrentLookup.cs
-System.Linq.Parallel/INodeVisitor.cs
-System.Linq.Parallel/IVisitableNode.cs
-System.Linq.Parallel/OrderingEnumerator.cs
-System.Linq.Parallel/ParallelExecuter.cs
-System.Linq.Parallel/ParallelPartitioner.cs
-System.Linq.Parallel/ParallelQueryEnumerator.cs
-System.Linq.Parallel/ParallelQuickSort.cs
-System.Linq.Parallel/QueryCheckerVisitor.cs
-System.Linq.Parallel/QueryIsOrderedVisitor.cs
-System.Linq.Parallel/QueryOptions.cs
-System.Linq.Parallel/RangeList.cs
-System.Linq.Parallel/RepeatList.cs
-System.Linq.Parallel/ReverseList.cs
-System.Linq.Parallel/StripPartitioner.cs
-System.Linq.Parallel/TemporaryArea.cs
 System.Linq/EnumerableExecutor.cs
 System.Linq/EnumerableExecutor_T.cs
 System.Linq/EnumerableQuery.cs
 System.Linq/EnumerableQuery_T.cs
-System.Linq/OrderedParallelQuery.cs
-System.Linq/ParallelEnumerable.cs
-System.Linq/ParallelExecutionMode.cs
-System.Linq/ParallelMergeOptions.cs
-System.Linq/ParallelQuery.cs
 System.IO.MemoryMappedFiles/MemoryMappedFile.cs
 System.IO.MemoryMappedFiles/MemoryMappedFileAccess.cs
 System.IO.MemoryMappedFiles/MemoryMappedFileOptions.cs
@@ -106,3 +60,142 @@ System.Linq.Expressions/ExpressionTransformer.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/DynamicExpression.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Compiler/Closure.cs
 System.Linq.Expressions/DynamicExpressionVisitor.cs
+../../../external/referencesource/System.Core/System/Linq/ParallelEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/ParallelMergeOptions.cs
+../../../external/referencesource/System.Core/System/Linq/ParallelExecutionMode.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Channels/AsynchronousChannel.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Channels/SynchronousChannel.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/AggregationMinMaxHelpers.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/EmptyEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/EnumerableWrapperWeakToStrong.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/IParallelPartitionable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/OrderedParallelQuery.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/ParallelEnumerableWrapper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/ParallelQuery.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/QueryAggregationOptions.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/RangeEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/RepeatEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/ArrayMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/AsynchronousChannelMergeEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/DefaultMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/IMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/MergeEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/MergeExecutor.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/OrderPreservingMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/OrderPreservingPipeliningMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/SynchronousChannelMergeEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/IPartitionedStreamRecipient.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/PartitionedDataSource.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/PartitionedStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/UnorderedHashRepartitionStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/AssociativeAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/ExceptQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/GroupJoinQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/HashJoinQueryOperatorEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/IntersectQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/JoinQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/ZipQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/BinaryQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/CountAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperatorEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongCountAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/ListQueryResults.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Options/OrderingQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Options/QueryExecutionOption.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/OrdinalIndexState.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/PartitionedStreamMerger.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/PartitionerQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryOpeningEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryOperatorEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryResults.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QuerySettings.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/ScanQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/AnyAllSearchOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ConcatQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ContainsSearchOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/DefaultIfEmptyQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/DistinctQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ElementAtQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/FirstQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ForAllOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/GroupByQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedSelectQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedWhereQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/LastQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ReverseQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectManyQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SingleQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SortQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipWhileQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/WhereQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/UnaryQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/CancellationState.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingPipeliningSpoolingTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingSpoolingTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/QueryLifecycle.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/QueryTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/QueryTaskGroupState.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/Scheduling.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/SpoolingTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/SpoolingTaskBase.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/CancellableEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ExceptionAggregator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ExchangeUtilities.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/FixedMaxHeap.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/GrowingArray.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/HashLookup.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/IntValueEvent.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ListChunk.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Lookup.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Pair.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/PairComparer.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ReverseComparer.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Shared.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Sorting.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/TraceHelpers.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Util.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Wrapper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/WrapperEqualityComparer.cs
+
+ReferenceSources/Set.cs
+ReferenceSources/SR.cs
+../../build/common/SR.cs
index ee0a10c7b1c0681d325a1f180a9aee042b5458dd..245d280ca08156c8dc8585be077f1d18adaafdcc 100644 (file)
@@ -1,4 +1,5 @@
 #include dynamic_System.Core.dll.sources
+../../build/common/SR.cs
 Assembly/AssemblyInfo.cs
 System/Actions.cs
 System/Funcs.cs
@@ -90,49 +91,142 @@ System.IO.Pipes/PipeUnix.cs
 System.IO.Pipes/PipeWin32.cs
 System.IO/HandleInheritability.cs
 
-System.Linq.Parallel/ParallelQueryEnumerator.cs
-System.Linq/OrderedParallelQuery.cs
-System.Linq/ParallelMergeOptions.cs
-System.Linq/ParallelExecutionMode.cs
-System.Linq/ParallelEnumerable.cs
-System.Linq.Parallel/ParallelPartitioner.cs
-System.Linq.Parallel/RangeList.cs
-System.Linq.Parallel/StripPartitioner.cs
-System.Linq.Parallel/RepeatList.cs
-System.Linq.Parallel/ParallelQuickSort.cs
-System.Linq.Parallel/OrderingEnumerator.cs
-System.Linq.Parallel/AggregationList.cs
-System.Linq.Parallel/ConcurrentLookup.cs
-System.Linq.Parallel/ConcurrentGrouping.cs
-System.Linq.Parallel/ReverseList.cs
-System.Linq.Parallel/ParallelExecuter.cs
-System.Linq.Parallel/TemporaryArea.cs
-System.Linq/ParallelQuery.cs
-System.Linq.Parallel.QueryNodes/QueryWhereNode.cs
-System.Linq.Parallel.QueryNodes/QueryCastNode.cs
-System.Linq.Parallel.QueryNodes/QueryConcatNode.cs
-System.Linq.Parallel.QueryNodes/QueryDefaultEmptyNode.cs
-System.Linq.Parallel.QueryNodes/QueryOptionNode.cs
-System.Linq.Parallel.QueryNodes/QueryGroupByNode.cs
-System.Linq.Parallel.QueryNodes/QuerySelectNode.cs
-System.Linq.Parallel.QueryNodes/QuerySelectManyNode.cs
-System.Linq.Parallel.QueryNodes/QueryStreamNode.cs
-System.Linq.Parallel.QueryNodes/QueryOrderedStreamNode.cs
-System.Linq.Parallel.QueryNodes/QueryStartNode.cs
-System.Linq.Parallel.QueryNodes/QueryBaseNode.cs
-System.Linq.Parallel.QueryNodes/QueryChildNode.cs
-System.Linq.Parallel.QueryNodes/QueryOrderGuardNode.cs
-System.Linq.Parallel.QueryNodes/QueryOrderByNode.cs
-System.Linq.Parallel.QueryNodes/QueryMuxNode.cs
-System.Linq.Parallel.QueryNodes/QueryZipNode.cs
-System.Linq.Parallel.QueryNodes/QuerySetNode.cs
-System.Linq.Parallel.QueryNodes/QueryReverseNode.cs
-System.Linq.Parallel.QueryNodes/SetInclusion.cs
-System.Linq.Parallel.QueryNodes/WrapHelper.cs
-System.Linq.Parallel.QueryNodes/QueryHeadWorkerNode.cs
-System.Linq.Parallel.QueryNodes/QueryJoinNode.cs
-System.Linq.Parallel/INodeVisitor.cs
-System.Linq.Parallel/IVisitableNode.cs
-System.Linq.Parallel/QueryCheckerVisitor.cs
-System.Linq.Parallel/QueryIsOrderedVisitor.cs
-System.Linq.Parallel/QueryOptions.cs
+#PLINQ
+../../../external/referencesource/System.Core/System/Linq/ParallelEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/ParallelMergeOptions.cs
+../../../external/referencesource/System.Core/System/Linq/ParallelExecutionMode.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Channels/AsynchronousChannel.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Channels/SynchronousChannel.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/AggregationMinMaxHelpers.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/EmptyEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/EnumerableWrapperWeakToStrong.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/IParallelPartitionable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/OrderedParallelQuery.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/ParallelEnumerableWrapper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/ParallelQuery.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/QueryAggregationOptions.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/RangeEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Enumerables/RepeatEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/ArrayMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/AsynchronousChannelMergeEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/DefaultMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/IMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/MergeEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/MergeExecutor.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/OrderPreservingMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/OrderPreservingPipeliningMergeHelper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Merging/SynchronousChannelMergeEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/IPartitionedStreamRecipient.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/PartitionedDataSource.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/PartitionedStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Partitioning/UnorderedHashRepartitionStream.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/AssociativeAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/ExceptQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/GroupJoinQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/HashJoinQueryOperatorEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/IntersectQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/JoinQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/ZipQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/BinaryQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/CountAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperatorEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongCountAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongAverageAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongMinMaxAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongSumAggregationOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/ListQueryResults.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Options/OrderingQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Options/QueryExecutionOption.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/OrdinalIndexState.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/PartitionedStreamMerger.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/PartitionerQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryOpeningEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryOperatorEnumerator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QueryResults.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/QuerySettings.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/ScanQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/AnyAllSearchOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ConcatQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ContainsSearchOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/DefaultIfEmptyQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/DistinctQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ElementAtQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/FirstQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ForAllOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/GroupByQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedSelectQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedWhereQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/LastQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ReverseQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectManyQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SingleQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SortQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipWhileQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/WhereQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/QueryOperators/UnaryQueryOperator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/CancellationState.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingPipeliningSpoolingTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingSpoolingTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/QueryLifecycle.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/QueryTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/QueryTaskGroupState.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/Scheduling.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/SpoolingTask.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Scheduling/SpoolingTaskBase.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/CancellableEnumerable.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ExceptionAggregator.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ExchangeUtilities.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/FixedMaxHeap.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/GrowingArray.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/HashLookup.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/IntValueEvent.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ListChunk.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Lookup.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Pair.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/PairComparer.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/ReverseComparer.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Shared.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Sorting.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/TraceHelpers.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Util.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/Wrapper.cs
+../../../external/referencesource/System.Core/System/Linq/Parallel/Utils/WrapperEqualityComparer.cs
+
+ReferenceSources/Set.cs
+ReferenceSources/SR.cs
diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_2_0.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_2_0.csproj
deleted file mode 100644 (file)
index ad266ec..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BB9C24C9-41DC-4F08-BBCE-3698C695332B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.DataSetExtensions</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Data\DataRowComparer.cs" />\r
-    <Compile Include="System.Data\DataRowComparer_1.cs" />\r
-    <Compile Include="System.Data\DataRowExtensions.cs" />\r
-    <Compile Include="System.Data\DataTableExtensions.cs" />\r
-    <Compile Include="System.Data\EnumerableRowCollection.cs" />\r
-    <Compile Include="System.Data\EnumerableRowCollection_1.cs" />\r
-    <Compile Include="System.Data\EnumerableRowCollectionExtensions.cs" />\r
-    <Compile Include="System.Data\OrderedEnumerableRowCollection.cs" />\r
-    <Compile Include="System.Data\RowEnumerableDataReader.cs" />\r
-    <Compile Include="System.Data\TypedTableBase.cs" />\r
-    <Compile Include="System.Data\TypedTableBaseExtensions.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_0.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_0.csproj
deleted file mode 100644 (file)
index dc34cca..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B77F6D18-6B1F-40A2-B6CA-56E2553C16EF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.DataSetExtensions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Data\DataRowComparer.cs" />\r
-    <Compile Include="System.Data\DataRowComparer_1.cs" />\r
-    <Compile Include="System.Data\DataRowExtensions.cs" />\r
-    <Compile Include="System.Data\DataTableExtensions.cs" />\r
-    <Compile Include="System.Data\EnumerableRowCollection.cs" />\r
-    <Compile Include="System.Data\EnumerableRowCollection_1.cs" />\r
-    <Compile Include="System.Data\EnumerableRowCollectionExtensions.cs" />\r
-    <Compile Include="System.Data\OrderedEnumerableRowCollection.cs" />\r
-    <Compile Include="System.Data\RowEnumerableDataReader.cs" />\r
-    <Compile Include="System.Data\TypedTableBase.cs" />\r
-    <Compile Include="System.Data\TypedTableBaseExtensions.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_2_0.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_2_0.csproj
deleted file mode 100644 (file)
index a8f9cc1..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B9F3CFD2-99EE-49B0-986F-E6089E4E5CFA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.DataSetExtensions-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.DataSetExtensions_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Data\DataRowComparerTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Data\EnumerableRowCollectionTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.DataSetExtensions\System.Data.DataSetExtensions-net_2_0.csproj">\r
-      <Project>{BB9C24C9-41DC-4F08-BBCE-3698C695332B}</Project>\r
-      <Name>System.Data.DataSetExtensions\System.Data.DataSetExtensions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_4_0.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 95042c5..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5B198F7D-3E59-4145-8446-D1D06A88BBAD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.DataSetExtensions-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.DataSetExtensions_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Data\DataRowComparerTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Data\EnumerableRowCollectionTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.DataSetExtensions\System.Data.DataSetExtensions-net_4_0.csproj">\r
-      <Project>{B77F6D18-6B1F-40A2-B6CA-56E2553C16EF}</Project>\r
-      <Name>System.Data.DataSetExtensions\System.Data.DataSetExtensions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..84393c4
--- /dev/null
@@ -0,0 +1,67 @@
+//
+// AssemblyInfo.cs
+//
+// Authors:
+//     Marek Safar (marek.safar@gmail.com)
+//
+// Copyright 2014 Xamarin Inc (http://www.xamarin.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.Reflection;
+using System.Resources;
+using System.Security;
+using System.Security.Permissions;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about the assembly
+
+[assembly: AssemblyTitle ("System.Data.Entity.dll")]
+[assembly: AssemblyDescription ("System.Data.Entity.dll")]
+[assembly: AssemblyDefaultAlias ("System.Data.Entity.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+
+#if MOBILE
+[assembly: AssemblyVersion ("4.0.0.0")]
+[assembly: SatelliteContractVersion ("4.0.0.0")]
+[assembly: AssemblyInformationalVersion ("4.0.50524.0")]
+[assembly: AssemblyFileVersion ("4.0.50524.0")]
+#else
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+#endif
+
+[assembly: NeutralResourcesLanguage ("en-US")]
+[assembly: CLSCompliant (true)]
+[assembly: AssemblyDelaySign (true)]
+
+[assembly: AssemblyKeyFile ("../ecma.pub")]
+
+[assembly: ComVisible (false)]
+
diff --git a/mcs/class/System.Data.Entity/EntityRes.cs b/mcs/class/System.Data.Entity/EntityRes.cs
new file mode 100644 (file)
index 0000000..1c7c71a
--- /dev/null
@@ -0,0 +1,637 @@
+namespace System.Data.Entity
+{
+       static class EntityRes
+       {
+               public static string GetString (string message, params object[] args)
+               {
+                       return message;
+               }
+
+               public static string CtxAlias {
+                       get {
+                               return GetString ("CtxAlias");
+                       }
+               }
+
+               public static string CtxAliasedNamespaceImport {
+                       get {
+                               return GetString ("CtxAliasedNamespaceImport");
+                       }
+               }
+
+               public static string CtxAnd {
+                       get {
+                               return GetString ("CtxAnd");
+                       }
+               }
+
+               public static string CtxAnyElement {
+                       get {
+                               return GetString ("CtxAnyElement");
+                       }
+               }
+
+               public static string CtxApplyClause {
+                       get {
+                               return GetString ("CtxApplyClause");
+                       }
+               }
+
+               public static string CtxBetween {
+                       get {
+                               return GetString ("CtxBetween");
+                       }
+               }
+
+               public static string CtxCase {
+                       get {
+                               return GetString ("CtxCase");
+                       }
+               }
+
+               public static string CtxCaseElse {
+                       get {
+                               return GetString ("CtxCaseElse");
+                       }
+               }
+
+               public static string CtxCaseWhenThen {
+                       get {
+                               return GetString ("CtxCaseWhenThen");
+                       }
+               }
+
+               public static string CtxCast {
+                       get {
+                               return GetString ("CtxCast");
+                       }
+               }
+
+               public static string CtxCollatedOrderByClauseItem {
+                       get {
+                               return GetString ("CtxCollatedOrderByClauseItem");
+                       }
+               }
+
+               public static string CtxCollectionTypeDefinition {
+                       get {
+                               return GetString ("CtxCollectionTypeDefinition");
+                       }
+               }
+
+               public static string CtxCommandExpression {
+                       get {
+                               return GetString ("CtxCommandExpression");
+                       }
+               }
+
+               public static string CtxCreateRef {
+                       get {
+                               return GetString ("CtxCreateRef");
+                       }
+               }
+
+               public static string CtxDeref {
+                       get {
+                               return GetString ("CtxDeref");
+                       }
+               }
+
+               public static string CtxDivide {
+                       get {
+                               return GetString ("CtxDivide");
+                       }
+               }
+
+               public static string CtxElement {
+                       get {
+                               return GetString ("CtxElement");
+                       }
+               }
+
+               public static string CtxEquals {
+                       get {
+                               return GetString ("CtxEquals");
+                       }
+               }
+
+               public static string CtxEscapedIdentifier {
+                       get {
+                               return GetString ("CtxEscapedIdentifier");
+                       }
+               }
+
+               public static string CtxExcept {
+                       get {
+                               return GetString ("CtxExcept");
+                       }
+               }
+
+               public static string CtxExists {
+                       get {
+                               return GetString ("CtxExists");
+                       }
+               }
+
+               public static string CtxExpressionList {
+                       get {
+                               return GetString ("CtxExpressionList");
+                       }
+               }
+
+               public static string CtxFlatten {
+                       get {
+                               return GetString ("CtxFlatten");
+                       }
+               }
+
+               public static string CtxFromApplyClause {
+                       get {
+                               return GetString ("CtxFromApplyClause");
+                       }
+               }
+
+               public static string CtxFromClause {
+                       get {
+                               return GetString ("CtxFromClause");
+                       }
+               }
+
+               public static string CtxFromClauseItem {
+                       get {
+                               return GetString ("CtxFromClauseItem");
+                       }
+               }
+
+               public static string CtxFromClauseList {
+                       get {
+                               return GetString ("CtxFromClauseList");
+                       }
+               }
+
+               public static string CtxFromJoinClause {
+                       get {
+                               return GetString ("CtxFromJoinClause");
+                       }
+               }
+
+               public static string CtxFunctionDefinition {
+                       get {
+                               return GetString ("CtxFunctionDefinition");
+                       }
+               }
+
+               public static string CtxGreaterThan {
+                       get {
+                               return GetString ("CtxGreaterThan");
+                       }
+               }
+
+               public static string CtxGreaterThanEqual {
+                       get {
+                               return GetString ("CtxGreaterThanEqual");
+                       }
+               }
+
+               public static string CtxGroupByClause {
+                       get {
+                               return GetString ("CtxGroupByClause");
+                       }
+               }
+
+               public static string CtxGroupPartition {
+                       get {
+                               return GetString ("CtxGroupPartition");
+                       }
+               }
+
+               public static string CtxHavingClause {
+                       get {
+                               return GetString ("CtxHavingClause");
+                       }
+               }
+
+               public static string CtxIdentifier {
+                       get {
+                               return GetString ("CtxIdentifier");
+                       }
+               }
+
+               public static string CtxIn {
+                       get {
+                               return GetString ("CtxIn");
+                       }
+               }
+
+               public static string CtxIntersect {
+                       get {
+                               return GetString ("CtxIntersect");
+                       }
+               }
+
+               public static string CtxIsNotNull {
+                       get {
+                               return GetString ("CtxIsNotNull");
+                       }
+               }
+
+               public static string CtxIsNotOf {
+                       get {
+                               return GetString ("CtxIsNotOf");
+                       }
+               }
+
+               public static string CtxIsNull {
+                       get {
+                               return GetString ("CtxIsNull");
+                       }
+               }
+
+               public static string CtxIsOf {
+                       get {
+                               return GetString ("CtxIsOf");
+                       }
+               }
+
+               public static string CtxJoinClause {
+                       get {
+                               return GetString ("CtxJoinClause");
+                       }
+               }
+
+               public static string CtxJoinOnClause {
+                       get {
+                               return GetString ("CtxJoinOnClause");
+                       }
+               }
+
+               public static string CtxKey {
+                       get {
+                               return GetString ("CtxKey");
+                       }
+               }
+
+               public static string CtxLessThan {
+                       get {
+                               return GetString ("CtxLessThan");
+                       }
+               }
+
+               public static string CtxLessThanEqual {
+                       get {
+                               return GetString ("CtxLessThanEqual");
+                       }
+               }
+
+               public static string CtxLike {
+                       get {
+                               return GetString ("CtxLike");
+                       }
+               }
+
+               public static string CtxLimitSubClause {
+                       get {
+                               return GetString ("CtxLimitSubClause");
+                       }
+               }
+
+               public static string CtxLiteral {
+                       get {
+                               return GetString ("CtxLiteral");
+                       }
+               }
+
+               public static string CtxMemberAccess {
+                       get {
+                               return GetString ("CtxMemberAccess");
+                       }
+               }
+
+               public static string CtxMethod {
+                       get {
+                               return GetString ("CtxMethod");
+                       }
+               }
+
+               public static string CtxMinus {
+                       get {
+                               return GetString ("CtxMinus");
+                       }
+               }
+
+               public static string CtxModulus {
+                       get {
+                               return GetString ("CtxModulus");
+                       }
+               }
+
+               public static string CtxMultiply {
+                       get {
+                               return GetString ("CtxMultiply");
+                       }
+               }
+
+               public static string CtxMultisetCtor {
+                       get {
+                               return GetString ("CtxMultisetCtor");
+                       }
+               }
+
+               public static string CtxNamespaceImport {
+                       get {
+                               return GetString ("CtxNamespaceImport");
+                       }
+               }
+
+               public static string CtxNamespaceImportList {
+                       get {
+                               return GetString ("CtxNamespaceImportList");
+                       }
+               }
+
+               public static string CtxNavigate {
+                       get {
+                               return GetString ("CtxNavigate");
+                       }
+               }
+
+               public static string CtxNot {
+                       get {
+                               return GetString ("CtxNot");
+                       }
+               }
+
+               public static string CtxNotBetween {
+                       get {
+                               return GetString ("CtxNotBetween");
+                       }
+               }
+
+               public static string CtxNotEqual {
+                       get {
+                               return GetString ("CtxNotEqual");
+                       }
+               }
+
+               public static string CtxNotIn {
+                       get {
+                               return GetString ("CtxNotIn");
+                       }
+               }
+
+               public static string CtxNotLike {
+                       get {
+                               return GetString ("CtxNotLike");
+                       }
+               }
+
+               public static string CtxNullLiteral {
+                       get {
+                               return GetString ("CtxNullLiteral");
+                       }
+               }
+
+               public static string CtxOfType {
+                       get {
+                               return GetString ("CtxOfType");
+                       }
+               }
+
+               public static string CtxOfTypeOnly {
+                       get {
+                               return GetString ("CtxOfTypeOnly");
+                       }
+               }
+
+               public static string CtxOr {
+                       get {
+                               return GetString ("CtxOr");
+                       }
+               }
+
+               public static string CtxOrderByClause {
+                       get {
+                               return GetString ("CtxOrderByClause");
+                       }
+               }
+
+               public static string CtxOrderByClauseItem {
+                       get {
+                               return GetString ("CtxOrderByClauseItem");
+                       }
+               }
+
+               public static string CtxOverlaps {
+                       get {
+                               return GetString ("CtxOverlaps");
+                       }
+               }
+
+               public static string CtxParen {
+                       get {
+                               return GetString ("CtxParen");
+                       }
+               }
+
+               public static string CtxPlus {
+                       get {
+                               return GetString ("CtxPlus");
+                       }
+               }
+
+               public static string CtxQueryExpression {
+                       get {
+                               return GetString ("CtxQueryExpression");
+                       }
+               }
+
+               public static string CtxQueryStatement {
+                       get {
+                               return GetString ("CtxQueryStatement");
+                       }
+               }
+
+               public static string CtxRef {
+                       get {
+                               return GetString ("CtxRef");
+                       }
+               }
+
+               public static string CtxRefTypeDefinition {
+                       get {
+                               return GetString ("CtxRefTypeDefinition");
+                       }
+               }
+
+               public static string CtxRelationship {
+                       get {
+                               return GetString ("CtxRelationship");
+                       }
+               }
+
+               public static string CtxRelationshipList {
+                       get {
+                               return GetString ("CtxRelationshipList");
+                       }
+               }
+
+               public static string CtxRowCtor {
+                       get {
+                               return GetString ("CtxRowCtor");
+                       }
+               }
+
+               public static string CtxRowTypeDefinition {
+                       get {
+                               return GetString ("CtxRowTypeDefinition");
+                       }
+               }
+
+               public static string CtxSelectRowClause {
+                       get {
+                               return GetString ("CtxSelectRowClause");
+                       }
+               }
+
+               public static string CtxSelectValueClause {
+                       get {
+                               return GetString ("CtxSelectValueClause");
+                       }
+               }
+
+               public static string CtxSet {
+                       get {
+                               return GetString ("CtxSet");
+                       }
+               }
+
+               public static string CtxSimpleIdentifier {
+                       get {
+                               return GetString ("CtxSimpleIdentifier");
+                       }
+               }
+
+               public static string CtxSkipSubClause {
+                       get {
+                               return GetString ("CtxSkipSubClause");
+                       }
+               }
+
+               public static string CtxTopSubClause {
+                       get {
+                               return GetString ("CtxTopSubClause");
+                       }
+               }
+
+               public static string CtxTreat {
+                       get {
+                               return GetString ("CtxTreat");
+                       }
+               }
+
+               public static string CtxTypeName {
+                       get {
+                               return GetString ("CtxTypeName");
+                       }
+               }
+
+               public static string CtxTypeNameWithTypeSpec {
+                       get {
+                               return GetString ("CtxTypeNameWithTypeSpec");
+                       }
+               }
+
+               public static string CtxUnaryMinus {
+                       get {
+                               return GetString ("CtxUnaryMinus");
+                       }
+               }
+
+               public static string CtxUnaryPlus {
+                       get {
+                               return GetString ("CtxUnaryPlus");
+                       }
+               }
+
+               public static string CtxUnion {
+                       get {
+                               return GetString ("CtxUnion");
+                       }
+               }
+
+               public static string CtxUnionAll {
+                       get {
+                               return GetString ("CtxUnionAll");
+                       }
+               }
+
+               public static string CtxWhereClause {
+                       get {
+                               return GetString ("CtxWhereClause");
+                       }
+               }
+
+               public static string ParserFatalError {
+                       get {
+                               return GetString ("ParserFatalError");
+                       }
+               }
+
+               public static string ParserInputError {
+                       get {
+                               return GetString ("ParserInputError");
+                       }
+               }
+
+               public static string GenericSyntaxError {
+                       get {
+                               return GetString ("GenericSyntaxError");
+                       }
+               }
+
+               public static string InvalidSchemaEncountered {
+                       get {
+                               return GetString ("InvalidSchemaEncountered");
+                       }
+               }
+
+
+               public static string ViewGen_Foreign_Key_ColumnOrder_Incorrect {
+                       get {
+                               return GetString ("ViewGen_Foreign_Key_ColumnOrder_Incorrect");
+                       }
+               }
+
+               public static string ViewGen_CommaBlank {
+                       get {
+                               return GetString ("ViewGen_CommaBlank");
+                       }
+               }
+
+               public static string Mapping_Default_OCMapping_Member_Type_Mismatch {
+                       get {
+                               return GetString ("Mapping_Default_OCMapping_Member_Type_Mismatch");
+                       }
+               }
+
+               public static string EntityClient_ProviderSpecificError {
+                       get {
+                               return GetString ("EntityClient_ProviderSpecificError");
+                       }
+               }
+
+               public const string EntityDataCategory_Context = "EntityDataCategory_Context";
+               public const string DataCategory_Data = "DataCategory_Data";
+               public const string EntityDataCategory_Source = "EntityDataCategory_Source";
+               public const string EntityDataCategory_NamedConnectionString = "EntityDataCategory_NamedConnectionString";
+               public const string DataCategory_Update = "DataCategory_Update";
+               public const string EntityConnectionString_ProviderConnectionString = "EntityConnectionString_ProviderConnectionString";
+               public const string DbParameter_Direction = "DbParameter_Direction";
+               public const string DbParameter_Size = "DbParameter_Size";
+               public const string DbParameter_SourceColumn = "DbParameter_SourceColumn";
+               public const string EntityConnectionString_Provider = "EntityConnectionString_Provider";
+               public const string DbParameter_SourceVersion = "DbParameter_SourceVersion";
+               public const string EntityConnectionString_Metadata = "EntityConnectionString_Metadata";
+               public const string EntityConnectionString_Name = "EntityConnectionString_Name";
+       }
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data.Entity/EntityResCategoryAttribute.cs b/mcs/class/System.Data.Entity/EntityResCategoryAttribute.cs
new file mode 100644 (file)
index 0000000..6064b9d
--- /dev/null
@@ -0,0 +1,12 @@
+using System.ComponentModel;
+
+namespace System.Data
+{
+       sealed class EntityResCategoryAttribute : CategoryAttribute
+       {
+               public EntityResCategoryAttribute (string category)
+                       : base (category)
+               {
+               }
+       }
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data.Entity/EntityResDescriptionAttribute.cs b/mcs/class/System.Data.Entity/EntityResDescriptionAttribute.cs
new file mode 100644 (file)
index 0000000..de58f04
--- /dev/null
@@ -0,0 +1,12 @@
+using System.ComponentModel;
+
+namespace System.Data
+{
+       sealed class EntityResDescriptionAttribute : DescriptionAttribute
+       {
+               public EntityResDescriptionAttribute (string description)
+                       : base (description)
+               {
+               }
+       }
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data.Entity/Error.cs b/mcs/class/System.Data.Entity/Error.cs
new file mode 100644 (file)
index 0000000..40a57ce
--- /dev/null
@@ -0,0 +1,25 @@
+namespace System.Data.Entity
+{
+       static class Error
+       {
+               public static Exception ArgumentNull (string paramName)
+               {
+                       return new ArgumentNullException (paramName);
+               }
+
+               public static Exception ArgumentOutOfRange (string paramName)
+               {
+                       return new ArgumentOutOfRangeException (paramName);
+               }
+
+               public static Exception NotImplemented ()
+               {
+                       return new NotImplementedException ();
+               }
+
+               public static Exception NotSupported ()
+               {
+                       return new NotSupportedException ();
+               }
+       }
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data.Entity/Makefile b/mcs/class/System.Data.Entity/Makefile
new file mode 100644 (file)
index 0000000..d3617e4
--- /dev/null
@@ -0,0 +1,10 @@
+thisdir = class/System.Data.Entity
+SUBDIRS = 
+include ../../build/rules.make
+
+LIBRARY = System.Data.Entity.dll
+LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll -r:System.Data.dll -r:System.Xml.dll -r:System.Xml.Linq.dll -r:System.Transactions.dll \
+                               -r:System.Runtime.Serialization.dll -r:System.ComponentModel.DataAnnotations.dll -r:System.Configuration.dll \
+                               -warn:2
+
+include ../../build/library.make
diff --git a/mcs/class/System.Data.Entity/Strings.cs b/mcs/class/System.Data.Entity/Strings.cs
new file mode 100644 (file)
index 0000000..715b1a8
--- /dev/null
@@ -0,0 +1,7721 @@
+namespace System.Data.Entity
+{
+
+
+
+    public static class Strings
+    {
+        public static string ADP_CollectionParameterElementIsNull (object p0)
+        {
+            return SR.GetString ("ADP_CollectionParameterElementIsNull", p0 );
+        }
+
+        public static string ADP_CollectionParameterElementIsNullOrEmpty (object p0)
+        {
+            return SR.GetString ("ADP_CollectionParameterElementIsNullOrEmpty", p0 );
+        }
+
+        public static string ADP_ConnectionStringSyntax (object p0)
+        {
+            return SR.GetString ("ADP_ConnectionStringSyntax", p0 );
+        }
+
+        public static string ADP_DataReaderClosed (object p0)
+        {
+            return SR.GetString ("ADP_DataReaderClosed", p0 );
+        }
+
+        public static string ADP_InternalProviderError (object p0)
+        {
+            return SR.GetString ("ADP_InternalProviderError", p0 );
+        }
+
+        public static string ADP_InvalidBufferSizeOrIndex (object p0, object p1)
+        {
+            return SR.GetString ("ADP_InvalidBufferSizeOrIndex", p0, p1 );
+        }
+
+        public static string ADP_InvalidConnectionOptionValue (object p0)
+        {
+            return SR.GetString ("ADP_InvalidConnectionOptionValue", p0 );
+        }
+
+        public static string ADP_InvalidDataLength (object p0)
+        {
+            return SR.GetString ("ADP_InvalidDataLength", p0 );
+        }
+
+        public static string ADP_InvalidDataReaderMissingColumnForType (object p0, object p1)
+        {
+            return SR.GetString ("ADP_InvalidDataReaderMissingColumnForType", p0, p1 );
+        }
+
+        public static string ADP_InvalidDataReaderMissingDiscriminatorColumn (object p0, object p1)
+        {
+            return SR.GetString ("ADP_InvalidDataReaderMissingDiscriminatorColumn", p0, p1 );
+        }
+
+        public static string ADP_InvalidDataReaderUnableToMaterializeNonScalarType (object p0, object p1)
+        {
+            return SR.GetString ("ADP_InvalidDataReaderUnableToMaterializeNonScalarType", p0, p1 );
+        }
+
+        public static string ADP_InvalidDataType (object p0)
+        {
+            return SR.GetString ("ADP_InvalidDataType", p0 );
+        }
+
+        public static string ADP_InvalidDestinationBufferIndex (object p0, object p1)
+        {
+            return SR.GetString ("ADP_InvalidDestinationBufferIndex", p0, p1 );
+        }
+
+        public static string ADP_InvalidEnumerationValue (object p0, object p1)
+        {
+            return SR.GetString ("ADP_InvalidEnumerationValue", p0, p1 );
+        }
+
+        public static string ADP_InvalidSizeValue (object p0)
+        {
+            return SR.GetString ("ADP_InvalidSizeValue", p0 );
+        }
+
+        public static string ADP_InvalidSourceBufferIndex (object p0, object p1)
+        {
+            return SR.GetString ("ADP_InvalidSourceBufferIndex", p0, p1 );
+        }
+
+        public static string ADP_KeysRequiredForJoinOverNest (object p0)
+        {
+            return SR.GetString ("ADP_KeysRequiredForJoinOverNest", p0 );
+        }
+
+        public static string ADP_KeywordNotSupported (object p0)
+        {
+            return SR.GetString ("ADP_KeywordNotSupported", p0 );
+        }
+
+        public static string ADP_NestingNotSupported (object p0, object p1)
+        {
+            return SR.GetString ("ADP_NestingNotSupported", p0, p1 );
+        }
+
+        public static string ADP_NonSequentialChunkAccess (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ADP_NonSequentialChunkAccess", p0, p1, p2 );
+        }
+
+        public static string ADP_NonSequentialColumnAccess (object p0, object p1)
+        {
+            return SR.GetString ("ADP_NonSequentialColumnAccess", p0, p1 );
+        }
+
+        public static string ADP_NoQueryMappingView (object p0, object p1)
+        {
+            return SR.GetString ("ADP_NoQueryMappingView", p0, p1 );
+        }
+
+        public static string ADP_UnknownDataTypeCode (object p0, object p1)
+        {
+            return SR.GetString ("ADP_UnknownDataTypeCode", p0, p1 );
+        }
+
+        public static string AliasNameAlreadyUsed (object p0)
+        {
+            return SR.GetString ("AliasNameAlreadyUsed", p0 );
+        }
+
+        public static string AliasNameIsAlreadyDefined (object p0)
+        {
+            return SR.GetString ("AliasNameIsAlreadyDefined", p0 );
+        }
+
+        public static string AllArtifactsMustTargetSameProvider_InvariantName (object p0, object p1)
+        {
+            return SR.GetString ("AllArtifactsMustTargetSameProvider_InvariantName", p0, p1 );
+        }
+
+        public static string AllArtifactsMustTargetSameProvider_ManifestToken (object p0, object p1)
+        {
+            return SR.GetString ("AllArtifactsMustTargetSameProvider_ManifestToken", p0, p1 );
+        }
+
+        public static string AmbiguousEntityContainerEnd (object p0, object p1)
+        {
+            return SR.GetString ("AmbiguousEntityContainerEnd", p0, p1 );
+        }
+
+        public static string AmbiguousFunctionAndType (object p0, object p1)
+        {
+            return SR.GetString ("AmbiguousFunctionAndType", p0, p1 );
+        }
+
+        public static string AmbiguousFunctionOverload (object p0, object p1)
+        {
+            return SR.GetString ("AmbiguousFunctionOverload", p0, p1 );
+        }
+
+        public static string AmbiguousMetadataMemberName (object p0, object p1, object p2)
+        {
+            return SR.GetString ("AmbiguousMetadataMemberName", p0, p1, p2 );
+        }
+
+        public static string ArgumentOutOfRange (object p0)
+        {
+            return SR.GetString ("ArgumentOutOfRange", p0 );
+        }
+
+        public static string ArgumentOutOfRangeExpectedPostiveNumber (object p0)
+        {
+            return SR.GetString ("ArgumentOutOfRangeExpectedPostiveNumber", p0 );
+        }
+
+        public static string ArgumentTypesAreIncompatible (object p0, object p1)
+        {
+            return SR.GetString ("ArgumentTypesAreIncompatible", p0, p1 );
+        }
+
+        public static string AssemblyMissingFromAssembliesToConsider (object p0)
+        {
+            return SR.GetString ("AssemblyMissingFromAssembliesToConsider", p0 );
+        }
+
+        public static string BadNamespaceOrAlias (object p0)
+        {
+            return SR.GetString ("BadNamespaceOrAlias", p0 );
+        }
+
+        public static string BadNavigationPropertyBadFromRoleType (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("BadNavigationPropertyBadFromRoleType", p0, p1, p2, p3, p4 );
+        }
+
+        public static string BadNavigationPropertyRelationshipNotRelationship (object p0)
+        {
+            return SR.GetString ("BadNavigationPropertyRelationshipNotRelationship", p0 );
+        }
+
+        public static string BadNavigationPropertyUndefinedRole (object p0, object p1)
+        {
+            return SR.GetString ("BadNavigationPropertyUndefinedRole", p0, p1 );
+        }
+
+        public static string BadParameterDirection (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("BadParameterDirection", p0, p1, p2, p3 );
+        }
+
+        public static string BadParameterDirectionForComposableFunctions (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("BadParameterDirectionForComposableFunctions", p0, p1, p2, p3 );
+        }
+
+        public static string BadPrecisionAndScale (object p0, object p1)
+        {
+            return SR.GetString ("BadPrecisionAndScale", p0, p1 );
+        }
+
+        public static string BetweenLimitsTypesAreNotCompatible (object p0, object p1)
+        {
+            return SR.GetString ("BetweenLimitsTypesAreNotCompatible", p0, p1 );
+        }
+
+        public static string BetweenLimitsTypesAreNotOrderComparable (object p0, object p1)
+        {
+            return SR.GetString ("BetweenLimitsTypesAreNotOrderComparable", p0, p1 );
+        }
+
+        public static string BetweenValueIsNotOrderComparable (object p0, object p1)
+        {
+            return SR.GetString ("BetweenValueIsNotOrderComparable", p0, p1 );
+        }
+
+        public static string BothMinAndMaxValueMustBeSpecifiedForNonConstantFacet (object p0, object p1)
+        {
+            return SR.GetString ("BothMinAndMaxValueMustBeSpecifiedForNonConstantFacet", p0, p1 );
+        }
+
+        public static string CannotCallNoncomposableFunction (object p0)
+        {
+            return SR.GetString ("CannotCallNoncomposableFunction", p0 );
+        }
+
+        public static string CannotConvertNumericLiteral (object p0, object p1)
+        {
+            return SR.GetString ("CannotConvertNumericLiteral", p0, p1 );
+        }
+
+        public static string CannotInstantiateAbstractType (object p0)
+        {
+            return SR.GetString ("CannotInstantiateAbstractType", p0 );
+        }
+
+        public static string CannotResolveNameToTypeOrFunction (object p0)
+        {
+            return SR.GetString ("CannotResolveNameToTypeOrFunction", p0 );
+        }
+
+        public static string CannotUseSystemNamespaceAsAlias (object p0)
+        {
+            return SR.GetString ("CannotUseSystemNamespaceAsAlias", p0 );
+        }
+
+        public static string CheckArgumentContainsNullFailed (object p0)
+        {
+            return SR.GetString ("CheckArgumentContainsNullFailed", p0 );
+        }
+
+        public static string CodeGen_ConstructorNoParameterless (object p0)
+        {
+            return SR.GetString ("CodeGen_ConstructorNoParameterless", p0 );
+        }
+
+        public static string Collections_CannotFillTryDifferentMergeOption (object p0, object p1)
+        {
+            return SR.GetString ("Collections_CannotFillTryDifferentMergeOption", p0, p1 );
+        }
+
+        public static string Collections_ExpectedCollectionGotReference (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Collections_ExpectedCollectionGotReference", p0, p1, p2 );
+        }
+
+        public static string Collections_InvalidEntityStateLoad (object p0)
+        {
+            return SR.GetString ("Collections_InvalidEntityStateLoad", p0 );
+        }
+
+        public static string Collections_NoRelationshipSetMatched (object p0)
+        {
+            return SR.GetString ("Collections_NoRelationshipSetMatched", p0 );
+        }
+
+        public static string CompiledELinq_UnsupportedNamedParameterType (object p0, object p1)
+        {
+            return SR.GetString ("CompiledELinq_UnsupportedNamedParameterType", p0, p1 );
+        }
+
+        public static string CompiledELinq_UnsupportedNamedParameterUseAsType (object p0, object p1)
+        {
+            return SR.GetString ("CompiledELinq_UnsupportedNamedParameterUseAsType", p0, p1 );
+        }
+
+        public static string CompiledELinq_UnsupportedParameterTypes (object p0)
+        {
+            return SR.GetString ("CompiledELinq_UnsupportedParameterTypes", p0 );
+        }
+
+        public static string ComplexObject_ComplexChangeRequestedOnScalarProperty (object p0)
+        {
+            return SR.GetString ("ComplexObject_ComplexChangeRequestedOnScalarProperty", p0 );
+        }
+
+        public static string ComplexObject_NullableComplexTypesNotSupported (object p0)
+        {
+            return SR.GetString ("ComplexObject_NullableComplexTypesNotSupported", p0 );
+        }
+
+        public static string ComplexTypeAsReturnTypeAndDefinedEntitySet (object p0, object p1)
+        {
+            return SR.GetString ("ComplexTypeAsReturnTypeAndDefinedEntitySet", p0, p1 );
+        }
+
+        public static string ComplexTypeAsReturnTypeAndNestedComplexProperty (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ComplexTypeAsReturnTypeAndNestedComplexProperty", p0, p1, p2 );
+        }
+
+        public static string ConcurrencyRedefinedOnSubTypeOfEntitySetType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ConcurrencyRedefinedOnSubTypeOfEntitySetType", p0, p1, p2 );
+        }
+
+        public static string ConstantFacetSpecifiedInSchema (object p0, object p1)
+        {
+            return SR.GetString ("ConstantFacetSpecifiedInSchema", p0, p1 );
+        }
+
+        public static string CouldNotResolveIdentifier (object p0)
+        {
+            return SR.GetString ("CouldNotResolveIdentifier", p0 );
+        }
+
+        public static string Cqt_Arithmetic_InvalidUnsignedTypeForUnaryMinus (object p0)
+        {
+            return SR.GetString ("Cqt_Arithmetic_InvalidUnsignedTypeForUnaryMinus", p0 );
+        }
+
+        public static string Cqt_Binary_CollectionsRequired (object p0)
+        {
+            return SR.GetString ("Cqt_Binary_CollectionsRequired", p0 );
+        }
+
+        public static string Cqt_Cast_InvalidCast (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_Cast_InvalidCast", p0, p1 );
+        }
+
+        public static string Cqt_CommandTree_InvalidParameterName (object p0)
+        {
+            return SR.GetString ("Cqt_CommandTree_InvalidParameterName", p0 );
+        }
+
+        public static string Cqt_Constant_ClrEnumTypeDoesNotMatchEdmEnumType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Cqt_Constant_ClrEnumTypeDoesNotMatchEdmEnumType", p0, p1, p2 );
+        }
+
+        public static string Cqt_Constant_InvalidConstantType (object p0)
+        {
+            return SR.GetString ("Cqt_Constant_InvalidConstantType", p0 );
+        }
+
+        public static string Cqt_Constant_InvalidValueForType (object p0)
+        {
+            return SR.GetString ("Cqt_Constant_InvalidValueForType", p0 );
+        }
+
+        public static string Cqt_Copier_EndNotFound (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_Copier_EndNotFound", p0, p1 );
+        }
+
+        public static string Cqt_Copier_EntityContainerNotFound (object p0)
+        {
+            return SR.GetString ("Cqt_Copier_EntityContainerNotFound", p0 );
+        }
+
+        public static string Cqt_Copier_EntitySetNotFound (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_Copier_EntitySetNotFound", p0, p1 );
+        }
+
+        public static string Cqt_Copier_FunctionNotFound (object p0)
+        {
+            return SR.GetString ("Cqt_Copier_FunctionNotFound", p0 );
+        }
+
+        public static string Cqt_Copier_NavPropertyNotFound (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_Copier_NavPropertyNotFound", p0, p1 );
+        }
+
+        public static string Cqt_Copier_PropertyNotFound (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_Copier_PropertyNotFound", p0, p1 );
+        }
+
+        public static string Cqt_Copier_TypeNotFound (object p0)
+        {
+            return SR.GetString ("Cqt_Copier_TypeNotFound", p0 );
+        }
+
+        public static string Cqt_CrossJoin_DuplicateVariableNames (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Cqt_CrossJoin_DuplicateVariableNames", p0, p1, p2 );
+        }
+
+        public static string Cqt_ExpressionLink_TypeMismatch (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_ExpressionLink_TypeMismatch", p0, p1 );
+        }
+
+        public static string Cqt_Factory_MethodResultTypeNotSupported (object p0)
+        {
+            return SR.GetString ("Cqt_Factory_MethodResultTypeNotSupported", p0 );
+        }
+
+        public static string Cqt_Factory_NoSuchProperty (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_Factory_NoSuchProperty", p0, p1 );
+        }
+
+        public static string Cqt_Function_CanonicalFunction_AmbiguousMatch (object p0)
+        {
+            return SR.GetString ("Cqt_Function_CanonicalFunction_AmbiguousMatch", p0 );
+        }
+
+        public static string Cqt_Function_CanonicalFunction_NotFound (object p0)
+        {
+            return SR.GetString ("Cqt_Function_CanonicalFunction_NotFound", p0 );
+        }
+
+        public static string Cqt_General_PolymorphicArgRequired (object p0)
+        {
+            return SR.GetString ("Cqt_General_PolymorphicArgRequired", p0 );
+        }
+
+        public static string Cqt_General_PolymorphicTypeRequired (object p0)
+        {
+            return SR.GetString ("Cqt_General_PolymorphicTypeRequired", p0 );
+        }
+
+        public static string Cqt_General_UnsupportedExpression (object p0)
+        {
+            return SR.GetString ("Cqt_General_UnsupportedExpression", p0 );
+        }
+
+        public static string Cqt_GroupBy_AggregateColumnExistsAsGroupColumn (object p0)
+        {
+            return SR.GetString ("Cqt_GroupBy_AggregateColumnExistsAsGroupColumn", p0 );
+        }
+
+        public static string Cqt_GroupBy_KeyNotEqualityComparable (object p0)
+        {
+            return SR.GetString ("Cqt_GroupBy_KeyNotEqualityComparable", p0 );
+        }
+
+        public static string Cqt_InvalidTypeForSetOperation (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_InvalidTypeForSetOperation", p0, p1 );
+        }
+
+        public static string Cqt_NewInstance_CannotInstantiateAbstractType (object p0)
+        {
+            return SR.GetString ("Cqt_NewInstance_CannotInstantiateAbstractType", p0 );
+        }
+
+        public static string Cqt_NewInstance_CannotInstantiateMemberlessType (object p0)
+        {
+            return SR.GetString ("Cqt_NewInstance_CannotInstantiateMemberlessType", p0 );
+        }
+
+        public static string Cqt_RelNav_WrongSourceType (object p0)
+        {
+            return SR.GetString ("Cqt_RelNav_WrongSourceType", p0 );
+        }
+
+        public static string Cqt_UDF_FunctionDefinitionGenerationFailed (object p0)
+        {
+            return SR.GetString ("Cqt_UDF_FunctionDefinitionGenerationFailed", p0 );
+        }
+
+        public static string Cqt_UDF_FunctionDefinitionResultTypeMismatch (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Cqt_UDF_FunctionDefinitionResultTypeMismatch", p0, p1, p2 );
+        }
+
+        public static string Cqt_UDF_FunctionDefinitionWithCircularReference (object p0)
+        {
+            return SR.GetString ("Cqt_UDF_FunctionDefinitionWithCircularReference", p0 );
+        }
+
+        public static string Cqt_UDF_FunctionHasNoDefinition (object p0)
+        {
+            return SR.GetString ("Cqt_UDF_FunctionHasNoDefinition", p0 );
+        }
+
+        public static string Cqt_Unary_CollectionRequired (object p0)
+        {
+            return SR.GetString ("Cqt_Unary_CollectionRequired", p0 );
+        }
+
+        public static string Cqt_Util_CheckListDuplicateName (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Cqt_Util_CheckListDuplicateName", p0, p1, p2 );
+        }
+
+        public static string Cqt_Validator_InvalidIncompatibleParameterReferences (object p0)
+        {
+            return SR.GetString ("Cqt_Validator_InvalidIncompatibleParameterReferences", p0 );
+        }
+
+        public static string Cqt_Validator_InvalidIncorrectDataSpaceMetadata (object p0, object p1)
+        {
+            return SR.GetString ("Cqt_Validator_InvalidIncorrectDataSpaceMetadata", p0, p1 );
+        }
+
+        public static string Cqt_Validator_InvalidOtherWorkspaceMetadata (object p0)
+        {
+            return SR.GetString ("Cqt_Validator_InvalidOtherWorkspaceMetadata", p0 );
+        }
+
+        public static string Cqt_Validator_VarRefInvalid (object p0)
+        {
+            return SR.GetString ("Cqt_Validator_VarRefInvalid", p0 );
+        }
+
+        public static string Cqt_Validator_VarRefTypeMismatch (object p0)
+        {
+            return SR.GetString ("Cqt_Validator_VarRefTypeMismatch", p0 );
+        }
+
+        public static string CreateRefTypeIdentifierMustBeASubOrSuperType (object p0, object p1)
+        {
+            return SR.GetString ("CreateRefTypeIdentifierMustBeASubOrSuperType", p0, p1 );
+        }
+
+        public static string CreateRefTypeIdentifierMustSpecifyAnEntityType (object p0, object p1)
+        {
+            return SR.GetString ("CreateRefTypeIdentifierMustSpecifyAnEntityType", p0, p1 );
+        }
+
+        public static string CtxFunction (object p0)
+        {
+            return SR.GetString ("CtxFunction", p0 );
+        }
+
+        public static string CtxTypeCtor (object p0)
+        {
+            return SR.GetString ("CtxTypeCtor", p0 );
+        }
+
+        public static string CycleInTypeHierarchy (object p0)
+        {
+            return SR.GetString ("CycleInTypeHierarchy", p0 );
+        }
+
+        public static string DeRefArgIsNotOfRefType (object p0)
+        {
+            return SR.GetString ("DeRefArgIsNotOfRefType", p0 );
+        }
+
+        public static string DifferentSchemaVersionInCollection (object p0, object p1, object p2)
+        {
+            return SR.GetString ("DifferentSchemaVersionInCollection", p0, p1, p2 );
+        }
+
+        public static string DuplicateAnnotation (object p0, object p1)
+        {
+            return SR.GetString ("DuplicateAnnotation", p0, p1 );
+        }
+
+        public static string DuplicatedFunctionoverloads (object p0, object p1)
+        {
+            return SR.GetString ("DuplicatedFunctionoverloads", p0, p1 );
+        }
+
+        public static string DuplicatedInlineFunctionOverload (object p0)
+        {
+            return SR.GetString ("DuplicatedInlineFunctionOverload", p0 );
+        }
+
+        public static string DuplicateEndName (object p0)
+        {
+            return SR.GetString ("DuplicateEndName", p0 );
+        }
+
+        public static string DuplicateEntityContainerMemberName (object p0)
+        {
+            return SR.GetString ("DuplicateEntityContainerMemberName", p0 );
+        }
+
+        public static string DuplicateEntitySetTable (object p0, object p1, object p2)
+        {
+            return SR.GetString ("DuplicateEntitySetTable", p0, p1, p2 );
+        }
+
+        public static string DuplicateMemberName (object p0, object p1, object p2)
+        {
+            return SR.GetString ("DuplicateMemberName", p0, p1, p2 );
+        }
+
+        public static string DuplicateMemberNameInExtendedEntityContainer (object p0, object p1, object p2)
+        {
+            return SR.GetString ("DuplicateMemberNameInExtendedEntityContainer", p0, p1, p2 );
+        }
+
+        public static string DuplicatePropertyNameSpecifiedInEntityKey (object p0, object p1)
+        {
+            return SR.GetString ("DuplicatePropertyNameSpecifiedInEntityKey", p0, p1 );
+        }
+
+        public static string DuplicationOperation (object p0)
+        {
+            return SR.GetString ("DuplicationOperation", p0 );
+        }
+
+        public static string EdmVersionNotSupportedByRuntime (object p0, object p1)
+        {
+            return SR.GetString ("EdmVersionNotSupportedByRuntime", p0, p1 );
+        }
+
+        public static string ELinq_EdmFunctionAttributedFunctionWithWrongReturnType (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_EdmFunctionAttributedFunctionWithWrongReturnType", p0, p1 );
+        }
+
+        public static string ELinq_EdmFunctionAttributeParameterNameNotValid (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ELinq_EdmFunctionAttributeParameterNameNotValid", p0, p1, p2 );
+        }
+
+        public static string ELinq_InvalidOfTypeResult (object p0)
+        {
+            return SR.GetString ("ELinq_InvalidOfTypeResult", p0 );
+        }
+
+        public static string ELinq_NotPropertyOrField (object p0)
+        {
+            return SR.GetString ("ELinq_NotPropertyOrField", p0 );
+        }
+
+        public static string ELinq_UnboundParameterExpression (object p0)
+        {
+            return SR.GetString ("ELinq_UnboundParameterExpression", p0 );
+        }
+
+        public static string ELinq_UnexpectedTypeForNavigationProperty (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("ELinq_UnexpectedTypeForNavigationProperty", p0, p1, p2, p3 );
+        }
+
+        public static string ELinq_UnhandledBindingType (object p0)
+        {
+            return SR.GetString ("ELinq_UnhandledBindingType", p0 );
+        }
+
+        public static string ELinq_UnhandledExpressionType (object p0)
+        {
+            return SR.GetString ("ELinq_UnhandledExpressionType", p0 );
+        }
+
+        public static string ELinq_UnrecognizedMember (object p0)
+        {
+            return SR.GetString ("ELinq_UnrecognizedMember", p0 );
+        }
+
+        public static string ELinq_UnresolvableFunctionForExpression (object p0)
+        {
+            return SR.GetString ("ELinq_UnresolvableFunctionForExpression", p0 );
+        }
+
+        public static string ELinq_UnresolvableFunctionForMember (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnresolvableFunctionForMember", p0, p1 );
+        }
+
+        public static string ELinq_UnresolvableFunctionForMethod (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnresolvableFunctionForMethod", p0, p1 );
+        }
+
+        public static string ELinq_UnresolvableFunctionForMethodAmbiguousMatch (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnresolvableFunctionForMethodAmbiguousMatch", p0, p1 );
+        }
+
+        public static string ELinq_UnresolvableFunctionForMethodNotFound (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnresolvableFunctionForMethodNotFound", p0, p1 );
+        }
+
+        public static string ELinq_UnresolvableStoreFunctionForExpression (object p0)
+        {
+            return SR.GetString ("ELinq_UnresolvableStoreFunctionForExpression", p0 );
+        }
+
+        public static string ELinq_UnresolvableStoreFunctionForMember (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnresolvableStoreFunctionForMember", p0, p1 );
+        }
+
+        public static string ELinq_UnsupportedAsUnicodeAndAsNonUnicode (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedAsUnicodeAndAsNonUnicode", p0 );
+        }
+
+        public static string ELinq_UnsupportedCast (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnsupportedCast", p0, p1 );
+        }
+
+        public static string ELinq_UnsupportedComparison (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedComparison", p0 );
+        }
+
+        public static string ELinq_UnsupportedConstant (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedConstant", p0 );
+        }
+
+        public static string ELinq_UnsupportedEnumerableType (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedEnumerableType", p0 );
+        }
+
+        public static string ELinq_UnsupportedExpressionType (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedExpressionType", p0 );
+        }
+
+        public static string ELinq_UnsupportedHeterogeneousInitializers (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedHeterogeneousInitializers", p0 );
+        }
+
+        public static string ELinq_UnsupportedIsOrAs (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ELinq_UnsupportedIsOrAs", p0, p1, p2 );
+        }
+
+        public static string ELinq_UnsupportedKeySelector (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedKeySelector", p0 );
+        }
+
+        public static string ELinq_UnsupportedMethod (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedMethod", p0 );
+        }
+
+        public static string ELinq_UnsupportedMethodSuggestedAlternative (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnsupportedMethodSuggestedAlternative", p0, p1 );
+        }
+
+        public static string ELinq_UnsupportedNominalType (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedNominalType", p0 );
+        }
+
+        public static string ELinq_UnsupportedNullConstant (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedNullConstant", p0 );
+        }
+
+        public static string ELinq_UnsupportedPassthrough (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnsupportedPassthrough", p0, p1 );
+        }
+
+        public static string ELinq_UnsupportedRefComparison (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnsupportedRefComparison", p0, p1 );
+        }
+
+        public static string ELinq_UnsupportedRowComparison (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedRowComparison", p0 );
+        }
+
+        public static string ELinq_UnsupportedRowMemberComparison (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedRowMemberComparison", p0 );
+        }
+
+        public static string ELinq_UnsupportedRowTypeComparison (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedRowTypeComparison", p0 );
+        }
+
+        public static string ELinq_UnsupportedStringRemoveCase (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnsupportedStringRemoveCase", p0, p1 );
+        }
+
+        public static string ELinq_UnsupportedTrimStartTrimEndCase (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedTrimStartTrimEndCase", p0 );
+        }
+
+        public static string ELinq_UnsupportedType (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedType", p0 );
+        }
+
+        public static string ELinq_UnsupportedUseOfContextParameter (object p0)
+        {
+            return SR.GetString ("ELinq_UnsupportedUseOfContextParameter", p0 );
+        }
+
+        public static string ELinq_UnsupportedVBDatePartInvalidInterval (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ELinq_UnsupportedVBDatePartInvalidInterval", p0, p1, p2 );
+        }
+
+        public static string ELinq_UnsupportedVBDatePartNonConstantInterval (object p0, object p1)
+        {
+            return SR.GetString ("ELinq_UnsupportedVBDatePartNonConstantInterval", p0, p1 );
+        }
+
+        public static string EmptyFile (object p0)
+        {
+            return SR.GetString ("EmptyFile", p0 );
+        }
+
+        public static string EmptyName (object p0)
+        {
+            return SR.GetString ("EmptyName", p0 );
+        }
+
+        public static string EndNameAlreadyDefinedDuplicate (object p0)
+        {
+            return SR.GetString ("EndNameAlreadyDefinedDuplicate", p0 );
+        }
+
+        public static string EndWithManyMultiplicityCannotHaveOperationsSpecified (object p0, object p1)
+        {
+            return SR.GetString ("EndWithManyMultiplicityCannotHaveOperationsSpecified", p0, p1 );
+        }
+
+        public static string EndWithoutMultiplicity (object p0, object p1)
+        {
+            return SR.GetString ("EndWithoutMultiplicity", p0, p1 );
+        }
+
+        public static string EntityClient_ConnectionStringMissingInfo (object p0)
+        {
+            return SR.GetString ("EntityClient_ConnectionStringMissingInfo", p0 );
+        }
+
+        public static string EntityClient_DbConnectionHasNoProvider (object p0)
+        {
+            return SR.GetString ("EntityClient_DbConnectionHasNoProvider", p0 );
+        }
+
+        public static string EntityClient_DoesNotImplementIServiceProvider (object p0)
+        {
+            return SR.GetString ("EntityClient_DoesNotImplementIServiceProvider", p0 );
+        }
+
+        public static string EntityClient_DuplicateParameterNames (object p0)
+        {
+            return SR.GetString ("EntityClient_DuplicateParameterNames", p0 );
+        }
+
+        public static string EntityClient_EntityParameterEdmTypeNotScalar (object p0)
+        {
+            return SR.GetString ("EntityClient_EntityParameterEdmTypeNotScalar", p0 );
+        }
+
+        public static string EntityClient_EntityParameterInconsistentEdmType (object p0, object p1)
+        {
+            return SR.GetString ("EntityClient_EntityParameterInconsistentEdmType", p0, p1 );
+        }
+
+        public static string EntityClient_ExecutingOnClosedConnection (object p0)
+        {
+            return SR.GetString ("EntityClient_ExecutingOnClosedConnection", p0 );
+        }
+
+        public static string EntityClient_FailedToGetInformation (object p0)
+        {
+            return SR.GetString ("EntityClient_FailedToGetInformation", p0 );
+        }
+
+        public static string EntityClient_FunctionImportMustBeNonComposable (object p0)
+        {
+            return SR.GetString ("EntityClient_FunctionImportMustBeNonComposable", p0 );
+        }
+
+        public static string EntityClient_IncompatibleNavigationPropertyResult (object p0, object p1)
+        {
+            return SR.GetString ("EntityClient_IncompatibleNavigationPropertyResult", p0, p1 );
+        }
+
+        public static string EntityClient_InvalidParameterDirection (object p0)
+        {
+            return SR.GetString ("EntityClient_InvalidParameterDirection", p0 );
+        }
+
+        public static string EntityClient_InvalidParameterName (object p0)
+        {
+            return SR.GetString ("EntityClient_InvalidParameterName", p0 );
+        }
+
+        public static string EntityClient_ItemCollectionsNotRegisteredInWorkspace (object p0)
+        {
+            return SR.GetString ("EntityClient_ItemCollectionsNotRegisteredInWorkspace", p0 );
+        }
+
+        public static string EntityClient_KeywordNotSupported (object p0)
+        {
+            return SR.GetString ("EntityClient_KeywordNotSupported", p0 );
+        }
+
+        public static string EntityClient_NestedNamedConnection (object p0)
+        {
+            return SR.GetString ("EntityClient_NestedNamedConnection", p0 );
+        }
+
+        public static string EntityClient_ProviderSpecificError (object p0)
+        {
+            return SR.GetString ("EntityClient_ProviderSpecificError", p0 );
+        }
+
+        public static string EntityClient_ReturnedNullOnProviderMethod (object p0, object p1)
+        {
+            return SR.GetString ("EntityClient_ReturnedNullOnProviderMethod", p0, p1 );
+        }
+
+        public static string EntityClient_UnableToFindFunctionImport (object p0, object p1)
+        {
+            return SR.GetString ("EntityClient_UnableToFindFunctionImport", p0, p1 );
+        }
+
+        public static string EntityClient_UnableToFindFunctionImportContainer (object p0)
+        {
+            return SR.GetString ("EntityClient_UnableToFindFunctionImportContainer", p0 );
+        }
+
+        public static string EntityClient_UnknownParameterType (object p0)
+        {
+            return SR.GetString ("EntityClient_UnknownParameterType", p0 );
+        }
+
+        public static string EntityClient_UnmappedFunctionImport (object p0)
+        {
+            return SR.GetString ("EntityClient_UnmappedFunctionImport", p0 );
+        }
+
+        public static string EntityClient_UnsupportedDbType (object p0, object p1)
+        {
+            return SR.GetString ("EntityClient_UnsupportedDbType", p0, p1 );
+        }
+
+        public static string EntityContainerAlreadyExists (object p0)
+        {
+            return SR.GetString ("EntityContainerAlreadyExists", p0 );
+        }
+
+        public static string EntityContainerCannotExtendItself (object p0)
+        {
+            return SR.GetString ("EntityContainerCannotExtendItself", p0 );
+        }
+
+        public static string EntityKey_DoesntMatchKeyOnEntity (object p0)
+        {
+            return SR.GetString ("EntityKey_DoesntMatchKeyOnEntity", p0 );
+        }
+
+        public static string EntityKey_EntitySetDoesNotMatch (object p0)
+        {
+            return SR.GetString ("EntityKey_EntitySetDoesNotMatch", p0 );
+        }
+
+        public static string EntityKey_EntityTypesDoNotMatch (object p0, object p1)
+        {
+            return SR.GetString ("EntityKey_EntityTypesDoNotMatch", p0, p1 );
+        }
+
+        public static string EntityKey_IncorrectNumberOfKeyValuePairs (object p0, object p1, object p2)
+        {
+            return SR.GetString ("EntityKey_IncorrectNumberOfKeyValuePairs", p0, p1, p2 );
+        }
+
+        public static string EntityKey_IncorrectValueType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("EntityKey_IncorrectValueType", p0, p1, p2 );
+        }
+
+        public static string EntityKey_InvalidName (object p0)
+        {
+            return SR.GetString ("EntityKey_InvalidName", p0 );
+        }
+
+        public static string EntityKey_MissingKeyValue (object p0, object p1)
+        {
+            return SR.GetString ("EntityKey_MissingKeyValue", p0, p1 );
+        }
+
+        public static string EntityKey_NoCorrespondingOSpaceTypeForEnumKeyMember (object p0, object p1)
+        {
+            return SR.GetString ("EntityKey_NoCorrespondingOSpaceTypeForEnumKeyMember", p0, p1 );
+        }
+
+        public static string EntityKey_NullKeyValue (object p0, object p1)
+        {
+            return SR.GetString ("EntityKey_NullKeyValue", p0, p1 );
+        }
+
+        public static string EntityKeyMustBeScalar (object p0, object p1)
+        {
+            return SR.GetString ("EntityKeyMustBeScalar", p0, p1 );
+        }
+
+        public static string EntityKeyTypeCurrentlyNotSupported (object p0, object p1, object p2)
+        {
+            return SR.GetString ("EntityKeyTypeCurrentlyNotSupported", p0, p1, p2 );
+        }
+
+        public static string EntityKeyTypeCurrentlyNotSupportedInSSDL (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("EntityKeyTypeCurrentlyNotSupportedInSSDL", p0, p1, p2, p3, p4 );
+        }
+
+        public static string EntityParameterCollectionInvalidIndex (object p0, object p1)
+        {
+            return SR.GetString ("EntityParameterCollectionInvalidIndex", p0, p1 );
+        }
+
+        public static string EntityParameterCollectionInvalidParameterName (object p0)
+        {
+            return SR.GetString ("EntityParameterCollectionInvalidParameterName", p0 );
+        }
+
+        public static string EntityProxyTypeInfo_CannotSetEntityCollectionProperty (object p0, object p1)
+        {
+            return SR.GetString ("EntityProxyTypeInfo_CannotSetEntityCollectionProperty", p0, p1 );
+        }
+
+        public static string EntityProxyTypeInfo_DuplicateOSpaceType (object p0)
+        {
+            return SR.GetString ("EntityProxyTypeInfo_DuplicateOSpaceType", p0 );
+        }
+
+        public static string EntityProxyTypeInfo_ProxyMetadataIsUnavailable (object p0)
+        {
+            return SR.GetString ("EntityProxyTypeInfo_ProxyMetadataIsUnavailable", p0 );
+        }
+
+        public static string EntityReference_CannotAddMoreThanOneEntityToEntityReference (object p0, object p1)
+        {
+            return SR.GetString ("EntityReference_CannotAddMoreThanOneEntityToEntityReference", p0, p1 );
+        }
+
+        public static string EntityReference_ExpectedReferenceGotCollection (object p0, object p1, object p2)
+        {
+            return SR.GetString ("EntityReference_ExpectedReferenceGotCollection", p0, p1, p2 );
+        }
+
+        public static string EntitySetNotInCSPace (object p0)
+        {
+            return SR.GetString ("EntitySetNotInCSPace", p0 );
+        }
+
+        public static string EntitySetTypeHasNoKeys (object p0, object p1)
+        {
+            return SR.GetString ("EntitySetTypeHasNoKeys", p0, p1 );
+        }
+
+        public static string EnumMemberValueOutOfItsUnderylingTypeRange (object p0, object p1, object p2)
+        {
+            return SR.GetString ("EnumMemberValueOutOfItsUnderylingTypeRange", p0, p1, p2 );
+        }
+
+        public static string ExpressionTypeMustBeEntityType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ExpressionTypeMustBeEntityType", p0, p1, p2 );
+        }
+
+        public static string ExpressionTypeMustBeNominalType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ExpressionTypeMustBeNominalType", p0, p1, p2 );
+        }
+
+        public static string FacetNotAllowed (object p0, object p1)
+        {
+            return SR.GetString ("FacetNotAllowed", p0, p1 );
+        }
+
+        public static string FacetsOnNonScalarType (object p0)
+        {
+            return SR.GetString ("FacetsOnNonScalarType", p0 );
+        }
+
+        public static string FailedToFindClrTypeMapping (object p0)
+        {
+            return SR.GetString ("FailedToFindClrTypeMapping", p0 );
+        }
+
+        public static string FailedToFindCSpaceTypeMapping (object p0)
+        {
+            return SR.GetString ("FailedToFindCSpaceTypeMapping", p0 );
+        }
+
+        public static string FailedToFindOSpaceTypeMapping (object p0)
+        {
+            return SR.GetString ("FailedToFindOSpaceTypeMapping", p0 );
+        }
+
+        public static string FailedToResolveAggregateFunction (object p0)
+        {
+            return SR.GetString ("FailedToResolveAggregateFunction", p0 );
+        }
+
+        public static string FunctionImportCollectionAndRefParametersNotAllowed (object p0)
+        {
+            return SR.GetString ("FunctionImportCollectionAndRefParametersNotAllowed", p0 );
+        }
+
+        public static string FunctionImportComposableAndSideEffectingNotAllowed (object p0)
+        {
+            return SR.GetString ("FunctionImportComposableAndSideEffectingNotAllowed", p0 );
+        }
+
+        public static string FunctionImportEntitySetAndEntitySetPathDeclared (object p0)
+        {
+            return SR.GetString ("FunctionImportEntitySetAndEntitySetPathDeclared", p0 );
+        }
+
+        public static string FunctionImportEntityTypeDoesNotMatchEntitySet (object p0, object p1, object p2)
+        {
+            return SR.GetString ("FunctionImportEntityTypeDoesNotMatchEntitySet", p0, p1, p2 );
+        }
+
+        public static string FunctionImportNonNullableParametersNotAllowed (object p0)
+        {
+            return SR.GetString ("FunctionImportNonNullableParametersNotAllowed", p0 );
+        }
+
+        public static string FunctionImportReturnEntitiesButDoesNotSpecifyEntitySet (object p0)
+        {
+            return SR.GetString ("FunctionImportReturnEntitiesButDoesNotSpecifyEntitySet", p0 );
+        }
+
+        public static string FunctionImportSpecifiesEntitySetButNotEntityType (object p0)
+        {
+            return SR.GetString ("FunctionImportSpecifiesEntitySetButNotEntityType", p0 );
+        }
+
+        public static string FunctionImportUnknownEntitySet (object p0, object p1)
+        {
+            return SR.GetString ("FunctionImportUnknownEntitySet", p0, p1 );
+        }
+
+        public static string FunctionImportWithUnsupportedReturnTypeV1 (object p0)
+        {
+            return SR.GetString ("FunctionImportWithUnsupportedReturnTypeV1", p0 );
+        }
+
+        public static string FunctionImportWithUnsupportedReturnTypeV1_1 (object p0)
+        {
+            return SR.GetString ("FunctionImportWithUnsupportedReturnTypeV1_1", p0 );
+        }
+
+        public static string FunctionImportWithUnsupportedReturnTypeV2 (object p0)
+        {
+            return SR.GetString ("FunctionImportWithUnsupportedReturnTypeV2", p0 );
+        }
+
+        public static string FunctionWithNonEdmPrimitiveTypeNotSupported (object p0, object p1)
+        {
+            return SR.GetString ("FunctionWithNonEdmPrimitiveTypeNotSupported", p0, p1 );
+        }
+
+        public static string FunctionWithNonPrimitiveTypeNotSupported (object p0, object p1)
+        {
+            return SR.GetString ("FunctionWithNonPrimitiveTypeNotSupported", p0, p1 );
+        }
+
+        public static string GeneralExceptionAsQueryInnerException (object p0)
+        {
+            return SR.GetString ("GeneralExceptionAsQueryInnerException", p0 );
+        }
+
+        public static string Generated_View_Type_Super_Class (object p0)
+        {
+            return SR.GetString ("Generated_View_Type_Super_Class", p0 );
+        }
+
+        public static string Generated_Views_Invalid_Extent (object p0)
+        {
+            return SR.GetString ("Generated_Views_Invalid_Extent", p0 );
+        }
+
+        public static string GenericTypeNotSupported (object p0)
+        {
+            return SR.GetString ("GenericTypeNotSupported", p0 );
+        }
+
+        public static string InferRelationshipEndAmbiguous (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("InferRelationshipEndAmbiguous", p0, p1, p2, p3, p4 );
+        }
+
+        public static string InferRelationshipEndFailedNoEntitySetMatch (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("InferRelationshipEndFailedNoEntitySetMatch", p0, p1, p2, p3, p4 );
+        }
+
+        public static string InferRelationshipEndGivesAlreadyDefinedEnd (object p0, object p1)
+        {
+            return SR.GetString ("InferRelationshipEndGivesAlreadyDefinedEnd", p0, p1 );
+        }
+
+        public static string InvalidAction (object p0, object p1)
+        {
+            return SR.GetString ("InvalidAction", p0, p1 );
+        }
+
+        public static string InvalidAliasName (object p0)
+        {
+            return SR.GetString ("InvalidAliasName", p0 );
+        }
+
+        public static string InvalidAssociationTypeForUnion (object p0)
+        {
+            return SR.GetString ("InvalidAssociationTypeForUnion", p0 );
+        }
+
+        public static string InvalidBaseTypeForItemType (object p0, object p1)
+        {
+            return SR.GetString ("InvalidBaseTypeForItemType", p0, p1 );
+        }
+
+        public static string InvalidBaseTypeForNestedType (object p0, object p1)
+        {
+            return SR.GetString ("InvalidBaseTypeForNestedType", p0, p1 );
+        }
+
+        public static string InvalidBaseTypeForStructuredType (object p0, object p1)
+        {
+            return SR.GetString ("InvalidBaseTypeForStructuredType", p0, p1 );
+        }
+
+        public static string InvalidCast (object p0, object p1)
+        {
+            return SR.GetString ("InvalidCast", p0, p1 );
+        }
+
+        public static string InvalidCollectionForMapping (object p0)
+        {
+            return SR.GetString ("InvalidCollectionForMapping", p0 );
+        }
+
+        public static string InvalidCollectionSpecified (object p0)
+        {
+            return SR.GetString ("InvalidCollectionSpecified", p0 );
+        }
+
+        public static string InvalidComplexType (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("InvalidComplexType", p0, p1, p2, p3 );
+        }
+
+        public static string InvalidCtorArgumentType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidCtorArgumentType", p0, p1, p2 );
+        }
+
+        public static string InvalidCtorUseOnType (object p0)
+        {
+            return SR.GetString ("InvalidCtorUseOnType", p0 );
+        }
+
+        public static string InvalidDateTimeOffsetLiteral (object p0)
+        {
+            return SR.GetString ("InvalidDateTimeOffsetLiteral", p0 );
+        }
+
+        public static string InvalidDay (object p0, object p1)
+        {
+            return SR.GetString ("InvalidDay", p0, p1 );
+        }
+
+        public static string InvalidDayInMonth (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidDayInMonth", p0, p1, p2 );
+        }
+
+        public static string InvalidDefaultBinaryWithNoMaxLength (object p0)
+        {
+            return SR.GetString ("InvalidDefaultBinaryWithNoMaxLength", p0 );
+        }
+
+        public static string InvalidDefaultBoolean (object p0)
+        {
+            return SR.GetString ("InvalidDefaultBoolean", p0 );
+        }
+
+        public static string InvalidDefaultDateTime (object p0, object p1)
+        {
+            return SR.GetString ("InvalidDefaultDateTime", p0, p1 );
+        }
+
+        public static string InvalidDefaultDateTimeOffset (object p0, object p1)
+        {
+            return SR.GetString ("InvalidDefaultDateTimeOffset", p0, p1 );
+        }
+
+        public static string InvalidDefaultDecimal (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidDefaultDecimal", p0, p1, p2 );
+        }
+
+        public static string InvalidDefaultFloatingPoint (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidDefaultFloatingPoint", p0, p1, p2 );
+        }
+
+        public static string InvalidDefaultGuid (object p0)
+        {
+            return SR.GetString ("InvalidDefaultGuid", p0 );
+        }
+
+        public static string InvalidDefaultIntegral (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidDefaultIntegral", p0, p1, p2 );
+        }
+
+        public static string InvalidDefaultTime (object p0, object p1)
+        {
+            return SR.GetString ("InvalidDefaultTime", p0, p1 );
+        }
+
+        public static string InvalidDeRefProperty (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidDeRefProperty", p0, p1, p2 );
+        }
+
+        public static string InvalidEDMVersion (object p0)
+        {
+            return SR.GetString ("InvalidEDMVersion", p0 );
+        }
+
+        public static string InvalidEndEntitySetTypeMismatch (object p0)
+        {
+            return SR.GetString ("InvalidEndEntitySetTypeMismatch", p0 );
+        }
+
+        public static string InvalidEndRoleInRelationshipConstraint (object p0, object p1)
+        {
+            return SR.GetString ("InvalidEndRoleInRelationshipConstraint", p0, p1 );
+        }
+
+        public static string InvalidEntityContainerNameInExtends (object p0)
+        {
+            return SR.GetString ("InvalidEntityContainerNameInExtends", p0 );
+        }
+
+        public static string InvalidEntityEndName (object p0, object p1)
+        {
+            return SR.GetString ("InvalidEntityEndName", p0, p1 );
+        }
+
+        public static string InvalidEntityParameterType (object p0)
+        {
+            return SR.GetString ("InvalidEntityParameterType", p0 );
+        }
+
+        public static string InvalidEntityRootTypeArgument (object p0, object p1)
+        {
+            return SR.GetString ("InvalidEntityRootTypeArgument", p0, p1 );
+        }
+
+        public static string InvalidEntitySetName (object p0)
+        {
+            return SR.GetString ("InvalidEntitySetName", p0 );
+        }
+
+        public static string InvalidEntitySetNameReference (object p0, object p1)
+        {
+            return SR.GetString ("InvalidEntitySetNameReference", p0, p1 );
+        }
+
+        public static string InvalidEntitySetType (object p0)
+        {
+            return SR.GetString ("InvalidEntitySetType", p0 );
+        }
+
+        public static string InvalidEntityTypeArgument (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("InvalidEntityTypeArgument", p0, p1, p2, p3 );
+        }
+
+        public static string InvalidEscapedIdentifier (object p0)
+        {
+            return SR.GetString ("InvalidEscapedIdentifier", p0 );
+        }
+
+        public static string InvalidEscapedIdentifierUnbalanced (object p0)
+        {
+            return SR.GetString ("InvalidEscapedIdentifierUnbalanced", p0 );
+        }
+
+        public static string InvalidExpressionResolutionClass (object p0, object p1)
+        {
+            return SR.GetString ("InvalidExpressionResolutionClass", p0, p1 );
+        }
+
+        public static string InvalidFileExtension (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidFileExtension", p0, p1, p2 );
+        }
+
+        public static string InvalidFromPropertyInRelationshipConstraint (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidFromPropertyInRelationshipConstraint", p0, p1, p2 );
+        }
+
+        public static string InvalidGroupIdentifierReference (object p0)
+        {
+            return SR.GetString ("InvalidGroupIdentifierReference", p0 );
+        }
+
+        public static string InvalidHour (object p0, object p1)
+        {
+            return SR.GetString ("InvalidHour", p0, p1 );
+        }
+
+        public static string InvalidImplicitRelationshipFromEnd (object p0)
+        {
+            return SR.GetString ("InvalidImplicitRelationshipFromEnd", p0 );
+        }
+
+        public static string InvalidImplicitRelationshipToEnd (object p0)
+        {
+            return SR.GetString ("InvalidImplicitRelationshipToEnd", p0 );
+        }
+
+        public static string InvalidInExprArgs (object p0, object p1)
+        {
+            return SR.GetString ("InvalidInExprArgs", p0, p1 );
+        }
+
+        public static string InvalidKeyArgument (object p0)
+        {
+            return SR.GetString ("InvalidKeyArgument", p0 );
+        }
+
+        public static string InvalidKeyKeyDefinedInBaseClass (object p0, object p1)
+        {
+            return SR.GetString ("InvalidKeyKeyDefinedInBaseClass", p0, p1 );
+        }
+
+        public static string InvalidKeyMember (object p0)
+        {
+            return SR.GetString ("InvalidKeyMember", p0 );
+        }
+
+        public static string InvalidKeyNoProperty (object p0, object p1)
+        {
+            return SR.GetString ("InvalidKeyNoProperty", p0, p1 );
+        }
+
+        public static string InvalidKeyNullablePart (object p0, object p1)
+        {
+            return SR.GetString ("InvalidKeyNullablePart", p0, p1 );
+        }
+
+        public static string InvalidKeyTypeForCollation (object p0)
+        {
+            return SR.GetString ("InvalidKeyTypeForCollation", p0 );
+        }
+
+        public static string InvalidLiteralFormat (object p0, object p1)
+        {
+            return SR.GetString ("InvalidLiteralFormat", p0, p1 );
+        }
+
+        public static string InvalidMemberNameMatchesTypeName (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMemberNameMatchesTypeName", p0, p1 );
+        }
+
+        public static string InvalidMetadataMemberClassResolution (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidMetadataMemberClassResolution", p0, p1, p2 );
+        }
+
+        public static string InvalidMinute (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMinute", p0, p1 );
+        }
+
+        public static string InvalidMonth (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMonth", p0, p1 );
+        }
+
+        public static string InvalidMultiplicityFromRoleToPropertyNonNullableV1 (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMultiplicityFromRoleToPropertyNonNullableV1", p0, p1 );
+        }
+
+        public static string InvalidMultiplicityFromRoleToPropertyNonNullableV2 (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMultiplicityFromRoleToPropertyNonNullableV2", p0, p1 );
+        }
+
+        public static string InvalidMultiplicityFromRoleToPropertyNullableV1 (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMultiplicityFromRoleToPropertyNullableV1", p0, p1 );
+        }
+
+        public static string InvalidMultiplicityFromRoleUpperBoundMustBeOne (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMultiplicityFromRoleUpperBoundMustBeOne", p0, p1 );
+        }
+
+        public static string InvalidMultiplicityToRoleLowerBoundMustBeZero (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMultiplicityToRoleLowerBoundMustBeZero", p0, p1 );
+        }
+
+        public static string InvalidMultiplicityToRoleUpperBoundMustBeMany (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMultiplicityToRoleUpperBoundMustBeMany", p0, p1 );
+        }
+
+        public static string InvalidMultiplicityToRoleUpperBoundMustBeOne (object p0, object p1)
+        {
+            return SR.GetString ("InvalidMultiplicityToRoleUpperBoundMustBeOne", p0, p1 );
+        }
+
+        public static string InvalidName (object p0, object p1)
+        {
+            return SR.GetString ("InvalidName", p0, p1 );
+        }
+
+        public static string InvalidNamespaceInUsing (object p0)
+        {
+            return SR.GetString ("InvalidNamespaceInUsing", p0 );
+        }
+
+        public static string InvalidNamespaceOrAliasSpecified (object p0)
+        {
+            return SR.GetString ("InvalidNamespaceOrAliasSpecified", p0 );
+        }
+
+        public static string InvalidNullLiteralForNonNullableMember (object p0, object p1)
+        {
+            return SR.GetString ("InvalidNullLiteralForNonNullableMember", p0, p1 );
+        }
+
+        public static string InvalidNumberOfParametersForAggregateFunction (object p0)
+        {
+            return SR.GetString ("InvalidNumberOfParametersForAggregateFunction", p0 );
+        }
+
+        public static string InvalidParameterFormat (object p0)
+        {
+            return SR.GetString ("InvalidParameterFormat", p0 );
+        }
+
+        public static string InvalidParameterTypeForAggregateFunction (object p0, object p1)
+        {
+            return SR.GetString ("InvalidParameterTypeForAggregateFunction", p0, p1 );
+        }
+
+        public static string InvalidPlaceholderRootTypeArgument (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("InvalidPlaceholderRootTypeArgument", p0, p1, p2, p3 );
+        }
+
+        public static string InvalidPlaceholderTypeArgument (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("InvalidPlaceholderTypeArgument", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string InvalidPrimitiveTypeKind (object p0)
+        {
+            return SR.GetString ("InvalidPrimitiveTypeKind", p0 );
+        }
+
+        public static string InvalidPropertyInRelationshipConstraint (object p0, object p1)
+        {
+            return SR.GetString ("InvalidPropertyInRelationshipConstraint", p0, p1 );
+        }
+
+        public static string InvalidPropertyType (object p0)
+        {
+            return SR.GetString ("InvalidPropertyType", p0 );
+        }
+
+        public static string InvalidQueryResultType (object p0)
+        {
+            return SR.GetString ("InvalidQueryResultType", p0 );
+        }
+
+        public static string InvalidRelationshipEndMultiplicity (object p0, object p1)
+        {
+            return SR.GetString ("InvalidRelationshipEndMultiplicity", p0, p1 );
+        }
+
+        public static string InvalidRelationshipEndType (object p0, object p1)
+        {
+            return SR.GetString ("InvalidRelationshipEndType", p0, p1 );
+        }
+
+        public static string InvalidRelationshipMember (object p0, object p1)
+        {
+            return SR.GetString ("InvalidRelationshipMember", p0, p1 );
+        }
+
+        public static string InvalidRelationshipSetName (object p0)
+        {
+            return SR.GetString ("InvalidRelationshipSetName", p0 );
+        }
+
+        public static string InvalidRelationshipSetType (object p0)
+        {
+            return SR.GetString ("InvalidRelationshipSetType", p0 );
+        }
+
+        public static string InvalidRootComplexType (object p0, object p1)
+        {
+            return SR.GetString ("InvalidRootComplexType", p0, p1 );
+        }
+
+        public static string InvalidRootRowType (object p0, object p1)
+        {
+            return SR.GetString ("InvalidRootRowType", p0, p1 );
+        }
+
+        public static string InvalidRowType (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("InvalidRowType", p0, p1, p2, p3 );
+        }
+
+        public static string InvalidSchemaEncountered (object p0)
+        {
+            return SR.GetString ("InvalidSchemaEncountered", p0 );
+        }
+
+        public static string InvalidSecond (object p0, object p1)
+        {
+            return SR.GetString ("InvalidSecond", p0, p1 );
+        }
+
+        public static string InvalidSimpleIdentifier (object p0)
+        {
+            return SR.GetString ("InvalidSimpleIdentifier", p0 );
+        }
+
+        public static string InvalidSimpleIdentifierNonASCII (object p0)
+        {
+            return SR.GetString ("InvalidSimpleIdentifierNonASCII", p0 );
+        }
+
+        public static string InvalidSize (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("InvalidSize", p0, p1, p2, p3 );
+        }
+
+        public static string InvalidStringArgument (object p0)
+        {
+            return SR.GetString ("InvalidStringArgument", p0 );
+        }
+
+        public static string InvalidSystemReferenceId (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("InvalidSystemReferenceId", p0, p1, p2, p3 );
+        }
+
+        public static string InvalidToPropertyInRelationshipConstraint (object p0, object p1, object p2)
+        {
+            return SR.GetString ("InvalidToPropertyInRelationshipConstraint", p0, p1, p2 );
+        }
+
+        public static string InvalidUnarySetOpArgument (object p0)
+        {
+            return SR.GetString ("InvalidUnarySetOpArgument", p0 );
+        }
+
+        public static string InvalidUnsignedTypeForUnaryMinusOperation (object p0)
+        {
+            return SR.GetString ("InvalidUnsignedTypeForUnaryMinusOperation", p0 );
+        }
+
+        public static string InvalidUseOfWebPath (object p0)
+        {
+            return SR.GetString ("InvalidUseOfWebPath", p0 );
+        }
+
+        public static string InvalidValueForParameterTypeSemanticsAttribute (object p0)
+        {
+            return SR.GetString ("InvalidValueForParameterTypeSemanticsAttribute", p0 );
+        }
+
+        public static string InvalidWithRelationshipTargetEndMultiplicity (object p0, object p1)
+        {
+            return SR.GetString ("InvalidWithRelationshipTargetEndMultiplicity", p0, p1 );
+        }
+
+        public static string InvalidYear (object p0, object p1)
+        {
+            return SR.GetString ("InvalidYear", p0, p1 );
+        }
+
+        public static string Iqt_General_UnsupportedOp (object p0)
+        {
+            return SR.GetString ("Iqt_General_UnsupportedOp", p0 );
+        }
+
+        public static string ItemCollectionAlreadyRegistered (object p0)
+        {
+            return SR.GetString ("ItemCollectionAlreadyRegistered", p0 );
+        }
+
+        public static string ItemDuplicateIdentity (object p0)
+        {
+            return SR.GetString ("ItemDuplicateIdentity", p0 );
+        }
+
+        public static string ItemInvalidIdentity (object p0)
+        {
+            return SR.GetString ("ItemInvalidIdentity", p0 );
+        }
+
+        public static string KeyMissingOnEntityType (object p0)
+        {
+            return SR.GetString ("KeyMissingOnEntityType", p0 );
+        }
+
+        public static string KeyMustBeCorrelated (object p0)
+        {
+            return SR.GetString ("KeyMustBeCorrelated", p0 );
+        }
+
+        public static string LiteralTypeNotFoundInMetadata (object p0)
+        {
+            return SR.GetString ("LiteralTypeNotFoundInMetadata", p0 );
+        }
+
+        public static string LiteralTypeNotSupported (object p0)
+        {
+            return SR.GetString ("LiteralTypeNotSupported", p0 );
+        }
+
+        public static string MalformedXml (object p0, object p1)
+        {
+            return SR.GetString ("MalformedXml", p0, p1 );
+        }
+
+        public static string Mapping_AbstractTypeMappingToNonAbstractType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_AbstractTypeMappingToNonAbstractType", p0, p1 );
+        }
+
+        public static string Mapping_AllQueryViewAtCompileTime (object p0)
+        {
+            return SR.GetString ("Mapping_AllQueryViewAtCompileTime", p0 );
+        }
+
+        public static string Mapping_AlreadyMapped_StorageEntityContainer (object p0)
+        {
+            return SR.GetString ("Mapping_AlreadyMapped_StorageEntityContainer", p0 );
+        }
+
+        public static string Mapping_CannotMapCLRTypeMultipleTimes (object p0)
+        {
+            return SR.GetString ("Mapping_CannotMapCLRTypeMultipleTimes", p0 );
+        }
+
+        public static string Mapping_Default_OCMapping_Clr_Member (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_Default_OCMapping_Clr_Member", p0, p1, p2 );
+        }
+
+        public static string Mapping_Default_OCMapping_Clr_Member2 (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_Default_OCMapping_Clr_Member2", p0, p1, p2 );
+        }
+
+        public static string Mapping_Default_OCMapping_Invalid_MemberType (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("Mapping_Default_OCMapping_Invalid_MemberType", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string Mapping_Default_OCMapping_Member_Count_Mismatch (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_Default_OCMapping_Member_Count_Mismatch", p0, p1 );
+        }
+
+        public static string Mapping_Default_OCMapping_MemberKind_Mismatch (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("Mapping_Default_OCMapping_MemberKind_Mismatch", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string Mapping_Default_OCMapping_MultiplicityMismatch (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("Mapping_Default_OCMapping_MultiplicityMismatch", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string Mapping_Duplicate_CdmAssociationSet_StorageMap (object p0)
+        {
+            return SR.GetString ("Mapping_Duplicate_CdmAssociationSet_StorageMap", p0 );
+        }
+
+        public static string Mapping_Duplicate_PropertyMap_CaseInsensitive (object p0)
+        {
+            return SR.GetString ("Mapping_Duplicate_PropertyMap_CaseInsensitive", p0 );
+        }
+
+        public static string Mapping_Duplicate_Type (object p0)
+        {
+            return SR.GetString ("Mapping_Duplicate_Type", p0 );
+        }
+
+        public static string Mapping_Empty_QueryView (object p0)
+        {
+            return SR.GetString ("Mapping_Empty_QueryView", p0 );
+        }
+
+        public static string Mapping_Empty_QueryView_OfType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_Empty_QueryView_OfType", p0, p1 );
+        }
+
+        public static string Mapping_Empty_QueryView_OfTypeOnly (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_Empty_QueryView_OfTypeOnly", p0, p1 );
+        }
+
+        public static string Mapping_EntitySetMismatchOnAssociationSetEnd_QueryView (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_EntitySetMismatchOnAssociationSetEnd_QueryView", p0, p1, p2, p3 );
+        }
+
+        public static string Mapping_Enum_EmptyValue (object p0)
+        {
+            return SR.GetString ("Mapping_Enum_EmptyValue", p0 );
+        }
+
+        public static string Mapping_Enum_InvalidValue (object p0)
+        {
+            return SR.GetString ("Mapping_Enum_InvalidValue", p0 );
+        }
+
+        public static string Mapping_Enum_OCMapping_MemberMismatch (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_Enum_OCMapping_MemberMismatch", p0, p1, p2, p3 );
+        }
+
+        public static string Mapping_Enum_OCMapping_UnderlyingTypesMismatch (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_Enum_OCMapping_UnderlyingTypesMismatch", p0, p1, p2, p3 );
+        }
+
+        public static string Mapping_EnumTypeMappingToNonEnumType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_EnumTypeMappingToNonEnumType", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_CannotInferTargetFunctionKeys (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_CannotInferTargetFunctionKeys", p0 );
+        }
+
+        public static string Mapping_FunctionImport_ConditionValueTypeMismatch (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ConditionValueTypeMismatch", p0, p1, p2 );
+        }
+
+        public static string Mapping_FunctionImport_EntityTypeMappingForFunctionNotReturningEntitySet (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_EntityTypeMappingForFunctionNotReturningEntitySet", p0, p1);
+        }
+
+        public static string Mapping_FunctionImport_FunctionAmbiguous (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_FunctionAmbiguous", p0 );
+        }
+
+        public static string Mapping_FunctionImport_FunctionImportDoesNotExist (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_FunctionImportDoesNotExist", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_FunctionImportMappedMultipleTimes (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_FunctionImportMappedMultipleTimes", p0 );
+        }
+
+        public static string Mapping_FunctionImport_ImplicitMappingForAbstractReturnType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ImplicitMappingForAbstractReturnType", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_ImportParameterHasNoCorrespondingTargetParameter (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ImportParameterHasNoCorrespondingTargetParameter", p0 );
+        }
+
+        public static string Mapping_FunctionImport_IncompatibleEnumParameterType (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_FunctionImport_IncompatibleEnumParameterType", p0, p1, p2, p3 );
+        }
+
+        public static string Mapping_FunctionImport_IncompatibleParameterMode (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_FunctionImport_IncompatibleParameterMode", p0, p1, p2 );
+        }
+
+        public static string Mapping_FunctionImport_IncompatibleParameterType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_FunctionImport_IncompatibleParameterType", p0, p1, p2 );
+        }
+
+        public static string Mapping_FunctionImport_InvalidContentEntityTypeForEntitySet (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_FunctionImport_InvalidContentEntityTypeForEntitySet", p0, p1, p2, p3);
+        }
+
+        public static string Mapping_FunctionImport_PropertyNotMapped (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_FunctionImport_PropertyNotMapped", p0, p1, p2 );
+        }
+
+        public static string Mapping_FunctionImport_ResultMapping_InvalidCTypeCTExpected (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ResultMapping_InvalidCTypeCTExpected", p0 );
+        }
+
+        public static string Mapping_FunctionImport_ResultMapping_InvalidCTypeETExpected (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ResultMapping_InvalidCTypeETExpected", p0 );
+        }
+
+        public static string Mapping_FunctionImport_ResultMapping_InvalidSType (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ResultMapping_InvalidSType", p0 );
+        }
+
+        public static string Mapping_FunctionImport_ResultMapping_MappedTypeDoesNotMatchReturnType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ResultMapping_MappedTypeDoesNotMatchReturnType", p0, p1);
+        }
+
+        public static string Mapping_FunctionImport_ResultMappingCountDoesNotMatchResultCount (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ResultMappingCountDoesNotMatchResultCount", p0 );
+        }
+
+        public static string Mapping_FunctionImport_RowsAffectedParameterDoesNotExist (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_RowsAffectedParameterDoesNotExist", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_RowsAffectedParameterHasWrongMode (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_FunctionImport_RowsAffectedParameterHasWrongMode", p0, p1, p2, p3);
+        }
+
+        public static string Mapping_FunctionImport_RowsAffectedParameterHasWrongType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_RowsAffectedParameterHasWrongType", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_ScalarMappingToMulticolumnTVF (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ScalarMappingToMulticolumnTVF", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_ScalarMappingTypeMismatch (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_FunctionImport_ScalarMappingTypeMismatch", p0, p1, p2, p3 );
+        }
+
+        public static string Mapping_FunctionImport_StoreFunctionDoesNotExist (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_StoreFunctionDoesNotExist", p0 );
+        }
+
+        public static string Mapping_FunctionImport_TargetFunctionMustBeComposable (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_TargetFunctionMustBeComposable", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_TargetFunctionMustBeNonComposable (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_TargetFunctionMustBeNonComposable", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_TargetParameterHasNoCorrespondingImportParameter (object p0)
+        {
+            return SR.GetString ("Mapping_FunctionImport_TargetParameterHasNoCorrespondingImportParameter", p0 );
+        }
+
+        public static string Mapping_FunctionImport_UnreachableIsTypeOf (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_UnreachableIsTypeOf", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_UnreachableType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_UnreachableType", p0, p1 );
+        }
+
+        public static string Mapping_FunctionImport_UnsupportedType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_FunctionImport_UnsupportedType", p0, p1 );
+        }
+
+        public static string Mapping_Invalid_Association_Type_For_Association_Set (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_Invalid_Association_Type_For_Association_Set", p0, p1, p2 );
+        }
+
+        public static string Mapping_Invalid_CSide_ScalarProperty (object p0)
+        {
+            return SR.GetString ("Mapping_Invalid_CSide_ScalarProperty", p0 );
+        }
+
+        public static string Mapping_Invalid_CSRootElementMissing (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_Invalid_CSRootElementMissing", p0, p1, p2 );
+        }
+
+        public static string Mapping_Invalid_Member_Mapping (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("Mapping_Invalid_Member_Mapping", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string Mapping_Invalid_Query_Views_MissingSetClosure (object p0)
+        {
+            return SR.GetString ("Mapping_Invalid_Query_Views_MissingSetClosure", p0 );
+        }
+
+        public static string Mapping_Invalid_QueryView (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_Invalid_QueryView", p0, p1 );
+        }
+
+        public static string Mapping_Invalid_QueryView_Type (object p0)
+        {
+            return SR.GetString ("Mapping_Invalid_QueryView_Type", p0 );
+        }
+
+        public static string Mapping_Invalid_QueryView2 (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_Invalid_QueryView2", p0, p1 );
+        }
+
+        public static string Mapping_InvalidContent_AbstractEntity_FunctionMapping (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_AbstractEntity_FunctionMapping", p0 );
+        }
+
+        public static string Mapping_InvalidContent_AbstractEntity_IsOfType (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_AbstractEntity_IsOfType", p0 );
+        }
+
+        public static string Mapping_InvalidContent_AbstractEntity_Type (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_AbstractEntity_Type", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Association_Set (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Association_Set", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Association_Type (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Association_Type", p0 );
+        }
+
+        public static string Mapping_InvalidContent_AssociationSet_Condition (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_AssociationSet_Condition", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Cdm_Member (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Cdm_Member", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Column (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Column", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Complex_Type (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Complex_Type", p0 );
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_Computed (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_ConditionMapping_Computed", p0 );
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_InvalidMember (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_ConditionMapping_InvalidMember", p0 );
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_InvalidPrimitiveTypeKind (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_InvalidContent_ConditionMapping_InvalidPrimitiveTypeKind", p0, p1);
+        }
+
+        public static string Mapping_InvalidContent_Duplicate_Cdm_Member (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Duplicate_Cdm_Member", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Duplicate_Condition_Member (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Duplicate_Condition_Member", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Emtpty_SetMap (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Emtpty_SetMap", p0 );
+        }
+
+        public static string Mapping_InvalidContent_End (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_End", p0 );
+        }
+
+        public static string Mapping_InvalidContent_EndProperty (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_EndProperty", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Entity_Set (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Entity_Set", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Entity_Type (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Entity_Type", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Entity_Type_For_Entity_Set (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Entity_Type_For_Entity_Set", p0, p1, p2 );
+        }
+
+        public static string Mapping_InvalidContent_EntityContainer (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_EntityContainer", p0 );
+        }
+
+        public static string Mapping_InvalidContent_ForeignKey_Association_Set (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_ForeignKey_Association_Set", p0 );
+        }
+
+        public static string Mapping_InvalidContent_ForeignKey_Association_Set_PKtoPK (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_ForeignKey_Association_Set_PKtoPK", p0 );
+        }
+
+        public static string Mapping_InvalidContent_StorageEntityContainer (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_StorageEntityContainer", p0 );
+        }
+
+        public static string Mapping_InvalidContent_Table (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidContent_Table", p0 );
+        }
+
+        public static string Mapping_InvalidMappingSchema_Parsing (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidMappingSchema_Parsing", p0 );
+        }
+
+        public static string Mapping_InvalidMappingSchema_validation (object p0)
+        {
+            return SR.GetString ("Mapping_InvalidMappingSchema_validation", p0 );
+        }
+
+        public static string Mapping_ItemWithSameNameExistsBothInCSpaceAndSSpace (object p0)
+        {
+            return SR.GetString ("Mapping_ItemWithSameNameExistsBothInCSpaceAndSSpace", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_AmbiguousFunction (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AmbiguousFunction", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_AmbiguousResultBinding (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AmbiguousResultBinding", p0, p1 );
+        }
+
+        public static string Mapping_ModificationFunction_AssociationEndMappingForeignKeyAssociation (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationEndMappingForeignKeyAssociation", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_AssociationEndMappingInvalidForEntityType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationEndMappingInvalidForEntityType", p0, p1, p2);
+        }
+
+        public static string Mapping_ModificationFunction_AssociationSetAmbiguous (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationSetAmbiguous", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_AssociationSetCardinality (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationSetCardinality", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_AssociationSetDoesNotExist (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationSetDoesNotExist", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_AssociationSetFromRoleIsNotEntitySet (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationSetFromRoleIsNotEntitySet", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_AssociationSetNotMappedForOperation (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationSetNotMappedForOperation", p0, p1, p2, p3);
+        }
+
+        public static string Mapping_ModificationFunction_AssociationSetRoleDoesNotExist (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_AssociationSetRoleDoesNotExist", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_ComplexTypeNotFound (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_ComplexTypeNotFound", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_MissingEntityType (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_MissingEntityType", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_MissingParameter (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_MissingParameter", p0, p1 );
+        }
+
+        public static string Mapping_ModificationFunction_MissingSetClosure (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_MissingSetClosure", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_MultipleEndsOfAssociationMapped (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_MultipleEndsOfAssociationMapped", p0, p1, p2);
+        }
+
+        public static string Mapping_ModificationFunction_NotValidFunction (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_NotValidFunction", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_NotValidFunctionParameter (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_NotValidFunctionParameter", p0, p1, p2 );
+        }
+
+        public static string Mapping_ModificationFunction_ParameterBoundTwice (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_ParameterBoundTwice", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_ParameterNotFound (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_ParameterNotFound", p0, p1 );
+        }
+
+        public static string Mapping_ModificationFunction_PropertyNotFound (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_PropertyNotFound", p0, p1 );
+        }
+
+        public static string Mapping_ModificationFunction_PropertyNotKey (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_PropertyNotKey", p0, p1 );
+        }
+
+        public static string Mapping_ModificationFunction_PropertyParameterTypeMismatch (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_PropertyParameterTypeMismatch", p0, p1, p2, p3, p4, p5);
+        }
+
+        public static string Mapping_ModificationFunction_RedundantEntityTypeMapping (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_RedundantEntityTypeMapping", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_UnknownFunction (object p0)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_UnknownFunction", p0 );
+        }
+
+        public static string Mapping_ModificationFunction_WrongComplexType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_ModificationFunction_WrongComplexType", p0, p1 );
+        }
+
+        public static string Mapping_NotFound_EntityContainer (object p0)
+        {
+            return SR.GetString ("Mapping_NotFound_EntityContainer", p0 );
+        }
+
+        public static string Mapping_Object_InvalidType (object p0)
+        {
+            return SR.GetString ("Mapping_Object_InvalidType", p0 );
+        }
+
+        public static string Mapping_Provider_WrongConnectionType (object p0)
+        {
+            return SR.GetString ("Mapping_Provider_WrongConnectionType", p0 );
+        }
+
+        public static string Mapping_Provider_WrongManifestType (object p0)
+        {
+            return SR.GetString ("Mapping_Provider_WrongManifestType", p0 );
+        }
+
+        public static string Mapping_ProviderReturnsNullType (object p0)
+        {
+            return SR.GetString ("Mapping_ProviderReturnsNullType", p0 );
+        }
+
+        public static string Mapping_QueryView_Duplicate_OfType (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_QueryView_Duplicate_OfType", p0, p1 );
+        }
+
+        public static string Mapping_QueryView_Duplicate_OfTypeOnly (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_QueryView_Duplicate_OfTypeOnly", p0, p1 );
+        }
+
+        public static string Mapping_QueryView_For_Base_Type (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_QueryView_For_Base_Type", p0, p1 );
+        }
+
+        public static string Mapping_QueryView_PropertyMaps (object p0)
+        {
+            return SR.GetString ("Mapping_QueryView_PropertyMaps", p0 );
+        }
+
+        public static string Mapping_QueryView_TypeName_Not_Defined (object p0)
+        {
+            return SR.GetString ("Mapping_QueryView_TypeName_Not_Defined", p0 );
+        }
+
+        public static string Mapping_QueryViewMultipleTypeInTypeName (object p0)
+        {
+            return SR.GetString ("Mapping_QueryViewMultipleTypeInTypeName", p0 );
+        }
+
+        public static string Mapping_Storage_InvalidSpace (object p0)
+        {
+            return SR.GetString ("Mapping_Storage_InvalidSpace", p0 );
+        }
+
+        public static string Mapping_StoreTypeMismatch_ScalarPropertyMapping (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_StoreTypeMismatch_ScalarPropertyMapping", p0, p1 );
+        }
+
+        public static string Mapping_TableName_QueryView (object p0)
+        {
+            return SR.GetString ("Mapping_TableName_QueryView", p0 );
+        }
+
+        public static string Mapping_UnsupportedExpressionKind_QueryView (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_UnsupportedExpressionKind_QueryView", p0, p1, p2 );
+        }
+
+        public static string Mapping_UnsupportedFunctionCall_QueryView (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_UnsupportedFunctionCall_QueryView", p0, p1 );
+        }
+
+        public static string Mapping_UnsupportedInitialization_QueryView (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_UnsupportedInitialization_QueryView", p0, p1 );
+        }
+
+        public static string Mapping_UnsupportedPropertyKind_QueryView (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Mapping_UnsupportedPropertyKind_QueryView", p0, p1, p2 );
+        }
+
+        public static string Mapping_UnsupportedScanTarget_QueryView (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_UnsupportedScanTarget_QueryView", p0, p1 );
+        }
+
+        public static string Mapping_Views_For_Extent_Not_Generated (object p0, object p1)
+        {
+            return SR.GetString ("Mapping_Views_For_Extent_Not_Generated", p0, p1 );
+        }
+
+        public static string Materializer_AddedEntityAlreadyExists (object p0)
+        {
+            return SR.GetString ("Materializer_AddedEntityAlreadyExists", p0 );
+        }
+
+        public static string Materializer_InvalidCastNullable (object p0, object p1)
+        {
+            return SR.GetString ("Materializer_InvalidCastNullable", p0, p1 );
+        }
+
+        public static string Materializer_InvalidCastReference (object p0, object p1)
+        {
+            return SR.GetString ("Materializer_InvalidCastReference", p0, p1 );
+        }
+
+        public static string Materializer_NullReferenceCast (object p0)
+        {
+            return SR.GetString ("Materializer_NullReferenceCast", p0 );
+        }
+
+        public static string Materializer_PropertyIsNotNullableWithName (object p0)
+        {
+            return SR.GetString ("Materializer_PropertyIsNotNullableWithName", p0 );
+        }
+
+        public static string Materializer_RecyclingEntity (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Materializer_RecyclingEntity", p0, p1, p2, p3 );
+        }
+
+        public static string Materializer_SetInvalidValue (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Materializer_SetInvalidValue", p0, p1, p2, p3 );
+        }
+
+        public static string MemberDoesNotBelongToEntityContainer (object p0, object p1)
+        {
+            return SR.GetString ("MemberDoesNotBelongToEntityContainer", p0, p1 );
+        }
+
+        public static string MemberInvalidIdentity (object p0)
+        {
+            return SR.GetString ("MemberInvalidIdentity", p0 );
+        }
+
+        public static string MinAndMaxMustBePositive (object p0, object p1)
+        {
+            return SR.GetString ("MinAndMaxMustBePositive", p0, p1 );
+        }
+
+        public static string MinAndMaxValueMustBeDifferentForNonConstantFacet (object p0, object p1)
+        {
+            return SR.GetString ("MinAndMaxValueMustBeDifferentForNonConstantFacet", p0, p1 );
+        }
+
+        public static string MinAndMaxValueMustBeSameForConstantFacet (object p0, object p1)
+        {
+            return SR.GetString ("MinAndMaxValueMustBeSameForConstantFacet", p0, p1 );
+        }
+
+        public static string MinMustBeLessThanMax (object p0, object p1, object p2)
+        {
+            return SR.GetString ("MinMustBeLessThanMax", p0, p1, p2 );
+        }
+
+        public static string MissingConstraintOnRelationshipType (object p0)
+        {
+            return SR.GetString ("MissingConstraintOnRelationshipType", p0 );
+        }
+
+        public static string MissingDefaultValueForConstantFacet (object p0, object p1)
+        {
+            return SR.GetString ("MissingDefaultValueForConstantFacet", p0, p1 );
+        }
+
+        public static string MissingEntityContainerEnd (object p0, object p1)
+        {
+            return SR.GetString ("MissingEntityContainerEnd", p0, p1 );
+        }
+
+        public static string MissingFacetDescription (object p0, object p1, object p2)
+        {
+            return SR.GetString ("MissingFacetDescription", p0, p1, p2 );
+        }
+
+        public static string MoreThanOneItemMatchesIdentity (object p0)
+        {
+            return SR.GetString ("MoreThanOneItemMatchesIdentity", p0 );
+        }
+
+        public static string MultipleDefinitionsOfParameter (object p0)
+        {
+            return SR.GetString ("MultipleDefinitionsOfParameter", p0 );
+        }
+
+        public static string MultipleDefinitionsOfVariable (object p0)
+        {
+            return SR.GetString ("MultipleDefinitionsOfVariable", p0 );
+        }
+
+        public static string NamespaceAliasAlreadyUsed (object p0)
+        {
+            return SR.GetString ("NamespaceAliasAlreadyUsed", p0 );
+        }
+
+        public static string NamespaceAlreadyImported (object p0)
+        {
+            return SR.GetString ("NamespaceAlreadyImported", p0 );
+        }
+
+        public static string NavigationPropertyRelationshipEndTypeMismatch (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("NavigationPropertyRelationshipEndTypeMismatch", p0, p1, p2, p3, p4 );
+        }
+
+        public static string NeedNotUseSystemNamespaceInUsing (object p0)
+        {
+            return SR.GetString ("NeedNotUseSystemNamespaceInUsing", p0 );
+        }
+
+        public static string NestedAggregateCannotBeUsedInAggregate (object p0, object p1)
+        {
+            return SR.GetString ("NestedAggregateCannotBeUsedInAggregate", p0, p1 );
+        }
+
+        public static string NestedClassNotSupported (object p0, object p1)
+        {
+            return SR.GetString ("NestedClassNotSupported", p0, p1 );
+        }
+
+        public static string NewTypeConflictsWithExistingType (object p0, object p1)
+        {
+            return SR.GetString ("NewTypeConflictsWithExistingType", p0, p1 );
+        }
+
+        public static string NoAggrFunctionOverloadMatch (object p0, object p1, object p2)
+        {
+            return SR.GetString ("NoAggrFunctionOverloadMatch", p0, p1, p2 );
+        }
+
+        public static string NoCanonicalAggrFunctionOverloadMatch (object p0, object p1, object p2)
+        {
+            return SR.GetString ("NoCanonicalAggrFunctionOverloadMatch", p0, p1, p2 );
+        }
+
+        public static string NoCanonicalFunctionOverloadMatch (object p0, object p1, object p2)
+        {
+            return SR.GetString ("NoCanonicalFunctionOverloadMatch", p0, p1, p2 );
+        }
+
+        public static string NoCodeGenNamespaceInStructuralAnnotation (object p0)
+        {
+            return SR.GetString ("NoCodeGenNamespaceInStructuralAnnotation", p0 );
+        }
+
+        public static string NoCollectionForSpace (object p0)
+        {
+            return SR.GetString ("NoCollectionForSpace", p0 );
+        }
+
+        public static string NoFunctionOverloadMatch (object p0, object p1, object p2)
+        {
+            return SR.GetString ("NoFunctionOverloadMatch", p0, p1, p2 );
+        }
+
+        public static string NoStoreTypeForEdmType (object p0, object p1)
+        {
+            return SR.GetString ("NoStoreTypeForEdmType", p0, p1 );
+        }
+
+        public static string NotAMemberOfCollection (object p0, object p1)
+        {
+            return SR.GetString ("NotAMemberOfCollection", p0, p1 );
+        }
+
+        public static string NotAMemberOfType (object p0, object p1)
+        {
+            return SR.GetString ("NotAMemberOfType", p0, p1 );
+        }
+
+        public static string NotASuperOrSubType (object p0, object p1)
+        {
+            return SR.GetString ("NotASuperOrSubType", p0, p1 );
+        }
+
+        public static string NotInNamespaceAlias (object p0, object p1, object p2)
+        {
+            return SR.GetString ("NotInNamespaceAlias", p0, p1, p2 );
+        }
+
+        public static string NotInNamespaceNoAlias (object p0, object p1)
+        {
+            return SR.GetString ("NotInNamespaceNoAlias", p0, p1 );
+        }
+
+        public static string NotNamespaceQualified (object p0)
+        {
+            return SR.GetString ("NotNamespaceQualified", p0 );
+        }
+
+        public static string NullParameterForEdmRelationshipAttribute (object p0, object p1)
+        {
+            return SR.GetString ("NullParameterForEdmRelationshipAttribute", p0, p1 );
+        }
+
+        public static string NullRelationshipNameforEdmRelationshipAttribute (object p0)
+        {
+            return SR.GetString ("NullRelationshipNameforEdmRelationshipAttribute", p0 );
+        }
+
+        public static string NumberOfTypeCtorIsLessThenFormalSpec (object p0)
+        {
+            return SR.GetString ("NumberOfTypeCtorIsLessThenFormalSpec", p0 );
+        }
+
+        public static string NumberOfTypeCtorIsMoreThenFormalSpec (object p0)
+        {
+            return SR.GetString ("NumberOfTypeCtorIsMoreThenFormalSpec", p0 );
+        }
+
+        public static string ObjectContext_AcceptAllChangesFailure (object p0)
+        {
+            return SR.GetString ("ObjectContext_AcceptAllChangesFailure", p0 );
+        }
+
+        public static string ObjectContext_CannotExplicitlyLoadDetachedRelationships (object p0)
+        {
+            return SR.GetString ("ObjectContext_CannotExplicitlyLoadDetachedRelationships", p0 );
+        }
+
+        public static string ObjectContext_CannotLoadReferencesUsingDifferentContext (object p0)
+        {
+            return SR.GetString ("ObjectContext_CannotLoadReferencesUsingDifferentContext", p0 );
+        }
+
+        public static string ObjectContext_ClientEntityRemovedFromStore (object p0)
+        {
+            return SR.GetString ("ObjectContext_ClientEntityRemovedFromStore", p0 );
+        }
+
+        public static string ObjectContext_EntitiesHaveDifferentType (object p0, object p1)
+        {
+            return SR.GetString ("ObjectContext_EntitiesHaveDifferentType", p0, p1 );
+        }
+
+        public static string ObjectContext_EntityContainerNotFoundForName (object p0)
+        {
+            return SR.GetString ("ObjectContext_EntityContainerNotFoundForName", p0 );
+        }
+
+        public static string ObjectContext_EntityMustBeUnchangedOrModified (object p0)
+        {
+            return SR.GetString ("ObjectContext_EntityMustBeUnchangedOrModified", p0 );
+        }
+
+        public static string ObjectContext_EntityMustBeUnchangedOrModifiedOrDeleted (object p0)
+        {
+            return SR.GetString ("ObjectContext_EntityMustBeUnchangedOrModifiedOrDeleted", p0 );
+        }
+
+        public static string ObjectContext_EntityNotInObjectSet_Delete (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("ObjectContext_EntityNotInObjectSet_Delete", p0, p1, p2, p3 );
+        }
+
+        public static string ObjectContext_EntityNotInObjectSet_Detach (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("ObjectContext_EntityNotInObjectSet_Detach", p0, p1, p2, p3 );
+        }
+
+        public static string ObjectContext_EntitySetNotFoundForName (object p0)
+        {
+            return SR.GetString ("ObjectContext_EntitySetNotFoundForName", p0 );
+        }
+
+        public static string ObjectContext_ExecuteFunctionCalledWithNonQueryFunction (object p0)
+        {
+            return SR.GetString ("ObjectContext_ExecuteFunctionCalledWithNonQueryFunction", p0 );
+        }
+
+        public static string ObjectContext_ExecuteFunctionCalledWithNullParameter (object p0)
+        {
+            return SR.GetString ("ObjectContext_ExecuteFunctionCalledWithNullParameter", p0 );
+        }
+
+        public static string ObjectContext_ExecuteFunctionCalledWithScalarFunction (object p0, object p1)
+        {
+            return SR.GetString ("ObjectContext_ExecuteFunctionCalledWithScalarFunction", p0, p1 );
+        }
+
+        public static string ObjectContext_ExecuteFunctionTypeMismatch (object p0, object p1)
+        {
+            return SR.GetString ("ObjectContext_ExecuteFunctionTypeMismatch", p0, p1 );
+        }
+
+        public static string ObjectContext_InvalidDefaultContainerName (object p0)
+        {
+            return SR.GetString ("ObjectContext_InvalidDefaultContainerName", p0 );
+        }
+
+        public static string ObjectContext_InvalidEntitySetForStoreQuery (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ObjectContext_InvalidEntitySetForStoreQuery", p0, p1, p2 );
+        }
+
+        public static string ObjectContext_InvalidEntitySetInKey (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("ObjectContext_InvalidEntitySetInKey", p0, p1, p2, p3 );
+        }
+
+        public static string ObjectContext_InvalidEntitySetInKeyFromName (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("ObjectContext_InvalidEntitySetInKeyFromName", p0, p1, p2, p3, p4 );
+        }
+
+        public static string ObjectContext_InvalidEntitySetOnEntity (object p0, object p1)
+        {
+            return SR.GetString ("ObjectContext_InvalidEntitySetOnEntity", p0, p1 );
+        }
+
+        public static string ObjectContext_InvalidObjectSetTypeForEntitySet (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ObjectContext_InvalidObjectSetTypeForEntitySet", p0, p1, p2 );
+        }
+
+        public static string ObjectContext_InvalidTypeForStoreQuery (object p0)
+        {
+            return SR.GetString ("ObjectContext_InvalidTypeForStoreQuery", p0 );
+        }
+
+        public static string ObjectContext_MultipleEntitySetsFoundInAllContainers (object p0)
+        {
+            return SR.GetString ("ObjectContext_MultipleEntitySetsFoundInAllContainers", p0 );
+        }
+
+        public static string ObjectContext_MultipleEntitySetsFoundInSingleContainer (object p0, object p1)
+        {
+            return SR.GetString ("ObjectContext_MultipleEntitySetsFoundInSingleContainer", p0, p1 );
+        }
+
+        public static string ObjectContext_NoEntitySetFoundForType (object p0)
+        {
+            return SR.GetString ("ObjectContext_NoEntitySetFoundForType", p0 );
+        }
+
+        public static string ObjectContext_NoMappingForEntityType (object p0)
+        {
+            return SR.GetString ("ObjectContext_NoMappingForEntityType", p0 );
+        }
+
+        public static string ObjectContext_NthElementInAddedState (object p0)
+        {
+            return SR.GetString ("ObjectContext_NthElementInAddedState", p0 );
+        }
+
+        public static string ObjectContext_NthElementIsDuplicate (object p0)
+        {
+            return SR.GetString ("ObjectContext_NthElementIsDuplicate", p0 );
+        }
+
+        public static string ObjectContext_NthElementIsNull (object p0)
+        {
+            return SR.GetString ("ObjectContext_NthElementIsNull", p0 );
+        }
+
+        public static string ObjectContext_NthElementNotInObjectStateManager (object p0)
+        {
+            return SR.GetString ("ObjectContext_NthElementNotInObjectStateManager", p0 );
+        }
+
+        public static string ObjectContext_TwoPropertiesMappedToSameColumn (object p0, object p1)
+        {
+            return SR.GetString ("ObjectContext_TwoPropertiesMappedToSameColumn", p0, p1 );
+        }
+
+        public static string ObjectParameter_InvalidParameterName (object p0)
+        {
+            return SR.GetString ("ObjectParameter_InvalidParameterName", p0 );
+        }
+
+        public static string ObjectParameter_InvalidParameterType (object p0)
+        {
+            return SR.GetString ("ObjectParameter_InvalidParameterType", p0 );
+        }
+
+        public static string ObjectParameterCollection_DuplicateParameterName (object p0)
+        {
+            return SR.GetString ("ObjectParameterCollection_DuplicateParameterName", p0 );
+        }
+
+        public static string ObjectParameterCollection_ParameterAlreadyExists (object p0)
+        {
+            return SR.GetString ("ObjectParameterCollection_ParameterAlreadyExists", p0 );
+        }
+
+        public static string ObjectParameterCollection_ParameterNameNotFound (object p0)
+        {
+            return SR.GetString ("ObjectParameterCollection_ParameterNameNotFound", p0 );
+        }
+
+        public static string ObjectQuery_InvalidQueryName (object p0)
+        {
+            return SR.GetString ("ObjectQuery_InvalidQueryName", p0 );
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidResultType (object p0)
+        {
+            return SR.GetString ("ObjectQuery_QueryBuilder_InvalidResultType", p0 );
+        }
+
+        public static string ObjectQuery_Span_NoNavProp (object p0, object p1)
+        {
+            return SR.GetString ("ObjectQuery_Span_NoNavProp", p0, p1 );
+        }
+
+        public static string ObjectQuery_UnableToMaterializeArbitaryProjectionType (object p0)
+        {
+            return SR.GetString ("ObjectQuery_UnableToMaterializeArbitaryProjectionType", p0 );
+        }
+
+        public static string ObjectQuery_UnableToMaterializeArray (object p0, object p1)
+        {
+            return SR.GetString ("ObjectQuery_UnableToMaterializeArray", p0, p1 );
+        }
+
+        public static string ObjectStateEntry_CannotModifyKeyProperty (object p0)
+        {
+            return SR.GetString ("ObjectStateEntry_CannotModifyKeyProperty", p0 );
+        }
+
+        public static string ObjectStateEntry_ChangedInDifferentStateFromChanging (object p0, object p1)
+        {
+            return SR.GetString ("ObjectStateEntry_ChangedInDifferentStateFromChanging", p0, p1 );
+        }
+
+        public static string ObjectStateEntry_ChangeOnUnmappedComplexProperty (object p0)
+        {
+            return SR.GetString ("ObjectStateEntry_ChangeOnUnmappedComplexProperty", p0 );
+        }
+
+        public static string ObjectStateEntry_ChangeOnUnmappedProperty (object p0)
+        {
+            return SR.GetString ("ObjectStateEntry_ChangeOnUnmappedProperty", p0 );
+        }
+
+        public static string ObjectStateEntry_ComplexObjectUsedMultipleTimes (object p0, object p1)
+        {
+            return SR.GetString ("ObjectStateEntry_ComplexObjectUsedMultipleTimes", p0, p1 );
+        }
+
+        public static string ObjectStateEntry_NullOriginalValueForNonNullableProperty (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ObjectStateEntry_NullOriginalValueForNonNullableProperty", p0, p1, p2 );
+        }
+
+        public static string ObjectStateEntry_SetModifiedOnInvalidProperty (object p0)
+        {
+            return SR.GetString ("ObjectStateEntry_SetModifiedOnInvalidProperty", p0 );
+        }
+
+        public static string ObjectStateEntry_SetModifiedStates (object p0)
+        {
+            return SR.GetString ("ObjectStateEntry_SetModifiedStates", p0 );
+        }
+
+        public static string ObjectStateEntry_SetOriginalComplexProperties (object p0)
+        {
+            return SR.GetString ("ObjectStateEntry_SetOriginalComplexProperties", p0 );
+        }
+
+        public static string ObjectStateEntry_SetOriginalPrimaryKey (object p0)
+        {
+            return SR.GetString ("ObjectStateEntry_SetOriginalPrimaryKey", p0 );
+        }
+
+        public static string ObjectStateEntry_UnableToEnumerateCollection (object p0, object p1)
+        {
+            return SR.GetString ("ObjectStateEntry_UnableToEnumerateCollection", p0, p1 );
+        }
+
+        public static string ObjectStateManager_ConflictingChangesOfRelationshipDetected (object p0, object p1)
+        {
+            return SR.GetString ("ObjectStateManager_ConflictingChangesOfRelationshipDetected", p0, p1 );
+        }
+
+        public static string ObjectStateManager_DoesnotAllowToReAddUnchangedOrModifiedOrDeletedEntity (object p0)
+        {
+            return SR.GetString ("ObjectStateManager_DoesnotAllowToReAddUnchangedOrModifiedOrDeletedEntity", p0 );
+        }
+
+        public static string ObjectStateManager_EntityTypeDoesnotMatchtoEntitySetType (object p0, object p1)
+        {
+            return SR.GetString ("ObjectStateManager_EntityTypeDoesnotMatchtoEntitySetType", p0, p1 );
+        }
+
+        public static string ObjectStateManager_GetEntityKeyRequiresObjectToHaveAKey (object p0)
+        {
+            return SR.GetString ("ObjectStateManager_GetEntityKeyRequiresObjectToHaveAKey", p0 );
+        }
+
+        public static string ObjectStateManager_NoEntryExistsForObject (object p0)
+        {
+            return SR.GetString ("ObjectStateManager_NoEntryExistsForObject", p0 );
+        }
+
+        public static string ObjectView_CannotResolveTheEntitySet (object p0)
+        {
+            return SR.GetString ("ObjectView_CannotResolveTheEntitySet", p0 );
+        }
+
+        public static string OfTypeExpressionElementTypeMustBeEntityType (object p0, object p1)
+        {
+            return SR.GetString ("OfTypeExpressionElementTypeMustBeEntityType", p0, p1 );
+        }
+
+        public static string OfTypeExpressionElementTypeMustBeNominalType (object p0, object p1)
+        {
+            return SR.GetString ("OfTypeExpressionElementTypeMustBeNominalType", p0, p1 );
+        }
+
+        public static string OfTypeOnlyTypeArgumentCannotBeAbstract (object p0)
+        {
+            return SR.GetString ("OfTypeOnlyTypeArgumentCannotBeAbstract", p0 );
+        }
+
+        public static string ParameterNameAlreadyDefinedDuplicate (object p0)
+        {
+            return SR.GetString ("ParameterNameAlreadyDefinedDuplicate", p0 );
+        }
+
+        public static string ParameterTypeNotSupported (object p0, object p1)
+        {
+            return SR.GetString ("ParameterTypeNotSupported", p0, p1 );
+        }
+
+        public static string ParameterWasNotDefined (object p0)
+        {
+            return SR.GetString ("ParameterWasNotDefined", p0 );
+        }
+
+        public static string PlaceholderExpressionMustBeCompatibleWithEdm64 (object p0, object p1)
+        {
+            return SR.GetString ("PlaceholderExpressionMustBeCompatibleWithEdm64", p0, p1 );
+        }
+
+        public static string PlaceholderExpressionMustBeConstant (object p0)
+        {
+            return SR.GetString ("PlaceholderExpressionMustBeConstant", p0 );
+        }
+
+        public static string PlaceholderExpressionMustBeGreaterThanOrEqualToZero (object p0)
+        {
+            return SR.GetString ("PlaceholderExpressionMustBeGreaterThanOrEqualToZero", p0 );
+        }
+
+        public static string PlaceholderSetArgTypeIsNotEqualComparable (object p0, object p1, object p2)
+        {
+            return SR.GetString ("PlaceholderSetArgTypeIsNotEqualComparable", p0, p1, p2 );
+        }
+
+        public static string PocoEntityWrapper_UnableToMaterializeArbitaryNavPropType (object p0, object p1)
+        {
+            return SR.GetString ("PocoEntityWrapper_UnableToMaterializeArbitaryNavPropType", p0, p1 );
+        }
+
+        public static string PocoEntityWrapper_UnableToSetFieldOrProperty (object p0, object p1)
+        {
+            return SR.GetString ("PocoEntityWrapper_UnableToSetFieldOrProperty", p0, p1 );
+        }
+
+        public static string PocoEntityWrapper_UnexpectedTypeForNavigationProperty (object p0, object p1)
+        {
+            return SR.GetString ("PocoEntityWrapper_UnexpectedTypeForNavigationProperty", p0, p1 );
+        }
+
+        public static string PrecisionMustBeGreaterThanScale (object p0, object p1)
+        {
+            return SR.GetString ("PrecisionMustBeGreaterThanScale", p0, p1 );
+        }
+
+        public static string PrecisionOutOfRange (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("PrecisionOutOfRange", p0, p1, p2, p3 );
+        }
+
+        public static string PropertyNameAlreadyDefinedDuplicate (object p0)
+        {
+            return SR.GetString ("PropertyNameAlreadyDefinedDuplicate", p0 );
+        }
+
+        public static string PropertyTypeAlreadyDefined (object p0)
+        {
+            return SR.GetString ("PropertyTypeAlreadyDefined", p0 );
+        }
+
+        public static string ProviderDoesNotSupportType (object p0)
+        {
+            return SR.GetString ("ProviderDoesNotSupportType", p0 );
+        }
+
+        public static string ProviderReturnedNullForGetDbInformation (object p0)
+        {
+            return SR.GetString ("ProviderReturnedNullForGetDbInformation", p0 );
+        }
+
+        public static string RefArgIsNotOfEntityType (object p0)
+        {
+            return SR.GetString ("RefArgIsNotOfEntityType", p0 );
+        }
+
+        public static string ReferenceToNonEntityType (object p0)
+        {
+            return SR.GetString ("ReferenceToNonEntityType", p0 );
+        }
+
+        public static string RefTypeIdentifierMustSpecifyAnEntityType (object p0, object p1)
+        {
+            return SR.GetString ("RefTypeIdentifierMustSpecifyAnEntityType", p0, p1 );
+        }
+
+        public static string RelatedEnd_CannotAddToFixedSizeArray (object p0)
+        {
+            return SR.GetString ("RelatedEnd_CannotAddToFixedSizeArray", p0 );
+        }
+
+        public static string RelatedEnd_CannotCreateRelationshipBetweenTrackedAndNoTrackedEntities (object p0)
+        {
+            return SR.GetString ("RelatedEnd_CannotCreateRelationshipBetweenTrackedAndNoTrackedEntities", p0 );
+        }
+
+        public static string RelatedEnd_CannotRemoveFromFixedSizeArray (object p0)
+        {
+            return SR.GetString ("RelatedEnd_CannotRemoveFromFixedSizeArray", p0 );
+        }
+
+        public static string RelatedEnd_CannotSerialize (object p0)
+        {
+            return SR.GetString ("RelatedEnd_CannotSerialize", p0 );
+        }
+
+        public static string RelatedEnd_EntitySetIsNotValidForRelationship (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("RelatedEnd_EntitySetIsNotValidForRelationship", p0, p1, p2, p3, p4 );
+        }
+
+        public static string RelatedEnd_InvalidContainedType_Collection (object p0, object p1)
+        {
+            return SR.GetString ("RelatedEnd_InvalidContainedType_Collection", p0, p1 );
+        }
+
+        public static string RelatedEnd_InvalidContainedType_Reference (object p0, object p1)
+        {
+            return SR.GetString ("RelatedEnd_InvalidContainedType_Reference", p0, p1 );
+        }
+
+        public static string RelatedEnd_InvalidNthElementContextForAttach (object p0)
+        {
+            return SR.GetString ("RelatedEnd_InvalidNthElementContextForAttach", p0 );
+        }
+
+        public static string RelatedEnd_InvalidNthElementNullForAttach (object p0)
+        {
+            return SR.GetString ("RelatedEnd_InvalidNthElementNullForAttach", p0 );
+        }
+
+        public static string RelatedEnd_InvalidNthElementStateForAttach (object p0)
+        {
+            return SR.GetString ("RelatedEnd_InvalidNthElementStateForAttach", p0 );
+        }
+
+        public static string RelatedEnd_InvalidRelationshipFixupDetected (object p0, object p1)
+        {
+            return SR.GetString ("RelatedEnd_InvalidRelationshipFixupDetected", p0, p1 );
+        }
+
+        public static string RelatedEnd_MismatchedMergeOptionOnLoad (object p0)
+        {
+            return SR.GetString ("RelatedEnd_MismatchedMergeOptionOnLoad", p0 );
+        }
+
+        public static string RelatedEnd_RelatedEndNotAttachedToContext (object p0)
+        {
+            return SR.GetString ("RelatedEnd_RelatedEndNotAttachedToContext", p0 );
+        }
+
+        public static string RelatedEndExprTypeMustBePromotoableToToEnd (object p0, object p1)
+        {
+            return SR.GetString ("RelatedEndExprTypeMustBePromotoableToToEnd", p0, p1 );
+        }
+
+        public static string RelationshipManager_CollectionAlreadyInitialized (object p0)
+        {
+            return SR.GetString ("RelationshipManager_CollectionAlreadyInitialized", p0 );
+        }
+
+        public static string RelationshipManager_CollectionRelationshipManagerAttached (object p0)
+        {
+            return SR.GetString ("RelationshipManager_CollectionRelationshipManagerAttached", p0 );
+        }
+
+        public static string RelationshipManager_InvalidTargetRole (object p0, object p1)
+        {
+            return SR.GetString ("RelationshipManager_InvalidTargetRole", p0, p1 );
+        }
+
+        public static string RelationshipManager_NavigationPropertyNotFound (object p0)
+        {
+            return SR.GetString ("RelationshipManager_NavigationPropertyNotFound", p0 );
+        }
+
+        public static string RelationshipManager_OwnerIsNotSourceType (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("RelationshipManager_OwnerIsNotSourceType", p0, p1, p2, p3 );
+        }
+
+        public static string RelationshipManager_ReferenceAlreadyInitialized (object p0)
+        {
+            return SR.GetString ("RelationshipManager_ReferenceAlreadyInitialized", p0 );
+        }
+
+        public static string RelationshipManager_RelationshipManagerAttached (object p0)
+        {
+            return SR.GetString ("RelationshipManager_RelationshipManagerAttached", p0 );
+        }
+
+        public static string RelationshipManager_UnableToFindRelationshipTypeInMetadata (object p0)
+        {
+            return SR.GetString ("RelationshipManager_UnableToFindRelationshipTypeInMetadata", p0 );
+        }
+
+        public static string RelationshipNameInNavigationPropertyNotValid (object p0, object p1, object p2)
+        {
+            return SR.GetString ("RelationshipNameInNavigationPropertyNotValid", p0, p1, p2 );
+        }
+
+        public static string RelationshipTargetMustBeUnique (object p0)
+        {
+            return SR.GetString ("RelationshipTargetMustBeUnique", p0 );
+        }
+
+        public static string RelationshipTypeExpected (object p0)
+        {
+            return SR.GetString ("RelationshipTypeExpected", p0 );
+        }
+
+        public static string RequiredFacetMissing (object p0, object p1)
+        {
+            return SR.GetString ("RequiredFacetMissing", p0, p1 );
+        }
+
+        public static string RoleTypeInEdmRelationshipAttributeIsInvalidType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("RoleTypeInEdmRelationshipAttributeIsInvalidType", p0, p1, p2 );
+        }
+
+        public static string SameRoleNameOnRelationshipAttribute (object p0, object p1)
+        {
+            return SR.GetString ("SameRoleNameOnRelationshipAttribute", p0, p1 );
+        }
+
+        public static string SameRoleReferredInReferentialConstraint (object p0)
+        {
+            return SR.GetString ("SameRoleReferredInReferentialConstraint", p0 );
+        }
+
+        public static string ScaleOutOfRange (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("ScaleOutOfRange", p0, p1, p2, p3 );
+        }
+
+        public static string SimilarRelationshipEnd (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("SimilarRelationshipEnd", p0, p1, p2, p3, p4 );
+        }
+
+        public static string SourceTypeMustBePromotoableToFromEndRelationType (object p0, object p1)
+        {
+            return SR.GetString ("SourceTypeMustBePromotoableToFromEndRelationType", p0, p1 );
+        }
+
+        public static string SqlGen_CanonicalFunctionNotSupportedPriorSql10 (object p0)
+        {
+            return SR.GetString ("SqlGen_CanonicalFunctionNotSupportedPriorSql10", p0 );
+        }
+
+        public static string SqlGen_InvalidDatePartArgumentExpression (object p0, object p1)
+        {
+            return SR.GetString ("SqlGen_InvalidDatePartArgumentExpression", p0, p1 );
+        }
+
+        public static string SqlGen_InvalidDatePartArgumentValue (object p0, object p1, object p2)
+        {
+            return SR.GetString ("SqlGen_InvalidDatePartArgumentValue", p0, p1, p2 );
+        }
+
+        public static string SqlGen_PrimitiveTypeNotSupportedPriorSql10 (object p0)
+        {
+            return SR.GetString ("SqlGen_PrimitiveTypeNotSupportedPriorSql10", p0 );
+        }
+
+        public static string SqlGen_TypedNaNNotSupported (object p0)
+        {
+            return SR.GetString ("SqlGen_TypedNaNNotSupported", p0 );
+        }
+
+        public static string SqlGen_TypedNegativeInfinityNotSupported (object p0, object p1)
+        {
+            return SR.GetString ("SqlGen_TypedNegativeInfinityNotSupported", p0, p1 );
+        }
+
+        public static string SqlGen_TypedPositiveInfinityNotSupported (object p0, object p1)
+        {
+            return SR.GetString ("SqlGen_TypedPositiveInfinityNotSupported", p0, p1 );
+        }
+
+        public static string SqlProvider_InvalidGeographyColumn (object p0)
+        {
+            return SR.GetString ("SqlProvider_InvalidGeographyColumn", p0 );
+        }
+
+        public static string SqlProvider_InvalidGeometryColumn (object p0)
+        {
+            return SR.GetString ("SqlProvider_InvalidGeometryColumn", p0 );
+        }
+
+        public static string SqlProvider_NeedSqlDataReader (object p0)
+        {
+            return SR.GetString ("SqlProvider_NeedSqlDataReader", p0 );
+        }
+
+        public static string SqlSpatialServices_ProviderValueNotSqlType (object p0)
+        {
+            return SR.GetString ("SqlSpatialServices_ProviderValueNotSqlType", p0 );
+        }
+
+        public static string StorageEntityContainerNameMismatchWhileSpecifyingPartialMapping (object p0, object p1, object p2)
+        {
+            return SR.GetString ("StorageEntityContainerNameMismatchWhileSpecifyingPartialMapping", p0, p1, p2);
+        }
+
+        public static string StoreItemCollectionMustHaveOneArtifact (object p0)
+        {
+            return SR.GetString ("StoreItemCollectionMustHaveOneArtifact", p0 );
+        }
+
+        public static string SystemNamespaceEncountered (object p0)
+        {
+            return SR.GetString ("SystemNamespaceEncountered", p0 );
+        }
+
+        public static string TableAndSchemaAreMutuallyExclusiveWithDefiningQuery (object p0)
+        {
+            return SR.GetString ("TableAndSchemaAreMutuallyExclusiveWithDefiningQuery", p0 );
+        }
+
+        public static string TargetRoleNameInNavigationPropertyNotValid (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("TargetRoleNameInNavigationPropertyNotValid", p0, p1, p2, p3 );
+        }
+
+        public static string TextNotAllowed (object p0)
+        {
+            return SR.GetString ("TextNotAllowed", p0 );
+        }
+
+        public static string TooManyAssociationEnds (object p0)
+        {
+            return SR.GetString ("TooManyAssociationEnds", p0 );
+        }
+
+        public static string TypeArgumentBelowMin (object p0)
+        {
+            return SR.GetString ("TypeArgumentBelowMin", p0 );
+        }
+
+        public static string TypeArgumentCountMismatch (object p0, object p1)
+        {
+            return SR.GetString ("TypeArgumentCountMismatch", p0, p1 );
+        }
+
+        public static string TypeArgumentExceedsMax (object p0)
+        {
+            return SR.GetString ("TypeArgumentExceedsMax", p0 );
+        }
+
+        public static string TypeDoesNotSupportFacet (object p0, object p1)
+        {
+            return SR.GetString ("TypeDoesNotSupportFacet", p0, p1 );
+        }
+
+        public static string TypeDoesNotSupportSpec (object p0)
+        {
+            return SR.GetString ("TypeDoesNotSupportSpec", p0 );
+        }
+
+        public static string TypeKindMismatch (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("TypeKindMismatch", p0, p1, p2, p3 );
+        }
+
+        public static string TypeMismatchRelationshipConstaint (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("TypeMismatchRelationshipConstaint", p0, p1, p2, p3, p4 );
+        }
+
+        public static string TypeMustBeEntityType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("TypeMustBeEntityType", p0, p1, p2 );
+        }
+
+        public static string TypeMustBeNominalType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("TypeMustBeNominalType", p0, p1, p2 );
+        }
+
+        public static string TypeNameAlreadyDefinedDuplicate (object p0)
+        {
+            return SR.GetString ("TypeNameAlreadyDefinedDuplicate", p0 );
+        }
+
+        public static string TypeNameNotFound (object p0)
+        {
+            return SR.GetString ("TypeNameNotFound", p0 );
+        }
+
+        public static string TypeNotInAssociationSet (object p0, object p1, object p2)
+        {
+            return SR.GetString ("TypeNotInAssociationSet", p0, p1, p2 );
+        }
+
+        public static string TypeNotInEntitySet (object p0, object p1, object p2)
+        {
+            return SR.GetString ("TypeNotInEntitySet", p0, p1, p2 );
+        }
+
+        public static string UnableToFindReflectedType (object p0, object p1)
+        {
+            return SR.GetString ("UnableToFindReflectedType", p0, p1 );
+        }
+
+        public static string UnableToResolveAssembly (object p0)
+        {
+            return SR.GetString ("UnableToResolveAssembly", p0 );
+        }
+
+        public static string UnacceptableUri (object p0)
+        {
+            return SR.GetString ("UnacceptableUri", p0 );
+        }
+
+        public static string UnexpectedRootElement (object p0, object p1, object p2)
+        {
+            return SR.GetString ("UnexpectedRootElement", p0, p1, p2 );
+        }
+
+        public static string UnexpectedRootElementNoNamespace (object p0, object p1, object p2)
+        {
+            return SR.GetString ("UnexpectedRootElementNoNamespace", p0, p1, p2 );
+        }
+
+        public static string UnexpectedTypeInCollection (object p0, object p1)
+        {
+            return SR.GetString ("UnexpectedTypeInCollection", p0, p1 );
+        }
+
+        public static string UnexpectedXmlAttribute (object p0)
+        {
+            return SR.GetString ("UnexpectedXmlAttribute", p0 );
+        }
+
+        public static string UnexpectedXmlElement (object p0)
+        {
+            return SR.GetString ("UnexpectedXmlElement", p0 );
+        }
+
+        public static string UnexpectedXmlNodeType (object p0)
+        {
+            return SR.GetString ("UnexpectedXmlNodeType", p0 );
+        }
+
+        public static string UnknownExpressionResolutionClass (object p0)
+        {
+            return SR.GetString ("UnknownExpressionResolutionClass", p0 );
+        }
+
+        public static string Update_AmbiguousForeignKey (object p0)
+        {
+            return SR.GetString ("Update_AmbiguousForeignKey", p0 );
+        }
+
+        public static string Update_ConcurrencyError (object p0)
+        {
+            return SR.GetString ("Update_ConcurrencyError", p0 );
+        }
+
+        public static string Update_GeneratedDependent (object p0)
+        {
+            return SR.GetString ("Update_GeneratedDependent", p0 );
+        }
+
+        public static string Update_InsertingOrUpdatingReferenceToDeletedEntity (object p0)
+        {
+            return SR.GetString ("Update_InsertingOrUpdatingReferenceToDeletedEntity", p0 );
+        }
+
+        public static string Update_MappingNotFound (object p0)
+        {
+            return SR.GetString ("Update_MappingNotFound", p0 );
+        }
+
+        public static string Update_MissingEntity (object p0, object p1)
+        {
+            return SR.GetString ("Update_MissingEntity", p0, p1 );
+        }
+
+        public static string Update_MissingFunctionMapping (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Update_MissingFunctionMapping", p0, p1, p2 );
+        }
+
+        public static string Update_MissingRequiredEntity (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Update_MissingRequiredEntity", p0, p1, p2 );
+        }
+
+        public static string Update_MissingRequiredRelationshipValue (object p0, object p1)
+        {
+            return SR.GetString ("Update_MissingRequiredRelationshipValue", p0, p1 );
+        }
+
+        public static string Update_MissingResultColumn (object p0)
+        {
+            return SR.GetString ("Update_MissingResultColumn", p0 );
+        }
+
+        public static string Update_ModifyingIdentityColumn (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Update_ModifyingIdentityColumn", p0, p1, p2 );
+        }
+
+        public static string Update_NotSupportedComputedKeyColumn (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("Update_NotSupportedComputedKeyColumn", p0, p1, p2, p3, p4 );
+        }
+
+        public static string Update_NotSupportedIdentityType (object p0, object p1)
+        {
+            return SR.GetString ("Update_NotSupportedIdentityType", p0, p1 );
+        }
+
+        public static string Update_NotSupportedServerGenKey (object p0)
+        {
+            return SR.GetString ("Update_NotSupportedServerGenKey", p0 );
+        }
+
+        public static string Update_NullReturnValueForNonNullableMember (object p0, object p1)
+        {
+            return SR.GetString ("Update_NullReturnValueForNonNullableMember", p0, p1 );
+        }
+
+        public static string Update_NullValue (object p0)
+        {
+            return SR.GetString ("Update_NullValue", p0 );
+        }
+
+        public static string Update_RelationshipCardinalityConstraintViolation (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("Update_RelationshipCardinalityConstraintViolation", p0, p1, p2, p3, p4, p5);
+        }
+
+        public static string Update_RelationshipCardinalityConstraintViolationSingleValue (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("Update_RelationshipCardinalityConstraintViolationSingleValue", p0, p1, p2, p3, p4);
+        }
+
+        public static string Update_RelationshipCardinalityViolation (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("Update_RelationshipCardinalityViolation", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string Update_ReturnValueHasUnexpectedType (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("Update_ReturnValueHasUnexpectedType", p0, p1, p2, p3 );
+        }
+
+        public static string Update_SqlEntitySetWithoutDmlFunctions (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Update_SqlEntitySetWithoutDmlFunctions", p0, p1, p2 );
+        }
+
+        public static string Update_UnableToConvertRowsAffectedParameterToInt32 (object p0, object p1)
+        {
+            return SR.GetString ("Update_UnableToConvertRowsAffectedParameterToInt32", p0, p1 );
+        }
+
+        public static string Update_UnsupportedCastArgument (object p0)
+        {
+            return SR.GetString ("Update_UnsupportedCastArgument", p0 );
+        }
+
+        public static string Update_UnsupportedExpressionKind (object p0, object p1)
+        {
+            return SR.GetString ("Update_UnsupportedExpressionKind", p0, p1 );
+        }
+
+        public static string Update_UnsupportedExtentType (object p0, object p1)
+        {
+            return SR.GetString ("Update_UnsupportedExtentType", p0, p1 );
+        }
+
+        public static string Update_UnsupportedJoinType (object p0)
+        {
+            return SR.GetString ("Update_UnsupportedJoinType", p0 );
+        }
+
+        public static string Update_UnsupportedProjection (object p0)
+        {
+            return SR.GetString ("Update_UnsupportedProjection", p0 );
+        }
+
+        public static string Validator_NoKeyMembers (object p0)
+        {
+            return SR.GetString ("Validator_NoKeyMembers", p0 );
+        }
+
+        public static string Validator_NullableEntityKeyProperty (object p0, object p1)
+        {
+            return SR.GetString ("Validator_NullableEntityKeyProperty", p0, p1 );
+        }
+
+        public static string Validator_OSpace_ComplexPropertyNotComplex (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Validator_OSpace_ComplexPropertyNotComplex", p0, p1, p2 );
+        }
+
+        public static string Validator_OSpace_Convention_AmbiguousClrType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_AmbiguousClrType", p0, p1, p2 );
+        }
+
+        public static string Validator_OSpace_Convention_AttributeAssemblyReferenced (object p0)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_AttributeAssemblyReferenced", p0 );
+        }
+
+        public static string Validator_OSpace_Convention_BaseTypeIncompatible (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_BaseTypeIncompatible", p0, p1, p2 );
+        }
+
+        public static string Validator_OSpace_Convention_BaseTypeNotLoaded (object p0, object p1)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_BaseTypeNotLoaded", p0, p1 );
+        }
+
+        public static string Validator_OSpace_Convention_MissingOSpaceType (object p0)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_MissingOSpaceType", p0 );
+        }
+
+        public static string Validator_OSpace_Convention_MissingRequiredProperty (object p0, object p1)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_MissingRequiredProperty", p0, p1 );
+        }
+
+        public static string Validator_OSpace_Convention_MultipleTypesWithSameName (object p0)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_MultipleTypesWithSameName", p0 );
+        }
+
+        public static string Validator_OSpace_Convention_NonPrimitiveTypeProperty (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_NonPrimitiveTypeProperty", p0, p1, p2 );
+        }
+
+        public static string Validator_OSpace_Convention_RelationshipNotLoaded (object p0, object p1)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_RelationshipNotLoaded", p0, p1 );
+        }
+
+        public static string Validator_OSpace_Convention_ScalarPropertyMissginGetterOrSetter (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_ScalarPropertyMissginGetterOrSetter", p0, p1, p2);
+        }
+
+        public static string Validator_OSpace_Convention_SSpaceOSpaceTypeMismatch (object p0, object p1)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_SSpaceOSpaceTypeMismatch", p0, p1 );
+        }
+
+        public static string Validator_OSpace_Convention_Struct (object p0, object p1)
+        {
+            return SR.GetString ("Validator_OSpace_Convention_Struct", p0, p1 );
+        }
+
+        public static string Validator_OSpace_InvalidNavPropReturnType (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Validator_OSpace_InvalidNavPropReturnType", p0, p1, p2 );
+        }
+
+        public static string Validator_OSpace_ScalarPropertyNotPrimitive (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Validator_OSpace_ScalarPropertyNotPrimitive", p0, p1, p2 );
+        }
+
+        public static string Validator_UnsupportedEnumUnderlyingType (object p0)
+        {
+            return SR.GetString ("Validator_UnsupportedEnumUnderlyingType", p0 );
+        }
+
+        public static string ValueNotUnderstood (object p0, object p1)
+        {
+            return SR.GetString ("ValueNotUnderstood", p0, p1 );
+        }
+
+        public static string ViewGen_AssociationEndShouldBeMappedToKey (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_AssociationEndShouldBeMappedToKey", p0, p1 );
+        }
+
+        public static string ViewGen_AssociationSet_AsUserString (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_AssociationSet_AsUserString", p0, p1, p2 );
+        }
+
+        public static string ViewGen_AssociationSet_AsUserString_Negated (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_AssociationSet_AsUserString_Negated", p0, p1, p2 );
+        }
+
+        public static string ViewGen_AssociationSetKey_Missing (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_AssociationSetKey_Missing", p0, p1, p2 );
+        }
+
+        public static string ViewGen_Cannot_Disambiguate_MultiConstant (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_Cannot_Disambiguate_MultiConstant", p0, p1 );
+        }
+
+        public static string ViewGen_Cannot_Recover_Attributes (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_Cannot_Recover_Attributes", p0, p1, p2 );
+        }
+
+        public static string ViewGen_Cannot_Recover_Types (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_Cannot_Recover_Types", p0, p1 );
+        }
+
+        public static string Viewgen_CannotGenerateQueryViewUnderNoValidation (object p0)
+        {
+            return SR.GetString ("Viewgen_CannotGenerateQueryViewUnderNoValidation", p0 );
+        }
+
+        public static string ViewGen_Concurrency_Derived_Class (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_Concurrency_Derived_Class", p0, p1, p2 );
+        }
+
+        public static string ViewGen_Concurrency_Invalid_Condition (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_Concurrency_Invalid_Condition", p0, p1 );
+        }
+
+        public static string Viewgen_ConfigurationErrorMsg (object p0)
+        {
+            return SR.GetString ("Viewgen_ConfigurationErrorMsg", p0 );
+        }
+
+        public static string ViewGen_CQ_DomainConstraint (object p0)
+        {
+            return SR.GetString ("ViewGen_CQ_DomainConstraint", p0 );
+        }
+
+        public static string ViewGen_CQ_PartitionConstraint (object p0)
+        {
+            return SR.GetString ("ViewGen_CQ_PartitionConstraint", p0 );
+        }
+
+        public static string ViewGen_Duplicate_CProperties (object p0)
+        {
+            return SR.GetString ("ViewGen_Duplicate_CProperties", p0 );
+        }
+
+        public static string ViewGen_Duplicate_CProperties_IsMapped (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_Duplicate_CProperties_IsMapped", p0, p1 );
+        }
+
+        public static string ViewGen_EntitySet_AsUserString (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_EntitySet_AsUserString", p0, p1 );
+        }
+
+        public static string ViewGen_EntitySet_AsUserString_Negated (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_EntitySet_AsUserString_Negated", p0, p1 );
+        }
+
+        public static string ViewGen_EntitySetKey_Missing (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_EntitySetKey_Missing", p0, p1 );
+        }
+
+        public static string ViewGen_ErrorLog (object p0)
+        {
+            return SR.GetString ("ViewGen_ErrorLog", p0 );
+        }
+
+        public static string ViewGen_ErrorLog2 (object p0)
+        {
+            return SR.GetString ("ViewGen_ErrorLog2", p0 );
+        }
+
+        public static string Viewgen_ErrorPattern_ConditionMemberIsMapped (object p0)
+        {
+            return SR.GetString ("Viewgen_ErrorPattern_ConditionMemberIsMapped", p0 );
+        }
+
+        public static string Viewgen_ErrorPattern_DuplicateConditionValue (object p0)
+        {
+            return SR.GetString ("Viewgen_ErrorPattern_DuplicateConditionValue", p0 );
+        }
+
+        public static string Viewgen_ErrorPattern_NotNullConditionMappedToNullableMember (object p0, object p1)
+        {
+            return SR.GetString ("Viewgen_ErrorPattern_NotNullConditionMappedToNullableMember", p0, p1 );
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_MultipleTypesMappedToSameTable_WithoutCondition (object p0, object p1)
+        {
+            return SR.GetString ("Viewgen_ErrorPattern_Partition_MultipleTypesMappedToSameTable_WithoutCondition", p0, p1);
+        }
+
+        public static string Viewgen_ErrorPattern_TableMappedToMultipleES (object p0, object p1, object p2)
+        {
+            return SR.GetString ("Viewgen_ErrorPattern_TableMappedToMultipleES", p0, p1, p2 );
+        }
+
+        public static string ViewGen_Foreign_Key (object p0, object p1, object p2, object p3, object p4)
+        {
+            return SR.GetString ("ViewGen_Foreign_Key", p0, p1, p2, p3, p4 );
+        }
+
+        public static string ViewGen_Foreign_Key_LowerBound_MustBeOne (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_Foreign_Key_LowerBound_MustBeOne", p0, p1, p2 );
+        }
+
+        public static string ViewGen_Foreign_Key_Missing_Relationship_Mapping (object p0)
+        {
+            return SR.GetString ("ViewGen_Foreign_Key_Missing_Relationship_Mapping", p0 );
+        }
+
+        public static string ViewGen_Foreign_Key_Missing_Table_Mapping (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_Foreign_Key_Missing_Table_Mapping", p0, p1 );
+        }
+
+        public static string ViewGen_Foreign_Key_Not_Guaranteed_InCSpace (object p0)
+        {
+            return SR.GetString ("ViewGen_Foreign_Key_Not_Guaranteed_InCSpace", p0 );
+        }
+
+        public static string ViewGen_Foreign_Key_ParentTable_NotMappedToEnd (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("ViewGen_Foreign_Key_ParentTable_NotMappedToEnd", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string ViewGen_Foreign_Key_UpperBound_MustBeOne (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_Foreign_Key_UpperBound_MustBeOne", p0, p1, p2 );
+        }
+
+        public static string ViewGen_HashOnMappingClosure_Not_Matching (object p0)
+        {
+            return SR.GetString ("ViewGen_HashOnMappingClosure_Not_Matching", p0 );
+        }
+
+        public static string ViewGen_InvalidCondition (object p0)
+        {
+            return SR.GetString ("ViewGen_InvalidCondition", p0 );
+        }
+
+        public static string ViewGen_KeyConstraint_Update_Violation_AssociationSet (object p0, object p1, object p2)
+        {
+            return SR.GetString ("ViewGen_KeyConstraint_Update_Violation_AssociationSet", p0, p1, p2 );
+        }
+
+        public static string ViewGen_KeyConstraint_Update_Violation_EntitySet (object p0, object p1, object p2, object p3)
+        {
+            return SR.GetString ("ViewGen_KeyConstraint_Update_Violation_EntitySet", p0, p1, p2, p3 );
+        }
+
+        public static string ViewGen_KeyConstraint_Violation (object p0, object p1, object p2, object p3, object p4, object p5)
+        {
+            return SR.GetString ("ViewGen_KeyConstraint_Violation", p0, p1, p2, p3, p4, p5 );
+        }
+
+        public static string ViewGen_Missing_Set_Mapping (object p0)
+        {
+            return SR.GetString ("ViewGen_Missing_Set_Mapping", p0 );
+        }
+
+        public static string ViewGen_Missing_Sets_Mapping (object p0)
+        {
+            return SR.GetString ("ViewGen_Missing_Sets_Mapping", p0 );
+        }
+
+        public static string ViewGen_Missing_Type_Mapping (object p0)
+        {
+            return SR.GetString ("ViewGen_Missing_Type_Mapping", p0 );
+        }
+
+        public static string Viewgen_MultipleFragmentsBetweenCandSExtentWithDistinct (object p0, object p1)
+        {
+            return SR.GetString ("Viewgen_MultipleFragmentsBetweenCandSExtentWithDistinct", p0, p1 );
+        }
+
+        public static string ViewGen_NegatedCellConstant (object p0)
+        {
+            return SR.GetString ("ViewGen_NegatedCellConstant", p0 );
+        }
+
+        public static string ViewGen_No_Default_Value (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_No_Default_Value", p0, p1 );
+        }
+
+        public static string ViewGen_No_Default_Value_For_Configuration (object p0)
+        {
+            return SR.GetString ("ViewGen_No_Default_Value_For_Configuration", p0 );
+        }
+
+        public static string ViewGen_NonKeyProjectedWithOverlappingPartitions (object p0)
+        {
+            return SR.GetString ("ViewGen_NonKeyProjectedWithOverlappingPartitions", p0 );
+        }
+
+        public static string ViewGen_NotNull_No_Projected_Slot (object p0)
+        {
+            return SR.GetString ("ViewGen_NotNull_No_Projected_Slot", p0 );
+        }
+
+        public static string Viewgen_NullableMappingForNonNullableColumn (object p0, object p1)
+        {
+            return SR.GetString ("Viewgen_NullableMappingForNonNullableColumn", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_IsEqualTo (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_IsEqualTo", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_IsNonNullable (object p0)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_IsNonNullable", p0 );
+        }
+
+        public static string ViewGen_OneOfConst_IsNotEqualTo (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_IsNotEqualTo", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_IsNotOneOf (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_IsNotOneOf", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_IsOneOf (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_IsOneOf", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_IsOneOfTypes (object p0)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_IsOneOfTypes", p0 );
+        }
+
+        public static string ViewGen_OneOfConst_MustBeEqualTo (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_MustBeEqualTo", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_MustBeNonNullable (object p0)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_MustBeNonNullable", p0 );
+        }
+
+        public static string ViewGen_OneOfConst_MustBeNull (object p0)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_MustBeNull", p0 );
+        }
+
+        public static string ViewGen_OneOfConst_MustBeOneOf (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_MustBeOneOf", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_MustNotBeEqualTo (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_MustNotBeEqualTo", p0, p1 );
+        }
+
+        public static string ViewGen_OneOfConst_MustNotBeOneOf (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_OneOfConst_MustNotBeOneOf", p0, p1 );
+        }
+
+        public static string Viewgen_QV_RewritingNotFound (object p0)
+        {
+            return SR.GetString ("Viewgen_QV_RewritingNotFound", p0 );
+        }
+
+        public static string Viewgen_RightSideNotDisjoint (object p0)
+        {
+            return SR.GetString ("Viewgen_RightSideNotDisjoint", p0 );
+        }
+
+        public static string ViewGen_TableKey_Missing (object p0, object p1)
+        {
+            return SR.GetString ("ViewGen_TableKey_Missing", p0, p1 );
+        }
+
+        // Properties
+        public static string ADP_ClosedDataReaderError {
+            get {
+                return SR.GetString ("ADP_ClosedDataReaderError");
+            }
+        }
+
+        public static string ADP_GetSchemaTableIsNotSupported {
+            get {
+                return SR.GetString ("ADP_GetSchemaTableIsNotSupported");
+            }
+        }
+
+        public static string ADP_ImplicitlyClosedDataReaderError {
+            get {
+                return SR.GetString ("ADP_ImplicitlyClosedDataReaderError");
+            }
+        }
+
+        public static string ADP_InvalidDataDirectory {
+            get {
+                return SR.GetString ("ADP_InvalidDataDirectory");
+            }
+        }
+
+        public static string ADP_InvalidDataReaderFieldCountForScalarType {
+            get {
+                return SR.GetString ("ADP_InvalidDataReaderFieldCountForScalarType");
+            }
+        }
+
+        public static string ADP_InvalidDataReaderUnableToDetermineType {
+            get {
+                return SR.GetString ("ADP_InvalidDataReaderUnableToDetermineType");
+            }
+        }
+
+        public static string ADP_InvalidMultipartNameDelimiterUsage {
+            get {
+                return SR.GetString ("ADP_InvalidMultipartNameDelimiterUsage");
+            }
+        }
+
+        public static string ADP_KeysRequiredForNesting {
+            get {
+                return SR.GetString ("ADP_KeysRequiredForNesting");
+            }
+        }
+
+        public static string ADP_MustUseSequentialAccess {
+            get {
+                return SR.GetString ("ADP_MustUseSequentialAccess");
+            }
+        }
+
+        public static string ADP_NoData {
+            get {
+                return SR.GetString ("ADP_NoData");
+            }
+        }
+
+        public static string ADP_ProviderDoesNotSupportCommandTrees {
+            get {
+                return SR.GetString ("ADP_ProviderDoesNotSupportCommandTrees");
+            }
+        }
+
+        public static string AllElementsMustBeInSchema {
+            get {
+                return SR.GetString ("AllElementsMustBeInSchema");
+            }
+        }
+
+        public static string AmbiguousFunctionArguments {
+            get {
+                return SR.GetString ("AmbiguousFunctionArguments");
+            }
+        }
+
+        public static string ArgumentMustBeCSpaceType {
+            get {
+                return SR.GetString ("ArgumentMustBeCSpaceType");
+            }
+        }
+
+        public static string ArgumentMustBeOSpaceType {
+            get {
+                return SR.GetString ("ArgumentMustBeOSpaceType");
+            }
+        }
+
+        public static string ArrayTooSmall {
+            get {
+                return SR.GetString ("ArrayTooSmall");
+            }
+        }
+
+        public static string AtleastOneSSDLNeeded {
+            get {
+                return SR.GetString ("AtleastOneSSDLNeeded");
+            }
+        }
+
+        public static string BadNavigationPropertyRolesCannotBeTheSame {
+            get {
+                return SR.GetString ("BadNavigationPropertyRolesCannotBeTheSame");
+            }
+        }
+
+        public static string BetweenLimitsCannotBeUntypedNulls {
+            get {
+                return SR.GetString ("BetweenLimitsCannotBeUntypedNulls");
+            }
+        }
+
+        public static string CalculatedEnumValueOutOfRange {
+            get {
+                return SR.GetString ("CalculatedEnumValueOutOfRange");
+            }
+        }
+
+        public static string CannotCreateEmptyMultiset {
+            get {
+                return SR.GetString ("CannotCreateEmptyMultiset");
+            }
+        }
+
+        public static string CannotCreateMultisetofNulls {
+            get {
+                return SR.GetString ("CannotCreateMultisetofNulls");
+            }
+        }
+
+        public static string CannotLoadDifferentVersionOfSchemaInTheSameItemCollection {
+            get {
+                return SR.GetString ("CannotLoadDifferentVersionOfSchemaInTheSameItemCollection");
+            }
+        }
+
+        public static string CodeGen_PropertyDeclaringTypeIsValueType {
+            get {
+                return SR.GetString ("CodeGen_PropertyDeclaringTypeIsValueType");
+            }
+        }
+
+        public static string CodeGen_PropertyIsIndexed {
+            get {
+                return SR.GetString ("CodeGen_PropertyIsIndexed");
+            }
+        }
+
+        public static string CodeGen_PropertyIsStatic {
+            get {
+                return SR.GetString ("CodeGen_PropertyIsStatic");
+            }
+        }
+
+        public static string CodeGen_PropertyNoGetter {
+            get {
+                return SR.GetString ("CodeGen_PropertyNoGetter");
+            }
+        }
+
+        public static string CodeGen_PropertyNoSetter {
+            get {
+                return SR.GetString ("CodeGen_PropertyNoSetter");
+            }
+        }
+
+        public static string CodeGen_PropertyStrongNameIdentity {
+            get {
+                return SR.GetString ("CodeGen_PropertyStrongNameIdentity");
+            }
+        }
+
+        public static string CodeGen_PropertyUnsupportedForm {
+            get {
+                return SR.GetString ("CodeGen_PropertyUnsupportedForm");
+            }
+        }
+
+        public static string CodeGen_PropertyUnsupportedType {
+            get {
+                return SR.GetString ("CodeGen_PropertyUnsupportedType");
+            }
+        }
+
+        public static string Collections_InvalidEntityStateSource {
+            get {
+                return SR.GetString ("Collections_InvalidEntityStateSource");
+            }
+        }
+
+        public static string Collections_UnableToMergeCollections {
+            get {
+                return SR.GetString ("Collections_UnableToMergeCollections");
+            }
+        }
+
+        public static string CommandTextFunctionsCannotDeclareStoreFunctionName {
+            get {
+                return SR.GetString ("CommandTextFunctionsCannotDeclareStoreFunctionName");
+            }
+        }
+
+        public static string CommandTextFunctionsNotComposable {
+            get {
+                return SR.GetString ("CommandTextFunctionsNotComposable");
+            }
+        }
+
+        public static string ComplexObject_ComplexObjectAlreadyAttachedToParent {
+            get {
+                return SR.GetString ("ComplexObject_ComplexObjectAlreadyAttachedToParent");
+            }
+        }
+
+        public static string ComposableFunctionOrFunctionImportMustDeclareReturnType {
+            get {
+                return SR.GetString ("ComposableFunctionOrFunctionImportMustDeclareReturnType");
+            }
+        }
+
+        public static string ConcatBuiltinNotSupported {
+            get {
+                return SR.GetString ("ConcatBuiltinNotSupported");
+            }
+        }
+
+        public static string Cqt_Aggregate_InvalidFunction {
+            get {
+                return SR.GetString ("Cqt_Aggregate_InvalidFunction");
+            }
+        }
+
+        public static string Cqt_And_BooleanArgumentsRequired {
+            get {
+                return SR.GetString ("Cqt_And_BooleanArgumentsRequired");
+            }
+        }
+
+        public static string Cqt_Apply_DuplicateVariableNames {
+            get {
+                return SR.GetString ("Cqt_Apply_DuplicateVariableNames");
+            }
+        }
+
+        public static string Cqt_Arithmetic_NumericCommonType {
+            get {
+                return SR.GetString ("Cqt_Arithmetic_NumericCommonType");
+            }
+        }
+
+        public static string Cqt_Binding_CollectionRequired {
+            get {
+                return SR.GetString ("Cqt_Binding_CollectionRequired");
+            }
+        }
+
+        public static string Cqt_Binding_VariableNameNotValid {
+            get {
+                return SR.GetString ("Cqt_Binding_VariableNameNotValid");
+            }
+        }
+
+        public static string Cqt_Case_InvalidResultType {
+            get {
+                return SR.GetString ("Cqt_Case_InvalidResultType");
+            }
+        }
+
+        public static string Cqt_Case_WhensMustEqualThens {
+            get {
+                return SR.GetString ("Cqt_Case_WhensMustEqualThens");
+            }
+        }
+
+        public static string Cqt_CommandTree_InvalidDataSpace {
+            get {
+                return SR.GetString ("Cqt_CommandTree_InvalidDataSpace");
+            }
+        }
+
+        public static string Cqt_Comparison_ComparableRequired {
+            get {
+                return SR.GetString ("Cqt_Comparison_ComparableRequired");
+            }
+        }
+
+        public static string Cqt_Constant_InvalidType {
+            get {
+                return SR.GetString ("Cqt_Constant_InvalidType");
+            }
+        }
+
+        public static string Cqt_CrossJoin_AtLeastTwoInputs {
+            get {
+                return SR.GetString ("Cqt_CrossJoin_AtLeastTwoInputs");
+            }
+        }
+
+        public static string Cqt_DeRef_RefRequired {
+            get {
+                return SR.GetString ("Cqt_DeRef_RefRequired");
+            }
+        }
+
+        public static string Cqt_Distinct_InvalidCollection {
+            get {
+                return SR.GetString ("Cqt_Distinct_InvalidCollection");
+            }
+        }
+
+        public static string Cqt_Element_InvalidArgumentForUnwrapSingleProperty {
+            get {
+                return SR.GetString ("Cqt_Element_InvalidArgumentForUnwrapSingleProperty");
+            }
+        }
+
+        public static string Cqt_Exceptions_InvalidCommandTree {
+            get {
+                return SR.GetString ("Cqt_Exceptions_InvalidCommandTree");
+            }
+        }
+
+        public static string Cqt_ExpressionList_IncorrectElementCount {
+            get {
+                return SR.GetString ("Cqt_ExpressionList_IncorrectElementCount");
+            }
+        }
+
+        public static string Cqt_Factory_IncompatibleRelationEnds {
+            get {
+                return SR.GetString ("Cqt_Factory_IncompatibleRelationEnds");
+            }
+        }
+
+        public static string Cqt_Factory_NewCollectionInvalidCommonType {
+            get {
+                return SR.GetString ("Cqt_Factory_NewCollectionInvalidCommonType");
+            }
+        }
+
+        public static string Cqt_Factory_NoSuchRelationEnd {
+            get {
+                return SR.GetString ("Cqt_Factory_NoSuchRelationEnd");
+            }
+        }
+
+        public static string Cqt_Function_CommandTextInExpression {
+            get {
+                return SR.GetString ("Cqt_Function_CommandTextInExpression");
+            }
+        }
+
+        public static string Cqt_Function_NonComposableInExpression {
+            get {
+                return SR.GetString ("Cqt_Function_NonComposableInExpression");
+            }
+        }
+
+        public static string Cqt_Function_VoidResultInvalid {
+            get {
+                return SR.GetString ("Cqt_Function_VoidResultInvalid");
+            }
+        }
+
+        public static string Cqt_General_MetadataNotReadOnly {
+            get {
+                return SR.GetString ("Cqt_General_MetadataNotReadOnly");
+            }
+        }
+
+        public static string Cqt_General_NoProviderBooleanType {
+            get {
+                return SR.GetString ("Cqt_General_NoProviderBooleanType");
+            }
+        }
+
+        public static string Cqt_General_NoProviderIntegerType {
+            get {
+                return SR.GetString ("Cqt_General_NoProviderIntegerType");
+            }
+        }
+
+        public static string Cqt_General_NoProviderStringType {
+            get {
+                return SR.GetString ("Cqt_General_NoProviderStringType");
+            }
+        }
+
+        public static string Cqt_GetEntityRef_EntityRequired {
+            get {
+                return SR.GetString ("Cqt_GetEntityRef_EntityRequired");
+            }
+        }
+
+        public static string Cqt_GetRefKey_RefRequired {
+            get {
+                return SR.GetString ("Cqt_GetRefKey_RefRequired");
+            }
+        }
+
+        public static string Cqt_GroupBinding_CollectionRequired {
+            get {
+                return SR.GetString ("Cqt_GroupBinding_CollectionRequired");
+            }
+        }
+
+        public static string Cqt_GroupBinding_GroupVariableNameNotValid {
+            get {
+                return SR.GetString ("Cqt_GroupBinding_GroupVariableNameNotValid");
+            }
+        }
+
+        public static string Cqt_GroupBy_AtLeastOneKeyOrAggregate {
+            get {
+                return SR.GetString ("Cqt_GroupBy_AtLeastOneKeyOrAggregate");
+            }
+        }
+
+        public static string Cqt_GroupBy_MoreThanOneGroupAggregate {
+            get {
+                return SR.GetString ("Cqt_GroupBy_MoreThanOneGroupAggregate");
+            }
+        }
+
+        public static string Cqt_IsNull_CollectionNotAllowed {
+            get {
+                return SR.GetString ("Cqt_IsNull_CollectionNotAllowed");
+            }
+        }
+
+        public static string Cqt_IsNull_InvalidType {
+            get {
+                return SR.GetString ("Cqt_IsNull_InvalidType");
+            }
+        }
+
+        public static string Cqt_Join_DuplicateVariableNames {
+            get {
+                return SR.GetString ("Cqt_Join_DuplicateVariableNames");
+            }
+        }
+
+        public static string Cqt_Limit_ConstantOrParameterRefRequired {
+            get {
+                return SR.GetString ("Cqt_Limit_ConstantOrParameterRefRequired");
+            }
+        }
+
+        public static string Cqt_Limit_IntegerRequired {
+            get {
+                return SR.GetString ("Cqt_Limit_IntegerRequired");
+            }
+        }
+
+        public static string Cqt_Limit_NonNegativeLimitRequired {
+            get {
+                return SR.GetString ("Cqt_Limit_NonNegativeLimitRequired");
+            }
+        }
+
+        public static string Cqt_Metadata_EdmMemberIncorrectSpace {
+            get {
+                return SR.GetString ("Cqt_Metadata_EdmMemberIncorrectSpace");
+            }
+        }
+
+        public static string Cqt_Metadata_EntitySetEntityContainerNull {
+            get {
+                return SR.GetString ("Cqt_Metadata_EntitySetEntityContainerNull");
+            }
+        }
+
+        public static string Cqt_Metadata_EntitySetIncorrectSpace {
+            get {
+                return SR.GetString ("Cqt_Metadata_EntitySetIncorrectSpace");
+            }
+        }
+
+        public static string Cqt_Metadata_EntityTypeEmptyKeyMembersInvalid {
+            get {
+                return SR.GetString ("Cqt_Metadata_EntityTypeEmptyKeyMembersInvalid");
+            }
+        }
+
+        public static string Cqt_Metadata_EntityTypeNullKeyMembersInvalid {
+            get {
+                return SR.GetString ("Cqt_Metadata_EntityTypeNullKeyMembersInvalid");
+            }
+        }
+
+        public static string Cqt_Metadata_FunctionIncorrectSpace {
+            get {
+                return SR.GetString ("Cqt_Metadata_FunctionIncorrectSpace");
+            }
+        }
+
+        public static string Cqt_Metadata_FunctionParameterIncorrectSpace {
+            get {
+                return SR.GetString ("Cqt_Metadata_FunctionParameterIncorrectSpace");
+            }
+        }
+
+        public static string Cqt_Metadata_FunctionReturnParameterNull {
+            get {
+                return SR.GetString ("Cqt_Metadata_FunctionReturnParameterNull");
+            }
+        }
+
+        public static string Cqt_Metadata_TypeUsageIncorrectSpace {
+            get {
+                return SR.GetString ("Cqt_Metadata_TypeUsageIncorrectSpace");
+            }
+        }
+
+        public static string Cqt_NewInstance_CollectionTypeRequired {
+            get {
+                return SR.GetString ("Cqt_NewInstance_CollectionTypeRequired");
+            }
+        }
+
+        public static string Cqt_NewInstance_IncompatibleRelatedEntity_SourceTypeNotValid {
+            get {
+                return SR.GetString ("Cqt_NewInstance_IncompatibleRelatedEntity_SourceTypeNotValid");
+            }
+        }
+
+        public static string Cqt_NewInstance_StructuralTypeRequired {
+            get {
+                return SR.GetString ("Cqt_NewInstance_StructuralTypeRequired");
+            }
+        }
+
+        public static string Cqt_Not_BooleanArgumentRequired {
+            get {
+                return SR.GetString ("Cqt_Not_BooleanArgumentRequired");
+            }
+        }
+
+        public static string Cqt_Or_BooleanArgumentsRequired {
+            get {
+                return SR.GetString ("Cqt_Or_BooleanArgumentsRequired");
+            }
+        }
+
+        public static string Cqt_Property_InstanceRequiredForInstance {
+            get {
+                return SR.GetString ("Cqt_Property_InstanceRequiredForInstance");
+            }
+        }
+
+        public static string Cqt_Ref_PolymorphicArgRequired {
+            get {
+                return SR.GetString ("Cqt_Ref_PolymorphicArgRequired");
+            }
+        }
+
+        public static string Cqt_RelatedEntityRef_TargetEndFromDifferentRelationship {
+            get {
+                return SR.GetString ("Cqt_RelatedEntityRef_TargetEndFromDifferentRelationship");
+            }
+        }
+
+        public static string Cqt_RelatedEntityRef_TargetEndMustBeAtMostOne {
+            get {
+                return SR.GetString ("Cqt_RelatedEntityRef_TargetEndMustBeAtMostOne");
+            }
+        }
+
+        public static string Cqt_RelatedEntityRef_TargetEndSameAsSourceEnd {
+            get {
+                return SR.GetString ("Cqt_RelatedEntityRef_TargetEndSameAsSourceEnd");
+            }
+        }
+
+        public static string Cqt_RelatedEntityRef_TargetEntityNotCompatible {
+            get {
+                return SR.GetString ("Cqt_RelatedEntityRef_TargetEntityNotCompatible");
+            }
+        }
+
+        public static string Cqt_RelatedEntityRef_TargetEntityNotRef {
+            get {
+                return SR.GetString ("Cqt_RelatedEntityRef_TargetEntityNotRef");
+            }
+        }
+
+        public static string Cqt_RelNav_NoCompositions {
+            get {
+                return SR.GetString ("Cqt_RelNav_NoCompositions");
+            }
+        }
+
+        public static string Cqt_Skip_ConstantOrParameterRefRequired {
+            get {
+                return SR.GetString ("Cqt_Skip_ConstantOrParameterRefRequired");
+            }
+        }
+
+        public static string Cqt_Skip_IntegerRequired {
+            get {
+                return SR.GetString ("Cqt_Skip_IntegerRequired");
+            }
+        }
+
+        public static string Cqt_Skip_NonNegativeCountRequired {
+            get {
+                return SR.GetString ("Cqt_Skip_NonNegativeCountRequired");
+            }
+        }
+
+        public static string Cqt_Sort_EmptyCollationInvalid {
+            get {
+                return SR.GetString ("Cqt_Sort_EmptyCollationInvalid");
+            }
+        }
+
+        public static string Cqt_Sort_NonStringCollationInvalid {
+            get {
+                return SR.GetString ("Cqt_Sort_NonStringCollationInvalid");
+            }
+        }
+
+        public static string Cqt_Sort_OrderComparable {
+            get {
+                return SR.GetString ("Cqt_Sort_OrderComparable");
+            }
+        }
+
+        public static string Cqt_Util_CheckListEmptyInvalid {
+            get {
+                return SR.GetString ("Cqt_Util_CheckListEmptyInvalid");
+            }
+        }
+
+        public static string CtxAlias {
+            get {
+                return SR.GetString ("CtxAlias");
+            }
+        }
+
+        public static string CtxAliasedNamespaceImport {
+            get {
+                return SR.GetString ("CtxAliasedNamespaceImport");
+            }
+        }
+
+        public static string CtxAnd {
+            get {
+                return SR.GetString ("CtxAnd");
+            }
+        }
+
+        public static string CtxAnyElement {
+            get {
+                return SR.GetString ("CtxAnyElement");
+            }
+        }
+
+        public static string CtxApplyClause {
+            get {
+                return SR.GetString ("CtxApplyClause");
+            }
+        }
+
+        public static string CtxBetween {
+            get {
+                return SR.GetString ("CtxBetween");
+            }
+        }
+
+        public static string CtxCase {
+            get {
+                return SR.GetString ("CtxCase");
+            }
+        }
+
+        public static string CtxCaseElse {
+            get {
+                return SR.GetString ("CtxCaseElse");
+            }
+        }
+
+        public static string CtxCaseWhenThen {
+            get {
+                return SR.GetString ("CtxCaseWhenThen");
+            }
+        }
+
+        public static string CtxCast {
+            get {
+                return SR.GetString ("CtxCast");
+            }
+        }
+
+        public static string CtxCollatedOrderByClauseItem {
+            get {
+                return SR.GetString ("CtxCollatedOrderByClauseItem");
+            }
+        }
+
+        public static string CtxCollectionTypeDefinition {
+            get {
+                return SR.GetString ("CtxCollectionTypeDefinition");
+            }
+        }
+
+        public static string CtxCommandExpression {
+            get {
+                return SR.GetString ("CtxCommandExpression");
+            }
+        }
+
+        public static string CtxCreateRef {
+            get {
+                return SR.GetString ("CtxCreateRef");
+            }
+        }
+
+        public static string CtxDeref {
+            get {
+                return SR.GetString ("CtxDeref");
+            }
+        }
+
+        public static string CtxDivide {
+            get {
+                return SR.GetString ("CtxDivide");
+            }
+        }
+
+        public static string CtxElement {
+            get {
+                return SR.GetString ("CtxElement");
+            }
+        }
+
+        public static string CtxEquals {
+            get {
+                return SR.GetString ("CtxEquals");
+            }
+        }
+
+        public static string CtxEscapedIdentifier {
+            get {
+                return SR.GetString ("CtxEscapedIdentifier");
+            }
+        }
+
+        public static string CtxExcept {
+            get {
+                return SR.GetString ("CtxExcept");
+            }
+        }
+
+        public static string CtxExists {
+            get {
+                return SR.GetString ("CtxExists");
+            }
+        }
+
+        public static string CtxExpressionList {
+            get {
+                return SR.GetString ("CtxExpressionList");
+            }
+        }
+
+        public static string CtxFlatten {
+            get {
+                return SR.GetString ("CtxFlatten");
+            }
+        }
+
+        public static string CtxFromApplyClause {
+            get {
+                return SR.GetString ("CtxFromApplyClause");
+            }
+        }
+
+        public static string CtxFromClause {
+            get {
+                return SR.GetString ("CtxFromClause");
+            }
+        }
+
+        public static string CtxFromClauseItem {
+            get {
+                return SR.GetString ("CtxFromClauseItem");
+            }
+        }
+
+        public static string CtxFromClauseList {
+            get {
+                return SR.GetString ("CtxFromClauseList");
+            }
+        }
+
+        public static string CtxFromJoinClause {
+            get {
+                return SR.GetString ("CtxFromJoinClause");
+            }
+        }
+
+        public static string CtxFunctionDefinition {
+            get {
+                return SR.GetString ("CtxFunctionDefinition");
+            }
+        }
+
+        public static string CtxGreaterThan {
+            get {
+                return SR.GetString ("CtxGreaterThan");
+            }
+        }
+
+        public static string CtxGreaterThanEqual {
+            get {
+                return SR.GetString ("CtxGreaterThanEqual");
+            }
+        }
+
+        public static string CtxGroupByClause {
+            get {
+                return SR.GetString ("CtxGroupByClause");
+            }
+        }
+
+        public static string CtxGroupPartition {
+            get {
+                return SR.GetString ("CtxGroupPartition");
+            }
+        }
+
+        public static string CtxHavingClause {
+            get {
+                return SR.GetString ("CtxHavingClause");
+            }
+        }
+
+        public static string CtxIdentifier {
+            get {
+                return SR.GetString ("CtxIdentifier");
+            }
+        }
+
+        public static string CtxIn {
+            get {
+                return SR.GetString ("CtxIn");
+            }
+        }
+
+        public static string CtxIntersect {
+            get {
+                return SR.GetString ("CtxIntersect");
+            }
+        }
+
+        public static string CtxIsNotNull {
+            get {
+                return SR.GetString ("CtxIsNotNull");
+            }
+        }
+
+        public static string CtxIsNotOf {
+            get {
+                return SR.GetString ("CtxIsNotOf");
+            }
+        }
+
+        public static string CtxIsNull {
+            get {
+                return SR.GetString ("CtxIsNull");
+            }
+        }
+
+        public static string CtxIsOf {
+            get {
+                return SR.GetString ("CtxIsOf");
+            }
+        }
+
+        public static string CtxJoinClause {
+            get {
+                return SR.GetString ("CtxJoinClause");
+            }
+        }
+
+        public static string CtxJoinOnClause {
+            get {
+                return SR.GetString ("CtxJoinOnClause");
+            }
+        }
+
+        public static string CtxKey {
+            get {
+                return SR.GetString ("CtxKey");
+            }
+        }
+
+        public static string CtxLessThan {
+            get {
+                return SR.GetString ("CtxLessThan");
+            }
+        }
+
+        public static string CtxLessThanEqual {
+            get {
+                return SR.GetString ("CtxLessThanEqual");
+            }
+        }
+
+        public static string CtxLike {
+            get {
+                return SR.GetString ("CtxLike");
+            }
+        }
+
+        public static string CtxLimitSubClause {
+            get {
+                return SR.GetString ("CtxLimitSubClause");
+            }
+        }
+
+        public static string CtxLiteral {
+            get {
+                return SR.GetString ("CtxLiteral");
+            }
+        }
+
+        public static string CtxMemberAccess {
+            get {
+                return SR.GetString ("CtxMemberAccess");
+            }
+        }
+
+        public static string CtxMethod {
+            get {
+                return SR.GetString ("CtxMethod");
+            }
+        }
+
+        public static string CtxMinus {
+            get {
+                return SR.GetString ("CtxMinus");
+            }
+        }
+
+        public static string CtxModulus {
+            get {
+                return SR.GetString ("CtxModulus");
+            }
+        }
+
+        public static string CtxMultiply {
+            get {
+                return SR.GetString ("CtxMultiply");
+            }
+        }
+
+        public static string CtxMultisetCtor {
+            get {
+                return SR.GetString ("CtxMultisetCtor");
+            }
+        }
+
+        public static string CtxNamespaceImport {
+            get {
+                return SR.GetString ("CtxNamespaceImport");
+            }
+        }
+
+        public static string CtxNamespaceImportList {
+            get {
+                return SR.GetString ("CtxNamespaceImportList");
+            }
+        }
+
+        public static string CtxNavigate {
+            get {
+                return SR.GetString ("CtxNavigate");
+            }
+        }
+
+        public static string CtxNot {
+            get {
+                return SR.GetString ("CtxNot");
+            }
+        }
+
+        public static string CtxNotBetween {
+            get {
+                return SR.GetString ("CtxNotBetween");
+            }
+        }
+
+        public static string CtxNotEqual {
+            get {
+                return SR.GetString ("CtxNotEqual");
+            }
+        }
+
+        public static string CtxNotIn {
+            get {
+                return SR.GetString ("CtxNotIn");
+            }
+        }
+
+        public static string CtxNotLike {
+            get {
+                return SR.GetString ("CtxNotLike");
+            }
+        }
+
+        public static string CtxNullLiteral {
+            get {
+                return SR.GetString ("CtxNullLiteral");
+            }
+        }
+
+        public static string CtxOfType {
+            get {
+                return SR.GetString ("CtxOfType");
+            }
+        }
+
+        public static string CtxOfTypeOnly {
+            get {
+                return SR.GetString ("CtxOfTypeOnly");
+            }
+        }
+
+        public static string CtxOr {
+            get {
+                return SR.GetString ("CtxOr");
+            }
+        }
+
+        public static string CtxOrderByClause {
+            get {
+                return SR.GetString ("CtxOrderByClause");
+            }
+        }
+
+        public static string CtxOrderByClauseItem {
+            get {
+                return SR.GetString ("CtxOrderByClauseItem");
+            }
+        }
+
+        public static string CtxOverlaps {
+            get {
+                return SR.GetString ("CtxOverlaps");
+            }
+        }
+
+        public static string CtxParen {
+            get {
+                return SR.GetString ("CtxParen");
+            }
+        }
+
+        public static string CtxPlus {
+            get {
+                return SR.GetString ("CtxPlus");
+            }
+        }
+
+        public static string CtxQueryExpression {
+            get {
+                return SR.GetString ("CtxQueryExpression");
+            }
+        }
+
+        public static string CtxQueryStatement {
+            get {
+                return SR.GetString ("CtxQueryStatement");
+            }
+        }
+
+        public static string CtxRef {
+            get {
+                return SR.GetString ("CtxRef");
+            }
+        }
+
+        public static string CtxRefTypeDefinition {
+            get {
+                return SR.GetString ("CtxRefTypeDefinition");
+            }
+        }
+
+        public static string CtxRelationship {
+            get {
+                return SR.GetString ("CtxRelationship");
+            }
+        }
+
+        public static string CtxRelationshipList {
+            get {
+                return SR.GetString ("CtxRelationshipList");
+            }
+        }
+
+        public static string CtxRowCtor {
+            get {
+                return SR.GetString ("CtxRowCtor");
+            }
+        }
+
+        public static string CtxRowTypeDefinition {
+            get {
+                return SR.GetString ("CtxRowTypeDefinition");
+            }
+        }
+
+        public static string CtxSelectRowClause {
+            get {
+                return SR.GetString ("CtxSelectRowClause");
+            }
+        }
+
+        public static string CtxSelectValueClause {
+            get {
+                return SR.GetString ("CtxSelectValueClause");
+            }
+        }
+
+        public static string CtxSet {
+            get {
+                return SR.GetString ("CtxSet");
+            }
+        }
+
+        public static string CtxSimpleIdentifier {
+            get {
+                return SR.GetString ("CtxSimpleIdentifier");
+            }
+        }
+
+        public static string CtxSkipSubClause {
+            get {
+                return SR.GetString ("CtxSkipSubClause");
+            }
+        }
+
+        public static string CtxTopSubClause {
+            get {
+                return SR.GetString ("CtxTopSubClause");
+            }
+        }
+
+        public static string CtxTreat {
+            get {
+                return SR.GetString ("CtxTreat");
+            }
+        }
+
+        public static string CtxTypeName {
+            get {
+                return SR.GetString ("CtxTypeName");
+            }
+        }
+
+        public static string CtxTypeNameWithTypeSpec {
+            get {
+                return SR.GetString ("CtxTypeNameWithTypeSpec");
+            }
+        }
+
+        public static string CtxUnaryMinus {
+            get {
+                return SR.GetString ("CtxUnaryMinus");
+            }
+        }
+
+        public static string CtxUnaryPlus {
+            get {
+                return SR.GetString ("CtxUnaryPlus");
+            }
+        }
+
+        public static string CtxUnion {
+            get {
+                return SR.GetString ("CtxUnion");
+            }
+        }
+
+        public static string CtxUnionAll {
+            get {
+                return SR.GetString ("CtxUnionAll");
+            }
+        }
+
+        public static string CtxWhereClause {
+            get {
+                return SR.GetString ("CtxWhereClause");
+            }
+        }
+
+        public static string DefaultNotAllowed {
+            get {
+                return SR.GetString ("DefaultNotAllowed");
+            }
+        }
+
+        public static string DuplicateEnumMember {
+            get {
+                return SR.GetString ("DuplicateEnumMember");
+            }
+        }
+
+        public static string EdmMembersDefiningTypeDoNotAgreeWithMetadataType {
+            get {
+                return SR.GetString ("EdmMembersDefiningTypeDoNotAgreeWithMetadataType");
+            }
+        }
+
+        public static string ElementOperatorIsNotSupported {
+            get {
+                return SR.GetString ("ElementOperatorIsNotSupported");
+            }
+        }
+
+        public static string ELinq_AnonymousType {
+            get {
+                return SR.GetString ("ELinq_AnonymousType");
+            }
+        }
+
+        public static string ELinq_ClosureType {
+            get {
+                return SR.GetString ("ELinq_ClosureType");
+            }
+        }
+
+        public static string ELinq_CreateOrderedEnumerableNotSupported {
+            get {
+                return SR.GetString ("ELinq_CreateOrderedEnumerableNotSupported");
+            }
+        }
+
+        public static string ELinq_CycleDetected {
+            get {
+                return SR.GetString ("ELinq_CycleDetected");
+            }
+        }
+
+        public static string ELinq_EdmFunctionDirectCall {
+            get {
+                return SR.GetString ("ELinq_EdmFunctionDirectCall");
+            }
+        }
+
+        public static string ELinq_ExpressionMustBeIQueryable {
+            get {
+                return SR.GetString ("ELinq_ExpressionMustBeIQueryable");
+            }
+        }
+
+        public static string ELinq_MethodNotDirectlyCallable {
+            get {
+                return SR.GetString ("ELinq_MethodNotDirectlyCallable");
+            }
+        }
+
+        public static string ELinq_PropertyIndexNotSupported {
+            get {
+                return SR.GetString ("ELinq_PropertyIndexNotSupported");
+            }
+        }
+
+        public static string ELinq_SkipWithoutOrder {
+            get {
+                return SR.GetString ("ELinq_SkipWithoutOrder");
+            }
+        }
+
+        public static string ELinq_ThenByDoesNotFollowOrderBy {
+            get {
+                return SR.GetString ("ELinq_ThenByDoesNotFollowOrderBy");
+            }
+        }
+
+        public static string ELinq_UnsupportedBinding {
+            get {
+                return SR.GetString ("ELinq_UnsupportedBinding");
+            }
+        }
+
+        public static string ELinq_UnsupportedCastToDecimal {
+            get {
+                return SR.GetString ("ELinq_UnsupportedCastToDecimal");
+            }
+        }
+
+        public static string ELinq_UnsupportedConstructor {
+            get {
+                return SR.GetString ("ELinq_UnsupportedConstructor");
+            }
+        }
+
+        public static string ELinq_UnsupportedDifferentContexts {
+            get {
+                return SR.GetString ("ELinq_UnsupportedDifferentContexts");
+            }
+        }
+
+        public static string ELinq_UnsupportedInclude {
+            get {
+                return SR.GetString ("ELinq_UnsupportedInclude");
+            }
+        }
+
+        public static string ELinq_UnsupportedInitializers {
+            get {
+                return SR.GetString ("ELinq_UnsupportedInitializers");
+            }
+        }
+
+        public static string ELinq_UnsupportedMergeAs {
+            get {
+                return SR.GetString ("ELinq_UnsupportedMergeAs");
+            }
+        }
+
+        public static string ELinq_UnsupportedNestedFirst {
+            get {
+                return SR.GetString ("ELinq_UnsupportedNestedFirst");
+            }
+        }
+
+        public static string ELinq_UnsupportedNestedSingle {
+            get {
+                return SR.GetString ("ELinq_UnsupportedNestedSingle");
+            }
+        }
+
+        public static string ELinq_UnsupportedQueryableMethod {
+            get {
+                return SR.GetString ("ELinq_UnsupportedQueryableMethod");
+            }
+        }
+
+        public static string EmptyCommandText {
+            get {
+                return SR.GetString ("EmptyCommandText");
+            }
+        }
+
+        public static string EmptyDefiningQuery {
+            get {
+                return SR.GetString ("EmptyDefiningQuery");
+            }
+        }
+
+        public static string EmptySchemaTextReader {
+            get {
+                return SR.GetString ("EmptySchemaTextReader");
+            }
+        }
+
+        public static string Entity_EntityCantHaveMultipleChangeTrackers {
+            get {
+                return SR.GetString ("Entity_EntityCantHaveMultipleChangeTrackers");
+            }
+        }
+
+        public static string EntityClient_CannotCloneStoreProvider {
+            get {
+                return SR.GetString ("EntityClient_CannotCloneStoreProvider");
+            }
+        }
+
+        public static string EntityClient_CannotDeduceDbType {
+            get {
+                return SR.GetString ("EntityClient_CannotDeduceDbType");
+            }
+        }
+
+        public static string EntityClient_CannotGetCommandText {
+            get {
+                return SR.GetString ("EntityClient_CannotGetCommandText");
+            }
+        }
+
+        public static string EntityClient_CannotGetCommandTree {
+            get {
+                return SR.GetString ("EntityClient_CannotGetCommandTree");
+            }
+        }
+
+        public static string EntityClient_CannotReopenConnection {
+            get {
+                return SR.GetString ("EntityClient_CannotReopenConnection");
+            }
+        }
+
+        public static string EntityClient_CannotReprepareCommandDefinitionBasedCommand {
+            get {
+                return SR.GetString ("EntityClient_CannotReprepareCommandDefinitionBasedCommand");
+            }
+        }
+
+        public static string EntityClient_CannotSetCommandText {
+            get {
+                return SR.GetString ("EntityClient_CannotSetCommandText");
+            }
+        }
+
+        public static string EntityClient_CannotSetCommandTree {
+            get {
+                return SR.GetString ("EntityClient_CannotSetCommandTree");
+            }
+        }
+
+        public static string EntityClient_ClosedConnectionForUpdate {
+            get {
+                return SR.GetString ("EntityClient_ClosedConnectionForUpdate");
+            }
+        }
+
+        public static string EntityClient_CommandDefinitionExecutionFailed {
+            get {
+                return SR.GetString ("EntityClient_CommandDefinitionExecutionFailed");
+            }
+        }
+
+        public static string EntityClient_CommandDefinitionPreparationFailed {
+            get {
+                return SR.GetString ("EntityClient_CommandDefinitionPreparationFailed");
+            }
+        }
+
+        public static string EntityClient_CommandExecutionFailed {
+            get {
+                return SR.GetString ("EntityClient_CommandExecutionFailed");
+            }
+        }
+
+        public static string EntityClient_CommandTreeMetadataIncompatible {
+            get {
+                return SR.GetString ("EntityClient_CommandTreeMetadataIncompatible");
+            }
+        }
+
+        public static string EntityClient_ConnectionMustBeClosed {
+            get {
+                return SR.GetString ("EntityClient_ConnectionMustBeClosed");
+            }
+        }
+
+        public static string EntityClient_ConnectionNotOpen {
+            get {
+                return SR.GetString ("EntityClient_ConnectionNotOpen");
+            }
+        }
+
+        public static string EntityClient_ConnectionStateBroken {
+            get {
+                return SR.GetString ("EntityClient_ConnectionStateBroken");
+            }
+        }
+
+        public static string EntityClient_ConnectionStateClosed {
+            get {
+                return SR.GetString ("EntityClient_ConnectionStateClosed");
+            }
+        }
+
+        public static string EntityClient_ConnectionStringNeededBeforeOperation {
+            get {
+                return SR.GetString ("EntityClient_ConnectionStringNeededBeforeOperation");
+            }
+        }
+
+        public static string EntityClient_DataReaderIsStillOpen {
+            get {
+                return SR.GetString ("EntityClient_DataReaderIsStillOpen");
+            }
+        }
+
+        public static string EntityClient_EmptyParameterName {
+            get {
+                return SR.GetString ("EntityClient_EmptyParameterName");
+            }
+        }
+
+        public static string EntityClient_ErrorInBeginningTransaction {
+            get {
+                return SR.GetString ("EntityClient_ErrorInBeginningTransaction");
+            }
+        }
+
+        public static string EntityClient_ErrorInClosingConnection {
+            get {
+                return SR.GetString ("EntityClient_ErrorInClosingConnection");
+            }
+        }
+
+        public static string EntityClient_ExtraParametersWithNamedConnection {
+            get {
+                return SR.GetString ("EntityClient_ExtraParametersWithNamedConnection");
+            }
+        }
+
+        public static string EntityClient_FunctionImportEmptyCommandText {
+            get {
+                return SR.GetString ("EntityClient_FunctionImportEmptyCommandText");
+            }
+        }
+
+        public static string EntityClient_InvalidNamedConnection {
+            get {
+                return SR.GetString ("EntityClient_InvalidNamedConnection");
+            }
+        }
+
+        public static string EntityClient_InvalidStoredProcedureCommandText {
+            get {
+                return SR.GetString ("EntityClient_InvalidStoredProcedureCommandText");
+            }
+        }
+
+        public static string EntityClient_InvalidStoreProvider {
+            get {
+                return SR.GetString ("EntityClient_InvalidStoreProvider");
+            }
+        }
+
+        public static string EntityClient_InvalidTransactionForCommand {
+            get {
+                return SR.GetString ("EntityClient_InvalidTransactionForCommand");
+            }
+        }
+
+        public static string EntityClient_NoCommandText {
+            get {
+                return SR.GetString ("EntityClient_NoCommandText");
+            }
+        }
+
+        public static string EntityClient_NoConnectionForAdapter {
+            get {
+                return SR.GetString ("EntityClient_NoConnectionForAdapter");
+            }
+        }
+
+        public static string EntityClient_NoConnectionForCommand {
+            get {
+                return SR.GetString ("EntityClient_NoConnectionForCommand");
+            }
+        }
+
+        public static string EntityClient_NoStoreConnectionForUpdate {
+            get {
+                return SR.GetString ("EntityClient_NoStoreConnectionForUpdate");
+            }
+        }
+
+        public static string EntityClient_ProviderGeneralError {
+            get {
+                return SR.GetString ("EntityClient_ProviderGeneralError");
+            }
+        }
+
+        public static string EntityClient_RequiresNonStoreCommandTree {
+            get {
+                return SR.GetString ("EntityClient_RequiresNonStoreCommandTree");
+            }
+        }
+
+        public static string EntityClient_SettingsCannotBeChangedOnOpenConnection {
+            get {
+                return SR.GetString ("EntityClient_SettingsCannotBeChangedOnOpenConnection");
+            }
+        }
+
+        public static string EntityClient_StoreReaderFailed {
+            get {
+                return SR.GetString ("EntityClient_StoreReaderFailed");
+            }
+        }
+
+        public static string EntityClient_TooFewColumns {
+            get {
+                return SR.GetString ("EntityClient_TooFewColumns");
+            }
+        }
+
+        public static string EntityClient_TransactionAlreadyStarted {
+            get {
+                return SR.GetString ("EntityClient_TransactionAlreadyStarted");
+            }
+        }
+
+        public static string EntityClient_UnsupportedCommandType {
+            get {
+                return SR.GetString ("EntityClient_UnsupportedCommandType");
+            }
+        }
+
+        public static string EntityClient_ValueNotString {
+            get {
+                return SR.GetString ("EntityClient_ValueNotString");
+            }
+        }
+
+        public static string EntityKey_CannotChangeKey {
+            get {
+                return SR.GetString ("EntityKey_CannotChangeKey");
+            }
+        }
+
+        public static string EntityKey_DataRecordMustBeEntity {
+            get {
+                return SR.GetString ("EntityKey_DataRecordMustBeEntity");
+            }
+        }
+
+        public static string EntityKey_EntityKeyMustHaveValues {
+            get {
+                return SR.GetString ("EntityKey_EntityKeyMustHaveValues");
+            }
+        }
+
+        public static string EntityKey_InvalidQualifiedEntitySetName {
+            get {
+                return SR.GetString ("EntityKey_InvalidQualifiedEntitySetName");
+            }
+        }
+
+        public static string EntityKey_MissingEntitySetName {
+            get {
+                return SR.GetString ("EntityKey_MissingEntitySetName");
+            }
+        }
+
+        public static string EntityKey_NoNullsAllowedInKeyValuePairs {
+            get {
+                return SR.GetString ("EntityKey_NoNullsAllowedInKeyValuePairs");
+            }
+        }
+
+        public static string EntityKey_UnexpectedNull {
+            get {
+                return SR.GetString ("EntityKey_UnexpectedNull");
+            }
+        }
+
+        public static string EntityParameterCollectionRemoveInvalidObject {
+            get {
+                return SR.GetString ("EntityParameterCollectionRemoveInvalidObject");
+            }
+        }
+
+        public static string EntityParameterContainedByAnotherCollection {
+            get {
+                return SR.GetString ("EntityParameterContainedByAnotherCollection");
+            }
+        }
+
+        public static string EntityParameterNull {
+            get {
+                return SR.GetString ("EntityParameterNull");
+            }
+        }
+
+        public static string EntityProxyTypeInfo_ProxyHasWrongWrapper {
+            get {
+                return SR.GetString ("EntityProxyTypeInfo_ProxyHasWrongWrapper");
+            }
+        }
+
+        public static string EntityReference_CannotChangeReferentialConstraintProperty {
+            get {
+                return SR.GetString ("EntityReference_CannotChangeReferentialConstraintProperty");
+            }
+        }
+
+        public static string EntityReference_CannotSetSpecialKeys {
+            get {
+                return SR.GetString ("EntityReference_CannotSetSpecialKeys");
+            }
+        }
+
+        public static string EntityReference_EntityKeyValueMismatch {
+            get {
+                return SR.GetString ("EntityReference_EntityKeyValueMismatch");
+            }
+        }
+
+        public static string EntityReference_LessThanExpectedRelatedEntitiesFound {
+            get {
+                return SR.GetString ("EntityReference_LessThanExpectedRelatedEntitiesFound");
+            }
+        }
+
+        public static string EntityReference_MoreThanExpectedRelatedEntitiesFound {
+            get {
+                return SR.GetString ("EntityReference_MoreThanExpectedRelatedEntitiesFound");
+            }
+        }
+
+        public static string EntitySetInAnotherContainer {
+            get {
+                return SR.GetString ("EntitySetInAnotherContainer");
+            }
+        }
+
+        public static string EntityTypesDoNotAgree {
+            get {
+                return SR.GetString ("EntityTypesDoNotAgree");
+            }
+        }
+
+        public static string ExpressionCannotBeNull {
+            get {
+                return SR.GetString ("ExpressionCannotBeNull");
+            }
+        }
+
+        public static string ExpressionMustBeCollection {
+            get {
+                return SR.GetString ("ExpressionMustBeCollection");
+            }
+        }
+
+        public static string ExpressionMustBeNumericType {
+            get {
+                return SR.GetString ("ExpressionMustBeNumericType");
+            }
+        }
+
+        public static string ExpressionTypeMustBeBoolean {
+            get {
+                return SR.GetString ("ExpressionTypeMustBeBoolean");
+            }
+        }
+
+        public static string ExpressionTypeMustBeEqualComparable {
+            get {
+                return SR.GetString ("ExpressionTypeMustBeEqualComparable");
+            }
+        }
+
+        public static string ExpressionTypeMustNotBeCollection {
+            get {
+                return SR.GetString ("ExpressionTypeMustNotBeCollection");
+            }
+        }
+
+        public static string ExprIsNotValidEntitySetForCreateRef {
+            get {
+                return SR.GetString ("ExprIsNotValidEntitySetForCreateRef");
+            }
+        }
+
+        public static string ExtraInfo {
+            get {
+                return SR.GetString ("ExtraInfo");
+            }
+        }
+
+        public static string FacetDeclarationRequiresTypeAttribute {
+            get {
+                return SR.GetString ("FacetDeclarationRequiresTypeAttribute");
+            }
+        }
+
+        public static string FailedToRetrieveProviderManifest {
+            get {
+                return SR.GetString ("FailedToRetrieveProviderManifest");
+            }
+        }
+
+        public static string GeneralQueryError {
+            get {
+                return SR.GetString ("GeneralQueryError");
+            }
+        }
+
+        public static string Generated_Views_Changed {
+            get {
+                return SR.GetString ("Generated_Views_Changed");
+            }
+        }
+
+        public static string GeneratorErrorSeverityError {
+            get {
+                return SR.GetString ("GeneratorErrorSeverityError");
+            }
+        }
+
+        public static string GeneratorErrorSeverityUnknown {
+            get {
+                return SR.GetString ("GeneratorErrorSeverityUnknown");
+            }
+        }
+
+        public static string GeneratorErrorSeverityWarning {
+            get {
+                return SR.GetString ("GeneratorErrorSeverityWarning");
+            }
+        }
+
+        public static string GenericSyntaxError {
+            get {
+                return SR.GetString ("GenericSyntaxError");
+            }
+        }
+
+        public static string GroupingKeysMustBeEqualComparable {
+            get {
+                return SR.GetString ("GroupingKeysMustBeEqualComparable");
+            }
+        }
+
+        public static string GroupPartitionOutOfContext {
+            get {
+                return SR.GetString ("GroupPartitionOutOfContext");
+            }
+        }
+
+        public static string GroupVarNotFoundInScope {
+            get {
+                return SR.GetString ("GroupVarNotFoundInScope");
+            }
+        }
+
+        public static string HavingRequiresGroupClause {
+            get {
+                return SR.GetString ("HavingRequiresGroupClause");
+            }
+        }
+
+        public static string ImcompatibleCreateRefKeyElementType {
+            get {
+                return SR.GetString ("ImcompatibleCreateRefKeyElementType");
+            }
+        }
+
+        public static string ImcompatibleCreateRefKeyType {
+            get {
+                return SR.GetString ("ImcompatibleCreateRefKeyType");
+            }
+        }
+
+        public static string IncorrectProviderManifest {
+            get {
+                return SR.GetString ("IncorrectProviderManifest");
+            }
+        }
+
+        public static string InFromClause {
+            get {
+                return SR.GetString ("InFromClause");
+            }
+        }
+
+        public static string InGroupClause {
+            get {
+                return SR.GetString ("InGroupClause");
+            }
+        }
+
+        public static string InnerJoinMustHaveOnPredicate {
+            get {
+                return SR.GetString ("InnerJoinMustHaveOnPredicate");
+            }
+        }
+
+        public static string InRowCtor {
+            get {
+                return SR.GetString ("InRowCtor");
+            }
+        }
+
+        public static string InSelectProjectionList {
+            get {
+                return SR.GetString ("InSelectProjectionList");
+            }
+        }
+
+        public static string InvalidArgumentTypeForAggregateFunction {
+            get {
+                return SR.GetString ("InvalidArgumentTypeForAggregateFunction");
+            }
+        }
+
+        public static string InvalidCaseResultTypes {
+            get {
+                return SR.GetString ("InvalidCaseResultTypes");
+            }
+        }
+
+        public static string InvalidCaseWhenThenNullType {
+            get {
+                return SR.GetString ("InvalidCaseWhenThenNullType");
+            }
+        }
+
+        public static string InvalidCastExpressionType {
+            get {
+                return SR.GetString ("InvalidCastExpressionType");
+            }
+        }
+
+        public static string InvalidCastType {
+            get {
+                return SR.GetString ("InvalidCastType");
+            }
+        }
+
+        public static string InvalidCreateRefKeyType {
+            get {
+                return SR.GetString ("InvalidCreateRefKeyType");
+            }
+        }
+
+        public static string InvalidDistinctArgumentInCtor {
+            get {
+                return SR.GetString ("InvalidDistinctArgumentInCtor");
+            }
+        }
+
+        public static string InvalidDistinctArgumentInNonAggFunction {
+            get {
+                return SR.GetString ("InvalidDistinctArgumentInNonAggFunction");
+            }
+        }
+
+        public static string InvalidDocumentationBothTextAndStructure {
+            get {
+                return SR.GetString ("InvalidDocumentationBothTextAndStructure");
+            }
+        }
+
+        public static string InvalidEmptyIdentifier {
+            get {
+                return SR.GetString ("InvalidEmptyIdentifier");
+            }
+        }
+
+        public static string InvalidEmptyQuery {
+            get {
+                return SR.GetString ("InvalidEmptyQuery");
+            }
+        }
+
+        public static string InvalidEmptyQueryTextArgument {
+            get {
+                return SR.GetString ("InvalidEmptyQueryTextArgument");
+            }
+        }
+
+        public static string InvalidEnumUnderlyingType {
+            get {
+                return SR.GetString ("InvalidEnumUnderlyingType");
+            }
+        }
+
+        public static string InvalidFlattenArgument {
+            get {
+                return SR.GetString ("InvalidFlattenArgument");
+            }
+        }
+
+        public static string InvalidJoinLeftCorrelation {
+            get {
+                return SR.GetString ("InvalidJoinLeftCorrelation");
+            }
+        }
+
+        public static string InvalidMaxLengthSize {
+            get {
+                return SR.GetString ("InvalidMaxLengthSize");
+            }
+        }
+
+        public static string InvalidMetadataMemberName {
+            get {
+                return SR.GetString ("InvalidMetadataMemberName");
+            }
+        }
+
+        public static string InvalidMetadataPath {
+            get {
+                return SR.GetString ("InvalidMetadataPath");
+            }
+        }
+
+        public static string InvalidModeForWithRelationshipClause {
+            get {
+                return SR.GetString ("InvalidModeForWithRelationshipClause");
+            }
+        }
+
+        public static string InvalidNamespaceAlias {
+            get {
+                return SR.GetString ("InvalidNamespaceAlias");
+            }
+        }
+
+        public static string InvalidNullArithmetic {
+            get {
+                return SR.GetString ("InvalidNullArithmetic");
+            }
+        }
+
+        public static string InvalidNullComparison {
+            get {
+                return SR.GetString ("InvalidNullComparison");
+            }
+        }
+
+        public static string InvalidOperationMultipleEndsInAssociation {
+            get {
+                return SR.GetString ("InvalidOperationMultipleEndsInAssociation");
+            }
+        }
+
+        public static string InvalidOperatorSymbol {
+            get {
+                return SR.GetString ("InvalidOperatorSymbol");
+            }
+        }
+
+        public static string InvalidPredicateForCrossJoin {
+            get {
+                return SR.GetString ("InvalidPredicateForCrossJoin");
+            }
+        }
+
+        public static string InvalidPunctuatorSymbol {
+            get {
+                return SR.GetString ("InvalidPunctuatorSymbol");
+            }
+        }
+
+        public static string InvalidSavePoint {
+            get {
+                return SR.GetString ("InvalidSavePoint");
+            }
+        }
+
+        public static string InvalidScopeIndex {
+            get {
+                return SR.GetString ("InvalidScopeIndex");
+            }
+        }
+
+        public static string InvalidSelectValueAliasedExpression {
+            get {
+                return SR.GetString ("InvalidSelectValueAliasedExpression");
+            }
+        }
+
+        public static string InvalidSelectValueList {
+            get {
+                return SR.GetString ("InvalidSelectValueList");
+            }
+        }
+
+        public static string InvalidTypeForWithRelationshipClause {
+            get {
+                return SR.GetString ("InvalidTypeForWithRelationshipClause");
+            }
+        }
+
+        public static string Iqt_CTGen_UnexpectedAggregate {
+            get {
+                return SR.GetString ("Iqt_CTGen_UnexpectedAggregate");
+            }
+        }
+
+        public static string Iqt_CTGen_UnexpectedVarDef {
+            get {
+                return SR.GetString ("Iqt_CTGen_UnexpectedVarDef");
+            }
+        }
+
+        public static string Iqt_CTGen_UnexpectedVarDefList {
+            get {
+                return SR.GetString ("Iqt_CTGen_UnexpectedVarDefList");
+            }
+        }
+
+        public static string IsNullInvalidType {
+            get {
+                return SR.GetString ("IsNullInvalidType");
+            }
+        }
+
+        public static string LeftSetExpressionArgsMustBeCollection {
+            get {
+                return SR.GetString ("LeftSetExpressionArgsMustBeCollection");
+            }
+        }
+
+        public static string LikeArgMustBeStringType {
+            get {
+                return SR.GetString ("LikeArgMustBeStringType");
+            }
+        }
+
+        public static string LocalizedCollection {
+            get {
+                return SR.GetString ("LocalizedCollection");
+            }
+        }
+
+        public static string LocalizedColumn {
+            get {
+                return SR.GetString ("LocalizedColumn");
+            }
+        }
+
+        public static string LocalizedComplex {
+            get {
+                return SR.GetString ("LocalizedComplex");
+            }
+        }
+
+        public static string LocalizedEntity {
+            get {
+                return SR.GetString ("LocalizedEntity");
+            }
+        }
+
+        public static string LocalizedEntityContainerExpression {
+            get {
+                return SR.GetString ("LocalizedEntityContainerExpression");
+            }
+        }
+
+        public static string LocalizedEnumMember {
+            get {
+                return SR.GetString ("LocalizedEnumMember");
+            }
+        }
+
+        public static string LocalizedFunction {
+            get {
+                return SR.GetString ("LocalizedFunction");
+            }
+        }
+
+        public static string LocalizedInlineFunction {
+            get {
+                return SR.GetString ("LocalizedInlineFunction");
+            }
+        }
+
+        public static string LocalizedKeyword {
+            get {
+                return SR.GetString ("LocalizedKeyword");
+            }
+        }
+
+        public static string LocalizedLeft {
+            get {
+                return SR.GetString ("LocalizedLeft");
+            }
+        }
+
+        public static string LocalizedLine {
+            get {
+                return SR.GetString ("LocalizedLine");
+            }
+        }
+
+        public static string LocalizedMetadataMemberExpression {
+            get {
+                return SR.GetString ("LocalizedMetadataMemberExpression");
+            }
+        }
+
+        public static string LocalizedNamespace {
+            get {
+                return SR.GetString ("LocalizedNamespace");
+            }
+        }
+
+        public static string LocalizedNear {
+            get {
+                return SR.GetString ("LocalizedNear");
+            }
+        }
+
+        public static string LocalizedPrimitive {
+            get {
+                return SR.GetString ("LocalizedPrimitive");
+            }
+        }
+
+        public static string LocalizedReference {
+            get {
+                return SR.GetString ("LocalizedReference");
+            }
+        }
+
+        public static string LocalizedRight {
+            get {
+                return SR.GetString ("LocalizedRight");
+            }
+        }
+
+        public static string LocalizedRow {
+            get {
+                return SR.GetString ("LocalizedRow");
+            }
+        }
+
+        public static string LocalizedTerm {
+            get {
+                return SR.GetString ("LocalizedTerm");
+            }
+        }
+
+        public static string LocalizedType {
+            get {
+                return SR.GetString ("LocalizedType");
+            }
+        }
+
+        public static string LocalizedValueExpression {
+            get {
+                return SR.GetString ("LocalizedValueExpression");
+            }
+        }
+
+        public static string MalformedSingleQuotePayload {
+            get {
+                return SR.GetString ("MalformedSingleQuotePayload");
+            }
+        }
+
+        public static string MalformedStringLiteralPayload {
+            get {
+                return SR.GetString ("MalformedStringLiteralPayload");
+            }
+        }
+
+        public static string Mapping_ConditionValueTypeMismatch {
+            get {
+                return SR.GetString ("Mapping_ConditionValueTypeMismatch");
+            }
+        }
+
+        public static string Mapping_DifferentEdmStoreVersion {
+            get {
+                return SR.GetString ("Mapping_DifferentEdmStoreVersion");
+            }
+        }
+
+        public static string Mapping_DifferentMappingEdmStoreVersion {
+            get {
+                return SR.GetString ("Mapping_DifferentMappingEdmStoreVersion");
+            }
+        }
+
+        public static string Mapping_DistinctFlagInReadWriteContainer {
+            get {
+                return SR.GetString ("Mapping_DistinctFlagInReadWriteContainer");
+            }
+        }
+
+        public static string Mapping_General_Error {
+            get {
+                return SR.GetString ("Mapping_General_Error");
+            }
+        }
+
+        public static string Mapping_InvalidContent_Association_Type_Empty {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_Association_Type_Empty");
+            }
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_Both_Members {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_ConditionMapping_Both_Members");
+            }
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_Both_Values {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_ConditionMapping_Both_Values");
+            }
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_Either_Members {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_ConditionMapping_Either_Members");
+            }
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_Either_Values {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_ConditionMapping_Either_Values");
+            }
+        }
+
+        public static string Mapping_InvalidContent_ConditionMapping_NonScalar {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_ConditionMapping_NonScalar");
+            }
+        }
+
+        public static string Mapping_InvalidContent_Container_SubElement {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_Container_SubElement");
+            }
+        }
+
+        public static string Mapping_InvalidContent_General {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_General");
+            }
+        }
+
+        public static string Mapping_InvalidContent_IsTypeOfNotTerminated {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_IsTypeOfNotTerminated");
+            }
+        }
+
+        public static string Mapping_InvalidContent_Table_Expected {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_Table_Expected");
+            }
+        }
+
+        public static string Mapping_InvalidContent_TypeMapping_QueryView {
+            get {
+                return SR.GetString ("Mapping_InvalidContent_TypeMapping_QueryView");
+            }
+        }
+
+        public static string Mapping_ModificationFunction_In_Table_Context {
+            get {
+                return SR.GetString ("Mapping_ModificationFunction_In_Table_Context");
+            }
+        }
+
+        public static string Mapping_ModificationFunction_MissingVersion {
+            get {
+                return SR.GetString ("Mapping_ModificationFunction_MissingVersion");
+            }
+        }
+
+        public static string Mapping_ModificationFunction_Multiple_Types {
+            get {
+                return SR.GetString ("Mapping_ModificationFunction_Multiple_Types");
+            }
+        }
+
+        public static string Mapping_ModificationFunction_VersionMustBeCurrent {
+            get {
+                return SR.GetString ("Mapping_ModificationFunction_VersionMustBeCurrent");
+            }
+        }
+
+        public static string Mapping_ModificationFunction_VersionMustBeOriginal {
+            get {
+                return SR.GetString ("Mapping_ModificationFunction_VersionMustBeOriginal");
+            }
+        }
+
+        public static string Mapping_TypeName_For_First_QueryView {
+            get {
+                return SR.GetString ("Mapping_TypeName_For_First_QueryView");
+            }
+        }
+
+        public static string Materializer_CannotReEnumerateQueryResults {
+            get {
+                return SR.GetString ("Materializer_CannotReEnumerateQueryResults");
+            }
+        }
+
+        public static string Materializer_PropertyIsNotNullable {
+            get {
+                return SR.GetString ("Materializer_PropertyIsNotNullable");
+            }
+        }
+
+        public static string Materializer_UnsupportedType {
+            get {
+                return SR.GetString ("Materializer_UnsupportedType");
+            }
+        }
+
+        public static string Metadata_General_Error {
+            get {
+                return SR.GetString ("Metadata_General_Error");
+            }
+        }
+
+        public static string MethodInvocationNotSupported {
+            get {
+                return SR.GetString ("MethodInvocationNotSupported");
+            }
+        }
+
+        public static string MismatchNumberOfPropertiesinRelationshipConstraint {
+            get {
+                return SR.GetString ("MismatchNumberOfPropertiesinRelationshipConstraint");
+            }
+        }
+
+        public static string MissingName {
+            get {
+                return SR.GetString ("MissingName");
+            }
+        }
+
+        public static string MissingNamespaceAttribute {
+            get {
+                return SR.GetString ("MissingNamespaceAttribute");
+            }
+        }
+
+        public static string MultisetElemsAreNotTypeCompatible {
+            get {
+                return SR.GetString ("MultisetElemsAreNotTypeCompatible");
+            }
+        }
+
+        public static string NonComposableFunctionHasDisallowedAttribute {
+            get {
+                return SR.GetString ("NonComposableFunctionHasDisallowedAttribute");
+            }
+        }
+
+        public static string NonComposableFunctionMustNotDeclareReturnType {
+            get {
+                return SR.GetString ("NonComposableFunctionMustNotDeclareReturnType");
+            }
+        }
+
+        public static string NotBinaryTypeForTypeUsage {
+            get {
+                return SR.GetString ("NotBinaryTypeForTypeUsage");
+            }
+        }
+
+        public static string NotDateTimeOffsetTypeForTypeUsage {
+            get {
+                return SR.GetString ("NotDateTimeOffsetTypeForTypeUsage");
+            }
+        }
+
+        public static string NotDateTimeTypeForTypeUsage {
+            get {
+                return SR.GetString ("NotDateTimeTypeForTypeUsage");
+            }
+        }
+
+        public static string NotDecimalTypeForTypeUsage {
+            get {
+                return SR.GetString ("NotDecimalTypeForTypeUsage");
+            }
+        }
+
+        public static string NotStringTypeForTypeUsage {
+            get {
+                return SR.GetString ("NotStringTypeForTypeUsage");
+            }
+        }
+
+        public static string NotTimeTypeForTypeUsage {
+            get {
+                return SR.GetString ("NotTimeTypeForTypeUsage");
+            }
+        }
+
+        public static string NotValidInputPath {
+            get {
+                return SR.GetString ("NotValidInputPath");
+            }
+        }
+
+        public static string NullLiteralCannotBePromotedToCollectionOfNulls {
+            get {
+                return SR.GetString ("NullLiteralCannotBePromotedToCollectionOfNulls");
+            }
+        }
+
+        public static string ObjectContext_CannotAttachEntityWithoutKey {
+            get {
+                return SR.GetString ("ObjectContext_CannotAttachEntityWithoutKey");
+            }
+        }
+
+        public static string ObjectContext_CannotAttachEntityWithTemporaryKey {
+            get {
+                return SR.GetString ("ObjectContext_CannotAttachEntityWithTemporaryKey");
+            }
+        }
+
+        public static string ObjectContext_CannotDeleteEntityNotInObjectStateManager {
+            get {
+                return SR.GetString ("ObjectContext_CannotDeleteEntityNotInObjectStateManager");
+            }
+        }
+
+        public static string ObjectContext_CannotDetachEntityNotInObjectStateManager {
+            get {
+                return SR.GetString ("ObjectContext_CannotDetachEntityNotInObjectStateManager");
+            }
+        }
+
+        public static string ObjectContext_CannotSetDefaultContainerName {
+            get {
+                return SR.GetString ("ObjectContext_CannotSetDefaultContainerName");
+            }
+        }
+
+        public static string ObjectContext_CommitWithConceptualNull {
+            get {
+                return SR.GetString ("ObjectContext_CommitWithConceptualNull");
+            }
+        }
+
+        public static string ObjectContext_ContainerQualifiedEntitySetNameRequired {
+            get {
+                return SR.GetString ("ObjectContext_ContainerQualifiedEntitySetNameRequired");
+            }
+        }
+
+        public static string ObjectContext_EntityAlreadyExistsInObjectStateManager {
+            get {
+                return SR.GetString ("ObjectContext_EntityAlreadyExistsInObjectStateManager");
+            }
+        }
+
+        public static string ObjectContext_EntityNotTrackedOrHasTempKey {
+            get {
+                return SR.GetString ("ObjectContext_EntityNotTrackedOrHasTempKey");
+            }
+        }
+
+        public static string ObjectContext_EntitySetNameOrEntityKeyRequired {
+            get {
+                return SR.GetString ("ObjectContext_EntitySetNameOrEntityKeyRequired");
+            }
+        }
+
+        public static string ObjectContext_ExecuteCommandWithMixOfDbParameterAndValues {
+            get {
+                return SR.GetString ("ObjectContext_ExecuteCommandWithMixOfDbParameterAndValues");
+            }
+        }
+
+        public static string ObjectContext_InvalidCommandTimeout {
+            get {
+                return SR.GetString ("ObjectContext_InvalidCommandTimeout");
+            }
+        }
+
+        public static string ObjectContext_InvalidConnection {
+            get {
+                return SR.GetString ("ObjectContext_InvalidConnection");
+            }
+        }
+
+        public static string ObjectContext_InvalidConnectionString {
+            get {
+                return SR.GetString ("ObjectContext_InvalidConnectionString");
+            }
+        }
+
+        public static string ObjectContext_InvalidDataAdapter {
+            get {
+                return SR.GetString ("ObjectContext_InvalidDataAdapter");
+            }
+        }
+
+        public static string ObjectContext_InvalidEntityState {
+            get {
+                return SR.GetString ("ObjectContext_InvalidEntityState");
+            }
+        }
+
+        public static string ObjectContext_InvalidRelationshipState {
+            get {
+                return SR.GetString ("ObjectContext_InvalidRelationshipState");
+            }
+        }
+
+        public static string ObjectContext_MetadataHasChanged {
+            get {
+                return SR.GetString ("ObjectContext_MetadataHasChanged");
+            }
+        }
+
+        public static string ObjectContext_ObjectDisposed {
+            get {
+                return SR.GetString ("ObjectContext_ObjectDisposed");
+            }
+        }
+
+        public static string ObjectContext_ObjectNotFound {
+            get {
+                return SR.GetString ("ObjectContext_ObjectNotFound");
+            }
+        }
+
+        public static string ObjectContext_QualfiedEntitySetName {
+            get {
+                return SR.GetString ("ObjectContext_QualfiedEntitySetName");
+            }
+        }
+
+        public static string ObjectContext_RequiredMetadataNotAvailble {
+            get {
+                return SR.GetString ("ObjectContext_RequiredMetadataNotAvailble");
+            }
+        }
+
+        public static string ObjectContext_SelectorExpressionMustBeMemberAccess {
+            get {
+                return SR.GetString ("ObjectContext_SelectorExpressionMustBeMemberAccess");
+            }
+        }
+
+        public static string ObjectContext_StoreEntityNotPresentInClient {
+            get {
+                return SR.GetString ("ObjectContext_StoreEntityNotPresentInClient");
+            }
+        }
+
+        public static string ObjectParameterCollection_ParametersLocked {
+            get {
+                return SR.GetString ("ObjectParameterCollection_ParametersLocked");
+            }
+        }
+
+        public static string ObjectQuery_InvalidConnection {
+            get {
+                return SR.GetString ("ObjectQuery_InvalidConnection");
+            }
+        }
+
+        public static string ObjectQuery_InvalidEmptyQuery {
+            get {
+                return SR.GetString ("ObjectQuery_InvalidEmptyQuery");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidFilterPredicate {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_InvalidFilterPredicate");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidGroupKeyList {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_InvalidGroupKeyList");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidProjectionList {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_InvalidProjectionList");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidQueryArgument {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_InvalidQueryArgument");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidSkipCount {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_InvalidSkipCount");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidSortKeyList {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_InvalidSortKeyList");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_InvalidTopCount {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_InvalidTopCount");
+            }
+        }
+
+        public static string ObjectQuery_QueryBuilder_NotSupportedLinqSource {
+            get {
+                return SR.GetString ("ObjectQuery_QueryBuilder_NotSupportedLinqSource");
+            }
+        }
+
+        public static string ObjectQuery_Span_IncludeRequiresEntityOrEntityCollection {
+            get {
+                return SR.GetString ("ObjectQuery_Span_IncludeRequiresEntityOrEntityCollection");
+            }
+        }
+
+        public static string ObjectQuery_Span_SpanPathSyntaxError {
+            get {
+                return SR.GetString ("ObjectQuery_Span_SpanPathSyntaxError");
+            }
+        }
+
+        public static string ObjectQuery_Span_WhiteSpacePath {
+            get {
+                return SR.GetString ("ObjectQuery_Span_WhiteSpacePath");
+            }
+        }
+
+        public static string ObjectQuery_UnableToMapResultType {
+            get {
+                return SR.GetString ("ObjectQuery_UnableToMapResultType");
+            }
+        }
+
+        public static string ObjectStateEntry_CannotAccessKeyEntryValues {
+            get {
+                return SR.GetString ("ObjectStateEntry_CannotAccessKeyEntryValues");
+            }
+        }
+
+        public static string ObjectStateEntry_CannotDeleteOnKeyEntry {
+            get {
+                return SR.GetString ("ObjectStateEntry_CannotDeleteOnKeyEntry");
+            }
+        }
+
+        public static string ObjectStateEntry_CannotModifyKeyEntryState {
+            get {
+                return SR.GetString ("ObjectStateEntry_CannotModifyKeyEntryState");
+            }
+        }
+
+        public static string ObjectStateEntry_CantModifyDetachedDeletedEntries {
+            get {
+                return SR.GetString ("ObjectStateEntry_CantModifyDetachedDeletedEntries");
+            }
+        }
+
+        public static string ObjectStateEntry_CantModifyRelationState {
+            get {
+                return SR.GetString ("ObjectStateEntry_CantModifyRelationState");
+            }
+        }
+
+        public static string ObjectStateEntry_CantModifyRelationValues {
+            get {
+                return SR.GetString ("ObjectStateEntry_CantModifyRelationValues");
+            }
+        }
+
+        public static string ObjectStateEntry_CantSetEntityKey {
+            get {
+                return SR.GetString ("ObjectStateEntry_CantSetEntityKey");
+            }
+        }
+
+        public static string ObjectStateEntry_CurrentValuesDoesNotExist {
+            get {
+                return SR.GetString ("ObjectStateEntry_CurrentValuesDoesNotExist");
+            }
+        }
+
+        public static string ObjectStateEntry_EntityMemberChangedWithoutEntityMemberChanging {
+            get {
+                return SR.GetString ("ObjectStateEntry_EntityMemberChangedWithoutEntityMemberChanging");
+            }
+        }
+
+        public static string ObjectStateEntry_InvalidState {
+            get {
+                return SR.GetString ("ObjectStateEntry_InvalidState");
+            }
+        }
+
+        public static string ObjectStateEntry_InvalidTypeForComplexTypeProperty {
+            get {
+                return SR.GetString ("ObjectStateEntry_InvalidTypeForComplexTypeProperty");
+            }
+        }
+
+        public static string ObjectStateEntry_OriginalValuesDoesNotExist {
+            get {
+                return SR.GetString ("ObjectStateEntry_OriginalValuesDoesNotExist");
+            }
+        }
+
+        public static string ObjectStateEntry_RelationshipAndKeyEntriesDoNotHaveRelationshipManagers {
+            get {
+                return SR.GetString ("ObjectStateEntry_RelationshipAndKeyEntriesDoNotHaveRelationshipManagers");
+            }
+        }
+
+        public static string ObjectStateManager_AcceptChangesEntityKeyIsNotValid {
+            get {
+                return SR.GetString ("ObjectStateManager_AcceptChangesEntityKeyIsNotValid");
+            }
+        }
+
+        public static string ObjectStateManager_CannotChangeRelationshipStateEntityAdded {
+            get {
+                return SR.GetString ("ObjectStateManager_CannotChangeRelationshipStateEntityAdded");
+            }
+        }
+
+        public static string ObjectStateManager_CannotChangeRelationshipStateEntityDeleted {
+            get {
+                return SR.GetString ("ObjectStateManager_CannotChangeRelationshipStateEntityDeleted");
+            }
+        }
+
+        public static string ObjectStateManager_CannotChangeRelationshipStateKeyEntry {
+            get {
+                return SR.GetString ("ObjectStateManager_CannotChangeRelationshipStateKeyEntry");
+            }
+        }
+
+        public static string ObjectStateManager_CannotFixUpKeyToExistingValues {
+            get {
+                return SR.GetString ("ObjectStateManager_CannotFixUpKeyToExistingValues");
+            }
+        }
+
+        public static string ObjectStateManager_CannotGetRelationshipManagerForDetachedPocoEntity {
+            get {
+                return SR.GetString ("ObjectStateManager_CannotGetRelationshipManagerForDetachedPocoEntity");
+            }
+        }
+
+        public static string ObjectStateManager_ChangeRelationshipStateNotSupportedForForeignKeyAssociations {
+            get {
+                return SR.GetString ("ObjectStateManager_ChangeRelationshipStateNotSupportedForForeignKeyAssociations");
+            }
+        }
+
+        public static string ObjectStateManager_ChangeStateFromAddedWithNullKeyIsInvalid {
+            get {
+                return SR.GetString ("ObjectStateManager_ChangeStateFromAddedWithNullKeyIsInvalid");
+            }
+        }
+
+        public static string ObjectStateManager_DetachedObjectStateEntriesDoesNotExistInObjectStateManager {
+            get {
+                return SR.GetString ("ObjectStateManager_DetachedObjectStateEntriesDoesNotExistInObjectStateManager");
+            }
+        }
+
+        public static string ObjectStateManager_EntityConflictsWithKeyEntry {
+            get {
+                return SR.GetString ("ObjectStateManager_EntityConflictsWithKeyEntry");
+            }
+        }
+
+        public static string ObjectStateManager_EntityNotTracked {
+            get {
+                return SR.GetString ("ObjectStateManager_EntityNotTracked");
+            }
+        }
+
+        public static string ObjectStateManager_InvalidKey {
+            get {
+                return SR.GetString ("ObjectStateManager_InvalidKey");
+            }
+        }
+
+        public static string ObjectStateManager_KeyPropertyDoesntMatchValueInKey {
+            get {
+                return SR.GetString ("ObjectStateManager_KeyPropertyDoesntMatchValueInKey");
+            }
+        }
+
+        public static string ObjectStateManager_KeyPropertyDoesntMatchValueInKeyForAttach {
+            get {
+                return SR.GetString ("ObjectStateManager_KeyPropertyDoesntMatchValueInKeyForAttach");
+            }
+        }
+
+        public static string ObjectStateManager_NoEntryExistForEntityKey {
+            get {
+                return SR.GetString ("ObjectStateManager_NoEntryExistForEntityKey");
+            }
+        }
+
+        public static string ObjectStateManager_ObjectStateManagerContainsThisEntityKey {
+            get {
+                return SR.GetString ("ObjectStateManager_ObjectStateManagerContainsThisEntityKey");
+            }
+        }
+
+        public static string ObjectView_AddNewOperationNotAllowedOnAbstractBindingList {
+            get {
+                return SR.GetString ("ObjectView_AddNewOperationNotAllowedOnAbstractBindingList");
+            }
+        }
+
+        public static string ObjectView_CannotReplacetheEntityorRow {
+            get {
+                return SR.GetString ("ObjectView_CannotReplacetheEntityorRow");
+            }
+        }
+
+        public static string ObjectView_IncompatibleArgument {
+            get {
+                return SR.GetString ("ObjectView_IncompatibleArgument");
+            }
+        }
+
+        public static string ObjectView_IndexBasedInsertIsNotSupported {
+            get {
+                return SR.GetString ("ObjectView_IndexBasedInsertIsNotSupported");
+            }
+        }
+
+        public static string ObjectView_WriteOperationNotAllowedOnReadOnlyBindingList {
+            get {
+                return SR.GetString ("ObjectView_WriteOperationNotAllowedOnReadOnlyBindingList");
+            }
+        }
+
+        public static string OnlyStoreConnectionsSupported {
+            get {
+                return SR.GetString ("OnlyStoreConnectionsSupported");
+            }
+        }
+
+        public static string OperationOnReadOnlyCollection {
+            get {
+                return SR.GetString ("OperationOnReadOnlyCollection");
+            }
+        }
+
+        public static string OperationOnReadOnlyItem {
+            get {
+                return SR.GetString ("OperationOnReadOnlyItem");
+            }
+        }
+
+        public static string OrderByKeyIsNotOrderComparable {
+            get {
+                return SR.GetString ("OrderByKeyIsNotOrderComparable");
+            }
+        }
+
+        public static string PlusLeftExpressionInvalidType {
+            get {
+                return SR.GetString ("PlusLeftExpressionInvalidType");
+            }
+        }
+
+        public static string PlusRightExpressionInvalidType {
+            get {
+                return SR.GetString ("PlusRightExpressionInvalidType");
+            }
+        }
+
+        public static string ProviderDidNotCreateACommandDefinition {
+            get {
+                return SR.GetString ("ProviderDidNotCreateACommandDefinition");
+            }
+        }
+
+        public static string ProviderDidNotReturnAProviderManifest {
+            get {
+                return SR.GetString ("ProviderDidNotReturnAProviderManifest");
+            }
+        }
+
+        public static string ProviderDidNotReturnAProviderManifestToken {
+            get {
+                return SR.GetString ("ProviderDidNotReturnAProviderManifestToken");
+            }
+        }
+
+        public static string ProviderDidNotReturnSpatialServices {
+            get {
+                return SR.GetString ("ProviderDidNotReturnSpatialServices");
+            }
+        }
+
+        public static string ProviderDoesNotSupportCreateDatabase {
+            get {
+                return SR.GetString ("ProviderDoesNotSupportCreateDatabase");
+            }
+        }
+
+        public static string ProviderDoesNotSupportCreateDatabaseScript {
+            get {
+                return SR.GetString ("ProviderDoesNotSupportCreateDatabaseScript");
+            }
+        }
+
+        public static string ProviderDoesNotSupportDatabaseExists {
+            get {
+                return SR.GetString ("ProviderDoesNotSupportDatabaseExists");
+            }
+        }
+
+        public static string ProviderDoesNotSupportDeleteDatabase {
+            get {
+                return SR.GetString ("ProviderDoesNotSupportDeleteDatabase");
+            }
+        }
+
+        public static string ProviderEscapeLikeArgumentReturnedNull {
+            get {
+                return SR.GetString ("ProviderEscapeLikeArgumentReturnedNull");
+            }
+        }
+
+        public static string ProviderManifestTokenNotFound {
+            get {
+                return SR.GetString ("ProviderManifestTokenNotFound");
+            }
+        }
+
+        public static string ProviderRequiresStoreCommandTree {
+            get {
+                return SR.GetString ("ProviderRequiresStoreCommandTree");
+            }
+        }
+
+        public static string ProviderReturnedNullForCreateCommandDefinition {
+            get {
+                return SR.GetString ("ProviderReturnedNullForCreateCommandDefinition");
+            }
+        }
+
+        public static string ProviderShouldOverrideEscapeLikeArgument {
+            get {
+                return SR.GetString ("ProviderShouldOverrideEscapeLikeArgument");
+            }
+        }
+
+        public static string RelatedEnd_CannotCreateRelationshipEntitiesInDifferentContexts {
+            get {
+                return SR.GetString ("RelatedEnd_CannotCreateRelationshipEntitiesInDifferentContexts");
+            }
+        }
+
+        public static string RelatedEnd_ConflictingChangeOfRelationshipDetected {
+            get {
+                return SR.GetString ("RelatedEnd_ConflictingChangeOfRelationshipDetected");
+            }
+        }
+
+        public static string RelatedEnd_InvalidEntityContextForAttach {
+            get {
+                return SR.GetString ("RelatedEnd_InvalidEntityContextForAttach");
+            }
+        }
+
+        public static string RelatedEnd_InvalidEntityStateForAttach {
+            get {
+                return SR.GetString ("RelatedEnd_InvalidEntityStateForAttach");
+            }
+        }
+
+        public static string RelatedEnd_InvalidOwnerStateForAttach {
+            get {
+                return SR.GetString ("RelatedEnd_InvalidOwnerStateForAttach");
+            }
+        }
+
+        public static string RelatedEnd_LoadCalledOnAlreadyLoadedNoTrackedRelatedEnd {
+            get {
+                return SR.GetString ("RelatedEnd_LoadCalledOnAlreadyLoadedNoTrackedRelatedEnd");
+            }
+        }
+
+        public static string RelatedEnd_LoadCalledOnNonEmptyNoTrackedRelatedEnd {
+            get {
+                return SR.GetString ("RelatedEnd_LoadCalledOnNonEmptyNoTrackedRelatedEnd");
+            }
+        }
+
+        public static string RelatedEnd_OwnerIsNull {
+            get {
+                return SR.GetString ("RelatedEnd_OwnerIsNull");
+            }
+        }
+
+        public static string RelatedEnd_RelatedEndNotFound {
+            get {
+                return SR.GetString ("RelatedEnd_RelatedEndNotFound");
+            }
+        }
+
+        public static string RelatedEnd_UnableToAddEntity {
+            get {
+                return SR.GetString ("RelatedEnd_UnableToAddEntity");
+            }
+        }
+
+        public static string RelatedEnd_UnableToAddRelationshipWithDeletedEntity {
+            get {
+                return SR.GetString ("RelatedEnd_UnableToAddRelationshipWithDeletedEntity");
+            }
+        }
+
+        public static string RelatedEnd_UnableToRemoveEntity {
+            get {
+                return SR.GetString ("RelatedEnd_UnableToRemoveEntity");
+            }
+        }
+
+        public static string RelatedEndExprTypeMustBeReference {
+            get {
+                return SR.GetString ("RelatedEndExprTypeMustBeReference");
+            }
+        }
+
+        public static string RelationshipFromEndIsAmbiguos {
+            get {
+                return SR.GetString ("RelationshipFromEndIsAmbiguos");
+            }
+        }
+
+        public static string RelationshipManager_CannotGetRelatEndForDetachedPocoEntity {
+            get {
+                return SR.GetString ("RelationshipManager_CannotGetRelatEndForDetachedPocoEntity");
+            }
+        }
+
+        public static string RelationshipManager_CircularRelationshipsWithReferentialConstraints {
+            get {
+                return SR.GetString ("RelationshipManager_CircularRelationshipsWithReferentialConstraints");
+            }
+        }
+
+        public static string RelationshipManager_CollectionInitializeIsForDeserialization {
+            get {
+                return SR.GetString ("RelationshipManager_CollectionInitializeIsForDeserialization");
+            }
+        }
+
+        public static string RelationshipManager_InconsistentReferentialConstraintProperties {
+            get {
+                return SR.GetString ("RelationshipManager_InconsistentReferentialConstraintProperties");
+            }
+        }
+
+        public static string RelationshipManager_InitializeIsForDeserialization {
+            get {
+                return SR.GetString ("RelationshipManager_InitializeIsForDeserialization");
+            }
+        }
+
+        public static string RelationshipManager_InvalidRelationshipManagerOwner {
+            get {
+                return SR.GetString ("RelationshipManager_InvalidRelationshipManagerOwner");
+            }
+        }
+
+        public static string RelationshipManager_UnableToRetrieveReferentialConstraintProperties {
+            get {
+                return SR.GetString ("RelationshipManager_UnableToRetrieveReferentialConstraintProperties");
+            }
+        }
+
+        public static string RelationshipManager_UnexpectedNull {
+            get {
+                return SR.GetString ("RelationshipManager_UnexpectedNull");
+            }
+        }
+
+        public static string RelationshipManager_UnexpectedNullContext {
+            get {
+                return SR.GetString ("RelationshipManager_UnexpectedNullContext");
+            }
+        }
+
+        public static string RelationshipToEndIsAmbiguos {
+            get {
+                return SR.GetString ("RelationshipToEndIsAmbiguos");
+            }
+        }
+
+        public static string ResultingExpressionTypeCannotBeNull {
+            get {
+                return SR.GetString ("ResultingExpressionTypeCannotBeNull");
+            }
+        }
+
+        public static string RightSetExpressionArgsMustBeCollection {
+            get {
+                return SR.GetString ("RightSetExpressionArgsMustBeCollection");
+            }
+        }
+
+        public static string RowCtorElementCannotBeNull {
+            get {
+                return SR.GetString ("RowCtorElementCannotBeNull");
+            }
+        }
+
+        public static string RowTypeWithoutProperty {
+            get {
+                return SR.GetString ("RowTypeWithoutProperty");
+            }
+        }
+
+        public static string SelectDistinctMustBeEqualComparable {
+            get {
+                return SR.GetString ("SelectDistinctMustBeEqualComparable");
+            }
+        }
+
+        public static string SourceUriUnknown {
+            get {
+                return SR.GetString ("SourceUriUnknown");
+            }
+        }
+
+        public static string Spatial_GeographyValueNotCompatibleWithSpatialServices {
+            get {
+                return SR.GetString ("Spatial_GeographyValueNotCompatibleWithSpatialServices");
+            }
+        }
+
+        public static string Spatial_GeometryValueNotCompatibleWithSpatialServices {
+            get {
+                return SR.GetString ("Spatial_GeometryValueNotCompatibleWithSpatialServices");
+            }
+        }
+
+        public static string Spatial_ProviderValueNotCompatibleWithSpatialServices {
+            get {
+                return SR.GetString ("Spatial_ProviderValueNotCompatibleWithSpatialServices");
+            }
+        }
+
+        public static string Spatial_WellKnownGeographyValueNotValid {
+            get {
+                return SR.GetString ("Spatial_WellKnownGeographyValueNotValid");
+            }
+        }
+
+        public static string Spatial_WellKnownGeometryValueNotValid {
+            get {
+                return SR.GetString ("Spatial_WellKnownGeometryValueNotValid");
+            }
+        }
+
+        public static string Spatial_WellKnownValueSerializationPropertyNotDirectlySettable {
+            get {
+                return SR.GetString ("Spatial_WellKnownValueSerializationPropertyNotDirectlySettable");
+            }
+        }
+
+        public static string SpatialWithUseStrongSpatialTypesFalse {
+            get {
+                return SR.GetString ("SpatialWithUseStrongSpatialTypesFalse");
+            }
+        }
+
+        public static string SqlGen_ApplyNotSupportedOnSql8 {
+            get {
+                return SR.GetString ("SqlGen_ApplyNotSupportedOnSql8");
+            }
+        }
+
+        public static string SqlGen_NiladicFunctionsCannotHaveParameters {
+            get {
+                return SR.GetString ("SqlGen_NiladicFunctionsCannotHaveParameters");
+            }
+        }
+
+        public static string SqlGen_ParameterForLimitNotSupportedOnSql8 {
+            get {
+                return SR.GetString ("SqlGen_ParameterForLimitNotSupportedOnSql8");
+            }
+        }
+
+        public static string SqlGen_ParameterForSkipNotSupportedOnSql8 {
+            get {
+                return SR.GetString ("SqlGen_ParameterForSkipNotSupportedOnSql8");
+            }
+        }
+
+        public static string SqlProvider_CredentialsMissingForMasterConnection {
+            get {
+                return SR.GetString ("SqlProvider_CredentialsMissingForMasterConnection");
+            }
+        }
+
+        public static string SqlProvider_DdlGeneration_CannotDeleteDatabaseNoInitialCatalog {
+            get {
+                return SR.GetString ("SqlProvider_DdlGeneration_CannotDeleteDatabaseNoInitialCatalog");
+            }
+        }
+
+        public static string SqlProvider_DdlGeneration_CannotTellIfDatabaseExists {
+            get {
+                return SR.GetString ("SqlProvider_DdlGeneration_CannotTellIfDatabaseExists");
+            }
+        }
+
+        public static string SqlProvider_DdlGeneration_MissingInitialCatalog {
+            get {
+                return SR.GetString ("SqlProvider_DdlGeneration_MissingInitialCatalog");
+            }
+        }
+
+        public static string SqlProvider_GeographyValueNotSqlCompatible {
+            get {
+                return SR.GetString ("SqlProvider_GeographyValueNotSqlCompatible");
+            }
+        }
+
+        public static string SqlProvider_GeometryValueNotSqlCompatible {
+            get {
+                return SR.GetString ("SqlProvider_GeometryValueNotSqlCompatible");
+            }
+        }
+
+        public static string SqlProvider_IncompleteCreateDatabase {
+            get {
+                return SR.GetString ("SqlProvider_IncompleteCreateDatabase");
+            }
+        }
+
+        public static string SqlProvider_IncompleteCreateDatabaseAggregate {
+            get {
+                return SR.GetString ("SqlProvider_IncompleteCreateDatabaseAggregate");
+            }
+        }
+
+        public static string SqlProvider_Sql2008RequiredForSpatial {
+            get {
+                return SR.GetString ("SqlProvider_Sql2008RequiredForSpatial");
+            }
+        }
+
+        public static string SqlProvider_SqlTypesAssemblyNotFound {
+            get {
+                return SR.GetString ("SqlProvider_SqlTypesAssemblyNotFound");
+            }
+        }
+
+        public static string SqlSpatialservices_CouldNotCreateWellKnownGeographyValueNoSrid {
+            get {
+                return SR.GetString ("SqlSpatialservices_CouldNotCreateWellKnownGeographyValueNoSrid");
+            }
+        }
+
+        public static string SqlSpatialservices_CouldNotCreateWellKnownGeographyValueNoWkbOrWkt {
+            get {
+                return SR.GetString ("SqlSpatialservices_CouldNotCreateWellKnownGeographyValueNoWkbOrWkt");
+            }
+        }
+
+        public static string SqlSpatialservices_CouldNotCreateWellKnownGeometryValueNoSrid {
+            get {
+                return SR.GetString ("SqlSpatialservices_CouldNotCreateWellKnownGeometryValueNoSrid");
+            }
+        }
+
+        public static string SqlSpatialservices_CouldNotCreateWellKnownGeometryValueNoWkbOrWkt {
+            get {
+                return SR.GetString ("SqlSpatialservices_CouldNotCreateWellKnownGeometryValueNoWkbOrWkt");
+            }
+        }
+
+        public static string StackOverflowInParser {
+            get {
+                return SR.GetString ("StackOverflowInParser");
+            }
+        }
+
+        public static string TopAndLimitCannotCoexist {
+            get {
+                return SR.GetString ("TopAndLimitCannotCoexist");
+            }
+        }
+
+        public static string TopAndSkipCannotCoexist {
+            get {
+                return SR.GetString ("TopAndSkipCannotCoexist");
+            }
+        }
+
+        public static string TVFReturnTypeRowHasNonScalarProperty {
+            get {
+                return SR.GetString ("TVFReturnTypeRowHasNonScalarProperty");
+            }
+        }
+
+        public static string TypeArgumentIsNotValid {
+            get {
+                return SR.GetString ("TypeArgumentIsNotValid");
+            }
+        }
+
+        public static string TypeArgumentMustBeLiteral {
+            get {
+                return SR.GetString ("TypeArgumentMustBeLiteral");
+            }
+        }
+
+        public static string TypeDeclaredAsAttributeAndElement {
+            get {
+                return SR.GetString ("TypeDeclaredAsAttributeAndElement");
+            }
+        }
+
+        public static string TypeMustBeDeclared {
+            get {
+                return SR.GetString ("TypeMustBeDeclared");
+            }
+        }
+
+        public static string TypeMustBeInheritableType {
+            get {
+                return SR.GetString ("TypeMustBeInheritableType");
+            }
+        }
+
+        public static string UnableToDetermineApplicationContext {
+            get {
+                return SR.GetString ("UnableToDetermineApplicationContext");
+            }
+        }
+
+        public static string UnableToDetermineStoreVersion {
+            get {
+                return SR.GetString ("UnableToDetermineStoreVersion");
+            }
+        }
+
+        public static string UnableToLoadResource {
+            get {
+                return SR.GetString ("UnableToLoadResource");
+            }
+        }
+
+        public static string UnknownAstCommandExpression {
+            get {
+                return SR.GetString ("UnknownAstCommandExpression");
+            }
+        }
+
+        public static string UnknownAstExpressionType {
+            get {
+                return SR.GetString ("UnknownAstExpressionType");
+            }
+        }
+
+        public static string UnknownBuiltInAstExpressionType {
+            get {
+                return SR.GetString ("UnknownBuiltInAstExpressionType");
+            }
+        }
+
+        public static string Update_AmbiguousServerGenIdentifier {
+            get {
+                return SR.GetString ("Update_AmbiguousServerGenIdentifier");
+            }
+        }
+
+        public static string Update_CircularRelationships {
+            get {
+                return SR.GetString ("Update_CircularRelationships");
+            }
+        }
+
+        public static string Update_ConstraintCycle {
+            get {
+                return SR.GetString ("Update_ConstraintCycle");
+            }
+        }
+
+        public static string Update_DuplicateKeys {
+            get {
+                return SR.GetString ("Update_DuplicateKeys");
+            }
+        }
+
+        public static string Update_ErrorLoadingRecord {
+            get {
+                return SR.GetString ("Update_ErrorLoadingRecord");
+            }
+        }
+
+        public static string Update_GeneralExecutionException {
+            get {
+                return SR.GetString ("Update_GeneralExecutionException");
+            }
+        }
+
+        public static string Update_InvalidChanges {
+            get {
+                return SR.GetString ("Update_InvalidChanges");
+            }
+        }
+
+        public static string Update_ReferentialConstraintIntegrityViolation {
+            get {
+                return SR.GetString ("Update_ReferentialConstraintIntegrityViolation");
+            }
+        }
+
+        public static string Update_WorkspaceMismatch {
+            get {
+                return SR.GetString ("Update_WorkspaceMismatch");
+            }
+        }
+
+        public static string Validator_BaseTypeHasMemberOfSameName {
+            get {
+                return SR.GetString ("Validator_BaseTypeHasMemberOfSameName");
+            }
+        }
+
+        public static string Validator_CollectionHasNoTypeUsage {
+            get {
+                return SR.GetString ("Validator_CollectionHasNoTypeUsage");
+            }
+        }
+
+        public static string Validator_CollectionTypesCannotHaveBaseType {
+            get {
+                return SR.GetString ("Validator_CollectionTypesCannotHaveBaseType");
+            }
+        }
+
+        public static string Validator_EmptyIdentity {
+            get {
+                return SR.GetString ("Validator_EmptyIdentity");
+            }
+        }
+
+        public static string Validator_FacetHasNoName {
+            get {
+                return SR.GetString ("Validator_FacetHasNoName");
+            }
+        }
+
+        public static string Validator_FacetTypeIsNull {
+            get {
+                return SR.GetString ("Validator_FacetTypeIsNull");
+            }
+        }
+
+        public static string Validator_ItemAttributeHasNullTypeUsage {
+            get {
+                return SR.GetString ("Validator_ItemAttributeHasNullTypeUsage");
+            }
+        }
+
+        public static string Validator_MemberHasNoName {
+            get {
+                return SR.GetString ("Validator_MemberHasNoName");
+            }
+        }
+
+        public static string Validator_MemberHasNullDeclaringType {
+            get {
+                return SR.GetString ("Validator_MemberHasNullDeclaringType");
+            }
+        }
+
+        public static string Validator_MemberHasNullTypeUsage {
+            get {
+                return SR.GetString ("Validator_MemberHasNullTypeUsage");
+            }
+        }
+
+        public static string Validator_MetadataPropertyHasNoName {
+            get {
+                return SR.GetString ("Validator_MetadataPropertyHasNoName");
+            }
+        }
+
+        public static string Validator_OSpace_Convention_NonMatchingUnderlyingTypes {
+            get {
+                return SR.GetString ("Validator_OSpace_Convention_NonMatchingUnderlyingTypes");
+            }
+        }
+
+        public static string Validator_RefTypeHasNullEntityType {
+            get {
+                return SR.GetString ("Validator_RefTypeHasNullEntityType");
+            }
+        }
+
+        public static string Validator_RefTypesCannotHaveBaseType {
+            get {
+                return SR.GetString ("Validator_RefTypesCannotHaveBaseType");
+            }
+        }
+
+        public static string Validator_TypeHasNoName {
+            get {
+                return SR.GetString ("Validator_TypeHasNoName");
+            }
+        }
+
+        public static string Validator_TypeHasNoNamespace {
+            get {
+                return SR.GetString ("Validator_TypeHasNoNamespace");
+            }
+        }
+
+        public static string Validator_TypeUsageHasNullEdmType {
+            get {
+                return SR.GetString ("Validator_TypeUsageHasNullEdmType");
+            }
+        }
+
+        public static string ViewGen_AND {
+            get {
+                return SR.GetString ("ViewGen_AND");
+            }
+        }
+
+        public static string ViewGen_CommaBlank {
+            get {
+                return SR.GetString ("ViewGen_CommaBlank");
+            }
+        }
+
+        public static string ViewGen_Entities {
+            get {
+                return SR.GetString ("ViewGen_Entities");
+            }
+        }
+
+        public static string ViewGen_EntityInstanceToken {
+            get {
+                return SR.GetString ("ViewGen_EntityInstanceToken");
+            }
+        }
+
+        public static string ViewGen_Error {
+            get {
+                return SR.GetString ("ViewGen_Error");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Disj_Eq {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Disj_Eq");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Disj_Subs {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Disj_Subs");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Disj_Subs_Ref {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Disj_Subs_Ref");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Disj_Unk {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Disj_Unk");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Eq_Disj {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Eq_Disj");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Eq_Subs {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Eq_Subs");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Eq_Subs_Ref {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Eq_Subs_Ref");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Eq_Unk {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Eq_Unk");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Eq_Unk_Association {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Eq_Unk_Association");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Sub_Disj {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Sub_Disj");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Sub_Eq {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Sub_Eq");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Sub_Eq_Ref {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Sub_Eq_Ref");
+            }
+        }
+
+        public static string Viewgen_ErrorPattern_Partition_Sub_Unk {
+            get {
+                return SR.GetString ("Viewgen_ErrorPattern_Partition_Sub_Unk");
+            }
+        }
+
+        public static string ViewGen_Extent {
+            get {
+                return SR.GetString ("ViewGen_Extent");
+            }
+        }
+
+        public static string Viewgen_NoJoinKeyOrFK {
+            get {
+                return SR.GetString ("Viewgen_NoJoinKeyOrFK");
+            }
+        }
+
+        public static string ViewGen_NotNull {
+            get {
+                return SR.GetString ("ViewGen_NotNull");
+            }
+        }
+
+        public static string ViewGen_Null {
+            get {
+                return SR.GetString ("ViewGen_Null");
+            }
+        }
+
+        public static string ViewGen_Tuples {
+            get {
+                return SR.GetString ("ViewGen_Tuples");
+            }
+        }
+
+        public static string WildcardEnumeratorReturnedNull {
+            get {
+                return SR.GetString ("WildcardEnumeratorReturnedNull");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data.Entity/System.Data.Entity.dll.sources b/mcs/class/System.Data.Entity/System.Data.Entity.dll.sources
new file mode 100644 (file)
index 0000000..32c5577
--- /dev/null
@@ -0,0 +1,725 @@
+Assembly/AssemblyInfo.cs
+../../build/common/Consts.cs
+../../build/common/SR.cs
+EntityRes.cs
+EntityResCategoryAttribute.cs
+EntityResDescriptionAttribute.cs
+Error.cs
+Strings.cs
+
+../../../external/referencesource/System.Data.Entity/misc/HResults.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/AbstractExpressions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Aggregates.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/BasicCommandTreeVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/BasicExpressionVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbCommandTree.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbDeleteCommandTree.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor_TResultType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbFunctionCommandTree.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbInsertCommandTree.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbLambda.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationClause.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationCommandTree.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbQueryCommandTree.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbSetClause.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DbUpdateCommandTree.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/DefaultExpressionVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBindings.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/ArgumentValidation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/EnumerableValidator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Row.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Spatial/SpatialEdmFunctions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/DbExpressionRules.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionCopier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionDumper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionKeyGen.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionList.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionPrinter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ParameterRetriever.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/PatternMatchRules.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/Validator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ViewSimplifier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/Internal/XmlExpressionDumper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/OperatorExpressions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/RelationalExpressions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/CommandTrees/ValueExpressions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/DataRecord.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/DataRecordInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/DbCommandDefinition.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/DbProviderManifest.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/DbProviderServices.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/DbXmlEnabledProviderManifest.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntityRecordInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/AliasedExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/AstNode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/BuiltInExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/CaseExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/Command.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/ConstructorExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/CreateRefExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/DotExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/FunctionDefinition.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupAggregateExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupPartitionExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/Identifier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/Literal.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/MethodExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/NamespaceImport.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/NavigationExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/ParenExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryParameter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryStatement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/RefExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/AST/TypeDefinition.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/CqlErrorHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/CqlLexer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/CqlLexerHelpers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/CqlParser.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/CqlParserHelpers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/CqlQuery.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/EntitySqlParser.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/FunctionOverloadResolver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/ParseResult.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/ParserOptions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/SemanticAnalyzer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/SemanticResolver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/StaticContext.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntitySql/TypeResolver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/EntityUtil.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/FieldMetadata.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/FieldNameLookup.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/DbTypeMap.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/ColumnMapKeyBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/CompensatingCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/Coordinator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorScratchpad.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordState.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateScratchpad.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/Shaper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/ShaperFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/Translator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/Materialization/Util.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Internal/MultipartIdentifier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/EntityClientCacheKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/EntitySqlQueryCacheKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/LinqQueryCacheKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/QueryCache/ShaperFactoryQueryCacheKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/AliasGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/BoolExpr.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Clause.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/ConversionContext.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Converter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/DomainConstraint.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/IdentifierService.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/KnowledgeBase.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Literal.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/NegationPusher.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Sentence.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Simplifier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Solver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Vertex.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Boolean/Visitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/ByValueEqualityComparer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/CommandHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/DisposableCollectionWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Helpers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/InternalBase.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/KeyToListMap.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Memoizer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/MetadataHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/ModifiableIteratorCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Pair.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Set.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/Singleton.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/StringUtil.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/ThreadSafeList.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/TrailingSpaceComparer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Common/Utils/TreePrinter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/DbConnectionOptions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/DbParameterCollectionHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/DbParameterHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityAdapter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityCommand.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityCommandDefinition.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityConnection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityConnectionStringBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityDataReader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityParameter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityParameterCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityProviderFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityProviderServices.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/EntityTransaction.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityClient/NameValuePair.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityCommandCompilationException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityCommandExecutionException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Action.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/BooleanFacetDescriptionElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ByteFacetDescriptionElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/CollectionKind.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/CollectionTypeElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ConcurrencyMode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Documentation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSetEnd.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySetDefiningQuery.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSetEnd.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityKeyElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ErrorCode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetDescriptionElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetEnabledSchemaElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FilteredSchemaElementLookUpTable.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Function.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionCommandText.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionImportElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/IntegerFacetDescriptionElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/IRelationship.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/IRelationshipEnd.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ISchemaElementLookUpTable.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ItemType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/KeyProperty.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunction.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunctionTypeElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/NavigationProperty.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/OnOperation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Operation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Parameter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/PrimitiveSchema.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Property.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceSchema.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceTypeElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraint.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraintRoleElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Relationship.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEnd.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEndCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnValue.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypeElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypePropertyElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ScalarType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Schema.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaComplexType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaDataModelOption.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTable.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTableEnumerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumMember.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaLookupTable.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SridFacetDescriptionElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StoreGeneratedPattern.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredProperty.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TextElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeModifier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeRefElement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeUsageBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Utils.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ValidationHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/XmlSchemaResource.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntitySqlException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/EntityState.cs
+../../../external/referencesource/System.Data.Entity/System/Data/IEntityAdapter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/IEntityStateEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/IEntityStateManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/IExtendedDataRecord.cs
+../../../external/referencesource/System.Data.Entity/System/Data/InternalMappingException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/InvalidCommandTreeException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/BaseMetadataMappingVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/DefaultObjectMappingItemCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/EntityViewContainer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/EntityViewGenerationAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.ReturnTypeRenameMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/FunctionImportMappingComposable.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/FunctionImportMappingNonComposable.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Mapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/MappingItemCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.HashSourceBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ObjectAssociationEndMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ObjectComplexPropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ObjectMemberMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ObjectMslConstructs.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ObjectNavigationPropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ObjectPropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ObjectTypeMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageAssociationSetMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageAssociationTypeMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageComplexPropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageComplexTypeMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageConditionPropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageEndPropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageEntityContainerMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageEntitySetMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageEntityTypeMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageMappingErrorCode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageMappingFragment.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.ViewDictionary.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageMappingItemLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageModificationFunctionMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageMslConstructs.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StoragePropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageScalarPropertyMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageSetMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/StorageTypeMapping.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/AssociationSetMetadata.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/ChangeNode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/CompositeKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/DynamicUpdateCommand.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractedStateEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractorMetadata.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionMappingTranslator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionUpdateCommand.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/Graph.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/KeyManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.Evaluator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.ExtentPlaceholderCreator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.JoinPredicateVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.SubstitutingCloneVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/PropagatorFlags.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/PropagatorResult.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/RecordConverter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/RelationshipConstraintValidator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/SourceInterpreter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/TableChangeProcessor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/UndirectedGraph.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommand.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommandOrderer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCompiler.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateExpressionVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateTranslator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/Update/Internal/ViewLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/BasicViewGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellCreator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellPartitioner.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellTreeSimplifier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/ConfigViewGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/AliasedSlot.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/BooleanProjectedSlot.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CaseCqlBlock.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlBlock.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlIdentifiers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlWriter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/ExtentCqlBlock.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/JoinCqlBlock.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/SlotInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/UnionCqlBlock.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/DiscriminatorMap.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/GeneratedView.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQuery.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryKB.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryProcessor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/QueryRewriter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingPass.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingProcessor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingSimplifier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingValidator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RoleBoolean.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/Tile.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpression.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpressionVisitors.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolLiteral.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatementProjectedSlot.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Cell.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellIdBoolean.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellLabel.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellQuery.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNodeVisitors.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeOpType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Constant.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ConstantProjectedSlot.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Domain.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ErrorLog.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeafCellTreeNode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeftCellWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberDomainMap.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberMaps.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberPath.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectedSlot.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectionIndex.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberRestriction.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/NegatedConstant.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ProjectedSlot.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/QualifiedCellIdBoolean.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarConstant.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarRestriction.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeConstant.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeRestriction.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/WithStatement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExceptionHelpers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExternalCalls.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ViewGenErrorCode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicCellRelation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicKeyConstraint.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/CellRelation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ConstraintBase.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ErrorPatternMatcher.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ExtentKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ForeignConstraint.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/KeyConstraint.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/SchemaConstraints.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellRelation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellSlot.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewKeyConstraint.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenContext.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenGatekeeper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenResults.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Mapping/ViewValidator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/MappingException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/AspProxy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/CacheForPrimitiveTypes.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ClrPerspective.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Converter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/CustomAssemblyResolver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/DataSpace.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/DefaultAssemblyResolver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/AssociationEndMember.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/AssociationSet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/AssociationSetEnd.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/AssociationType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/AttributeKind.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/BuiltInKind.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/CollectionType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/ComplexType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/Documentation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EdmConstants.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EdmFunction.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EdmMember.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EdmProperty.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EdmType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EntityContainer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EntitySet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBase.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBaseCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EntityType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EntityTypeBase.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EnumMember.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/EnumType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/Facet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/FacetDescription.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/FacetValueContainer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/FacetValues.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/FilteredReadOnlyMetadataCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/FunctionParameter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/GlobalItem.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/ItemCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/LightweightCodeGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MemberCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MetadataCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem_Static.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MetadataProperty.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyvalue.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/NavigationProperty.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/NavigationPropertyAccessor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/OperationAction.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/ParameterMode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/PrimitiveType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/PrimitiveTypeKind.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/Provider/ClrProviderManifest.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifest.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestFunctionBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestSpatialFunctions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/ReadOnlyMetadataCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/ReferentialConstraint.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/RefType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/RelationshipEndMember.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/RelationshipMultiplicity.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/RelationshipSet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/RelationshipType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/RowType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/SafeLink.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/SafeLinkCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/SimpleType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/StructuralType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/TypeUsage.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Edm/util.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/EdmError.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/EdmItemCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/EdmItemCollection.OcAssemblyCache.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/EdmItemError.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/EdmSchemaError.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/EdmSchemaErrorSeverity.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/EdmValidator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Helper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MappingMetadataHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactAssemblyResolver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderComposite.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeFile.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeResource.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderFile.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderResource.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderXmlReaderWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataCache.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/MetadataWorkspace.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ModelPerspective.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectItemCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCache.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCacheEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/ImmutableAssemblyCacheEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssembliesSet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssemblyEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/LoadMessageLogger.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/LockedAssemblyCache.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/MetadataAssemblyHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/MutableAssemblyCacheEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAssemblyLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAttributeAssemblyLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemCachedAssemblyLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemConventionAssemblyLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemLoadingSessionData.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemNoOpAssemblyLoader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/ParameterTypeSemantics.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/Perspective.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/StoreItemCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/StoreItemCollection.Loader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/TargetPerspective.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/TypeHelpers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/TypeSemantics.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Metadata/XmlConstants.cs
+../../../external/referencesource/System.Data.Entity/System/Data/MetadataException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/ObjectNotFoundException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/AdditionalEntityFunctions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/CompiledQuery.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/ComplexObject.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexPropertyAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexTypeAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmEntityTypeAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmEnumTypeAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmFunctionAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmPropertyAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipNavigationPropertyAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipRoleAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmScalarPropertyAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmSchemaAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EdmTypeAttribute.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EntityCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EntityObject.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference_TResultType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/IEntityChangeTracker.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/IEntityWithChangeTracker.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/IEntityWithKey.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/IEntityWithRelationships.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/IRelatedEnd.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/IRelationshipFixer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/RelatedEnd.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipFixer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipKind.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipNavigation.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataClasses/StructuralObject.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/DataRecordObjectView.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/BindingContext.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/CompiledELinqQueryState.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/ELinqQueryState.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/EntityExpressionVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/ExpressionConverter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/ExpressionVisitorHelpers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/Funcletizer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/InitializerFacet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/LinqExpressionNormalizer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/MethodCallTranslator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/ObjectQueryProvider.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/OrderByLifter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/ReflectionUtil.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/SpatialMethodCallTranslator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/SpatialPropertyTranslator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/Translator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ELinq/TypeSystem.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/EntityEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/EntityFunctions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/FieldDescriptor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/BaseEntityWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/ComplexTypeMaterializer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntityProxyFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntityProxyTypeInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryState.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntityWithChangeTrackerStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntityWithKeyStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntityWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/EntityWrapperFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/ForeignKeyFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/IChangeTrackingStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/IEntityKeyStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/IEntityWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/IPropertyAccessorStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/LazyLoadBehavior.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/LightweightEntityWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/NullEntityWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/ObjectFullSpanRewriter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryExecutionPlan.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryState.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/ObjectSpanRewriter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/PocoEntityKeyStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/PocoPropertyAccessorStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/SnapshotChangeTrackingStrategy.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Internal/TransactionManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/IObjectSet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/IObjectView.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/IObjectViewData.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/MergeOption.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/NextResultGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectContext.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectMaterializedEventArgs.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectParameter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectParameterCollection.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectQuery.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectQuery_EntitySqlExtensions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectQuery_TResultType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectResult.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectResult_TResultType.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectSet.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectStateEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectStateEntryBaseUpdatableDataRecord.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbDataRecord.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbUpdatableDataRecord.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectStateEntryOriginalDbUpdatableDataRecord.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectStateManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectStateManagerMetadata.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectView.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectViewEntityCollectionData.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectViewFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectViewListener.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ObjectViewQueryResultData.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/ProxyDataContractResolver.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/RefreshMode.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/RelationshipEntry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/RelationshipWrapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/SaveOptions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/Span.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/SpanIndex.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/SqlClient/SqlFunctions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Objects/SqlClient/SqlSpatialFunctions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/OptimisticConcurrencyException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/PropertyConstraintException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/ProviderIncompatibleException.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/AncillaryOps.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/BasicValidator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMap.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapCopier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapFactory.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Command.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Dump.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/ExplicitDiscriminatorMap.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Metadata.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/NodeCounter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/NodeInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Nodes.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/OpCopier.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Ops.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/PhysicalOps.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/RelOps.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/RelPropertyHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Rule.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/RulePatternOps.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/RuleProcessor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/ScalarOps.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Vars.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/InternalTrees/Visitors.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/AggregatePushdown.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/CodeGen.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapProcessor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapTranslator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/CommandPlan.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/ConstraintManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/CTreeGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/ITreeGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/JoinElimination.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/JoinGraph.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/KeyPullup.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/NestPullup.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/NominalTypeEliminator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/Normalizer.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompiler.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompilerUtil.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/Predicate.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/PreProcessor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/ProjectionPruner.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyPushdownHelper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyRef.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/ProviderCommandInfoUtils.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/StructuredTypeInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/SubqueryTrackingVisitor.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/TransformationRules.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/TypeInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/TypeUtils.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/Validator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/VarInfo.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/VarRefManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/PlanCompiler/VarRemapper.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataReader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataRecord.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/DbGeography.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/DbGeographyWellKnownValue.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/DbGeometry.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/DbGeometryWellKnownValue.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/DbSpatialDataReader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/DbSpatialServices.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/DefaultSpatialServices.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/ExtensionMethods.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/Internal/SpatialExceptions.cs
+../../../external/referencesource/System.Data.Entity/System/Data/Spatial/SpatialHelpers.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/IDbSpatialValue.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/DmlSqlGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/ISqlFragment.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/JoinSymbol.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/OptionalColumn.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ConformanceChecker.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ExpressionRewriter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlFunctionCallHandler.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlGenerator.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectClauseBuilder.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectStatement.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlWriter.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/Symbol.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolPair.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolTable.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolUsageManager.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlGen/TopClause.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlProviderManifest.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlProviderServices.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlProviderUtilities.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlSpatialDataReader.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.Generated.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlTypesAssembly.cs
+../../../external/referencesource/System.Data.Entity/System/Data/SqlClient/SqlVersion.cs
+../../../external/referencesource/System.Data.Entity/System/Data/UpdateException.cs
+../../../external/referencesource/System.Data.Entity/Util/AppSettings.cs
index ff9dd8fd02b9793ce77ad127926b462375d3e359..6a8469e3e3004e4ad7d3ffc1ffb67d9d320ddde8 100755 (executable)
@@ -12,17 +12,12 @@ LIB_MCS_FLAGS = \
                /resource:./src/DbLinq/Schema/Dbml/DbmlSchema.xsd,DbLinq.Schema.Dbml.DbmlSchema.xsd \
                /d:MONO_STRICT /d:MONO_DEPLOY -warn:1
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
-endif
-
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = src/DbLinq/Schema/Dbml/DbmlSchema.xsd
 
 # This is a .NET 3.5+ assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Data.Linq.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Data.Linq/System.Data.Linq-net_2_0.csproj b/mcs/class/System.Data.Linq/System.Data.Linq-net_2_0.csproj
deleted file mode 100644 (file)
index 6893a2f..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{286ED1A3-6AE6-4147-A43B-B3421681CC84}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;MONO_STRICT;MONO_DEPLOY;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;MONO_STRICT;MONO_DEPLOY;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdVendor.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresVendor.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlDataContext.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlVendor.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleVendor.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlDataContext.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlVendor.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\Schema\DataCommand.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteVendor.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerDataContext.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerTypeConversions.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerVendor.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ChangeAction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ChangeSet.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseTransaction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseConnection.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseTransaction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\TransactionalCommand.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\ITransactionalCommand.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DataContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DataLoadOptions.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DBLinqExtendedAttributte.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\EntityRef.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\EntitySet.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IdentityKey.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReaderFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityProviderReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReaderFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IExecuteResult.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IMemberModificationHandler.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\DisabledEntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityState.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTrack.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\IEntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\MemberModificationHandler.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\QueryProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\VendorProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ITable.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IVendorProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAbstractMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAssociationMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedColumnMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaAssociation.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaFunction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaModel.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaTable.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributeMappingSource.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\LambdaMetaAccessor.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\MappingContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\XmlMappingSource.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\RefreshMode.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlLiteralPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlParameterPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatement.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatementBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\FirebirdProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\IngresProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\MySqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\OracleProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\PostgreSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2000Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2005Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2008Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqliteProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqlServerProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\AbstractQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\BuilderContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\DeleteQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\DirectQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Error.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionChain.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\ExpressionMutatorExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\ExpressionMutatorFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\BinaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ConditionalExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ConstantExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\IMemberBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\InvocationExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\LambdaExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ListInitExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberAssignmentMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberBindingMutatorFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberInitExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberListBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberMemberBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MethodCallExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\NewArrayExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\NewExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ParameterExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\TypeBinaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\UnaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionPrecedence.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ColumnExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\CustomExpressionType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\EntitySetExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\GroupExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\IExecutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\IMutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\InputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\MetaTableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\MutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ObjectInputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ObjectOutputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\OperandsMutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\OrderByExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SelectExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SelectOperatorType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SpecialExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SpecialExpressionType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\StartIndexOffsetExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SubSelectExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableJoinType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionTier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataMapper.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataRecordReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionDispatcher.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionLanguageParser.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionOptimizer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionQualifier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataMapper.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataRecordReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Analyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Registrar.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionLanguageParser.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionOptimizer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionQualifier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\LineGrouping.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\PrequelAnalyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.Upsert.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryCache.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryRunner.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SpecialExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SqlBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IPrequelAnalyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryCache.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryRunner.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISpecialExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISqlBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ParameterizedQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\QueryContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\SelectQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\UpsertQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Table.cs" />\r
-    <Compile Include="src\DbLinq\DbLinqToDoAttribute.cs" />\r
-    <Compile Include="src\DbLinq\Factory\DbLinqAttribute.cs" />\r
-    <Compile Include="src\DbLinq\Factory\Implementation\ReflectionObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Factory\IObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Factory\ObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Language\ILanguages.cs" />\r
-    <Compile Include="src\DbLinq\Language\ILanguageWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\AbstractEndPluralWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\AbstractWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\Languages.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\NoLanguageWords.cs" />\r
-    <Compile Include="src\DbLinq\Schema\AssociationName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Case.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ColumnName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\ArrayAdapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\CsvArrayAdapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\EnumType.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\INamedType.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\ISimpleList.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\SpecifiedPropertyUpdater.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DatabaseSerializer.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.Adapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSerializer.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Implementation\NameFormatter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\INameFormatter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Name.cs" />\r
-    <Compile Include="src\DbLinq\Schema\NameFormat.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ParameterName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ProcedureName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\SchemaName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\TableName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\WordsExtraction.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Binary.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ChangeConflictCollection.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ChangeConflictException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\CompiledQuery.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ConflictMode.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\DBConvert.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\DuplicateKeyException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ForeignKeyReferenceAlreadyHasValueException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\IFunctionResult.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\IMultipleResults.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ISingleResult.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Link.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\MemberChangeConflict.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ModifiedMemberInfo.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ObjectChangeConflict.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\AssociationAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\AutoSync.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ColumnAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\DataAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\DatabaseAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\FunctionAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\InheritanceMappingAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MappingSource.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAccessor.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAccessor_2.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAssociation.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaFunction.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaModel.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaParameter.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaTable.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaType.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ParameterAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ProviderAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ResultTypeAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\TableAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\UpdateCheck.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient.Implementation\ObjectMaterializer.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlHelpers.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlMethods.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Util\DataCommand.cs" />\r
-    <Compile Include="src\DbLinq\Util\DbmlExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\ExpressionChainEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\ExpressionEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDataRecordExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDataTypeExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDbDataParameterExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IThreadSafeDictionary.cs" />\r
-    <Compile Include="src\DbLinq\Util\LambdaComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\MemberInfoExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\Output.cs" />\r
-    <Compile Include="src\DbLinq\Util\OutputLevel.cs" />\r
-    <Compile Include="src\DbLinq\Util\Page.cs" />\r
-    <Compile Include="src\DbLinq\Util\Profiler.cs" />\r
-    <Compile Include="src\DbLinq\Util\QuotesHelper.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReferenceEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReflectionExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReflectionUtility.cs" />\r
-    <Compile Include="src\DbLinq\Util\StringExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\TextWriterExtension.cs" />\r
-    <Compile Include="src\DbLinq\Util\ThreadSafeDictionary.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeConvert.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\DbSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataName.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataTableColumn.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataType.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataName.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataTableColumn.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.ForeignKey.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Name.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.TypeMapping.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.ProcedureResult.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\INameAliases.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\ISchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\ISqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IVendor.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\VendorAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="./src/DbLinq/Schema/Dbml/DbmlSchema.xsd">\r
-      <LogicalName>DbLinq.Schema.Dbml.DbmlSchema.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Linq/System.Data.Linq-net_4_0.csproj b/mcs/class/System.Data.Linq/System.Data.Linq-net_4_0.csproj
deleted file mode 100644 (file)
index f99cbb0..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EB50CF5B-D17A-4BEF-96C4-874FB8E61ACE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdVendor.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresVendor.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlDataContext.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlVendor.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleVendor.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlDataContext.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlVendor.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\Schema\DataCommand.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteVendor.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerDataContext.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerTypeConversions.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerVendor.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ChangeAction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ChangeSet.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseTransaction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseConnection.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseTransaction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\TransactionalCommand.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\ITransactionalCommand.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DataContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DataLoadOptions.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DBLinqExtendedAttributte.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\EntityRef.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\EntitySet.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IdentityKey.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReaderFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityProviderReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReaderFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IExecuteResult.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IMemberModificationHandler.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\DisabledEntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityState.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTrack.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\IEntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\MemberModificationHandler.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\QueryProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\VendorProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ITable.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IVendorProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAbstractMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAssociationMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedColumnMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaAssociation.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaFunction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaModel.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaTable.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributeMappingSource.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\LambdaMetaAccessor.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\MappingContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\XmlMappingSource.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\RefreshMode.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlLiteralPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlParameterPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatement.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatementBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\FirebirdProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\IngresProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\MySqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\OracleProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\PostgreSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2000Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2005Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2008Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqliteProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqlServerProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\AbstractQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\BuilderContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\DeleteQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\DirectQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Error.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionChain.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\ExpressionMutatorExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\ExpressionMutatorFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\BinaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ConditionalExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ConstantExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\IMemberBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\InvocationExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\LambdaExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ListInitExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberAssignmentMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberBindingMutatorFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberInitExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberListBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberMemberBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MethodCallExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\NewArrayExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\NewExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ParameterExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\TypeBinaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\UnaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionPrecedence.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ColumnExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\CustomExpressionType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\EntitySetExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\GroupExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\IExecutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\IMutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\InputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\MetaTableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\MutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ObjectInputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ObjectOutputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\OperandsMutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\OrderByExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SelectExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SelectOperatorType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SpecialExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SpecialExpressionType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\StartIndexOffsetExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SubSelectExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableJoinType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionTier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataMapper.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataRecordReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionDispatcher.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionLanguageParser.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionOptimizer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionQualifier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataMapper.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataRecordReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Analyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Registrar.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionLanguageParser.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionOptimizer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionQualifier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\LineGrouping.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\PrequelAnalyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.Upsert.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryCache.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryRunner.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SpecialExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SqlBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IPrequelAnalyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryCache.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryRunner.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISpecialExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISqlBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ParameterizedQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\QueryContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\SelectQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\UpsertQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Table.cs" />\r
-    <Compile Include="src\DbLinq\DbLinqToDoAttribute.cs" />\r
-    <Compile Include="src\DbLinq\Factory\DbLinqAttribute.cs" />\r
-    <Compile Include="src\DbLinq\Factory\Implementation\ReflectionObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Factory\IObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Factory\ObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Language\ILanguages.cs" />\r
-    <Compile Include="src\DbLinq\Language\ILanguageWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\AbstractEndPluralWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\AbstractWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\Languages.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\NoLanguageWords.cs" />\r
-    <Compile Include="src\DbLinq\Schema\AssociationName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Case.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ColumnName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\ArrayAdapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\CsvArrayAdapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\EnumType.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\INamedType.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\ISimpleList.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\SpecifiedPropertyUpdater.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DatabaseSerializer.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.Adapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSerializer.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Implementation\NameFormatter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\INameFormatter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Name.cs" />\r
-    <Compile Include="src\DbLinq\Schema\NameFormat.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ParameterName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ProcedureName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\SchemaName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\TableName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\WordsExtraction.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Binary.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ChangeConflictCollection.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ChangeConflictException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\CompiledQuery.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ConflictMode.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\DBConvert.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\DuplicateKeyException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ForeignKeyReferenceAlreadyHasValueException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\IFunctionResult.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\IMultipleResults.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ISingleResult.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Link.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\MemberChangeConflict.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ModifiedMemberInfo.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ObjectChangeConflict.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\AssociationAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\AutoSync.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ColumnAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\DataAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\DatabaseAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\FunctionAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\InheritanceMappingAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MappingSource.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAccessor.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAccessor_2.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAssociation.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaFunction.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaModel.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaParameter.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaTable.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaType.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ParameterAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ProviderAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ResultTypeAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\TableAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\UpdateCheck.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient.Implementation\ObjectMaterializer.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlHelpers.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlMethods.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Util\DataCommand.cs" />\r
-    <Compile Include="src\DbLinq\Util\DbmlExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\ExpressionChainEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\ExpressionEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDataRecordExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDataTypeExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDbDataParameterExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IThreadSafeDictionary.cs" />\r
-    <Compile Include="src\DbLinq\Util\LambdaComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\MemberInfoExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\Output.cs" />\r
-    <Compile Include="src\DbLinq\Util\OutputLevel.cs" />\r
-    <Compile Include="src\DbLinq\Util\Page.cs" />\r
-    <Compile Include="src\DbLinq\Util\Profiler.cs" />\r
-    <Compile Include="src\DbLinq\Util\QuotesHelper.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReferenceEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReflectionExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReflectionUtility.cs" />\r
-    <Compile Include="src\DbLinq\Util\StringExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\TextWriterExtension.cs" />\r
-    <Compile Include="src\DbLinq\Util\ThreadSafeDictionary.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeConvert.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\DbSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataName.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataTableColumn.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataType.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataName.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataTableColumn.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.ForeignKey.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Name.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.TypeMapping.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.ProcedureResult.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\INameAliases.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\ISchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\ISqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IVendor.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\VendorAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="./src/DbLinq/Schema/Dbml/DbmlSchema.xsd">\r
-      <LogicalName>DbLinq.Schema.Dbml.DbmlSchema.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Linq/System.Data.Linq-tests-net_2_0.csproj b/mcs/class/System.Data.Linq/System.Data.Linq-tests-net_2_0.csproj
deleted file mode 100644 (file)
index eee1f76..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{50082F92-4608-4F6F-B2BB-338DC1B3B591}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.Linq-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Linq_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;MONO_STRICT;MONO_DEPLOY;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;MONO_STRICT;MONO_DEPLOY;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="src\DbLinq.SqlServer\Test\MsSqlDataContextTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\BinaryTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\DataContextTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\EntitySetTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\NullProvider.cs" />\r
-    <Compile Include="src\DbLinq\Test\PeopleTable.cs" />\r
-    <Compile Include="src\DbLinq\Test\Providers\DataContextTestBase.cs" />\r
-    <Compile Include="src\DbLinq\Test\TableTest.cs" />\r
-    <Compile Include="Test\dummy.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_2_0.csproj">\r
-      <Project>{286ED1A3-6AE6-4147-A43B-B3421681CC84}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="./src/DbLinq/Schema/Dbml/DbmlSchema.xsd">\r
-      <LogicalName>DbLinq.Schema.Dbml.DbmlSchema.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Linq/System.Data.Linq-tests-net_4_0.csproj b/mcs/class/System.Data.Linq/System.Data.Linq-tests-net_4_0.csproj
deleted file mode 100644 (file)
index cfa7226..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{39EF1F73-CB1D-4DA1-9237-094F4D0C996F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.Linq-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Linq_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="src\DbLinq.SqlServer\Test\MsSqlDataContextTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\BinaryTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\DataContextTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\EntitySetTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\NullProvider.cs" />\r
-    <Compile Include="src\DbLinq\Test\PeopleTable.cs" />\r
-    <Compile Include="src\DbLinq\Test\Providers\DataContextTestBase.cs" />\r
-    <Compile Include="src\DbLinq\Test\TableTest.cs" />\r
-    <Compile Include="Test\dummy.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_0.csproj">\r
-      <Project>{EB50CF5B-D17A-4BEF-96C4-874FB8E61ACE}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="./src/DbLinq/Schema/Dbml/DbmlSchema.xsd">\r
-      <LogicalName>DbLinq.Schema.Dbml.DbmlSchema.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_2_0.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_2_0.csproj
deleted file mode 100644 (file)
index 68cb0f8..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FB31E958-0E46-4D09-80B2-EF1245FDDB87}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.OracleClient</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciAttributeType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciBindHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciCalls.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciColumnInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciCredentialType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDataType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDateTimeDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDefineHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDescriptorHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciEnvironmentHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciEnvironmentMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciErrorHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciErrorInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciExecuteMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciHandleType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciIntervalDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciLobLocator.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciLobType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciNlsServiceType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciParameterDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciPointerType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciRowIdDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciServerHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciServiceHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciSessionHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciSessionMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementLanguage.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciTransactionFlags.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciTransactionHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient\OciGlue.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBFile.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBinary.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBoolean.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleClientFactory.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleCommand.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleCommandBuilder.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnection.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionPool.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionPoolManager.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDataAdapter.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDataReader.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDateTime.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleException.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleLob.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleLobOpenMode.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleMonthSpan.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleNumber.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleParameter.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleParameterCollection.cs" />\r
-    <Compile Include="System.Data.OracleClient\OraclePermission.cs" />\r
-    <Compile Include="System.Data.OracleClient\OraclePermissionAttribute.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleString.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleTimeSpan.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleTransaction.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleType.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_0.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_0.csproj
deleted file mode 100644 (file)
index b7dfb02..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C9C42FD1-45A1-4A55-B019-6D05E33857FD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.OracleClient</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciAttributeType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciBindHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciCalls.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciColumnInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciCredentialType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDataType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDateTimeDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDefineHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDescriptorHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciEnvironmentHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciEnvironmentMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciErrorHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciErrorInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciExecuteMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciHandleType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciIntervalDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciLobLocator.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciLobType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciNlsServiceType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciParameterDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciPointerType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciRowIdDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciServerHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciServiceHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciSessionHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciSessionMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementLanguage.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciTransactionFlags.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciTransactionHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient\OciGlue.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBFile.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBinary.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBoolean.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleClientFactory.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleCommand.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleCommandBuilder.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnection.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionPool.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionPoolManager.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDataAdapter.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDataReader.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDateTime.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleException.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleLob.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleLobOpenMode.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleMonthSpan.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleNumber.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleParameter.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleParameterCollection.cs" />\r
-    <Compile Include="System.Data.OracleClient\OraclePermission.cs" />\r
-    <Compile Include="System.Data.OracleClient\OraclePermissionAttribute.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleString.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleTimeSpan.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleTransaction.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleType.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_2_0.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_2_0.csproj
deleted file mode 100644 (file)
index dc651ac..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F5A01B66-E44D-4901-9607-DB7BF2D6B572}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.OracleClient-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.OracleClient_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.Oci\OciDefineHandleTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleLobTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OraclePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleTimeSpanTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.OracleClient\System.Data.OracleClient-net_2_0.csproj">\r
-      <Project>{FB31E958-0E46-4D09-80B2-EF1245FDDB87}</Project>\r
-      <Name>System.Data.OracleClient\System.Data.OracleClient-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_4_0.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 29fcbea..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{13C57C82-415F-43B9-A7B7-8395C30281FA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.OracleClient-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.OracleClient_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.Oci\OciDefineHandleTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleLobTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OraclePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleTimeSpanTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.OracleClient\System.Data.OracleClient-net_4_0.csproj">\r
-      <Project>{C9C42FD1-45A1-4A55-B019-6D05E33857FD}</Project>\r
-      <Name>System.Data.OracleClient\System.Data.OracleClient-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_2_0.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_2_0.csproj
deleted file mode 100644 (file)
index 18b6958..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2BD87584-B572-4E15-9941-93776CE3C901}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services.Client</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Client\AssemblyAttributes.cs" />\r
-    <Compile Include=".\Client\Parameterized.System.Data.Services.Client.cs" />\r
-    <Compile Include=".\Client\System.Data.Services.Client.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceExpressionVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceQueryProvider.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\Evaluator.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionNormalizer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionWriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\FilterQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputBinder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputReferenceExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\NavigationPropertySingletonExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\OrderByQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ParameterReplacerVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\PathBox.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionAnalyzer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionRewriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryComponents.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ReflectionUtil.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceBinder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpressionType.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceSetExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\SkipQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TakeQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TypeSystem.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriHelper.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriWriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ArraySet.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomContentProperty.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomDataKind.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomEntry.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomFeed.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializerLog.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomParser.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BaseAsyncResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStream.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStreamState.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingEntityInfo.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingGraph.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingObserver.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingUtils.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityChangedParams.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ChangesetResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ClientConvert.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ClientType.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceClientException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceContext.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceEntityAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceKeyAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceProtocolVersion.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQuery.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryContinuation.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequest.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceStreamResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Descriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityDescriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityPropertyMappingAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityStates.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Error.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\GetReadStreamResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\HasStreamAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\LinkDescriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MaterializeFromAtom.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MediaEntryAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MemberAssignmentAnalysis.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MergeOption.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MimeTypePropertyAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObject.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObjectAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OperationResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPath.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathBuilder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathSegment.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlan.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlanCompiler.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryOperationResponseOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ReadingWritingEntityEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ReferenceEqualityComparer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\SaveChangesOptions.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\SendingRequestEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Util.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\WebUtil.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Xml\XmlAtomErrorReader.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Xml\XmlWrappingReader.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\XmlUtil.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmContentSerializerBase.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmCustomContentSerializer.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmCustomContentWriterNodeData.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourcePathSegment.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourceTree.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetPathSegment.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetTree.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\HttpProcessUtility.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Parsing\WebConvert.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\XmlConstants.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_2_0.csproj">\r
-      <Project>{80B8A117-6BB4-4646-8BE9-863A5C105437}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_2_0.csproj">\r
-      <Project>{65F08514-3634-45C8-8EEB-6BAEA2EDC0C8}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Client/System.Data.Services.Client.resources">\r
-      <LogicalName>System.Data.Services.Client.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_0.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_0.csproj
deleted file mode 100644 (file)
index a95aa62..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{133BEBD5-0BA9-498E-AD69-16CF10D20D56}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services.Client</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Client\Parameterized.System.Data.Services.Client.cs" />\r
-    <Compile Include=".\Client\System.Data.Services.Client.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceExpressionVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceQueryProvider.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\Evaluator.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionNormalizer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionWriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\FilterQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputBinder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputReferenceExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\NavigationPropertySingletonExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\OrderByQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ParameterReplacerVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\PathBox.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionAnalyzer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionRewriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryComponents.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ReflectionUtil.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceBinder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpressionType.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceSetExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\SkipQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TakeQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TypeSystem.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriHelper.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriWriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ArraySet.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomContentProperty.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomDataKind.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomEntry.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomFeed.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializerLog.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomParser.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BaseAsyncResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStream.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStreamState.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingEntityInfo.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingGraph.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingObserver.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingUtils.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityChangedParams.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ChangesetResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ClientConvert.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ClientType.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceClientException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceContext.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceEntityAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceKeyAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceProtocolVersion.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQuery.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryContinuation.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequest.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceStreamResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Descriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityDescriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityPropertyMappingAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityStates.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Error.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\GetReadStreamResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\HasStreamAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\LinkDescriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MaterializeFromAtom.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MediaEntryAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MemberAssignmentAnalysis.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MergeOption.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MimeTypePropertyAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObject.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObjectAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OperationResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPath.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathBuilder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathSegment.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlan.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlanCompiler.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryOperationResponseOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ReadingWritingEntityEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ReferenceEqualityComparer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\SaveChangesOptions.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\SendingRequestEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Util.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\WebUtil.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Xml\XmlAtomErrorReader.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Xml\XmlWrappingReader.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\XmlUtil.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmContentSerializerBase.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmCustomContentSerializer.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmCustomContentWriterNodeData.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourcePathSegment.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourceTree.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetPathSegment.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetTree.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\HttpProcessUtility.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Parsing\WebConvert.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\XmlConstants.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_0.csproj">\r
-      <Project>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_4_0.csproj">\r
-      <Project>{166B91FA-332C-48D9-9A0E-EF02794507BC}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Client/System.Data.Services.Client.resources">\r
-      <LogicalName>System.Data.Services.Client.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Services/System.Data.Services-net_2_0.csproj b/mcs/class/System.Data.Services/System.Data.Services-net_2_0.csproj
deleted file mode 100644 (file)
index c40c38d..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{09A92F36-0617-4D47-95BB-17AAB6588793}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Data.Services\ChangeInterceptorAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\DataService.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceException.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceHost.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceHostFactory.cs" />\r
-    <Compile Include=".\System.Data.Services\EntitySetRights.cs" />\r
-    <Compile Include=".\System.Data.Services\ETagAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ExpandSegment.cs" />\r
-    <Compile Include=".\System.Data.Services\ExpandSegmentCollection.cs" />\r
-    <Compile Include=".\System.Data.Services\HandleExceptionArgs.cs" />\r
-    <Compile Include=".\System.Data.Services\IDataServiceConfiguration.cs" />\r
-    <Compile Include=".\System.Data.Services\IDataServiceHost.cs" />\r
-    <Compile Include=".\System.Data.Services\IExpandedResult.cs" />\r
-    <Compile Include=".\System.Data.Services\IExpandProvider.cs" />\r
-    <Compile Include=".\System.Data.Services\IgnorePropertiesAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\IRequestHandler.cs" />\r
-    <Compile Include=".\System.Data.Services\IUpdatable.cs" />\r
-    <Compile Include=".\System.Data.Services\MimeTypeAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ProcessRequestArgs.cs" />\r
-    <Compile Include=".\System.Data.Services\QueryInterceptorAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ServiceOperationRights.cs" />\r
-    <Compile Include=".\System.Data.Services\SingleResultAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\UpdateOperations.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Web\System.ServiceModel.Web-net_2_0.csproj">\r
-      <Project>{3C6EB10D-5929-4CB4-81F2-7984FCECCDAA}</Project>\r
-      <Name>System.ServiceModel.Web\System.ServiceModel.Web-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Services.Client\System.Data.Services.Client-net_2_0.csproj">\r
-      <Project>{2BD87584-B572-4E15-9941-93776CE3C901}</Project>\r
-      <Name>System.Data.Services.Client\System.Data.Services.Client-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Services/System.Data.Services-net_4_0.csproj b/mcs/class/System.Data.Services/System.Data.Services-net_4_0.csproj
deleted file mode 100644 (file)
index 613024f..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B6154CE4-03B9-4544-BE33-499C965ECDCD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Data.Services\ChangeInterceptorAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\DataService.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceException.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceHost.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceHostFactory.cs" />\r
-    <Compile Include=".\System.Data.Services\EntitySetRights.cs" />\r
-    <Compile Include=".\System.Data.Services\ETagAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ExpandSegment.cs" />\r
-    <Compile Include=".\System.Data.Services\ExpandSegmentCollection.cs" />\r
-    <Compile Include=".\System.Data.Services\HandleExceptionArgs.cs" />\r
-    <Compile Include=".\System.Data.Services\IDataServiceConfiguration.cs" />\r
-    <Compile Include=".\System.Data.Services\IDataServiceHost.cs" />\r
-    <Compile Include=".\System.Data.Services\IExpandedResult.cs" />\r
-    <Compile Include=".\System.Data.Services\IExpandProvider.cs" />\r
-    <Compile Include=".\System.Data.Services\IgnorePropertiesAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\IRequestHandler.cs" />\r
-    <Compile Include=".\System.Data.Services\IUpdatable.cs" />\r
-    <Compile Include=".\System.Data.Services\MimeTypeAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ProcessRequestArgs.cs" />\r
-    <Compile Include=".\System.Data.Services\QueryInterceptorAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ServiceOperationRights.cs" />\r
-    <Compile Include=".\System.Data.Services\SingleResultAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\UpdateOperations.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`1.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`10.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`11.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`12.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`13.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`2.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`3.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`4.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`5.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`6.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`7.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`8.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`9.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper0.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper1.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper2.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper3.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper4.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper5.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper6.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper7.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper8.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapperMany.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapperManyEnd.cs" />\r
-    <Compile Include="System.Data.Services.Providers\DataServiceProviderMethods.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceMetadataProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServicePagingProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceQueryProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceStreamProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceUpdateProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\OpenTypeMethods.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceAssociationSet.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceAssociationSetEnd.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceProperty.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourcePropertyKind.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceSet.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceType.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceTypeKind.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ServiceOperation.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ServiceOperationParameter.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ServiceOperationResultKind.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceBehavior.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceConfiguration.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceOperationContext.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceProcessingPipeline.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceProcessingPipelineEventArgs.cs" />\r
-    <Compile Include="System.Data.Services\IDataServiceHost2.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Web\System.ServiceModel.Web-net_4_0.csproj">\r
-      <Project>{3867C3D0-36C4-4CC1-A8E5-5D15631B35D4}</Project>\r
-      <Name>System.ServiceModel.Web\System.ServiceModel.Web-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Services.Client\System.Data.Services.Client-net_4_0.csproj">\r
-      <Project>{133BEBD5-0BA9-498E-AD69-16CF10D20D56}</Project>\r
-      <Name>System.Data.Services.Client\System.Data.Services.Client-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0.csproj">\r
-      <Project>{1C9B4EFC-57D5-4DEE-9D2F-0B505824623F}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Services/System.Data.Services-tests-net_2_0.csproj b/mcs/class/System.Data.Services/System.Data.Services-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 4a2a04d..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E5666F81-4D04-454B-A208-25A90186E92C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.Services-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\.\ChangeInterceptorAttributeTests.cs" />\r
-    <Compile Include="Test\.\DataServiceExceptionTests.cs" />\r
-    <Compile Include="Test\.\DataServiceTests.cs" />\r
-    <Compile Include="Test\.\ETagAttributeTests.cs" />\r
-    <Compile Include="Test\.\ExpandSegmentCollectionTests.cs" />\r
-    <Compile Include="Test\.\ExpandSegmentTests.cs" />\r
-    <Compile Include="Test\.\IgnorePropertiesAttributeTests.cs" />\r
-    <Compile Include="Test\.\MimeTypeAttributeTests.cs" />\r
-    <Compile Include="Test\.\QueryInterceptorAttributeTests.cs" />\r
-    <Compile Include="Test\.\System.Data.Services.Providers\DataServiceProviderMethodsTest.cs" />\r
-    <Compile Include="Test\.\System.Data.Services.Providers\ResourceTypeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Services\System.Data.Services-net_2_0.csproj">\r
-      <Project>{09A92F36-0617-4D47-95BB-17AAB6588793}</Project>\r
-      <Name>System.Data.Services\System.Data.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data.Services/System.Data.Services-tests-net_4_0.csproj b/mcs/class/System.Data.Services/System.Data.Services-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 39e81d4..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3FA35AB4-2275-4C88-8739-C72670C193DF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.Services-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\.\ChangeInterceptorAttributeTests.cs" />\r
-    <Compile Include="Test\.\DataServiceExceptionTests.cs" />\r
-    <Compile Include="Test\.\DataServiceTests.cs" />\r
-    <Compile Include="Test\.\ETagAttributeTests.cs" />\r
-    <Compile Include="Test\.\ExpandSegmentCollectionTests.cs" />\r
-    <Compile Include="Test\.\ExpandSegmentTests.cs" />\r
-    <Compile Include="Test\.\IgnorePropertiesAttributeTests.cs" />\r
-    <Compile Include="Test\.\MimeTypeAttributeTests.cs" />\r
-    <Compile Include="Test\.\QueryInterceptorAttributeTests.cs" />\r
-    <Compile Include="Test\.\System.Data.Services.Providers\DataServiceProviderMethodsTest.cs" />\r
-    <Compile Include="Test\.\System.Data.Services.Providers\ResourceTypeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Services\System.Data.Services-net_4_0.csproj">\r
-      <Project>{B6154CE4-03B9-4544-BE33-499C965ECDCD}</Project>\r
-      <Name>System.Data.Services\System.Data.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 2fb0b08ecd5ca399090d45d510a4b654bae5dd90..59772888b4d95660e774e631b5e549de89de4103 100644 (file)
@@ -2,27 +2,13 @@ thisdir = class/System.Data
 SUBDIRS = 
 include ../../build/rules.make
 
-# I have *no idea* why I need to do this.
-
-ifeq ($(PROFILE),atomic)
-system = System.dll
-else
-system = $(topdir)/class/lib/$(PROFILE)/System.dll
-endif
-
-ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
-OTHER_LIB_MCS_FLAGS = -r:System.Configuration.dll \
-                       -r:System.Transactions.dll
-endif
-
 LIBRARY = System.Data.dll
+
 LIB_MCS_FLAGS = \
        -nowarn:649 \
        -unsafe \
-       -r:$(corlib)                            \
-       -r:$(system)                            \
-       -r:System.Xml.dll                       \
-
+       -r:System                               \
+       -r:System.Xml.dll
 
 MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE))
 ifdef MOBILE
@@ -33,7 +19,8 @@ else
 LIB_MCS_FLAGS += \
        -r:System.EnterpriseServices.dll        \
        -r:Mono.Data.Tds.dll \
-       $(OTHER_LIB_MCS_FLAGS)
+       -r:System.Configuration.dll \
+       -r:System.Transactions.dll
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.Core.dll -r:Mono.Data.Sqlite.dll -nowarn:618,169,612,219,168
diff --git a/mcs/class/System.Data/System.Data-net_2_0.csproj b/mcs/class/System.Data/System.Data-net_2_0.csproj
deleted file mode 100644 (file)
index fc6d5c4..0000000
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\DataAccessKind.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\Format.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\IBinarySerialize.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\InvalidUdtException.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlFacetAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlFunctionAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlMetaData.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlMethodAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlProcedureAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlTriggerAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlTriggerContext.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlUserDefinedAggregateAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlUserDefinedTypeAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SystemDataAccessKind.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\TriggerAction.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Aggregation.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\ArithmeticExpressions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\BooleanExpressions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\ColumnReference.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Comparison.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Expressions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Functions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\In.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Like.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Literal.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Numeric.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\StringFunctions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Tokenizer.cs" />\r
-    <Compile Include="System.Data.Common\CatalogLocation.cs" />\r
-    <Compile Include="System.Data.Common\ComparerFactory.cs" />\r
-    <Compile Include="System.Data.Common\DataAdapter.cs" />\r
-    <Compile Include="System.Data.Common\DataColumnMapping.cs" />\r
-    <Compile Include="System.Data.Common\DataColumnMappingCollection.cs" />\r
-    <Compile Include="System.Data.Common\DataColumnMappingConverter.cs" />\r
-    <Compile Include="System.Data.Common\DataContainer.cs" />\r
-    <Compile Include="System.Data.Common\DataTableMapping.cs" />\r
-    <Compile Include="System.Data.Common\DataTableMappingCollection.cs" />\r
-    <Compile Include="System.Data.Common\DataTableMappingConverter.cs" />\r
-    <Compile Include="System.Data.Common\DbCommand.cs" />\r
-    <Compile Include="System.Data.Common\DbCommandBuilder.cs" />\r
-    <Compile Include="System.Data.Common\DbConnection.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionOptions.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionString.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionStringBuilderHelper.cs" />\r
-    <Compile Include="System.Data.Common\DbDataAdapter.cs" />\r
-    <Compile Include="System.Data.Common\DbDataPermission.cs" />\r
-    <Compile Include="System.Data.Common\DbDataPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.Common\DbDataReader.cs" />\r
-    <Compile Include="System.Data.Common\DbDataRecord.cs" />\r
-    <Compile Include="System.Data.Common\DbDataSourceEnumerator.cs" />\r
-    <Compile Include="System.Data.Common\DbEnumerator.cs" />\r
-    <Compile Include="System.Data.Common\DbException.cs" />\r
-    <Compile Include="System.Data.Common\DbMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.Common\DbMetaDataColumnNames.cs" />\r
-    <Compile Include="System.Data.Common\DbParameter.cs" />\r
-    <Compile Include="System.Data.Common\DbParameterCollection.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderConfigurationHandler.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderFactories.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderFactoriesConfigurationHandler.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderFactory.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderSpecificTypePropertyAttribute.cs" />\r
-    <Compile Include="System.Data.Common\DbTable.cs" />\r
-    <Compile Include="System.Data.Common\DbTransaction.cs" />\r
-    <Compile Include="System.Data.Common\DbTypes.cs" />\r
-    <Compile Include="System.Data.Common\ExceptionHelper.cs" />\r
-    <Compile Include="System.Data.Common\FieldNameLookup.cs" />\r
-    <Compile Include="System.Data.Common\GroupByBehavior.cs" />\r
-    <Compile Include="System.Data.Common\IdentifierCase.cs" />\r
-    <Compile Include="System.Data.Common\Index.cs" />\r
-    <Compile Include="System.Data.Common\Key.cs" />\r
-    <Compile Include="System.Data.Common\PermissionHelper.cs" />\r
-    <Compile Include="System.Data.Common\RecordCache.cs" />\r
-    <Compile Include="System.Data.Common\RowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.Common\RowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.Common\SchemaInfo.cs" />\r
-    <Compile Include="System.Data.Common\SchemaTableColumn.cs" />\r
-    <Compile Include="System.Data.Common\SchemaTableOptionalColumn.cs" />\r
-    <Compile Include="System.Data.Common\SupportedJoinOperators.cs" />\r
-    <Compile Include="System.Data.Common\TaskHelper.cs" />\r
-    <Compile Include="System.Data.Odbc\libodbc.cs" />\r
-    <Compile Include="System.Data.Odbc\NativeBuffer.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcCategoryAttribute.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcColumn.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcCommand.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcCommandBuilder.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcConnection.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcDataAdapter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcDataReader.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcDescriptionAttribute.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcError.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcErrorCollection.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcException.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcFactory.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcMetaDataColumnNames.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcParameter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcParameterCollection.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcParameterConverter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcPermission.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcTransaction.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcType.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcTypeConverter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcTypeMap.cs" />\r
-    <Compile Include="System.Data.OleDb\libgda.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbCommand.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbCommandBuilder.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbConnection.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbDataAdapter.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbDataReader.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbError.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbErrorCollection.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbException.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbFactory.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbLiteral.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbParameter.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbParameterCollection.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbParameterConverter.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbPermission.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbSchemaGuid.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbTransaction.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbType.cs" />\r
-    <Compile Include="System.Data.Sql\SqlDataSourceEnumerator.cs" />\r
-    <Compile Include="System.Data.Sql\SqlNotificationRequest.cs" />\r
-    <Compile Include="System.Data.SqlClient\NetworkLibraryConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\OnChangeEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SortOrder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlAsyncResult.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlAsyncState.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopy.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMapping.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMappingCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyOptions.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientFactory.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientPermission.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlCommand.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlCommandBuilder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlConnection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataAdapter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataReader.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataSourceConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SQLDebugging.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDependency.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlError.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlErrorCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlException.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInitialCatalogConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationInfo.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationSource.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationType.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameterCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameterConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlTransaction.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlXmlTextReader.cs" />\r
-    <Compile Include="System.Data.SqlTypes\INullable.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlAlreadyFilledException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlBinary.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlBoolean.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlByte.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlBytes.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlChars.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlCompareOptions.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlDateTime.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlDecimal.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlDouble.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlGuid.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlInt16.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlInt32.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlInt64.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlMoney.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlNotFilledException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlNullValueException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlSingle.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlString.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlTruncateException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlTypeException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlXml.cs" />\r
-    <Compile Include="System.Data.SqlTypes\StorageState.cs" />\r
-    <Compile Include="System.Data\AcceptRejectRule.cs" />\r
-    <Compile Include="System.Data\ColumnTypeConverter.cs" />\r
-    <Compile Include="System.Data\CommandBehavior.cs" />\r
-    <Compile Include="System.Data\CommandType.cs" />\r
-    <Compile Include="System.Data\ConflictOption.cs" />\r
-    <Compile Include="System.Data\ConnectionState.cs" />\r
-    <Compile Include="System.Data\Constraint.cs" />\r
-    <Compile Include="System.Data\ConstraintCollection.cs" />\r
-    <Compile Include="System.Data\ConstraintConverter.cs" />\r
-    <Compile Include="System.Data\ConstraintException.cs" />\r
-    <Compile Include="System.Data\CustomDataClassGenerator.cs" />\r
-    <Compile Include="System.Data\DataCategoryAttribute.cs" />\r
-    <Compile Include="System.Data\DataColumn.cs" />\r
-    <Compile Include="System.Data\DataColumnChangeEventArgs.cs" />\r
-    <Compile Include="System.Data\DataColumnChangeEventHandler.cs" />\r
-    <Compile Include="System.Data\DataColumnCollection.cs" />\r
-    <Compile Include="System.Data\DataColumnPropertyDescriptor.cs" />\r
-    <Compile Include="System.Data\DataException.cs" />\r
-    <Compile Include="System.Data\DataRelation.cs" />\r
-    <Compile Include="System.Data\DataRelationCollection.cs" />\r
-    <Compile Include="System.Data\DataRelationPropertyDescriptor.cs" />\r
-    <Compile Include="System.Data\DataRow.cs" />\r
-    <Compile Include="System.Data\DataRowAction.cs" />\r
-    <Compile Include="System.Data\DataRowBuilder.cs" />\r
-    <Compile Include="System.Data\DataRowChangeEventArgs.cs" />\r
-    <Compile Include="System.Data\DataRowChangeEventHandler.cs" />\r
-    <Compile Include="System.Data\DataRowCollection.cs" />\r
-    <Compile Include="System.Data\DataRowState.cs" />\r
-    <Compile Include="System.Data\DataRowVersion.cs" />\r
-    <Compile Include="System.Data\DataRowView.cs" />\r
-    <Compile Include="System.Data\DataSet.cs" />\r
-    <Compile Include="System.Data\DataSetDateTime.cs" />\r
-    <Compile Include="System.Data\DataSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Data\DataTable.cs" />\r
-    <Compile Include="System.Data\DataTableClearEventArgs.cs" />\r
-    <Compile Include="System.Data\DataTableClearEventHandler.cs" />\r
-    <Compile Include="System.Data\DataTableCollection.cs" />\r
-    <Compile Include="System.Data\DataTableNewRowEventArgs.cs" />\r
-    <Compile Include="System.Data\DataTableNewRowEventHandler.cs" />\r
-    <Compile Include="System.Data\DataTablePropertyDescriptor.cs" />\r
-    <Compile Include="System.Data\DataTableReader.cs" />\r
-    <Compile Include="System.Data\DataTableTypeConverter.cs" />\r
-    <Compile Include="System.Data\DataView.cs" />\r
-    <Compile Include="System.Data\DataViewManager.cs" />\r
-    <Compile Include="System.Data\DataViewManagerListItemTypeDescriptor.cs" />\r
-    <Compile Include="System.Data\DataViewRowState.cs" />\r
-    <Compile Include="System.Data\DataViewSetting.cs" />\r
-    <Compile Include="System.Data\DataViewSettingCollection.cs" />\r
-    <Compile Include="System.Data\DBConcurrencyException.cs" />\r
-    <Compile Include="System.Data\DbType.cs" />\r
-    <Compile Include="System.Data\DefaultValueTypeConverter.cs" />\r
-    <Compile Include="System.Data\DeletedRowInaccessibleException.cs" />\r
-    <Compile Include="System.Data\DuplicateNameException.cs" />\r
-    <Compile Include="System.Data\EvaluateException.cs" />\r
-    <Compile Include="System.Data\FillErrorEventArgs.cs" />\r
-    <Compile Include="System.Data\FillErrorEventHandler.cs" />\r
-    <Compile Include="System.Data\ForeignKeyConstraint.cs" />\r
-    <Compile Include="System.Data\IColumnMapping.cs" />\r
-    <Compile Include="System.Data\IColumnMappingCollection.cs" />\r
-    <Compile Include="System.Data\IDataAdapter.cs" />\r
-    <Compile Include="System.Data\IDataParameter.cs" />\r
-    <Compile Include="System.Data\IDataParameterCollection.cs" />\r
-    <Compile Include="System.Data\IDataReader.cs" />\r
-    <Compile Include="System.Data\IDataRecord.cs" />\r
-    <Compile Include="System.Data\IDbCommand.cs" />\r
-    <Compile Include="System.Data\IDbConnection.cs" />\r
-    <Compile Include="System.Data\IDbDataAdapter.cs" />\r
-    <Compile Include="System.Data\IDbDataParameter.cs" />\r
-    <Compile Include="System.Data\IDbTransaction.cs" />\r
-    <Compile Include="System.Data\InRowChangingEventException.cs" />\r
-    <Compile Include="System.Data\InternalDataCollectionBase.cs" />\r
-    <Compile Include="System.Data\InvalidConstraintException.cs" />\r
-    <Compile Include="System.Data\InvalidExpressionException.cs" />\r
-    <Compile Include="System.Data\ISafeDataRecord.cs" />\r
-    <Compile Include="System.Data\IsolationLevel.cs" />\r
-    <Compile Include="System.Data\ITableMapping.cs" />\r
-    <Compile Include="System.Data\ITableMappingCollection.cs" />\r
-    <Compile Include="System.Data\KeyRestrictionBehavior.cs" />\r
-    <Compile Include="System.Data\LoadOption.cs" />\r
-    <Compile Include="System.Data\MappingType.cs" />\r
-    <Compile Include="System.Data\MergeFailedEventArgs.cs" />\r
-    <Compile Include="System.Data\MergeFailedEventHandler.cs" />\r
-    <Compile Include="System.Data\MergeManager.cs" />\r
-    <Compile Include="System.Data\MissingMappingAction.cs" />\r
-    <Compile Include="System.Data\MissingPrimaryKeyException.cs" />\r
-    <Compile Include="System.Data\MissingSchemaAction.cs" />\r
-    <Compile Include="System.Data\Node.cs" />\r
-    <Compile Include="System.Data\NoNullAllowedException.cs" />\r
-    <Compile Include="System.Data\OperationAbortedException.cs" />\r
-    <Compile Include="System.Data\ParameterDirection.cs" />\r
-    <Compile Include="System.Data\PropertyAttributes.cs" />\r
-    <Compile Include="System.Data\PropertyCollection.cs" />\r
-    <Compile Include="System.Data\ReadOnlyException.cs" />\r
-    <Compile Include="System.Data\RelatedDataView.cs" />\r
-    <Compile Include="System.Data\RelationshipConverter.cs" />\r
-    <Compile Include="System.Data\ResDescriptionAttribute.cs" />\r
-    <Compile Include="System.Data\RowNotInTableException.cs" />\r
-    <Compile Include="System.Data\Rule.cs" />\r
-    <Compile Include="System.Data\SchemaSerializationMode.cs" />\r
-    <Compile Include="System.Data\SchemaType.cs" />\r
-    <Compile Include="System.Data\SerializationFormat.cs" />\r
-    <Compile Include="System.Data\SqlDbType.cs" />\r
-    <Compile Include="System.Data\StateChangeEventArgs.cs" />\r
-    <Compile Include="System.Data\StateChangeEventHandler.cs" />\r
-    <Compile Include="System.Data\StatementCompletedEventArgs.cs" />\r
-    <Compile Include="System.Data\StatementCompletedEventHandler.cs" />\r
-    <Compile Include="System.Data\StatementType.cs" />\r
-    <Compile Include="System.Data\StrongTypingException.cs" />\r
-    <Compile Include="System.Data\SyntaxErrorException.cs" />\r
-    <Compile Include="System.Data\TableAdapterSchemaInfo.cs" />\r
-    <Compile Include="System.Data\TypeDataSetGeneratorException.cs" />\r
-    <Compile Include="System.Data\TypedDataSetGenerator.cs" />\r
-    <Compile Include="System.Data\UniqueConstraint.cs" />\r
-    <Compile Include="System.Data\UpdateRowSource.cs" />\r
-    <Compile Include="System.Data\UpdateStatus.cs" />\r
-    <Compile Include="System.Data\VersionNotFoundException.cs" />\r
-    <Compile Include="System.Data\XmlConstants.cs" />\r
-    <Compile Include="System.Data\XmlDataInferenceLoader.cs" />\r
-    <Compile Include="System.Data\XmlDataLoader.cs" />\r
-    <Compile Include="System.Data\XmlDataReader.cs" />\r
-    <Compile Include="System.Data\XmlDiffLoader.cs" />\r
-    <Compile Include="System.Data\XmlHelper.cs" />\r
-    <Compile Include="System.Data\XmlReadMode.cs" />\r
-    <Compile Include="System.Data\XmlSchemaDataImporter.cs" />\r
-    <Compile Include="System.Data\XmlSchemaWriter.cs" />\r
-    <Compile Include="System.Data\XmlTableWriter.cs" />\r
-    <Compile Include="System.Data\XmlWriteMode.cs" />\r
-    <Compile Include="System.Xml\XmlDataDocument.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_2_0.csproj">\r
-      <Project>{C21CB6AB-7059-4FA5-A23C-84EA0B854BB7}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data/System.Data-net_4_0.csproj b/mcs/class/System.Data/System.Data-net_4_0.csproj
deleted file mode 100644 (file)
index 50b72c0..0000000
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0ADBE502-5524-4312-81B0-8456328C367C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\DataAccessKind.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\Format.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\IBinarySerialize.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\InvalidUdtException.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlFacetAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlFunctionAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlMetaData.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlMethodAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlProcedureAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlTriggerAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlTriggerContext.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlUserDefinedAggregateAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlUserDefinedTypeAttribute.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SystemDataAccessKind.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\TriggerAction.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Aggregation.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\ArithmeticExpressions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\BooleanExpressions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\ColumnReference.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Comparison.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Expressions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Functions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\In.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Like.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Literal.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Numeric.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\StringFunctions.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Tokenizer.cs" />\r
-    <Compile Include="System.Data.Common\CatalogLocation.cs" />\r
-    <Compile Include="System.Data.Common\ComparerFactory.cs" />\r
-    <Compile Include="System.Data.Common\DataAdapter.cs" />\r
-    <Compile Include="System.Data.Common\DataColumnMapping.cs" />\r
-    <Compile Include="System.Data.Common\DataColumnMappingCollection.cs" />\r
-    <Compile Include="System.Data.Common\DataColumnMappingConverter.cs" />\r
-    <Compile Include="System.Data.Common\DataContainer.cs" />\r
-    <Compile Include="System.Data.Common\DataTableMapping.cs" />\r
-    <Compile Include="System.Data.Common\DataTableMappingCollection.cs" />\r
-    <Compile Include="System.Data.Common\DataTableMappingConverter.cs" />\r
-    <Compile Include="System.Data.Common\DbCommand.cs" />\r
-    <Compile Include="System.Data.Common\DbCommandBuilder.cs" />\r
-    <Compile Include="System.Data.Common\DbConnection.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionOptions.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionString.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionStringBuilderHelper.cs" />\r
-    <Compile Include="System.Data.Common\DbDataAdapter.cs" />\r
-    <Compile Include="System.Data.Common\DbDataPermission.cs" />\r
-    <Compile Include="System.Data.Common\DbDataPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.Common\DbDataReader.cs" />\r
-    <Compile Include="System.Data.Common\DbDataRecord.cs" />\r
-    <Compile Include="System.Data.Common\DbDataSourceEnumerator.cs" />\r
-    <Compile Include="System.Data.Common\DbEnumerator.cs" />\r
-    <Compile Include="System.Data.Common\DbException.cs" />\r
-    <Compile Include="System.Data.Common\DbMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.Common\DbMetaDataColumnNames.cs" />\r
-    <Compile Include="System.Data.Common\DbParameter.cs" />\r
-    <Compile Include="System.Data.Common\DbParameterCollection.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderConfigurationHandler.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderFactories.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderFactoriesConfigurationHandler.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderFactory.cs" />\r
-    <Compile Include="System.Data.Common\DbProviderSpecificTypePropertyAttribute.cs" />\r
-    <Compile Include="System.Data.Common\DbTable.cs" />\r
-    <Compile Include="System.Data.Common\DbTransaction.cs" />\r
-    <Compile Include="System.Data.Common\DbTypes.cs" />\r
-    <Compile Include="System.Data.Common\ExceptionHelper.cs" />\r
-    <Compile Include="System.Data.Common\FieldNameLookup.cs" />\r
-    <Compile Include="System.Data.Common\GroupByBehavior.cs" />\r
-    <Compile Include="System.Data.Common\IdentifierCase.cs" />\r
-    <Compile Include="System.Data.Common\Index.cs" />\r
-    <Compile Include="System.Data.Common\Key.cs" />\r
-    <Compile Include="System.Data.Common\PermissionHelper.cs" />\r
-    <Compile Include="System.Data.Common\RecordCache.cs" />\r
-    <Compile Include="System.Data.Common\RowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.Common\RowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.Common\SchemaInfo.cs" />\r
-    <Compile Include="System.Data.Common\SchemaTableColumn.cs" />\r
-    <Compile Include="System.Data.Common\SchemaTableOptionalColumn.cs" />\r
-    <Compile Include="System.Data.Common\SupportedJoinOperators.cs" />\r
-    <Compile Include="System.Data.Common\TaskHelper.cs" />\r
-    <Compile Include="System.Data.Odbc\libodbc.cs" />\r
-    <Compile Include="System.Data.Odbc\NativeBuffer.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcCategoryAttribute.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcColumn.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcCommand.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcCommandBuilder.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcConnection.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcDataAdapter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcDataReader.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcDescriptionAttribute.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcError.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcErrorCollection.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcException.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcFactory.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcMetaDataColumnNames.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcParameter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcParameterCollection.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcParameterConverter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcPermission.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcTransaction.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcType.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcTypeConverter.cs" />\r
-    <Compile Include="System.Data.Odbc\OdbcTypeMap.cs" />\r
-    <Compile Include="System.Data.OleDb\libgda.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbCommand.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbCommandBuilder.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbConnection.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbDataAdapter.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbDataReader.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbError.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbErrorCollection.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbException.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbFactory.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbLiteral.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbParameter.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbParameterCollection.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbParameterConverter.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbPermission.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbSchemaGuid.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbTransaction.cs" />\r
-    <Compile Include="System.Data.OleDb\OleDbType.cs" />\r
-    <Compile Include="System.Data.Sql\SqlDataSourceEnumerator.cs" />\r
-    <Compile Include="System.Data.Sql\SqlNotificationRequest.cs" />\r
-    <Compile Include="System.Data.SqlClient\NetworkLibraryConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\OnChangeEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SortOrder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlAsyncResult.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlAsyncState.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopy.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMapping.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMappingCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyOptions.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientFactory.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientPermission.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientPermissionAttribute.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlCommand.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlCommandBuilder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlConnection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataAdapter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataReader.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataSourceConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SQLDebugging.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDependency.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlError.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlErrorCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlException.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInitialCatalogConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationInfo.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationSource.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationType.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameterCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameterConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlTransaction.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlXmlTextReader.cs" />\r
-    <Compile Include="System.Data.SqlTypes\INullable.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlAlreadyFilledException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlBinary.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlBoolean.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlByte.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlBytes.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlChars.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlCompareOptions.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlDateTime.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlDecimal.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlDouble.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlGuid.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlInt16.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlInt32.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlInt64.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlMoney.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlNotFilledException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlNullValueException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlSingle.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlString.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlTruncateException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlTypeException.cs" />\r
-    <Compile Include="System.Data.SqlTypes\SqlXml.cs" />\r
-    <Compile Include="System.Data.SqlTypes\StorageState.cs" />\r
-    <Compile Include="System.Data\AcceptRejectRule.cs" />\r
-    <Compile Include="System.Data\ColumnTypeConverter.cs" />\r
-    <Compile Include="System.Data\CommandBehavior.cs" />\r
-    <Compile Include="System.Data\CommandType.cs" />\r
-    <Compile Include="System.Data\ConflictOption.cs" />\r
-    <Compile Include="System.Data\ConnectionState.cs" />\r
-    <Compile Include="System.Data\Constraint.cs" />\r
-    <Compile Include="System.Data\ConstraintCollection.cs" />\r
-    <Compile Include="System.Data\ConstraintConverter.cs" />\r
-    <Compile Include="System.Data\ConstraintException.cs" />\r
-    <Compile Include="System.Data\CustomDataClassGenerator.cs" />\r
-    <Compile Include="System.Data\DataCategoryAttribute.cs" />\r
-    <Compile Include="System.Data\DataColumn.cs" />\r
-    <Compile Include="System.Data\DataColumnChangeEventArgs.cs" />\r
-    <Compile Include="System.Data\DataColumnChangeEventHandler.cs" />\r
-    <Compile Include="System.Data\DataColumnCollection.cs" />\r
-    <Compile Include="System.Data\DataColumnPropertyDescriptor.cs" />\r
-    <Compile Include="System.Data\DataException.cs" />\r
-    <Compile Include="System.Data\DataRelation.cs" />\r
-    <Compile Include="System.Data\DataRelationCollection.cs" />\r
-    <Compile Include="System.Data\DataRelationPropertyDescriptor.cs" />\r
-    <Compile Include="System.Data\DataRow.cs" />\r
-    <Compile Include="System.Data\DataRowAction.cs" />\r
-    <Compile Include="System.Data\DataRowBuilder.cs" />\r
-    <Compile Include="System.Data\DataRowChangeEventArgs.cs" />\r
-    <Compile Include="System.Data\DataRowChangeEventHandler.cs" />\r
-    <Compile Include="System.Data\DataRowCollection.cs" />\r
-    <Compile Include="System.Data\DataRowState.cs" />\r
-    <Compile Include="System.Data\DataRowVersion.cs" />\r
-    <Compile Include="System.Data\DataRowView.cs" />\r
-    <Compile Include="System.Data\DataSet.cs" />\r
-    <Compile Include="System.Data\DataSetDateTime.cs" />\r
-    <Compile Include="System.Data\DataSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Data\DataTable.cs" />\r
-    <Compile Include="System.Data\DataTableClearEventArgs.cs" />\r
-    <Compile Include="System.Data\DataTableClearEventHandler.cs" />\r
-    <Compile Include="System.Data\DataTableCollection.cs" />\r
-    <Compile Include="System.Data\DataTableNewRowEventArgs.cs" />\r
-    <Compile Include="System.Data\DataTableNewRowEventHandler.cs" />\r
-    <Compile Include="System.Data\DataTablePropertyDescriptor.cs" />\r
-    <Compile Include="System.Data\DataTableReader.cs" />\r
-    <Compile Include="System.Data\DataTableTypeConverter.cs" />\r
-    <Compile Include="System.Data\DataView.cs" />\r
-    <Compile Include="System.Data\DataViewManager.cs" />\r
-    <Compile Include="System.Data\DataViewManagerListItemTypeDescriptor.cs" />\r
-    <Compile Include="System.Data\DataViewRowState.cs" />\r
-    <Compile Include="System.Data\DataViewSetting.cs" />\r
-    <Compile Include="System.Data\DataViewSettingCollection.cs" />\r
-    <Compile Include="System.Data\DBConcurrencyException.cs" />\r
-    <Compile Include="System.Data\DbType.cs" />\r
-    <Compile Include="System.Data\DefaultValueTypeConverter.cs" />\r
-    <Compile Include="System.Data\DeletedRowInaccessibleException.cs" />\r
-    <Compile Include="System.Data\DuplicateNameException.cs" />\r
-    <Compile Include="System.Data\EvaluateException.cs" />\r
-    <Compile Include="System.Data\FillErrorEventArgs.cs" />\r
-    <Compile Include="System.Data\FillErrorEventHandler.cs" />\r
-    <Compile Include="System.Data\ForeignKeyConstraint.cs" />\r
-    <Compile Include="System.Data\IColumnMapping.cs" />\r
-    <Compile Include="System.Data\IColumnMappingCollection.cs" />\r
-    <Compile Include="System.Data\IDataAdapter.cs" />\r
-    <Compile Include="System.Data\IDataParameter.cs" />\r
-    <Compile Include="System.Data\IDataParameterCollection.cs" />\r
-    <Compile Include="System.Data\IDataReader.cs" />\r
-    <Compile Include="System.Data\IDataRecord.cs" />\r
-    <Compile Include="System.Data\IDbCommand.cs" />\r
-    <Compile Include="System.Data\IDbConnection.cs" />\r
-    <Compile Include="System.Data\IDbDataAdapter.cs" />\r
-    <Compile Include="System.Data\IDbDataParameter.cs" />\r
-    <Compile Include="System.Data\IDbTransaction.cs" />\r
-    <Compile Include="System.Data\InRowChangingEventException.cs" />\r
-    <Compile Include="System.Data\InternalDataCollectionBase.cs" />\r
-    <Compile Include="System.Data\InvalidConstraintException.cs" />\r
-    <Compile Include="System.Data\InvalidExpressionException.cs" />\r
-    <Compile Include="System.Data\ISafeDataRecord.cs" />\r
-    <Compile Include="System.Data\IsolationLevel.cs" />\r
-    <Compile Include="System.Data\ITableMapping.cs" />\r
-    <Compile Include="System.Data\ITableMappingCollection.cs" />\r
-    <Compile Include="System.Data\KeyRestrictionBehavior.cs" />\r
-    <Compile Include="System.Data\LoadOption.cs" />\r
-    <Compile Include="System.Data\MappingType.cs" />\r
-    <Compile Include="System.Data\MergeFailedEventArgs.cs" />\r
-    <Compile Include="System.Data\MergeFailedEventHandler.cs" />\r
-    <Compile Include="System.Data\MergeManager.cs" />\r
-    <Compile Include="System.Data\MissingMappingAction.cs" />\r
-    <Compile Include="System.Data\MissingPrimaryKeyException.cs" />\r
-    <Compile Include="System.Data\MissingSchemaAction.cs" />\r
-    <Compile Include="System.Data\Node.cs" />\r
-    <Compile Include="System.Data\NoNullAllowedException.cs" />\r
-    <Compile Include="System.Data\OperationAbortedException.cs" />\r
-    <Compile Include="System.Data\ParameterDirection.cs" />\r
-    <Compile Include="System.Data\PropertyAttributes.cs" />\r
-    <Compile Include="System.Data\PropertyCollection.cs" />\r
-    <Compile Include="System.Data\ReadOnlyException.cs" />\r
-    <Compile Include="System.Data\RelatedDataView.cs" />\r
-    <Compile Include="System.Data\RelationshipConverter.cs" />\r
-    <Compile Include="System.Data\ResDescriptionAttribute.cs" />\r
-    <Compile Include="System.Data\RowNotInTableException.cs" />\r
-    <Compile Include="System.Data\Rule.cs" />\r
-    <Compile Include="System.Data\SchemaSerializationMode.cs" />\r
-    <Compile Include="System.Data\SchemaType.cs" />\r
-    <Compile Include="System.Data\SerializationFormat.cs" />\r
-    <Compile Include="System.Data\SqlDbType.cs" />\r
-    <Compile Include="System.Data\StateChangeEventArgs.cs" />\r
-    <Compile Include="System.Data\StateChangeEventHandler.cs" />\r
-    <Compile Include="System.Data\StatementCompletedEventArgs.cs" />\r
-    <Compile Include="System.Data\StatementCompletedEventHandler.cs" />\r
-    <Compile Include="System.Data\StatementType.cs" />\r
-    <Compile Include="System.Data\StrongTypingException.cs" />\r
-    <Compile Include="System.Data\SyntaxErrorException.cs" />\r
-    <Compile Include="System.Data\TableAdapterSchemaInfo.cs" />\r
-    <Compile Include="System.Data\TypeDataSetGeneratorException.cs" />\r
-    <Compile Include="System.Data\TypedDataSetGenerator.cs" />\r
-    <Compile Include="System.Data\UniqueConstraint.cs" />\r
-    <Compile Include="System.Data\UpdateRowSource.cs" />\r
-    <Compile Include="System.Data\UpdateStatus.cs" />\r
-    <Compile Include="System.Data\VersionNotFoundException.cs" />\r
-    <Compile Include="System.Data\XmlConstants.cs" />\r
-    <Compile Include="System.Data\XmlDataInferenceLoader.cs" />\r
-    <Compile Include="System.Data\XmlDataLoader.cs" />\r
-    <Compile Include="System.Data\XmlDataReader.cs" />\r
-    <Compile Include="System.Data\XmlDiffLoader.cs" />\r
-    <Compile Include="System.Data\XmlHelper.cs" />\r
-    <Compile Include="System.Data\XmlReadMode.cs" />\r
-    <Compile Include="System.Data\XmlSchemaDataImporter.cs" />\r
-    <Compile Include="System.Data\XmlSchemaWriter.cs" />\r
-    <Compile Include="System.Data\XmlTableWriter.cs" />\r
-    <Compile Include="System.Data\XmlWriteMode.cs" />\r
-    <Compile Include="System.Xml\XmlDataDocument.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_4_0.csproj">\r
-      <Project>{6ECC0DBC-E614-4ABD-811F-0DE92E8314EA}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data/System.Data-tests-net_2_0.csproj b/mcs/class/System.Data/System.Data-tests-net_2_0.csproj
deleted file mode 100644 (file)
index cb4d133..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{98528310-9599-43E7-B342-C9686B861C6E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Data.SqlExpressions\DataColumnExpressionTest.cs" />\r
-    <Compile Include="Test\Mono.Data.SqlExpressions\DateComparisonTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\ConnectionStringsSectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataColumnMappingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataTableMappingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DBDataPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DBDataPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbProviderFactoriesConfigurationHandlerTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbTransactionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.Sql\SqlNotificationRequestTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlBulkCopyTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBinaryTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBooleanTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBytesTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlByteTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlCharsTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDateTimeTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDecimalTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDoubleTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlGuidTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt16Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt32Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt64Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlMoneyTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlSingleTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlStringTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlXmlTest.cs" />\r
-    <Compile Include="Test\System.Data.Test.Utils\DataProvider.cs" />\r
-    <Compile Include="Test\System.Data\BinarySerializationTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowViewTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowViewTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataSet1.Designer.cs" />\r
-    <Compile Include="Test\System.Data\DataSetAssertion.cs" />\r
-    <Compile Include="Test\System.Data\DataSetInferXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetReadXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetReadXmlTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTypedDataSetTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataTableLoadRowTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReaderTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReadWriteXmlTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReadXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest3.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest4.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest5.cs" />\r
-    <Compile Include="Test\System.Data\DataViewManagerTest.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest_IBindingList.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest_IBindingListView.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest2.cs" />\r
-    <Compile Include="Test\System.Data\DBConcurrencyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\DeletedRowInaccessibleExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\DuplicateNameExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\EvaluateExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ForeignKeyConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\ForeignKeyConstraintTest2.cs" />\r
-    <Compile Include="Test\System.Data\InRowChangingEventExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\InvalidConstraintExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\MissingPrimaryKeyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\MonkeyDataSet.cs" />\r
-    <Compile Include="Test\System.Data\NoNullAllowedExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ReadOnlyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\RowNotInTableExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\SyntaxErrorExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\TrailingSpaceTest.cs" />\r
-    <Compile Include="Test\System.Data\TypedDataSetGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Data\UniqueConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\UniqueConstraintTest2.cs" />\r
-    <Compile Include="Test\System.Data\VersionNotFoundException.cs" />\r
-    <Compile Include="Test\System.Data\XmlDataLoaderTest.cs" />\r
-    <Compile Include="Test\System.Data\XmlDataReaderTest.cs" />\r
-    <Compile Include="Test\System.Data\XmlExportOfTypedDataSetTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDataDocumentTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDataDocumentTest2.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_2_0.csproj">\r
-      <Project>{C21CB6AB-7059-4FA5-A23C-84EA0B854BB7}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="Mono.Data.Sqlite.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>Mono.Data.Sqlite.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Data/System.Data-tests-net_4_0.csproj b/mcs/class/System.Data/System.Data-tests-net_4_0.csproj
deleted file mode 100644 (file)
index b749333..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2473906B-8FEB-467D-8AD6-A55552D604B1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Data.SqlExpressions\DataColumnExpressionTest.cs" />\r
-    <Compile Include="Test\Mono.Data.SqlExpressions\DateComparisonTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\ConnectionStringsSectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataColumnMappingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataTableMappingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DBDataPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DBDataPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbProviderFactoriesConfigurationHandlerTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbTransactionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.Sql\SqlNotificationRequestTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlBulkCopyTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBinaryTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBooleanTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBytesTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlByteTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlCharsTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDateTimeTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDecimalTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDoubleTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlGuidTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt16Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt32Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt64Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlMoneyTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlSingleTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlStringTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlXmlTest.cs" />\r
-    <Compile Include="Test\System.Data.Test.Utils\DataProvider.cs" />\r
-    <Compile Include="Test\System.Data\BinarySerializationTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowViewTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowViewTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataSet1.Designer.cs" />\r
-    <Compile Include="Test\System.Data\DataSetAssertion.cs" />\r
-    <Compile Include="Test\System.Data\DataSetInferXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetReadXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetReadXmlTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTypedDataSetTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataTableLoadRowTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReaderTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReadWriteXmlTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReadXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest3.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest4.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest5.cs" />\r
-    <Compile Include="Test\System.Data\DataViewManagerTest.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest_IBindingList.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest_IBindingListView.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest2.cs" />\r
-    <Compile Include="Test\System.Data\DBConcurrencyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\DeletedRowInaccessibleExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\DuplicateNameExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\EvaluateExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ForeignKeyConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\ForeignKeyConstraintTest2.cs" />\r
-    <Compile Include="Test\System.Data\InRowChangingEventExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\InvalidConstraintExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\MissingPrimaryKeyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\MonkeyDataSet.cs" />\r
-    <Compile Include="Test\System.Data\NoNullAllowedExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ReadOnlyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\RowNotInTableExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\SyntaxErrorExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\TrailingSpaceTest.cs" />\r
-    <Compile Include="Test\System.Data\TypedDataSetGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Data\UniqueConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\UniqueConstraintTest2.cs" />\r
-    <Compile Include="Test\System.Data\VersionNotFoundException.cs" />\r
-    <Compile Include="Test\System.Data\XmlDataLoaderTest.cs" />\r
-    <Compile Include="Test\System.Data\XmlDataReaderTest.cs" />\r
-    <Compile Include="Test\System.Data\XmlExportOfTypedDataSetTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDataDocumentTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDataDocumentTest2.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_4_0.csproj">\r
-      <Project>{6ECC0DBC-E614-4ABD-811F-0DE92E8314EA}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0.csproj">\r
-      <Project>{7B3F5668-ED1F-48EB-9897-E6BE6A1C8CB3}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 2a6c0da4885d78eb7a81a2198a3ab49bb1fe34ba..7cad139dc3d7a581efa8501630cca1f3b478aaaf 100644 (file)
@@ -43,7 +43,6 @@ namespace System.Data.Common {
                readonly IDataReader reader;
                readonly bool closeReader;
                readonly SchemaInfo [] schema;
-               readonly object [] values;
        
                #endregion // Fields
 
@@ -58,7 +57,6 @@ namespace System.Data.Common {
                {
                        this.reader = reader;
                        this.closeReader = closeReader;
-                       this.values = new object [reader.FieldCount];
                        this.schema = LoadSchema (reader);
                }
 
@@ -67,8 +65,13 @@ namespace System.Data.Common {
                #region Properties
 
                public object Current {
-                       get { 
+                       get {
+                               // DbDataRecordImpl does not do copy of the array
+                               // and MoveNext would overwrite any previously filled data
+                               var values = new object [reader.FieldCount];
                                reader.GetValues (values);
+
+                               // TODO: Should not allocate on every property call
                                return new DbDataRecordImpl (schema, values); 
                        }
                }
diff --git a/mcs/class/System.Design/System.Design-net_2_0.csproj b/mcs/class/System.Design/System.Design-net_2_0.csproj
deleted file mode 100644 (file)
index f146ad3..0000000
+++ /dev/null
@@ -1,438 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D3F4E3E9-C9E8-43D4-9E6C-A4AD4433592C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;DRAWING_DESIGN_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;DRAWING_DESIGN_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroup.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroupCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataColumn.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataConnection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataParameter.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataSchemaClass.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataStoredProcedure.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTable.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTableBase.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataView.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\IDataEnvironment.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\IDesignerDataSchema.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\QueryBuilderMode.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\BasicDesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomDesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationModel.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerBase.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerException.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CollectionCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\EnumCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\EventCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ExpressionContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ICodeDomDesignerReload.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ObjectStatementCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\PrimitiveCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\PropertyCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializeAbsoluteContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\StatementContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\TypeCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ArrayEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\BinaryEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ByteViewer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CollectionEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentActionsType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DateTimeEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionHeaderItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionItemCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionList.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionMethodItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionPropertyItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionTextItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCommandSet.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignModeNestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignModeSite.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurface.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DisplayMode.cs" />\r
-    <Compile Include="System.ComponentModel.Design\EventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ExceptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ExtenderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDesignerDebugService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDesignerStateService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\InheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LoadedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LoadedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LocalizationExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MultilineStringEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ObjectSelectorEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\UndoEngine.cs" />\r
-    <Compile Include="System.Data.Design\MethodSignatureGenerator.cs" />\r
-    <Compile Include="System.Data.Design\ParameterGenerationOption.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetGeneratorException.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetSchemaImporterExtension.cs" />\r
-    <Compile Include="System.Design\DummyClass.cs" />\r
-    <Compile Include="System.Diagnostics.Design\LogConverter.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessModuleDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessThreadDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\StringValueConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageDesigner.cs" />\r
-    <Compile Include="System.Resources.Tools\StronglyTypedResourceBuilder.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceControllerDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.Util\DummyClass.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\AdRotatorDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListComponentEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseValidatorDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ButtonDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CalendarAutoFormatDialog.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CalendarDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CheckBoxDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CompositeControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataListComponentEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataProviderNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataSourceIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\HierarchicalDataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\HyperLinkDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\LabelDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\LinkButtonDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ListControlDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ListControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\PanelDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RegexEditorDialog.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RegexTypeEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RepeaterDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableCellsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableRowsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\XmlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\AppSettingsExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\CalendarDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\ClientScriptItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\ClientScriptItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\ColorBuilder.cs" />\r
-    <Compile Include="System.Web.UI.Design\ConnectionStringEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ConnectionStringsExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContainerControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContentDefinition.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContentDesignerState.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlDesignerState.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlLocation.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlParser.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlPersister.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingCollectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingValueUIHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataColumnSelectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataFieldConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataMemberConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetFieldSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetViewSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceBooleanViewSchemaConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceViewSchemaConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormat.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormatCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormatStyle.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerObject.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegionCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegionMouseEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignTimeData.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignTimeResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.UI.Design\EditableDesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionEditorSheet.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionsCollectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HtmlControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HtmlIntrinsicControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HyperLinkDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\IContentResolutionService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerBehaviour.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerTag.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerView.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataBindingSchemaProvider.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceFieldSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceProvider.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceViewSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDesignTimeResourceProviderFactoryService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDesignTimeResourceWriter.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDocumentProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\IFolderProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\IHierarchicalDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\IHtmlControlDesignerBehavior.cs" />\r
-    <Compile Include="System.Web.UI.Design\ImageUrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\IProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\ITemplateEditingFrame.cs" />\r
-    <Compile Include="System.Web.UI.Design\ITemplateEditingService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebAdministrationService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebApplication.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormReferenceManager.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormsBuilderUIService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormsDocumentService.cs" />\r
-    <Compile Include="System.Web.UI.Design\MailFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\MdbDataFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ReadWriteControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ResourceExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ResourceExpressionEditorSheet.cs" />\r
-    <Compile Include="System.Web.UI.Design\SkinIDTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\SupportsPreviewControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplatedControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplatedEditableDesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateDefinition.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateEditingService.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateEditingVerb.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateGroup.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateModeChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\TextControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\TextDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\TransactedChangeCallback.cs" />\r
-    <Compile Include="System.Web.UI.Design\TypeSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlBuilderOptions.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\UserControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\UserControlFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEvent.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewFlags.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewRendering.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebControlToolboxItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsDesignerActionService.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsReferenceManager.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsRootDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlDataFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlDocumentSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlUrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XsdSchemaFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XslTransformFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XslUrlEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Adorner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Behavior.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollectionEnumerator.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\ComponentGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\ControlBodyGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Glyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphSelectionType.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLine.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLinePriority.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLineType.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AnchorEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxImporter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxParameterData.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxWrapperGen.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\BorderSidesEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentDocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentTray.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlBindingsConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlCollectionCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlDataObject.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberFieldConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberFieldEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberListEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataSourceConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DefaultMenuCommands.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DesignerOptions.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DockEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\EventHandlerService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FileNameEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FolderNameEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FormatStringEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FormDocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageIndexEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageListCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageListImageEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IMenuEditorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IMessageReceiver.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IOleDragClient.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ISelectionUIHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IUISelectionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ListControlStringCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\MaskDescriptor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\MenuCommands.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\Native.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\PanelDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ParentControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ScrollableControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SelectionFrame.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SelectionRules.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ShortcutKeysEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SplitContainerDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\StringArrayEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\StringCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\TabPageCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\UISelectionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WindowsFormsDesignerOptionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WndProcRouter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_2_0.csproj">\r
-      <Project>{43A23ADA-35D9-4A48-BCE5-C21C081C6676}</Project>\r
-      <Name>Accessibility\Accessibility-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Drawing.Design.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Drawing.Design.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Design/System.Design-net_4_0.csproj b/mcs/class/System.Design/System.Design-net_4_0.csproj
deleted file mode 100644 (file)
index 1731a55..0000000
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3F28EF87-A1A7-42CE-B985-DE1E6EB14B06}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;DRAWING_DESIGN_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;DRAWING_DESIGN_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroup.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroupCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataColumn.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataConnection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataParameter.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataSchemaClass.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataStoredProcedure.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTable.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTableBase.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataView.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\IDataEnvironment.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\IDesignerDataSchema.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\QueryBuilderMode.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\BasicDesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomDesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationModel.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerBase.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerException.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CollectionCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\EnumCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\EventCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ExpressionContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ICodeDomDesignerReload.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ObjectStatementCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\PrimitiveCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\PropertyCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializeAbsoluteContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\StatementContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\TypeCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ArrayEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\BinaryEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ByteViewer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CollectionEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentActionsType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DateTimeEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionHeaderItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionItemCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionList.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionMethodItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionPropertyItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionTextItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCommandSet.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignModeNestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignModeSite.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurface.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DisplayMode.cs" />\r
-    <Compile Include="System.ComponentModel.Design\EventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ExceptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ExtenderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDesignerDebugService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDesignerStateService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\InheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LoadedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LoadedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LocalizationExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MultilineStringEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ObjectSelectorEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\UndoEngine.cs" />\r
-    <Compile Include="System.Data.Design\MethodSignatureGenerator.cs" />\r
-    <Compile Include="System.Data.Design\ParameterGenerationOption.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetGeneratorException.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetSchemaImporterExtension.cs" />\r
-    <Compile Include="System.Design\DummyClass.cs" />\r
-    <Compile Include="System.Diagnostics.Design\LogConverter.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessModuleDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessThreadDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\StringValueConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageDesigner.cs" />\r
-    <Compile Include="System.Resources.Tools\StronglyTypedResourceBuilder.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceControllerDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.Util\DummyClass.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\AdRotatorDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListComponentEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseValidatorDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ButtonDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CalendarAutoFormatDialog.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CalendarDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CheckBoxDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CompositeControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataListComponentEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataProviderNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataSourceIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\HierarchicalDataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\HyperLinkDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\LabelDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\LinkButtonDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ListControlDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ListControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\PanelDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RegexEditorDialog.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RegexTypeEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RepeaterDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableCellsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableRowsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\XmlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\AppSettingsExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\CalendarDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\ClientScriptItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\ClientScriptItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\ColorBuilder.cs" />\r
-    <Compile Include="System.Web.UI.Design\ConnectionStringEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ConnectionStringsExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContainerControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContentDefinition.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContentDesignerState.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlDesignerState.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlLocation.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlParser.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlPersister.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingCollectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingValueUIHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataColumnSelectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataFieldConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataMemberConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetFieldSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetViewSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceBooleanViewSchemaConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceViewSchemaConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormat.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormatCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormatStyle.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerObject.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegionCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegionMouseEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignTimeData.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignTimeResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.UI.Design\EditableDesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionEditorSheet.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionsCollectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HtmlControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HtmlIntrinsicControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HyperLinkDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\IContentResolutionService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerBehaviour.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerTag.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerView.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataBindingSchemaProvider.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceFieldSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceProvider.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceViewSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDesignTimeResourceProviderFactoryService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDesignTimeResourceWriter.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDocumentProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\IFolderProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\IHierarchicalDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\IHtmlControlDesignerBehavior.cs" />\r
-    <Compile Include="System.Web.UI.Design\ImageUrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\IProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\ITemplateEditingFrame.cs" />\r
-    <Compile Include="System.Web.UI.Design\ITemplateEditingService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebAdministrationService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebApplication.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormReferenceManager.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormsBuilderUIService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormsDocumentService.cs" />\r
-    <Compile Include="System.Web.UI.Design\MailFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\MdbDataFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ReadWriteControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ResourceExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ResourceExpressionEditorSheet.cs" />\r
-    <Compile Include="System.Web.UI.Design\SkinIDTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\SupportsPreviewControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplatedControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplatedEditableDesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateDefinition.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateEditingService.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateEditingVerb.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateGroup.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateModeChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\TextControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\TextDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\TransactedChangeCallback.cs" />\r
-    <Compile Include="System.Web.UI.Design\TypeSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlBuilderOptions.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\UserControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\UserControlFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEvent.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewFlags.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewRendering.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebControlToolboxItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsDesignerActionService.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsReferenceManager.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsRootDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlDataFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlDocumentSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlUrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XsdSchemaFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XslTransformFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XslUrlEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Adorner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Behavior.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollectionEnumerator.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\ComponentGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\ControlBodyGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Glyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphSelectionType.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLine.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLinePriority.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLineType.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AnchorEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxImporter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxParameterData.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxWrapperGen.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\BorderSidesEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentDocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentTray.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlBindingsConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlCollectionCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlDataObject.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberFieldConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberFieldEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberListEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataSourceConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DefaultMenuCommands.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DesignerOptions.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DockEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\EventHandlerService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FileNameEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FolderNameEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FormatStringEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FormDocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageIndexEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageListCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageListImageEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IMenuEditorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IMessageReceiver.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IOleDragClient.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ISelectionUIHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IUISelectionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ListControlStringCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\MaskDescriptor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\MenuCommands.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\Native.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\PanelDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ParentControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ScrollableControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SelectionFrame.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SelectionRules.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ShortcutKeysEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SplitContainerDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\StringArrayEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\StringCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\TabPageCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\UISelectionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WindowsFormsDesignerOptionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WndProcRouter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_4_0.csproj">\r
-      <Project>{0978E130-1E7B-4627-A9CC-7489DB17BFF1}</Project>\r
-      <Name>Accessibility\Accessibility-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing.Design\System.Drawing.Design-net_2_0.csproj">\r
-      <Project>{1A2E7A4A-050C-4F3E-9776-79E7E44B48BE}</Project>\r
-      <Name>System.Drawing.Design\System.Drawing.Design-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Design/System.Design-tests-net_2_0.csproj b/mcs/class/System.Design/System.Design-tests-net_2_0.csproj
deleted file mode 100644 (file)
index a60dee7..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D963664C-F52A-43CB-987B-D5B9563FA779}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Design-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Design_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionListsChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionMethodItemTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionPropertyItemTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Design\StringValueConverterTest.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderBaseNameTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderCodeDomTest.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderNamespaceTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderOtherTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderResourceNameTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderResxFileTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderVerifyResourceNameTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Design\MenuCommandsTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Design\System.Design-net_2_0-1.csproj">\r
-      <Project>{31BD6BF1-0C7A-4C0A-AB48-091F2EBB4AAC}</Project>\r
-      <Name>System.Design\System.Design-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Design/System.Design-tests-net_4_0.csproj b/mcs/class/System.Design/System.Design-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 825b539..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{613A0DE1-16FD-4E19-A31B-6D4CBA651BDD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Design-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Design_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionListsChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionMethodItemTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionPropertyItemTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Design\StringValueConverterTest.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderBaseNameTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderCodeDomTest.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderNamespaceTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderOtherTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderResourceNameTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderResxFileTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderVerifyResourceNameTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Design\MenuCommandsTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Design\System.Design-net_4_0-1.csproj">\r
-      <Project>{7D002453-8C26-4B11-8A26-B19877B73BDC}</Project>\r
-      <Name>System.Design\System.Design-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_2_0.csproj b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_2_0.csproj
deleted file mode 100644 (file)
index 0af954f..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{38D88F62-36F7-4E60-BE74-09C0D2EFD4A0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices.Protocols</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AddRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AddResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AsqRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AsqResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AuthType.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\BerConversionException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\BerConverter.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CompareRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CompareResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CrossDomainMoveControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DeleteRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DeleteResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DereferenceAlias.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DereferenceConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeModification.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeModificationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryControlCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryNotificationControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectorySynchronizationOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DomainScopeControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlAuthRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlAuthResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDocumentProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlErrorProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlErrorResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlInvalidDocumentException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlRequestDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlResponseDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlResponseOrder.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlSoapConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlSoapHttpConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ErrorResponseCategory.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ErrorResponseException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedDNControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedDNFlag.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LazyCommitControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapDirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapSessionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LocatorFlags.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyDNRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyDNResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\NotifyOfNewConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PageResultRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PageResultResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PartialResultProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PartialResultsCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PermissiveModifyControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QueryClientCertificateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QueryForConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QuotaControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ReferralCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ReferralChasingOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ResultCode.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchOption.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchOptionsControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultAttributeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultEntry.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultEntryCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultReference.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultReferenceCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchScope.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityDescriptorFlagControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityMasks.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityPackageContextConnectionInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityProtocol.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ShowDeletedControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortKey.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\TlsOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\TreeDeleteControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VerifyNameControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VerifyServerCertificateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VlvRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VlvResponseControl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.DirectoryServices\System.DirectoryServices-net_2_0.csproj">\r
-      <Project>{390BE0FB-F60C-4E2C-8C52-A221087F1355}</Project>\r
-      <Name>System.DirectoryServices\System.DirectoryServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_0.csproj b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_0.csproj
deleted file mode 100644 (file)
index 69ea41e..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D0F57A87-9EFE-424B-802F-539A23F233C0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices.Protocols</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AddRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AddResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AsqRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AsqResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AuthType.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\BerConversionException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\BerConverter.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CompareRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CompareResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CrossDomainMoveControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DeleteRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DeleteResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DereferenceAlias.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DereferenceConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeModification.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeModificationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryControlCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryNotificationControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectorySynchronizationOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DomainScopeControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlAuthRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlAuthResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDocumentProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlErrorProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlErrorResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlInvalidDocumentException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlRequestDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlResponseDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlResponseOrder.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlSoapConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlSoapHttpConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ErrorResponseCategory.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ErrorResponseException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedDNControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedDNFlag.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LazyCommitControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapDirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapSessionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LocatorFlags.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyDNRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyDNResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\NotifyOfNewConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PageResultRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PageResultResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PartialResultProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PartialResultsCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PermissiveModifyControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QueryClientCertificateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QueryForConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QuotaControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ReferralCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ReferralChasingOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ResultCode.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchOption.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchOptionsControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultAttributeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultEntry.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultEntryCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultReference.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultReferenceCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchScope.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityDescriptorFlagControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityMasks.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityPackageContextConnectionInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityProtocol.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ShowDeletedControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortKey.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\TlsOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\TreeDeleteControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VerifyNameControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VerifyServerCertificateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VlvRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VlvResponseControl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.DirectoryServices\System.DirectoryServices-net_4_0.csproj">\r
-      <Project>{83BB158B-955E-443A-A0D7-9E8DDC5B8075}</Project>\r
-      <Name>System.DirectoryServices\System.DirectoryServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_2_0.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-net_2_0.csproj
deleted file mode 100644 (file)
index 7d203c9..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{390BE0FB-F60C-4E2C-8C52-A221087F1355}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryPartition.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryReplicationMetadata.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryRole.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryRoleCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchedule.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchema.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaClass.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaClassCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaProperty.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySecurity.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryServerDownException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySite.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLink.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLinkBridge.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLinkCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySubnet.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySubnetCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySyntax.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryTransportType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ApplicationPartition.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ApplicationPartitionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\AttributeMetadata.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\AttributeMetadataCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryContext.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryContextType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryEntryConfiguration.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryServer.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryServerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\Domain.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainCollisionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainController.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainControllerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainMode.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\Forest.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestMode.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustCollisionException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustCollisionType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainInfoCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipCollision.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipCollisionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\GlobalCatalog.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\GlobalCatalogCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\HourOfDay.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\LocatorOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\MinuteOfHour.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\NotificationStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\PropertyTypes.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyActiveDirectorySchemaClassCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyActiveDirectorySchemaPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyDirectoryServerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteLinkBridgeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteLinkCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyStringCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationConnectionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationCursor.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationCursorCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationFailure.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationFailureCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationNeighbor.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationNeighborCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationSecurityLevel.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationSpan.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SchemaClassType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SecurityMasks.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersErrorCategory.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersErrorInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersEvent.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncUpdateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelName.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameCollisionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustDirection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustRelationshipInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustRelationshipInformationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustType.cs" />\r
-    <Compile Include="System.DirectoryServices.Design\DirectoryEntryConverter.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryAuditRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryRights.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectorySecurityInheritance.cs" />\r
-    <Compile Include="System.DirectoryServices\AuthenticationTypes.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryEntries.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryEntry.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySearcher.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesCOMException.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermission.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionAccess.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionEntry.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySynchronization.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySynchronizationOptions.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryVirtualListView.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryVirtualListViewContext.cs" />\r
-    <Compile Include="System.DirectoryServices\DSDescriptionAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices\ExtendedDN.cs" />\r
-    <Compile Include="System.DirectoryServices\ExtendedRightAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ListChildrenAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PasswordEncodingMethod.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyAccess.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertySetAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyValueCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\ReferralChasingOption.cs" />\r
-    <Compile Include="System.DirectoryServices\ResultPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\ResultPropertyValueCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SchemaNameCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchResult.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchResultCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchScope.cs" />\r
-    <Compile Include="System.DirectoryServices\SortDirection.cs" />\r
-    <Compile Include="System.DirectoryServices\SortOption.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_2_0.csproj">\r
-      <Project>{30C57C43-3A84-4E9F-A889-53CAE3C634C4}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_0.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_0.csproj
deleted file mode 100644 (file)
index 9ce3a9f..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{83BB158B-955E-443A-A0D7-9E8DDC5B8075}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryPartition.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryReplicationMetadata.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryRole.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryRoleCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchedule.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchema.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaClass.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaClassCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaProperty.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySecurity.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryServerDownException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySite.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLink.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLinkBridge.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLinkCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySubnet.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySubnetCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySyntax.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryTransportType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ApplicationPartition.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ApplicationPartitionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\AttributeMetadata.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\AttributeMetadataCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryContext.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryContextType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryEntryConfiguration.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryServer.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryServerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\Domain.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainCollisionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainController.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainControllerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainMode.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\Forest.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestMode.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustCollisionException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustCollisionType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainInfoCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipCollision.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipCollisionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\GlobalCatalog.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\GlobalCatalogCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\HourOfDay.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\LocatorOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\MinuteOfHour.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\NotificationStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\PropertyTypes.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyActiveDirectorySchemaClassCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyActiveDirectorySchemaPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyDirectoryServerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteLinkBridgeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteLinkCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyStringCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationConnectionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationCursor.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationCursorCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationFailure.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationFailureCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationNeighbor.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationNeighborCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationSecurityLevel.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationSpan.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SchemaClassType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SecurityMasks.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersErrorCategory.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersErrorInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersEvent.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncUpdateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelName.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameCollisionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustDirection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustRelationshipInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustRelationshipInformationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustType.cs" />\r
-    <Compile Include="System.DirectoryServices.Design\DirectoryEntryConverter.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryAuditRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryRights.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectorySecurityInheritance.cs" />\r
-    <Compile Include="System.DirectoryServices\AuthenticationTypes.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryEntries.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryEntry.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySearcher.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesCOMException.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermission.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionAccess.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionEntry.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySynchronization.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySynchronizationOptions.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryVirtualListView.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryVirtualListViewContext.cs" />\r
-    <Compile Include="System.DirectoryServices\DSDescriptionAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices\ExtendedDN.cs" />\r
-    <Compile Include="System.DirectoryServices\ExtendedRightAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ListChildrenAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PasswordEncodingMethod.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyAccess.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertySetAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyValueCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\ReferralChasingOption.cs" />\r
-    <Compile Include="System.DirectoryServices\ResultPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\ResultPropertyValueCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SchemaNameCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchResult.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchResultCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchScope.cs" />\r
-    <Compile Include="System.DirectoryServices\SortDirection.cs" />\r
-    <Compile Include="System.DirectoryServices\SortOption.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_0.csproj">\r
-      <Project>{D6DA2E60-D81F-42EC-991E-ED2FFBD5094D}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_2_0.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_2_0.csproj
deleted file mode 100644 (file)
index ddbc318..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F179583B-C57D-4274-BCB0-CF8E90C639B0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.DirectoryServices-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesDirectoryEntryTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesDirectorySearcherTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesPermissionTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesSearchResultTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\TestConfiguration.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.DirectoryServices\System.DirectoryServices-net_2_0.csproj">\r
-      <Project>{390BE0FB-F60C-4E2C-8C52-A221087F1355}</Project>\r
-      <Name>System.DirectoryServices\System.DirectoryServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_2_0.csproj">\r
-      <Project>{30C57C43-3A84-4E9F-A889-53CAE3C634C4}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_4_0.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 1d60ed4..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AD2E2906-EA78-4E0A-B0FA-093C929A0906}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.DirectoryServices-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesDirectoryEntryTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesDirectorySearcherTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesPermissionTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesSearchResultTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\TestConfiguration.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.DirectoryServices\System.DirectoryServices-net_4_0.csproj">\r
-      <Project>{83BB158B-955E-443A-A0D7-9E8DDC5B8075}</Project>\r
-      <Name>System.DirectoryServices\System.DirectoryServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_0.csproj">\r
-      <Project>{D6DA2E60-D81F-42EC-991E-ED2FFBD5094D}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_2_0.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design-net_2_0.csproj
deleted file mode 100644 (file)
index 9405ca7..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1A2E7A4A-050C-4F3E-9776-79E7E44B48BE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Drawing.Design\BitmapEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ColorEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ContentAlignmentEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\CursorEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\FontEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\FontNameEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\IconEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ImageEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\MetafileEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemContainer.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCreator.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxService.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_0.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_0.csproj
deleted file mode 100644 (file)
index eff1356..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{81FDD05B-E6D8-4667-B637-99DA7C1D7284}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Drawing.Design\BitmapEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ColorEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ContentAlignmentEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\CursorEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\FontEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\FontNameEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\IconEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ImageEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\MetafileEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemContainer.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCreator.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxService.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Drawing/System.Drawing-net_2_0.csproj b/mcs/class/System.Drawing/System.Drawing-net_2_0.csproj
deleted file mode 100644 (file)
index c895031..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Drawing.Design\CategoryNameCollection.cs" />\r
-    <Compile Include="System.Drawing.Design\IPropertyValueUIService.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxItemProvider.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxService.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxUser.cs" />\r
-    <Compile Include="System.Drawing.Design\PaintValueEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueItem.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueUIHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueUIItemInvokeHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCollection.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCreatorCallback.cs" />\r
-    <Compile Include="System.Drawing.Design\UITypeEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\UITypeEditorEditStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\AdjustableArrowCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\Blend.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\ColorBlend.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CombineMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CompostingMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CompostingQuality.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CoordinateSpace.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CustomLineCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\DashCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\DashStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\FillMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\FlushIntention.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsPathIterator.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsState.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\HatchBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\HatchStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\InterpolationMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LinearGradientMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LineCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LineJoin.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\MatrixOrder.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathData.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathPointType.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PenAlignment.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PenType.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PixelOffsetMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\QualityMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\RegionData.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\SmoothingMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\WarpMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\WrapMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorAdjustType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorChannelFlag.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMap.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMapType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMatrix.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMatrixFlag.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorPalette.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EmfPlusRecordType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EmfType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\Encoder.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameter.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameters.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameterValueType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderValue.cs" />\r
-    <Compile Include="System.Drawing.Imaging\FrameDimension.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageAttributes.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageCodecFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageCodecInfo.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageLockMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\Metafile.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileFrameUnit.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PaletteFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PixelFormat.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PlayRecordCallback.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PropertyItem.cs" />\r
-    <Compile Include="System.Drawing.Imaging\WmfPlaceableFileHeader.cs" />\r
-    <Compile Include="System.Drawing.Printing\Duplex.cs" />\r
-    <Compile Include="System.Drawing.Printing\InvalidPrinterException.cs" />\r
-    <Compile Include="System.Drawing.Printing\Margins.cs" />\r
-    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />\r
-    <Compile Include="System.Drawing.Printing\PageSettings.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSize.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSource.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSourceKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PreviewPageInfo.cs" />\r
-    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintAction.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintController.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterResolution.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterResolutionKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterUnit.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterUnitConvert.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermission.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermissionAttribute.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermissionLevel.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintPageEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintRange.cs" />\r
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />\r
-    <Compile Include="System.Drawing.Text\FontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\GenericFontFamilies.cs" />\r
-    <Compile Include="System.Drawing.Text\HotkeyPrefix.cs" />\r
-    <Compile Include="System.Drawing.Text\InstalledFontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\TextRenderingHint.cs" />\r
-    <Compile Include="System.Drawing\Bitmap.cs" />\r
-    <Compile Include="System.Drawing\Brush.cs" />\r
-    <Compile Include="System.Drawing\Brushes.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphics.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />\r
-    <Compile Include="System.Drawing\CharacterRange.cs" />\r
-    <Compile Include="System.Drawing\Color.cs" />\r
-    <Compile Include="System.Drawing\ColorConverter.cs" />\r
-    <Compile Include="System.Drawing\ColorTranslator.cs" />\r
-    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />\r
-    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />\r
-    <Compile Include="System.Drawing\ContentAlignment.cs" />\r
-    <Compile Include="System.Drawing\CopyPixelOperation.cs" />\r
-    <Compile Include="System.Drawing\Font.cs" />\r
-    <Compile Include="System.Drawing\FontConverter.cs" />\r
-    <Compile Include="System.Drawing\FontFamily.cs" />\r
-    <Compile Include="System.Drawing\FontStyle.cs" />\r
-    <Compile Include="System.Drawing\gdipEnums.cs" />\r
-    <Compile Include="System.Drawing\gdipFunctions.cs" />\r
-    <Compile Include="System.Drawing\gdipStructs.cs" />\r
-    <Compile Include="System.Drawing\Graphics.cs" />\r
-    <Compile Include="System.Drawing\GraphicsUnit.cs" />\r
-    <Compile Include="System.Drawing\Icon.cs" />\r
-    <Compile Include="System.Drawing\IconConverter.cs" />\r
-    <Compile Include="System.Drawing\IDeviceContext.cs" />\r
-    <Compile Include="System.Drawing\Image.cs" />\r
-    <Compile Include="System.Drawing\ImageAnimator.cs" />\r
-    <Compile Include="System.Drawing\ImageConverter.cs" />\r
-    <Compile Include="System.Drawing\ImageFormatConverter.cs" />\r
-    <Compile Include="System.Drawing\KnownColor.cs" />\r
-    <Compile Include="System.Drawing\KnownColors.cs" />\r
-    <Compile Include="System.Drawing\macFunctions.cs" />\r
-    <Compile Include="System.Drawing\Pen.cs" />\r
-    <Compile Include="System.Drawing\Pens.cs" />\r
-    <Compile Include="System.Drawing\Point.cs" />\r
-    <Compile Include="System.Drawing\PointConverter.cs" />\r
-    <Compile Include="System.Drawing\PointF.cs" />\r
-    <Compile Include="System.Drawing\Rectangle.cs" />\r
-    <Compile Include="System.Drawing\RectangleConverter.cs" />\r
-    <Compile Include="System.Drawing\RectangleF.cs" />\r
-    <Compile Include="System.Drawing\Region.cs" />\r
-    <Compile Include="System.Drawing\RotateFlipType.cs" />\r
-    <Compile Include="System.Drawing\Size.cs" />\r
-    <Compile Include="System.Drawing\SizeConverter.cs" />\r
-    <Compile Include="System.Drawing\SizeF.cs" />\r
-    <Compile Include="System.Drawing\SizeFConverter.cs" />\r
-    <Compile Include="System.Drawing\SolidBrush.cs" />\r
-    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System.Drawing\StringAligment.cs" />\r
-    <Compile Include="System.Drawing\StringDigitSubstitute.cs" />\r
-    <Compile Include="System.Drawing\StringFormat.cs" />\r
-    <Compile Include="System.Drawing\StringFormatFlags.cs" />\r
-    <Compile Include="System.Drawing\StringTrimming.cs" />\r
-    <Compile Include="System.Drawing\StringUnit.cs" />\r
-    <Compile Include="System.Drawing\SystemBrushes.cs" />\r
-    <Compile Include="System.Drawing\SystemColors.cs" />\r
-    <Compile Include="System.Drawing\SystemFonts.cs" />\r
-    <Compile Include="System.Drawing\SystemIcons.cs" />\r
-    <Compile Include="System.Drawing\SystemPens.cs" />\r
-    <Compile Include="System.Drawing\TextureBrush.cs" />\r
-    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Assembly/Mono.ico">\r
-      <LogicalName>Mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Information.ico">\r
-      <LogicalName>Information.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Error.ico">\r
-      <LogicalName>Error.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Warning.ico">\r
-      <LogicalName>Warning.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Question.ico">\r
-      <LogicalName>Question.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Shield.ico">\r
-      <LogicalName>Shield.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Drawing/System.Drawing-net_4_0.csproj b/mcs/class/System.Drawing/System.Drawing-net_4_0.csproj
deleted file mode 100644 (file)
index f377119..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Drawing.Design\CategoryNameCollection.cs" />\r
-    <Compile Include="System.Drawing.Design\IPropertyValueUIService.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxItemProvider.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxService.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxUser.cs" />\r
-    <Compile Include="System.Drawing.Design\PaintValueEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueItem.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueUIHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueUIItemInvokeHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCollection.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCreatorCallback.cs" />\r
-    <Compile Include="System.Drawing.Design\UITypeEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\UITypeEditorEditStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\AdjustableArrowCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\Blend.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\ColorBlend.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CombineMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CompostingMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CompostingQuality.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CoordinateSpace.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CustomLineCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\DashCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\DashStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\FillMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\FlushIntention.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsPathIterator.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsState.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\HatchBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\HatchStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\InterpolationMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LinearGradientMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LineCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LineJoin.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\MatrixOrder.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathData.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathPointType.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PenAlignment.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PenType.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PixelOffsetMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\QualityMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\RegionData.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\SmoothingMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\WarpMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\WrapMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorAdjustType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorChannelFlag.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMap.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMapType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMatrix.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMatrixFlag.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorPalette.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EmfPlusRecordType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EmfType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\Encoder.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameter.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameters.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameterValueType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderValue.cs" />\r
-    <Compile Include="System.Drawing.Imaging\FrameDimension.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageAttributes.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageCodecFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageCodecInfo.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageLockMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\Metafile.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileFrameUnit.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PaletteFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PixelFormat.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PlayRecordCallback.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PropertyItem.cs" />\r
-    <Compile Include="System.Drawing.Imaging\WmfPlaceableFileHeader.cs" />\r
-    <Compile Include="System.Drawing.Printing\Duplex.cs" />\r
-    <Compile Include="System.Drawing.Printing\InvalidPrinterException.cs" />\r
-    <Compile Include="System.Drawing.Printing\Margins.cs" />\r
-    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />\r
-    <Compile Include="System.Drawing.Printing\PageSettings.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSize.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSource.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSourceKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PreviewPageInfo.cs" />\r
-    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintAction.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintController.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterResolution.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterResolutionKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterUnit.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterUnitConvert.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermission.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermissionAttribute.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermissionLevel.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintPageEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintRange.cs" />\r
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />\r
-    <Compile Include="System.Drawing.Text\FontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\GenericFontFamilies.cs" />\r
-    <Compile Include="System.Drawing.Text\HotkeyPrefix.cs" />\r
-    <Compile Include="System.Drawing.Text\InstalledFontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\TextRenderingHint.cs" />\r
-    <Compile Include="System.Drawing\Bitmap.cs" />\r
-    <Compile Include="System.Drawing\Brush.cs" />\r
-    <Compile Include="System.Drawing\Brushes.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphics.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />\r
-    <Compile Include="System.Drawing\CharacterRange.cs" />\r
-    <Compile Include="System.Drawing\Color.cs" />\r
-    <Compile Include="System.Drawing\ColorConverter.cs" />\r
-    <Compile Include="System.Drawing\ColorTranslator.cs" />\r
-    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />\r
-    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />\r
-    <Compile Include="System.Drawing\ContentAlignment.cs" />\r
-    <Compile Include="System.Drawing\CopyPixelOperation.cs" />\r
-    <Compile Include="System.Drawing\Font.cs" />\r
-    <Compile Include="System.Drawing\FontConverter.cs" />\r
-    <Compile Include="System.Drawing\FontFamily.cs" />\r
-    <Compile Include="System.Drawing\FontStyle.cs" />\r
-    <Compile Include="System.Drawing\gdipEnums.cs" />\r
-    <Compile Include="System.Drawing\gdipFunctions.cs" />\r
-    <Compile Include="System.Drawing\gdipStructs.cs" />\r
-    <Compile Include="System.Drawing\Graphics.cs" />\r
-    <Compile Include="System.Drawing\GraphicsUnit.cs" />\r
-    <Compile Include="System.Drawing\Icon.cs" />\r
-    <Compile Include="System.Drawing\IconConverter.cs" />\r
-    <Compile Include="System.Drawing\IDeviceContext.cs" />\r
-    <Compile Include="System.Drawing\Image.cs" />\r
-    <Compile Include="System.Drawing\ImageAnimator.cs" />\r
-    <Compile Include="System.Drawing\ImageConverter.cs" />\r
-    <Compile Include="System.Drawing\ImageFormatConverter.cs" />\r
-    <Compile Include="System.Drawing\KnownColor.cs" />\r
-    <Compile Include="System.Drawing\KnownColors.cs" />\r
-    <Compile Include="System.Drawing\macFunctions.cs" />\r
-    <Compile Include="System.Drawing\Pen.cs" />\r
-    <Compile Include="System.Drawing\Pens.cs" />\r
-    <Compile Include="System.Drawing\Point.cs" />\r
-    <Compile Include="System.Drawing\PointConverter.cs" />\r
-    <Compile Include="System.Drawing\PointF.cs" />\r
-    <Compile Include="System.Drawing\Rectangle.cs" />\r
-    <Compile Include="System.Drawing\RectangleConverter.cs" />\r
-    <Compile Include="System.Drawing\RectangleF.cs" />\r
-    <Compile Include="System.Drawing\Region.cs" />\r
-    <Compile Include="System.Drawing\RotateFlipType.cs" />\r
-    <Compile Include="System.Drawing\Size.cs" />\r
-    <Compile Include="System.Drawing\SizeConverter.cs" />\r
-    <Compile Include="System.Drawing\SizeF.cs" />\r
-    <Compile Include="System.Drawing\SizeFConverter.cs" />\r
-    <Compile Include="System.Drawing\SolidBrush.cs" />\r
-    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System.Drawing\StringAligment.cs" />\r
-    <Compile Include="System.Drawing\StringDigitSubstitute.cs" />\r
-    <Compile Include="System.Drawing\StringFormat.cs" />\r
-    <Compile Include="System.Drawing\StringFormatFlags.cs" />\r
-    <Compile Include="System.Drawing\StringTrimming.cs" />\r
-    <Compile Include="System.Drawing\StringUnit.cs" />\r
-    <Compile Include="System.Drawing\SystemBrushes.cs" />\r
-    <Compile Include="System.Drawing\SystemColors.cs" />\r
-    <Compile Include="System.Drawing\SystemFonts.cs" />\r
-    <Compile Include="System.Drawing\SystemIcons.cs" />\r
-    <Compile Include="System.Drawing\SystemPens.cs" />\r
-    <Compile Include="System.Drawing\TextureBrush.cs" />\r
-    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Assembly/Mono.ico">\r
-      <LogicalName>Mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Information.ico">\r
-      <LogicalName>Information.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Error.ico">\r
-      <LogicalName>Error.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Warning.ico">\r
-      <LogicalName>Warning.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Question.ico">\r
-      <LogicalName>Question.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Shield.ico">\r
-      <LogicalName>Shield.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Drawing/System.Drawing-tests-net_2_0.csproj b/mcs/class/System.Drawing/System.Drawing-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 27c9774..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{34B64C48-9A07-4A68-8EE4-14471777CD34}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <OutputPath>bin\Debug\System.Drawing-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="System.Drawing\gdipEnums.cs" />\r
-    <Compile Include="System.Drawing\gdipFunctions.cs" />\r
-    <Compile Include="System.Drawing\gdipStructs.cs" />\r
-    <Compile Include="Test\HostIgnoreList.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\CategoryNameCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\PaintValueEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\PropertyValueUIItemCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\TestToolboxItem.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxComponentsCreatedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxComponentsCreatingEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxItemCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\UITypeEditorCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\UITypeEditorTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\GraphicsPathTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\LinearGradientBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\PathDataTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\PathGradientBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestBlend.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestColorBlend.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestHatchBrush.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestMatrix.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\EmfPlusRecordTypeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\FrameDimensionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\GifCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\IconCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\MetafileTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\MetaHeaderTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\PngCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestBmpCodec.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestColorMatrix.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageAttributes.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageCodecInfo.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageFormat.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestJpegCodec.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TiffCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\WmfPlaceableFileHeaderTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\MarginsTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PageSettingsTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PageSourceTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PaperSizeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrinterUnitConvertTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingPermissionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingServicesUnixTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\InstalledFontCollectionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\PrivateFontCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\PrivateFontCollectionTest.cs" />\r
-    <Compile Include="Test\System.Drawing\BitmapCas.cs" />\r
-    <Compile Include="Test\System.Drawing\ColorConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\ColorTranslator.cs" />\r
-    <Compile Include="Test\System.Drawing\FontFamilyTest.cs" />\r
-    <Compile Include="Test\System.Drawing\GDIPlusTest.cs" />\r
-    <Compile Include="Test\System.Drawing\GraphicsCas.cs" />\r
-    <Compile Include="Test\System.Drawing\PenTest.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionCas.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionDataTest.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionNonRectTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SolidBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SystemFontsTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SystemIconsTest.cs" />\r
-    <Compile Include="Test\System.Drawing\TestBitmap.cs" />\r
-    <Compile Include="Test\System.Drawing\TestBrushes.cs" />\r
-    <Compile Include="Test\System.Drawing\TestColor.cs" />\r
-    <Compile Include="Test\System.Drawing\TestFont.cs" />\r
-    <Compile Include="Test\System.Drawing\TestFontConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestGraphics.cs" />\r
-    <Compile Include="Test\System.Drawing\TestIcon.cs" />\r
-    <Compile Include="Test\System.Drawing\TestIconConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImage.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImageConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImageFormatConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPens.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPoint.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPointConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPointF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangle.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangleConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangleF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRegion.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSize.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeFConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestStringFormat.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSystemBrushes.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSystemPens.cs" />\r
-    <Compile Include="Test\System.Drawing\TextureBrushTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Runtime.Serialization.Formatters.Soap.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Runtime.Serialization.Formatters.Soap.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Assembly/Mono.ico">\r
-      <LogicalName>Mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Information.ico">\r
-      <LogicalName>Information.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Error.ico">\r
-      <LogicalName>Error.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Warning.ico">\r
-      <LogicalName>Warning.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Question.ico">\r
-      <LogicalName>Question.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Shield.ico">\r
-      <LogicalName>Shield.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/indexed.png">\r
-      <LogicalName>indexed.png</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Drawing/System.Drawing-tests-net_4_0.csproj b/mcs/class/System.Drawing/System.Drawing-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 08630f8..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6538F1EE-1176-406B-91D5-4482846B3C81}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <OutputPath>bin\Debug\System.Drawing-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="System.Drawing\gdipEnums.cs" />\r
-    <Compile Include="System.Drawing\gdipFunctions.cs" />\r
-    <Compile Include="System.Drawing\gdipStructs.cs" />\r
-    <Compile Include="Test\HostIgnoreList.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\CategoryNameCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\PaintValueEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\PropertyValueUIItemCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\TestToolboxItem.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxComponentsCreatedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxComponentsCreatingEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxItemCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\UITypeEditorCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\UITypeEditorTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\GraphicsPathTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\LinearGradientBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\PathDataTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\PathGradientBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestBlend.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestColorBlend.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestHatchBrush.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestMatrix.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\EmfPlusRecordTypeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\FrameDimensionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\GifCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\IconCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\MetafileTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\MetaHeaderTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\PngCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestBmpCodec.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestColorMatrix.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageAttributes.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageCodecInfo.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageFormat.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestJpegCodec.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TiffCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\WmfPlaceableFileHeaderTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\MarginsTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PageSettingsTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PageSourceTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PaperSizeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrinterUnitConvertTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingPermissionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingServicesUnixTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\InstalledFontCollectionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\PrivateFontCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\PrivateFontCollectionTest.cs" />\r
-    <Compile Include="Test\System.Drawing\BitmapCas.cs" />\r
-    <Compile Include="Test\System.Drawing\ColorConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\ColorTranslator.cs" />\r
-    <Compile Include="Test\System.Drawing\FontFamilyTest.cs" />\r
-    <Compile Include="Test\System.Drawing\GDIPlusTest.cs" />\r
-    <Compile Include="Test\System.Drawing\GraphicsCas.cs" />\r
-    <Compile Include="Test\System.Drawing\PenTest.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionCas.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionDataTest.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionNonRectTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SolidBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SystemFontsTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SystemIconsTest.cs" />\r
-    <Compile Include="Test\System.Drawing\TestBitmap.cs" />\r
-    <Compile Include="Test\System.Drawing\TestBrushes.cs" />\r
-    <Compile Include="Test\System.Drawing\TestColor.cs" />\r
-    <Compile Include="Test\System.Drawing\TestFont.cs" />\r
-    <Compile Include="Test\System.Drawing\TestFontConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestGraphics.cs" />\r
-    <Compile Include="Test\System.Drawing\TestIcon.cs" />\r
-    <Compile Include="Test\System.Drawing\TestIconConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImage.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImageConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImageFormatConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPens.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPoint.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPointConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPointF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangle.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangleConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangleF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRegion.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSize.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeFConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestStringFormat.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSystemBrushes.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSystemPens.cs" />\r
-    <Compile Include="Test\System.Drawing\TextureBrushTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Assembly/Mono.ico">\r
-      <LogicalName>Mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Information.ico">\r
-      <LogicalName>Information.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Error.ico">\r
-      <LogicalName>Error.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Warning.ico">\r
-      <LogicalName>Warning.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Question.ico">\r
-      <LogicalName>Question.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Shield.ico">\r
-      <LogicalName>Shield.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/indexed.png">\r
-      <LogicalName>indexed.png</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Dynamic/System.Dynamic-net_4_0.csproj b/mcs/class/System.Dynamic/System.Dynamic-net_4_0.csproj
deleted file mode 100644 (file)
index 866cdd1..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A97C0057-6A9B-4B55-8B78-0E3EF9F7855D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Dynamic</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CODEPLEX_40</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CODEPLEX_40</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Assert.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\BoolArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\BoundDispEvent.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\CollectionExtensions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComBinderHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComDispIds.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventSink.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventSinkProxy.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventSinksContainer.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComFallbackMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComHresults.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComInterop.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComInvokeAction.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComInvokeBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComMethodDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComRuntimeHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeClassDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeEnumDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeLibDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ContractUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ConversionArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ConvertArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ConvertibleArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\CurrencyArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DateTimeArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispatchArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispCallable.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispCallableMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ErrorArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Errors.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ExcepInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Helpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\IDispatchComObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\IDispatchMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\NullArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\SimpleArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\SplatCallSite.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\StringArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\TypeUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\UnknownArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VarEnumSelector.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Variant.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantArray.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantBuilder.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_2_0.csproj b/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_2_0.csproj
deleted file mode 100644 (file)
index 8a2c4a5..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{94E27660-C3DF-43D1-958A-94D68EF3131F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.EnterpriseServices</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ApplicationCrmEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\Clerk.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ClerkInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ClerkMonitor.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\Compensator.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\CompensatorOptions.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\LogRecord.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\LogRecordFlags.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\TransactionState.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\AppDomainHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\AssemblyLocator.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ClientRemotingConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ClrObjectFactory.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ComManagedImportUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ComSoapPublishError.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\GenerateMetadata.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IClrObjectFactory.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComManagedImportUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapIISVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapMetadata.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapPublisher.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IISVirtualRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IServerWebConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapClientImport.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapServerTlb.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapServerVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapUtility.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\Publish.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ServerWebConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapClientImport.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapServerTlb.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapServerVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapUtility.cs" />\r
-    <Compile Include="System.EnterpriseServices\AccessChecksLevelOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\ActivationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\Activity.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationAccessControlAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationActivationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationIDAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationNameAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationQueuingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\AuthenticationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\AutoCompleteAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\BindingOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\BOID.cs" />\r
-    <Compile Include="System.EnterpriseServices\BYOT.cs" />\r
-    <Compile Include="System.EnterpriseServices\ComponentAccessControlAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\COMTIIntrinsicsAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ConstructionEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ContextUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices\DescriptionAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\EventClassAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\EventTrackingEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ExceptionClassAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IAsyncErrorNotify.cs" />\r
-    <Compile Include="System.EnterpriseServices\IConfigurationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IISIntrinsicsAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ImpersonationLevelOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\InheritanceOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\InstallationFlags.cs" />\r
-    <Compile Include="System.EnterpriseServices\InterfaceQueuingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IPlaybackControl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IProcessInitControl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IProcessInitializer.cs" />\r
-    <Compile Include="System.EnterpriseServices\IRegistrationHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices\IRemoteDispatch.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityCallContext.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityCallersColl.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityIdentityColl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IServiceCall.cs" />\r
-    <Compile Include="System.EnterpriseServices\IServicedComponentInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISharedProperty.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISharedPropertyGroup.cs" />\r
-    <Compile Include="System.EnterpriseServices\ITransaction.cs" />\r
-    <Compile Include="System.EnterpriseServices\JustInTimeActivationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\LoadBalancingSupportedAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\MustRunInClientContextAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ObjectPoolingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\PartitionOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\PrivateComponentAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\PropertyLockMode.cs" />\r
-    <Compile Include="System.EnterpriseServices\PropertyReleaseMode.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationErrorInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationException.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationHelperTx.cs" />\r
-    <Compile Include="System.EnterpriseServices\ResourcePool.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecureMethodAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityCallContext.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityCallers.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityIdentity.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityRoleAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServiceConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServicedComponent.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServicedComponentException.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServiceDomain.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedProperty.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedPropertyGroup.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedPropertyGroupManager.cs" />\r
-    <Compile Include="System.EnterpriseServices\SxsOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\SynchronizationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\SynchronizationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\ThreadPoolOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionIsolationLevel.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionStatus.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionVote.cs" />\r
-    <Compile Include="System.EnterpriseServices\XACTTRANSINFO.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_0.csproj b/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_0.csproj
deleted file mode 100644 (file)
index 9c723e0..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C8124AA3-044F-4027-BD71-4810346B8FB6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.EnterpriseServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ApplicationCrmEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\Clerk.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ClerkInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ClerkMonitor.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\Compensator.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\CompensatorOptions.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\LogRecord.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\LogRecordFlags.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\TransactionState.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\AppDomainHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\AssemblyLocator.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ClientRemotingConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ClrObjectFactory.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ComManagedImportUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ComSoapPublishError.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\GenerateMetadata.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IClrObjectFactory.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComManagedImportUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapIISVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapMetadata.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapPublisher.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IISVirtualRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IServerWebConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapClientImport.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapServerTlb.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapServerVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapUtility.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\Publish.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ServerWebConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapClientImport.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapServerTlb.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapServerVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapUtility.cs" />\r
-    <Compile Include="System.EnterpriseServices\AccessChecksLevelOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\ActivationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\Activity.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationAccessControlAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationActivationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationIDAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationNameAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationQueuingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\AuthenticationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\AutoCompleteAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\BindingOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\BOID.cs" />\r
-    <Compile Include="System.EnterpriseServices\BYOT.cs" />\r
-    <Compile Include="System.EnterpriseServices\ComponentAccessControlAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\COMTIIntrinsicsAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ConstructionEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ContextUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices\DescriptionAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\EventClassAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\EventTrackingEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ExceptionClassAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IAsyncErrorNotify.cs" />\r
-    <Compile Include="System.EnterpriseServices\IConfigurationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IISIntrinsicsAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ImpersonationLevelOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\InheritanceOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\InstallationFlags.cs" />\r
-    <Compile Include="System.EnterpriseServices\InterfaceQueuingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IPlaybackControl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IProcessInitControl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IProcessInitializer.cs" />\r
-    <Compile Include="System.EnterpriseServices\IRegistrationHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices\IRemoteDispatch.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityCallContext.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityCallersColl.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityIdentityColl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IServiceCall.cs" />\r
-    <Compile Include="System.EnterpriseServices\IServicedComponentInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISharedProperty.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISharedPropertyGroup.cs" />\r
-    <Compile Include="System.EnterpriseServices\ITransaction.cs" />\r
-    <Compile Include="System.EnterpriseServices\JustInTimeActivationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\LoadBalancingSupportedAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\MustRunInClientContextAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ObjectPoolingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\PartitionOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\PrivateComponentAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\PropertyLockMode.cs" />\r
-    <Compile Include="System.EnterpriseServices\PropertyReleaseMode.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationErrorInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationException.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationHelperTx.cs" />\r
-    <Compile Include="System.EnterpriseServices\ResourcePool.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecureMethodAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityCallContext.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityCallers.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityIdentity.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityRoleAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServiceConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServicedComponent.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServicedComponentException.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServiceDomain.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedProperty.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedPropertyGroup.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedPropertyGroupManager.cs" />\r
-    <Compile Include="System.EnterpriseServices\SxsOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\SynchronizationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\SynchronizationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\ThreadPoolOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionIsolationLevel.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionStatus.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionVote.cs" />\r
-    <Compile Include="System.EnterpriseServices\XACTTRANSINFO.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index eaa3b75230dd928e8121e5a558f3e929c3cc986e..d08439bd87c5e42d87710668b4f3b46347b7e604 100644 (file)
@@ -43,7 +43,7 @@ namespace System.IO.Compression
                        CompressionLevel compressionLevel, bool includeBaseDirectory)
                {
                        CreateFromDirectory (sourceDirectoryName, destinationArchiveFileName,
-                               CompressionLevel.Fastest, includeBaseDirectory, Encoding.UTF8);
+                               compressionLevel, includeBaseDirectory, Encoding.UTF8);
                }
 
                public static void CreateFromDirectory (
index d88fb810c4c0f785d5313336355dc0a5aaefa262..f9243edf7db9ffebcff2cf89b8f56eec8b043c78 100755 (executable)
@@ -15,7 +15,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.IdentityModel.Selectors.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_2_0.csproj b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_2_0.csproj
deleted file mode 100644 (file)
index a6cb6bf..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7203476D-4107-4C91-9930-DEC5CCFE62C8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel.Selectors</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpaceException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpacePolicyElement.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpaceSelector.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\IdentityValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\PolicyValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\ServiceBusyException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\ServiceNotStartedException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\StsCommunicationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UnsupportedPolicyOptionsException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UntrustedRecipientException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserCancellationException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_2_0.csproj">\r
-      <Project>{737EBB38-BBFD-40D8-99F1-1FBBD49AF1B6}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_0.csproj b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_0.csproj
deleted file mode 100644 (file)
index e159bb4..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FCCADAA1-34B7-4F15-933A-1FAA4DAF9871}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel.Selectors</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpaceException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpacePolicyElement.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpaceSelector.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\IdentityValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\PolicyValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\ServiceBusyException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\ServiceNotStartedException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\StsCommunicationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UnsupportedPolicyOptionsException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UntrustedRecipientException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserCancellationException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_4_0.csproj">\r
-      <Project>{888E3381-24AB-4FA9-B973-FD683B0461D3}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 320f21c9dae6e108cb9202a38ab9cdc13df7a25f..956c2a72ec3b100eba721ef784163c568c22e111 100644 (file)
@@ -26,7 +26,7 @@ EXTRA_DISTFILES = \
        Test/Resources/test.pfx \
        Test/Resources/test2.pfx
 
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.IdentityModel.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel-net_2_0.csproj b/mcs/class/System.IdentityModel/System.IdentityModel-net_2_0.csproj
deleted file mode 100644 (file)
index 798580c..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{737EBB38-BBFD-40D8-99F1-1FBBD49AF1B6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\Claim.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\ClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\ClaimTypes.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\DefaultClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\Rights.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\WindowsClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\X509CertificateClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\AuthorizationContext.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\EvaluationContext.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationComponent.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationPolicy.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\AudienceUriMode.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CustomUserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\RsaSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SamlSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenManager.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenRequirement.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenResolver.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenSerializer.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenVersion.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SystemIdentityAuthorizationPolicy.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNamePasswordValidator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\WindowsSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\WindowsUserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509CertificateValidator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\AsymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\BinaryKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\EncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\GenericXmlSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\InMemorySymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\KerberosReceiverSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\KerberosRequestorSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\LocalIdKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAccessDecision.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAction.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAdvice.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertion.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertionKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAttribute.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAttributeStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAudienceRestrictionCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorityBinding.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlConditions.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlConstants.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlDoNotCacheCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlEvidence.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlNameIdentifierClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSerializer.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSubject.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSubjectStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityAlgorithms.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifier.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyType.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyUsage.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenTypes.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SigningCredentials.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\TlsHMAC.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\UserNameSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\WindowsSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509AsymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509IssuerSerialKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509RawDataKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509SecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509SubjectKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509ThumbprintKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509WindowsSecurityToken.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel-net_4_0.csproj b/mcs/class/System.IdentityModel/System.IdentityModel-net_4_0.csproj
deleted file mode 100644 (file)
index 0f18472..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{888E3381-24AB-4FA9-B973-FD683B0461D3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\Claim.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\ClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\ClaimTypes.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\DefaultClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\Rights.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\WindowsClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\X509CertificateClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\AuthorizationContext.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\EvaluationContext.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationComponent.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationPolicy.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\AudienceUriMode.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CustomUserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\RsaSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SamlSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenManager.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenRequirement.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenResolver.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenSerializer.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenVersion.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SystemIdentityAuthorizationPolicy.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNamePasswordValidator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\WindowsSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\WindowsUserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509CertificateValidator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\AsymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\BinaryKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\EncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\GenericXmlSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\InMemorySymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\KerberosReceiverSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\KerberosRequestorSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\LocalIdKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAccessDecision.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAction.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAdvice.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertion.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertionKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAttribute.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAttributeStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAudienceRestrictionCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorityBinding.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlConditions.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlConstants.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlDoNotCacheCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlEvidence.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlNameIdentifierClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSerializer.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSubject.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSubjectStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityAlgorithms.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifier.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyType.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyUsage.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenTypes.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SigningCredentials.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\TlsHMAC.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\UserNameSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\WindowsSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509AsymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509IssuerSerialKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509RawDataKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509SecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509SubjectKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509ThumbprintKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509WindowsSecurityToken.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel-tests-net_2_0.csproj b/mcs/class/System.IdentityModel/System.IdentityModel-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 169cbad..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5E8EA9D3-4EBC-48D6-8B6F-EAF579539518}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.IdentityModel-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimSetTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimTypesTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\X509CertificateClaimSetTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Common\MySecurityTokenSerializer.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Policy\AuthorizationContextTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\CustomUserNameSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\RsaSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SamlSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SecurityTokenRequirementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SecurityTokenResolverTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\TestEvaluationContext.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\X509SecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\X509SecurityTokenProviderTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\EncryptedKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\InMemorySymmetricSecurityKeyTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\LocalIdKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlActionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAssertionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAttributeStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAudienceRestrictionConditionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthenticationStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthorityBindingTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthorizationDecisionStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlConditionsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlConstantsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlEvidenceTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlSubjectTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityAlgorithmsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityKeyIdentifierTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityTokenTypesTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\UserNameSecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509AsymmetricSecurityKeyTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509IssuerSerialKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509SecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509ThumbprintKeyIdentifierClauseTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_2_0.csproj">\r
-      <Project>{737EBB38-BBFD-40D8-99F1-1FBBD49AF1B6}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel-tests-net_4_0.csproj b/mcs/class/System.IdentityModel/System.IdentityModel-tests-net_4_0.csproj
deleted file mode 100644 (file)
index deb18cd..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2372E56F-BB02-4D04-AE37-BADACCA41FB2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.IdentityModel-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimSetTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimTypesTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\X509CertificateClaimSetTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Common\MySecurityTokenSerializer.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Policy\AuthorizationContextTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\CustomUserNameSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\RsaSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SamlSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SecurityTokenRequirementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SecurityTokenResolverTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\TestEvaluationContext.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\X509SecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\X509SecurityTokenProviderTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\EncryptedKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\InMemorySymmetricSecurityKeyTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\LocalIdKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlActionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAssertionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAttributeStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAudienceRestrictionConditionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthenticationStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthorityBindingTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthorizationDecisionStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlConditionsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlConstantsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlEvidenceTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlSubjectTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityAlgorithmsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityKeyIdentifierTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityTokenTypesTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\UserNameSecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509AsymmetricSecurityKeyTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509IssuerSerialKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509SecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509ThumbprintKeyIdentifierClauseTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_4_0.csproj">\r
-      <Project>{888E3381-24AB-4FA9-B973-FD683B0461D3}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_0.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_0.csproj
deleted file mode 100644 (file)
index 2878b91..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2BCCABAA-2E46-449D-9F41-0478BBC6CB24}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json.Microsoft</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Json\Extensions\JsonValueExtensions.cs" />\r
-    <Compile Include="System.Json\GlobalSuppressions.cs" />\r
-    <Compile Include="System.Json\JsonArray.cs" />\r
-    <Compile Include="System.Json\JsonObject.cs" />\r
-    <Compile Include="System.Json\JsonPrimitive.cs" />\r
-    <Compile Include="System.Json\JsonType.cs" />\r
-    <Compile Include="System.Json\JsonValue.cs" />\r
-    <Compile Include="System.Json\JsonValueChange.cs" />\r
-    <Compile Include="System.Json\JsonValueChangeEventArgs.cs" />\r
-    <Compile Include="System.Json\JsonValueDynamicMetaObject.cs" />\r
-    <Compile Include="System.Json\JsonValueLinqExtensions.cs" />\r
-    <Compile Include="System.Json\JXmlToJsonValueConverter.cs" />\r
-    <Compile Include="System.Json\NGenWrapper.cs" />\r
-    <Compile Include="System.Json\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="System.Json\Properties\Resources.Designer.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.CSharp\Microsoft.CSharp-net_4_0.csproj">\r
-      <Project>{9ACDCB1D-5099-4091-A426-DBBA9B0976C2}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">\r
-      <LogicalName>System.Json.Properties.Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-tests-net_4_0.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-tests-net_4_0.csproj
deleted file mode 100644 (file)
index e17e2ef..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8FF31E68-4AF2-4CED-85AD-2F1C0D5F1277}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Json.Microsoft-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json.Microsoft_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Json\JsonValueTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Json.Microsoft\System.Json.Microsoft-net_4_0.csproj">\r
-      <Project>{2BCCABAA-2E46-449D-9F41-0478BBC6CB24}</Project>\r
-      <Name>System.Json.Microsoft\System.Json.Microsoft-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.CSharp\Microsoft.CSharp-net_4_0.csproj">\r
-      <Project>{9ACDCB1D-5099-4091-A426-DBBA9B0976C2}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">\r
-      <LogicalName>System.Json.Properties.Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Json/System.Json-net_2_0.csproj b/mcs/class/System.Json/System.Json-net_2_0.csproj
deleted file mode 100644 (file)
index a822d6b..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DB40BFDD-0EC2-4C14-B5F6-2D958099E8C6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JavaScriptReader.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Json\JsonArray.cs" />\r
-    <Compile Include="System.Json\JsonObject.cs" />\r
-    <Compile Include="System.Json\JsonPrimitive.cs" />\r
-    <Compile Include="System.Json\JsonType.cs" />\r
-    <Compile Include="System.Json\JsonValue.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Json/System.Json-net_4_0.csproj b/mcs/class/System.Json/System.Json-net_4_0.csproj
deleted file mode 100644 (file)
index 080d04c..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{21BAC36D-68CD-4F2E-9C11-FF439F2D212D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JavaScriptReader.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Json\JsonArray.cs" />\r
-    <Compile Include="System.Json\JsonObject.cs" />\r
-    <Compile Include="System.Json\JsonPrimitive.cs" />\r
-    <Compile Include="System.Json\JsonType.cs" />\r
-    <Compile Include="System.Json\JsonValue.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Json/System.Json-tests-net_2_0.csproj b/mcs/class/System.Json/System.Json-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 91a9a67..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D6326E54-3E22-4524-B506-4E9852235565}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Json-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Json\JsonValueTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Json\System.Json-net_2_0.csproj">\r
-      <Project>{DB40BFDD-0EC2-4C14-B5F6-2D958099E8C6}</Project>\r
-      <Name>System.Json\System.Json-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Json/System.Json-tests-net_4_0.csproj b/mcs/class/System.Json/System.Json-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 60da552..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8A49FBB5-14E0-42C4-BAA2-4BC47B56AC2B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Json-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Json\JsonValueTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Json\System.Json-net_4_0.csproj">\r
-      <Project>{21BAC36D-68CD-4F2E-9C11-FF439F2D212D}</Project>\r
-      <Name>System.Json\System.Json-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Management/System.Management-net_2_0.csproj b/mcs/class/System.Management/System.Management-net_2_0.csproj
deleted file mode 100644 (file)
index 8f1f727..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{47B40391-645F-42E1-AE88-206970D141D2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Management</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Management.Instrumentation\BaseEvent.cs" />\r
-    <Compile Include="System.Management.Instrumentation\DefaultManagementProjectInstaller.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IEvent.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IgnoreMemberAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IInstance.cs" />\r
-    <Compile Include="System.Management.Instrumentation\Instance.cs" />\r
-    <Compile Include="System.Management.Instrumentation\Instrumentation.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentationClassAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentationType.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentedAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\ManagedNameAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\ManagementInstaller.cs" />\r
-    <Compile Include="System.Management\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Management\CimType.cs" />\r
-    <Compile Include="System.Management\CodeLanguage.cs" />\r
-    <Compile Include="System.Management\ComparisonSettings.cs" />\r
-    <Compile Include="System.Management\CompletedEventArgs.cs" />\r
-    <Compile Include="System.Management\CompletedEventHandler.cs" />\r
-    <Compile Include="System.Management\ConnectionOptions.cs" />\r
-    <Compile Include="System.Management\DeleteOptions.cs" />\r
-    <Compile Include="System.Management\EnumerationOptions.cs" />\r
-    <Compile Include="System.Management\EventArrivedEventArgs.cs" />\r
-    <Compile Include="System.Management\EventArrivedEventHandler.cs" />\r
-    <Compile Include="System.Management\EventQuery.cs" />\r
-    <Compile Include="System.Management\EventWatcherOptions.cs" />\r
-    <Compile Include="System.Management\ImpersonationLevel.cs" />\r
-    <Compile Include="System.Management\InvokeMethodOptions.cs" />\r
-    <Compile Include="System.Management\ManagementBaseObject.cs" />\r
-    <Compile Include="System.Management\ManagementClass.cs" />\r
-    <Compile Include="System.Management\ManagementDateTimeConverter.cs" />\r
-    <Compile Include="System.Management\ManagementEventArgs.cs" />\r
-    <Compile Include="System.Management\ManagementEventWatcher.cs" />\r
-    <Compile Include="System.Management\ManagementException.cs" />\r
-    <Compile Include="System.Management\ManagementNamedValueCollection.cs" />\r
-    <Compile Include="System.Management\ManagementObject.cs" />\r
-    <Compile Include="System.Management\ManagementObjectCollection.cs" />\r
-    <Compile Include="System.Management\ManagementObjectSearcher.cs" />\r
-    <Compile Include="System.Management\ManagementOperationObserver.cs" />\r
-    <Compile Include="System.Management\ManagementOptions.cs" />\r
-    <Compile Include="System.Management\ManagementPath.cs" />\r
-    <Compile Include="System.Management\ManagementQuery.cs" />\r
-    <Compile Include="System.Management\ManagementScope.cs" />\r
-    <Compile Include="System.Management\ManagementStatus.cs" />\r
-    <Compile Include="System.Management\MethodData.cs" />\r
-    <Compile Include="System.Management\MethodDataCollection.cs" />\r
-    <Compile Include="System.Management\ObjectGetOptions.cs" />\r
-    <Compile Include="System.Management\ObjectPutEventArgs.cs" />\r
-    <Compile Include="System.Management\ObjectPutEventHandler.cs" />\r
-    <Compile Include="System.Management\ObjectQuery.cs" />\r
-    <Compile Include="System.Management\ObjectReadyEventArgs.cs" />\r
-    <Compile Include="System.Management\ObjectReadyEventHandler.cs" />\r
-    <Compile Include="System.Management\ProgressEventArgs.cs" />\r
-    <Compile Include="System.Management\ProgressEventHandler.cs" />\r
-    <Compile Include="System.Management\PropertyData.cs" />\r
-    <Compile Include="System.Management\PropertyDataCollection.cs" />\r
-    <Compile Include="System.Management\PutOptions.cs" />\r
-    <Compile Include="System.Management\PutType.cs" />\r
-    <Compile Include="System.Management\QualifierData.cs" />\r
-    <Compile Include="System.Management\QualifierDataCollection.cs" />\r
-    <Compile Include="System.Management\RelatedObjectQuery.cs" />\r
-    <Compile Include="System.Management\RelationshipQuery.cs" />\r
-    <Compile Include="System.Management\SelectQuery.cs" />\r
-    <Compile Include="System.Management\StoppedEventArgs.cs" />\r
-    <Compile Include="System.Management\StoppedEventHandler.cs" />\r
-    <Compile Include="System.Management\TextFormat.cs" />\r
-    <Compile Include="System.Management\WqlEventQuery.cs" />\r
-    <Compile Include="System.Management\WqlObjectQuery.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_2_0.csproj">\r
-      <Project>{C8B650EA-042C-4352-8224-03F759A682C6}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Management/System.Management-net_4_0.csproj b/mcs/class/System.Management/System.Management-net_4_0.csproj
deleted file mode 100644 (file)
index 0184726..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C9E21BEA-8ADA-4736-973E-21DB934FD39B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Management</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Management.Instrumentation\BaseEvent.cs" />\r
-    <Compile Include="System.Management.Instrumentation\DefaultManagementProjectInstaller.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IEvent.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IgnoreMemberAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IInstance.cs" />\r
-    <Compile Include="System.Management.Instrumentation\Instance.cs" />\r
-    <Compile Include="System.Management.Instrumentation\Instrumentation.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentationClassAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentationType.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentedAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\ManagedNameAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\ManagementInstaller.cs" />\r
-    <Compile Include="System.Management\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Management\CimType.cs" />\r
-    <Compile Include="System.Management\CodeLanguage.cs" />\r
-    <Compile Include="System.Management\ComparisonSettings.cs" />\r
-    <Compile Include="System.Management\CompletedEventArgs.cs" />\r
-    <Compile Include="System.Management\CompletedEventHandler.cs" />\r
-    <Compile Include="System.Management\ConnectionOptions.cs" />\r
-    <Compile Include="System.Management\DeleteOptions.cs" />\r
-    <Compile Include="System.Management\EnumerationOptions.cs" />\r
-    <Compile Include="System.Management\EventArrivedEventArgs.cs" />\r
-    <Compile Include="System.Management\EventArrivedEventHandler.cs" />\r
-    <Compile Include="System.Management\EventQuery.cs" />\r
-    <Compile Include="System.Management\EventWatcherOptions.cs" />\r
-    <Compile Include="System.Management\ImpersonationLevel.cs" />\r
-    <Compile Include="System.Management\InvokeMethodOptions.cs" />\r
-    <Compile Include="System.Management\ManagementBaseObject.cs" />\r
-    <Compile Include="System.Management\ManagementClass.cs" />\r
-    <Compile Include="System.Management\ManagementDateTimeConverter.cs" />\r
-    <Compile Include="System.Management\ManagementEventArgs.cs" />\r
-    <Compile Include="System.Management\ManagementEventWatcher.cs" />\r
-    <Compile Include="System.Management\ManagementException.cs" />\r
-    <Compile Include="System.Management\ManagementNamedValueCollection.cs" />\r
-    <Compile Include="System.Management\ManagementObject.cs" />\r
-    <Compile Include="System.Management\ManagementObjectCollection.cs" />\r
-    <Compile Include="System.Management\ManagementObjectSearcher.cs" />\r
-    <Compile Include="System.Management\ManagementOperationObserver.cs" />\r
-    <Compile Include="System.Management\ManagementOptions.cs" />\r
-    <Compile Include="System.Management\ManagementPath.cs" />\r
-    <Compile Include="System.Management\ManagementQuery.cs" />\r
-    <Compile Include="System.Management\ManagementScope.cs" />\r
-    <Compile Include="System.Management\ManagementStatus.cs" />\r
-    <Compile Include="System.Management\MethodData.cs" />\r
-    <Compile Include="System.Management\MethodDataCollection.cs" />\r
-    <Compile Include="System.Management\ObjectGetOptions.cs" />\r
-    <Compile Include="System.Management\ObjectPutEventArgs.cs" />\r
-    <Compile Include="System.Management\ObjectPutEventHandler.cs" />\r
-    <Compile Include="System.Management\ObjectQuery.cs" />\r
-    <Compile Include="System.Management\ObjectReadyEventArgs.cs" />\r
-    <Compile Include="System.Management\ObjectReadyEventHandler.cs" />\r
-    <Compile Include="System.Management\ProgressEventArgs.cs" />\r
-    <Compile Include="System.Management\ProgressEventHandler.cs" />\r
-    <Compile Include="System.Management\PropertyData.cs" />\r
-    <Compile Include="System.Management\PropertyDataCollection.cs" />\r
-    <Compile Include="System.Management\PutOptions.cs" />\r
-    <Compile Include="System.Management\PutType.cs" />\r
-    <Compile Include="System.Management\QualifierData.cs" />\r
-    <Compile Include="System.Management\QualifierDataCollection.cs" />\r
-    <Compile Include="System.Management\RelatedObjectQuery.cs" />\r
-    <Compile Include="System.Management\RelationshipQuery.cs" />\r
-    <Compile Include="System.Management\SelectQuery.cs" />\r
-    <Compile Include="System.Management\StoppedEventArgs.cs" />\r
-    <Compile Include="System.Management\StoppedEventHandler.cs" />\r
-    <Compile Include="System.Management\TextFormat.cs" />\r
-    <Compile Include="System.Management\WqlEventQuery.cs" />\r
-    <Compile Include="System.Management\WqlObjectQuery.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_4_0.csproj">\r
-      <Project>{29529439-51F1-4953-8A5D-7ED8F7EB8FDB}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Messaging/System.Messaging-net_2_0.csproj b/mcs/class/System.Messaging/System.Messaging-net_2_0.csproj
deleted file mode 100644 (file)
index 87b84c8..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DB0FD42E-2BF8-4E67-B707-901AC35FCB9A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Messaging</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageFormatterConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageQueueConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\QueuePathDialog.cs" />\r
-    <Compile Include="System.Messaging.Design\QueuePathEditor.cs" />\r
-    <Compile Include="System.Messaging.Design\TimeoutConverter.cs" />\r
-    <Compile Include="System.Messaging\AccessControlEntry.cs" />\r
-    <Compile Include="System.Messaging\AccessControlEntryType.cs" />\r
-    <Compile Include="System.Messaging\AccessControlList.cs" />\r
-    <Compile Include="System.Messaging\AcknowledgeTypes.cs" />\r
-    <Compile Include="System.Messaging\Acknowledgment.cs" />\r
-    <Compile Include="System.Messaging\ActiveXMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\BinaryMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\CryptographicProviderType.cs" />\r
-    <Compile Include="System.Messaging\DefaultPropertiesToSend.cs" />\r
-    <Compile Include="System.Messaging\EncryptionAlgorithm.cs" />\r
-    <Compile Include="System.Messaging\EncryptionRequired.cs" />\r
-    <Compile Include="System.Messaging\GenericAccessRights.cs" />\r
-    <Compile Include="System.Messaging\HashAlgorithm.cs" />\r
-    <Compile Include="System.Messaging\IMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\Message.cs" />\r
-    <Compile Include="System.Messaging\MessageEnumerator.cs" />\r
-    <Compile Include="System.Messaging\MessagePriority.cs" />\r
-    <Compile Include="System.Messaging\MessagePropertyFilter.cs" />\r
-    <Compile Include="System.Messaging\MessageQueue.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueAccessControlEntry.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueAccessRights.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueCriteria.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueEnumerator.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueErrorCode.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueException.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueInstaller.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermission.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionAccess.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionAttribute.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionEntry.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionEntryCollection.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransaction.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransactionStatus.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransactionType.cs" />\r
-    <Compile Include="System.Messaging\MessageType.cs" />\r
-    <Compile Include="System.Messaging\MessagingDescriptionAttribute.cs" />\r
-    <Compile Include="System.Messaging\PeekCompletedEventArgs.cs" />\r
-    <Compile Include="System.Messaging\PeekCompletedEventHandler.cs" />\r
-    <Compile Include="System.Messaging\QueueAccessMode.cs" />\r
-    <Compile Include="System.Messaging\ReceiveCompletedEventArgs.cs" />\r
-    <Compile Include="System.Messaging\ReceiveCompletedEventHandler.cs" />\r
-    <Compile Include="System.Messaging\StandardAccessRights.cs" />\r
-    <Compile Include="System.Messaging\Trustee.cs" />\r
-    <Compile Include="System.Messaging\TrusteeType.cs" />\r
-    <Compile Include="System.Messaging\XmlMessageFormatter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_2_0.csproj">\r
-      <Project>{C8B650EA-042C-4352-8224-03F759A682C6}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_2_0.csproj">\r
-      <Project>{2220FC2B-F933-49D2-B1A4-A6241F486B88}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Messaging/MessageQueue.resx">\r
-      <LogicalName>MessageQueue.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Messaging/System.Messaging-net_4_0.csproj b/mcs/class/System.Messaging/System.Messaging-net_4_0.csproj
deleted file mode 100644 (file)
index f4ee3d9..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5854BF27-FC35-44F5-BE59-580900694E32}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Messaging</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageFormatterConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageQueueConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\QueuePathDialog.cs" />\r
-    <Compile Include="System.Messaging.Design\QueuePathEditor.cs" />\r
-    <Compile Include="System.Messaging.Design\TimeoutConverter.cs" />\r
-    <Compile Include="System.Messaging\AccessControlEntry.cs" />\r
-    <Compile Include="System.Messaging\AccessControlEntryType.cs" />\r
-    <Compile Include="System.Messaging\AccessControlList.cs" />\r
-    <Compile Include="System.Messaging\AcknowledgeTypes.cs" />\r
-    <Compile Include="System.Messaging\Acknowledgment.cs" />\r
-    <Compile Include="System.Messaging\ActiveXMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\BinaryMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\CryptographicProviderType.cs" />\r
-    <Compile Include="System.Messaging\DefaultPropertiesToSend.cs" />\r
-    <Compile Include="System.Messaging\EncryptionAlgorithm.cs" />\r
-    <Compile Include="System.Messaging\EncryptionRequired.cs" />\r
-    <Compile Include="System.Messaging\GenericAccessRights.cs" />\r
-    <Compile Include="System.Messaging\HashAlgorithm.cs" />\r
-    <Compile Include="System.Messaging\IMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\Message.cs" />\r
-    <Compile Include="System.Messaging\MessageEnumerator.cs" />\r
-    <Compile Include="System.Messaging\MessagePriority.cs" />\r
-    <Compile Include="System.Messaging\MessagePropertyFilter.cs" />\r
-    <Compile Include="System.Messaging\MessageQueue.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueAccessControlEntry.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueAccessRights.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueCriteria.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueEnumerator.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueErrorCode.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueException.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueInstaller.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermission.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionAccess.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionAttribute.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionEntry.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionEntryCollection.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransaction.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransactionStatus.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransactionType.cs" />\r
-    <Compile Include="System.Messaging\MessageType.cs" />\r
-    <Compile Include="System.Messaging\MessagingDescriptionAttribute.cs" />\r
-    <Compile Include="System.Messaging\PeekCompletedEventArgs.cs" />\r
-    <Compile Include="System.Messaging\PeekCompletedEventHandler.cs" />\r
-    <Compile Include="System.Messaging\QueueAccessMode.cs" />\r
-    <Compile Include="System.Messaging\ReceiveCompletedEventArgs.cs" />\r
-    <Compile Include="System.Messaging\ReceiveCompletedEventHandler.cs" />\r
-    <Compile Include="System.Messaging\StandardAccessRights.cs" />\r
-    <Compile Include="System.Messaging\Trustee.cs" />\r
-    <Compile Include="System.Messaging\TrusteeType.cs" />\r
-    <Compile Include="System.Messaging\XmlMessageFormatter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_4_0.csproj">\r
-      <Project>{29529439-51F1-4953-8A5D-7ED8F7EB8FDB}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_0.csproj">\r
-      <Project>{DD379954-9A73-4B1D-B314-D8EF1D4C5EB7}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Messaging/MessageQueue.resx">\r
-      <LogicalName>MessageQueue.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Messaging/System.Messaging-tests-net_2_0.csproj b/mcs/class/System.Messaging/System.Messaging-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 7b17d94..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8D0EE23F-327F-4C6C-9DF3-6517D60F7EBB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Messaging-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Messaging_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Messaging\AdminTest.cs" />\r
-    <Compile Include="Test\System.Messaging\AsyncPeekTest.cs" />\r
-    <Compile Include="Test\System.Messaging\AsyncReceiveTest.cs" />\r
-    <Compile Include="Test\System.Messaging\BasicMessagingTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MessageEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MessageQueuePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MQUtil.cs" />\r
-    <Compile Include="Test\System.Messaging\PeekTest.cs" />\r
-    <Compile Include="Test\System.Messaging\SelectorTest.cs" />\r
-    <Compile Include="Test\System.Messaging\TransactionMessagingTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_2_0.csproj">\r
-      <Project>{DB0FD42E-2BF8-4E67-B707-901AC35FCB9A}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_2_0.csproj">\r
-      <Project>{C8B650EA-042C-4352-8224-03F759A682C6}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_2_0.csproj">\r
-      <Project>{2220FC2B-F933-49D2-B1A4-A6241F486B88}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Messaging/MessageQueue.resx">\r
-      <LogicalName>MessageQueue.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Messaging/System.Messaging-tests-net_4_0.csproj b/mcs/class/System.Messaging/System.Messaging-tests-net_4_0.csproj
deleted file mode 100644 (file)
index ba9b7bc..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6EB65DB4-E8F3-479A-BF52-5AF80259E9FC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Messaging-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Messaging_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Messaging\AdminTest.cs" />\r
-    <Compile Include="Test\System.Messaging\AsyncPeekTest.cs" />\r
-    <Compile Include="Test\System.Messaging\AsyncReceiveTest.cs" />\r
-    <Compile Include="Test\System.Messaging\BasicMessagingTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MessageEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MessageQueuePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MQUtil.cs" />\r
-    <Compile Include="Test\System.Messaging\PeekTest.cs" />\r
-    <Compile Include="Test\System.Messaging\SelectorTest.cs" />\r
-    <Compile Include="Test\System.Messaging\TransactionMessagingTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_0.csproj">\r
-      <Project>{5854BF27-FC35-44F5-BE59-580900694E32}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_4_0.csproj">\r
-      <Project>{29529439-51F1-4953-8A5D-7ED8F7EB8FDB}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_0.csproj">\r
-      <Project>{DD379954-9A73-4B1D-B314-D8EF1D4C5EB7}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Messaging/MessageQueue.resx">\r
-      <LogicalName>MessageQueue.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 9329ac5796fe4945830f62f8623ac2b840246dc7..f80e50e41431ff0013d257f124aa2708867252fb 100644 (file)
@@ -257,6 +257,11 @@ namespace System.Net.Http.Headers
                                        continue;
                                }
 
+                               if (!Lexer.IsValidCharacter (ch) || ch == '*' || ch == '?' || ch == '%') {
+                                       sb.Append (Uri.HexEscape (ch));
+                                       continue;
+                               }
+
                                sb.Append (ch);
                        }
 
index 622e36b0ec2b43e358902642c1e40d5198623777..5bf97d0b96f9cf613fcf4a8a309a0731707b0f22 100644 (file)
@@ -94,7 +94,7 @@ namespace System.Net.Http.Headers
                        /*90*/  true, false, false, false, true, true, true, true, true, true,
                        /*100*/ true, true, true, true, true, true, true, true, true, true,
                        /*110*/ true, true, true, true, true, true, true, true, true, true,
-                       /*120*/ true, true, true, false, true, false
+                       /*120*/ true, true, true, false, true, false, true
                        };
 
                static readonly int last_token_char = token_chars.Length;
@@ -193,13 +193,18 @@ namespace System.Net.Http.Headers
                        //
                        for (; i < input.Length; ++i) {
                                char s = input[i];
-                               if (s > last_token_char || !token_chars[s])
+                               if (!IsValidCharacter (s))
                                        return false;
                        }
 
                        return i > 0;
                }
 
+               public static bool IsValidCharacter (char input)
+               {
+                       return input < last_token_char && token_chars[input];
+               }
+
                public void EatChar ()
                {
                        ++pos;
@@ -292,18 +297,11 @@ namespace System.Net.Http.Headers
                                        // Quoted string
                                        start = pos - 1;
                                        while (pos < s.Length) {
-                                               ch = s[pos];
+                                               ch = s [pos++];
                                                if (ch == '"') {
-                                                       ++pos;
                                                        ttype = Token.Type.QuotedString;
                                                        break;
                                                }
-
-                                               // any OCTET except CTLs, but including LWS
-                                               if (ch < 32 || ch > 126)
-                                                       break;
-
-                                               ++pos;
                                        }
 
                                        break;
@@ -312,13 +310,13 @@ namespace System.Net.Http.Headers
                                        ttype = Token.Type.OpenParens;
                                        break;
                                default:
-                                       if (ch <= last_token_char && token_chars[ch]) {
+                                       if (ch < last_token_char && token_chars[ch]) {
                                                start = pos - 1;
 
                                                ttype = Token.Type.Token;
                                                while (pos < s.Length) {
                                                        ch = s[pos];
-                                                       if (ch > last_token_char || !token_chars[ch]) {
+                                                       if (ch >= last_token_char || !token_chars[ch]) {
                                                                break;
                                                        }
 
index b4de2a029cf96a7423ebae93c782e23ce6393748..026171a4f7ad6139b6264cab2ddbae3633235e4e 100644 (file)
@@ -314,38 +314,38 @@ namespace System.Net.Http
 
                        Volatile.Write (ref sentRequest, true);
                        var wrequest = CreateWebRequest (request);
+                       HttpWebResponse wresponse = null;
 
-                       if (request.Content != null) {
-                               var headers = wrequest.Headers;
-                               foreach (var header in request.Content.Headers) {
-                                       foreach (var value in header.Value) {
-                                               headers.AddValue (header.Key, value);
+                       try {
+                               using (cancellationToken.Register (l => ((HttpWebRequest)l).Abort (), wrequest)) {
+                                       if (request.Content != null) {
+                                               var headers = wrequest.Headers;
+                                               foreach (var header in request.Content.Headers) {
+                                                       foreach (var value in header.Value) {
+                                                               headers.AddValue (header.Key, value);
+                                                       }
+                                               }
+
+                                               var stream = await wrequest.GetRequestStreamAsync ().ConfigureAwait (false);
+                                               await request.Content.CopyToAsync (stream).ConfigureAwait (false);
+                                       } else if (HttpMethod.Post.Equals (request.Method) || HttpMethod.Put.Equals (request.Method) || HttpMethod.Delete.Equals (request.Method)) {
+                                               // Explicitly set this to make sure we're sending a "Content-Length: 0" header.
+                                               // This fixes the issue that's been reported on the forums:
+                                               // http://forums.xamarin.com/discussion/17770/length-required-error-in-http-post-since-latest-release
+                                               wrequest.ContentLength = 0;
                                        }
-                               }
-
-                               var stream = await wrequest.GetRequestStreamAsync ().ConfigureAwait (false);
-                               await request.Content.CopyToAsync (stream).ConfigureAwait (false);
-                       } else if (HttpMethod.Post.Equals (request.Method) || HttpMethod.Put.Equals (request.Method) || HttpMethod.Delete.Equals (request.Method)) {
-                               // Explicitly set this to make sure we're sending a "Content-Length: 0" header.
-                               // This fixes the issue that's been reported on the forums:
-                               // http://forums.xamarin.com/discussion/17770/length-required-error-in-http-post-since-latest-release
-                               wrequest.ContentLength = 0;
-                       }
 
-                       HttpWebResponse wresponse = null;
-                       using (cancellationToken.Register (l => ((HttpWebRequest) l).Abort (), wrequest)) {
-                               try {
-                                       wresponse = (HttpWebResponse) await wrequest.GetResponseAsync ().ConfigureAwait (false);
-                               } catch (WebException we) {
-                                       if (we.Status != WebExceptionStatus.RequestCanceled)
-                                               throw;
+                                       wresponse = (HttpWebResponse)await wrequest.GetResponseAsync ().ConfigureAwait (false);
                                }
+                       } catch (WebException we) {
+                               if (we.Status != WebExceptionStatus.RequestCanceled)
+                                       throw;
+                       }
 
-                               if (cancellationToken.IsCancellationRequested) {
-                                       var cancelled = new TaskCompletionSource<HttpResponseMessage> ();
-                                       cancelled.SetCanceled ();
-                                       return await cancelled.Task;
-                               }
+                       if (cancellationToken.IsCancellationRequested) {
+                               var cancelled = new TaskCompletionSource<HttpResponseMessage> ();
+                               cancelled.SetCanceled ();
+                               return await cancelled.Task;
                        }
                        
                        return CreateResponseMessage (wresponse, request, cancellationToken);
index 0bf3fba28abd6b381b465e039d404fcbcf48d3d9..0823365d74476ff243a965f357fc77203697beae 100644 (file)
@@ -89,13 +89,25 @@ namespace System.Net.Http
                                return uri;
                        }
                        set {
-                               if (value != null && (value.IsAbsoluteUri && value.Scheme != Uri.UriSchemeHttp && value.Scheme != Uri.UriSchemeHttps))
+                               if (value != null && value.IsAbsoluteUri && !IsAllowedAbsoluteUri (value))
                                        throw new ArgumentException ("Only http or https scheme is allowed");
 
                                uri = value;
                        }
                }
 
+               static bool IsAllowedAbsoluteUri (Uri uri)
+               {
+                       if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
+                               return true;
+
+                       // Mono URI handling which does not distinguish between file and url absolute paths without scheme
+                       if (uri.Scheme == Uri.UriSchemeFile && uri.OriginalString.StartsWith ("/", StringComparison.Ordinal))
+                               return true;
+
+                       return false;
+               }
+
                public Version Version {
                        get {
                                return version ?? HttpVersion.Version11;
index e9a7ab8de0a4c6b1d5e768c1f05602f8856cf5ab..18d582b00b7d26770021362db9d2c3e79730e7f7 100644 (file)
@@ -223,6 +223,14 @@ namespace MonoTests.System.Net.Http.Headers
                        value.FileName = "\"quoted\"";
                        Assert.AreEqual ("\"quoted\"", value.FileName, "#41");
                        Assert.AreEqual (new NameValueHeaderValue ("filename", "\"quoted\""), value.Parameters.First (), "#42");
+
+                       value.FileName = "~";
+                       Assert.AreEqual ("~", value.FileName, "#51");
+                       Assert.AreEqual (new NameValueHeaderValue ("filename", "~"), value.Parameters.First (), "#52");
+
+                       value.FileName = "\x7f";
+                       Assert.AreEqual ("\"\x7f\"", value.FileName, "#61");
+                       Assert.AreEqual (new NameValueHeaderValue ("filename", "\"\x7f\""), value.Parameters.First (), "#62");
                }
 
                [Test]
@@ -237,8 +245,11 @@ namespace MonoTests.System.Net.Http.Headers
                        value.FileNameStar = "č";
                        Assert.AreEqual ("č", value.FileNameStar, "#11");
                        Assert.AreEqual (new NameValueHeaderValue ("filename*", "utf-8''%C4%8D"), value.Parameters.First (), "#12");
-               }
 
+                       value.FileNameStar = "@x*\\%?.txt";
+                       Assert.AreEqual ("@x*\\%?.txt", value.FileNameStar, "#21");
+                       Assert.AreEqual (new NameValueHeaderValue ("filename*", "utf-8''%40x%2A%5C%25%3F.txt"), value.Parameters.First (), "#22");
+               }
 
                [Test]
                public void Properties_Name ()
index 32cf785a0e9d5ffbdfd042d99926c6edea25c7f9..7de0ccdb2ae9272db825e07d8c8848dcedb98b7a 100644 (file)
@@ -51,6 +51,30 @@ namespace MonoTests.System.Net.Http.Headers
                                Assert.Fail ("#2");
                        } catch (FormatException) {
                        }
+
+                       try {
+                               new NameValueHeaderValue ("\x7f", null);
+                               Assert.Fail ("#3");
+                       } catch (FormatException) {
+                       }
+
+                       try {
+                               new NameValueHeaderValue ("arg", "\x7f");
+                               Assert.Fail ("#4");
+                       } catch (FormatException) {
+                       }
+               }
+
+               [Test]
+               public void Ctor_ValidArguments ()
+               {
+                       NameValueHeaderValue nvh;
+                       
+                       nvh = new NameValueHeaderValue ("arg", "~");
+                       Assert.AreEqual ("~", nvh.Value, "#1");
+                       
+                       nvh = new NameValueHeaderValue ("arg", "\"\x7f\x80\"");
+                       Assert.AreEqual ("\"\x7f\x80\"", nvh.Value, "#2");
                }
 
                [Test]
index 4b07313aafdbe23ee1b3a9658bfbc032c167afb0..eaeb6f6d23b965dad7c3b56087baf51ab3fc106c 100644 (file)
@@ -170,6 +170,35 @@ namespace MonoTests.System.Net.Http
                        client.SendAsync (request).Wait (WaitTimeout);
                }
 
+
+               [Test]
+               public void CancelRequestViaProxy ()
+               {
+                       var handler = new HttpClientHandler {
+                               Proxy = new WebProxy ("192.168.10.25:8888/"), // proxy that doesn't exist
+                               UseProxy = true,
+                               AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+                       };
+
+                       var httpClient = new HttpClient (handler) {
+                               BaseAddress = new Uri ("https://google.com"),
+                               Timeout = TimeSpan.FromSeconds (1)
+                       };
+
+                       try {
+                               var restRequest = new HttpRequestMessage {
+                                       Method = HttpMethod.Post,
+                                       RequestUri = new Uri("foo", UriKind.Relative),
+                                       Content = new StringContent("", null, "application/json")
+                               };
+
+                               httpClient.PostAsync (restRequest.RequestUri, restRequest.Content).Wait (WaitTimeout);
+                               Assert.Fail ("#1");
+                       } catch (AggregateException e) {
+                               Assert.IsTrue (e.InnerException is TaskCanceledException, "#2");
+                       }
+               }
+
                [Test]
                public void Properties ()
                {
index 8b4d6bf394e4e8aa12bdd0842d18d148280b726c..eabc8a05c5da51f242dffbd772c5cdb45a2b62ed 100644 (file)
@@ -99,6 +99,20 @@ namespace MonoTests.System.Net.Http
                        Assert.AreEqual (req.RequestUri, uri);
                }
 
+               [Test]
+               public void Ctor_RelativeOrAbsoluteUri ()
+               {
+                       var uri = new Uri ("/", UriKind.RelativeOrAbsolute);
+                       new HttpRequestMessage (HttpMethod.Get, uri);
+
+                       uri = new Uri ("file://", UriKind.RelativeOrAbsolute);
+                       try {
+                               new HttpRequestMessage (HttpMethod.Get, uri);
+                               Assert.Fail ("#1");
+                       } catch (ArgumentException) {
+                       }
+               }
+
                [Test]
                public void Ctor_RelativeUriString ()
                {
@@ -109,6 +123,18 @@ namespace MonoTests.System.Net.Http
                        Assert.IsFalse (req.RequestUri.IsAbsoluteUri);
                }
 
+               [Test]
+               public void Ctor_RelativeOrAbsoluteUriString ()
+               {
+                       new HttpRequestMessage (HttpMethod.Get, "/");
+
+                       try {
+                               new HttpRequestMessage (HttpMethod.Get, "file://");
+                               Assert.Fail ("#1");
+                       } catch (ArgumentException) {
+                       }
+               }
+
                [Test]
                public void Headers ()
                {
diff --git a/mcs/class/System.Net/System.Net-net_2_0.csproj b/mcs/class/System.Net/System.Net-net_2_0.csproj
deleted file mode 100644 (file)
index bb2ce92..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{ED90CD4E-E958-4E14-B0E4-425CFA3BF661}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\TypeForwarders.cs" />\r
-    <Compile Include="System.Net\IPEndPointCollection.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Net/System.Net-net_4_0.csproj b/mcs/class/System.Net/System.Net-net_4_0.csproj
deleted file mode 100644 (file)
index 511066f..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{018D907D-AF28-4DB2-8D7D-24AB62ED97BC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\TypeForwarders.cs" />\r
-    <Compile Include="System.Net\IPEndPointCollection.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Numerics/System.Numerics-net_4_0.csproj b/mcs/class/System.Numerics/System.Numerics-net_4_0.csproj
deleted file mode 100644 (file)
index a33e8e2..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8602E0AD-B84E-4107-98AD-E62FA8898241}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Numerics</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Numerics\BigInteger.cs" />\r
-    <Compile Include="System.Numerics\Complex.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Numerics/System.Numerics-tests-net_4_0.csproj b/mcs/class/System.Numerics/System.Numerics-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 2a7ba74..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A50F4A28-93AA-42E0-BB98-24F3A48B1AC1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Numerics-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Numerics_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Numerics\BigIntegerTest.cs" />\r
-    <Compile Include="Test\System.Numerics\ComplexTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Numerics\System.Numerics-net_4_0.csproj">\r
-      <Project>{8602E0AD-B84E-4107-98AD-E62FA8898241}</Project>\r
-      <Name>System.Numerics\System.Numerics-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_0.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_0.csproj
deleted file mode 100644 (file)
index b4d328e..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\InternalsVisibleTo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\NamespaceDocs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Observable.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Observer.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousSafeObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\AsyncLock.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CatchScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CurrentThreadScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DefaultScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DisableOptimizationsScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ImmediateScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.TimerQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ScheduledItem.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Async.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Recursive.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.Emulation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Simple.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Wrappers.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerDefaults.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerOperation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerWrapper.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Stopwatch.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.ObserveOn.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.Synchronize.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SynchronizationContextScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\AnonymousDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\BooleanDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\CancellationDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\CompositeDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\ContextDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\DefaultDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\Disposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\MultipleAssignmentDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\RefCountDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\ScheduledDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\SerialDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\SingleAssignmentDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\AsyncLockObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\AutoDetachObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\CheckedObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentDictionary.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\HostLifecycleService.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ImmutableList.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Lazy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Observers.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\PlatformEnlightenmentProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\PriorityQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Producer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SafeObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ScheduledObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Semaphore.Silverlight.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Semaphore.Xna.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Sink.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Stubs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizationContextExtensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizedObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Notification.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObservableBase.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObserverBase.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Unit.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Strings_Core.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Core.resources">\r
-      <LogicalName>System.Reactive.Strings_Core.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_0.csproj b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_0.csproj
deleted file mode 100644 (file)
index 896779e..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6129EE9A-2C68-48E2-AB4A-221B428F9AF8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Debugger</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_0.csproj b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_0.csproj
deleted file mode 100644 (file)
index 73a3e22..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FFBDFAF9-2ADD-49DE-8DC4-CB3F47B728AB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Experimental</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\ExperimentalAttribute.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\InternalsVisibleTo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Internal\BinaryObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\IQueryLanguageEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\ObservableEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.Generated.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QueryLanguageEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\ListObservable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_0.csproj b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_0.csproj
deleted file mode 100644 (file)
index 483b087..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Interfaces</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\AssemblyFileVersionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\DateTimeOffset.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\IObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\IObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\NamespaceDocs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IScheduledItem.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerLongRunning.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerPeriodic.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatch.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatchProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Disposables\ICancelable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventPattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventPatternSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IObserver.Result.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IGroupedObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservableProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\IConnectableObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_0.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_0.csproj
deleted file mode 100644 (file)
index 986dcd5..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\InternalsVisibleTo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\NamespaceDocs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\HistoricalScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSourceBase.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\AnonymousEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\BinaryObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\ConcatSink.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Either.Generic.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\HashSet.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Helpers.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\IConcatenatable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\IEvaluatableObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Lookup.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\PushPullAdapter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\QueryServices.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\ReflectionUtils.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\TailRecursiveSink.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\ActivePlan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\JoinObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\Pattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\Plan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\GroupedObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\IQueryLanguage.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\LocalQueryMethodImplementationTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Aggregates.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Async.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Awaiter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Binding.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Blocking.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Concurrency.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Conversions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Creation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Events.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Imperative.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Joins.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Multiple.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Single.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.StandardSequenceOperators.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Time.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\_.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\AddRef.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Aggregate.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\All.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Amb.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Any.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\AsObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Average.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Buffer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Case.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Cast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Catch.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Collect.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\CombineLatest.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Concat.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Contains.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Count.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DefaultIfEmpty.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Defer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Delay.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DelaySubscription.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Dematerialize.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Distinct.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DistinctUntilChanged.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Do.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DoWhile.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ElementAt.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Empty.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Finally.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FirstAsync.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\For.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ForEach.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FromEvent.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FromEventPattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Generate.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GetEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupBy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupByUntil.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupJoin.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\If.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\IgnoreElements.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\IsEmpty.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Join.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\LastAsync.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Latest.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\LongCount.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Materialize.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Max.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MaxBy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Merge.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Min.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MinBy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MostRecent.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Multicast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Never.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Next.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\OfType.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\OnErrorResumeNext.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\PushToPullAdapter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Range.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\RefCount.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Repeat.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Return.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Sample.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Scan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Select.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SelectMany.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SequenceEqual.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SingleAsync.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Skip.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipLast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipUntil.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipWhile.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Sum.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Switch.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Take.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeLast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeLastBuffer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeUntil.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeWhile.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Throttle.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Throw.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TimeInterval.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timeout.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timestamp.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToArray.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToDictionary.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToList.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToLookup.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Using.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Where.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\While.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Window.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Zip.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable_.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Aggregates.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Async.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Awaiter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Binding.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Blocking.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Concurrency.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Conversions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Creation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Events.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Imperative.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Joins.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Multiple.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Single.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.StandardSequenceOperators.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Time.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage_.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\AsyncSubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\BehaviorSubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ConnectableObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ReplaySubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\NamespaceDoc.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\TaskObservableExtensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\TimeInterval.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Timestamped.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Strings_Linq.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Linq.resources">\r
-      <LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_0.csproj b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_0.csproj
deleted file mode 100644 (file)
index 5b14946..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{18FF6BCF-7B16-441D-B1BB-9575C9E2F8FF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Observable.Aliases</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Observable.Aliases\Observable.Aliases.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Observable.Aliases\Qbservable.Aliases.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Providers\System.Reactive.Providers-net_4_0.csproj">\r
-      <Project>{71582426-D334-4886-99B0-E947026EFDE3}</Project>\r
-      <Name>System.Reactive.Providers\System.Reactive.Providers-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_0.csproj b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_0.csproj
deleted file mode 100644 (file)
index c06c855..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B1F716D6-ED54-4B1C-9B8C-4C046FC7E84F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.PlatformServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NO_TASK_DELAY;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NO_TASK_DELAY;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.Windows.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\EventLoopScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\NewThreadScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\TaskPoolScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\Thread.Stub.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.Windows.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\EnlightenmentProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\ExceptionServicesImpl.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.Windows.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.WindowsPhone.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\PhoneShellThunks.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\PlatformEnlightenmentProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\StopwatchImpl.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\Stubs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_PlatformServices.resources">\r
-      <LogicalName>System.Reactive.Strings_PlatformServices.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_0.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_0.csproj
deleted file mode 100644 (file)
index 2c3d883..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{71582426-D334-4886-99B0-E947026EFDE3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Providers</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePlan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\ExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Observable.Queryable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Generated.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Joins.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\ObservableQuery.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Strings_Providers.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Providers.resources">\r
-      <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_0.csproj b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_0.csproj
deleted file mode 100644 (file)
index e35fad8..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E3E58191-8C65-486C-B93C-0C1F4A16CB29}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Runtime.Remoting</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\Observable.Remoting.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\QueryLanguage.Remoting.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_0.csproj b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_0.csproj
deleted file mode 100644 (file)
index b40941a..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A43E708A-8514-40E6-A45F-2E53D82D1FDD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Windows.Forms</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Reactive\Concurrency\ControlScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Reactive\Linq\ControlObservable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_0.csproj b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_0.csproj
deleted file mode 100644 (file)
index 8e59f0f..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5655F065-7D2A-41DD-9A91-462D5CD09B69}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Windows.Threading</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Concurrency\CoreDispatcherScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Concurrency\DispatcherScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Linq\CoreDispatcherObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Linq\DispatcherObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Strings_WindowsThreading.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">\r
-      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">\r
-      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">\r
-      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_4_0.csproj">\r
-      <Project>{166B91FA-332C-48D9-9A0E-EF02794507BC}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_WindowsThreading.resources">\r
-      <LogicalName>System.Reactive.Strings_WindowsThreading.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_0.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_0.csproj
deleted file mode 100644 (file)
index 793a6fb..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2AB7F86E-1FE4-49E0-B570-47AB8BD5AF7F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Caching</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Caching.Configuration\CachingSectionGroup.cs" />\r
-    <Compile Include="System.Runtime.Caching.Configuration\MemoryCacheElement.cs" />\r
-    <Compile Include="System.Runtime.Caching.Configuration\MemoryCacheSection.cs" />\r
-    <Compile Include="System.Runtime.Caching.Configuration\MemoryCacheSettingsCollection.cs" />\r
-    <Compile Include="System.Runtime.Caching.Hosting\IApplicationIdentifier.cs" />\r
-    <Compile Include="System.Runtime.Caching.Hosting\IFileChangeNotificationSystem.cs" />\r
-    <Compile Include="System.Runtime.Caching.Hosting\IMemoryCacheManager.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheEntryChangeMonitor.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheEntryRemovedArguments.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheEntryRemovedCallback.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheEntryRemovedReason.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheEntryUpdateArguments.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheEntryUpdateCallback.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheItem.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheItemPolicy.cs" />\r
-    <Compile Include="System.Runtime.Caching\CacheItemPriority.cs" />\r
-    <Compile Include="System.Runtime.Caching\ChangeMonitor.cs" />\r
-    <Compile Include="System.Runtime.Caching\DefaultCacheCapabilities.cs" />\r
-    <Compile Include="System.Runtime.Caching\FileChangeMonitor.cs" />\r
-    <Compile Include="System.Runtime.Caching\FileChangeNotificationSystem.cs" />\r
-    <Compile Include="System.Runtime.Caching\FileChangeNotificationSystemEntry.cs" />\r
-    <Compile Include="System.Runtime.Caching\Helpers.cs" />\r
-    <Compile Include="System.Runtime.Caching\HostFileChangeMonitor.cs" />\r
-    <Compile Include="System.Runtime.Caching\MemoryCache.cs" />\r
-    <Compile Include="System.Runtime.Caching\MemoryCacheContainer.cs" />\r
-    <Compile Include="System.Runtime.Caching\MemoryCacheEntry.cs" />\r
-    <Compile Include="System.Runtime.Caching\MemoryCacheEntryChangeMonitor.cs" />\r
-    <Compile Include="System.Runtime.Caching\MemoryCacheEntryPriorityQueue.cs" />\r
-    <Compile Include="System.Runtime.Caching\MemoryCacheLRU.cs" />\r
-    <Compile Include="System.Runtime.Caching\MemoryCachePerformanceCounters.cs" />\r
-    <Compile Include="System.Runtime.Caching\ObjectCache.cs" />\r
-    <Compile Include="System.Runtime.Caching\OnChangedCallback.cs" />\r
-    <Compile Include="System.Runtime.Caching\SqlChangeMonitor.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-tests-net_4_0.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-tests-net_4_0.csproj
deleted file mode 100644 (file)
index a8f4d29..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B55E3A62-3217-40C4-BAE8-2F9FED3BA866}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Caching-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Caching_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Common\AppDomainTools.cs" />\r
-    <Compile Include="Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Common\PokerChangeMonitor.cs" />\r
-    <Compile Include="Test\Common\PokerMemoryCache.cs" />\r
-    <Compile Include="Test\Common\PokerObjectCache.cs" />\r
-    <Compile Include="Test\Common\TestNotificationSystem.cs" />\r
-    <Compile Include="Test\System.Runtime.Caching\HostFileChangeMonitorTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Caching\MemoryCacheTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Caching\ObjectCacheTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Caching\System.Runtime.Caching-net_4_0.csproj">\r
-      <Project>{2AB7F86E-1FE4-49E0-B570-47AB8BD5AF7F}</Project>\r
-      <Name>System.Runtime.Caching\System.Runtime.Caching-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_0.csproj b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_0.csproj
deleted file mode 100644 (file)
index 37bed59..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{04A5721F-57CC-4C31-AE47-65A6386A5127}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.DurableInstancing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\AllEnums.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\AllExceptions.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceHandle.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceKey.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceKeyView.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceLockQueryResult.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceOwner.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceOwnerQueryResult.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstancePersistenceCommand.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstancePersistenceContext.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstancePersistenceEvent.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceStore.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceStoreQueryResult.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceValue.cs" />\r
-    <Compile Include="System.Runtime.DurableInstancing\InstanceView.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_0.csproj">\r
-      <Project>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-tests-net_4_0.csproj b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 3888554..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E01DEF6B-A8DD-49FB-B33D-F570CC99DF51}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.DurableInstancing-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.DurableInstancing_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.DurableInstancing\InstancePersistenceEventTest.cs" />\r
-    <Compile Include="Test\System.Runtime.DurableInstancing\InstanceValueTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.DurableInstancing\System.Runtime.DurableInstancing-net_4_0.csproj">\r
-      <Project>{04A5721F-57CC-4C31-AE47-65A6386A5127}</Project>\r
-      <Name>System.Runtime.DurableInstancing\System.Runtime.DurableInstancing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_0.csproj">\r
-      <Project>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_2_0.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_2_0.csproj
deleted file mode 100644 (file)
index bcb638c..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{14C27158-5E50-403C-96D6-79FFF1F52889}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Remoting</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\AggregateDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientTransportSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpRemotingHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpRemotingHandlerFactory.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpServerTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\RemotingHttpListener.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\UnixChannelLoader.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcChannelHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcTransport.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeClient.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeListener.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeSocket.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeStream.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientTransportSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpConnectionPool.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpMessageIO.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpServerTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryServerFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\CommonTransportKeys.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IAuthorizeRemotingConnection.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\RemotingThreadPool.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapMessageFormatter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapServerFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SocketCachePolicy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaData.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataCodeGenerator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataExporter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlType.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\ServiceType.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSGeneratorException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSParserException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\RemotingClientProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\RemotingService.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_0.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_0.csproj
deleted file mode 100644 (file)
index ee43118..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E8EE34D7-A86B-4569-8C5D-4DB8D3E2EF54}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Remoting</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\AggregateDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientTransportSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpRemotingHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpRemotingHandlerFactory.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpServerTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\RemotingHttpListener.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\UnixChannelLoader.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcChannelHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcTransport.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeClient.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeListener.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeSocket.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeStream.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientTransportSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpConnectionPool.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpMessageIO.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpServerTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryServerFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\CommonTransportKeys.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IAuthorizeRemotingConnection.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\RemotingThreadPool.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapMessageFormatter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapServerFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SocketCachePolicy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaData.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataCodeGenerator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataExporter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlType.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\ServiceType.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSGeneratorException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSParserException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\RemotingClientProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\RemotingService.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_2_0.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_2_0.csproj
deleted file mode 100644 (file)
index a7e43f6..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A84DDEFD-D504-4F33-A353-8BB852CF778E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Remoting-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Remoting_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\ActivationTests.cs" />\r
-    <Compile Include="Test\AsyncCalls.cs" />\r
-    <Compile Include="Test\BaseCalls.cs" />\r
-    <Compile Include="Test\CallSeq.cs" />\r
-    <Compile Include="Test\ContextHookAttribute.cs" />\r
-    <Compile Include="Test\ContextsTest.cs" />\r
-    <Compile Include="Test\CrossDomainCalls.cs" />\r
-    <Compile Include="Test\DelegateCalls.cs" />\r
-    <Compile Include="Test\GenericTest.cs" />\r
-    <Compile Include="Test\HttpBugTests.cs" />\r
-    <Compile Include="Test\HttpCalls.cs" />\r
-    <Compile Include="Test\HttpServerChannelTests.cs" />\r
-    <Compile Include="Test\IpcCalls.cs" />\r
-    <Compile Include="Test\IpcChannelTest.cs" />\r
-    <Compile Include="Test\ReflectionCalls.cs" />\r
-    <Compile Include="Test\RemotingServicesTest.cs" />\r
-    <Compile Include="Test\ServerObject.cs" />\r
-    <Compile Include="Test\SyncCalls.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Channels.Tcp\TcpChannelTest.cs" />\r
-    <Compile Include="Test\TcpCalls.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Remoting\System.Runtime.Remoting-net_2_0.csproj">\r
-      <Project>{14C27158-5E50-403C-96D6-79FFF1F52889}</Project>\r
-      <Name>System.Runtime.Remoting\System.Runtime.Remoting-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Remoting\System.Runtime.Remoting-net_2_0.csproj">\r
-      <Project>{14C27158-5E50-403C-96D6-79FFF1F52889}</Project>\r
-      <Name>System.Runtime.Remoting\System.Runtime.Remoting-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_4_0.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 16eeea1..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{63A1C1C9-008F-42CB-8E72-5C92ACC6FAC3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Remoting-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Remoting_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\ActivationTests.cs" />\r
-    <Compile Include="Test\AsyncCalls.cs" />\r
-    <Compile Include="Test\BaseCalls.cs" />\r
-    <Compile Include="Test\CallSeq.cs" />\r
-    <Compile Include="Test\ContextHookAttribute.cs" />\r
-    <Compile Include="Test\ContextsTest.cs" />\r
-    <Compile Include="Test\CrossDomainCalls.cs" />\r
-    <Compile Include="Test\DelegateCalls.cs" />\r
-    <Compile Include="Test\GenericTest.cs" />\r
-    <Compile Include="Test\HttpBugTests.cs" />\r
-    <Compile Include="Test\HttpCalls.cs" />\r
-    <Compile Include="Test\HttpServerChannelTests.cs" />\r
-    <Compile Include="Test\IpcCalls.cs" />\r
-    <Compile Include="Test\IpcChannelTest.cs" />\r
-    <Compile Include="Test\ReflectionCalls.cs" />\r
-    <Compile Include="Test\RemotingServicesTest.cs" />\r
-    <Compile Include="Test\ServerObject.cs" />\r
-    <Compile Include="Test\SyncCalls.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Channels.Tcp\TcpChannelTest.cs" />\r
-    <Compile Include="Test\TcpCalls.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Remoting\System.Runtime.Remoting-net_4_0.csproj">\r
-      <Project>{E8EE34D7-A86B-4569-8C5D-4DB8D3E2EF54}</Project>\r
-      <Name>System.Runtime.Remoting\System.Runtime.Remoting-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Remoting\System.Runtime.Remoting-net_4_0.csproj">\r
-      <Project>{E8EE34D7-A86B-4569-8C5D-4DB8D3E2EF54}</Project>\r
-      <Name>System.Runtime.Remoting\System.Runtime.Remoting-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj
deleted file mode 100644 (file)
index f8a99aa..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Formatters.Soap</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapTypeMapper.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj
deleted file mode 100644 (file)
index c7b7c9f..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Formatters.Soap</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapTypeMapper.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_2_0.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 0aa1b8f..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2F358FB0-9083-439D-B246-971F40EF4644}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Serialization.Formatters.Soap-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Formatters.Soap_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AssemblyInfo.cs" />\r
-    <Compile Include="Test\InternalSoapValuesTest.cs" />\r
-    <Compile Include="Test\SerializationCallbackTest.cs" />\r
-    <Compile Include="Test\SerializationTest.cs" />\r
-    <Compile Include="Test\SoapFormatterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_4_0.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 2e2196a..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C7870309-E30C-437F-A496-92FAE16CA198}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Serialization.Formatters.Soap-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Formatters.Soap_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AssemblyInfo.cs" />\r
-    <Compile Include="Test\InternalSoapValuesTest.cs" />\r
-    <Compile Include="Test\SerializationCallbackTest.cs" />\r
-    <Compile Include="Test\SerializationTest.cs" />\r
-    <Compile Include="Test\SoapFormatterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_2_0.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_2_0.csproj
deleted file mode 100644 (file)
index f27edaa..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\DataContractSerializerSection.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\DeclaredTypeElement.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\DeclaredTypeElementCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\ParameterElement.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\ParameterElementCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\TypeElement.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\TypeElementCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization\CollectionDataContractAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ContractNamespaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataContractAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataContractResolver.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataContractSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataMemberAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\EnumMemberAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ExportOptions.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ExtensionDataObject.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IDataContractSurrogate.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IExtensibleDataObject.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IgnoreDataMemberAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ImportOptions.cs" />\r
-    <Compile Include="System.Runtime.Serialization\InvalidDataContractException.cs" />\r
-    <Compile Include="System.Runtime.Serialization\KnownTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\KnownTypeCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization\NetDataContractSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationMap.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationMap.XsdExporter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlFormatterDeserializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlFormatterSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlObjectSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlSerializableServices.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XsdDataContractExporter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XsdDataContractImporter.cs" />\r
-    <Compile Include="System.Xml\IFragmentCapableXmlDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\IStreamProvider.cs" />\r
-    <Compile Include="System.Xml\IXmlBinaryReaderInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlBinaryWriterInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlDictionary.cs" />\r
-    <Compile Include="System.Xml\IXmlMtomReaderInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlMtomWriterInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlUTF8ReaderInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlUTF8WriterInitializer.cs" />\r
-    <Compile Include="System.Xml\OnXmlDictionaryReaderClose.cs" />\r
-    <Compile Include="System.Xml\UniqueId.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryDictionaryWriterAutoGen.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryFormat.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryReaderSession.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryWriterSession.cs" />\r
-    <Compile Include="System.Xml\XmlC14NWriter.cs" />\r
-    <Compile Include="System.Xml\XmlCanonicalWriter.cs" />\r
-    <Compile Include="System.Xml\XmlDictionary.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryReaderAutoGen.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryReaderQuotas.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryString.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryWriterAutoGen.cs" />\r
-    <Compile Include="System.Xml\XmlMtomDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlMtomDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\XmlSimpleDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlSimpleDictionaryWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/mstypes.schema">\r
-      <LogicalName>mstypes.schema</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_0.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_0.csproj
deleted file mode 100644 (file)
index 421f6a2..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{28265916-A48E-4A4D-A845-2F1C06027D68}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\DataContractJsonSerializer.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\IXmlJsonReaderInitializer.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\IXmlJsonWriterInitializer.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JsonReader.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JsonReaderWriterFactory.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JsonSerializationReader.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JsonSerializationWriter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JsonWriter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\TypeMap.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\DataContractSerializerSection.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\DeclaredTypeElement.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\DeclaredTypeElementCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\ParameterElement.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\ParameterElementCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\TypeElement.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Configuration\TypeElementCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization\CollectionDataContractAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ContractNamespaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataContractAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataContractResolver.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataContractSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\DataMemberAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\EnumMemberAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ExportOptions.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ExtensionDataObject.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IDataContractSurrogate.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IExtensibleDataObject.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IgnoreDataMemberAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ImportOptions.cs" />\r
-    <Compile Include="System.Runtime.Serialization\InvalidDataContractException.cs" />\r
-    <Compile Include="System.Runtime.Serialization\KnownTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\KnownTypeCollection.cs" />\r
-    <Compile Include="System.Runtime.Serialization\NetDataContractSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationMap.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationMap.XsdExporter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlFormatterDeserializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlFormatterSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlObjectSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XmlSerializableServices.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XsdDataContractExporter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\XsdDataContractImporter.cs" />\r
-    <Compile Include="System.Xml\IFragmentCapableXmlDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\IStreamProvider.cs" />\r
-    <Compile Include="System.Xml\IXmlBinaryReaderInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlBinaryWriterInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlDictionary.cs" />\r
-    <Compile Include="System.Xml\IXmlMtomReaderInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlMtomWriterInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlUTF8ReaderInitializer.cs" />\r
-    <Compile Include="System.Xml\IXmlUTF8WriterInitializer.cs" />\r
-    <Compile Include="System.Xml\OnXmlDictionaryReaderClose.cs" />\r
-    <Compile Include="System.Xml\UniqueId.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryDictionaryWriterAutoGen.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryFormat.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryReaderSession.cs" />\r
-    <Compile Include="System.Xml\XmlBinaryWriterSession.cs" />\r
-    <Compile Include="System.Xml\XmlC14NWriter.cs" />\r
-    <Compile Include="System.Xml\XmlCanonicalWriter.cs" />\r
-    <Compile Include="System.Xml\XmlDictionary.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryReaderAutoGen.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryReaderQuotas.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryString.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\XmlDictionaryWriterAutoGen.cs" />\r
-    <Compile Include="System.Xml\XmlMtomDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlMtomDictionaryWriter.cs" />\r
-    <Compile Include="System.Xml\XmlSimpleDictionaryReader.cs" />\r
-    <Compile Include="System.Xml\XmlSimpleDictionaryWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/mstypes.schema">\r
-      <LogicalName>mstypes.schema</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_2_0.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 2f95199..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2F43A5EC-AB47-4075-831F-D0681E7CA07B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Serialization-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.Serialization\AttributesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug242Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug2843Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug3258Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug666333Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug675144Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug695203Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\CollectionSerialization.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractResolverTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_DuplicateQName.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_InvalidCharacters.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_NullableWithDictionary.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\KnownTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\WsdlHelper.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XmlObjectSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractExporterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractExporterTest2.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractImporterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractImporterTest2.cs" />\r
-    <Compile Include="Test\System.Xml\UniqueIdTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryDictionaryReaderTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryWriterSessionTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryReaderAbstractTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryReaderQuotasTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryStringTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlMtomDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSimpleDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\XmlComparer.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.ServiceModel.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.ServiceModel.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/mstypes.schema">\r
-      <LogicalName>mstypes.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/Resources/WSDL/collections.wsdl">\r
-      <LogicalName>collections.wsdl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/Resources/WSDL/custom-collections.wsdl">\r
-      <LogicalName>custom-collections.wsdl</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_4_0.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_4_0.csproj
deleted file mode 100644 (file)
index f52d670..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DA14FBBE-12B0-4CFC-AECC-5DAD4C79F679}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Serialization-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.Serialization\AttributesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug242Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug2843Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug3258Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug666333Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug675144Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug695203Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\CollectionSerialization.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractResolverTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_DuplicateQName.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_InvalidCharacters.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_NullableWithDictionary.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\KnownTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\WsdlHelper.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XmlObjectSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractExporterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractExporterTest2.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractImporterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractImporterTest2.cs" />\r
-    <Compile Include="Test\System.Xml\UniqueIdTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryDictionaryReaderTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryWriterSessionTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryReaderAbstractTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryReaderQuotasTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryStringTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlMtomDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSimpleDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\XmlComparer.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_0.csproj">\r
-      <Project>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/mstypes.schema">\r
-      <LogicalName>mstypes.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/Resources/WSDL/collections.wsdl">\r
-      <LogicalName>collections.wsdl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/Resources/WSDL/custom-collections.wsdl">\r
-      <LogicalName>custom-collections.wsdl</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 8c0eb2c4d92f90398cb6030edabce8a0d057bb93..4b439f382ceea160ee6b525bee0dd3a0fd0f02cd 100644 (file)
@@ -996,6 +996,10 @@ namespace System.Runtime.Serialization
                                string s = null;
                                foreach (EnumMemberInfo emi in enum_members) {
                                        long f = Convert.ToInt64 (emi.Value);
+                                       if (f == val) {
+                                               s = emi.XmlName;
+                                               break;
+                                       }
                                        if ((f & val) == f)
                                                s += (s != null ? " " : String.Empty) + emi.XmlName;
                                }
index 91fe958e0bf2d343721a2408e2a4028437845121..ada461fe2b8610290a5e9ef17a4170552cfd21e9 100644 (file)
@@ -92,6 +92,35 @@ namespace MonoTests.System.Runtime.Serialization
                         var ser = new DataContractSerializer(typeof(MyObject));
                        ser.ReadObject (XmlReader.Create(new StringReader(s)));
                }
-               
+
+               [Flags ()]
+               [Serializable]
+               public enum FlagsEnum
+               {
+                       None = 0,
+                       Flag1 = 0x10,
+                       Flag2 = 0x20,
+                       All = 0xffff,
+               };
+
+               [Serializable]
+               public class ClassWithFlagsEnum
+               {
+                       public FlagsEnum Flags = FlagsEnum.All;
+               }
+
+               // Bug #21072
+               [Test]
+               public void FlagsEnumTest ()
+               {
+                       var ser = new DataContractSerializer (typeof (ClassWithFlagsEnum));
+
+                       using (var m = new MemoryStream ()) {
+                               ser.WriteObject (m, new ClassWithFlagsEnum ());
+                               var data = m.ToArray ();
+                               var s = Encoding.UTF8.GetString (data, 0, (int) data.Length);
+                               Assert.IsTrue (s.Contains ("<Flags>All</Flags>"));
+                       }
+               }
        }
 }
index c57de5341cc92701599ec3f6be12546631e5fe4f..752a5f3f82b2a6efa84b57d1f7c3bc224b07efc2 100644 (file)
@@ -12,7 +12,7 @@ LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir)
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:168,169,183,219,414,1595
 
-VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter moonlight_raw net_4_0 net_4_5, $(PROFILE))
 
 EXTRA_DISTFILES = \
        Test/System.Security.Cryptography.Xml/sample.pfx \
diff --git a/mcs/class/System.Security/System.Security-net_2_0.csproj b/mcs/class/System.Security/System.Security-net_2_0.csproj
deleted file mode 100644 (file)
index 7e31b44..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{879EA17D-67A5-44ED-B912-1BE4883356FE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Security</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\ManagedProtection.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\NativeDapiProtection.cs" />\r
-    <Compile Include="Mono.Xml\XmlCanonicalizer.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\AlgorithmIdentifier.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipient.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipientCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipientEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsSigner.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\ContentInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\EnvelopedCms.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeKeyChoice.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeRecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyTransRecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9Attribute.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9ContentType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9DocumentDescription.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9DocumentName.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9MessageDigest.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9SigningTime.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\PublicKeyInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignedCms.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfoCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfoEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifier.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierOrKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierOrKeyType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2UI.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SelectionFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\CipherData.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\CipherReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DataObject.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DataReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DSAKeyValue.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedData.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedXml.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionProperties.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionProperty.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\IRelDecryptor.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoClause.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoEncryptedKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoName.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoNode.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoRetrievalMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoX509Data.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Manifest.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Reference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\ReferenceList.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\RSAKeyValue.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Signature.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SignedInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SignedXml.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SymmetricKeyWrap.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\TransformChain.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\X509IssuerSerial.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDecryptionTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigBase64Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigC14NTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigC14NWithCommentsTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigEnvelopedSignatureTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigExcC14NTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigExcC14NWithCommentsTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigNodeList.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigXPathTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigXsltTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlEncryption.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlLicenseTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlSignature.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlSignatureStreamReader.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttribute.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttributeCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttributeEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\DataProtectionScope.cs" />\r
-    <Compile Include="System.Security.Cryptography\MemoryProtectionScope.cs" />\r
-    <Compile Include="System.Security.Cryptography\ProtectedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\ProtectedMemory.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-1.csproj">\r
-      <Project>{5A1ED72C-ADAB-4396-AB03-D0E26AA91E90}</Project>\r
-      <Name>System\System-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0.csproj">\r
-      <Project>{E89F34AB-7AE2-41CA-B891-C8D1C9F02EB8}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Security/System.Security-net_4_0.csproj b/mcs/class/System.Security/System.Security-net_4_0.csproj
deleted file mode 100644 (file)
index 94f7829..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E15F571E-B653-4409-AF7C-F478DA81B959}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Security</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\ManagedProtection.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\NativeDapiProtection.cs" />\r
-    <Compile Include="Mono.Xml\XmlCanonicalizer.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\AlgorithmIdentifier.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipient.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipientCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipientEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsSigner.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\ContentInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\EnvelopedCms.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeKeyChoice.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeRecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyTransRecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9Attribute.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9ContentType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9DocumentDescription.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9DocumentName.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9MessageDigest.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9SigningTime.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\PublicKeyInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignedCms.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfoCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfoEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifier.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierOrKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierOrKeyType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2UI.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SelectionFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\CipherData.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\CipherReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DataObject.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DataReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DSAKeyValue.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedData.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedXml.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionProperties.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionProperty.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\IRelDecryptor.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoClause.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoEncryptedKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoName.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoNode.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoRetrievalMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoX509Data.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Manifest.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Reference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\ReferenceList.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\RSAKeyValue.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Signature.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SignedInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SignedXml.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SymmetricKeyWrap.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\TransformChain.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\X509IssuerSerial.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDecryptionTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigBase64Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigC14NTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigC14NWithCommentsTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigEnvelopedSignatureTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigExcC14NTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigExcC14NWithCommentsTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigNodeList.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigXPathTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigXsltTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlEncryption.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlLicenseTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlSignature.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlSignatureStreamReader.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttribute.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttributeCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttributeEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\DataProtectionScope.cs" />\r
-    <Compile Include="System.Security.Cryptography\MemoryProtectionScope.cs" />\r
-    <Compile Include="System.Security.Cryptography\ProtectedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\ProtectedMemory.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-1.csproj">\r
-      <Project>{C8452C42-726B-4C74-A086-00AFBC162B9A}</Project>\r
-      <Name>System\System-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0.csproj">\r
-      <Project>{86DD6F16-A480-4248-AE96-301B2F973CD7}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Security/System.Security-tests-net_2_0.csproj b/mcs/class/System.Security/System.Security-tests-net_2_0.csproj
deleted file mode 100644 (file)
index e27eff0..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9E4A512E-2ABA-477E-892D-FC0B58881339}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <OutputPath>bin\Debug\System.Security-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Security_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\AlgorithmIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsRecipientCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsRecipientTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsSignerTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\ContentInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\EnvelopedCmsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\KeyTransRecipientInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9AttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9ContentTypeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9DocumentDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9DocumentNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9MessageDigestTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9SigningTimeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkits_4_01_SignatureVerification.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\PkitsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignedCmsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignerInfoCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignerInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SubjectIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2UICas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2UITest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\AssertCrypto.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DataObjectTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DataReferenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DSAKeyValueTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\EncryptedXmlTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoNodeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoRetrievalMethodTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoX509DataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\ReferenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\RSAKeyValueTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignatureTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignedInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignedXmlTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\TransformChainTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDecryptionTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigBase64TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigC14NTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigC14NWithCommentsTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigEnvelopedSignatureTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigExcC14NTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigExcC14NWithCommentsTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigXPathTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigXsltTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlLicenseTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCollectionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectEnumeratorCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedDataCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedDataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedMemoryCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedMemoryTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\DataProtectionPermissionAttributeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-1.csproj">\r
-      <Project>{5A1ED72C-ADAB-4396-AB03-D0E26AA91E90}</Project>\r
-      <Name>System\System-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0.csproj">\r
-      <Project>{E89F34AB-7AE2-41CA-B891-C8D1C9F02EB8}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Security/System.Security-tests-net_4_0.csproj b/mcs/class/System.Security/System.Security-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 1ad029a..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C3A1EAFF-3F38-4F9C-AE12-DB78331C14C6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <OutputPath>bin\Debug\System.Security-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Security_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\AlgorithmIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsRecipientCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsRecipientTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsSignerTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\ContentInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\EnvelopedCmsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\KeyTransRecipientInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9AttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9ContentTypeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9DocumentDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9DocumentNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9MessageDigestTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9SigningTimeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkits_4_01_SignatureVerification.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\PkitsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignedCmsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignerInfoCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignerInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SubjectIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2UICas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2UITest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\AssertCrypto.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DataObjectTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DataReferenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DSAKeyValueTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\EncryptedXmlTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoNodeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoRetrievalMethodTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoX509DataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\ReferenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\RSAKeyValueTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignatureTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignedInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignedXmlTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\TransformChainTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDecryptionTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigBase64TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigC14NTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigC14NWithCommentsTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigEnvelopedSignatureTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigExcC14NTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigExcC14NWithCommentsTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigXPathTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigXsltTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlLicenseTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCollectionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectEnumeratorCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedDataCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedDataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedMemoryCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedMemoryTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\DataProtectionPermissionAttributeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-1.csproj">\r
-      <Project>{C8452C42-726B-4C74-A086-00AFBC162B9A}</Project>\r
-      <Name>System\System-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0.csproj">\r
-      <Project>{86DD6F16-A480-4248-AE96-301B2F973CD7}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_0.csproj b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_0.csproj
deleted file mode 100644 (file)
index 1ae0ce7..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1C9B4EFC-57D5-4DEE-9D2F-0B505824623F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Activation</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.ServiceModel\System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="..\System.ServiceModel\System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0.csproj">\r
-      <Project>{49578558-7849-4977-B029-8ECFA79C79E8}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_0.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_0.csproj
deleted file mode 100644 (file)
index 8e5987a..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7D4BD161-BAD2-461D-80F3-D7E6A6CC584A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Discovery</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DiscoveryChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\EndpointDiscoveryElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\FindCriteriaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ServiceDiscoveryElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpTransportSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\AnnouncementClient11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryMessageSequence11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryProxyClient11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryTargetClient11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\EndpointDiscoveryMetadata11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\FindCriteria11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\IAnnouncementContract11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryProxyContract11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryTargetContract11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\MessageContracts11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\ResolveCriteria11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\AnnouncementClientApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryMessageSequenceApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryProxyClientApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryTargetClientApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\EndpointDiscoveryMetadataApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\FindCriteriaApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IAnnouncementContractApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryProxyContractApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryTargetContractApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\MessageContractsApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\ResolveCriteriaApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\AnnouncementClientCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryMessageSequenceCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryProxyClientCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryTargetClientCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\EndpointDiscoveryMetadataCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\FindCriteriaCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IAnnouncementContractCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryProxyContractCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryTargetContractCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\MessageContractsCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\ResolveCriteriaCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementClient.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementService.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryClient.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryClientBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointPublisherBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequence.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequenceGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryOperationContextExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryProxy.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryService.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryServiceExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryViaUriBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DynamicEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryMetadata.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindCompletedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindCriteria.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindResponse.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ResolveCompletedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ResolveCriteria.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ResolveResponse.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryMode.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\UdpAnnouncementEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\UdpDiscoveryEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\UdpTransportSettings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_0.csproj">\r
-      <Project>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_0.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 9081829..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FA9958CE-E29E-4E82-AE5E-CB299CB9EE26}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel.Discovery-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Discovery_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementBoundDiscoveryService.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementClientTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementServiceTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\ContractTypes.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryProxyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryServiceTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DynamicEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryMetadataTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\FindCriteriaTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\InspectionBehaviors.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\IntegratedDiscoveryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\MyDiscoveryServiceTypes.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\ServiceDiscoveryBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\UdpAnnouncementEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\UdpDiscoveryEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\UdpTransportTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Discovery\System.ServiceModel.Discovery-net_4_0.csproj">\r
-      <Project>{7D4BD161-BAD2-461D-80F3-D7E6A6CC584A}</Project>\r
-      <Name>System.ServiceModel.Discovery\System.ServiceModel.Discovery-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_0.csproj">\r
-      <Project>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_0.csproj b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_0.csproj
deleted file mode 100644 (file)
index 99ce663..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{971936E9-C270-4F35-B43E-06C1404989B8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Routing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointNameMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\StrictAndMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\BackupEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\BackupEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\BackupListCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterTableCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterTableEntryCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterTableEntryElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterType.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\NamespaceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\NamespaceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\RoutingExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\RoutingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\SoapProcessingExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\IDuplexSessionRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\IRequestReplyRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\ISimplexDatagramRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\ISimplexSessionRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingService.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\SoapProcessingBehavior.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_2_0.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_2_0.csproj
deleted file mode 100644 (file)
index e7314da..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3C6EB10D-5929-4CB4-81F2-7984FCECCDAA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\TypeForwarders.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\DataContractJsonSerializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\IXmlJsonReaderInitializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\IXmlJsonWriterInitializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\JavaScriptObjectDeserializer.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\JavaScriptReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\JsonReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\JsonReaderWriterFactory.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\JsonSerializationReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\JsonSerializationWriter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\JsonWriter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Json\TypeMap.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\WebScriptServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\WebServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebBodyFormatMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebContentFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebContentTypeMapper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEnablingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebHttpBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebHttpEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebScriptEnablingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebScriptEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\JsonQueryStringConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\QueryStringConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\WebMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Atom10FeedFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Atom10FeedFormatter_1.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Atom10ItemFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Atom10ItemFormatter_1.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter_1.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\CategoriesDocument.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\InlineCategoriesDocument.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\ISyndicationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\ReferencedCategoriesDocument.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\ResourceCollectionInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Rss20FeedFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Rss20FeedFormatter_1.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Rss20ItemFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Rss20ItemFormatter_1.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\ServiceDocument.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\ServiceDocumentFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationCategory.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationContent.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationElementExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationElementExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationExtensions.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationFeed.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationFeedFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationItem.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationItemFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationLink.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationPerson.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\SyndicationVersions.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\TextSyndicationContent.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\TextSyndicationContentKind.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\UrlSyndicationContent.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\Workspace.cs" />\r
-    <Compile Include="System.ServiceModel.Syndication\XmlSyndicationContent.cs" />\r
-    <Compile Include="System.ServiceModel.Web\IncomingWebRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\IncomingWebResponseContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\OutgoingWebRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\OutgoingWebResponseContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebAttributeInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebGetAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebInvokeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebMessageBodyStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebMessageFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebOperationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpSecurityMode.cs" />\r
-    <Compile Include="System\UriTemplate.cs" />\r
-    <Compile Include="System\UriTemplateEquivalenceComparer.cs" />\r
-    <Compile Include="System\UriTemplateMatch.cs" />\r
-    <Compile Include="System\UriTemplateMatchException.cs" />\r
-    <Compile Include="System\UriTemplateTable.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions_1.0\System.Web.Extensions_1.0-net_2_0.csproj">\r
-      <Project>{5B5CA61A-0901-40B5-B56A-D0A6E67DDA66}</Project>\r
-      <Name>System.Web.Extensions_1.0\System.Web.Extensions_1.0-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_0.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_0.csproj
deleted file mode 100644 (file)
index 301b929..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3867C3D0-36C4-4CC1-A8E5-5D15631B35D4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\TypeForwarders.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\WebScriptServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\WebServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebBodyFormatMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebContentFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebContentTypeMapper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEnablingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebHttpBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebHttpEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebScriptEnablingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebScriptEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\JsonQueryStringConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\QueryStringConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\WebMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Web\IncomingWebRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\IncomingWebResponseContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\OutgoingWebRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\OutgoingWebResponseContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebAttributeInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebGetAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebInvokeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebMessageBodyStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebMessageFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebOperationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpSecurityMode.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_0.csproj">\r
-      <Project>{3A327AAD-B09D-47E3-A915-C16BFB3F1682}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0.csproj">\r
-      <Project>{1C9B4EFC-57D5-4DEE-9D2F-0B505824623F}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_2_0.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 7750796..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{98478C8A-B3F8-4D4E-9561-BB75C34BABCA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel.Web-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Web_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\DataContractJsonSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\JsonReaderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\JsonWriterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Activation\WebScriptServiceHostFactoryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\WebBodyFormatMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\WebMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\WebHttpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebHttpBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebHttpEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebScriptEnablingBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\JsonQueryStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\QueryStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelectorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Atom10FeedFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Atom10ItemFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Rss20FeedFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Rss20ItemFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\ServiceDocumentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationElementExtensionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationFeedTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationItemTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationLinkTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\TextSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\UrlSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\XmlSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebGetAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebInvokeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebOperationContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebServiceHostTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WebHttpBindingTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateEquivalenceComparerTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateTableTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Web\System.ServiceModel.Web-net_2_0.csproj">\r
-      <Project>{3C6EB10D-5929-4CB4-81F2-7984FCECCDAA}</Project>\r
-      <Name>System.ServiceModel.Web\System.ServiceModel.Web-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions_1.0\System.Web.Extensions_1.0-net_2_0.csproj">\r
-      <Project>{5B5CA61A-0901-40B5-B56A-D0A6E67DDA66}</Project>\r
-      <Name>System.Web.Extensions_1.0\System.Web.Extensions_1.0-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_4_0.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 02aebe1..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E2D71809-71AB-4EA0-B285-EA551854BA18}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel.Web-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Web_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\DataContractJsonSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\JsonReaderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\JsonWriterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Activation\WebScriptServiceHostFactoryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\WebBodyFormatMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\WebMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\WebHttpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebHttpBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebHttpEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebScriptEnablingBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\JsonQueryStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\QueryStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelectorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Atom10FeedFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Atom10ItemFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Rss20FeedFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Rss20ItemFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\ServiceDocumentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationElementExtensionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationFeedTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationItemTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationLinkTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\TextSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\UrlSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\XmlSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebGetAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebInvokeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebOperationContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebServiceHostTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WebHttpBindingTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateEquivalenceComparerTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateTableTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Web\System.ServiceModel.Web-net_4_0.csproj">\r
-      <Project>{3867C3D0-36C4-4CC1-A8E5-5D15631B35D4}</Project>\r
-      <Name>System.ServiceModel.Web\System.ServiceModel.Web-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_0.csproj">\r
-      <Project>{3A327AAD-B09D-47E3-A915-C16BFB3F1682}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0.csproj">\r
-      <Project>{1C9B4EFC-57D5-4DEE-9D2F-0B505824623F}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-net_2_0.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-net_2_0.csproj
deleted file mode 100644 (file)
index f2cd38c..0000000
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAdd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAnd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgument.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgumentReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArithmeticOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayLength.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAssignment.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryComparison.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBuilder.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCast.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeClass.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCustomAttribute.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeDecrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeExpression.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFieldReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFor.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeForeach.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeGenerationHelper.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIf.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIs.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeLiteral.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethod.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethodCall.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeModule.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNew.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNewArray.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNotEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeOr.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeProperty.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodePropertyReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeReturn.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelect.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelfIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeTryBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeUnaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeValueReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableDeclaration.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhen.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhile.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWriter.cs" />\r
-    <Compile Include="Mono.CodeGeneration\Exp.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmTargetInformation.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmVersion.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyedByTypeCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedKeyedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedReadOnlyCollection.cs" />\r
-    <Compile Include="System.IO\PipeException.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\AspNetIntegrationRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\VirtualPathExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListenerEntry.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpContextInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManagerTable.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\PeerDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpBinaryFrameManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\MessageSecurityBindingSupport.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageDecryptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SupportingTokenInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSEncryptedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSecurityMessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSignedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeaderCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressingVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AsymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Binding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BufferManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CachingCompiler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase_1.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelManagerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompilationException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ConnectionOrientedTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ContentType.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CustomBinding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryFailure.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryStatus.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexSessionBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\FaultConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HostedTransportConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HtmlizedException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpResponseMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingDeliveryCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingMulticastCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingRuntimePreferences.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransactedBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransportTokenAssertionProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LocalClientSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Message.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBufferImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFault.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFaultBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaderInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageProperties.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipetransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerCustomResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PnrpPeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PolicyImportHelper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PrivacyNoticeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RemoteEndpointMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ServiceHostParser.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StandardBindingImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandlerFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UnderstoodHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UseManagedPresentationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WindowsStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlObjectSerializerBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlReaderBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.ComIntegration\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AddressHeaderCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthenticationMode.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpMessageSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BinaryMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingElementExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateReferenceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientViaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConnectionOrientedTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DataContractSerializerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DiagnosticSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EncodingConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointAddressElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\FederatedMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpDigestClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IBindingConfigurationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IPAddressConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersEndpointAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalClientSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalServiceSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageLoggingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverMsmqElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverTcpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MetadataElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MethodStubs.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MtomMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NonDualMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\OneWayElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCredentialElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCustomResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PnrpPeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PrivacyNoticeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableMessagingVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\RsaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecureConversationServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityAlgorithmSuiteConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceAuthorizationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceHostingEnvironmentSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataPublishingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelEnhancedConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelSectionGroup.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceSecurityAuditElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceThrottlingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SslStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingOptionalReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SynchronousReceiveElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TextMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactedBatchingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionFlowElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionProtocolConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UseManagedPresentationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserNameServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509DefaultServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ServiceCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementComparer.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientViaBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescriptionGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IEndpointBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IMetadataExchange.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IPolicyImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\LocalServiceSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageBodyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataConversionError.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeBindings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeClient.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataLocation.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataReference.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSectionSerializerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSet.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MustUnderstandBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyAssertionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceAuthorizationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceSecurityAuditBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceThrottlingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\SynchronousReceiveBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TransactedBatchingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TypedMessageConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlContractConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlEndpointConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlName.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLogTraceRecord.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\PerformanceCounterScope.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\CallbackInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherBase.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DataContractSerializerServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ErrorProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ExceptionHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FaultContractInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FilterInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FinalizeProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ICallContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelDispatcherBoundListener.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IErrorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInputSessionShutdown.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InitializingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InputOrReplyRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceContextIdleCallback.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceManager.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IParameterInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterNodeQuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageProcessingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MexInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MultipleMessageFilterMatchesException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\NavigatorInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\OperationInvokerHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PostReceiveRequestHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ReplyHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SeekableXPathNavigator.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ServiceThrottle.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SessionInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SingletonInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XmlMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathNavigatorException.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBinding.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationSecurity.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqMessage.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\CustomPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ICustomPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerConnectorContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\LocalPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerCustomResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerReferralPolicy.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverMode.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResult.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ServiceSettingsResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UnregisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UpdateInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\AuthenticatorCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ClaimTypeRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedTokenCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\KerberosSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ProviderCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RecipientServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RenewedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RsaSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenReferenceStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypes.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiClientSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SupportingTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsClientSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsServerSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\UserNameSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BasicSecurityProfileVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ChannelProtectionRequirements.cs" />\r
-    <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\HttpDigestClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IEndpointIdentityProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecureConversationSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecuritySession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageProtectionOrder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageSecurityException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\PeerCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ScopedMessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityCredentialsManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityNegotiationException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityPolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenAttachmentMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ServiceCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SspiSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\TrustVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UnionSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WSSecurityTokenSerializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ClientCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509PeerCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ServiceCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel\ActionNotSupportedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAlreadyInUseException.cs" />\r
-    <Compile Include="System.ServiceModel\AllEnums.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpMessageSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\CallbackBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory_1.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelTerminatedException.cs" />\r
-    <Compile Include="System.ServiceModel\ClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\ClientCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel\ClientProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRealProxy.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectAbortedException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectFaultedException.cs" />\r
-    <Compile Include="System.ServiceModel\Constants.cs" />\r
-    <Compile Include="System.ServiceModel\DataContractFormatAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\DeliveryRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DnsEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress10.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressBuilder.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointNotFoundException.cs" />\r
-    <Compile Include="System.ServiceModel\EnvelopeVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ExceptionDetail.cs" />\r
-    <Compile Include="System.ServiceModel\ExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\FaultCode.cs" />\r
-    <Compile Include="System.ServiceModel\FaultContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException_1.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReason.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReasonText.cs" />\r
-    <Compile Include="System.ServiceModel\FederatedMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\HttpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\IClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ICommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel\IContextChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IDefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\IDuplexClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensibleObject.cs" />\r
-    <Compile Include="System.ServiceModel\IExtension.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\InstanceContext.cs" />\r
-    <Compile Include="System.ServiceModel\InvalidMessageContractException.cs" />\r
-    <Compile Include="System.ServiceModel\IOnlineStatus.cs" />\r
-    <Compile Include="System.ServiceModel\IServiceChannel.cs" />\r
-    <Compile Include="System.ServiceModel\Logger.cs" />\r
-    <Compile Include="System.ServiceModel\MessageBodyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractMemberAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderArrayAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderException.cs" />\r
-    <Compile Include="System.ServiceModel\MessageParameterAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessagePropertyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverMsmq.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverTcp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqPoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NamedPipeTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetPeerTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NonDualMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\OperationBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContext.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContextScope.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OptionalReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\PeerMessagePropagationMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNode.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNodeAddress.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolver.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolverImpl.cs" />\r
-    <Compile Include="System.ServiceModel\PeerSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PeerTransportSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\ProtocolException.cs" />\r
-    <Compile Include="System.ServiceModel\QuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableMessagingVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\RsaEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\ServerTooBusyException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceActivationException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceAuthorizationManager.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostBase.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceKnownTypeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceSecurityContext.cs" />\r
-    <Compile Include="System.ServiceModel\SilverlightClientConfigLoader.cs" />\r
-    <Compile Include="System.ServiceModel\SpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\TcpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionFlowAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionProtocol.cs" />\r
-    <Compile Include="System.ServiceModel\TransferMode.cs" />\r
-    <Compile Include="System.ServiceModel\UnknownMessageReceivedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel\UpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007FederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007HttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_2_0.csproj">\r
-      <Project>{737EBB38-BBFD-40D8-99F1-1FBBD49AF1B6}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_2_0.csproj">\r
-      <Project>{7203476D-4107-4C91-9930-DEC5CCFE62C8}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_2_0.csproj">\r
-      <Project>{DB0FD42E-2BF8-4E67-B707-901AC35FCB9A}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_0.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_0.csproj
deleted file mode 100644 (file)
index e21e1de..0000000
+++ /dev/null
@@ -1,1146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{49578558-7849-4977-B029-8ECFA79C79E8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\InlineCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ISyndicationElement.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ReferencedCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ResourceCollectionInfo.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationCategory.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtension.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtensionCollection.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationExtensions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeed.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItem.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationLink.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationPerson.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationVersions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContentKind.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\UrlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Workspace.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\XmlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplate.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateEquivalenceComparer.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatch.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatchException.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateTable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAdd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAnd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgument.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgumentReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArithmeticOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayLength.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAssignment.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryComparison.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBuilder.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCast.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeClass.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCustomAttribute.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeDecrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeExpression.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFieldReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFor.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeForeach.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeGenerationHelper.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIf.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIs.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeLiteral.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethod.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethodCall.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeModule.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNew.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNewArray.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNotEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeOr.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeProperty.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodePropertyReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeReturn.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelect.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelfIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeTryBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeUnaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeValueReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableDeclaration.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhen.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhile.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWriter.cs" />\r
-    <Compile Include="Mono.CodeGeneration\Exp.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmTargetInformation.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmVersion.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyedByTypeCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedKeyedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedReadOnlyCollection.cs" />\r
-    <Compile Include="System.IO\PipeException.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\AspNetIntegrationRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\VirtualPathExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListenerEntry.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpContextInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManagerTable.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\PeerDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpBinaryFrameManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\MessageSecurityBindingSupport.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageDecryptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SupportingTokenInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSEncryptedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSecurityMessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSignedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeaderCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressingVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AsymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Binding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BufferManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CachingCompiler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase_1.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelManagerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompilationException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ConnectionOrientedTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ContentType.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CustomBinding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryFailure.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryStatus.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexSessionBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\FaultConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HostedTransportConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HtmlizedException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpCookieContainerBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpResponseMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingDeliveryCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingMulticastCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingRuntimePreferences.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IHttpCookieContainer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransactedBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransportTokenAssertionProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LocalClientSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Message.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBufferImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFault.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFaultBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaderInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageProperties.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipetransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerCustomResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PnrpPeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PolicyImportHelper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PrivacyNoticeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RemoteEndpointMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ServiceHostParser.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StandardBindingImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandlerFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UnderstoodHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UseManagedPresentationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WindowsStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlObjectSerializerBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlReaderBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.ComIntegration\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AddressHeaderCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthenticationMode.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpMessageSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BinaryMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingElementExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateReferenceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientViaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConnectionOrientedTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DataContractSerializerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DiagnosticSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EncodingConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointAddressElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\FederatedMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpDigestClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IBindingConfigurationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IPAddressConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersEndpointAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalClientSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalServiceSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageLoggingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverMsmqElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverTcpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MetadataElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MethodStubs.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MtomMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NonDualMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\OneWayElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCredentialElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCustomResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PnrpPeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PrivacyNoticeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableMessagingVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\RsaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecureConversationServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityAlgorithmSuiteConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceAuthorizationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceHostingEnvironmentSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataPublishingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelEnhancedConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelSectionGroup.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceSecurityAuditElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceThrottlingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SslStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingOptionalReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SynchronousReceiveElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TextMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactedBatchingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionFlowElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionProtocolConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UseManagedPresentationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserNameServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509DefaultServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ServiceCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementComparer.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientViaBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescriptionGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IEndpointBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IMetadataExchange.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IPolicyImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\LocalServiceSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageBodyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataConversionError.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeBindings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeClient.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataLocation.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataReference.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSectionSerializerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSet.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MustUnderstandBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyAssertionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceAuthorizationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceSecurityAuditBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceThrottlingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\SynchronousReceiveBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TransactedBatchingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TypedMessageConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlContractConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlEndpointConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlName.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLogTraceRecord.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\PerformanceCounterScope.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\CallbackInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherBase.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DataContractSerializerServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ErrorProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ExceptionHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FaultContractInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FilterInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FinalizeProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ICallContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelDispatcherBoundListener.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IErrorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInputSessionShutdown.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InitializingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InputOrReplyRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceContextIdleCallback.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceManager.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IParameterInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterNodeQuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageProcessingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MexInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MultipleMessageFilterMatchesException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\NavigatorInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\OperationInvokerHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PostReceiveRequestHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ReplyHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SeekableXPathNavigator.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ServiceThrottle.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SessionInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SingletonInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XmlMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathNavigatorException.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBinding.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationSecurity.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqMessage.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\CustomPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ICustomPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerConnectorContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\LocalPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerCustomResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerReferralPolicy.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverMode.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResult.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ServiceSettingsResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UnregisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UpdateInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\AuthenticatorCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ClaimTypeRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedTokenCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\KerberosSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ProviderCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RecipientServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RenewedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RsaSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenReferenceStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypes.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiClientSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SupportingTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsClientSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsServerSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\UserNameSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BasicSecurityProfileVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ChannelProtectionRequirements.cs" />\r
-    <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\HttpDigestClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IEndpointIdentityProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecureConversationSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecuritySession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageProtectionOrder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageSecurityException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\PeerCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ScopedMessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityCredentialsManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityNegotiationException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityPolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenAttachmentMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ServiceCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SspiSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\TrustVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UnionSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WSSecurityTokenSerializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ClientCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509PeerCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ServiceCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel\ActionNotSupportedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAlreadyInUseException.cs" />\r
-    <Compile Include="System.ServiceModel\AllEnums.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpMessageSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\CallbackBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory_1.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelTerminatedException.cs" />\r
-    <Compile Include="System.ServiceModel\ClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\ClientCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel\ClientProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRealProxy.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectAbortedException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectFaultedException.cs" />\r
-    <Compile Include="System.ServiceModel\Constants.cs" />\r
-    <Compile Include="System.ServiceModel\DataContractFormatAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\DeliveryRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DnsEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress10.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressBuilder.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointNotFoundException.cs" />\r
-    <Compile Include="System.ServiceModel\EnvelopeVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ExceptionDetail.cs" />\r
-    <Compile Include="System.ServiceModel\ExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\FaultCode.cs" />\r
-    <Compile Include="System.ServiceModel\FaultContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException_1.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReason.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReasonText.cs" />\r
-    <Compile Include="System.ServiceModel\FederatedMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\HttpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\IClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ICommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel\IContextChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IDefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\IDuplexClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensibleObject.cs" />\r
-    <Compile Include="System.ServiceModel\IExtension.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\InstanceContext.cs" />\r
-    <Compile Include="System.ServiceModel\InvalidMessageContractException.cs" />\r
-    <Compile Include="System.ServiceModel\IOnlineStatus.cs" />\r
-    <Compile Include="System.ServiceModel\IServiceChannel.cs" />\r
-    <Compile Include="System.ServiceModel\Logger.cs" />\r
-    <Compile Include="System.ServiceModel\MessageBodyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractMemberAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderArrayAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderException.cs" />\r
-    <Compile Include="System.ServiceModel\MessageParameterAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessagePropertyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverMsmq.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverTcp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqPoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NamedPipeTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetPeerTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NonDualMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\OperationBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContext.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContextScope.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OptionalReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\PeerMessagePropagationMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNode.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNodeAddress.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolver.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolverImpl.cs" />\r
-    <Compile Include="System.ServiceModel\PeerSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PeerTransportSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\ProtocolException.cs" />\r
-    <Compile Include="System.ServiceModel\QuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableMessagingVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\RsaEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\ServerTooBusyException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceActivationException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceAuthorizationManager.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostBase.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceKnownTypeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceSecurityContext.cs" />\r
-    <Compile Include="System.ServiceModel\SilverlightClientConfigLoader.cs" />\r
-    <Compile Include="System.ServiceModel\SpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\TcpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionFlowAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionProtocol.cs" />\r
-    <Compile Include="System.ServiceModel\TransferMode.cs" />\r
-    <Compile Include="System.ServiceModel\UnknownMessageReceivedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel\UpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007FederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007HttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_4_0.csproj">\r
-      <Project>{888E3381-24AB-4FA9-B973-FD683B0461D3}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_0.csproj">\r
-      <Project>{FCCADAA1-34B7-4F15-933A-1FAA4DAF9871}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_0.csproj">\r
-      <Project>{5854BF27-FC35-44F5-BE59-580900694E32}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_0.csproj">\r
-      <Project>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.ServiceModel.Activation.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.ServiceModel.Activation.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_2_0.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_2_0.csproj
deleted file mode 100644 (file)
index b3f9f0c..0000000
+++ /dev/null
@@ -1,1098 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B7F6F3A3-349F-4F3F-BC96-F491DC9E90BE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0/plainservice</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAdd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAnd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgument.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgumentReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArithmeticOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayLength.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAssignment.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryComparison.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBuilder.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCast.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeClass.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCustomAttribute.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeDecrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeExpression.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFieldReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFor.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeForeach.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeGenerationHelper.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIf.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIs.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeLiteral.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethod.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethodCall.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeModule.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNew.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNewArray.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNotEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeOr.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeProperty.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodePropertyReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeReturn.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelect.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelfIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeTryBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeUnaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeValueReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableDeclaration.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhen.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhile.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWriter.cs" />\r
-    <Compile Include="Mono.CodeGeneration\Exp.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmTargetInformation.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmVersion.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyedByTypeCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedKeyedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedReadOnlyCollection.cs" />\r
-    <Compile Include="System.IO\PipeException.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\AspNetIntegrationRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\VirtualPathExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListenerEntry.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpContextInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManagerTable.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\PeerDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpBinaryFrameManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\MessageSecurityBindingSupport.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageDecryptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SupportingTokenInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSEncryptedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSecurityMessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSignedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeaderCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressingVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AsymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Binding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BufferManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CachingCompiler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase_1.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelManagerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompilationException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ConnectionOrientedTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ContentType.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CustomBinding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryFailure.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryStatus.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexSessionBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\FaultConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HostedTransportConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HtmlizedException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpResponseMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingDeliveryCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingMulticastCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingRuntimePreferences.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransactedBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransportTokenAssertionProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LocalClientSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Message.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBufferImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFault.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFaultBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaderInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageProperties.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipetransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerCustomResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PnrpPeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PolicyImportHelper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PrivacyNoticeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RemoteEndpointMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ServiceHostParser.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StandardBindingImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandlerFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UnderstoodHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UseManagedPresentationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WindowsStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlObjectSerializerBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlReaderBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.ComIntegration\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AddressHeaderCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthenticationMode.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpMessageSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BinaryMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingElementExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateReferenceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientViaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConnectionOrientedTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DataContractSerializerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DiagnosticSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EncodingConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointAddressElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\FederatedMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpDigestClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IBindingConfigurationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IPAddressConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersEndpointAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalClientSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalServiceSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageLoggingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverMsmqElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverTcpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MetadataElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MethodStubs.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MtomMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NonDualMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\OneWayElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCredentialElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCustomResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PnrpPeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PrivacyNoticeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableMessagingVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\RsaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecureConversationServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityAlgorithmSuiteConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceAuthorizationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceHostingEnvironmentSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataPublishingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelEnhancedConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelSectionGroup.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceSecurityAuditElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceThrottlingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SslStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingOptionalReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SynchronousReceiveElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TextMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactedBatchingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionFlowElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionProtocolConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UseManagedPresentationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserNameServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509DefaultServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ServiceCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementComparer.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientViaBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescriptionGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IEndpointBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IMetadataExchange.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IPolicyImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\LocalServiceSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageBodyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataConversionError.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeBindings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeClient.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataLocation.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataReference.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSectionSerializerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSet.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MustUnderstandBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyAssertionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceAuthorizationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceSecurityAuditBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceThrottlingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\SynchronousReceiveBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TransactedBatchingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TypedMessageConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlContractConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlEndpointConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlName.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLogTraceRecord.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\PerformanceCounterScope.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\CallbackInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherBase.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DataContractSerializerServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ErrorProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ExceptionHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FaultContractInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FilterInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FinalizeProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ICallContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelDispatcherBoundListener.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IErrorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInputSessionShutdown.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InitializingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InputOrReplyRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceContextIdleCallback.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceManager.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IParameterInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterNodeQuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageProcessingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MexInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MultipleMessageFilterMatchesException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\NavigatorInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\OperationInvokerHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PostReceiveRequestHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ReplyHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SeekableXPathNavigator.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ServiceThrottle.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SessionInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SingletonInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XmlMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathNavigatorException.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBinding.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationSecurity.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqMessage.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\CustomPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ICustomPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerConnectorContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\LocalPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerCustomResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerReferralPolicy.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverMode.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResult.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ServiceSettingsResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UnregisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UpdateInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\AuthenticatorCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ClaimTypeRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedTokenCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\KerberosSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ProviderCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RecipientServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RenewedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RsaSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenReferenceStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypes.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiClientSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SupportingTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsClientSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsServerSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\UserNameSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BasicSecurityProfileVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ChannelProtectionRequirements.cs" />\r
-    <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\HttpDigestClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IEndpointIdentityProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecureConversationSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecuritySession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageProtectionOrder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageSecurityException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\PeerCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ScopedMessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityCredentialsManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityNegotiationException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityPolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenAttachmentMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ServiceCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SspiSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\TrustVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UnionSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WSSecurityTokenSerializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ClientCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509PeerCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ServiceCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel\ActionNotSupportedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAlreadyInUseException.cs" />\r
-    <Compile Include="System.ServiceModel\AllEnums.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpMessageSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\CallbackBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory_1.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelTerminatedException.cs" />\r
-    <Compile Include="System.ServiceModel\ClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\ClientCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel\ClientProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRealProxy.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectAbortedException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectFaultedException.cs" />\r
-    <Compile Include="System.ServiceModel\Constants.cs" />\r
-    <Compile Include="System.ServiceModel\DataContractFormatAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\DeliveryRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DnsEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress10.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressBuilder.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointNotFoundException.cs" />\r
-    <Compile Include="System.ServiceModel\EnvelopeVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ExceptionDetail.cs" />\r
-    <Compile Include="System.ServiceModel\ExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\FaultCode.cs" />\r
-    <Compile Include="System.ServiceModel\FaultContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException_1.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReason.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReasonText.cs" />\r
-    <Compile Include="System.ServiceModel\FederatedMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\HttpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\IClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ICommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel\IContextChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IDefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\IDuplexClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensibleObject.cs" />\r
-    <Compile Include="System.ServiceModel\IExtension.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\InstanceContext.cs" />\r
-    <Compile Include="System.ServiceModel\InvalidMessageContractException.cs" />\r
-    <Compile Include="System.ServiceModel\IOnlineStatus.cs" />\r
-    <Compile Include="System.ServiceModel\IServiceChannel.cs" />\r
-    <Compile Include="System.ServiceModel\Logger.cs" />\r
-    <Compile Include="System.ServiceModel\MessageBodyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractMemberAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderArrayAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderException.cs" />\r
-    <Compile Include="System.ServiceModel\MessageParameterAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessagePropertyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverMsmq.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverTcp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqPoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NamedPipeTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetPeerTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NonDualMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\OperationBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContext.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContextScope.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OptionalReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\PeerMessagePropagationMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNode.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNodeAddress.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolver.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolverImpl.cs" />\r
-    <Compile Include="System.ServiceModel\PeerSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PeerTransportSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\ProtocolException.cs" />\r
-    <Compile Include="System.ServiceModel\QuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableMessagingVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\RsaEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\ServerTooBusyException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceActivationException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceAuthorizationManager.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostBase.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceKnownTypeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceSecurityContext.cs" />\r
-    <Compile Include="System.ServiceModel\SilverlightClientConfigLoader.cs" />\r
-    <Compile Include="System.ServiceModel\SpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\TcpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionFlowAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionProtocol.cs" />\r
-    <Compile Include="System.ServiceModel\TransferMode.cs" />\r
-    <Compile Include="System.ServiceModel\UnknownMessageReceivedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel\UpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007FederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007HttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_2_0.csproj">\r
-      <Project>{AAA3F683-244C-40EF-8EF8-A95938862A44}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-bare-net_2_0.csproj">\r
-      <Project>{5459507F-DC25-401C-A2F4-D5ECAC3A34E6}</Project>\r
-      <Name>System\System-bare-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_2_0.csproj">\r
-      <Project>{0E9DD462-944B-426E-BC1E-96EF270EF7E2}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-plaincore-net_2_0.csproj">\r
-      <Project>{F0743710-AB7C-4019-A13A-07AE79F514E4}</Project>\r
-      <Name>System.Core\System.Core-plaincore-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{CDFC3554-7C58-4C56-B862-9821EE91E2E2}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_2_0.csproj">\r
-      <Project>{13AAE1FB-48CB-41ED-BF9B-F6F69CDE258F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_2_0.csproj">\r
-      <Project>{3D0435AD-4ACE-45BE-87DE-335BAD6D8EB1}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Security/System.Security-net_2_0.csproj">\r
-      <Project>{D3703145-8C5A-45B9-99A1-059D50BF3DFF}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_2_0.csproj">\r
-      <Project>{79E05A44-5A8D-4409-8F84-5FFEF95CD7AD}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_2_0.csproj">\r
-      <Project>{88EFC58B-C753-42BB-AC08-4D9AD59FE3E5}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_2_0.csproj">\r
-      <Project>{CEB6068D-261E-4546-8013-0A279BE86B5A}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Messaging/System.Messaging-net_2_0.csproj">\r
-      <Project>{A15967D7-34EF-4D38-B25E-19AE6808A308}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-plainweb-net_2_0.csproj">\r
-      <Project>{97FD9F81-DC17-4CEC-992A-F2F17B6602D7}</Project>\r
-      <Name>System.Web\System.Web-plainweb-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Services/System.Web.Services-net_2_0.csproj">\r
-      <Project>{73D0EC8D-BC1E-4748-979B-68DDFF011AF4}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_2_0.csproj">\r
-      <Project>{ECDB1158-526C-46EE-896E-9BFB6F85C0A3}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_0.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_0.csproj
deleted file mode 100644 (file)
index 299f6db..0000000
+++ /dev/null
@@ -1,1145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{816ADD37-2313-47D0-8F75-1DA6E7B8EB99}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0/plainservice</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\InlineCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ISyndicationElement.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ReferencedCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ResourceCollectionInfo.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationCategory.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtension.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtensionCollection.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationExtensions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeed.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItem.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationLink.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationPerson.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationVersions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContentKind.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\UrlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Workspace.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\XmlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplate.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateEquivalenceComparer.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatch.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatchException.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateTable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAdd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAnd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgument.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgumentReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArithmeticOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayLength.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAssignment.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryComparison.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBuilder.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCast.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeClass.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCustomAttribute.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeDecrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeExpression.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFieldReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFor.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeForeach.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeGenerationHelper.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIf.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIs.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeLiteral.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethod.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethodCall.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeModule.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNew.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNewArray.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNotEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeOr.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeProperty.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodePropertyReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeReturn.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelect.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelfIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeTryBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeUnaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeValueReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableDeclaration.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhen.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhile.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWriter.cs" />\r
-    <Compile Include="Mono.CodeGeneration\Exp.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmTargetInformation.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmVersion.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyedByTypeCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedKeyedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedReadOnlyCollection.cs" />\r
-    <Compile Include="System.IO\PipeException.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\AspNetIntegrationRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\VirtualPathExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListenerEntry.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpContextInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManagerTable.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\PeerDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpBinaryFrameManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\MessageSecurityBindingSupport.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageDecryptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SupportingTokenInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSEncryptedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSecurityMessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSignedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeaderCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressingVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AsymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Binding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BufferManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CachingCompiler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase_1.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelManagerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompilationException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ConnectionOrientedTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ContentType.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CustomBinding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryFailure.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryStatus.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexSessionBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\FaultConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HostedTransportConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HtmlizedException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpCookieContainerBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpResponseMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingDeliveryCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingMulticastCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingRuntimePreferences.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IHttpCookieContainer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransactedBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransportTokenAssertionProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LocalClientSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Message.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBufferImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFault.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFaultBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaderInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageProperties.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipetransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerCustomResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PnrpPeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PolicyImportHelper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PrivacyNoticeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RemoteEndpointMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ServiceHostParser.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StandardBindingImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandlerFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UnderstoodHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UseManagedPresentationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WindowsStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlObjectSerializerBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlReaderBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.ComIntegration\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AddressHeaderCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthenticationMode.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpMessageSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BinaryMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingElementExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateReferenceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientViaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConnectionOrientedTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DataContractSerializerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DiagnosticSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EncodingConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointAddressElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\FederatedMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpDigestClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IBindingConfigurationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IPAddressConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersEndpointAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalClientSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalServiceSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageLoggingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverMsmqElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverTcpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MetadataElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MethodStubs.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MtomMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NonDualMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\OneWayElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCredentialElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCustomResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PnrpPeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PrivacyNoticeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableMessagingVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\RsaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecureConversationServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityAlgorithmSuiteConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceAuthorizationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceHostingEnvironmentSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataPublishingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelEnhancedConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelSectionGroup.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceSecurityAuditElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceThrottlingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SslStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingOptionalReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SynchronousReceiveElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TextMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactedBatchingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionFlowElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionProtocolConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UseManagedPresentationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserNameServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509DefaultServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ServiceCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementComparer.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientViaBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescriptionGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IEndpointBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IMetadataExchange.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IPolicyImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\LocalServiceSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageBodyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataConversionError.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeBindings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeClient.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataLocation.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataReference.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSectionSerializerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSet.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MustUnderstandBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyAssertionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceAuthorizationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceSecurityAuditBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceThrottlingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\SynchronousReceiveBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TransactedBatchingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TypedMessageConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlContractConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlEndpointConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlName.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLogTraceRecord.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\PerformanceCounterScope.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\CallbackInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherBase.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DataContractSerializerServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ErrorProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ExceptionHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FaultContractInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FilterInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FinalizeProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ICallContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelDispatcherBoundListener.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IErrorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInputSessionShutdown.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InitializingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InputOrReplyRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceContextIdleCallback.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceManager.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IParameterInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterNodeQuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageProcessingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MexInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MultipleMessageFilterMatchesException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\NavigatorInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\OperationInvokerHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PostReceiveRequestHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ReplyHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SeekableXPathNavigator.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ServiceThrottle.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SessionInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SingletonInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XmlMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathNavigatorException.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBinding.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationSecurity.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqMessage.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\CustomPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ICustomPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerConnectorContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\LocalPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerCustomResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerReferralPolicy.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverMode.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResult.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ServiceSettingsResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UnregisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UpdateInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\AuthenticatorCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ClaimTypeRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedTokenCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\KerberosSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ProviderCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RecipientServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RenewedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RsaSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenReferenceStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypes.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiClientSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SupportingTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsClientSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsServerSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\UserNameSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BasicSecurityProfileVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ChannelProtectionRequirements.cs" />\r
-    <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\HttpDigestClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IEndpointIdentityProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecureConversationSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecuritySession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageProtectionOrder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageSecurityException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\PeerCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ScopedMessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityCredentialsManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityNegotiationException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityPolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenAttachmentMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ServiceCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SspiSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\TrustVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UnionSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WSSecurityTokenSerializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ClientCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509PeerCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ServiceCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel\ActionNotSupportedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAlreadyInUseException.cs" />\r
-    <Compile Include="System.ServiceModel\AllEnums.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpMessageSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\CallbackBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory_1.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelTerminatedException.cs" />\r
-    <Compile Include="System.ServiceModel\ClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\ClientCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel\ClientProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRealProxy.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectAbortedException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectFaultedException.cs" />\r
-    <Compile Include="System.ServiceModel\Constants.cs" />\r
-    <Compile Include="System.ServiceModel\DataContractFormatAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\DeliveryRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DnsEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress10.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressBuilder.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointNotFoundException.cs" />\r
-    <Compile Include="System.ServiceModel\EnvelopeVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ExceptionDetail.cs" />\r
-    <Compile Include="System.ServiceModel\ExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\FaultCode.cs" />\r
-    <Compile Include="System.ServiceModel\FaultContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException_1.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReason.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReasonText.cs" />\r
-    <Compile Include="System.ServiceModel\FederatedMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\HttpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\IClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ICommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel\IContextChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IDefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\IDuplexClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensibleObject.cs" />\r
-    <Compile Include="System.ServiceModel\IExtension.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\InstanceContext.cs" />\r
-    <Compile Include="System.ServiceModel\InvalidMessageContractException.cs" />\r
-    <Compile Include="System.ServiceModel\IOnlineStatus.cs" />\r
-    <Compile Include="System.ServiceModel\IServiceChannel.cs" />\r
-    <Compile Include="System.ServiceModel\Logger.cs" />\r
-    <Compile Include="System.ServiceModel\MessageBodyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractMemberAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderArrayAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderException.cs" />\r
-    <Compile Include="System.ServiceModel\MessageParameterAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessagePropertyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverMsmq.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverTcp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqPoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NamedPipeTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetPeerTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NonDualMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\OperationBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContext.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContextScope.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OptionalReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\PeerMessagePropagationMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNode.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNodeAddress.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolver.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolverImpl.cs" />\r
-    <Compile Include="System.ServiceModel\PeerSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PeerTransportSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\ProtocolException.cs" />\r
-    <Compile Include="System.ServiceModel\QuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableMessagingVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\RsaEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\ServerTooBusyException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceActivationException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceAuthorizationManager.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostBase.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceKnownTypeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceSecurityContext.cs" />\r
-    <Compile Include="System.ServiceModel\SilverlightClientConfigLoader.cs" />\r
-    <Compile Include="System.ServiceModel\SpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\TcpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionFlowAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionProtocol.cs" />\r
-    <Compile Include="System.ServiceModel\TransferMode.cs" />\r
-    <Compile Include="System.ServiceModel\UnknownMessageReceivedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel\UpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007FederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007HttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_0.csproj">\r
-      <Project>{5889848E-305B-4B11-B3B1-A25761DAFE45}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-secxml-net_4_0.csproj">\r
-      <Project>{ED114F49-84B3-4EF9-80EC-90D4EEF7FF8E}</Project>\r
-      <Name>System\System-secxml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_4_0.csproj">\r
-      <Project>{FB3BD508-7228-49CF-ADCA-F5D0C8E8ABCF}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-plaincore-net_4_0.csproj">\r
-      <Project>{2D5DF73B-C3E5-40E6-94DA-EE49231F1FB4}</Project>\r
-      <Name>System.Core\System.Core-plaincore-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{5F7BBDFE-ABEF-4B41-AC38-B4BB6EAE2F5B}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_0.csproj">\r
-      <Project>{41A642E0-E14A-4B75-B37B-28549F5536FC}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_0.csproj">\r
-      <Project>{F9CB6ED4-1F88-4C63-84BA-4A60E8E4CB9B}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Security/System.Security-net_4_0.csproj">\r
-      <Project>{F6E83619-012D-471F-BEE2-3D2A19F04EB4}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_0.csproj">\r
-      <Project>{03FB840A-3D5A-45D4-9DD5-2EBF946312CB}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_0.csproj">\r
-      <Project>{F0994902-D7DB-4B6D-A269-7D865328F3F7}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_0.csproj">\r
-      <Project>{F141397D-ED2D-4522-8603-47E5D89FB9CD}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Messaging/System.Messaging-net_4_0.csproj">\r
-      <Project>{56EC74E6-7600-475D-84B7-38BD33A90548}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-plainweb-net_4_0.csproj">\r
-      <Project>{DE03397A-FF16-4665-B1B4-D8E437D1A7DB}</Project>\r
-      <Name>System.Web\System.Web-plainweb-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_0.csproj">\r
-      <Project>{0D6601DD-3604-48B2-9180-8435B13CD76A}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_0.csproj">\r
-      <Project>{E625DC4E-7922-4453-A5F1-C16D46B3E0BA}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{21BBD9A9-836A-4BF0-81EF-CAFE55B11226}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-tests-net_2_0.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 17e7560..0000000
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6E7270E1-B6F4-4244-B349-59208C772462}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\FeatureBased\Features.Client\AsyncCallTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\AsyncPatternServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\DataContractTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\ExitProcessHelperServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\FaultsTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\KnownTypeTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\MessageContractTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\OperationContractServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\PrimitiveTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\UntypedMessageTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\AsyncCallTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\AsyncPatternContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\DataContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\DualContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\ExitpProcessHelper.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\FaultsTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\KnownTypeTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\MessageContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\OperationContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\PrimitiveTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\UntypedMessageTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\AsyncCallTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\AsyncPatternTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\DataContractSerializerTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\DualContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\ExitProcessHelper.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\FaultsTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\KnownTypeTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\MessageContractTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\OperationContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\PrimitiveTesterTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\UntypedMessageTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\XmlComparer.cs" />\r
-    <Compile Include="Test\FeatureBased\TestFixtureBase.cs" />\r
-    <Compile Include="Test\MetadataTests\BindingTestAssertions.cs" />\r
-    <Compile Include="Test\MetadataTests\ExportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_CreateMetadata.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_LoadMetadata.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_RoundTrip.cs" />\r
-    <Compile Include="Test\MetadataTests\MetadataSamples.cs" />\r
-    <Compile Include="Test\MetadataTests\MiscImportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\TestContext.cs" />\r
-    <Compile Include="Test\MetadataTests\TestLabel.cs" />\r
-    <Compile Include="Test\NUnitMoonHelper.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AddressHeaderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AddressingVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AsymmetricSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BinaryMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CalcSampleProxy.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CommunicationObjectSyncTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CommunicationObjectTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\ConnectionOrientedTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CustomBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\DebugBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\EmptyFaultExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\EnvelopeVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\FaultConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\FaultExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HandlerBodyWriter.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HandlerTransportBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpRequestMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpsTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\InterceptorBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\InvalidBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\LocalClientSecuritySettingsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageBufferTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageEncoderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageFaultTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageHeadersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageHeaderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessagePropertiesTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MsmqBindingElementBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MsmqTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\NamedPipeTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\OneWayBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\PeerTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SecurityAssert.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SslStreamSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SymmetricSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TcpTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TextMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TransactionFlowBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\AddressHeaderCollectionElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BasicHttpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BehaviorsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BindingsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ChannelEndpointElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\CustomBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\EndpointBehaviorElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ExtensionsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\MetadataElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\MexBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetNamedPipeBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetPeerTcpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetTcpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceBehaviorElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceModelConfigurationElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceModelSectionGroupTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingCollectionElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardEndpointsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\UserBinding.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\BugX41.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ClientCredentialsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ContractDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\FaultDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataExchangeBindingsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataResolverTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataSetTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\OperationDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceAuthorizationBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceContractGeneratorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceCredentialsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceDebugBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceMetadataBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceMetadataEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceThrottlingBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\TypedMessageConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WsdlExporterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WsdlImporterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ActionFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\Bug652331_2Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\Bug652331Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ChannelDispatcherTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\DispatchOperationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\DispatchRuntimeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\EndpointDispatcherTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ExceptionHandlerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\FilterTableTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\InvalidBodyAccessExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\XPathMessageContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.PeerResolvers\CustomPeerResolverServiceTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.PeerResolvers\PeerResolverSerializationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\IssuedSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\IssuedSecurityTokenProviderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\RsaSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypesTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SslSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SspiSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\UserNameSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\WrappedKeySecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\X509ListedCertificateValidator.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\X509SecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ChannelProtectionRequirementsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\MessagePartSpecificationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ScopedMessagePartSpecificationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityAlgorithmSuiteTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityTokenSpeficicationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ServiceCredentialsSecurityTokenManagerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ServiceSecurityContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SupportingTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\TransportSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\WSSecurityTokenSerializerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\BasicHttpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\CallbackBehaviorAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ChannelFactory_1Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ChannelFactoryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientBase_InteractiveChannelInitializerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientCredentialsSecurityTokenManagerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\CommonUseCases.cs" />\r
-    <Compile Include="Test\System.ServiceModel\Constants.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddress10Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddressBuilderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddressTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointBehaviorCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointIdentityTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultCodeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultContractAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultReasonTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\IntegratedConnectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\MessageSecurityVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\MsmqTransportSecurityTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetMsmqBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetPeerTcpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetTcpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\OperationContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\PeerNodeAddressTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceAssert.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceEndpointCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceHostBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceHostTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceKnownTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\SynchronizedReadOnlyCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\TransactionProtocolTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\UriSchemeKeyedCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WSFederationHttpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WSHttpBindingTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_2_0.csproj">\r
-      <Project>{01BE23DB-E426-45E7-B56C-CA1175232AA7}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_2_0.csproj">\r
-      <Project>{879EA17D-67A5-44ED-B912-1BE4883356FE}</Project>\r
-      <Name>System.Security\System.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_2_0.csproj">\r
-      <Project>{737EBB38-BBFD-40D8-99F1-1FBBD49AF1B6}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_2_0.csproj">\r
-      <Project>{7203476D-4107-4C91-9930-DEC5CCFE62C8}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_2_0.csproj">\r
-      <Project>{DB0FD42E-2BF8-4E67-B707-901AC35FCB9A}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-tests-net_4_0.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 8359e88..0000000
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9F423060-8B21-400F-835A-2C880C4A90FC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\FeatureBased\Features.Client\AsyncCallTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\AsyncPatternServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\DataContractTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\ExitProcessHelperServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\FaultsTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\KnownTypeTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\MessageContractTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\OperationContractServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\PrimitiveTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\UntypedMessageTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\AsyncCallTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\AsyncPatternContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\DataContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\DualContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\ExitpProcessHelper.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\FaultsTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\KnownTypeTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\MessageContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\OperationContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\PrimitiveTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\UntypedMessageTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\AsyncCallTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\AsyncPatternTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\DataContractSerializerTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\DualContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\ExitProcessHelper.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\FaultsTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\KnownTypeTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\MessageContractTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\OperationContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\PrimitiveTesterTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\UntypedMessageTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\XmlComparer.cs" />\r
-    <Compile Include="Test\FeatureBased\TestFixtureBase.cs" />\r
-    <Compile Include="Test\MetadataTests\BindingTestAssertions.cs" />\r
-    <Compile Include="Test\MetadataTests\ExportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_CreateMetadata.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_LoadMetadata.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_RoundTrip.cs" />\r
-    <Compile Include="Test\MetadataTests\MetadataSamples.cs" />\r
-    <Compile Include="Test\MetadataTests\MiscImportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\TestContext.cs" />\r
-    <Compile Include="Test\MetadataTests\TestLabel.cs" />\r
-    <Compile Include="Test\NUnitMoonHelper.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AddressHeaderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AddressingVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AsymmetricSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BinaryMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CalcSampleProxy.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CommunicationObjectSyncTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CommunicationObjectTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\ConnectionOrientedTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CustomBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\DebugBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\EmptyFaultExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\EnvelopeVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\FaultConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\FaultExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HandlerBodyWriter.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HandlerTransportBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpRequestMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpsTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\InterceptorBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\InvalidBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\LocalClientSecuritySettingsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageBufferTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageEncoderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageFaultTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageHeadersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageHeaderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessagePropertiesTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MsmqBindingElementBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MsmqTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\NamedPipeTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\OneWayBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\PeerTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SecurityAssert.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SslStreamSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SymmetricSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TcpTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TextMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TransactionFlowBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\AddressHeaderCollectionElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BasicHttpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BehaviorsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BindingsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ChannelEndpointElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\CustomBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\EndpointBehaviorElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ExtensionsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\MetadataElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\MexBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetNamedPipeBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetPeerTcpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetTcpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceBehaviorElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceModelConfigurationElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceModelSectionGroupTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingCollectionElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardEndpointsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\UserBinding.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\BugX41.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ClientCredentialsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ContractDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\FaultDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataExchangeBindingsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataResolverTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataSetTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\OperationDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceAuthorizationBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceContractGeneratorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceCredentialsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceDebugBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceMetadataBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceMetadataEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceThrottlingBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\TypedMessageConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WsdlExporterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WsdlImporterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ActionFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\Bug652331_2Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\Bug652331Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ChannelDispatcherTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\DispatchOperationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\DispatchRuntimeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\EndpointDispatcherTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ExceptionHandlerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\FilterTableTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\InvalidBodyAccessExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\XPathMessageContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.PeerResolvers\CustomPeerResolverServiceTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.PeerResolvers\PeerResolverSerializationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\IssuedSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\IssuedSecurityTokenProviderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\RsaSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypesTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SslSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SspiSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\UserNameSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\WrappedKeySecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\X509ListedCertificateValidator.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\X509SecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ChannelProtectionRequirementsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\MessagePartSpecificationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ScopedMessagePartSpecificationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityAlgorithmSuiteTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityTokenSpeficicationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ServiceCredentialsSecurityTokenManagerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ServiceSecurityContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SupportingTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\TransportSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\WSSecurityTokenSerializerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\BasicHttpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\CallbackBehaviorAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ChannelFactory_1Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ChannelFactoryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientBase_InteractiveChannelInitializerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientCredentialsSecurityTokenManagerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\CommonUseCases.cs" />\r
-    <Compile Include="Test\System.ServiceModel\Constants.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddress10Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddressBuilderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddressTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointBehaviorCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointIdentityTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultCodeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultContractAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultReasonTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\IntegratedConnectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\MessageSecurityVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\MsmqTransportSecurityTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetMsmqBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetPeerTcpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetTcpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\OperationContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\PeerNodeAddressTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceAssert.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceEndpointCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceHostBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceHostTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceKnownTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\SynchronizedReadOnlyCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\TransactionProtocolTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\UriSchemeKeyedCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WSFederationHttpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WSHttpBindingTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">\r
-      <Project>{28265916-A48E-4A4D-A845-2F1C06027D68}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_0.csproj">\r
-      <Project>{E15F571E-B653-4409-AF7C-F478DA81B959}</Project>\r
-      <Name>System.Security\System.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_4_0.csproj">\r
-      <Project>{888E3381-24AB-4FA9-B973-FD683B0461D3}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_0.csproj">\r
-      <Project>{FCCADAA1-34B7-4F15-933A-1FAA4DAF9871}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_0.csproj">\r
-      <Project>{5854BF27-FC35-44F5-BE59-580900694E32}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_0.csproj">\r
-      <Project>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0.csproj">\r
-      <Project>{1C9B4EFC-57D5-4DEE-9D2F-0B505824623F}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_2_0.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-net_2_0.csproj
deleted file mode 100644 (file)
index 93d4a7a..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E278AD54-C1F6-49BC-B788-6E412212D0EA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceProcess</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceInstallerDialog.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceInstallerDialogResult.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceNameConverter.cs" />\r
-    <Compile Include="System.ServiceProcess\PowerBroadcastStatus.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceAccount.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceBase.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceController.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerImpl.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermission.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionAccess.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionAttribute.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionEntry.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionEntryCollection.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerStatus.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceInstaller.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceProcessDescriptionAttribute.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceProcessInstaller.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceStartMode.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceType.cs" />\r
-    <Compile Include="System.ServiceProcess\SessionChangeDescription.cs" />\r
-    <Compile Include="System.ServiceProcess\SessionChangeReason.cs" />\r
-    <Compile Include="System.ServiceProcess\TimeoutException.cs" />\r
-    <Compile Include="System.ServiceProcess\UnixServiceController.cs" />\r
-    <Compile Include="System.ServiceProcess\Win32ServiceController.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_2_0.csproj">\r
-      <Project>{C8B650EA-042C-4352-8224-03F759A682C6}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_0.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_0.csproj
deleted file mode 100644 (file)
index 99508ab..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9716FC54-C30A-485D-B4D3-D9502F6CD296}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceProcess</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceInstallerDialog.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceInstallerDialogResult.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceNameConverter.cs" />\r
-    <Compile Include="System.ServiceProcess\PowerBroadcastStatus.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceAccount.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceBase.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceController.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerImpl.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermission.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionAccess.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionAttribute.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionEntry.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionEntryCollection.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerStatus.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceInstaller.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceProcessDescriptionAttribute.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceProcessInstaller.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceStartMode.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceType.cs" />\r
-    <Compile Include="System.ServiceProcess\SessionChangeDescription.cs" />\r
-    <Compile Include="System.ServiceProcess\SessionChangeReason.cs" />\r
-    <Compile Include="System.ServiceProcess\TimeoutException.cs" />\r
-    <Compile Include="System.ServiceProcess\UnixServiceController.cs" />\r
-    <Compile Include="System.ServiceProcess\Win32ServiceController.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_4_0.csproj">\r
-      <Project>{29529439-51F1-4953-8A5D-7ED8F7EB8FDB}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_2_0.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 88c736a..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8CFBFA75-E0ED-4F16-8251-8B55E960A7C2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceProcess-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceProcess_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ServiceProcess\ServiceBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerPermissionTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceProcess\System.ServiceProcess-net_2_0.csproj">\r
-      <Project>{E278AD54-C1F6-49BC-B788-6E412212D0EA}</Project>\r
-      <Name>System.ServiceProcess\System.ServiceProcess-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_2_0.csproj">\r
-      <Project>{C8B650EA-042C-4352-8224-03F759A682C6}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_4_0.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_4_0.csproj
deleted file mode 100644 (file)
index aeeef92..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{860CF845-5246-45BE-B803-F8B531F24593}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceProcess-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceProcess_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ServiceProcess\ServiceBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerPermissionTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceProcess\System.ServiceProcess-net_4_0.csproj">\r
-      <Project>{9716FC54-C30A-485D-B4D3-D9502F6CD296}</Project>\r
-      <Name>System.ServiceProcess\System.ServiceProcess-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_4_0.csproj">\r
-      <Project>{29529439-51F1-4953-8A5D-7ED8F7EB8FDB}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index b87e8601f5e8d2a24e366c72bc6e40976ec18191..d6015665b286926a27d65cc1440cb54e89279004 100644 (file)
@@ -136,7 +136,7 @@ namespace System.Threading.Tasks.Dataflow {
                protected override void OutgoingQueueComplete ()
                {
                        if (MessageQueue.IsCompleted
-                           && Thread.VolatileRead (ref degreeOfParallelism) == 1)
+                           && Volatile.Read (ref degreeOfParallelism) == 1)
                                outgoingQueueComplete ();
                }
 
@@ -145,7 +145,7 @@ namespace System.Threading.Tasks.Dataflow {
                /// </summary>
                protected override void VerifyCompleteness ()
                {
-                       if (Thread.VolatileRead (ref degreeOfParallelism) == 1)
+                       if (Volatile.Read (ref degreeOfParallelism) == 1)
                                base.VerifyCompleteness ();
                }
 
@@ -160,4 +160,4 @@ namespace System.Threading.Tasks.Dataflow {
                                   || iteration < Options.MaxMessagesPerTask);
                }
        }
-}
\ No newline at end of file
+}
index 239a610f727629ca494c1e2aca7bacbac63df20f..867f803a9aae519e8a32d5196634e4294c535d3e 100644 (file)
@@ -80,7 +80,7 @@ namespace System.Threading.Tasks.Dataflow {
                                return DataflowMessageStatus.DecliningPermanently;
 
                        var full = options.BoundedCapacity != -1
-                                  && Thread.VolatileRead (ref itemCount) >= options.BoundedCapacity;
+                                  && Volatile.Read (ref itemCount) >= options.BoundedCapacity;
                        if (!greedy || full) {
                                if (source == null)
                                        return DataflowMessageStatus.Declined;
@@ -252,7 +252,7 @@ namespace System.Threading.Tasks.Dataflow {
                void RetrievePostponed ()
                {
                        // BoundedCapacity can't be -1 here, because in that case there would be no postponing
-                       while (Thread.VolatileRead (ref itemCount) < options.BoundedCapacity
+                       while (Volatile.Read (ref itemCount) < options.BoundedCapacity
                               && !postponedMessages.IsEmpty && !MessageQueue.IsAddingCompleted) {
                                var block = postponedMessages.First ().Key;
                                DataflowMessageHeader header;
@@ -286,7 +286,7 @@ namespace System.Threading.Tasks.Dataflow {
                        postponedProcessing.Value = false;
 
                        // because of race
-                       if ((Thread.VolatileRead (ref itemCount) < options.BoundedCapacity
+                       if ((Volatile.Read (ref itemCount) < options.BoundedCapacity
                             || MessageQueue.IsAddingCompleted)
                            && !postponedMessages.IsEmpty)
                                EnsurePostponedProcessing ();
@@ -329,4 +329,4 @@ namespace System.Threading.Tasks.Dataflow {
                                CompHelper.Complete ();
                }
        }
-}
\ No newline at end of file
+}
index 8b49b461d1c87d190335a6b64fdadacfb6a8c124..cdd9bcb5839ac88b45317cc8ecf3cf9c61df177e 100644 (file)
@@ -167,7 +167,7 @@ namespace System.Threading.Tasks.Dataflow {
                {
                        firstOffering = true;
                        currentItem = item;
-                       Thread.VolatileWrite (ref currentMessageHeaderId, ++lastMessageHeaderId);
+                       Volatile.Write (ref currentMessageHeaderId, ++lastMessageHeaderId);
 
                        ClearUnpostponed ();
                }
@@ -184,14 +184,14 @@ namespace System.Threading.Tasks.Dataflow {
                public void ResetCurrentItem ()
                {
                        currentItem = default(T);
-                       Thread.VolatileWrite (ref currentMessageHeaderId, 0);
+                       Volatile.Write (ref currentMessageHeaderId, 0);
                }
 
                /// <summary>
                /// Is there an item to send right now?
                /// </summary>
                public bool HasCurrentItem {
-                       get { return Thread.VolatileRead (ref currentMessageHeaderId) != 0; }
+                       get { return Volatile.Read (ref currentMessageHeaderId) != 0; }
                }
 
                /// <summary>
@@ -352,7 +352,7 @@ namespace System.Threading.Tasks.Dataflow {
                /// </summary>
                public bool VerifyHeader (DataflowMessageHeader header)
                {
-                       return header.Id == Thread.VolatileRead (ref currentMessageHeaderId);
+                       return header.Id == Volatile.Read (ref currentMessageHeaderId);
                }
        }
 
@@ -520,4 +520,4 @@ namespace System.Threading.Tasks.Dataflow {
                        return false;
                }
        }
-}
\ No newline at end of file
+}
index 243bf6a74eb3fc63f5c5505c27e1ac493e04ab97..bd8ccb579e0fdf8a3f422a412adf296bd44be296 100644 (file)
@@ -133,7 +133,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
 
-                       Assert.AreEqual (2, Thread.VolatileRead (ref n));
+                       Assert.AreEqual (2, Volatile.Read (ref n));
                }
 
                [Test]
@@ -156,7 +156,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
 
-                       Assert.AreEqual (2, Thread.VolatileRead (ref n));
+                       Assert.AreEqual (2, Volatile.Read (ref n));
                }
 
                int n;
@@ -181,7 +181,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        Assert.IsFalse (transform.Post (102));
 
-                       Assert.AreEqual (10000, Thread.VolatileRead (ref n));
+                       Assert.AreEqual (10000, Volatile.Read (ref n));
                }
 
                IEnumerable<int> ComputeResults ()
@@ -318,4 +318,4 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                        throw new NotImplementedException ();
                }
        }
-}
\ No newline at end of file
+}
index e4329e7982f5eedc0ac6b8502a35d592bc016acc..d523a8faa35e41d77bfd90de5835ee86cbfc36f8 100644 (file)
@@ -92,7 +92,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        var blocks = GetExecutionBlocksWithAction (() =>
                        {
-                               if (Thread.VolatileRead (ref shouldRun) == 0) {
+                               if (Volatile.Read (ref shouldRun) == 0) {
                                        ranAfterFault++;
                                        return;
                                }
@@ -122,7 +122,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                                Thread.Sleep (100);
 
-                               Assert.AreEqual (0, Thread.VolatileRead (ref ranAfterFault));
+                               Assert.AreEqual (0, Volatile.Read (ref ranAfterFault));
                        }
                }
 
@@ -136,7 +136,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        var blocks = GetExecutionBlocksWithAsyncAction (
                                i =>
-                               tcs.Task.ContinueWith (t => Thread.VolatileWrite (ref result, i + t.Result)),
+                               tcs.Task.ContinueWith (t => Volatile.Write (ref result, i + t.Result)),
                                new ExecutionDataflowBlockOptions { TaskScheduler = scheduler });
 
                        foreach (var block in blocks) {
@@ -160,7 +160,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                                Assert.AreEqual (11, result);
 
                                tcs = new TaskCompletionSource<int> ();
-                               Thread.VolatileWrite (ref result, 0);
+                               Volatile.Write (ref result, 0);
                        }
                }
 
@@ -196,4 +196,4 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                        }
                }
        }
-}
\ No newline at end of file
+}
index d59199e3fa0c53cbf048492e166abe315d3a3819..27fce238a62d72cf31cf28808e2908cc2e03d5e7 100644 (file)
@@ -215,10 +215,10 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        Assert.IsTrue (action.Post (1));
 
-                       Assert.AreEqual (0, Thread.VolatileRead (ref n));
+                       Assert.AreEqual (0, Volatile.Read (ref n));
 
                        Assert.AreEqual (1, scheduler.ExecuteAll ());
-                       Assert.AreEqual (1, Thread.VolatileRead (ref n));
+                       Assert.AreEqual (1, Volatile.Read (ref n));
                }
 
                [Test]
@@ -416,4 +416,4 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                                new[] { task1.Result, task2.Result });
                }
        }
-}
\ No newline at end of file
+}
diff --git a/mcs/class/System.Transactions/System.Transactions-net_2_0.csproj b/mcs/class/System.Transactions/System.Transactions-net_2_0.csproj
deleted file mode 100644 (file)
index dc3c0d6..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Transactions</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Transactions\CommittableTransaction.cs" />\r
-    <Compile Include="System.Transactions\Configuration\DefaultSettingsSection.cs" />\r
-    <Compile Include="System.Transactions\Configuration\MachineSettingsSection.cs" />\r
-    <Compile Include="System.Transactions\Configuration\TransactionsSectionGroup.cs" />\r
-    <Compile Include="System.Transactions\Delegates.cs" />\r
-    <Compile Include="System.Transactions\DependentCloneOption.cs" />\r
-    <Compile Include="System.Transactions\DependentTransaction.cs" />\r
-    <Compile Include="System.Transactions\Enlistment.cs" />\r
-    <Compile Include="System.Transactions\EnlistmentOptions.cs" />\r
-    <Compile Include="System.Transactions\EnterpriseServicesInteropOption.cs" />\r
-    <Compile Include="System.Transactions\IDtcTransaction.cs" />\r
-    <Compile Include="System.Transactions\IEnlistmentNotification.cs" />\r
-    <Compile Include="System.Transactions\IPromotableSinglePhaseNotification.cs" />\r
-    <Compile Include="System.Transactions\ISimpleTransactionSuperior.cs" />\r
-    <Compile Include="System.Transactions\ISinglePhaseNotification.cs" />\r
-    <Compile Include="System.Transactions\IsolationLevel.cs" />\r
-    <Compile Include="System.Transactions\ITransactionPromoter.cs" />\r
-    <Compile Include="System.Transactions\PreparingEnlistment.cs" />\r
-    <Compile Include="System.Transactions\SinglePhaseEnlistment.cs" />\r
-    <Compile Include="System.Transactions\SubordinateTransaction.cs" />\r
-    <Compile Include="System.Transactions\Transaction.cs" />\r
-    <Compile Include="System.Transactions\TransactionAbortedException.cs" />\r
-    <Compile Include="System.Transactions\TransactionEventArgs.cs" />\r
-    <Compile Include="System.Transactions\TransactionException.cs" />\r
-    <Compile Include="System.Transactions\TransactionInDoubtException.cs" />\r
-    <Compile Include="System.Transactions\TransactionInformation.cs" />\r
-    <Compile Include="System.Transactions\TransactionInterop.cs" />\r
-    <Compile Include="System.Transactions\TransactionManager.cs" />\r
-    <Compile Include="System.Transactions\TransactionManagerCommunicationException.cs" />\r
-    <Compile Include="System.Transactions\TransactionOptions.cs" />\r
-    <Compile Include="System.Transactions\TransactionPromotionException.cs" />\r
-    <Compile Include="System.Transactions\TransactionScope.cs" />\r
-    <Compile Include="System.Transactions\TransactionScopeOption.cs" />\r
-    <Compile Include="System.Transactions\TransactionStatus.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Transactions/System.Transactions-net_4_0.csproj b/mcs/class/System.Transactions/System.Transactions-net_4_0.csproj
deleted file mode 100644 (file)
index 368ac64..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{03A0E889-9E62-423F-B65E-40416E021F1B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Transactions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Transactions\CommittableTransaction.cs" />\r
-    <Compile Include="System.Transactions\Configuration\DefaultSettingsSection.cs" />\r
-    <Compile Include="System.Transactions\Configuration\MachineSettingsSection.cs" />\r
-    <Compile Include="System.Transactions\Configuration\TransactionsSectionGroup.cs" />\r
-    <Compile Include="System.Transactions\Delegates.cs" />\r
-    <Compile Include="System.Transactions\DependentCloneOption.cs" />\r
-    <Compile Include="System.Transactions\DependentTransaction.cs" />\r
-    <Compile Include="System.Transactions\Enlistment.cs" />\r
-    <Compile Include="System.Transactions\EnlistmentOptions.cs" />\r
-    <Compile Include="System.Transactions\EnterpriseServicesInteropOption.cs" />\r
-    <Compile Include="System.Transactions\IDtcTransaction.cs" />\r
-    <Compile Include="System.Transactions\IEnlistmentNotification.cs" />\r
-    <Compile Include="System.Transactions\IPromotableSinglePhaseNotification.cs" />\r
-    <Compile Include="System.Transactions\ISimpleTransactionSuperior.cs" />\r
-    <Compile Include="System.Transactions\ISinglePhaseNotification.cs" />\r
-    <Compile Include="System.Transactions\IsolationLevel.cs" />\r
-    <Compile Include="System.Transactions\ITransactionPromoter.cs" />\r
-    <Compile Include="System.Transactions\PreparingEnlistment.cs" />\r
-    <Compile Include="System.Transactions\SinglePhaseEnlistment.cs" />\r
-    <Compile Include="System.Transactions\SubordinateTransaction.cs" />\r
-    <Compile Include="System.Transactions\Transaction.cs" />\r
-    <Compile Include="System.Transactions\TransactionAbortedException.cs" />\r
-    <Compile Include="System.Transactions\TransactionEventArgs.cs" />\r
-    <Compile Include="System.Transactions\TransactionException.cs" />\r
-    <Compile Include="System.Transactions\TransactionInDoubtException.cs" />\r
-    <Compile Include="System.Transactions\TransactionInformation.cs" />\r
-    <Compile Include="System.Transactions\TransactionInterop.cs" />\r
-    <Compile Include="System.Transactions\TransactionManager.cs" />\r
-    <Compile Include="System.Transactions\TransactionManagerCommunicationException.cs" />\r
-    <Compile Include="System.Transactions\TransactionOptions.cs" />\r
-    <Compile Include="System.Transactions\TransactionPromotionException.cs" />\r
-    <Compile Include="System.Transactions\TransactionScope.cs" />\r
-    <Compile Include="System.Transactions\TransactionScopeOption.cs" />\r
-    <Compile Include="System.Transactions\TransactionStatus.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Transactions/System.Transactions-tests-net_2_0.csproj b/mcs/class/System.Transactions/System.Transactions-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 03d3666..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D8B6CB08-B1BB-464B-82E1-E3276B92B458}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <OutputPath>bin\Debug\System.Transactions-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Transactions_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AsyncTest.cs" />\r
-    <Compile Include="Test\EnlistTest.cs" />\r
-    <Compile Include="Test\IntResourceManager.cs" />\r
-    <Compile Include="Test\TransactionScopeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_2_0.csproj">\r
-      <Project>{BBC5CD06-50EB-439E-9DBB-2B5D644BE6C3}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Transactions/System.Transactions-tests-net_4_0.csproj b/mcs/class/System.Transactions/System.Transactions-tests-net_4_0.csproj
deleted file mode 100644 (file)
index f899d87..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C171BA5C-B2B3-4BE9-97F1-3EDB31C36A77}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <OutputPath>bin\Debug\System.Transactions-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Transactions_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AsyncTest.cs" />\r
-    <Compile Include="Test\EnlistTest.cs" />\r
-    <Compile Include="Test\IntResourceManager.cs" />\r
-    <Compile Include="Test\TransactionScopeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_0.csproj">\r
-      <Project>{03A0E889-9E62-423F-B65E-40416E021F1B}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 10afc10c162457d4d446caba825739812a0955bf..991adbe5b4a99a2c2f21dc48e65f84d54862a355 100644 (file)
@@ -8,17 +8,12 @@ LIB_MCS_FLAGS = \
                /r:System.Core.dll \
                /r:System.Web.dll
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5
-endif
-
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
 # This is a .NET 3.5+ assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Web.Abstractions.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_2_0.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_2_0.csproj
deleted file mode 100644 (file)
index 84fa334..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Abstractions</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web\HttpApplicationStateBase.cs" />\r
-    <Compile Include="System.Web\HttpApplicationStateWrapper.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilitiesBase.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilitiesWrapper.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicyBase.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicyWrapper.cs" />\r
-    <Compile Include="System.Web\HttpContextBase.cs" />\r
-    <Compile Include="System.Web\HttpContextWrapper.cs" />\r
-    <Compile Include="System.Web\HttpFileCollectionBase.cs" />\r
-    <Compile Include="System.Web\HttpFileCollectionWrapper.cs" />\r
-    <Compile Include="System.Web\HttpPostedFileBase.cs" />\r
-    <Compile Include="System.Web\HttpPostedFileWrapper.cs" />\r
-    <Compile Include="System.Web\HttpRequestBase.cs" />\r
-    <Compile Include="System.Web\HttpRequestWrapper.cs" />\r
-    <Compile Include="System.Web\HttpResponseBase.cs" />\r
-    <Compile Include="System.Web\HttpResponseWrapper.cs" />\r
-    <Compile Include="System.Web\HttpServerUtilityBase.cs" />\r
-    <Compile Include="System.Web\HttpServerUtilityWrapper.cs" />\r
-    <Compile Include="System.Web\HttpSessionStateBase.cs" />\r
-    <Compile Include="System.Web\HttpSessionStateWrapper.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollectionBase.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollectionWrapper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_0.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_0.csproj
deleted file mode 100644 (file)
index 1e7ad3e..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4D4682F3-E5E3-4167-AA36-F689331C2509}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Abstractions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_2_0.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 2ebb029..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D2B91F5B-D914-4C6E-B41F-7DF9CADEB9A9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Abstractions-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Abstractions_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationStateBaseTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpFileCollectionWrapperTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_2_0.csproj">\r
-      <Project>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_4_0.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_4_0.csproj
deleted file mode 100644 (file)
index ae1cd76..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4D2C6AEF-0A7D-4E4A-A0F6-BBFEE9DA9F34}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Abstractions-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Abstractions_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationStateBaseTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpFileCollectionWrapperTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_0.csproj">\r
-      <Project>{4D4682F3-E5E3-4167-AA36-F689331C2509}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_2_0.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_2_0.csproj
deleted file mode 100644 (file)
index d6390e3..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8E128532-4FB9-4D6D-BD07-63025433586B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>dummy-System.Web.ApplicationServices</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_0.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_0.csproj
deleted file mode 100644 (file)
index ba67f74..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.ApplicationServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipCreateStatus.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipCreateUserException.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipPasswordException.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipPasswordFormat.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipProvider.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipProviderCollection.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipUser.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipUserCollection.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\MembershipValidatePasswordEventHandler.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\RoleProvider.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Security\ValidatePasswordEventArgs.cs" />\r
-    <Compile Include="..\System.Web\System.Web.UI\KeyedList.cs" />\r
-    <Compile Include="..\System.Web\System.Web.UI\KeyedListEnumerator.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration\MembershipPasswordCompatibilityMode.cs" />\r
-    <Compile Include="System.Web.Security\IMembershipHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 2bfe34c3b2c066d4d0b59bc6255cf63393eac0a3..7b50cd5e070ff63355b6a2b8bfbf47386926f77f 100644 (file)
@@ -15,11 +15,6 @@ LIB_MCS_FLAGS = \
                /r:System.Web.Abstractions.dll \
                /r:System.Web.Routing.dll
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5
-endif
-
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll
 endif
@@ -186,7 +181,7 @@ endif
 EXTRA_DISTFILES = $(foreach resource,$(TEST_RESOURCE_FILES), $(shell echo $(subst \`,\\\`,$(resource)) | cut -d ',' -f 1))
 
 # This is a .NET 3.5+ assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Web.DynamicData.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_2_0.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_2_0.csproj
deleted file mode 100644 (file)
index b0e5944..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{413F9BD7-61AE-4F12-8EDE-A7404B2BEE9C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.DynamicData</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\AssociationDirection.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\AssociationProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\ColumnProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DataModelProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqAssociationProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqColumnProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqDataModelProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqTableProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\TableProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData\ContextConfiguration.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicControl.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicControlParameter.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataExtensions.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataManager.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataRoute.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataRouteHandler.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicField.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicQueryStringParameter.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicValidator.cs" />\r
-    <Compile Include="System.Web.DynamicData\FieldTemplateFactory.cs" />\r
-    <Compile Include="System.Web.DynamicData\FieldTemplateUserControl.cs" />\r
-    <Compile Include="System.Web.DynamicData\FilterRepeater.cs" />\r
-    <Compile Include="System.Web.DynamicData\FilterUserControlBase.cs" />\r
-    <Compile Include="System.Web.DynamicData\IControlParameterTarget.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldFormattingOptions.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplate.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplateFactory.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplateHost.cs" />\r
-    <Compile Include="System.Web.DynamicData\IWhereParametersProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaChildrenColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaForeignKeyColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaModel.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaTable.cs" />\r
-    <Compile Include="System.Web.DynamicData\PageAction.cs" />\r
-    <Compile Include="System.Web.DynamicData\TableNameAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0.csproj">\r
-      <Project>{F3112064-6311-48A9-992B-A68DD3C62133}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_2_0.csproj">\r
-      <Project>{286ED1A3-6AE6-4147-A43B-B3421681CC84}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_2_0.csproj">\r
-      <Project>{42527CAE-C932-4518-9CF7-F4ABB44510A5}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_2_0.csproj">\r
-      <Project>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_2_0.csproj">\r
-      <Project>{A9B310AD-FF67-49ED-8AC8-AAF1E4B05249}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_0.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_0.csproj
deleted file mode 100644 (file)
index 5000675..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B52A5C17-3CD0-4B74-8FF4-D115F0B999E4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.DynamicData</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\AssociationDirection.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\AssociationProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\ColumnProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DataModelProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqAssociationProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqColumnProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqDataModelProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqTableProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\TableProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData\ContextConfiguration.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicControl.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicControlParameter.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataExtensions.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataManager.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataRoute.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataRouteHandler.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicField.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicQueryStringParameter.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicValidator.cs" />\r
-    <Compile Include="System.Web.DynamicData\FieldTemplateFactory.cs" />\r
-    <Compile Include="System.Web.DynamicData\FieldTemplateUserControl.cs" />\r
-    <Compile Include="System.Web.DynamicData\FilterRepeater.cs" />\r
-    <Compile Include="System.Web.DynamicData\FilterUserControlBase.cs" />\r
-    <Compile Include="System.Web.DynamicData\IControlParameterTarget.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldFormattingOptions.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplate.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplateFactory.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplateHost.cs" />\r
-    <Compile Include="System.Web.DynamicData\IWhereParametersProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaChildrenColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaForeignKeyColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaModel.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaTable.cs" />\r
-    <Compile Include="System.Web.DynamicData\PageAction.cs" />\r
-    <Compile Include="System.Web.DynamicData\TableNameAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0.csproj">\r
-      <Project>{82CAAC49-507E-446E-A6FB-2C875E8F2C4E}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_0.csproj">\r
-      <Project>{EB50CF5B-D17A-4BEF-96C4-874FB8E61ACE}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_0.csproj">\r
-      <Project>{3A327AAD-B09D-47E3-A915-C16BFB3F1682}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_0.csproj">\r
-      <Project>{4D4682F3-E5E3-4167-AA36-F689331C2509}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_4_0.csproj">\r
-      <Project>{3EDC0F88-564F-4B98-A50A-471345348F16}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_2_0.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 51a5691..0000000
+++ /dev/null
@@ -1,697 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AD07E068-F605-4F24-A60B-74514641DDDC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.DynamicData-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.DynamicData_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\CustomSection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Test\Common\AFieldTemplate.cs" />\r
-    <Compile Include="Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Common\AssociatedBar.cs" />\r
-    <Compile Include="Test\Common\AssociatedFoo.cs" />\r
-    <Compile Include="Test\Common\Baz.cs" />\r
-    <Compile Include="Test\Common\BazColumnAttributes.cs" />\r
-    <Compile Include="Test\Common\BazDataTypeDefaultTypes.cs" />\r
-    <Compile Include="Test\Common\BazNoStrings.cs" />\r
-    <Compile Include="Test\Common\BazNoStringsNoPrimary.cs" />\r
-    <Compile Include="Test\Common\BazValidationAttributes.cs" />\r
-    <Compile Include="Test\Common\BazWithDataTypeAttribute.cs" />\r
-    <Compile Include="Test\Common\EmployeesDataContext.cs" />\r
-    <Compile Include="Test\Common\FakeHttpWorkerRequest.cs" />\r
-    <Compile Include="Test\Common\FieldFormattingOptions.cs" />\r
-    <Compile Include="Test\Common\FieldTemplatePathTables.cs" />\r
-    <Compile Include="Test\Common\FieldTemplateTestDescription.cs" />\r
-    <Compile Include="Test\Common\FooBarNoScaffold.cs" />\r
-    <Compile Include="Test\Common\FooDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooDisplayName.cs" />\r
-    <Compile Include="Test\Common\FooDisplayNameEmptyName.cs" />\r
-    <Compile Include="Test\Common\FooEmpty.cs" />\r
-    <Compile Include="Test\Common\FooEmptyDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooEmptySortColumn.cs" />\r
-    <Compile Include="Test\Common\FooInvalidDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooMisnamedSortColumn.cs" />\r
-    <Compile Include="Test\Common\FooNoDefaultsWithPrimaryKey.cs" />\r
-    <Compile Include="Test\Common\FooNoPrimaryColumns.cs" />\r
-    <Compile Include="Test\Common\FooNoScaffold.cs" />\r
-    <Compile Include="Test\Common\FooReadOnly.cs" />\r
-    <Compile Include="Test\Common\FooSettableDefaults.cs" />\r
-    <Compile Include="Test\Common\FooWithDefaults.cs" />\r
-    <Compile Include="Test\Common\FooWithMetadataType.cs" />\r
-    <Compile Include="Test\Common\FooWithToString.cs" />\r
-    <Compile Include="Test\Common\ITestDataContext.cs" />\r
-    <Compile Include="Test\Common\KnownResponseHeader.cs" />\r
-    <Compile Include="Test\Common\MiscExtensions.cs" />\r
-    <Compile Include="Test\Common\Mocks.cs" />\r
-    <Compile Include="Test\Common\MyDynamicDataRouteHandler.cs" />\r
-    <Compile Include="Test\Common\MyHttpContextWrapper.cs" />\r
-    <Compile Include="Test\Common\MyHttpRequestWrapper.cs" />\r
-    <Compile Include="Test\Common\PokerDynamicControl.cs" />\r
-    <Compile Include="Test\Common\PokerDynamicValidator.cs" />\r
-    <Compile Include="Test\Common\PokerFieldTemplateUserControl.cs" />\r
-    <Compile Include="Test\Common\TestDataColumn.cs" />\r
-    <Compile Include="Test\Common\TestDataContainer.cs" />\r
-    <Compile Include="Test\Common\TestDataContext.cs" />\r
-    <Compile Include="Test\Common\TestDataContext2.cs" />\r
-    <Compile Include="Test\Common\TestDataContext3.cs" />\r
-    <Compile Include="Test\Common\TestDataContext4.cs" />\r
-    <Compile Include="Test\Common\TestDataTable.cs" />\r
-    <Compile Include="Test\Common\TestsBasePage.cs" />\r
-    <Compile Include="Test\Common\TestsSetup.cs" />\r
-    <Compile Include="Test\Common\TestStubTypes.cs" />\r
-    <Compile Include="Test\Common\UnknownResponseHeader.cs" />\r
-    <Compile Include="Test\Common\Utils.cs" />\r
-    <Compile Include="Test\DataObjects\Employee.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeColumn.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeDynamicDataContainer.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeTable.cs" />\r
-    <Compile Include="Test\DataObjects\SeasonalEmployee.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataColumn.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataContainer.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataSource.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataSourceView.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataTable.cs" />\r
-    <Compile Include="Test\DataSource\IDynamicDataContainer.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataAssociationAttribute.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataAssociationProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerColumnProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerModelProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerTableProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataSortableAttribute.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataStringLengthAttribute.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData.ModelProviders\TableProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\ContextConfigurationTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicControlTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataRouteHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataRouteTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\FieldTemplateFactoryTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\FieldTemplateUserControlTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaModelTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaTableTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.DynamicData\System.Web.DynamicData-net_2_0.csproj">\r
-      <Project>{413F9BD7-61AE-4F12-8EDE-A7404B2BEE9C}</Project>\r
-      <Name>System.Web.DynamicData\System.Web.DynamicData-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0.csproj">\r
-      <Project>{F3112064-6311-48A9-992B-A68DD3C62133}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_2_0.csproj">\r
-      <Project>{286ED1A3-6AE6-4147-A43B-B3421681CC84}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_2_0.csproj">\r
-      <Project>{42527CAE-C932-4518-9CF7-F4ABB44510A5}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_2_0.csproj">\r
-      <Project>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_2_0.csproj">\r
-      <Project>{A9B310AD-FF67-49ED-8AC8-AAF1E4B05249}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_2_0.csproj">\r
-      <Project>{328B62A2-55C4-420A-81C1-AEAB15A8F3A6}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/FilterUserControl.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.FilterUserControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/FilterUserControl.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.FilterUserControl.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/GridViewPager.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.GridViewPager.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/GridViewPager.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.GridViewPager.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/Back.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.Back.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/header_back.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.header_back.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgFirst.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgFirst.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgLast.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgLast.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgNext.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgNext.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgPrev.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgPrev.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/plus.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Children.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Children.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Children.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Children.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomColor.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomColor.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomColor.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomColor.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomFieldTemplate.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomFieldTemplate.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomFieldTemplate.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomFieldTemplate.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Decimal_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Decimal_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Decimal_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Decimal_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Integer_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Integer_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Integer_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Integer_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MultilineText_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MultilineText_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MultilineText_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MultilineText_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MyCustomUIHintTemplate_Text.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MyCustomUIHintTemplate_Text.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MyCustomUIHintTemplate_Text.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MyCustomUIHintTemplate_Text.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte[].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte[].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte[].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte[].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Char.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Char.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Char.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Char.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/FooEmpty.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.FooEmpty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/FooEmpty.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.FooEmpty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/ICollection.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.ICollection.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/ICollection.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.ICollection.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/MonoTests.Common.FooEmpty.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.MonoTests.Common.FooEmpty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/MonoTests.Common.FooEmpty.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.MonoTests.Common.FooEmpty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Object.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Object.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Object.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Object.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/SByte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.SByte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/SByte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.SByte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/String.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.String.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/String.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.String.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte[].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte[].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte[].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte[].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Char.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Char.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Char.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Char.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.Generic.List`1[System.String].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.Generic.List`1[System.String].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.Generic.List`1[System.String].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.Generic.List`1[System.String].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.ICollection.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.ICollection.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.ICollection.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.ICollection.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Object.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Object.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Object.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Object.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.SByte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.SByte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.SByte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.SByte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.String.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.String.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.String.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.String.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/PlainControlTemplate.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.PlainControlTemplate.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/PlainControlTemplate.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.PlainControlTemplate.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Details.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Details.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Details.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Details.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Edit.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Edit.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Edit.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Edit.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Insert.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Insert.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Insert.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Insert.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/List.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.List.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/List.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.List.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/ListDetails.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.ListDetails.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/ListDetails.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.ListDetails.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/web.config">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.web.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Global.asax">\r
-      <LogicalName>MonoTests.WebPages.Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_01.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_01.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_01.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_01.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_02.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_02.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_02.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_02.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_03.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_03.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_03.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_03.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_04.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_04.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_04.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_04.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_05.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_05.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_05.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_05.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_06.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_06.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_06.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_06.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_07.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_07.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_07.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_07.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_08.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_08.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_08.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_08.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_09.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_09.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_09.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_09.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_10.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_10.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_10.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_10.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_01.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_01.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_01.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_01.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_02.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_02.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_02.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_02.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.css">\r
-      <LogicalName>MonoTests.WebPages.Site.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.master">\r
-      <LogicalName>MonoTests.WebPages.Site.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.master.cs">\r
-      <LogicalName>MonoTests.WebPages.Site.master.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.2.0">\r
-      <LogicalName>MonoTests.WebPages.web.config.2.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.4.0">\r
-      <LogicalName>MonoTests.WebPages.web.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.4.5">\r
-      <LogicalName>MonoTests.WebPages.web.config.4.5</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_4_0.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 09576a0..0000000
+++ /dev/null
@@ -1,701 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B6DE5FC0-11C1-4A18-B140-FFFB4286AF12}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.DynamicData-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.DynamicData_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\CustomSection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Test\Common\AFieldTemplate.cs" />\r
-    <Compile Include="Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Common\AssociatedBar.cs" />\r
-    <Compile Include="Test\Common\AssociatedFoo.cs" />\r
-    <Compile Include="Test\Common\Baz.cs" />\r
-    <Compile Include="Test\Common\BazColumnAttributes.cs" />\r
-    <Compile Include="Test\Common\BazDataTypeDefaultTypes.cs" />\r
-    <Compile Include="Test\Common\BazNoStrings.cs" />\r
-    <Compile Include="Test\Common\BazNoStringsNoPrimary.cs" />\r
-    <Compile Include="Test\Common\BazValidationAttributes.cs" />\r
-    <Compile Include="Test\Common\BazWithDataTypeAttribute.cs" />\r
-    <Compile Include="Test\Common\EmployeesDataContext.cs" />\r
-    <Compile Include="Test\Common\FakeHttpWorkerRequest.cs" />\r
-    <Compile Include="Test\Common\FieldFormattingOptions.cs" />\r
-    <Compile Include="Test\Common\FieldTemplatePathTables.cs" />\r
-    <Compile Include="Test\Common\FieldTemplateTestDescription.cs" />\r
-    <Compile Include="Test\Common\FooBarNoScaffold.cs" />\r
-    <Compile Include="Test\Common\FooDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooDisplayName.cs" />\r
-    <Compile Include="Test\Common\FooDisplayNameEmptyName.cs" />\r
-    <Compile Include="Test\Common\FooEmpty.cs" />\r
-    <Compile Include="Test\Common\FooEmptyDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooEmptySortColumn.cs" />\r
-    <Compile Include="Test\Common\FooInvalidDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooMisnamedSortColumn.cs" />\r
-    <Compile Include="Test\Common\FooNoDefaultsWithPrimaryKey.cs" />\r
-    <Compile Include="Test\Common\FooNoPrimaryColumns.cs" />\r
-    <Compile Include="Test\Common\FooNoScaffold.cs" />\r
-    <Compile Include="Test\Common\FooReadOnly.cs" />\r
-    <Compile Include="Test\Common\FooSettableDefaults.cs" />\r
-    <Compile Include="Test\Common\FooWithDefaults.cs" />\r
-    <Compile Include="Test\Common\FooWithMetadataType.cs" />\r
-    <Compile Include="Test\Common\FooWithToString.cs" />\r
-    <Compile Include="Test\Common\ITestDataContext.cs" />\r
-    <Compile Include="Test\Common\KnownResponseHeader.cs" />\r
-    <Compile Include="Test\Common\MiscExtensions.cs" />\r
-    <Compile Include="Test\Common\Mocks.cs" />\r
-    <Compile Include="Test\Common\MyDynamicDataRouteHandler.cs" />\r
-    <Compile Include="Test\Common\MyHttpContextWrapper.cs" />\r
-    <Compile Include="Test\Common\MyHttpRequestWrapper.cs" />\r
-    <Compile Include="Test\Common\PokerDynamicControl.cs" />\r
-    <Compile Include="Test\Common\PokerDynamicValidator.cs" />\r
-    <Compile Include="Test\Common\PokerFieldTemplateUserControl.cs" />\r
-    <Compile Include="Test\Common\TestDataColumn.cs" />\r
-    <Compile Include="Test\Common\TestDataContainer.cs" />\r
-    <Compile Include="Test\Common\TestDataContext.cs" />\r
-    <Compile Include="Test\Common\TestDataContext2.cs" />\r
-    <Compile Include="Test\Common\TestDataContext3.cs" />\r
-    <Compile Include="Test\Common\TestDataContext4.cs" />\r
-    <Compile Include="Test\Common\TestDataTable.cs" />\r
-    <Compile Include="Test\Common\TestsBasePage.cs" />\r
-    <Compile Include="Test\Common\TestsSetup.cs" />\r
-    <Compile Include="Test\Common\TestStubTypes.cs" />\r
-    <Compile Include="Test\Common\UnknownResponseHeader.cs" />\r
-    <Compile Include="Test\Common\Utils.cs" />\r
-    <Compile Include="Test\DataObjects\Employee.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeColumn.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeDynamicDataContainer.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeTable.cs" />\r
-    <Compile Include="Test\DataObjects\SeasonalEmployee.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataColumn.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataContainer.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataSource.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataSourceView.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataTable.cs" />\r
-    <Compile Include="Test\DataSource\IDynamicDataContainer.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataAssociationAttribute.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataAssociationProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerColumnProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerModelProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerTableProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataSortableAttribute.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataStringLengthAttribute.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData.ModelProviders\TableProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\ContextConfigurationTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicControlTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataRouteHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataRouteTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\FieldTemplateFactoryTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\FieldTemplateUserControlTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaModelTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaTableTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.DynamicData\System.Web.DynamicData-net_4_0.csproj">\r
-      <Project>{B52A5C17-3CD0-4B74-8FF4-D115F0B999E4}</Project>\r
-      <Name>System.Web.DynamicData\System.Web.DynamicData-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0.csproj">\r
-      <Project>{82CAAC49-507E-446E-A6FB-2C875E8F2C4E}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_0.csproj">\r
-      <Project>{EB50CF5B-D17A-4BEF-96C4-874FB8E61ACE}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_0.csproj">\r
-      <Project>{3A327AAD-B09D-47E3-A915-C16BFB3F1682}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_0.csproj">\r
-      <Project>{4D4682F3-E5E3-4167-AA36-F689331C2509}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_4_0.csproj">\r
-      <Project>{3EDC0F88-564F-4B98-A50A-471345348F16}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_4_0.csproj">\r
-      <Project>{D4CC2FBC-04C8-446E-915D-69ABC8FFFFAE}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/FilterUserControl.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.FilterUserControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/FilterUserControl.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.FilterUserControl.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/GridViewPager.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.GridViewPager.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/GridViewPager.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.GridViewPager.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/Back.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.Back.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/header_back.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.header_back.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgFirst.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgFirst.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgLast.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgLast.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgNext.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgNext.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgPrev.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgPrev.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/plus.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Children.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Children.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Children.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Children.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomColor.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomColor.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomColor.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomColor.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomFieldTemplate.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomFieldTemplate.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomFieldTemplate.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomFieldTemplate.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Decimal_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Decimal_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Decimal_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Decimal_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Integer_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Integer_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Integer_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Integer_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MultilineText_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MultilineText_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MultilineText_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MultilineText_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MyCustomUIHintTemplate_Text.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MyCustomUIHintTemplate_Text.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MyCustomUIHintTemplate_Text.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MyCustomUIHintTemplate_Text.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte[].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte[].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte[].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte[].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Char.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Char.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Char.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Char.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/FooEmpty.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.FooEmpty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/FooEmpty.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.FooEmpty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/ICollection.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.ICollection.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/ICollection.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.ICollection.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/MonoTests.Common.FooEmpty.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.MonoTests.Common.FooEmpty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/MonoTests.Common.FooEmpty.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.MonoTests.Common.FooEmpty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Object.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Object.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Object.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Object.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/SByte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.SByte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/SByte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.SByte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/String.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.String.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/String.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.String.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte[].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte[].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte[].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte[].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Char.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Char.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Char.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Char.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.Generic.List`1[System.String].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.Generic.List`1[System.String].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.Generic.List`1[System.String].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.Generic.List`1[System.String].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.ICollection.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.ICollection.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.ICollection.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.ICollection.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Object.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Object.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Object.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Object.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.SByte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.SByte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.SByte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.SByte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.String.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.String.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.String.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.String.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/PlainControlTemplate.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.PlainControlTemplate.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/PlainControlTemplate.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.PlainControlTemplate.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Details.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Details.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Details.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Details.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Edit.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Edit.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Edit.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Edit.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Insert.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Insert.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Insert.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Insert.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/List.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.List.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/List.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.List.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/ListDetails.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.ListDetails.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/ListDetails.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.ListDetails.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/web.config">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.web.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Global.asax">\r
-      <LogicalName>MonoTests.WebPages.Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_01.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_01.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_01.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_01.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_02.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_02.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_02.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_02.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_03.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_03.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_03.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_03.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_04.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_04.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_04.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_04.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_05.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_05.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_05.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_05.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_06.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_06.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_06.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_06.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_07.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_07.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_07.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_07.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_08.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_08.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_08.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_08.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_09.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_09.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_09.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_09.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_10.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_10.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_10.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_10.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_01.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_01.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_01.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_01.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_02.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_02.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_02.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_02.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.css">\r
-      <LogicalName>MonoTests.WebPages.Site.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.master">\r
-      <LogicalName>MonoTests.WebPages.Site.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.master.cs">\r
-      <LogicalName>MonoTests.WebPages.Site.master.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.2.0">\r
-      <LogicalName>MonoTests.WebPages.web.config.2.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.4.0">\r
-      <LogicalName>MonoTests.WebPages.web.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.4.5">\r
-      <LogicalName>MonoTests.WebPages.web.config.4.5</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 4304e0a7f9e79c465f4b46ff1c173f337ac8d260..4398b8bf4f5e42b01efb1a3b3c26b6736fbc2f97 100644 (file)
@@ -635,11 +635,11 @@ namespace MonoTests.System.Web.DynamicData
 
                        // Custom type
                        //   It appears that DataTypeAttribute's custom type name is passed to BuildVirtualPath
-                       AssertExtensions.Throws<ArgumentNullException> (() => {
+                       AssertExtensions.Throws<InvalidOperationException> (() => {
                                string path = ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null);
                        }, "#A1");
                        
-                       AssertExtensions.Throws<ArgumentNullException> (() => {
+                       AssertExtensions.Throws<InvalidOperationException> (() => {
                                string path = ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "NoSuchTemplate");
                        }, "#A1-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Boolean.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean"), "#A1-2");
@@ -650,11 +650,11 @@ namespace MonoTests.System.Web.DynamicData
                        Assert.Greater (mc.UIHint.Length, 0, "#A2-1");
 
                        // Proves that UIHint on the column is not used, just the uiHint argument
-                       AssertExtensions.Throws<ArgumentNullException> (() => {
+                       AssertExtensions.Throws<InvalidOperationException> (() => {
                                string path = ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null);
                        }, "#A2-2");
 
-                       AssertExtensions.Throws<ArgumentNullException> (() => {
+                       AssertExtensions.Throws<InvalidOperationException> (() => {
                                string path = ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "NoSuchTemplate");
                        }, "#A2-3");
                        
diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_2_0.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_2_0.csproj
deleted file mode 100644 (file)
index cd61854..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BC7F5750-D8B4-4D81-B5CE-F7923B3A5AEA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\AsyncPostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\AsyncPostBackTriggerEventNameConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\CollectionEditorBase.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ExtenderControlDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\PostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ScriptManagerDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ScriptManagerProxyDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\TimerDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdatePanelDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdatePanelTriggerCollectionEditor.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdateProgressAssociatedUpdatePanelIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdateProgressDesigner.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Design\System.Design-net_2_0-1.csproj">\r
-      <Project>{31BD6BF1-0C7A-4C0A-AB48-091F2EBB4AAC}</Project>\r
-      <Name>System.Design\System.Design-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_0.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_0.csproj
deleted file mode 100644 (file)
index fe98426..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{98E79AFE-7DC9-46E0-842B-A508D9743559}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\AsyncPostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\AsyncPostBackTriggerEventNameConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\CollectionEditorBase.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ExtenderControlDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\PostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ScriptManagerDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ScriptManagerProxyDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\TimerDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdatePanelDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdatePanelTriggerCollectionEditor.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdateProgressAssociatedUpdatePanelIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdateProgressDesigner.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Design\System.Design-net_4_0-1.csproj">\r
-      <Project>{7D002453-8C26-4B11-8A26-B19877B73BDC}</Project>\r
-      <Name>System.Design\System.Design-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Extensions.Design_1.0/System.Web.Extensions.Design_1.0-net_2_0.csproj b/mcs/class/System.Web.Extensions.Design_1.0/System.Web.Extensions.Design_1.0-net_2_0.csproj
deleted file mode 100644 (file)
index 93c968c..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A4D4C8B5-6C55-48C4-8C47-F394D5979079}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/compat/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\AsyncPostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\AsyncPostBackTriggerEventNameConverter.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\CollectionEditorBase.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\ExtenderControlDesigner.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\PostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\ScriptManagerDesigner.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\ScriptManagerProxyDesigner.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\TimerDesigner.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\UpdatePanelDesigner.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\UpdatePanelTriggerCollectionEditor.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\UpdateProgressAssociatedUpdatePanelIDConverter.cs" />\r
-    <Compile Include="..\System.Web.Extensions.Design\System.Web.Extensions.Design\UpdateProgressDesigner.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Design\System.Design-net_2_0-1.csproj">\r
-      <Project>{31BD6BF1-0C7A-4C0A-AB48-091F2EBB4AAC}</Project>\r
-      <Name>System.Design\System.Design-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">\r
-      <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_2_0.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-net_2_0.csproj
deleted file mode 100644 (file)
index 0da8da8..0000000
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{42527CAE-C932-4518-9CF7-F4ABB44510A5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationCredentials.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationMembershipProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientRoleProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientSettingsProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientWindowsAuthenticationMembershipProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\IClientFormsAuthenticationCredentialsProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\SettingsSavedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\UserValidatedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ClientFormsIdentity.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ClientRolePrincipal.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ConnectivityStatus.cs" />\r
-    <Compile Include=".\System.Web.Configuration\Converter.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ConvertersCollection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingAuthenticationServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingJsonSerializationSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingProfileServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingRoleServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingScriptResourceHandlerSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingWebServicesSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.Configuration\SystemWebExtensionsSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\DynamicDataSourceOperation.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\DynamicValidatorEventArgs.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\IDynamicDataSource.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\IDynamicValidatorException.cs" />\r
-    <Compile Include=".\System.Web.Handlers\ScriptModule.cs" />\r
-    <Compile Include=".\System.Web.Handlers\ScriptResourceHandler.cs" />\r
-    <Compile Include=".\System.Web.Query.Dynamic\DynamicClass.cs" />\r
-    <Compile Include=".\System.Web.Query.Dynamic\ParseException.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptConverter.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptSerializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptTypeResolver.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\Json.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JSON\JavaScriptUtils.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JSON\ReflectionUtils.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JsonDeserializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JsonSerializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\ScriptIgnoreAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\SimpleTypeResolver.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\StringBuilderExtensions.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\AuthenticationService.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ClientProxyHandler.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\GenerateScriptTypeAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\LogicalTypeInfo.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ProfileService.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ProxyGenerator.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ResponseFormat.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\RestHandler.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptHandlerFactory.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptMethodAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptServiceAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPager.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldCollection.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\HelperExtensions.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\InsertItemPosition.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\IPageableItemContainer.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSource.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceContextEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDeleteEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDisposeEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceInsertEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceSelectEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceStatusEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceUpdateEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceValidationException.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceView.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListView.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelMode.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewContainer.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDataItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDeletedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDeleteEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewEditEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItemEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItemType.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewPagedDataSource.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewSelectEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewSortEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewTableCell.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewTableRow.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewUpdatedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewUpdateEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\NextPreviousPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\NumericPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\PageEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\PagePropertiesChangingEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\TemplatePagerField.cs" />\r
-    <Compile Include=".\System.Web.UI\AsyncPostBackErrorEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\AsyncPostBackTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\AuthenticationServiceManager.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeEntry.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeScriptReference.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeScriptReferenceEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\ExtenderControl.cs" />\r
-    <Compile Include=".\System.Web.UI\IExtenderControl.cs" />\r
-    <Compile Include=".\System.Web.UI\IScriptControl.cs" />\r
-    <Compile Include=".\System.Web.UI\PostBackTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\ProfileServiceManager.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredArrayDeclaration.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredDisposeScript.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredExpandoAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredHiddenField.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredScript.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredScriptType.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptBehaviorDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptComponentDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptControl.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptControlDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptManager.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptManagerProxy.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptMode.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReference.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceBase.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptResourceAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\ServiceReference.cs" />\r
-    <Compile Include=".\System.Web.UI\ServiceReferenceCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\TargetControlTypeAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\Timer.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanel.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelControlTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelRenderMode.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelTriggerCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelUpdateMode.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdateProgress.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_2_0.csproj">\r
-      <Project>{286ED1A3-6AE6-4147-A43B-B3421681CC84}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js">\r
-      <LogicalName>MicrosoftAjax.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js">\r
-      <LogicalName>MicrosoftAjax.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js">\r
-      <LogicalName>MicrosoftAjaxTimer.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js">\r
-      <LogicalName>MicrosoftAjaxTimer.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_0.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_0.csproj
deleted file mode 100644 (file)
index 3b91bbd..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3A327AAD-B09D-47E3-A915-C16BFB3F1682}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationCredentials.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationMembershipProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientRoleProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientSettingsProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientWindowsAuthenticationMembershipProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\IClientFormsAuthenticationCredentialsProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\SettingsSavedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\UserValidatedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ClientFormsIdentity.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ClientRolePrincipal.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ConnectivityStatus.cs" />\r
-    <Compile Include=".\System.Web.Configuration\Converter.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ConvertersCollection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingAuthenticationServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingJsonSerializationSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingProfileServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingRoleServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingScriptResourceHandlerSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingWebServicesSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.Configuration\SystemWebExtensionsSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\DynamicDataSourceOperation.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\DynamicValidatorEventArgs.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\IDynamicDataSource.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\IDynamicValidatorException.cs" />\r
-    <Compile Include=".\System.Web.Handlers\ScriptModule.cs" />\r
-    <Compile Include=".\System.Web.Handlers\ScriptResourceHandler.cs" />\r
-    <Compile Include=".\System.Web.Query.Dynamic\DynamicClass.cs" />\r
-    <Compile Include=".\System.Web.Query.Dynamic\ParseException.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptConverter.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptSerializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptTypeResolver.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\Json.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JSON\JavaScriptUtils.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JSON\ReflectionUtils.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JsonDeserializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JsonSerializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\ScriptIgnoreAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\SimpleTypeResolver.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\StringBuilderExtensions.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\AuthenticationService.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ClientProxyHandler.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\GenerateScriptTypeAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\LogicalTypeInfo.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ProfileService.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ProxyGenerator.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ResponseFormat.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\RestHandler.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptHandlerFactory.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptMethodAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptServiceAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPager.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldCollection.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\HelperExtensions.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\InsertItemPosition.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\IPageableItemContainer.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSource.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceContextEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDeleteEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDisposeEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceInsertEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceSelectEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceStatusEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceUpdateEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceValidationException.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceView.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListView.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelMode.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewContainer.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDataItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDeletedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDeleteEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewEditEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItemEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItemType.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewPagedDataSource.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewSelectEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewSortEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewTableCell.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewTableRow.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewUpdatedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewUpdateEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\NextPreviousPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\NumericPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\PageEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\PagePropertiesChangingEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\TemplatePagerField.cs" />\r
-    <Compile Include=".\System.Web.UI\AsyncPostBackErrorEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\AsyncPostBackTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\AuthenticationServiceManager.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeEntry.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeScriptReference.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeScriptReferenceEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\ExtenderControl.cs" />\r
-    <Compile Include=".\System.Web.UI\IExtenderControl.cs" />\r
-    <Compile Include=".\System.Web.UI\IScriptControl.cs" />\r
-    <Compile Include=".\System.Web.UI\PostBackTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\ProfileServiceManager.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredArrayDeclaration.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredDisposeScript.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredExpandoAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredHiddenField.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredScript.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredScriptType.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptBehaviorDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptComponentDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptControl.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptControlDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptManager.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptManagerProxy.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptMode.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReference.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceBase.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptResourceAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\ServiceReference.cs" />\r
-    <Compile Include=".\System.Web.UI\ServiceReferenceCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\TargetControlTypeAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\Timer.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanel.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelControlTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelRenderMode.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelTriggerCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelUpdateMode.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdateProgress.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_0.csproj">\r
-      <Project>{EB50CF5B-D17A-4BEF-96C4-874FB8E61ACE}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_0.csproj">\r
-      <Project>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0.csproj">\r
-      <Project>{49578558-7849-4977-B029-8ECFA79C79E8}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js">\r
-      <LogicalName>MicrosoftAjax.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js">\r
-      <LogicalName>MicrosoftAjax.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js">\r
-      <LogicalName>MicrosoftAjaxTimer.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js">\r
-      <LogicalName>MicrosoftAjaxTimer.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_2_0.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_2_0.csproj
deleted file mode 100644 (file)
index e6db9f6..0000000
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1F2F06C1-46F5-4297-B417-61C7648D9C1F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Extensions-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;SYSTEM_WEB_EXTENSIONS;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;SYSTEM_WEB_EXTENSIONS;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\AssemblyInfo.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Global.asax.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\code\Bug604053_DataSource.cs" />\r
-    <Compile Include="Test\code\Country.cs" />\r
-    <Compile Include="Test\code\CountryCollection.cs" />\r
-    <Compile Include="Test\code\WebTestLocal.cs" />\r
-    <Compile Include="Test\System.Web.Script.Serialization\JavaScriptSerializerTest.cs" />\r
-    <Compile Include="Test\System.Web.Script.Services\ProxyGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataPagerFieldCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EventRecorder.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListViewPagedDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptBehaviorDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptComponentDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptControlDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptReferenceBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\UpdateProgressTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_2_0.csproj">\r
-      <Project>{42527CAE-C932-4518-9CF7-F4ABB44510A5}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_2_0.csproj">\r
-      <Project>{286ED1A3-6AE6-4147-A43B-B3421681CC84}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_2_0.csproj">\r
-      <Project>{DA50E37C-63DE-4049-9BE0-141BF1104E20}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_2_0.csproj">\r
-      <Project>{328B62A2-55C4-420A-81C1-AEAB15A8F3A6}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js">\r
-      <LogicalName>MicrosoftAjax.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js">\r
-      <LogicalName>MicrosoftAjax.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js">\r
-      <LogicalName>MicrosoftAjaxTimer.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js">\r
-      <LogicalName>MicrosoftAjaxTimer.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/Web.mono.config">\r
-      <LogicalName>Web.mono.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.4.5">\r
-      <LogicalName>profile.config.4.5</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.4.0">\r
-      <LogicalName>profile.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.2.0">\r
-      <LogicalName>profile.config.2.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewSort.aspx">\r
-      <LogicalName>ListViewSort.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTest.aspx">\r
-      <LogicalName>ListViewTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug535701_1.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug535701_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug535701_2.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug535701_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug604053.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug604053.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs">\r
-      <LogicalName>MyPage.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax">\r
-      <LogicalName>Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx">\r
-      <LogicalName>My.ashx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx">\r
-      <LogicalName>MyPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx">\r
-      <LogicalName>MyPageWithDerivedMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx">\r
-      <LogicalName>MyPageWithMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMasterInvalidPlaceHolder.aspx">\r
-      <LogicalName>MyPageWithMasterInvalidPlaceHolder.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master">\r
-      <LogicalName>My.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master">\r
-      <LogicalName>MyDerived.master</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_4_0.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 890da27..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{195974C6-5A5F-421C-B96D-5C53825BBDDD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Extensions-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;SYSTEM_WEB_EXTENSIONS;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;SYSTEM_WEB_EXTENSIONS;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\AssemblyInfo.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Global.asax.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\code\Bug604053_DataSource.cs" />\r
-    <Compile Include="Test\code\Country.cs" />\r
-    <Compile Include="Test\code\CountryCollection.cs" />\r
-    <Compile Include="Test\code\WebTestLocal.cs" />\r
-    <Compile Include="Test\System.Web.Script.Serialization\JavaScriptSerializerTest.cs" />\r
-    <Compile Include="Test\System.Web.Script.Services\ProxyGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataPagerFieldCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EventRecorder.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListViewPagedDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptBehaviorDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptComponentDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptControlDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptReferenceBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\UpdateProgressTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_0.csproj">\r
-      <Project>{3A327AAD-B09D-47E3-A915-C16BFB3F1682}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_0.csproj">\r
-      <Project>{EB50CF5B-D17A-4BEF-96C4-874FB8E61ACE}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_0.csproj">\r
-      <Project>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0.csproj">\r
-      <Project>{49578558-7849-4977-B029-8ECFA79C79E8}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_4_0.csproj">\r
-      <Project>{D4CC2FBC-04C8-446E-915D-69ABC8FFFFAE}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js">\r
-      <LogicalName>MicrosoftAjax.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js">\r
-      <LogicalName>MicrosoftAjax.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js">\r
-      <LogicalName>MicrosoftAjaxTimer.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js">\r
-      <LogicalName>MicrosoftAjaxTimer.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/Web.mono.config">\r
-      <LogicalName>Web.mono.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.4.5">\r
-      <LogicalName>profile.config.4.5</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.4.0">\r
-      <LogicalName>profile.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.2.0">\r
-      <LogicalName>profile.config.2.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewSort.aspx">\r
-      <LogicalName>ListViewSort.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTest.aspx">\r
-      <LogicalName>ListViewTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug535701_1.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug535701_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug535701_2.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug535701_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug604053.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug604053.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs">\r
-      <LogicalName>MyPage.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax">\r
-      <LogicalName>Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx">\r
-      <LogicalName>My.ashx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx">\r
-      <LogicalName>MyPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx">\r
-      <LogicalName>MyPageWithDerivedMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx">\r
-      <LogicalName>MyPageWithMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMasterInvalidPlaceHolder.aspx">\r
-      <LogicalName>MyPageWithMasterInvalidPlaceHolder.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master">\r
-      <LogicalName>My.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master">\r
-      <LogicalName>MyDerived.master</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 5af83ada28b44f9b616a52a59911c4a6c4dab956..7944ff08d6454eac85e904ef0643939f899caf0b 100644 (file)
@@ -1,5 +1,5 @@
 //
-// System.Web.UI.WebControls.ListView
+// System.Web.UI.WebControls.ListViewDataItem
 //
 // Authors:
 //   Marek Habersack (mhabersack@novell.com)
@@ -52,6 +52,7 @@ namespace System.Web.UI.WebControls
                        return base.OnBubbleEvent (source, e);
                }
                
+#if !NET_4_0
                public virtual object DataItem {
                        get;
                        set;
@@ -66,6 +67,7 @@ namespace System.Web.UI.WebControls
                        get;
                        private set;
                }
+#endif
        }
 }
 #endif
index 73a0c2d5e53e3d1505093e6b9d5157c235ee4770..c73332b2613e1fea4d8c95b9e3bf8731ebdbb6b8 100644 (file)
@@ -1,5 +1,5 @@
 //
-// System.Web.UI.WebControls.ListView
+// System.Web.UI.WebControls.ListViewItem
 //
 // Authors:
 //   Marek Habersack (mhabersack@novell.com)
@@ -35,6 +35,9 @@ namespace System.Web.UI.WebControls
 {
        [ToolboxItemAttribute (false)]
        public class ListViewItem : Control, INamingContainer
+#if NET_4_0
+       , IDataItemContainer
+#endif
        {
                internal ListViewItem ()
                        : this (ListViewItemType.DataItem)
@@ -61,6 +64,23 @@ namespace System.Web.UI.WebControls
                        get;
                        private set;
                }
+               
+#if NET_4_0
+               public virtual object DataItem {
+                       get;
+                       set;
+               }
+               
+               public virtual int DataItemIndex {
+                       get;
+                       protected set;
+               }
+               
+               public virtual int DisplayIndex {
+                       get;
+                       protected set;
+               }
+#endif
        }
 }
 #endif
diff --git a/mcs/class/System.Web.Extensions_1.0/System.Web.Extensions_1.0-net_2_0.csproj b/mcs/class/System.Web.Extensions_1.0/System.Web.Extensions_1.0-net_2_0.csproj
deleted file mode 100644 (file)
index 84aae73..0000000
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5B5CA61A-0901-40B5-B56A-D0A6E67DDA66}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/compat/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\Converter.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\ConvertersCollection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\ScriptingAuthenticationServiceSection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\ScriptingJsonSerializationSection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\ScriptingProfileServiceSection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\ScriptingScriptResourceHandlerSection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\ScriptingSectionGroup.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\ScriptingWebServicesSectionGroup.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Configuration\SystemWebExtensionsSectionGroup.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.DynamicData\DynamicDataSourceOperation.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.DynamicData\DynamicValidatorEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.DynamicData\IDynamicDataSource.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.DynamicData\IDynamicValidatorException.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Handlers\ScriptModule.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Handlers\ScriptResourceHandler.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\JavaScriptConverter.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\JavaScriptSerializer.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\JavaScriptTypeResolver.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\Json.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\JSON\JavaScriptUtils.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\JSON\ReflectionUtils.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\JsonDeserializer.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\JsonSerializer.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\ScriptIgnoreAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\SimpleTypeResolver.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Serialization\StringBuilderExtensions.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\AuthenticationService.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\ClientProxyHandler.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\GenerateScriptTypeAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\LogicalTypeInfo.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\ProfileService.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\ProxyGenerator.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\ResponseFormat.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\RestHandler.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\ScriptHandlerFactory.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\ScriptMethodAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.Script.Services\ScriptServiceAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\DataPager.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\DataPagerField.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\DataPagerFieldCollection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\DataPagerFieldCommandEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\DataPagerFieldItem.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\InsertItemPosition.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\IPageableItemContainer.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSource.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceContextEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceDeleteEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceDisposeEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceInsertEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceSelectEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceUpdateEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceValidationException.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\LinqDataSourceView.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListView.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewCancelEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewCancelMode.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewCommandEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewDataItem.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewDeletedEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewDeleteEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewEditEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewInsertEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewItem.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewItemEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewItemType.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewPagedDataSource.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewSelectEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewSortEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewTableRow.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewUpdatedEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\ListViewUpdateEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\NextPreviousPagerField.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\NumericPagerField.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\PageEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI.WebControls\PagePropertiesChangingEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\AsyncPostBackErrorEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\AsyncPostBackTrigger.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\AuthenticationServiceManager.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ExtenderControl.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\IExtenderControl.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\IScriptControl.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\PostBackTrigger.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ProfileServiceManager.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\RegisteredArrayDeclaration.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\RegisteredDisposeScript.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\RegisteredExpandoAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\RegisteredHiddenField.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\RegisteredScript.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\RegisteredScriptType.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptBehaviorDescriptor.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptComponentDescriptor.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptControl.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptControlDescriptor.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptDescriptor.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptManager.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptManagerProxy.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptMode.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptReference.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptReferenceBase.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptReferenceCollection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptReferenceEventArgs.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ScriptResourceAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ServiceReference.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\ServiceReferenceCollection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\TargetControlTypeAttribute.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\Timer.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\UpdatePanel.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\UpdatePanelControlTrigger.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\UpdatePanelRenderMode.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\UpdatePanelTrigger.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\UpdatePanelTriggerCollection.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\UpdatePanelUpdateMode.cs" />\r
-    <Compile Include="..\System.Web.Extensions\System.Web.UI\UpdateProgress.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Util\MachineKeySectionUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjax.debug.js">\r
-      <LogicalName>MicrosoftAjax.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjax.js">\r
-      <LogicalName>MicrosoftAjax.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxTimer.debug.js">\r
-      <LogicalName>MicrosoftAjaxTimer.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxTimer.js">\r
-      <LogicalName>MicrosoftAjaxTimer.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxWebForms.debug.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxWebForms.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Mvc/.gitattributes b/mcs/class/System.Web.Mvc/.gitattributes
deleted file mode 100644 (file)
index 82f4994..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/GlobalSuppressions.cs -crlf
-/license.htm -crlf
diff --git a/mcs/class/System.Web.Mvc/ChangeLog b/mcs/class/System.Web.Mvc/ChangeLog
deleted file mode 100644 (file)
index 3815b79..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-2010-03-15  Marek Habersack  <mhabersack@novell.com>
-
-       * Makefile (LIBRARY_COMPAT): added - this lib is installed in the
-       compat dir.
-
-2010-02-17  Marek Habersack  <mhabersack@novell.com>
-
-       * Makefile: RESX_RES is no more, it was replaced with
-       RESOURCES. Fixes bug #580594
-
-2009-08-13  Marek Habersack  <mhabersack@novell.com>
-
-       * Makefile: build only in the 2.0 profile, or otherwise we'll end
-       up with the resulting assembly referencing the 4.0 corlib.
-
-2009-04-21  Marek Habersack  <mhabersack@novell.com>
-
-       * Makefile: fixed resource ID generation.
-
-2009-04-02  Marek Habersack  <mhabersack@novell.com>
-
-       * Initial import of ASP.NET MVC 1.0
-
diff --git a/mcs/class/System.Web.Mvc/GlobalSuppressions.cs b/mcs/class/System.Web.Mvc/GlobalSuppressions.cs
deleted file mode 100644 (file)
index 040d0fa..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage \r
-// attributes that are applied to this project. \r
-// Project-level suppressions either have no target or are given \r
-// a specific target and scoped to a namespace, type, member, etc. \r
-//\r
-// To add a suppression to this file, right-click the message in the \r
-// Error List, point to "Suppress Message(s)", and click \r
-// "In Project Suppression File". \r
-// You do not need to add suppressions to this file manually. \r
-\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Scope = "member", Target = "System.Web.Mvc.TempDataDictionary.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Object>>.Contains(System.Collections.Generic.KeyValuePair`2<System.String,System.Object>)",\r
-    Justification = "There are no defined scenarios for wanting to derive from this class, but we don't want to prevent it either.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Scope = "member", Target = "System.Web.Mvc.TempDataDictionary.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Object>>.CopyTo(System.Collections.Generic.KeyValuePair`2<System.String,System.Object>[],System.Int32)",\r
-    Justification = "There are no defined scenarios for wanting to derive from this class, but we don't want to prevent it either.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Scope = "member", Target = "System.Web.Mvc.TempDataDictionary.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Object>>.IsReadOnly",\r
-    Justification = "There are no defined scenarios for wanting to derive from this class, but we don't want to prevent it either.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.Web.Mvc.Ajax",\r
-    Justification = "Helpers reside within a separate namespace to support alternate helper classes.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Portability", "CA1903:UseOnlyApiFromTargetedFramework", MessageId = "System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",\r
-    Justification = "The referenced assembly is bin-deployable, so we do not have an SP1 dependency.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Portability", "CA1903:UseOnlyApiFromTargetedFramework", MessageId = "System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",\r
-    Justification = "The referenced assembly is bin-deployable, so we do not have an SP1 dependency.")]\r
-\r
diff --git a/mcs/class/System.Web.Mvc/Makefile b/mcs/class/System.Web.Mvc/Makefile
deleted file mode 100644 (file)
index 4243537..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-thisdir = class/System.Web.Mvc
-SUBDIRS = 
-include ../../build/rules.make
-
-LIBRARY = System.Web.Mvc.dll
-LIBRARY_COMPAT = yes
-
-RESX_DIST =  System.Web.Mvc/Resources/MvcResources.resx
-
-LIB_MCS_FLAGS = \
-               /r:System.dll \
-               /r:System.Core.dll \
-               /r:System.Configuration.dll \
-               /r:System.Data.dll \
-               /r:System.Xml.dll \
-               /r:System.Web.dll \
-               /r:System.Web.Abstractions.dll \
-               /r:System.Web.Routing.dll \
-               /r:System.Web.Extensions.dll \
-               $(foreach r, $(RESOURCES), /resource:$(r),System.Web.Mvc.Resources.$(notdir $(r)))
-
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5 -d:MONO
-endif
-
-EXTRA_DISTFILES = $(RESX_DIST) license.htm
-
-# This is a .NET 3.5+ assembly - it must be built ONLY in the 2.0 profile
-VALID_PROFILE := $(filter net_2_0, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Web.Mvc.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-else
-RESOURCES = $(RESX_DIST:.resx=.resources)
-endif
-
-include ../../build/library.make
-
-$(build_lib): $(RESOURCES)
-
-$(RESOURCES): %.resources: %.resx
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
diff --git a/mcs/class/System.Web.Mvc/Mvc b/mcs/class/System.Web.Mvc/Mvc
deleted file mode 100644 (file)
index 2a2c951..0000000
+++ /dev/null
@@ -1 +0,0 @@
-System.Web.Mvc
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc/Properties/.gitattributes b/mcs/class/System.Web.Mvc/Properties/.gitattributes
deleted file mode 100644 (file)
index f7d8287..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/AssemblyInfo.cs -crlf
diff --git a/mcs/class/System.Web.Mvc/Properties/AssemblyInfo.cs b/mcs/class/System.Web.Mvc/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 1bc4e38..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Reflection;\r
-using System.Resources;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-using System.Security;\r
-\r
-// General Information about an assembly is controlled through the following \r
-// set of attributes. Change these attribute values to modify the information\r
-// associated with an assembly.\r
-[assembly: AssemblyTitle("System.Web.Mvc.dll")]\r
-[assembly: AssemblyDescription("System.Web.Mvc.dll")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("Microsoft Corporation")]\r
-[assembly: AssemblyProduct("Microsoft® .NET Framework")]\r
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// Setting ComVisible to false makes the types in this assembly not visible \r
-// to COM components.  If you need to access a type in this assembly from \r
-// COM, set the ComVisible attribute to true on that type.\r
-[assembly: ComVisible(false)]\r
-\r
-// The following GUID is for the ID of the typelib if this project is exposed to COM\r
-[assembly: Guid("4b5f4208-c6b0-4c37-9a41-63325ffa52ad")]\r
-\r
-// Version information for an assembly consists of the following four values:\r
-//\r
-//      Major Version\r
-//      Minor Version \r
-//      Build Number\r
-//      Revision\r
-//\r
-// You can specify all the values or you can default the Build and Revision Numbers \r
-// by using the '*' as shown below:\r
-// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.0.0")]\r
-[assembly: AssemblyFileVersion("1.0.40310.0")]\r
-\r
-[assembly: AllowPartiallyTrustedCallers]\r
-[assembly: SecurityTransparent]\r
-[assembly: CLSCompliant(true)]\r
-[assembly: NeutralResourcesLanguage("en-US")]\r
-\r
-[assembly: AssemblyDelaySign (true)]\r
-[assembly: AssemblyKeyFile("../winfx.pub")]\r
diff --git a/mcs/class/System.Web.Mvc/Properties/ChangeLog b/mcs/class/System.Web.Mvc/Properties/ChangeLog
deleted file mode 100644 (file)
index 3407eea..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-2009-04-02  Marek Habersack  <mhabersack@novell.com>
-
-       * AssemblyInfo.cs: added Mono specific attributes to delay-sign
-       the assembly with the winfx.pub key.
-
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc-net_2_0.csproj b/mcs/class/System.Web.Mvc/System.Web.Mvc-net_2_0.csproj
deleted file mode 100644 (file)
index 2517e75..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{268C75DA-7F8A-4402-B143-ABAF2A7D97C9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/compat/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Mvc</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="GlobalSuppressions.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\AcceptVerbsAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionFilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcher.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcherCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelectorCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxOptions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\InsertionMode.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxRequestExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryData.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryDataSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryToken.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryTokenSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizationContext.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizeAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BindAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BuildManagerWrapper.cs" />\r
-    <Compile Include="System.Web.Mvc\ContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Controller.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptorCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerTypeCache.cs" />\r
-    <Compile Include="System.Web.Mvc\CustomModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\DescriptorUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\DictionaryHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ExceptionContext.cs" />\r
-    <Compile Include="System.Web.Mvc\FileContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilePathResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileStreamResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\FormCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\FormMethod.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\FormExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\InputExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\LinkExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\MvcForm.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\RenderPartialExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\SelectExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\TextAreaExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\ValidationExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpAntiForgeryException.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPostedFileBaseModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpUnauthorizedResult.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpVerbs.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\IAuthorizationFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IBuildManager.cs" />\r
-    <Compile Include="System.Web.Mvc\IController.cs" />\r
-    <Compile Include="System.Web.Mvc\IControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\IExceptionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\InputType.cs" />\r
-    <Compile Include="System.Web.Mvc\IResultFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\ITempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\IView.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewDataContainer.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\JavaScriptResult.cs" />\r
-    <Compile Include="System.Web.Mvc\JsonResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinders.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBindingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelError.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelErrorCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelState.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelStateDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\MultiSelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHttpHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcRouteHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\NameValueCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\NonActionAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\NullViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\OutputCacheAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\PartialViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\PathHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\ReaderWriterCache`2.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectResult.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectToRouteResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Resources\MvcResources.Designer.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteValuesHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectListItem.cs" />\r
-    <Compile Include="System.Web.Mvc\SessionStateTempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\TagBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\TagRenderMode.cs" />\r
-    <Compile Include="System.Web.Mvc\TempDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\UrlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateAntiForgeryTokenAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateInputAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngines.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResultBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewType.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeParserFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\VirtualPathProviderViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormView.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormViewEngine.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_2_0.csproj">\r
-      <Project>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_2_0.csproj">\r
-      <Project>{A9B310AD-FF67-49ED-8AC8-AAF1E4B05249}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions_1.0\System.Web.Extensions_1.0-net_2_0.csproj">\r
-      <Project>{5B5CA61A-0901-40B5-B56A-D0A6E67DDA66}</Project>\r
-      <Name>System.Web.Extensions_1.0\System.Web.Extensions_1.0-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Mvc/Resources/MvcResources.resources">\r
-      <LogicalName>System.Web.Mvc.Resources.MvcResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc.csproj b/mcs/class/System.Web.Mvc/System.Web.Mvc.csproj
deleted file mode 100644 (file)
index 6d43ceb..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3D3FFD8A-624D-4E9B-954B-E1C105507975}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>System.Web</RootNamespace>\r
-    <AssemblyName>System.Web.Mvc</AssemblyName>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <SignAssembly>false</SignAssembly>\r
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="System" />\r
-    <Reference Include="System.configuration" />\r
-    <Reference Include="System.Core">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Web" />\r
-    <Reference Include="System.Web.Abstractions" />\r
-    <Reference Include="System.Web.Routing" />\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Web.Extensions">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Xml" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Mvc\ActionExecutedContext.cs" />\r
-    <Compile Include="Mvc\ActionExecutingContext.cs" />\r
-    <Compile Include="Mvc\AntiForgeryData.cs" />\r
-    <Compile Include="Mvc\AntiForgeryDataSerializer.cs" />\r
-    <Compile Include="Mvc\AuthorizationContext.cs" />\r
-    <Compile Include="Mvc\ControllerContext.cs" />\r
-    <Compile Include="Mvc\PathHelpers.cs" />\r
-    <Compile Include="Mvc\ExceptionContext.cs" />\r
-    <Compile Include="Mvc\ResultExecutedContext.cs" />\r
-    <Compile Include="Mvc\ResultExecutingContext.cs" />\r
-    <Compile Include="Mvc\ValidateAntiForgeryTokenAttribute.cs" />\r
-    <Compile Include="Mvc\HttpAntiForgeryException.cs" />\r
-    <Compile Include="Mvc\JavaScriptResult.cs" />\r
-    <Compile Include="Mvc\ActionDescriptor.cs" />\r
-    <Compile Include="Mvc\ActionMethodDispatcher.cs" />\r
-    <Compile Include="Mvc\ActionMethodSelector.cs" />\r
-    <Compile Include="Mvc\ActionMethodSelectorAttribute.cs" />\r
-    <Compile Include="Mvc\ActionMethodSelectorCache.cs" />\r
-    <Compile Include="Mvc\ActionNameSelectorAttribute.cs" />\r
-    <Compile Include="Mvc\AuthorizeAttribute.cs" />\r
-    <Compile Include="Mvc\Ajax\AjaxOptions.cs" />\r
-    <Compile Include="Mvc\Ajax\AjaxExtensions.cs" />\r
-    <Compile Include="Mvc\ActionMethodDispatcherCache.cs" />\r
-    <Compile Include="Mvc\BindAttribute.cs" />\r
-    <Compile Include="Mvc\ControllerBase.cs" />\r
-    <Compile Include="Mvc\ActionNameAttribute.cs" />\r
-    <Compile Include="Mvc\AcceptVerbsAttribute.cs" />\r
-    <Compile Include="Mvc\AjaxHelper`1.cs" />\r
-    <Compile Include="Mvc\HtmlHelper`1.cs" />\r
-    <Compile Include="Mvc\DictionaryHelpers.cs" />\r
-    <Compile Include="Mvc\AjaxRequestExtensions.cs" />\r
-    <Compile Include="Mvc\ModelBinderDictionary.cs" />\r
-    <Compile Include="Mvc\ValueProviderDictionary.cs" />\r
-    <Compile Include="Mvc\ViewContext.cs" />\r
-    <Compile Include="Mvc\ViewType.cs" />\r
-    <Compile Include="Mvc\ViewTypeControlBuilder.cs" />\r
-    <Compile Include="Mvc\ViewUserControlControlBuilder.cs" />\r
-    <Compile Include="Mvc\ViewPageControlBuilder.cs" />\r
-    <Compile Include="Mvc\ViewTypeParserFilter.cs" />\r
-    <Compile Include="Mvc\DefaultViewLocationCache.cs" />\r
-    <Compile Include="Mvc\FormCollection.cs" />\r
-    <Compile Include="Mvc\HttpPostedFileBaseModelBinder.cs" />\r
-    <Compile Include="Mvc\NullViewLocationCache.cs" />\r
-    <Compile Include="Mvc\ValidateInputAttribute.cs" />\r
-    <Compile Include="Mvc\FileContentResult.cs" />\r
-    <Compile Include="Mvc\FilePathResult.cs" />\r
-    <Compile Include="Mvc\FileResult.cs" />\r
-    <Compile Include="Mvc\FileStreamResult.cs" />\r
-    <Compile Include="Mvc\InputType.cs" />\r
-    <Compile Include="Mvc\ControllerDescriptorCache.cs" />\r
-    <Compile Include="Mvc\ReflectedParameterBindingInfo.cs" />\r
-    <Compile Include="Mvc\ParameterBindingInfo.cs" />\r
-    <Compile Include="Mvc\ReaderWriterCache`2.cs" />\r
-    <Compile Include="Mvc\DescriptorUtil.cs" />\r
-    <Compile Include="Mvc\ReflectedControllerDescriptor.cs" />\r
-    <Compile Include="Mvc\ControllerDescriptor.cs" />\r
-    <Compile Include="Mvc\ActionSelector.cs" />\r
-    <Compile Include="Mvc\ReflectedActionDescriptor.cs" />\r
-    <Compile Include="Mvc\Html\MvcForm.cs" />\r
-    <Compile Include="Mvc\HttpVerbs.cs" />\r
-    <Compile Include="Mvc\DefaultModelBinder.cs" />\r
-    <Compile Include="Mvc\ModelBindingContext.cs" />\r
-    <Compile Include="Mvc\ParameterDescriptor.cs" />\r
-    <Compile Include="Mvc\RouteValuesHelpers.cs" />\r
-    <Compile Include="Mvc\SelectListItem.cs" />\r
-    <Compile Include="Mvc\TagRenderMode.cs" />\r
-    <Compile Include="Mvc\ReflectedParameterDescriptor.cs" />\r
-    <Compile Include="Mvc\ValueProviderResult.cs" />\r
-    <Compile Include="Mvc\CustomModelBinderAttribute.cs" />\r
-    <Compile Include="Mvc\FormMethod.cs" />\r
-    <Compile Include="Mvc\Html\FormExtensions.cs" />\r
-    <Compile Include="Mvc\Html\InputExtensions.cs" />\r
-    <Compile Include="Mvc\Html\RenderPartialExtensions.cs" />\r
-    <Compile Include="Mvc\Html\SelectExtensions.cs" />\r
-    <Compile Include="Mvc\Html\TextAreaExtensions.cs" />\r
-    <Compile Include="Mvc\Html\ValidationExtensions.cs" />\r
-    <Compile Include="Mvc\IModelBinder.cs" />\r
-    <Compile Include="Mvc\Html\LinkExtensions.cs" />\r
-    <Compile Include="Mvc\ModelBinderAttribute.cs" />\r
-    <Compile Include="Mvc\ModelBinders.cs" />\r
-    <Compile Include="Mvc\ModelStateDictionary.cs" />\r
-    <Compile Include="Mvc\ModelState.cs" />\r
-    <Compile Include="Mvc\ModelErrorCollection.cs" />\r
-    <Compile Include="Mvc\ModelError.cs" />\r
-    <Compile Include="Mvc\Ajax\InsertionMode.cs" />\r
-    <Compile Include="Mvc\HandleErrorAttribute.cs" />\r
-    <Compile Include="Mvc\HandleErrorInfo.cs" />\r
-    <Compile Include="Mvc\HttpUnauthorizedResult.cs" />\r
-    <Compile Include="Mvc\IActionInvoker.cs" />\r
-    <Compile Include="Mvc\IView.cs" />\r
-    <Compile Include="Mvc\IViewLocationCache.cs" />\r
-    <Compile Include="Mvc\MvcHttpHandler.cs" />\r
-    <Compile Include="Mvc\PartialViewResult.cs" />\r
-    <Compile Include="Mvc\SessionStateTempDataProvider.cs" />\r
-    <Compile Include="Mvc\ITempDataProvider.cs" />\r
-    <Compile Include="Mvc\OutputCacheAttribute.cs" />\r
-    <Compile Include="Mvc\FilterInfo.cs" />\r
-    <Compile Include="Mvc\ActionFilterAttribute.cs" />\r
-    <Compile Include="Mvc\ActionResult.cs" />\r
-    <Compile Include="Mvc\AjaxHelper.cs" />\r
-    <Compile Include="Mvc\BuildManagerWrapper.cs" />\r
-    <Compile Include="Mvc\Controller.cs" />\r
-    <Compile Include="Mvc\ControllerActionInvoker.cs" />\r
-    <Compile Include="Mvc\ControllerBuilder.cs" />\r
-    <Compile Include="Mvc\ControllerTypeCache.cs" />\r
-    <Compile Include="Mvc\ContentResult.cs" />\r
-    <Compile Include="Mvc\FilterAttribute.cs" />\r
-    <Compile Include="Mvc\IResultFilter.cs" />\r
-    <Compile Include="Mvc\IExceptionFilter.cs" />\r
-    <Compile Include="Mvc\IAuthorizationFilter.cs" />\r
-    <Compile Include="Mvc\JsonResult.cs" />\r
-    <Compile Include="Mvc\NameValueCollectionExtensions.cs" />\r
-    <Compile Include="Mvc\ViewDataDictionary`1.cs" />\r
-    <Compile Include="Mvc\EmptyResult.cs" />\r
-    <Compile Include="Mvc\MultiSelectList.cs" />\r
-    <Compile Include="Mvc\RedirectResult.cs" />\r
-    <Compile Include="Mvc\RedirectToRouteResult.cs" />\r
-    <Compile Include="Mvc\DefaultControllerFactory.cs" />\r
-    <Compile Include="Mvc\HtmlHelper.cs" />\r
-    <Compile Include="Mvc\IActionFilter.cs" />\r
-    <Compile Include="Mvc\IBuildManager.cs" />\r
-    <Compile Include="Mvc\IController.cs" />\r
-    <Compile Include="Mvc\IControllerFactory.cs" />\r
-    <Compile Include="Mvc\IViewDataContainer.cs" />\r
-    <Compile Include="Mvc\IViewEngine.cs" />\r
-    <Compile Include="Mvc\MvcHandler.cs" />\r
-    <Compile Include="Mvc\MvcRouteHandler.cs" />\r
-    <Compile Include="Mvc\NonActionAttribute.cs" />\r
-    <Compile Include="Mvc\RouteCollectionExtensions.cs" />\r
-    <Compile Include="Mvc\SelectList.cs" />\r
-    <Compile Include="Mvc\TagBuilder.cs" />\r
-    <Compile Include="Mvc\TempDataDictionary.cs" />\r
-    <Compile Include="Mvc\TypeHelpers.cs" />\r
-    <Compile Include="Mvc\UrlHelper.cs" />\r
-    <Compile Include="Mvc\ViewDataDictionary.cs" />\r
-    <Compile Include="Mvc\ViewEngineCollection.cs" />\r
-    <Compile Include="Mvc\ViewEngineResult.cs" />\r
-    <Compile Include="Mvc\ViewEngines.cs" />\r
-    <Compile Include="Mvc\ViewMasterPage.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewMasterPage`1.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewPage.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewPage`1.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewResult.cs" />\r
-    <Compile Include="Mvc\ViewResultBase.cs" />\r
-    <Compile Include="Mvc\ViewUserControl.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewUserControl`1.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\VirtualPathProviderViewEngine.cs" />\r
-    <Compile Include="Mvc\WebFormView.cs" />\r
-    <Compile Include="Mvc\WebFormViewEngine.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Mvc\Resources\MvcResources.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>MvcResources.resx</DependentUpon>\r
-    </Compile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Mvc\Resources\MvcResources.resx">\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>MvcResources.Designer.cs</LastGenOutput>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-</Project>
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc.dll.sources b/mcs/class/System.Web.Mvc/System.Web.Mvc.dll.sources
deleted file mode 100644 (file)
index 1f440dd..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-../../build/common/Consts.cs
-../../build/common/MonoTODOAttribute.cs
-GlobalSuppressions.cs
-Properties/AssemblyInfo.cs
-System.Web.Mvc/Resources/MvcResources.Designer.cs
-System.Web.Mvc/AcceptVerbsAttribute.cs
-System.Web.Mvc/ActionDescriptor.cs
-System.Web.Mvc/ActionExecutedContext.cs
-System.Web.Mvc/ActionExecutingContext.cs
-System.Web.Mvc/ActionFilterAttribute.cs
-System.Web.Mvc/ActionMethodDispatcherCache.cs
-System.Web.Mvc/ActionMethodDispatcher.cs
-System.Web.Mvc/ActionMethodSelectorAttribute.cs
-System.Web.Mvc/ActionMethodSelectorCache.cs
-System.Web.Mvc/ActionMethodSelector.cs
-System.Web.Mvc/ActionNameAttribute.cs
-System.Web.Mvc/ActionNameSelectorAttribute.cs
-System.Web.Mvc/ActionResult.cs
-System.Web.Mvc/ActionSelector.cs
-System.Web.Mvc/AntiForgeryData.cs
-System.Web.Mvc/AntiForgeryDataSerializer.cs
-System.Web.Mvc/Ajax/AjaxExtensions.cs
-System.Web.Mvc/Ajax/AjaxOptions.cs
-System.Web.Mvc/AjaxHelper`1.cs
-System.Web.Mvc/AjaxHelper.cs
-System.Web.Mvc/Ajax/InsertionMode.cs
-System.Web.Mvc/AjaxRequestExtensions.cs
-System.Web.Mvc/AntiForgeryToken.cs
-System.Web.Mvc/AntiForgeryTokenSerializer.cs
-System.Web.Mvc/AuthorizationContext.cs
-System.Web.Mvc/AuthorizeAttribute.cs
-System.Web.Mvc/BindAttribute.cs
-System.Web.Mvc/BuildManagerWrapper.cs
-System.Web.Mvc/ContentResult.cs
-System.Web.Mvc/ControllerActionInvoker.cs
-System.Web.Mvc/ControllerBase.cs
-System.Web.Mvc/ControllerBuilder.cs
-System.Web.Mvc/ControllerContext.cs
-System.Web.Mvc/Controller.cs
-System.Web.Mvc/ControllerDescriptorCache.cs
-System.Web.Mvc/ControllerDescriptor.cs
-System.Web.Mvc/ControllerTypeCache.cs
-System.Web.Mvc/CustomModelBinderAttribute.cs
-System.Web.Mvc/DefaultControllerFactory.cs
-System.Web.Mvc/DefaultModelBinder.cs
-System.Web.Mvc/DefaultViewLocationCache.cs
-System.Web.Mvc/DescriptorUtil.cs
-System.Web.Mvc/DictionaryHelpers.cs
-System.Web.Mvc/EmptyResult.cs
-System.Web.Mvc/ExceptionContext.cs
-System.Web.Mvc/FileContentResult.cs
-System.Web.Mvc/FilePathResult.cs
-System.Web.Mvc/FileResult.cs
-System.Web.Mvc/FileStreamResult.cs
-System.Web.Mvc/FilterAttribute.cs
-System.Web.Mvc/FilterInfo.cs
-System.Web.Mvc/FormCollection.cs
-System.Web.Mvc/FormMethod.cs
-System.Web.Mvc/HandleErrorAttribute.cs
-System.Web.Mvc/HandleErrorInfo.cs
-System.Web.Mvc/Html/FormExtensions.cs
-System.Web.Mvc/HtmlHelper`1.cs
-System.Web.Mvc/HtmlHelper.cs
-System.Web.Mvc/Html/InputExtensions.cs
-System.Web.Mvc/Html/LinkExtensions.cs
-System.Web.Mvc/Html/MvcForm.cs
-System.Web.Mvc/Html/RenderPartialExtensions.cs
-System.Web.Mvc/Html/SelectExtensions.cs
-System.Web.Mvc/Html/TextAreaExtensions.cs
-System.Web.Mvc/Html/ValidationExtensions.cs
-System.Web.Mvc/HttpAntiForgeryException.cs
-System.Web.Mvc/HttpPostedFileBaseModelBinder.cs
-System.Web.Mvc/HttpUnauthorizedResult.cs
-System.Web.Mvc/HttpVerbs.cs
-System.Web.Mvc/IActionFilter.cs
-System.Web.Mvc/IActionInvoker.cs
-System.Web.Mvc/IAuthorizationFilter.cs
-System.Web.Mvc/IBuildManager.cs
-System.Web.Mvc/IController.cs
-System.Web.Mvc/IControllerFactory.cs
-System.Web.Mvc/IExceptionFilter.cs
-System.Web.Mvc/IModelBinder.cs
-System.Web.Mvc/InputType.cs
-System.Web.Mvc/IResultFilter.cs
-System.Web.Mvc/ITempDataProvider.cs
-System.Web.Mvc/IView.cs
-System.Web.Mvc/IViewDataContainer.cs
-System.Web.Mvc/IViewEngine.cs
-System.Web.Mvc/IViewLocationCache.cs
-System.Web.Mvc/JavaScriptResult.cs
-System.Web.Mvc/JsonResult.cs
-System.Web.Mvc/ModelBinderAttribute.cs
-System.Web.Mvc/ModelBinderDictionary.cs
-System.Web.Mvc/ModelBinders.cs
-System.Web.Mvc/ModelBindingContext.cs
-System.Web.Mvc/ModelErrorCollection.cs
-System.Web.Mvc/ModelError.cs
-System.Web.Mvc/ModelState.cs
-System.Web.Mvc/ModelStateDictionary.cs
-System.Web.Mvc/MultiSelectList.cs
-System.Web.Mvc/MvcHandler.cs
-System.Web.Mvc/MvcHttpHandler.cs
-System.Web.Mvc/MvcRouteHandler.cs
-System.Web.Mvc/NameValueCollectionExtensions.cs
-System.Web.Mvc/NonActionAttribute.cs
-System.Web.Mvc/NullViewLocationCache.cs
-System.Web.Mvc/OutputCacheAttribute.cs
-System.Web.Mvc/ParameterBindingInfo.cs
-System.Web.Mvc/ParameterDescriptor.cs
-System.Web.Mvc/PartialViewResult.cs
-System.Web.Mvc/PathHelpers.cs
-System.Web.Mvc/ReaderWriterCache`2.cs
-System.Web.Mvc/RedirectResult.cs
-System.Web.Mvc/RedirectToRouteResult.cs
-System.Web.Mvc/ReflectedActionDescriptor.cs
-System.Web.Mvc/ReflectedControllerDescriptor.cs
-System.Web.Mvc/ReflectedParameterBindingInfo.cs
-System.Web.Mvc/ReflectedParameterDescriptor.cs
-System.Web.Mvc/ResultExecutedContext.cs
-System.Web.Mvc/ResultExecutingContext.cs
-System.Web.Mvc/RouteCollectionExtensions.cs
-System.Web.Mvc/RouteValuesHelpers.cs
-System.Web.Mvc/SelectList.cs
-System.Web.Mvc/SelectListItem.cs
-System.Web.Mvc/SessionStateTempDataProvider.cs
-System.Web.Mvc/TagBuilder.cs
-System.Web.Mvc/TagRenderMode.cs
-System.Web.Mvc/TempDataDictionary.cs
-System.Web.Mvc/TypeHelpers.cs
-System.Web.Mvc/UrlHelper.cs
-System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs
-System.Web.Mvc/ValidateInputAttribute.cs
-System.Web.Mvc/ValueProviderDictionary.cs
-System.Web.Mvc/ValueProviderResult.cs
-System.Web.Mvc/ViewContext.cs
-System.Web.Mvc/ViewDataDictionary`1.cs
-System.Web.Mvc/ViewDataDictionary.cs
-System.Web.Mvc/ViewEngineCollection.cs
-System.Web.Mvc/ViewEngineResult.cs
-System.Web.Mvc/ViewEngines.cs
-System.Web.Mvc/ViewMasterPage`1.cs
-System.Web.Mvc/ViewMasterPage.cs
-System.Web.Mvc/ViewPage`1.cs
-System.Web.Mvc/ViewPageControlBuilder.cs
-System.Web.Mvc/ViewPage.cs
-System.Web.Mvc/ViewResultBase.cs
-System.Web.Mvc/ViewResult.cs
-System.Web.Mvc/ViewTypeControlBuilder.cs
-System.Web.Mvc/ViewType.cs
-System.Web.Mvc/ViewTypeParserFilter.cs
-System.Web.Mvc/ViewUserControl`1.cs
-System.Web.Mvc/ViewUserControlControlBuilder.cs
-System.Web.Mvc/ViewUserControl.cs
-System.Web.Mvc/VirtualPathProviderViewEngine.cs
-System.Web.Mvc/WebFormView.cs
-System.Web.Mvc/WebFormViewEngine.cs
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/.gitattributes b/mcs/class/System.Web.Mvc/System.Web.Mvc/.gitattributes
deleted file mode 100644 (file)
index 7f24bae..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/AcceptVerbsAttribute.cs -crlf
-/ActionDescriptor.cs -crlf
-/ActionExecutedContext.cs -crlf
-/ActionExecutingContext.cs -crlf
-/ActionFilterAttribute.cs -crlf
-/ActionMethodDispatcher.cs -crlf
-/ActionMethodDispatcherCache.cs -crlf
-/ActionMethodSelector.cs -crlf
-/ActionMethodSelectorAttribute.cs -crlf
-/ActionMethodSelectorCache.cs -crlf
-/ActionNameAttribute.cs -crlf
-/ActionNameSelectorAttribute.cs -crlf
-/ActionResult.cs -crlf
-/ActionSelector.cs -crlf
-/AjaxHelper.cs -crlf
-/AjaxHelper`1.cs -crlf
-/AjaxRequestExtensions.cs -crlf
-/AntiForgeryData.cs -crlf
-/AntiForgeryDataSerializer.cs -crlf
-/AntiForgeryToken.cs -crlf
-/AntiForgeryTokenSerializer.cs -crlf
-/AuthorizationContext.cs -crlf
-/AuthorizeAttribute.cs -crlf
-/BindAttribute.cs -crlf
-/BuildManagerWrapper.cs -crlf
-/ContentResult.cs -crlf
-/Controller.cs -crlf
-/ControllerActionInvoker.cs -crlf
-/ControllerBase.cs -crlf
-/ControllerBuilder.cs -crlf
-/ControllerContext.cs -crlf
-/ControllerDescriptor.cs -crlf
-/ControllerDescriptorCache.cs -crlf
-/ControllerTypeCache.cs -crlf
-/CustomModelBinderAttribute.cs -crlf
-/DefaultControllerFactory.cs -crlf
-/DefaultViewLocationCache.cs -crlf
-/DescriptorUtil.cs -crlf
-/DictionaryHelpers.cs -crlf
-/EmptyResult.cs -crlf
-/ExceptionContext.cs -crlf
-/FileContentResult.cs -crlf
-/FilePathResult.cs -crlf
-/FileResult.cs -crlf
-/FileStreamResult.cs -crlf
-/FilterAttribute.cs -crlf
-/FilterInfo.cs -crlf
-/FormCollection.cs -crlf
-/FormMethod.cs -crlf
-/HandleErrorAttribute.cs -crlf
-/HandleErrorInfo.cs -crlf
-/HtmlHelper.cs -crlf
-/HtmlHelper`1.cs -crlf
-/HttpAntiForgeryException.cs -crlf
-/HttpPostedFileBaseModelBinder.cs -crlf
-/HttpUnauthorizedResult.cs -crlf
-/HttpVerbs.cs -crlf
-/IActionFilter.cs -crlf
-/IActionInvoker.cs -crlf
-/IAuthorizationFilter.cs -crlf
-/IBuildManager.cs -crlf
-/IController.cs -crlf
-/IControllerFactory.cs -crlf
-/IExceptionFilter.cs -crlf
-/IModelBinder.cs -crlf
-/IResultFilter.cs -crlf
-/ITempDataProvider.cs -crlf
-/IView.cs -crlf
-/IViewDataContainer.cs -crlf
-/IViewEngine.cs -crlf
-/IViewLocationCache.cs -crlf
-/InputType.cs -crlf
-/JavaScriptResult.cs -crlf
-/JsonResult.cs -crlf
-/ModelBinderAttribute.cs -crlf
-/ModelBinderDictionary.cs -crlf
-/ModelBinders.cs -crlf
-/ModelBindingContext.cs -crlf
-/ModelError.cs -crlf
-/ModelErrorCollection.cs -crlf
-/ModelState.cs -crlf
-/ModelStateDictionary.cs -crlf
-/MultiSelectList.cs -crlf
-/MvcHandler.cs -crlf
-/MvcHttpHandler.cs -crlf
-/MvcRouteHandler.cs -crlf
-/NameValueCollectionExtensions.cs -crlf
-/NonActionAttribute.cs -crlf
-/NullViewLocationCache.cs -crlf
-/OutputCacheAttribute.cs -crlf
-/ParameterBindingInfo.cs -crlf
-/ParameterDescriptor.cs -crlf
-/PartialViewResult.cs -crlf
-/PathHelpers.cs -crlf
-/ReaderWriterCache`2.cs -crlf
-/RedirectResult.cs -crlf
-/RedirectToRouteResult.cs -crlf
-/ReflectedActionDescriptor.cs -crlf
-/ReflectedControllerDescriptor.cs -crlf
-/ReflectedParameterBindingInfo.cs -crlf
-/ReflectedParameterDescriptor.cs -crlf
-/ResultExecutedContext.cs -crlf
-/ResultExecutingContext.cs -crlf
-/RouteCollectionExtensions.cs -crlf
-/RouteValuesHelpers.cs -crlf
-/SelectList.cs -crlf
-/SelectListItem.cs -crlf
-/SessionStateTempDataProvider.cs -crlf
-/TagBuilder.cs -crlf
-/TagRenderMode.cs -crlf
-/TempDataDictionary.cs -crlf
-/TypeHelpers.cs -crlf
-/UrlHelper.cs -crlf
-/ValidateAntiForgeryTokenAttribute.cs -crlf
-/ValidateInputAttribute.cs -crlf
-/ValueProviderDictionary.cs -crlf
-/ValueProviderResult.cs -crlf
-/ViewContext.cs -crlf
-/ViewDataDictionary.cs -crlf
-/ViewDataDictionary`1.cs -crlf
-/ViewEngineCollection.cs -crlf
-/ViewEngineResult.cs -crlf
-/ViewEngines.cs -crlf
-/ViewMasterPage.cs -crlf
-/ViewMasterPage`1.cs -crlf
-/ViewPage.cs -crlf
-/ViewPageControlBuilder.cs -crlf
-/ViewPage`1.cs -crlf
-/ViewResult.cs -crlf
-/ViewResultBase.cs -crlf
-/ViewType.cs -crlf
-/ViewTypeControlBuilder.cs -crlf
-/ViewTypeParserFilter.cs -crlf
-/ViewUserControl.cs -crlf
-/ViewUserControlControlBuilder.cs -crlf
-/ViewUserControl`1.cs -crlf
-/VirtualPathProviderViewEngine.cs -crlf
-/WebFormView.cs -crlf
-/WebFormViewEngine.cs -crlf
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AcceptVerbsAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AcceptVerbsAttribute.cs
deleted file mode 100644 (file)
index 9b66e58..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Design", "CA1019:DefineAccessorsForAttributeArguments",\r
-        Justification = "The accessor is exposed as an ICollection<string>.")]\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class AcceptVerbsAttribute : ActionMethodSelectorAttribute {\r
-\r
-        public AcceptVerbsAttribute(HttpVerbs verbs)\r
-            : this(EnumToArray(verbs)) {\r
-        }\r
-\r
-        public AcceptVerbsAttribute(params string[] verbs) {\r
-            if (verbs == null || verbs.Length == 0) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "verbs");\r
-            }\r
-\r
-            Verbs = new ReadOnlyCollection<string>(verbs);\r
-        }\r
-\r
-        public ICollection<string> Verbs {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        private static void AddEntryToList(HttpVerbs verbs, HttpVerbs match, List<string> verbList, string entryText) {\r
-            if ((verbs & match) != 0) {\r
-                verbList.Add(entryText);\r
-            }\r
-        }\r
-\r
-        internal static string[] EnumToArray(HttpVerbs verbs) {\r
-            List<string> verbList = new List<string>();\r
-\r
-            AddEntryToList(verbs, HttpVerbs.Get, verbList, "GET");\r
-            AddEntryToList(verbs, HttpVerbs.Post, verbList, "POST");\r
-            AddEntryToList(verbs, HttpVerbs.Put, verbList, "PUT");\r
-            AddEntryToList(verbs, HttpVerbs.Delete, verbList, "DELETE");\r
-            AddEntryToList(verbs, HttpVerbs.Head, verbList, "HEAD");\r
-\r
-            return verbList.ToArray();\r
-        }\r
-\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            string incomingVerb = controllerContext.HttpContext.Request.HttpMethod;\r
-            return Verbs.Contains(incomingVerb, StringComparer.OrdinalIgnoreCase);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionDescriptor.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionDescriptor.cs
deleted file mode 100644 (file)
index ae0bded..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Reflection;\r
-\r
-    public abstract class ActionDescriptor : ICustomAttributeProvider {\r
-\r
-        private static readonly ActionSelector[] _emptySelectors = new ActionSelector[0];\r
-\r
-        public abstract string ActionName {\r
-            get;\r
-        }\r
-\r
-        public abstract ControllerDescriptor ControllerDescriptor {\r
-            get;\r
-        }\r
-\r
-        public abstract object Execute(ControllerContext controllerContext, IDictionary<string, object> parameters);\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual object[] GetCustomAttributes(bool inherit) {\r
-            return GetCustomAttributes(typeof(object), inherit);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return (object[])Array.CreateInstance(attributeType, 0);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "This method may perform non-trivial work.")]\r
-        public virtual FilterInfo GetFilters() {\r
-            return new FilterInfo();\r
-        }\r
-\r
-        public abstract ParameterDescriptor[] GetParameters();\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "This method may perform non-trivial work.")]\r
-        public virtual ICollection<ActionSelector> GetSelectors() {\r
-            return _emptySelectors;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual bool IsDefined(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionExecutedContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionExecutedContext.cs
deleted file mode 100644 (file)
index 1dfaa17..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ActionExecutedContext : ControllerContext {\r
-\r
-        private ActionResult _result;\r
-\r
-        // parameterless constructor used for mocking\r
-        public ActionExecutedContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ActionExecutedContext(ControllerContext controllerContext, ActionDescriptor actionDescriptor, bool canceled, Exception exception)\r
-            : base(controllerContext) {\r
-            if (actionDescriptor == null) {\r
-                throw new ArgumentNullException("actionDescriptor");\r
-            }\r
-\r
-            ActionDescriptor = actionDescriptor;\r
-            Canceled = canceled;\r
-            Exception = exception;\r
-        }\r
-\r
-        public virtual ActionDescriptor ActionDescriptor {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual bool Canceled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual Exception Exception {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public bool ExceptionHandled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get {\r
-                return _result ?? EmptyResult.Instance;\r
-            }\r
-            set {\r
-                _result = value;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionExecutingContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionExecutingContext.cs
deleted file mode 100644 (file)
index 4cc21e0..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ActionExecutingContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public ActionExecutingContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ActionExecutingContext(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary<string, object> actionParameters)\r
-            : base(controllerContext) {\r
-            if (actionDescriptor == null) {\r
-                throw new ArgumentNullException("actionDescriptor");\r
-            }\r
-            if (actionParameters == null) {\r
-                throw new ArgumentNullException("actionParameters");\r
-            }\r
-\r
-            ActionDescriptor = actionDescriptor;\r
-            ActionParameters = actionParameters;\r
-        }\r
-\r
-        public virtual ActionDescriptor ActionDescriptor {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The property setter is only here to support mocking this type and should not be called at runtime.")]\r
-        public virtual IDictionary<string, object> ActionParameters {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionFilterAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionFilterAttribute.cs
deleted file mode 100644 (file)
index 1069ccc..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public abstract class ActionFilterAttribute : FilterAttribute, IActionFilter, IResultFilter {\r
-\r
-        // The OnXxx() methods are virtual rather than abstract so that a developer need override\r
-        // only the ones that interest him.\r
-\r
-        public virtual void OnActionExecuting(ActionExecutingContext filterContext) {\r
-        }\r
-\r
-        public virtual void OnActionExecuted(ActionExecutedContext filterContext) {\r
-        }\r
-\r
-        public virtual void OnResultExecuting(ResultExecutingContext filterContext) {\r
-        }\r
-\r
-        public virtual void OnResultExecuted(ResultExecutedContext filterContext) {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodDispatcher.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodDispatcher.cs
deleted file mode 100644 (file)
index 0adafe2..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-\r
-    // The methods in this class don't perform error checking; that is the responsibility of the\r
-    // caller.\r
-    internal sealed class ActionMethodDispatcher {\r
-\r
-        private delegate object ActionExecutor(ControllerBase controller, object[] parameters);\r
-        private delegate void VoidActionExecutor(ControllerBase controller, object[] parameters);\r
-\r
-        private ActionExecutor _executor;\r
-\r
-        public ActionMethodDispatcher(MethodInfo methodInfo) {\r
-            _executor = GetExecutor(methodInfo);\r
-            MethodInfo = methodInfo;\r
-        }\r
-\r
-        public MethodInfo MethodInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public object Execute(ControllerBase controller, object[] parameters) {\r
-            return _executor(controller, parameters);\r
-        }\r
-\r
-        private static ActionExecutor GetExecutor(MethodInfo methodInfo) {\r
-            // Parameters to executor\r
-            ParameterExpression controllerParameter = Expression.Parameter(typeof(ControllerBase), "controller");\r
-            ParameterExpression parametersParameter = Expression.Parameter(typeof(object[]), "parameters");\r
-\r
-            // Build parameter list\r
-            List<Expression> parameters = new List<Expression>();\r
-            ParameterInfo[] paramInfos = methodInfo.GetParameters();\r
-            for (int i = 0; i < paramInfos.Length; i++) {\r
-                ParameterInfo paramInfo = paramInfos[i];\r
-                BinaryExpression valueObj = Expression.ArrayIndex(parametersParameter, Expression.Constant(i));\r
-                UnaryExpression valueCast = Expression.Convert(valueObj, paramInfo.ParameterType);\r
-\r
-                // valueCast is "(Ti) parameters[i]"\r
-                parameters.Add(valueCast);\r
-            }\r
-\r
-            // Call method\r
-            UnaryExpression instanceCast = (!methodInfo.IsStatic) ? Expression.Convert(controllerParameter, methodInfo.ReflectedType) : null;\r
-            MethodCallExpression methodCall = methodCall = Expression.Call(instanceCast, methodInfo, parameters);\r
-\r
-            // methodCall is "((TController) controller) method((T0) parameters[0], (T1) parameters[1], ...)"\r
-            // Create function\r
-            if (methodCall.Type == typeof(void)) {\r
-                Expression<VoidActionExecutor> lambda = Expression.Lambda<VoidActionExecutor>(methodCall, controllerParameter, parametersParameter);\r
-                VoidActionExecutor voidExecutor = lambda.Compile();\r
-                return WrapVoidAction(voidExecutor);\r
-            }\r
-            else {\r
-                // must coerce methodCall to match ActionExecutor signature\r
-                UnaryExpression castMethodCall = Expression.Convert(methodCall, typeof(object));\r
-                Expression<ActionExecutor> lambda = Expression.Lambda<ActionExecutor>(castMethodCall, controllerParameter, parametersParameter);\r
-                return lambda.Compile();\r
-            }\r
-        }\r
-\r
-        private static ActionExecutor WrapVoidAction(VoidActionExecutor executor) {\r
-            return delegate(ControllerBase controller, object[] parameters) {\r
-                executor(controller, parameters);\r
-                return null;\r
-            };\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodDispatcherCache.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodDispatcherCache.cs
deleted file mode 100644 (file)
index 61b5333..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    internal sealed class ActionMethodDispatcherCache : ReaderWriterCache<MethodInfo,ActionMethodDispatcher> {\r
-\r
-        public ActionMethodDispatcherCache() {\r
-        }\r
-\r
-        public ActionMethodDispatcher GetDispatcher(MethodInfo methodInfo) {\r
-            return FetchOrCreateItem(methodInfo, () => new ActionMethodDispatcher(methodInfo));\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelector.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelector.cs
deleted file mode 100644 (file)
index 4b765db..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    internal sealed class ActionMethodSelector {\r
-\r
-        public ActionMethodSelector(Type controllerType) {\r
-            ControllerType = controllerType;\r
-            PopulateLookupTables();\r
-        }\r
-\r
-        public Type ControllerType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public MethodInfo[] AliasedMethods {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ILookup<string, MethodInfo> NonAliasedMethods {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        private AmbiguousMatchException CreateAmbiguousMatchException(List<MethodInfo> ambiguousMethods, string actionName) {\r
-            StringBuilder exceptionMessageBuilder = new StringBuilder();\r
-            foreach (MethodInfo methodInfo in ambiguousMethods) {\r
-                string controllerAction = Convert.ToString(methodInfo, CultureInfo.CurrentUICulture);\r
-                string controllerType = methodInfo.DeclaringType.FullName;\r
-                exceptionMessageBuilder.AppendLine();\r
-                exceptionMessageBuilder.AppendFormat(CultureInfo.CurrentUICulture, MvcResources.ActionMethodSelector_AmbiguousMatchType, controllerAction, controllerType);\r
-            }\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ActionMethodSelector_AmbiguousMatch,\r
-                actionName, ControllerType.Name, exceptionMessageBuilder);\r
-            return new AmbiguousMatchException(message);\r
-        }\r
-\r
-        public MethodInfo FindActionMethod(ControllerContext controllerContext, string actionName) {\r
-            List<MethodInfo> methodsMatchingName = GetMatchingAliasedMethods(controllerContext, actionName);\r
-            methodsMatchingName.AddRange(NonAliasedMethods[actionName]);\r
-            List<MethodInfo> finalMethods = RunSelectionFilters(controllerContext, methodsMatchingName);\r
-\r
-            switch (finalMethods.Count) {\r
-                case 0:\r
-                    return null;\r
-\r
-                case 1:\r
-                    return finalMethods[0];\r
-\r
-                default:\r
-                    throw CreateAmbiguousMatchException(finalMethods, actionName);\r
-            }\r
-        }\r
-\r
-        internal List<MethodInfo> GetMatchingAliasedMethods(ControllerContext controllerContext, string actionName) {\r
-            // find all aliased methods which are opting in to this request\r
-            // to opt in, all attributes defined on the method must return true\r
-\r
-            var methods = from methodInfo in AliasedMethods\r
-                          let attrs = (ActionNameSelectorAttribute[])methodInfo.GetCustomAttributes(typeof(ActionNameSelectorAttribute), true /* inherit */)\r
-                          where attrs.All(attr => attr.IsValidName(controllerContext, actionName, methodInfo))\r
-                          select methodInfo;\r
-            return methods.ToList();\r
-        }\r
-\r
-        private static bool IsMethodDecoratedWithAliasingAttribute(MethodInfo methodInfo) {\r
-            return methodInfo.IsDefined(typeof(ActionNameSelectorAttribute), true /* inherit */);\r
-        }\r
-\r
-        private static bool IsValidActionMethod(MethodInfo methodInfo) {\r
-            return !(methodInfo.IsSpecialName ||\r
-                     methodInfo.GetBaseDefinition().DeclaringType.IsAssignableFrom(typeof(Controller)));\r
-        }\r
-\r
-        private void PopulateLookupTables() {\r
-            MethodInfo[] allMethods = ControllerType.GetMethods(BindingFlags.InvokeMethod | BindingFlags.Instance | BindingFlags.Public);\r
-            MethodInfo[] actionMethods = Array.FindAll(allMethods, IsValidActionMethod);\r
-\r
-            AliasedMethods = Array.FindAll(actionMethods, IsMethodDecoratedWithAliasingAttribute);\r
-            NonAliasedMethods = actionMethods.Except(AliasedMethods).ToLookup(method => method.Name, StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-        private static List<MethodInfo> RunSelectionFilters(ControllerContext controllerContext, List<MethodInfo> methodInfos) {\r
-            // remove all methods which are opting out of this request\r
-            // to opt out, at least one attribute defined on the method must return false\r
-\r
-            List<MethodInfo> matchesWithSelectionAttributes = new List<MethodInfo>();\r
-            List<MethodInfo> matchesWithoutSelectionAttributes = new List<MethodInfo>();\r
-\r
-            foreach (MethodInfo methodInfo in methodInfos) {\r
-                ActionMethodSelectorAttribute[] attrs = (ActionMethodSelectorAttribute[])methodInfo.GetCustomAttributes(typeof(ActionMethodSelectorAttribute), true /* inherit */);\r
-                if (attrs.Length == 0) {\r
-                    matchesWithoutSelectionAttributes.Add(methodInfo);\r
-                }\r
-                else if (attrs.All(attr => attr.IsValidForRequest(controllerContext, methodInfo))) {\r
-                    matchesWithSelectionAttributes.Add(methodInfo);\r
-                }\r
-            }\r
-\r
-            // if a matching action method had a selection attribute, consider it more specific than a matching action method\r
-            // without a selection attribute\r
-            return (matchesWithSelectionAttributes.Count > 0) ? matchesWithSelectionAttributes : matchesWithoutSelectionAttributes;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelectorAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelectorAttribute.cs
deleted file mode 100644 (file)
index 0a2fd29..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public abstract class ActionMethodSelectorAttribute : Attribute {\r
-        public abstract bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelectorCache.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionMethodSelectorCache.cs
deleted file mode 100644 (file)
index abf66b0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Threading;\r
-\r
-    internal sealed class ActionMethodSelectorCache {\r
-\r
-        private ReaderWriterLock _rwLock = new ReaderWriterLock();\r
-        private Dictionary<Type, ActionMethodSelector> _selectorDictionary = new Dictionary<Type, ActionMethodSelector>();\r
-\r
-        // This method could potentially return multiple selectors for the same controllerType due to\r
-        // upgrading the lock from reader to writer, but the dictionary won't be corrupted as a result.\r
-        public ActionMethodSelector GetSelector(Type controllerType) {\r
-            ActionMethodSelector selector;\r
-\r
-            _rwLock.AcquireReaderLock(Timeout.Infinite);\r
-            try {\r
-                if (_selectorDictionary.TryGetValue(controllerType, out selector)) {\r
-                    return selector;\r
-                }\r
-            }\r
-            finally {\r
-                _rwLock.ReleaseReaderLock();\r
-            }\r
-\r
-            // if we got this far, the selector was not in the cache\r
-            selector = new ActionMethodSelector(controllerType);\r
-            _rwLock.AcquireWriterLock(Timeout.Infinite);\r
-            try {\r
-                _selectorDictionary[controllerType] = selector;\r
-                return selector;\r
-            }\r
-            finally {\r
-                _rwLock.ReleaseWriterLock();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionNameAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionNameAttribute.cs
deleted file mode 100644 (file)
index 46ef66a..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class ActionNameAttribute : ActionNameSelectorAttribute {\r
-\r
-        public ActionNameAttribute(string name) {\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            Name = name;\r
-        }\r
-\r
-        public string Name {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override bool IsValidName(ControllerContext controllerContext, string actionName, MethodInfo methodInfo) {\r
-            return String.Equals(actionName, Name, StringComparison.OrdinalIgnoreCase);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionNameSelectorAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionNameSelectorAttribute.cs
deleted file mode 100644 (file)
index 5ec4134..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public abstract class ActionNameSelectorAttribute : Attribute {\r
-        public abstract bool IsValidName(ControllerContext controllerContext, string actionName, MethodInfo methodInfo);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionResult.cs
deleted file mode 100644 (file)
index 11bc79c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public abstract class ActionResult {\r
-\r
-        public abstract void ExecuteResult(ControllerContext context);\r
-\r
-    }\r
-\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionSelector.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ActionSelector.cs
deleted file mode 100644 (file)
index 59891d6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public delegate bool ActionSelector(ControllerContext controllerContext);\r
-\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/.gitattributes b/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/.gitattributes
deleted file mode 100644 (file)
index 34c273d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/AjaxExtensions.cs -crlf
-/AjaxOptions.cs -crlf
-/InsertionMode.cs -crlf
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/AjaxExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/AjaxExtensions.cs
deleted file mode 100644 (file)
index d477286..0000000
+++ /dev/null
@@ -1,295 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Ajax {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.Globalization;\r
-    using System.Web;\r
-    using System.Web.Mvc;\r
-    using System.Web.Mvc.Html;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class AjaxExtensions {\r
-        private const string LinkOnClickFormat = "Sys.Mvc.AsyncHyperlink.handleClick(this, new Sys.UI.DomEvent(event), {0});";\r
-        private const string FormOnSubmitFormat = "Sys.Mvc.AsyncForm.handleSubmit(this, new Sys.UI.DomEvent(event), {0});";\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, ajaxOptions);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, null /* values */, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            RouteValueDictionary newValues = new RouteValueDictionary(routeValues);\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, newValues, ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(null, actionName, controllerName, routeValues, ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-\r
-            return GenerateLink(linkText, targetUrl, GetAjaxOptions(ajaxOptions), htmlAttributes);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            RouteValueDictionary newValues = new RouteValueDictionary(routeValues);\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, protocol, hostName, fragment, newValues, ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static string ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(null /* routeName */, actionName, controllerName, protocol, hostName, fragment, routeValues, ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-\r
-            return GenerateLink(linkText, targetUrl, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, AjaxOptions ajaxOptions) {\r
-            string formAction = ajaxHelper.ViewContext.HttpContext.Request.RawUrl;\r
-\r
-            TagBuilder builder = new TagBuilder("form");\r
-\r
-            builder.MergeAttribute("action", formAction);\r
-            builder.MergeAttribute("method", "post");\r
-            builder.MergeAttribute("onsubmit", GenerateAjaxScript(GetAjaxOptions(ajaxOptions), FormOnSubmitFormat));\r
-\r
-            HttpResponseBase response = ajaxHelper.ViewContext.HttpContext.Response;\r
-            response.Write(builder.ToString(TagRenderMode.StartTag));\r
-            return new MvcForm(response);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, ajaxOptions);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, controllerName, null /* values */, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            RouteValueDictionary newValues = new RouteValueDictionary(routeValues);\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return BeginForm(ajaxHelper, actionName, controllerName, newValues, ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            // get target URL\r
-            string formAction = UrlHelper.GenerateUrl(null, actionName, controllerName, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-            return FormHelper(ajaxHelper, formAction, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, AjaxOptions ajaxOptions) {\r
-            return BeginRouteForm(ajaxHelper, routeName, null /* routeValues */, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginRouteForm(ajaxHelper, routeName, (object)routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return BeginRouteForm(ajaxHelper, routeName, new RouteValueDictionary(routeValues), ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginRouteForm(ajaxHelper, routeName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            string formAction = UrlHelper.GenerateUrl(routeName, null /* actionName */, null /* controllerName */, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-            return FormHelper(ajaxHelper, formAction, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        private static MvcForm FormHelper(this AjaxHelper ajaxHelper, string formAction, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            TagBuilder builder = new TagBuilder("form");\r
-            builder.MergeAttributes(htmlAttributes);\r
-            builder.MergeAttribute("action", formAction);\r
-            builder.MergeAttribute("method", "post");\r
-            builder.MergeAttribute("onsubmit", GenerateAjaxScript(GetAjaxOptions(ajaxOptions), FormOnSubmitFormat));\r
-\r
-            HttpResponseBase response = ajaxHelper.ViewContext.HttpContext.Response;\r
-            response.Write(builder.ToString(TagRenderMode.StartTag));\r
-            return new MvcForm(response);\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, object routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             ObjectToCaseSensitiveDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, routeValues, ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(), ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(), ajaxOptions, ObjectToCaseSensitiveDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(), ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             ObjectToCaseSensitiveDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, routeValues, ajaxOptions, new Dictionary<string, object>());\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(routeName, null /* actionName */, null /* controllerName */, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-\r
-            return GenerateLink(linkText, targetUrl, GetAjaxOptions(ajaxOptions), htmlAttributes);\r
-        }\r
-\r
-        public static string RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(routeName, null /* actionName */, null /* controllerName */, protocol, hostName, fragment, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-\r
-            return GenerateLink(linkText, targetUrl, GetAjaxOptions(ajaxOptions), htmlAttributes);\r
-        }\r
-\r
-        internal static string InsertionModeToString(InsertionMode insertionMode) {\r
-            switch (insertionMode) {\r
-                case InsertionMode.Replace:\r
-                    return "Sys.Mvc.InsertionMode.replace";\r
-                case InsertionMode.InsertBefore:\r
-                    return "Sys.Mvc.InsertionMode.insertBefore";\r
-                case InsertionMode.InsertAfter:\r
-                    return "Sys.Mvc.InsertionMode.insertAfter";\r
-                default:\r
-                    return ((int)insertionMode).ToString(CultureInfo.InvariantCulture);\r
-            }\r
-        }\r
-\r
-        private static Dictionary<string, object> ObjectToCaseSensitiveDictionary(object values) {\r
-            Dictionary<string, object> dict = new Dictionary<string, object>(StringComparer.Ordinal);\r
-            if (values != null) {\r
-                foreach (PropertyDescriptor prop in TypeDescriptor.GetProperties(values)) {\r
-                    object val = prop.GetValue(values);\r
-                    dict[prop.Name] = val;\r
-                }\r
-            }\r
-            return dict;\r
-        }\r
-\r
-        private static string GenerateLink(string linkText, string targetUrl, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            TagBuilder tag = new TagBuilder("a") {\r
-                InnerHtml = HttpUtility.HtmlEncode(linkText)\r
-            };\r
-\r
-            tag.MergeAttributes(htmlAttributes);\r
-            tag.MergeAttribute("href", targetUrl);\r
-            tag.MergeAttribute("onclick", GenerateAjaxScript(ajaxOptions, LinkOnClickFormat));\r
-\r
-            return tag.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        private static string GenerateAjaxScript(AjaxOptions ajaxOptions, string scriptFormat) {\r
-            string optionsString = ajaxOptions.ToJavascriptString();\r
-            return String.Format(CultureInfo.InvariantCulture, scriptFormat, optionsString);\r
-        }\r
-\r
-        private static AjaxOptions GetAjaxOptions(AjaxOptions ajaxOptions) {\r
-            return (ajaxOptions != null) ? ajaxOptions : new AjaxOptions();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/AjaxOptions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/AjaxOptions.cs
deleted file mode 100644 (file)
index a8284ed..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Ajax {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class AjaxOptions {\r
-        private string _confirm;\r
-        private string _httpMethod;\r
-        private InsertionMode _insertionMode = InsertionMode.Replace;\r
-        private string _loadingElementId;\r
-        private string _onBegin;\r
-        private string _onComplete;\r
-        private string _onFailure;\r
-        private string _onSuccess;\r
-        private string _updateTargetId;\r
-        private string _url;\r
-\r
-        public string Confirm {\r
-            get {\r
-                return _confirm ?? String.Empty;\r
-            }\r
-            set {\r
-                _confirm = value;\r
-            }\r
-        }\r
-\r
-        public string HttpMethod {\r
-            get {\r
-                return _httpMethod ?? String.Empty;\r
-            }\r
-            set {\r
-                _httpMethod = value;\r
-            }\r
-        }\r
-\r
-        public InsertionMode InsertionMode {\r
-            get {\r
-                return _insertionMode;\r
-            }\r
-            set {\r
-                switch (value) {\r
-                    case InsertionMode.Replace:\r
-                    case InsertionMode.InsertAfter:\r
-                    case InsertionMode.InsertBefore:\r
-                        _insertionMode = value;\r
-                        return;\r
-\r
-                    default:\r
-                        throw new ArgumentOutOfRangeException("value", String.Format(CultureInfo.InvariantCulture,\r
-                            MvcResources.Common_InvalidEnumValue, value, typeof(InsertionMode).FullName));\r
-                }\r
-            }\r
-        }\r
-\r
-        public string LoadingElementId {\r
-            get {\r
-                return _loadingElementId ?? String.Empty;\r
-            }\r
-            set {\r
-                _loadingElementId = value;\r
-            }\r
-        }\r
-\r
-        public string OnBegin {\r
-            get {\r
-                return _onBegin ?? String.Empty;\r
-            }\r
-            set {\r
-                _onBegin = value;\r
-            }\r
-        }\r
-\r
-        public string OnComplete {\r
-            get {\r
-                return _onComplete ?? String.Empty;\r
-            }\r
-            set {\r
-                _onComplete = value;\r
-            }\r
-        }\r
-\r
-        public string OnFailure {\r
-            get {\r
-                return _onFailure ?? String.Empty;\r
-            }\r
-            set {\r
-                _onFailure = value;\r
-            }\r
-        }\r
-\r
-        public string OnSuccess {\r
-            get {\r
-                return _onSuccess ?? String.Empty;\r
-            }\r
-            set {\r
-                _onSuccess = value;\r
-            }\r
-        }\r
-\r
-        public string UpdateTargetId {\r
-            get {\r
-                return _updateTargetId ?? String.Empty;\r
-            }\r
-            set {\r
-                _updateTargetId = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings",\r
-            Justification = "This property is used by the optionsBuilder which always accepts a string.")]\r
-        public string Url {\r
-            get {\r
-                return _url ?? String.Empty;\r
-            }\r
-            set {\r
-                _url = value;\r
-            }\r
-        }\r
-\r
-        internal string ToJavascriptString() {\r
-            // creates a string of the form { key1: value1, key2 : value2, ... }\r
-            StringBuilder optionsBuilder = new StringBuilder("{");\r
-            optionsBuilder.Append(String.Format(CultureInfo.InvariantCulture, " insertionMode: {0},", AjaxExtensions.InsertionModeToString(InsertionMode)));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("confirm", Confirm));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("httpMethod", HttpMethod));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("loadingElementId", LoadingElementId));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("updateTargetId", UpdateTargetId));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("url", Url));\r
-            optionsBuilder.Append(EventStringIfSpecified("onBegin", OnBegin));\r
-            optionsBuilder.Append(EventStringIfSpecified("onComplete", OnComplete));\r
-            optionsBuilder.Append(EventStringIfSpecified("onFailure", OnFailure));\r
-            optionsBuilder.Append(EventStringIfSpecified("onSuccess", OnSuccess));\r
-            optionsBuilder.Length--;\r
-            optionsBuilder.Append(" }");\r
-            return optionsBuilder.ToString();\r
-        }\r
-\r
-        private static string EventStringIfSpecified(string propertyName, string handler) {\r
-            if (!String.IsNullOrEmpty(handler)) {\r
-                return String.Format(CultureInfo.InvariantCulture, " {0}: Function.createDelegate(this, {1}),", propertyName, handler.ToString());\r
-            }\r
-            return String.Empty;\r
-        }\r
-\r
-        private static string PropertyStringIfSpecified(string propertyName, string propertyValue) {\r
-            if (!String.IsNullOrEmpty(propertyValue)) {\r
-                string escapedPropertyValue = propertyValue.Replace("'", @"\'");\r
-                return String.Format(CultureInfo.InvariantCulture, " {0}: '{1}',", propertyName, escapedPropertyValue);\r
-            }\r
-            return String.Empty;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/InsertionMode.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Ajax/InsertionMode.cs
deleted file mode 100644 (file)
index de0eb4e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Ajax {\r
-    public enum InsertionMode {\r
-        Replace = 0,\r
-        InsertBefore = 1,\r
-        InsertAfter = 2\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxHelper.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxHelper.cs
deleted file mode 100644 (file)
index bcce9fd..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Routing;\r
-\r
-    public class AjaxHelper {\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection) {\r
-            if (viewContext == null) {\r
-                throw new ArgumentNullException("viewContext");\r
-            }\r
-            if (viewDataContainer == null) {\r
-                throw new ArgumentNullException("viewDataContainer");\r
-            }\r
-            if (routeCollection == null) {\r
-                throw new ArgumentNullException("routeCollection");\r
-            }\r
-            ViewContext = viewContext;\r
-            ViewDataContainer = viewDataContainer;\r
-            RouteCollection = routeCollection;\r
-        }\r
-\r
-        public RouteCollection RouteCollection {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                return ViewDataContainer.ViewData;\r
-            }\r
-        }\r
-\r
-        public IViewDataContainer ViewDataContainer {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxHelper`1.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxHelper`1.cs
deleted file mode 100644 (file)
index a407d3a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public class AjaxHelper<TModel> : AjaxHelper where TModel : class {\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection)\r
-            : base(viewContext, viewDataContainer, routeCollection) {\r
-\r
-            _viewData = new ViewDataDictionary<TModel>(viewDataContainer.ViewData);\r
-        }\r
-\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                return _viewData;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxRequestExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AjaxRequestExtensions.cs
deleted file mode 100644 (file)
index 411c250..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public static class AjaxRequestExtensions {\r
-\r
-        public static bool IsAjaxRequest(this HttpRequestBase request) {\r
-            if (request == null) {\r
-                throw new ArgumentNullException("request");\r
-            }\r
-            \r
-            return (request["X-Requested-With"] == "XMLHttpRequest") || ((request.Headers != null) && (request.Headers["X-Requested-With"] == "XMLHttpRequest"));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryData.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryData.cs
deleted file mode 100644 (file)
index 2d2ee68..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Security.Cryptography;\r
-    using System.Text;\r
-\r
-    internal sealed class AntiForgeryData {\r
-\r
-        private const string AntiForgeryTokenFieldName = "__RequestVerificationToken";\r
-\r
-        private const int TokenLength = 128 / 8;\r
-        private static RNGCryptoServiceProvider _prng = new RNGCryptoServiceProvider();\r
-\r
-        private string _salt;\r
-        private string _value;\r
-\r
-        public AntiForgeryData() {\r
-        }\r
-\r
-        // copy constructor\r
-        public AntiForgeryData(AntiForgeryData token) {\r
-            if (token == null) {\r
-                throw new ArgumentNullException("token");\r
-            }\r
-\r
-            CreationDate = token.CreationDate;\r
-            Salt = token.Salt;\r
-            Value = token.Value;\r
-        }\r
-\r
-        public DateTime CreationDate {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string Salt {\r
-            get {\r
-                return _salt ?? String.Empty;\r
-            }\r
-            set {\r
-                _salt = value;\r
-            }\r
-        }\r
-\r
-        public string Value {\r
-            get {\r
-                return _value ?? String.Empty;\r
-            }\r
-            set {\r
-                _value = value;\r
-            }\r
-        }\r
-\r
-        private static string Base64EncodeForCookieName(string s) {\r
-            byte[] rawBytes = Encoding.UTF8.GetBytes(s);\r
-            string base64String = Convert.ToBase64String(rawBytes);\r
-\r
-            // replace base64-specific characters with characters that are safe for a cookie name\r
-            return base64String.Replace('+', '.').Replace('/', '-').Replace('=', '_');\r
-        }\r
-\r
-        private static string GenerateRandomTokenString() {\r
-            byte[] tokenBytes = new byte[TokenLength];\r
-            _prng.GetBytes(tokenBytes);\r
-\r
-            string token = Convert.ToBase64String(tokenBytes);\r
-            return token;\r
-        }\r
-\r
-        // If the app path is provided, we're generating a cookie name rather than a field name, and the cookie names should\r
-        // be unique so that a development server cookie and an IIS cookie - both running on localhost - don't stomp on\r
-        // each other.\r
-        internal static string GetAntiForgeryTokenName(string appPath) {\r
-            if (String.IsNullOrEmpty(appPath)) {\r
-                return AntiForgeryTokenFieldName;\r
-            }\r
-            else {\r
-                return AntiForgeryTokenFieldName + "_" + Base64EncodeForCookieName(appPath);\r
-            }\r
-        }\r
-\r
-        public static AntiForgeryData NewToken() {\r
-            string tokenString = GenerateRandomTokenString();\r
-            return new AntiForgeryData() {\r
-                CreationDate = DateTime.Now,\r
-                Value = tokenString\r
-            };\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryDataSerializer.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryDataSerializer.cs
deleted file mode 100644 (file)
index 54465e1..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.IO;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    internal class AntiForgeryDataSerializer {\r
-\r
-        private IStateFormatter _formatter;\r
-\r
-        protected internal IStateFormatter Formatter {\r
-            get {\r
-                if (_formatter == null) {\r
-                    _formatter = FormatterGenerator.GetFormatter();\r
-                }\r
-                return _formatter;\r
-            }\r
-            set {\r
-                _formatter = value;\r
-            }\r
-        }\r
-\r
-        private static HttpAntiForgeryException CreateValidationException(Exception innerException) {\r
-            return new HttpAntiForgeryException(MvcResources.AntiForgeryToken_ValidationFailed, innerException);\r
-        }\r
-\r
-        public virtual AntiForgeryData Deserialize(string serializedToken) {\r
-            if (String.IsNullOrEmpty(serializedToken)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "serializedToken");\r
-            }\r
-\r
-            // call property getter outside try { } block so that exceptions bubble up for debugging\r
-            IStateFormatter formatter = Formatter;\r
-\r
-            try {\r
-                Triplet deserializedObj = (Triplet)formatter.Deserialize(serializedToken);\r
-                return new AntiForgeryData() {\r
-                    Salt = (string)deserializedObj.First,\r
-                    Value = (string)deserializedObj.Second,\r
-                    CreationDate = (DateTime)deserializedObj.Third\r
-                };\r
-            }\r
-            catch (Exception ex) {\r
-                throw CreateValidationException(ex);\r
-            }\r
-        }\r
-\r
-        public virtual string Serialize(AntiForgeryData token) {\r
-            if (token == null) {\r
-                throw new ArgumentNullException("token");\r
-            }\r
-\r
-            Triplet objToSerialize = new Triplet() {\r
-                First = token.Salt,\r
-                Second = token.Value,\r
-                Third = token.CreationDate\r
-            };\r
-\r
-            string serializedValue = Formatter.Serialize(objToSerialize);\r
-            return serializedValue;\r
-        }\r
-\r
-        // See http://www.yoda.arachsys.com/csharp/singleton.html (fifth version - fully lazy) for the singleton pattern\r
-        // used here. We need to defer the call to TokenPersister.CreateFormatterGenerator() until we're actually\r
-        // servicing a request, else HttpContext.Current might be invalid in TokenPersister.CreateFormatterGenerator().\r
-        private static class FormatterGenerator {\r
-\r
-            public static readonly Func<IStateFormatter> GetFormatter = TokenPersister.CreateFormatterGenerator();\r
-\r
-            [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline",\r
-                Justification = "This type must not be marked 'beforefieldinit'.")]\r
-            static FormatterGenerator() {\r
-            }\r
-\r
-            // This type is very difficult to unit-test because Page.ProcessRequest() requires mocking\r
-            // much of the hosting environment. For now, we can perform functional tests of this feature.\r
-            private sealed class TokenPersister : PageStatePersister {\r
-                private TokenPersister(Page page)\r
-                    : base(page) {\r
-                }\r
-\r
-                public static Func<IStateFormatter> CreateFormatterGenerator() {\r
-                    // This code instantiates a page and tricks it into thinking that it's servicing\r
-                    // a postback scenario with encrypted ViewState, which is required to make the\r
-                    // StateFormatter properly decrypt data. Specifically, this code sets the\r
-                    // internal Page.ContainsEncryptedViewState flag.\r
-                    TextWriter writer = TextWriter.Null;\r
-                    HttpResponse response = new HttpResponse(writer);\r
-                    HttpRequest request = new HttpRequest("DummyFile.aspx", HttpContext.Current.Request.Url.ToString(), "__EVENTTARGET=true&__VIEWSTATEENCRYPTED=true");\r
-                    HttpContext context = new HttpContext(request, response);\r
-\r
-                    Page page = new Page() {\r
-                        EnableViewStateMac = true,\r
-                        ViewStateEncryptionMode = ViewStateEncryptionMode.Always\r
-                    };\r
-                    page.ProcessRequest(context);\r
-\r
-                    return () => new TokenPersister(page).StateFormatter;\r
-                }\r
-\r
-                public override void Load() {\r
-                    throw new NotImplementedException();\r
-                }\r
-\r
-                public override void Save() {\r
-                    throw new NotImplementedException();\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryToken.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryToken.cs
deleted file mode 100644 (file)
index ef1b9e6..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Security.Cryptography;\r
-\r
-    internal sealed class AntiForgeryToken {\r
-\r
-        private const int TokenLength = 128 / 8;\r
-        private static RNGCryptoServiceProvider _prng = new RNGCryptoServiceProvider();\r
-\r
-        private string _salt;\r
-        private string _value;\r
-\r
-        public AntiForgeryToken() {\r
-        }\r
-\r
-        // copy constructor\r
-        public AntiForgeryToken(AntiForgeryToken token) {\r
-            if (token == null) {\r
-                throw new ArgumentNullException("token");\r
-            }\r
-\r
-            CreationDate = token.CreationDate;\r
-            Salt = token.Salt;\r
-            Value = token.Value;\r
-        }\r
-\r
-        public DateTime CreationDate {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string Salt {\r
-            get {\r
-                return _salt ?? String.Empty;\r
-            }\r
-            set {\r
-                _salt = value;\r
-            }\r
-        }\r
-\r
-        public string Value {\r
-            get {\r
-                return _value ?? String.Empty;\r
-            }\r
-            set {\r
-                _value = value;\r
-            }\r
-        }\r
-\r
-        private static string GenerateRandomTokenString() {\r
-            byte[] tokenBytes = new byte[TokenLength];\r
-            _prng.GetBytes(tokenBytes);\r
-\r
-            string token = Convert.ToBase64String(tokenBytes);\r
-            return token;\r
-        }\r
-\r
-        public static AntiForgeryToken NewToken() {\r
-            string tokenString = GenerateRandomTokenString();\r
-            return new AntiForgeryToken() {\r
-                CreationDate = DateTime.Now,\r
-                Value = tokenString\r
-            };\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryTokenSerializer.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AntiForgeryTokenSerializer.cs
deleted file mode 100644 (file)
index 8a6e42b..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.IO;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    internal class AntiForgeryTokenSerializer {\r
-\r
-        private IStateFormatter _formatter;\r
-\r
-        protected internal IStateFormatter Formatter {\r
-            get {\r
-                if (_formatter == null) {\r
-                    _formatter = FormatterGenerator.GetFormatter();\r
-                }\r
-                return _formatter;\r
-            }\r
-            set {\r
-                _formatter = value;\r
-            }\r
-        }\r
-\r
-        private static HttpAntiForgeryException CreateValidationException(Exception innerException) {\r
-            return new HttpAntiForgeryException(MvcResources.AntiForgeryToken_ValidationFailed, innerException);\r
-        }\r
-\r
-        public virtual AntiForgeryToken Deserialize(string serializedToken) {\r
-            if (String.IsNullOrEmpty(serializedToken)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "serializedToken");\r
-            }\r
-\r
-            // call property getter outside try { } block so that exceptions bubble up for debugging\r
-            IStateFormatter formatter = Formatter;\r
-\r
-            try {\r
-                Triplet deserializedObj = (Triplet)formatter.Deserialize(serializedToken);\r
-                return new AntiForgeryToken() {\r
-                    Salt = (string)deserializedObj.First,\r
-                    Value = (string)deserializedObj.Second,\r
-                    CreationDate = (DateTime)deserializedObj.Third\r
-                };\r
-            }\r
-            catch (Exception ex) {\r
-                throw CreateValidationException(ex);\r
-            }\r
-        }\r
-\r
-        public virtual string Serialize(AntiForgeryToken token) {\r
-            if (token == null) {\r
-                throw new ArgumentNullException("token");\r
-            }\r
-\r
-            Triplet objToSerialize = new Triplet() {\r
-                First = token.Salt,\r
-                Second = token.Value,\r
-                Third = token.CreationDate\r
-            };\r
-\r
-            string serializedValue = Formatter.Serialize(objToSerialize);\r
-            return serializedValue;\r
-        }\r
-\r
-        // See http://www.yoda.arachsys.com/csharp/singleton.html (fifth version - fully lazy) for the singleton pattern\r
-        // used here. We need to defer the call to TokenPersister.CreateFormatterGenerator() until we're actually\r
-        // servicing a request, else HttpContext.Current might be invalid in TokenPersister.CreateFormatterGenerator().\r
-        private static class FormatterGenerator {\r
-\r
-            public static readonly Func<IStateFormatter> GetFormatter = TokenPersister.CreateFormatterGenerator();\r
-\r
-            [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline",\r
-                Justification = "This type must not be marked 'beforefieldinit'.")]\r
-            static FormatterGenerator() {\r
-            }\r
-\r
-            // This type is very difficult to unit-test because Page.ProcessRequest() requires mocking\r
-            // much of the hosting environment. For now, we can perform functional tests of this feature.\r
-            private sealed class TokenPersister : PageStatePersister {\r
-                private TokenPersister(Page page)\r
-                    : base(page) {\r
-                }\r
-\r
-                public static Func<IStateFormatter> CreateFormatterGenerator() {\r
-                    // This code instantiates a page and tricks it into thinking that it's servicing\r
-                    // a postback scenario with encrypted ViewState, which is required to make the\r
-                    // StateFormatter properly decrypt data. Specifically, this code sets the\r
-                    // internal Page.ContainsEncryptedViewState flag.\r
-                    TextWriter writer = TextWriter.Null;\r
-                    HttpResponse response = new HttpResponse(writer);\r
-                    HttpRequest request = new HttpRequest("DummyFile.aspx", HttpContext.Current.Request.Url.ToString(), "__EVENTTARGET=true&__VIEWSTATEENCRYPTED=true");\r
-                    HttpContext context = new HttpContext(request, response);\r
-\r
-                    Page page = new Page() {\r
-                        EnableViewStateMac = true,\r
-                        ViewStateEncryptionMode = ViewStateEncryptionMode.Always\r
-                    };\r
-                    page.ProcessRequest(context);\r
-\r
-                    return () => new TokenPersister(page).StateFormatter;\r
-                }\r
-\r
-                public override void Load() {\r
-                    throw new NotImplementedException();\r
-                }\r
-\r
-                public override void Save() {\r
-                    throw new NotImplementedException();\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AuthorizationContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AuthorizationContext.cs
deleted file mode 100644 (file)
index 434875b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public class AuthorizationContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public AuthorizationContext() {\r
-        }\r
-\r
-        public AuthorizationContext(ControllerContext controllerContext)\r
-            : base(controllerContext) {\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/AuthorizeAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/AuthorizeAttribute.cs
deleted file mode 100644 (file)
index 18f5749..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Security.Principal;\r
-    using System.Web;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "Unsealed so that subclassed types can set properties in the default constructor or override our behavior.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]\r
-    public class AuthorizeAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        private string _roles;\r
-        private string[] _rolesSplit = new string[0];\r
-        private string _users;\r
-        private string[] _usersSplit = new string[0];\r
-\r
-        public string Roles {\r
-            get {\r
-                return _roles ?? String.Empty;\r
-            }\r
-            set {\r
-                _roles = value;\r
-                _rolesSplit = SplitString(value);\r
-            }\r
-        }\r
-\r
-        public string Users {\r
-            get {\r
-                return _users ?? String.Empty;\r
-            }\r
-            set {\r
-                _users = value;\r
-                _usersSplit = SplitString(value);\r
-            }\r
-        }\r
-\r
-        // This method must be thread-safe since it is called by the thread-safe OnCacheAuthorization() method.\r
-        protected virtual bool AuthorizeCore(HttpContextBase httpContext) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-\r
-            IPrincipal user = httpContext.User;\r
-            if (!user.Identity.IsAuthenticated) {\r
-                return false;\r
-            }\r
-\r
-            if (_usersSplit.Length > 0 && !_usersSplit.Contains(user.Identity.Name, StringComparer.OrdinalIgnoreCase)) {\r
-                return false;\r
-            }\r
-\r
-            if (_rolesSplit.Length > 0 && !_rolesSplit.Any(user.IsInRole)) {\r
-                return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private void CacheValidateHandler(HttpContext context, object data, ref HttpValidationStatus validationStatus) {\r
-            validationStatus = OnCacheAuthorization(new HttpContextWrapper(context));\r
-        }\r
-\r
-        public virtual void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            if (AuthorizeCore(filterContext.HttpContext)) {\r
-                // ** IMPORTANT **\r
-                // Since we're performing authorization at the action level, the authorization code runs\r
-                // after the output caching module. In the worst case this could allow an authorized user\r
-                // to cause the page to be cached, then an unauthorized user would later be served the\r
-                // cached page. We work around this by telling proxies not to cache the sensitive page,\r
-                // then we hook our custom authorization code into the caching mechanism so that we have\r
-                // the final say on whether a page should be served from the cache.\r
-\r
-                HttpCachePolicyBase cachePolicy = filterContext.HttpContext.Response.Cache;\r
-                cachePolicy.SetProxyMaxAge(new TimeSpan(0));\r
-                cachePolicy.AddValidationCallback(CacheValidateHandler, null /* data */);\r
-            }\r
-            else {\r
-                // auth failed, redirect to login page\r
-                filterContext.Result = new HttpUnauthorizedResult();\r
-            }\r
-        }\r
-\r
-        // This method must be thread-safe since it is called by the caching module.\r
-        protected virtual HttpValidationStatus OnCacheAuthorization(HttpContextBase httpContext) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-\r
-            bool isAuthorized = AuthorizeCore(httpContext);\r
-            return (isAuthorized) ? HttpValidationStatus.Valid : HttpValidationStatus.IgnoreThisRequest;\r
-        }\r
-\r
-        internal static string[] SplitString(string original) {\r
-            if (String.IsNullOrEmpty(original)) {\r
-                return new string[0];\r
-            }\r
-\r
-            var split = from piece in original.Split(',')\r
-                        let trimmed = piece.Trim()\r
-                        where !String.IsNullOrEmpty(trimmed)\r
-                        select trimmed;\r
-            return split.ToArray();\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/BindAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/BindAttribute.cs
deleted file mode 100644 (file)
index 5f3b1be..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Linq;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]\r
-    public sealed class BindAttribute : Attribute {\r
-\r
-        private string _exclude;\r
-        private string[] _excludeSplit = new string[0];\r
-        private string _include;\r
-        private string[] _includeSplit = new string[0];\r
-\r
-        public string Exclude {\r
-            get {\r
-                return _exclude ?? String.Empty;\r
-            }\r
-            set {\r
-                _exclude = value;\r
-                _excludeSplit = AuthorizeAttribute.SplitString(value);\r
-            }\r
-        }\r
-\r
-        public string Include {\r
-            get {\r
-                return _include ?? String.Empty;\r
-            }\r
-            set {\r
-                _include = value;\r
-                _includeSplit = AuthorizeAttribute.SplitString(value);\r
-            }\r
-        }\r
-\r
-        public string Prefix {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        internal static bool IsPropertyAllowed(string propertyName, string[] includeProperties, string[] excludeProperties) {\r
-            // We allow a property to be bound if its both in the include list AND not in the exclude list.\r
-            // An empty include list implies all properties are allowed.\r
-            // An empty exclude list implies no properties are disallowed.\r
-            bool includeProperty = (includeProperties == null) || (includeProperties.Length == 0) || includeProperties.Contains(propertyName, StringComparer.OrdinalIgnoreCase);\r
-            bool excludeProperty = (excludeProperties != null) && excludeProperties.Contains(propertyName, StringComparer.OrdinalIgnoreCase);\r
-            return includeProperty && !excludeProperty;\r
-        }\r
-\r
-        public bool IsPropertyAllowed(string propertyName) {\r
-            return IsPropertyAllowed(propertyName, _includeSplit, _excludeSplit);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/BuildManagerWrapper.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/BuildManagerWrapper.cs
deleted file mode 100644 (file)
index e6da39d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections;\r
-    using System.Web.Compilation;\r
-\r
-    internal sealed class BuildManagerWrapper : IBuildManager {\r
-        #region IBuildManager Members\r
-        object IBuildManager.CreateInstanceFromVirtualPath(string virtualPath, Type requiredBaseType) {\r
-            return BuildManager.CreateInstanceFromVirtualPath(virtualPath, requiredBaseType);\r
-        }\r
-\r
-        ICollection IBuildManager.GetReferencedAssemblies() {\r
-            return BuildManager.GetReferencedAssemblies();\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ContentResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ContentResult.cs
deleted file mode 100644 (file)
index 37ecb71..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Text;\r
-    using System.Web;\r
-\r
-    public class ContentResult : ActionResult {\r
-\r
-        public string Content {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public Encoding ContentEncoding {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ContentType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-\r
-            if (!String.IsNullOrEmpty(ContentType)) {\r
-                response.ContentType = ContentType;\r
-            }\r
-            if (ContentEncoding != null) {\r
-                response.ContentEncoding = ContentEncoding;\r
-            }\r
-            if (Content != null) {\r
-                response.Write(Content);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Controller.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Controller.cs
deleted file mode 100644 (file)
index 40a97a5..0000000
+++ /dev/null
@@ -1,533 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Security.Principal;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public abstract class Controller : ControllerBase, IActionFilter, IAuthorizationFilter, IDisposable, IExceptionFilter, IResultFilter {\r
-\r
-        private IActionInvoker _actionInvoker;\r
-        private ModelBinderDictionary _binders;\r
-        private RouteCollection _routeCollection;\r
-        private ITempDataProvider _tempDataProvider;\r
-\r
-        public IActionInvoker ActionInvoker {\r
-            get {\r
-                if (_actionInvoker == null) {\r
-                    _actionInvoker = new ControllerActionInvoker();\r
-                }\r
-                return _actionInvoker;\r
-            }\r
-            set {\r
-                _actionInvoker = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "Property is settable so that the dictionary can be provided for unit testing purposes.")]\r
-        protected internal ModelBinderDictionary Binders {\r
-            get {\r
-                if (_binders == null) {\r
-                    _binders = ModelBinders.Binders;\r
-                }\r
-                return _binders;\r
-            }\r
-            set {\r
-                _binders = value;\r
-            }\r
-        }\r
-\r
-        public HttpContextBase HttpContext {\r
-            get {\r
-                return ControllerContext == null ? null : ControllerContext.HttpContext;\r
-            }\r
-        }\r
-\r
-        public ModelStateDictionary ModelState {\r
-            get {\r
-                return ViewData.ModelState;\r
-            }\r
-        }\r
-\r
-        public HttpRequestBase Request {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Request;\r
-            }\r
-        }\r
-\r
-        public HttpResponseBase Response {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Response;\r
-            }\r
-        }\r
-\r
-        internal RouteCollection RouteCollection {\r
-            get {\r
-                if (_routeCollection == null) {\r
-                    _routeCollection = RouteTable.Routes;\r
-                }\r
-                return _routeCollection;\r
-            }\r
-            set {\r
-                _routeCollection = value;\r
-            }\r
-        }\r
-\r
-        public RouteData RouteData {\r
-            get {\r
-                return ControllerContext == null ? null : ControllerContext.RouteData;\r
-            }\r
-        }\r
-\r
-        public HttpServerUtilityBase Server {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Server;\r
-            }\r
-        }\r
-\r
-        public HttpSessionStateBase Session {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Session;\r
-            }\r
-        }\r
-\r
-        public ITempDataProvider TempDataProvider {\r
-            get {\r
-                if (_tempDataProvider == null) {\r
-                    _tempDataProvider = new SessionStateTempDataProvider();\r
-                }\r
-                return _tempDataProvider;\r
-            }\r
-            set {\r
-                _tempDataProvider = value;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public IPrincipal User {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.User;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "'Content' refers to ContentResult type; 'content' refers to ContentResult.Content property.")]\r
-        protected internal ContentResult Content(string content) {\r
-            return Content(content, null /* contentType */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "'Content' refers to ContentResult type; 'content' refers to ContentResult.Content property.")]\r
-        protected internal ContentResult Content(string content, string contentType) {\r
-            return Content(content, contentType, null /* contentEncoding */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "'Content' refers to ContentResult type; 'content' refers to ContentResult.Content property.")]\r
-        protected internal virtual ContentResult Content(string content, string contentType, Encoding contentEncoding) {\r
-            return new ContentResult {\r
-                Content = content,\r
-                ContentType = contentType,\r
-                ContentEncoding = contentEncoding\r
-            };\r
-        }\r
-\r
-        // The default invoker will never match methods defined on the Controller type, so\r
-        // the Dispose() method is not web-callable.  However, in general, since implicitly-\r
-        // implemented interface methods are public, they are web-callable unless decorated with\r
-        // [NonAction].\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Dispose() {\r
-            Dispose(true /* disposing */);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        protected virtual void Dispose(bool disposing) {\r
-        }\r
-\r
-        protected override void ExecuteCore() {\r
-            TempData.Load(ControllerContext, TempDataProvider);\r
-\r
-            try {\r
-                string actionName = RouteData.GetRequiredString("action");\r
-                if (!ActionInvoker.InvokeAction(ControllerContext, actionName)) {\r
-                    HandleUnknownAction(actionName);\r
-                }\r
-            }\r
-            finally {\r
-                TempData.Save(ControllerContext, TempDataProvider);\r
-            }\r
-        }\r
-\r
-        protected internal FileContentResult File(byte[] fileContents, string contentType) {\r
-            return File(fileContents, contentType, null /* fileDownloadName */);\r
-        }\r
-\r
-        protected internal virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName) {\r
-            return new FileContentResult(fileContents, contentType) { FileDownloadName = fileDownloadName };\r
-        }\r
-\r
-        protected internal FileStreamResult File(Stream fileStream, string contentType) {\r
-            return File(fileStream, contentType, null /* fileDownloadName */);\r
-        }\r
-\r
-        protected internal virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName) {\r
-            return new FileStreamResult(fileStream, contentType) { FileDownloadName = fileDownloadName };\r
-        }\r
-\r
-        protected internal FilePathResult File(string fileName, string contentType) {\r
-            return File(fileName, contentType, null /* fileDownloadName */);\r
-        }\r
-\r
-        protected internal virtual FilePathResult File(string fileName, string contentType, string fileDownloadName) {\r
-            return new FilePathResult(fileName, contentType) { FileDownloadName = fileDownloadName };\r
-        }\r
-\r
-        protected virtual void HandleUnknownAction(string actionName) {\r
-            throw new HttpException(404, String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Controller_UnknownAction, actionName, GetType().FullName));\r
-        }\r
-\r
-        protected internal virtual JavaScriptResult JavaScript(string script) {\r
-            return new JavaScriptResult { Script = script };\r
-        }\r
-\r
-        protected internal JsonResult Json(object data) {\r
-            return Json(data, null /* contentType */);\r
-        }\r
-\r
-        protected internal JsonResult Json(object data, string contentType) {\r
-            return Json(data, contentType, null /* contentEncoding */);\r
-        }\r
-\r
-        protected internal virtual JsonResult Json(object data, string contentType, Encoding contentEncoding) {\r
-            return new JsonResult {\r
-                Data = data,\r
-                ContentType = contentType,\r
-                ContentEncoding = contentEncoding\r
-            };\r
-        }\r
-\r
-        protected override void Initialize(RequestContext requestContext) {\r
-            base.Initialize(requestContext);\r
-            Url = new UrlHelper(requestContext);\r
-        }\r
-\r
-        protected virtual void OnActionExecuting(ActionExecutingContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnActionExecuted(ActionExecutedContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnAuthorization(AuthorizationContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnException(ExceptionContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnResultExecuted(ResultExecutedContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnResultExecuting(ResultExecutingContext filterContext) {\r
-        }\r
-\r
-        protected internal PartialViewResult PartialView() {\r
-            return PartialView(null /* viewName */, null /* model */);\r
-        }\r
-\r
-        protected internal PartialViewResult PartialView(object model) {\r
-            return PartialView(null /* viewName */, model);\r
-        }\r
-\r
-        protected internal PartialViewResult PartialView(string viewName) {\r
-            return PartialView(viewName, null /* model */);\r
-        }\r
-\r
-        protected internal virtual PartialViewResult PartialView(string viewName, object model) {\r
-            if (model != null) {\r
-                ViewData.Model = model;\r
-            }\r
-\r
-            return new PartialViewResult {\r
-                ViewName = viewName,\r
-                ViewData = ViewData,\r
-                TempData = TempData\r
-            };\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "Instance method for consistency with other helpers.")]\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "0#",\r
-            Justification = "Response.Redirect() takes its URI as a string parameter.")]\r
-        protected internal virtual RedirectResult Redirect(string url) {\r
-            if (String.IsNullOrEmpty(url)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "url");\r
-            }\r
-            return new RedirectResult(url);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName) {\r
-            return RedirectToAction(actionName, (RouteValueDictionary)null);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, object routeValues) {\r
-            return RedirectToAction(actionName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, RouteValueDictionary routeValues) {\r
-            return RedirectToAction(actionName, null /* controllerName */, routeValues);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, string controllerName) {\r
-            return RedirectToAction(actionName, controllerName, (RouteValueDictionary)null);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, string controllerName, object routeValues) {\r
-            return RedirectToAction(actionName, controllerName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal virtual RedirectToRouteResult RedirectToAction(string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            RouteValueDictionary mergedRouteValues;\r
-\r
-            if (RouteData == null) {\r
-                mergedRouteValues = RouteValuesHelpers.MergeRouteValues(actionName, controllerName, null, routeValues, true /* includeImplicitMvcValues */);\r
-            }\r
-            else {\r
-                mergedRouteValues = RouteValuesHelpers.MergeRouteValues(actionName, controllerName, RouteData.Values, routeValues, true /* includeImplicitMvcValues */);\r
-            }\r
-\r
-            return new RedirectToRouteResult(mergedRouteValues);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(object routeValues) {\r
-            return RedirectToRoute(new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(RouteValueDictionary routeValues) {\r
-            return RedirectToRoute(null /* routeName */, routeValues);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(string routeName) {\r
-            return RedirectToRoute(routeName, (RouteValueDictionary)null);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(string routeName, object routeValues) {\r
-            return RedirectToRoute(routeName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal virtual RedirectToRouteResult RedirectToRoute(string routeName, RouteValueDictionary routeValues) {\r
-            return new RedirectToRouteResult(routeName, RouteValuesHelpers.GetRouteValues(routeValues));\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model) where TModel : class {\r
-            return TryUpdateModel(model, null, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix) where TModel : class {\r
-            return TryUpdateModel(model, prefix, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string[] includeProperties) where TModel : class {\r
-            return TryUpdateModel(model, null, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties) where TModel : class {\r
-            return TryUpdateModel(model, prefix, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {\r
-            return TryUpdateModel(model, prefix, includeProperties, excludeProperties, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, null, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, prefix, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string[] includeProperties, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, null, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, prefix, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            if (model == null) {\r
-                throw new ArgumentNullException("model");\r
-            }\r
-            if (valueProvider == null) {\r
-                throw new ArgumentNullException("valueProvider");\r
-            }\r
-\r
-            Predicate<string> propertyFilter = propertyName => BindAttribute.IsPropertyAllowed(propertyName, includeProperties, excludeProperties);\r
-            IModelBinder binder = Binders.GetBinder(typeof(TModel));\r
-\r
-            ModelBindingContext bindingContext = new ModelBindingContext() {\r
-                Model = model,\r
-                ModelName = prefix,\r
-                ModelState = ModelState,\r
-                ModelType = typeof(TModel),\r
-                PropertyFilter = propertyFilter,\r
-                ValueProvider = valueProvider\r
-            };\r
-            binder.BindModel(ControllerContext, bindingContext);\r
-            return ModelState.IsValid;\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model) where TModel : class {\r
-            UpdateModel(model, null, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix) where TModel : class {\r
-            UpdateModel(model, prefix, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string[] includeProperties) where TModel : class {\r
-            UpdateModel(model, null, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties) where TModel : class {\r
-            UpdateModel(model, prefix, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {\r
-            UpdateModel(model, prefix, includeProperties, excludeProperties, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            UpdateModel(model, null, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            UpdateModel(model, prefix, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string[] includeProperties, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            UpdateModel(model, null, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            UpdateModel(model, prefix, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties, IDictionary<string, ValueProviderResult> valueProvider) where TModel : class {\r
-            bool success = TryUpdateModel(model, prefix, includeProperties, excludeProperties, valueProvider);\r
-            if (!success) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.Controller_UpdateModel_UpdateUnsuccessful,\r
-                    typeof(TModel).FullName);\r
-                throw new InvalidOperationException(message);\r
-            }\r
-        }\r
-\r
-        protected internal ViewResult View() {\r
-            return View(null /* viewName */, null /* masterName */, null /* model */);\r
-        }\r
-\r
-        protected internal ViewResult View(object model) {\r
-            return View(null /* viewName */, null /* masterName */, model);\r
-        }\r
-\r
-        protected internal ViewResult View(string viewName) {\r
-            return View(viewName, null /* masterName */, null /* model */);\r
-        }\r
-\r
-        protected internal ViewResult View(string viewName, string masterName) {\r
-            return View(viewName, masterName, null /* model */);\r
-        }\r
-\r
-        protected internal ViewResult View(string viewName, object model) {\r
-            return View(viewName, null /* masterName */, model);\r
-        }\r
-\r
-        protected internal virtual ViewResult View(string viewName, string masterName, object model) {\r
-            if (model != null) {\r
-                ViewData.Model = model;\r
-            }\r
-\r
-            return new ViewResult {\r
-                ViewName = viewName,\r
-                MasterName = masterName,\r
-                ViewData = ViewData,\r
-                TempData = TempData\r
-            };\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "The method name 'View' is a convenient shorthand for 'CreateViewResult'.")]\r
-        protected internal ViewResult View(IView view) {\r
-            return View(view, null /* model */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "The method name 'View' is a convenient shorthand for 'CreateViewResult'.")]\r
-        protected internal virtual ViewResult View(IView view, object model) {\r
-            if (model != null) {\r
-                ViewData.Model = model;\r
-            }\r
-\r
-            return new ViewResult {\r
-                View = view,\r
-                ViewData = ViewData,\r
-                TempData = TempData\r
-            };\r
-        }\r
-\r
-        #region IActionFilter Members\r
-        void IActionFilter.OnActionExecuting(ActionExecutingContext filterContext) {\r
-            OnActionExecuting(filterContext);\r
-        }\r
-\r
-        void IActionFilter.OnActionExecuted(ActionExecutedContext filterContext) {\r
-            OnActionExecuted(filterContext);\r
-        }\r
-        #endregion\r
-\r
-        #region IAuthorizationFilter Members\r
-        void IAuthorizationFilter.OnAuthorization(AuthorizationContext filterContext) {\r
-            OnAuthorization(filterContext);\r
-        }\r
-        #endregion\r
-\r
-        #region IExceptionFilter Members\r
-        void IExceptionFilter.OnException(ExceptionContext filterContext) {\r
-            OnException(filterContext);\r
-        }\r
-        #endregion\r
-\r
-        #region IResultFilter Members\r
-        void IResultFilter.OnResultExecuting(ResultExecutingContext filterContext) {\r
-            OnResultExecuting(filterContext);\r
-        }\r
-\r
-        void IResultFilter.OnResultExecuted(ResultExecutedContext filterContext) {\r
-            OnResultExecuted(filterContext);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerActionInvoker.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerActionInvoker.cs
deleted file mode 100644 (file)
index da483ff..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Threading;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ControllerActionInvoker : IActionInvoker {\r
-\r
-        private readonly static ControllerDescriptorCache _staticDescriptorCache = new ControllerDescriptorCache();\r
-\r
-        private ModelBinderDictionary _binders;\r
-        private ControllerDescriptorCache _instanceDescriptorCache;\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "Property is settable so that the dictionary can be provided for unit testing purposes.")]\r
-        protected internal ModelBinderDictionary Binders {\r
-            get {\r
-                if (_binders == null) {\r
-                    _binders = ModelBinders.Binders;\r
-                }\r
-                return _binders;\r
-            }\r
-            set {\r
-                _binders = value;\r
-            }\r
-        }\r
-\r
-        internal ControllerDescriptorCache DescriptorCache {\r
-            get {\r
-                if (_instanceDescriptorCache == null) {\r
-                    _instanceDescriptorCache = _staticDescriptorCache;\r
-                }\r
-                return _instanceDescriptorCache;\r
-            }\r
-            set {\r
-                _instanceDescriptorCache = value;\r
-            }\r
-        }\r
-\r
-        private static void AddControllerToFilterList<TFilter>(ControllerBase controller, IList<TFilter> filterList) where TFilter : class {\r
-            TFilter controllerAsFilter = controller as TFilter;\r
-            if (controllerAsFilter != null) {\r
-                filterList.Insert(0, controllerAsFilter);\r
-            }\r
-        }\r
-\r
-        protected virtual ActionResult CreateActionResult(ControllerContext controllerContext, ActionDescriptor actionDescriptor, object actionReturnValue) {\r
-            if (actionReturnValue == null) {\r
-                return new EmptyResult();\r
-            }\r
-\r
-            ActionResult actionResult = (actionReturnValue as ActionResult) ??\r
-                new ContentResult { Content = Convert.ToString(actionReturnValue, CultureInfo.InvariantCulture) };\r
-            return actionResult;\r
-        }\r
-\r
-        protected virtual ControllerDescriptor GetControllerDescriptor(ControllerContext controllerContext) {\r
-            Type controllerType = controllerContext.Controller.GetType();\r
-            ControllerDescriptor controllerDescriptor = DescriptorCache.GetDescriptor(controllerType);\r
-            return controllerDescriptor;\r
-        }\r
-\r
-        protected virtual ActionDescriptor FindAction(ControllerContext controllerContext, ControllerDescriptor controllerDescriptor, string actionName) {\r
-            ActionDescriptor actionDescriptor = controllerDescriptor.FindAction(controllerContext, actionName);\r
-            return actionDescriptor;\r
-        }\r
-\r
-        protected virtual FilterInfo GetFilters(ControllerContext controllerContext, ActionDescriptor actionDescriptor) {\r
-            FilterInfo filters = actionDescriptor.GetFilters();\r
-\r
-            // if the current controller implements one of the filter interfaces, it should be added to the list at position 0\r
-            ControllerBase controller = controllerContext.Controller;\r
-            AddControllerToFilterList(controller, filters.ActionFilters);\r
-            AddControllerToFilterList(controller, filters.ResultFilters);\r
-            AddControllerToFilterList(controller, filters.AuthorizationFilters);\r
-            AddControllerToFilterList(controller, filters.ExceptionFilters);\r
-\r
-            return filters;\r
-        }\r
-\r
-        private IModelBinder GetModelBinder(ParameterDescriptor parameterDescriptor) {\r
-            // look on the parameter itself, then look in the global table\r
-            return parameterDescriptor.BindingInfo.Binder ?? Binders.GetBinder(parameterDescriptor.ParameterType);\r
-        }\r
-\r
-        protected virtual object GetParameterValue(ControllerContext controllerContext, ParameterDescriptor parameterDescriptor) {\r
-            // collect all of the necessary binding properties\r
-            Type parameterType = parameterDescriptor.ParameterType;\r
-            IModelBinder binder = GetModelBinder(parameterDescriptor);\r
-            IDictionary<string, ValueProviderResult> valueProvider = controllerContext.Controller.ValueProvider;\r
-            string parameterName = parameterDescriptor.BindingInfo.Prefix ?? parameterDescriptor.ParameterName;\r
-            Predicate<string> propertyFilter = GetPropertyFilter(parameterDescriptor);\r
-\r
-            // finally, call into the binder\r
-            ModelBindingContext bindingContext = new ModelBindingContext() {\r
-                FallbackToEmptyPrefix = (parameterDescriptor.BindingInfo.Prefix == null), // only fall back if prefix not specified\r
-                ModelName = parameterName,\r
-                ModelState = controllerContext.Controller.ViewData.ModelState,\r
-                ModelType = parameterType,\r
-                PropertyFilter = propertyFilter,\r
-                ValueProvider = valueProvider\r
-            };\r
-            object result = binder.BindModel(controllerContext, bindingContext);\r
-            return result;\r
-        }\r
-\r
-        protected virtual IDictionary<string, object> GetParameterValues(ControllerContext controllerContext, ActionDescriptor actionDescriptor) {\r
-            Dictionary<string, object> parametersDict = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-            ParameterDescriptor[] parameterDescriptors = actionDescriptor.GetParameters();\r
-\r
-            foreach (ParameterDescriptor parameterDescriptor in parameterDescriptors) {\r
-                parametersDict[parameterDescriptor.ParameterName] = GetParameterValue(controllerContext, parameterDescriptor);\r
-            }\r
-            return parametersDict;\r
-        }\r
-\r
-        private static Predicate<string> GetPropertyFilter(ParameterDescriptor parameterDescriptor) {\r
-            ParameterBindingInfo bindingInfo = parameterDescriptor.BindingInfo;\r
-            return propertyName => BindAttribute.IsPropertyAllowed(propertyName, bindingInfo.Include.ToArray(), bindingInfo.Exclude.ToArray());\r
-        }\r
-\r
-        public virtual bool InvokeAction(ControllerContext controllerContext, string actionName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-\r
-            ControllerDescriptor controllerDescriptor = GetControllerDescriptor(controllerContext);\r
-            ActionDescriptor actionDescriptor = FindAction(controllerContext, controllerDescriptor, actionName);\r
-            if (actionDescriptor != null) {\r
-                FilterInfo filterInfo = GetFilters(controllerContext, actionDescriptor);\r
-\r
-                try {\r
-                    AuthorizationContext authContext = InvokeAuthorizationFilters(controllerContext, filterInfo.AuthorizationFilters, actionDescriptor);\r
-                    if (authContext.Result != null) {\r
-                        // the auth filter signaled that we should let it short-circuit the request\r
-                        InvokeActionResult(controllerContext, authContext.Result);\r
-                    }\r
-                    else {\r
-                        if (controllerContext.Controller.ValidateRequest) {\r
-                            ValidateRequest(controllerContext.HttpContext.Request);\r
-                        }\r
-\r
-                        IDictionary<string, object> parameters = GetParameterValues(controllerContext, actionDescriptor);\r
-                        ActionExecutedContext postActionContext = InvokeActionMethodWithFilters(controllerContext, filterInfo.ActionFilters, actionDescriptor, parameters);\r
-                        InvokeActionResultWithFilters(controllerContext, filterInfo.ResultFilters, postActionContext.Result);\r
-                    }\r
-                }\r
-                catch (ThreadAbortException) {\r
-                    // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                    // the filters don't see this as an error.\r
-                    throw;\r
-                }\r
-                catch (Exception ex) {\r
-                    // something blew up, so execute the exception filters\r
-                    ExceptionContext exceptionContext = InvokeExceptionFilters(controllerContext, filterInfo.ExceptionFilters, ex);\r
-                    if (!exceptionContext.ExceptionHandled) {\r
-                        throw;\r
-                    }\r
-                    InvokeActionResult(controllerContext, exceptionContext.Result);\r
-                }\r
-\r
-                return true;\r
-            }\r
-\r
-            // notify controller that no method matched\r
-            return false;\r
-        }\r
-\r
-        protected virtual ActionResult InvokeActionMethod(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters) {\r
-            object returnValue = actionDescriptor.Execute(controllerContext, parameters);\r
-            ActionResult result = CreateActionResult(controllerContext, actionDescriptor, returnValue);\r
-            return result;\r
-        }\r
-\r
-        internal static ActionExecutedContext InvokeActionMethodFilter(IActionFilter filter, ActionExecutingContext preContext, Func<ActionExecutedContext> continuation) {\r
-            filter.OnActionExecuting(preContext);\r
-            if (preContext.Result != null) {\r
-                return new ActionExecutedContext(preContext, preContext.ActionDescriptor, true /* canceled */, null /* exception */) {\r
-                    Result = preContext.Result\r
-                };\r
-            }\r
-\r
-            bool wasError = false;\r
-            ActionExecutedContext postContext = null;\r
-            try {\r
-                postContext = continuation();\r
-            }\r
-            catch (ThreadAbortException) {\r
-                // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                // the filters don't see this as an error.\r
-                postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, null /* exception */);\r
-                filter.OnActionExecuted(postContext);\r
-                throw;\r
-            }\r
-            catch (Exception ex) {\r
-                wasError = true;\r
-                postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, ex);\r
-                filter.OnActionExecuted(postContext);\r
-                if (!postContext.ExceptionHandled) {\r
-                    throw;\r
-                }\r
-            }\r
-            if (!wasError) {\r
-                filter.OnActionExecuted(postContext);\r
-            }\r
-            return postContext;\r
-        }\r
-\r
-        protected virtual ActionExecutedContext InvokeActionMethodWithFilters(ControllerContext controllerContext, IList<IActionFilter> filters, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters) {\r
-            ActionExecutingContext preContext = new ActionExecutingContext(controllerContext, actionDescriptor, parameters);\r
-            Func<ActionExecutedContext> continuation = () =>\r
-                new ActionExecutedContext(controllerContext, actionDescriptor, false /* canceled */, null /* exception */) {\r
-                    Result = InvokeActionMethod(controllerContext, actionDescriptor, parameters)\r
-                };\r
-\r
-            // need to reverse the filter list because the continuations are built up backward\r
-            Func<ActionExecutedContext> thunk = filters.Reverse().Aggregate(continuation,\r
-                (next, filter) => () => InvokeActionMethodFilter(filter, preContext, next));\r
-            return thunk();\r
-        }\r
-\r
-        protected virtual void InvokeActionResult(ControllerContext controllerContext, ActionResult actionResult) {\r
-            actionResult.ExecuteResult(controllerContext);\r
-        }\r
-\r
-        internal static ResultExecutedContext InvokeActionResultFilter(IResultFilter filter, ResultExecutingContext preContext, Func<ResultExecutedContext> continuation) {\r
-            filter.OnResultExecuting(preContext);\r
-            if (preContext.Cancel) {\r
-                return new ResultExecutedContext(preContext, preContext.Result, true /* canceled */, null /* exception */);\r
-            }\r
-\r
-            bool wasError = false;\r
-            ResultExecutedContext postContext = null;\r
-            try {\r
-                postContext = continuation();\r
-            }\r
-            catch (ThreadAbortException) {\r
-                // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                // the filters don't see this as an error.\r
-                postContext = new ResultExecutedContext(preContext, preContext.Result, false /* canceled */, null /* exception */);\r
-                filter.OnResultExecuted(postContext);\r
-                throw;\r
-            }\r
-            catch (Exception ex) {\r
-                wasError = true;\r
-                postContext = new ResultExecutedContext(preContext, preContext.Result, false /* canceled */, ex);\r
-                filter.OnResultExecuted(postContext);\r
-                if (!postContext.ExceptionHandled) {\r
-                    throw;\r
-                }\r
-            }\r
-            if (!wasError) {\r
-                filter.OnResultExecuted(postContext);\r
-            }\r
-            return postContext;\r
-        }\r
-\r
-        protected virtual ResultExecutedContext InvokeActionResultWithFilters(ControllerContext controllerContext, IList<IResultFilter> filters, ActionResult actionResult) {\r
-            ResultExecutingContext preContext = new ResultExecutingContext(controllerContext, actionResult);\r
-            Func<ResultExecutedContext> continuation = delegate {\r
-                InvokeActionResult(controllerContext, actionResult);\r
-                return new ResultExecutedContext(controllerContext, actionResult, false /* canceled */, null /* exception */);\r
-            };\r
-\r
-            // need to reverse the filter list because the continuations are built up backward\r
-            Func<ResultExecutedContext> thunk = filters.Reverse().Aggregate(continuation,\r
-                (next, filter) => () => InvokeActionResultFilter(filter, preContext, next));\r
-            return thunk();\r
-        }\r
-\r
-        protected virtual AuthorizationContext InvokeAuthorizationFilters(ControllerContext controllerContext, IList<IAuthorizationFilter> filters, ActionDescriptor actionDescriptor) {\r
-            AuthorizationContext context = new AuthorizationContext(controllerContext);\r
-            foreach (IAuthorizationFilter filter in filters) {\r
-                filter.OnAuthorization(context);\r
-                // short-circuit evaluation\r
-                if (context.Result != null) {\r
-                    break;\r
-                }\r
-            }\r
-\r
-            return context;\r
-        }\r
-\r
-        protected virtual ExceptionContext InvokeExceptionFilters(ControllerContext controllerContext, IList<IExceptionFilter> filters, Exception exception) {\r
-            ExceptionContext context = new ExceptionContext(controllerContext, exception);\r
-            foreach (IExceptionFilter filter in filters) {\r
-                filter.OnException(context);\r
-            }\r
-\r
-            return context;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "rawUrl",\r
-            Justification = "We only care about the property getter's side effects, not the returned value.")]\r
-        private static void ValidateRequest(HttpRequestBase request) {\r
-            // DevDiv 214040: Enable Request Validation by default for all controller requests\r
-            // \r
-            // Note that we grab the Request's RawUrl to force it to be validated. Calling ValidateInput()\r
-            // doesn't actually validate anything. It just sets flags indicating that on the next usage of\r
-            // certain inputs that they should be validated. We special case RawUrl because the URL has already\r
-            // been consumed by routing and thus might contain dangerous data. By forcing the RawUrl to be\r
-            // re-read we're making sure that it gets validated by ASP.NET.\r
-\r
-            request.ValidateInput();\r
-            string rawUrl = request.RawUrl;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerBase.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerBase.cs
deleted file mode 100644 (file)
index 8d6de63..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Routing;\r
-\r
-    public abstract class ControllerBase : MarshalByRefObject, IController {\r
-\r
-        private TempDataDictionary _tempDataDictionary;\r
-        private bool _validateRequest = true;\r
-        private IDictionary<string, ValueProviderResult> _valueProvider;\r
-        private ViewDataDictionary _viewDataDictionary;\r
-\r
-        public ControllerContext ControllerContext {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This property is settable so that unit tests can provide mock implementations.")]\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                if (_tempDataDictionary == null) {\r
-                    _tempDataDictionary = new TempDataDictionary();\r
-                }\r
-                return _tempDataDictionary;\r
-            }\r
-            set {\r
-                _tempDataDictionary = value;\r
-            }\r
-        }\r
-\r
-        public bool ValidateRequest {\r
-            get {\r
-                return _validateRequest;\r
-            }\r
-            set {\r
-                _validateRequest = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This property is settable so that unit tests can provide mock implementations.")]\r
-        public IDictionary<string, ValueProviderResult> ValueProvider {\r
-            get {\r
-                if (_valueProvider == null) {\r
-                    _valueProvider = new ValueProviderDictionary(ControllerContext);\r
-                }\r
-                return _valueProvider;\r
-            }\r
-            set {\r
-                _valueProvider = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This property is settable so that unit tests can provide mock implementations.")]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                if (_viewDataDictionary == null) {\r
-                    _viewDataDictionary = new ViewDataDictionary();\r
-                }\r
-                return _viewDataDictionary;\r
-            }\r
-            set {\r
-                _viewDataDictionary = value;\r
-            }\r
-        }\r
-\r
-        protected virtual void Execute(RequestContext requestContext) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-\r
-            Initialize(requestContext);\r
-            ExecuteCore();\r
-        }\r
-\r
-        protected abstract void ExecuteCore();\r
-\r
-        protected virtual void Initialize(RequestContext requestContext) {\r
-            ControllerContext = new ControllerContext(requestContext, this);\r
-        }\r
-\r
-        #region IController Members\r
-        void IController.Execute(RequestContext requestContext) {\r
-            Execute(requestContext);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerBuilder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerBuilder.cs
deleted file mode 100644 (file)
index c86f740..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ControllerBuilder {\r
-\r
-        private Func<IControllerFactory> _factoryThunk;\r
-        private static ControllerBuilder _instance = new ControllerBuilder();\r
-        private HashSet<string> _namespaces = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public ControllerBuilder() {\r
-            SetControllerFactory(new DefaultControllerFactory() {\r
-                ControllerBuilder = this\r
-            });\r
-        }\r
-\r
-        public static ControllerBuilder Current {\r
-            get {\r
-                return _instance;\r
-            }\r
-        }\r
-\r
-        public HashSet<string> DefaultNamespaces {\r
-            get {\r
-                return _namespaces;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "Calling method multiple times might return different objects.")]\r
-        public IControllerFactory GetControllerFactory() {\r
-            IControllerFactory controllerFactoryInstance = _factoryThunk();\r
-            return controllerFactoryInstance;\r
-        }\r
-\r
-        public void SetControllerFactory(IControllerFactory controllerFactory) {\r
-            if (controllerFactory == null) {\r
-                throw new ArgumentNullException("controllerFactory");\r
-            }\r
-\r
-            _factoryThunk = () => controllerFactory;\r
-        }\r
-\r
-        public void SetControllerFactory(Type controllerFactoryType) {\r
-            if (controllerFactoryType == null) {\r
-                throw new ArgumentNullException("controllerFactoryType");\r
-            }\r
-            if (!typeof(IControllerFactory).IsAssignableFrom(controllerFactoryType)) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ControllerBuilder_MissingIControllerFactory,\r
-                        controllerFactoryType),\r
-                    "controllerFactoryType");\r
-            }\r
-\r
-            _factoryThunk = delegate() {\r
-                try {\r
-                    return (IControllerFactory)Activator.CreateInstance(controllerFactoryType);\r
-                }\r
-                catch (Exception ex) {\r
-                    throw new InvalidOperationException(\r
-                        String.Format(\r
-                            CultureInfo.CurrentUICulture,\r
-                            MvcResources.ControllerBuilder_ErrorCreatingControllerFactory,\r
-                            controllerFactoryType),\r
-                        ex);\r
-                }\r
-            };\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerContext.cs
deleted file mode 100644 (file)
index 14ffc1a..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web;\r
-    using System.Web.Routing;\r
-\r
-    // Though many of the properties on ControllerContext and its subclassed types are virtual, there are still sealed\r
-    // properties (like ControllerContext.RequestContext, ActionExecutingContext.Result, etc.). If these properties\r
-    // were virtual, a mocking framework might override them with incorrect behavior (property getters would return\r
-    // null, property setters would be no-ops). By sealing these properties, we are forcing them to have the default\r
-    // "get or store a value" semantics that they were intended to have.\r
-\r
-    public class ControllerContext {\r
-\r
-        private HttpContextBase _httpContext;\r
-        private RequestContext _requestContext;\r
-        private RouteData _routeData;\r
-\r
-        // parameterless constructor used for mocking\r
-        public ControllerContext() {\r
-        }\r
-\r
-        // copy constructor - allows for subclassed types to take an existing ControllerContext as a parameter\r
-        // and we'll automatically set the appropriate properties\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        protected ControllerContext(ControllerContext controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            Controller = controllerContext.Controller;\r
-            RequestContext = controllerContext.RequestContext;\r
-        }\r
-\r
-        public ControllerContext(HttpContextBase httpContext, RouteData routeData, ControllerBase controller)\r
-            : this(new RequestContext(httpContext, routeData), controller) {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ControllerContext(RequestContext requestContext, ControllerBase controller) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-            if (controller == null) {\r
-                throw new ArgumentNullException("controller");\r
-            }\r
-\r
-            RequestContext = requestContext;\r
-            Controller = controller;\r
-        }\r
-\r
-        public virtual ControllerBase Controller {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual HttpContextBase HttpContext {\r
-            get {\r
-                if (_httpContext == null) {\r
-                    _httpContext = (_requestContext != null) ? _requestContext.HttpContext : new EmptyHttpContext();\r
-                }\r
-                return _httpContext;\r
-            }\r
-            set {\r
-                _httpContext = value;\r
-            }\r
-        }\r
-\r
-        public RequestContext RequestContext {\r
-            get {\r
-                if (_requestContext == null) {\r
-                    // still need explicit calls to constructors since the property getters are virtual and might return null\r
-                    HttpContextBase httpContext = HttpContext ?? new EmptyHttpContext();\r
-                    RouteData routeData = RouteData ?? new RouteData();\r
-\r
-                    _requestContext = new RequestContext(httpContext, routeData);\r
-                }\r
-                return _requestContext;\r
-            }\r
-            set {\r
-                _requestContext = value;\r
-            }\r
-        }\r
-\r
-        public virtual RouteData RouteData {\r
-            get {\r
-                if (_routeData == null) {\r
-                    _routeData = (_requestContext != null) ? _requestContext.RouteData : new RouteData();\r
-                }\r
-                return _routeData;\r
-            }\r
-            set {\r
-                _routeData = value;\r
-            }\r
-        }\r
-\r
-        private sealed class EmptyHttpContext : HttpContextBase {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerDescriptor.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerDescriptor.cs
deleted file mode 100644 (file)
index 4e7a986..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Reflection;\r
-\r
-    public abstract class ControllerDescriptor : ICustomAttributeProvider {\r
-\r
-        public virtual string ControllerName {\r
-            get {\r
-                string typeName = ControllerType.Name;\r
-                if (typeName.EndsWith("Controller", StringComparison.OrdinalIgnoreCase)) {\r
-                    return typeName.Substring(0, typeName.Length - "Controller".Length);\r
-                }\r
-\r
-                return typeName;\r
-            }\r
-        }\r
-\r
-        public abstract Type ControllerType {\r
-            get;\r
-        }\r
-\r
-        public abstract ActionDescriptor FindAction(ControllerContext controllerContext, string actionName);\r
-\r
-        public abstract ActionDescriptor[] GetCanonicalActions();\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual object[] GetCustomAttributes(bool inherit) {\r
-            return GetCustomAttributes(typeof(object), inherit);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return (object[])Array.CreateInstance(attributeType, 0);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual bool IsDefined(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerDescriptorCache.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerDescriptorCache.cs
deleted file mode 100644 (file)
index 4e6ba84..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    internal sealed class ControllerDescriptorCache : ReaderWriterCache<Type, ControllerDescriptor> {\r
-\r
-        public ControllerDescriptorCache() {\r
-        }\r
-\r
-        public ControllerDescriptor GetDescriptor(Type controllerType) {\r
-            return FetchOrCreateItem(controllerType, () => new ReflectedControllerDescriptor(controllerType));\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerTypeCache.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ControllerTypeCache.cs
deleted file mode 100644 (file)
index c831476..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-\r
-    internal sealed class ControllerTypeCache {\r
-\r
-        private Dictionary<string, ILookup<string, Type>> _cache;\r
-        private object _lockObj = new object();\r
-\r
-        internal int Count {\r
-            get {\r
-                int count = 0;\r
-                foreach (var lookup in _cache.Values) {\r
-                    foreach (var grouping in lookup) {\r
-                        count += grouping.Count();\r
-                    }\r
-                }\r
-                return count;\r
-            }\r
-        }\r
-\r
-        public void EnsureInitialized(IBuildManager buildManager) {\r
-            if (_cache == null) {\r
-                lock (_lockObj) {\r
-                    if (_cache == null) {\r
-                        List<Type> controllerTypes = GetAllControllerTypes(buildManager);\r
-                        var groupedByName = controllerTypes.GroupBy(\r
-                            t => t.Name.Substring(0, t.Name.Length - "Controller".Length),\r
-                            StringComparer.OrdinalIgnoreCase);\r
-                        _cache = groupedByName.ToDictionary(\r
-                            g => g.Key,\r
-                            g => g.ToLookup(t => t.Namespace ?? String.Empty, StringComparer.OrdinalIgnoreCase),\r
-                            StringComparer.OrdinalIgnoreCase);\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        private static List<Type> GetAllControllerTypes(IBuildManager buildManager) {\r
-            // Go through all assemblies referenced by the application and search for\r
-            // controllers and controller factories.\r
-            List<Type> controllerTypes = new List<Type>();\r
-            ICollection assemblies = buildManager.GetReferencedAssemblies();\r
-            foreach (Assembly assembly in assemblies) {\r
-                Type[] typesInAsm;\r
-                try {\r
-                    typesInAsm = assembly.GetTypes();\r
-                }\r
-                catch (ReflectionTypeLoadException ex) {\r
-                    typesInAsm = ex.Types;\r
-                }\r
-                controllerTypes.AddRange(typesInAsm.Where(IsControllerType));\r
-            }\r
-            return controllerTypes;\r
-        }\r
-\r
-        public IList<Type> GetControllerTypes(string controllerName, HashSet<string> namespaces) {\r
-            List<Type> matchingTypes = new List<Type>();\r
-\r
-            ILookup<string, Type> nsLookup;\r
-            if (_cache.TryGetValue(controllerName, out nsLookup)) {\r
-                // this friendly name was located in the cache, now cycle through namespaces\r
-                if (namespaces != null) {\r
-                    foreach (string ns in namespaces) {\r
-                        matchingTypes.AddRange(nsLookup[ns]);\r
-                    }\r
-                }\r
-                else {\r
-                    // if the namespaces parameter is null, search *every* namespace\r
-                    foreach (var nsGroup in nsLookup) {\r
-                        matchingTypes.AddRange(nsGroup);\r
-                    }\r
-                }\r
-            }\r
-\r
-            return matchingTypes;\r
-        }\r
-\r
-        internal static bool IsControllerType(Type t) {\r
-            return\r
-                t != null &&\r
-                t.IsPublic &&\r
-                t.Name.EndsWith("Controller", StringComparison.OrdinalIgnoreCase) &&\r
-                !t.IsAbstract &&\r
-                typeof(IController).IsAssignableFrom(t);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/CustomModelBinderAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/CustomModelBinderAttribute.cs
deleted file mode 100644 (file)
index c086781..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    [AttributeUsage(ValidTargets, AllowMultiple = false, Inherited = false)]\r
-    public abstract class CustomModelBinderAttribute : Attribute {\r
-\r
-        internal const AttributeTargets ValidTargets = AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Parameter | AttributeTargets.Struct;\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "This method can potentially perform a non-trivial amount of work.")]\r
-        public abstract IModelBinder GetBinder();\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultControllerFactory.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultControllerFactory.cs
deleted file mode 100644 (file)
index ee6b1a5..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public class DefaultControllerFactory : IControllerFactory {\r
-\r
-        private IBuildManager _buildManager;\r
-        private ControllerBuilder _controllerBuilder;\r
-        private ControllerTypeCache _instanceControllerTypeCache;\r
-        private static ControllerTypeCache _staticControllerTypeCache = new ControllerTypeCache();\r
-\r
-        internal IBuildManager BuildManager {\r
-            get {\r
-                if (_buildManager == null) {\r
-                    _buildManager = new BuildManagerWrapper();\r
-                }\r
-                return _buildManager;\r
-            }\r
-            set {\r
-                _buildManager = value;\r
-            }\r
-        }\r
-\r
-        internal ControllerBuilder ControllerBuilder {\r
-            get {\r
-                return _controllerBuilder ?? ControllerBuilder.Current;\r
-            }\r
-            set {\r
-                _controllerBuilder = value;\r
-            }\r
-        }\r
-\r
-        internal ControllerTypeCache ControllerTypeCache {\r
-            get {\r
-                return _instanceControllerTypeCache ?? _staticControllerTypeCache;\r
-            }\r
-            set {\r
-                _instanceControllerTypeCache = value;\r
-            }\r
-        }\r
-\r
-        public RequestContext RequestContext {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual IController CreateController(RequestContext requestContext, string controllerName) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-            if (String.IsNullOrEmpty(controllerName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "controllerName");\r
-            }\r
-            RequestContext = requestContext;\r
-            Type controllerType = GetControllerType(controllerName);\r
-            IController controller = GetControllerInstance(controllerType);\r
-            return controller;\r
-        }\r
-\r
-        protected internal virtual IController GetControllerInstance(Type controllerType) {\r
-            if (controllerType == null) {\r
-                throw new HttpException(404,\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.DefaultControllerFactory_NoControllerFound,\r
-                        RequestContext.HttpContext.Request.Path));\r
-            }\r
-            if (!typeof(IController).IsAssignableFrom(controllerType)) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.DefaultControllerFactory_TypeDoesNotSubclassControllerBase,\r
-                        controllerType),\r
-                    "controllerType");\r
-            }\r
-            try {\r
-                return (IController)Activator.CreateInstance(controllerType);\r
-            }\r
-            catch (Exception ex) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.DefaultControllerFactory_ErrorCreatingController,\r
-                        controllerType),\r
-                    ex);\r
-            }\r
-        }\r
-\r
-        protected internal virtual Type GetControllerType(string controllerName) {\r
-            if (String.IsNullOrEmpty(controllerName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "controllerName");\r
-            }\r
-\r
-            // first search in the current route's namespace collection\r
-            object routeNamespacesObj;\r
-            Type match;\r
-            if (RequestContext != null && RequestContext.RouteData.DataTokens.TryGetValue("Namespaces", out routeNamespacesObj)) {\r
-                IEnumerable<string> routeNamespaces = routeNamespacesObj as IEnumerable<string>;\r
-                if (routeNamespaces != null) {\r
-                    HashSet<string> nsHash = new HashSet<string>(routeNamespaces, StringComparer.OrdinalIgnoreCase);\r
-                    match = GetControllerTypeWithinNamespaces(controllerName, nsHash);\r
-                    if (match != null) {\r
-                        return match;\r
-                    }\r
-                }\r
-            }\r
-\r
-            // then search in the application's default namespace collection\r
-            HashSet<string> nsDefaults = new HashSet<string>(ControllerBuilder.DefaultNamespaces, StringComparer.OrdinalIgnoreCase);\r
-            match = GetControllerTypeWithinNamespaces(controllerName, nsDefaults);\r
-            if (match != null) {\r
-                return match;\r
-            }\r
-\r
-            // if all else fails, search every namespace\r
-            return GetControllerTypeWithinNamespaces(controllerName, null /* namespaces */);\r
-        }\r
-\r
-        private Type GetControllerTypeWithinNamespaces(string controllerName, HashSet<string> namespaces) {\r
-            // Once the master list of controllers has been created we can quickly index into it\r
-            ControllerTypeCache.EnsureInitialized(BuildManager);\r
-\r
-            IList<Type> matchingTypes = ControllerTypeCache.GetControllerTypes(controllerName, namespaces);\r
-            switch (matchingTypes.Count) {\r
-                case 0:\r
-                    // no matching types\r
-                    return null;\r
-\r
-                case 1:\r
-                    // single matching type\r
-                    return matchingTypes[0];\r
-\r
-                default:\r
-                    // multiple matching types\r
-                    // we need to generate an exception containing all the controller types\r
-                    StringBuilder sb = new StringBuilder();\r
-                    foreach (Type matchedType in matchingTypes) {\r
-                        sb.AppendLine();\r
-                        sb.Append(matchedType.FullName);\r
-                    }\r
-                    throw new InvalidOperationException(\r
-                        String.Format(\r
-                            CultureInfo.CurrentUICulture,\r
-                            MvcResources.DefaultControllerFactory_ControllerNameAmbiguous,\r
-                            controllerName, sb));\r
-            }\r
-        }\r
-\r
-        public virtual void ReleaseController(IController controller) {\r
-            IDisposable disposable = controller as IDisposable;\r
-            if (disposable != null) {\r
-                disposable.Dispose();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultModelBinder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultModelBinder.cs
deleted file mode 100644 (file)
index 21f52b2..0000000
+++ /dev/null
@@ -1,578 +0,0 @@
-/* ****************************************************************************
- *
- * Copyright (c) Microsoft Corporation. All rights reserved.
- *
- * This software is subject to the Microsoft Public License (Ms-PL). 
- * A copy of the license can be found in the license.htm file included 
- * in this distribution.
- *
- * You must not remove this notice, or any other, from this software.
- *
- * ***************************************************************************/
-
-namespace System.Web.Mvc {
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Linq;
-    using System.Reflection;
-    using System.Web.Mvc.Resources;
-
-    public class DefaultModelBinder : IModelBinder {
-
-        private ModelBinderDictionary _binders;
-        private static string _resourceClassKey;
-
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",
-            Justification = "Property is settable so that the dictionary can be provided for unit testing purposes.")]
-        protected internal ModelBinderDictionary Binders {
-            get {
-                if (_binders == null) {
-                    _binders = ModelBinders.Binders;
-                }
-                return _binders;
-            }
-            set {
-                _binders = value;
-            }
-        }
-
-        public static string ResourceClassKey {
-            get {
-                return _resourceClassKey ?? String.Empty;
-            }
-            set {
-                _resourceClassKey = value;
-            }
-        }
-
-        internal void BindComplexElementalModel(ControllerContext controllerContext, ModelBindingContext bindingContext, object model) {
-            // need to replace the property filter + model object and create an inner binding context
-            BindAttribute bindAttr = (BindAttribute)TypeDescriptor.GetAttributes(bindingContext.ModelType)[typeof(BindAttribute)];
-            Predicate<string> newPropertyFilter = (bindAttr != null)
-                ? propertyName => bindAttr.IsPropertyAllowed(propertyName) && bindingContext.PropertyFilter(propertyName)
-                : bindingContext.PropertyFilter;
-
-            ModelBindingContext newBindingContext = new ModelBindingContext() {
-                Model = model,
-                ModelName = bindingContext.ModelName,
-                ModelState = bindingContext.ModelState,
-                ModelType = bindingContext.ModelType,
-                PropertyFilter = newPropertyFilter,
-                ValueProvider = bindingContext.ValueProvider
-            };
-
-            // validation
-            if (OnModelUpdating(controllerContext, newBindingContext)) {
-                BindProperties(controllerContext, newBindingContext);
-                OnModelUpdated(controllerContext, newBindingContext);
-            }
-        }
-
-        internal object BindComplexModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {
-            object model = bindingContext.Model;
-            Type modelType = bindingContext.ModelType;
-            
-            // if we're being asked to create an array, create a list instead, then coerce to an array after the list is created
-            if (model == null && modelType.IsArray) {
-                Type elementType = modelType.GetElementType();
-                Type listType = typeof(List<>).MakeGenericType(elementType);
-                object collection = CreateModel(controllerContext, bindingContext, listType);
-
-                ModelBindingContext arrayBindingContext = new ModelBindingContext() {
-                    Model = collection,
-                    ModelName = bindingContext.ModelName,
-                    ModelState = bindingContext.ModelState,
-                    ModelType = listType,
-                    PropertyFilter = bindingContext.PropertyFilter,
-                    ValueProvider = bindingContext.ValueProvider
-                };
-                IList list = (IList)UpdateCollection(controllerContext, arrayBindingContext, elementType);
-
-                if (list == null) {
-                    return null;
-                }
-
-                Array array = Array.CreateInstance(elementType, list.Count);
-                list.CopyTo(array, 0);
-                return array;
-            }
-
-            if (model == null) {
-                model = CreateModel(controllerContext,bindingContext,modelType);
-            }
-
-            // special-case IDictionary<,> and ICollection<>
-            Type dictionaryType = ExtractGenericInterface(modelType, typeof(IDictionary<,>));
-            if (dictionaryType != null) {
-                Type[] genericArguments = dictionaryType.GetGenericArguments();
-                Type keyType = genericArguments[0];
-                Type valueType = genericArguments[1];
-
-                ModelBindingContext dictionaryBindingContext = new ModelBindingContext() {
-                    Model = model,
-                    ModelName = bindingContext.ModelName,
-                    ModelState = bindingContext.ModelState,
-                    ModelType = modelType,
-                    PropertyFilter = bindingContext.PropertyFilter,
-                    ValueProvider = bindingContext.ValueProvider
-                };
-                object dictionary = UpdateDictionary(controllerContext, dictionaryBindingContext, keyType, valueType);
-                return dictionary;
-            }
-
-            Type enumerableType = ExtractGenericInterface(modelType, typeof(IEnumerable<>));
-            if (enumerableType != null) {
-                Type elementType = enumerableType.GetGenericArguments()[0];
-
-                Type collectionType = typeof(ICollection<>).MakeGenericType(elementType);
-                if (collectionType.IsInstanceOfType(model)) {
-                    ModelBindingContext collectionBindingContext = new ModelBindingContext() {
-                        Model = model,
-                        ModelName = bindingContext.ModelName,
-                        ModelState = bindingContext.ModelState,
-                        ModelType = modelType,
-                        PropertyFilter = bindingContext.PropertyFilter,
-                        ValueProvider = bindingContext.ValueProvider
-                    };
-                    object collection = UpdateCollection(controllerContext, collectionBindingContext, elementType);
-                    return collection;
-                }
-            }
-
-            // otherwise, just update the properties on the complex type
-            BindComplexElementalModel(controllerContext, bindingContext, model);
-            return model;
-        }
-
-        public virtual object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {
-            if (bindingContext == null) {
-                throw new ArgumentNullException("bindingContext");
-            }
-
-            bool performedFallback = false;
-
-            if (!String.IsNullOrEmpty(bindingContext.ModelName) && !DictionaryHelpers.DoesAnyKeyHavePrefix(bindingContext.ValueProvider, bindingContext.ModelName)) {
-                // We couldn't find any entry that began with the prefix. If this is the top-level element, fall back
-                // to the empty prefix.
-                if (bindingContext.FallbackToEmptyPrefix) {
-                    bindingContext = new ModelBindingContext() {
-                        Model = bindingContext.Model,
-                        ModelState = bindingContext.ModelState,
-                        ModelType = bindingContext.ModelType,
-                        PropertyFilter = bindingContext.PropertyFilter,
-                        ValueProvider = bindingContext.ValueProvider
-                    };
-                    performedFallback = true;
-                }
-                else {
-                    return null;
-                }
-            }
-
-            // Simple model = int, string, etc.; determined by calling TypeConverter.CanConvertFrom(typeof(string))
-            // or by seeing if a value in the request exactly matches the name of the model we're binding.
-            // Complex type = everything else.
-            if (!performedFallback) {
-                ValueProviderResult vpResult;
-                bindingContext.ValueProvider.TryGetValue(bindingContext.ModelName, out vpResult);
-                if (vpResult != null) {
-                    return BindSimpleModel(controllerContext, bindingContext, vpResult);
-                }
-            }
-            if (TypeDescriptor.GetConverter(bindingContext.ModelType).CanConvertFrom(typeof(string))) {
-                return null;
-            }
-
-            return BindComplexModel(controllerContext, bindingContext);
-        }
-
-        private void BindProperties(ControllerContext controllerContext, ModelBindingContext bindingContext) {
-            PropertyDescriptorCollection properties = GetModelProperties(controllerContext, bindingContext);
-            foreach (PropertyDescriptor property in properties) {
-                BindProperty(controllerContext, bindingContext, property);
-            }
-        }
-
-        protected virtual void BindProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor) {
-            // need to skip properties that aren't part of the request, else we might hit a StackOverflowException
-            string fullPropertyKey = CreateSubPropertyName(bindingContext.ModelName, propertyDescriptor.Name);
-            if (!DictionaryHelpers.DoesAnyKeyHavePrefix(bindingContext.ValueProvider, fullPropertyKey)) {
-                return;
-            }
-
-            // call into the property's model binder
-            IModelBinder propertyBinder = Binders.GetBinder(propertyDescriptor.PropertyType);
-            object originalPropertyValue = propertyDescriptor.GetValue(bindingContext.Model);
-            ModelBindingContext innerBindingContext = new ModelBindingContext() {
-                Model = originalPropertyValue,
-                ModelName = fullPropertyKey,
-                ModelState = bindingContext.ModelState,
-                ModelType = propertyDescriptor.PropertyType,
-                ValueProvider = bindingContext.ValueProvider
-            };
-            object newPropertyValue = propertyBinder.BindModel(controllerContext, innerBindingContext);
-
-            // validation
-            if (OnPropertyValidating(controllerContext, bindingContext, propertyDescriptor, newPropertyValue)) {
-                SetProperty(controllerContext, bindingContext, propertyDescriptor, newPropertyValue);
-                OnPropertyValidated(controllerContext, bindingContext, propertyDescriptor, newPropertyValue);
-            }
-        }
-
-        internal object BindSimpleModel(ControllerContext controllerContext, ModelBindingContext bindingContext, ValueProviderResult valueProviderResult) {
-            bindingContext.ModelState.SetModelValue(bindingContext.ModelName, valueProviderResult);
-
-            // if the value provider returns an instance of the requested data type, we can just short-circuit
-            // the evaluation and return that instance
-            if (bindingContext.ModelType.IsInstanceOfType(valueProviderResult.RawValue)) {
-                return valueProviderResult.RawValue;
-            }
-
-            // since a string is an IEnumerable<char>, we want it to skip the two checks immediately following
-            if (bindingContext.ModelType != typeof(string)) {
-
-                // conversion results in 3 cases, as below
-                if (bindingContext.ModelType.IsArray) {
-                    // case 1: user asked for an array
-                    // ValueProviderResult.ConvertTo() understands array types, so pass in the array type directly
-                    object modelArray = ConvertProviderResult(bindingContext.ModelState, bindingContext.ModelName, valueProviderResult, bindingContext.ModelType);
-                    return modelArray;
-                }
-
-                Type enumerableType = ExtractGenericInterface(bindingContext.ModelType, typeof(IEnumerable<>));
-                if (enumerableType != null) {
-                    // case 2: user asked for a collection rather than an array
-                    // need to call ConvertTo() on the array type, then copy the array to the collection
-                    object modelCollection = CreateModel(controllerContext, bindingContext, bindingContext.ModelType);
-                    Type elementType = enumerableType.GetGenericArguments()[0];
-                    Type arrayType = elementType.MakeArrayType();
-                    object modelArray = ConvertProviderResult(bindingContext.ModelState, bindingContext.ModelName, valueProviderResult, arrayType);
-
-                    Type collectionType = typeof(ICollection<>).MakeGenericType(elementType);
-                    if (collectionType.IsInstanceOfType(modelCollection)) {
-                        CollectionHelpers.ReplaceCollection(elementType, modelCollection, modelArray);
-                    }
-                    return modelCollection;
-                }
-            }
-
-            // case 3: user asked for an individual element
-            object model = ConvertProviderResult(bindingContext.ModelState, bindingContext.ModelName, valueProviderResult, bindingContext.ModelType);
-            return model;
-        }
-
-        private static bool CanUpdateReadonlyTypedReference(Type type) {
-            // value types aren't strictly immutable, but because they have copy-by-value semantics
-            // we can't update a value type that is marked readonly
-            if (type.IsValueType) {
-                return false;
-            }
-
-            // arrays are mutable, but because we can't change their length we shouldn't try
-            // to update an array that is referenced readonly
-            if (type.IsArray) {
-                return false;
-            }
-
-            // special-case known common immutable types
-            if (type == typeof(string)) {
-                return false;
-            }
-
-            return true;
-        }
-
-        [SuppressMessage("Microsoft.Globalization", "CA1304:SpecifyCultureInfo", MessageId = "System.Web.Mvc.ValueProviderResult.ConvertTo(System.Type)",
-            Justification = "The target object should make the correct culture determination, not this method.")]
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",
-            Justification = "We're recording this exception so that we can act on it later.")]
-        private static object ConvertProviderResult(ModelStateDictionary modelState, string modelStateKey, ValueProviderResult valueProviderResult, Type destinationType) {
-            try {
-                object convertedValue = valueProviderResult.ConvertTo(destinationType);
-                return convertedValue;
-            }
-            catch (Exception ex) {
-                modelState.AddModelError(modelStateKey, ex);
-                return null;
-            }
-        }
-
-        protected virtual object CreateModel(ControllerContext controllerContext, ModelBindingContext bindingContext, Type modelType) {
-            Type typeToCreate = modelType;
-
-            // we can understand some collection interfaces, e.g. IList<>, IDictionary<,>
-            if (modelType.IsGenericType) {
-                Type genericTypeDefinition = modelType.GetGenericTypeDefinition();
-                if (genericTypeDefinition == typeof(IDictionary<,>)) {
-                    typeToCreate = typeof(Dictionary<,>).MakeGenericType(modelType.GetGenericArguments());
-                }
-                else if (genericTypeDefinition == typeof(IEnumerable<>) || genericTypeDefinition == typeof(ICollection<>) || genericTypeDefinition == typeof(IList<>)) {
-                    typeToCreate = typeof(List<>).MakeGenericType(modelType.GetGenericArguments());
-                }
-            }
-
-            // fallback to the type's default constructor
-            return Activator.CreateInstance(typeToCreate);
-        }
-
-        protected static string CreateSubIndexName(string prefix, int index) {
-            return String.Format(CultureInfo.InvariantCulture, "{0}[{1}]", prefix, index);
-        }
-
-        protected static string CreateSubPropertyName(string prefix, string propertyName) {
-            return (!String.IsNullOrEmpty(prefix)) ? prefix + "." + propertyName : propertyName;
-        }
-
-        private static Type ExtractGenericInterface(Type queryType, Type interfaceType) {
-            Func<Type, bool> matchesInterface = t => t.IsGenericType && t.GetGenericTypeDefinition() == interfaceType;
-            return (matchesInterface(queryType)) ? queryType : queryType.GetInterfaces().FirstOrDefault(matchesInterface);
-        }
-
-        protected virtual PropertyDescriptorCollection GetModelProperties(ControllerContext controllerContext, ModelBindingContext bindingContext) {
-            PropertyDescriptorCollection allProperties = TypeDescriptor.GetProperties(bindingContext.ModelType);
-            Predicate<string> propertyFilter = bindingContext.PropertyFilter;
-
-            var filteredProperties = from PropertyDescriptor property in allProperties
-                                     where ShouldUpdateProperty(property, propertyFilter)
-                                     select property;
-
-            return new PropertyDescriptorCollection(filteredProperties.ToArray());
-        }
-
-        private static string GetValueRequiredResource(ControllerContext controllerContext) {
-            string resourceValue = null;
-            if (!String.IsNullOrEmpty(ResourceClassKey) && (controllerContext != null) && (controllerContext.HttpContext != null)) {
-                // If the user specified a ResourceClassKey try to load the resource they specified.
-                // If the class key is invalid, an exception will be thrown.
-                // If the class key is valid but the resource is not found, it returns null, in which
-                // case it will fall back to the MVC default error message.
-                resourceValue = controllerContext.HttpContext.GetGlobalResourceObject(ResourceClassKey, "PropertyValueRequired", CultureInfo.CurrentUICulture) as string;
-            }
-            return resourceValue ?? MvcResources.DefaultModelBinder_ValueRequired;
-        }
-
-        protected virtual void OnModelUpdated(ControllerContext controllerContext, ModelBindingContext bindingContext) {
-            IDataErrorInfo errorProvider = bindingContext.Model as IDataErrorInfo;
-            if (errorProvider != null) {
-                string errorText = errorProvider.Error;
-                if (!String.IsNullOrEmpty(errorText)) {
-                    bindingContext.ModelState.AddModelError(bindingContext.ModelName, errorText);
-                }
-            }
-        }
-
-        protected virtual bool OnModelUpdating(ControllerContext controllerContext, ModelBindingContext bindingContext) {
-            // default implementation does nothing
-
-            return true;
-        }
-
-        protected virtual void OnPropertyValidated(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor, object value) {
-            IDataErrorInfo errorProvider = bindingContext.Model as IDataErrorInfo;
-            if (errorProvider != null) {
-                string errorText = errorProvider[propertyDescriptor.Name];
-                if (!String.IsNullOrEmpty(errorText)) {
-                    string modelStateKey = CreateSubPropertyName(bindingContext.ModelName, propertyDescriptor.Name);
-                    bindingContext.ModelState.AddModelError(modelStateKey, errorText);
-                }
-            }
-        }
-
-        protected virtual bool OnPropertyValidating(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor, object value) {
-            // default implementation just checks to make sure that required text entry fields aren't left blank
-
-            string modelStateKey = CreateSubPropertyName(bindingContext.ModelName, propertyDescriptor.Name);
-            return VerifyValueUsability(controllerContext, bindingContext.ModelState, modelStateKey, propertyDescriptor.PropertyType, value);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",
-            Justification = "We're recording this exception so that we can act on it later.")]
-        protected virtual void SetProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor, object value) {
-            if (propertyDescriptor.IsReadOnly) {
-                return;
-            }
-
-            try {
-                propertyDescriptor.SetValue(bindingContext.Model, value);
-            }
-            catch (Exception ex) {
-                string modelStateKey = CreateSubPropertyName(bindingContext.ModelName, propertyDescriptor.Name);
-                bindingContext.ModelState.AddModelError(modelStateKey, ex);
-            }
-        }
-
-        private static bool ShouldUpdateProperty(PropertyDescriptor property, Predicate<string> propertyFilter) {
-            if (property.IsReadOnly && !CanUpdateReadonlyTypedReference(property.PropertyType)) {
-                return false;
-            }
-
-            // if this property is rejected by the filter, move on
-            if (!propertyFilter(property.Name)) {
-                return false;
-            }
-
-            // otherwise, allow
-            return true;
-        }
-
-        internal object UpdateCollection(ControllerContext controllerContext, ModelBindingContext bindingContext, Type elementType) {
-            IModelBinder elementBinder = Binders.GetBinder(elementType);
-
-            // build up a list of items from the request
-            List<object> modelList = new List<object>();
-            for (int currentIndex = 0; ; currentIndex++) {
-                string subIndexKey = CreateSubIndexName(bindingContext.ModelName, currentIndex);
-                if (!DictionaryHelpers.DoesAnyKeyHavePrefix(bindingContext.ValueProvider, subIndexKey)) {
-                    // we ran out of elements to pull
-                    break;
-                }
-
-                ModelBindingContext innerContext = new ModelBindingContext() {
-                    ModelName = subIndexKey,
-                    ModelState = bindingContext.ModelState,
-                    ModelType = elementType,
-                    PropertyFilter = bindingContext.PropertyFilter,
-                    ValueProvider = bindingContext.ValueProvider
-                };
-                object thisElement = elementBinder.BindModel(controllerContext, innerContext);
-
-                // we need to merge model errors up
-                VerifyValueUsability(controllerContext, bindingContext.ModelState, subIndexKey, elementType, thisElement);
-                modelList.Add(thisElement);
-            }
-
-            // if there weren't any elements at all in the request, just return
-            if (modelList.Count == 0) {
-                return null;
-            }
-
-            // replace the original collection
-            object collection = bindingContext.Model;
-            CollectionHelpers.ReplaceCollection(elementType, collection, modelList);
-            return collection;
-        }
-
-        internal object UpdateDictionary(ControllerContext controllerContext, ModelBindingContext bindingContext, Type keyType, Type valueType) {
-            IModelBinder keyBinder = Binders.GetBinder(keyType);
-            IModelBinder valueBinder = Binders.GetBinder(valueType);
-
-            // build up a list of items from the request
-            List<KeyValuePair<object, object>> modelList = new List<KeyValuePair<object, object>>();
-            for (int currentIndex = 0; ; currentIndex++) {
-                string subIndexKey = CreateSubIndexName(bindingContext.ModelName, currentIndex);
-                string keyFieldKey = CreateSubPropertyName(subIndexKey, "key");
-                string valueFieldKey = CreateSubPropertyName(subIndexKey, "value");
-
-                if (!(DictionaryHelpers.DoesAnyKeyHavePrefix(bindingContext.ValueProvider, keyFieldKey) && DictionaryHelpers.DoesAnyKeyHavePrefix(bindingContext.ValueProvider, valueFieldKey))) {
-                    // we ran out of elements to pull
-                    break;
-                }
-
-                // bind the key
-                ModelBindingContext keyBindingContext = new ModelBindingContext() {
-                    ModelName = keyFieldKey,
-                    ModelState = bindingContext.ModelState,
-                    ModelType = keyType,
-                    ValueProvider = bindingContext.ValueProvider
-                };
-                object thisKey = keyBinder.BindModel(controllerContext, keyBindingContext);
-
-                // we need to merge model errors up
-                VerifyValueUsability(controllerContext, bindingContext.ModelState, keyFieldKey, keyType, thisKey);
-                if (!keyType.IsInstanceOfType(thisKey)) {
-                    // we can't add an invalid key, so just move on
-                    continue;
-                }
-
-                // bind the value
-                ModelBindingContext valueBindingContext = new ModelBindingContext() {
-                    ModelName = valueFieldKey,
-                    ModelState = bindingContext.ModelState,
-                    ModelType = valueType,
-                    PropertyFilter = bindingContext.PropertyFilter,
-                    ValueProvider = bindingContext.ValueProvider
-                };
-                object thisValue = valueBinder.BindModel(controllerContext, valueBindingContext);
-
-                // we need to merge model errors up
-                VerifyValueUsability(controllerContext, bindingContext.ModelState, valueFieldKey, valueType, thisValue);
-                KeyValuePair<object, object> kvp = new KeyValuePair<object, object>(thisKey, thisValue);
-                modelList.Add(kvp);
-            }
-
-            // if there weren't any elements at all in the request, just return
-            if (modelList.Count == 0) {
-                return null;
-            }
-
-            // replace the original collection
-            object dictionary = bindingContext.Model;
-            CollectionHelpers.ReplaceDictionary(keyType, valueType, dictionary, modelList);
-            return dictionary;
-        }
-
-        private static bool VerifyValueUsability(ControllerContext controllerContext, ModelStateDictionary modelState, string modelStateKey, Type elementType, object value) {
-            if (value == null && !TypeHelpers.TypeAllowsNullValue(elementType)) {
-                if (modelState.IsValidField(modelStateKey)) {
-                    // a required entry field was left blank
-                    string message = GetValueRequiredResource(controllerContext);
-                    modelState.AddModelError(modelStateKey, message);
-                }
-                // we don't care about "you must enter a value" messages if there was an error
-                return false;
-            }
-
-            return true;
-        }
-
-        // This helper type is used because we're working with strongly-typed collections, but we don't know the Ts
-        // ahead of time. By using the generic methods below, we can consolidate the collection-specific code in a
-        // single helper type rather than having reflection-based calls spread throughout the DefaultModelBinder type.
-        // There is a single point of entry to each of the methods below, so they're fairly simple to maintain.
-
-        private static class CollectionHelpers {
-
-            private static readonly MethodInfo _replaceCollectionMethod = typeof(CollectionHelpers).GetMethod("ReplaceCollectionImpl", BindingFlags.Static | BindingFlags.NonPublic);
-            private static readonly MethodInfo _replaceDictionaryMethod = typeof(CollectionHelpers).GetMethod("ReplaceDictionaryImpl", BindingFlags.Static | BindingFlags.NonPublic);
-
-            public static void ReplaceCollection(Type collectionType, object collection, object newContents) {
-                MethodInfo targetMethod = _replaceCollectionMethod.MakeGenericMethod(collectionType);
-                targetMethod.Invoke(null, new object[] { collection, newContents });
-            }
-
-            private static void ReplaceCollectionImpl<T>(ICollection<T> collection, IEnumerable newContents) {
-                collection.Clear();
-                if (newContents != null) {
-                    foreach (object item in newContents) {
-                        // if the item was not a T, some conversion failed. the error message will be propagated,
-                        // but in the meanwhile we need to make a placeholder element in the array.
-                        T castItem = (item is T) ? (T)item : default(T);
-                        collection.Add(castItem);
-                    }
-                }
-            }
-
-            public static void ReplaceDictionary(Type keyType, Type valueType, object dictionary, object newContents) {
-                MethodInfo targetMethod = _replaceDictionaryMethod.MakeGenericMethod(keyType, valueType);
-                targetMethod.Invoke(null, new object[] { dictionary, newContents });
-            }
-
-            private static void ReplaceDictionaryImpl<TKey, TValue>(IDictionary<TKey, TValue> dictionary, IEnumerable<KeyValuePair<object, object>> newContents) {
-                dictionary.Clear();
-                foreach (var item in newContents) {
-                    // if the item was not a T, some conversion failed. the error message will be propagated,
-                    // but in the meanwhile we need to make a placeholder element in the dictionary.
-                    TKey castKey = (TKey)item.Key; // this cast shouldn't fail
-                    TValue castValue = (item.Value is TValue) ? (TValue)item.Value : default(TValue);
-                    dictionary[castKey] = castValue;
-                }
-            }
-
-        }
-
-    }
-}
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultViewLocationCache.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/DefaultViewLocationCache.cs
deleted file mode 100644 (file)
index f0479f4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Caching;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Security", "CA2112:SecuredTypesShouldNotExposeFields",\r
-        Justification = "The Null field does not have access to secure information")]\r
-    public class DefaultViewLocationCache : IViewLocationCache {\r
-        private static readonly TimeSpan _defaultTimeSpan = new TimeSpan(0, 15, 0);\r
-\r
-        public DefaultViewLocationCache()\r
-            : this(_defaultTimeSpan) {\r
-        }\r
-\r
-        public DefaultViewLocationCache(TimeSpan timeSpan) {\r
-            if (timeSpan.Ticks < 0) {\r
-                throw new InvalidOperationException(MvcResources.DefaultViewLocationCache_NegativeTimeSpan);\r
-            }\r
-            TimeSpan = timeSpan;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes",\r
-            Justification = "The reference type is immutable. ")]\r
-        public static readonly IViewLocationCache Null = new NullViewLocationCache();\r
-\r
-        public TimeSpan TimeSpan {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        #region IViewLocationCache Members\r
-        public string GetViewLocation(HttpContextBase httpContext, string key) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-            return (string)httpContext.Cache[key];\r
-        }\r
-\r
-        public void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-            httpContext.Cache.Insert(key, virtualPath, null /* dependencies */, Cache.NoAbsoluteExpiration, TimeSpan);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/DescriptorUtil.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/DescriptorUtil.cs
deleted file mode 100644 (file)
index a19c90f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Linq;\r
-    using System.Threading;\r
-\r
-    internal static class DescriptorUtil {\r
-\r
-        public static TDescriptor[] LazilyFetchOrCreateDescriptors<TReflection, TDescriptor>(ref TDescriptor[] cacheLocation, Func<TReflection[]> initializer, Func<TReflection, TDescriptor> converter) {\r
-            // did we already calculate this once?\r
-            TDescriptor[] existingCache = Interlocked.CompareExchange(ref cacheLocation, null, null);\r
-            if (existingCache != null) {\r
-                return existingCache;\r
-            }\r
-\r
-            TReflection[] memberInfos = initializer();\r
-            TDescriptor[] descriptors = memberInfos.Select(converter).Where(descriptor => descriptor != null).ToArray();\r
-            TDescriptor[] updatedCache = Interlocked.CompareExchange(ref cacheLocation, descriptors, null);\r
-            return updatedCache ?? descriptors;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/DictionaryHelpers.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/DictionaryHelpers.cs
deleted file mode 100644 (file)
index 7eb761f..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-\r
-    internal static class DictionaryHelpers {\r
-\r
-        public static IEnumerable<KeyValuePair<string, TValue>> FindKeysWithPrefix<TValue>(IDictionary<string, TValue> dictionary, string prefix) {\r
-            TValue exactMatchValue;\r
-            if (dictionary.TryGetValue(prefix, out exactMatchValue)) {\r
-                yield return new KeyValuePair<string, TValue>(prefix, exactMatchValue);\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                string key = entry.Key;\r
-\r
-                if (key.Length <= prefix.Length) {\r
-                    continue;\r
-                }\r
-\r
-                if (!key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) {\r
-                    continue;\r
-                }\r
-\r
-                char charAfterPrefix = key[prefix.Length];\r
-                switch (charAfterPrefix) {\r
-                    case '[':\r
-                    case '.':\r
-                        yield return entry;\r
-                        break;\r
-                }\r
-            }\r
-        }\r
-\r
-        public static bool DoesAnyKeyHavePrefix<TValue>(IDictionary<string, TValue> dictionary, string prefix) {\r
-            return FindKeysWithPrefix(dictionary, prefix).Any();\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/EmptyResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/EmptyResult.cs
deleted file mode 100644 (file)
index 3fef8ee..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    // represents a result that doesn't do anything, like a controller action returning null\r
-    public class EmptyResult : ActionResult {\r
-\r
-        private static readonly EmptyResult _singleton = new EmptyResult();\r
-\r
-        internal static EmptyResult Instance {\r
-            get {\r
-                return _singleton;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ExceptionContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ExceptionContext.cs
deleted file mode 100644 (file)
index 937dd23..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ExceptionContext : ControllerContext {\r
-\r
-        private ActionResult _result;\r
-\r
-        // parameterless constructor used for mocking\r
-        public ExceptionContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ExceptionContext(ControllerContext controllerContext, Exception exception)\r
-            : base(controllerContext) {\r
-            if (exception == null) {\r
-                throw new ArgumentNullException("exception");\r
-            }\r
-\r
-            Exception = exception;\r
-        }\r
-\r
-        public virtual Exception Exception {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public bool ExceptionHandled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get {\r
-                return _result ?? EmptyResult.Instance;\r
-            }\r
-            set {\r
-                _result = value;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FileContentResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FileContentResult.cs
deleted file mode 100644 (file)
index 8a2fdc0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web;\r
-\r
-    public class FileContentResult : FileResult {\r
-\r
-        public FileContentResult(byte[] fileContents, string contentType)\r
-            : base(contentType) {\r
-            if (fileContents == null) {\r
-                throw new ArgumentNullException("fileContents");\r
-            }\r
-\r
-            FileContents = fileContents;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays",\r
-            Justification = "There's no reason to tamper-proof this array since it's supplied to the type's constructor.")]\r
-        public byte[] FileContents {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected override void WriteFile(HttpResponseBase response) {\r
-            response.OutputStream.Write(FileContents, 0, FileContents.Length);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FilePathResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FilePathResult.cs
deleted file mode 100644 (file)
index 550113f..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class FilePathResult : FileResult {\r
-\r
-        public FilePathResult(string fileName, string contentType)\r
-            : base(contentType) {\r
-            if (String.IsNullOrEmpty(fileName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "fileName");\r
-            }\r
-\r
-            FileName = fileName;\r
-        }\r
-\r
-        public string FileName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected override void WriteFile(HttpResponseBase response) {\r
-            response.TransmitFile(FileName);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FileResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FileResult.cs
deleted file mode 100644 (file)
index eb20542..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Net.Mime;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public abstract class FileResult : ActionResult {\r
-\r
-        protected FileResult(string contentType) {\r
-            if (String.IsNullOrEmpty(contentType)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "contentType");\r
-            }\r
-\r
-            ContentType = contentType;\r
-        }\r
-\r
-        private string _fileDownloadName;\r
-\r
-        public string ContentType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string FileDownloadName {\r
-            get {\r
-                return _fileDownloadName ?? String.Empty;\r
-            }\r
-            set {\r
-                _fileDownloadName = value;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-            response.ContentType = ContentType;\r
-\r
-            if (!String.IsNullOrEmpty(FileDownloadName)) {\r
-                // From RFC 2183, Sec. 2.3:\r
-                // The sender may want to suggest a filename to be used if the entity is\r
-                // detached and stored in a separate file. If the receiving MUA writes\r
-                // the entity to a file, the suggested filename should be used as a\r
-                // basis for the actual filename, where possible.\r
-                ContentDisposition disposition = new ContentDisposition() { FileName = FileDownloadName };\r
-                string headerValue = disposition.ToString();\r
-                context.HttpContext.Response.AddHeader("Content-Disposition", headerValue);\r
-            }\r
-\r
-            WriteFile(response);\r
-        }\r
-\r
-        protected abstract void WriteFile(HttpResponseBase response);\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FileStreamResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FileStreamResult.cs
deleted file mode 100644 (file)
index a6e1a6f..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.IO;\r
-    using System.Web;\r
-\r
-    public class FileStreamResult : FileResult {\r
-\r
-        // default buffer size as defined in BufferedStream type\r
-        private const int _bufferSize = 0x1000;\r
-\r
-        public FileStreamResult(Stream fileStream, string contentType)\r
-            : base(contentType) {\r
-            if (fileStream == null) {\r
-                throw new ArgumentNullException("fileStream");\r
-            }\r
-\r
-            FileStream = fileStream;\r
-        }\r
-\r
-        public Stream FileStream {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected override void WriteFile(HttpResponseBase response) {\r
-            // grab chunks of data and write to the output stream\r
-            Stream outputStream = response.OutputStream;\r
-            using (FileStream) {\r
-                byte[] buffer = new byte[_bufferSize];\r
-\r
-                while (true) {\r
-                    int bytesRead = FileStream.Read(buffer, 0, _bufferSize);\r
-                    if (bytesRead == 0) {\r
-                        // no more data\r
-                        break;\r
-                    }\r
-\r
-                    outputStream.Write(buffer, 0, bytesRead);\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FilterAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FilterAttribute.cs
deleted file mode 100644 (file)
index 1cda086..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public abstract class FilterAttribute : Attribute {\r
-\r
-        private int _order = -1;\r
-\r
-        public int Order {\r
-            get {\r
-                return _order;\r
-            }\r
-            set {\r
-                if (value < -1) {\r
-                    throw new ArgumentOutOfRangeException("value",\r
-                        MvcResources.FilterAttribute_OrderOutOfRange);\r
-                }\r
-                _order = value;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FilterInfo.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FilterInfo.cs
deleted file mode 100644 (file)
index 031ffe3..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public class FilterInfo {\r
-\r
-        private List<IActionFilter> _actionFilters = new List<IActionFilter>();\r
-        private List<IAuthorizationFilter> _authorizationFilters = new List<IAuthorizationFilter>();\r
-        private List<IExceptionFilter> _exceptionFilters = new List<IExceptionFilter>();\r
-        private List<IResultFilter> _resultFilters = new List<IResultFilter>();\r
-\r
-        public IList<IActionFilter> ActionFilters {\r
-            get {\r
-                return _actionFilters;\r
-            }\r
-        }\r
-\r
-        public IList<IAuthorizationFilter> AuthorizationFilters {\r
-            get {\r
-                return _authorizationFilters;\r
-            }\r
-        }\r
-\r
-        public IList<IExceptionFilter> ExceptionFilters {\r
-            get {\r
-                return _exceptionFilters;\r
-            }\r
-        }\r
-\r
-        public IList<IResultFilter> ResultFilters {\r
-            get {\r
-                return _resultFilters;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FormCollection.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FormCollection.cs
deleted file mode 100644 (file)
index fb89c58..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.Specialized;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable",\r
-        Justification = "It is not anticipated that users will need to serialize this type.")]\r
-    [SuppressMessage("Microsoft.Design", "CA1035:ICollectionImplementationsHaveStronglyTypedMembers",\r
-        Justification = "It is not anticipated that users will call FormCollection.CopyTo().")]\r
-    [FormCollectionBinder]\r
-    public class FormCollection : NameValueCollection {\r
-\r
-        public FormCollection() {\r
-        }\r
-\r
-        public FormCollection(NameValueCollection collection) {\r
-            if (collection == null) {\r
-                throw new ArgumentNullException("collection");\r
-            }\r
-\r
-            Add(collection);\r
-        }\r
-\r
-        public IDictionary<string, ValueProviderResult> ToValueProvider() {\r
-            CultureInfo currentCulture = CultureInfo.CurrentCulture;\r
-\r
-            Dictionary<string, ValueProviderResult> dict = new Dictionary<string, ValueProviderResult>(StringComparer.OrdinalIgnoreCase);\r
-            string[] keys = AllKeys;\r
-            foreach (string key in keys) {\r
-                string[] rawValue = GetValues(key);\r
-                string attemptedValue = this[key];\r
-                ValueProviderResult vpResult = new ValueProviderResult(rawValue, attemptedValue, currentCulture);\r
-                dict[key] = vpResult;\r
-            }\r
-\r
-            return dict;\r
-        }\r
-\r
-        public virtual ValueProviderResult GetValue(string name) {\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            string[] rawValue = GetValues(name);\r
-            if (rawValue == null) {\r
-                return null;\r
-            }\r
-\r
-            string attemptedValue = this[name];\r
-            return new ValueProviderResult(rawValue, attemptedValue, CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        private sealed class FormCollectionBinderAttribute : CustomModelBinderAttribute {\r
-\r
-            // since the FormCollectionModelBinder.BindModel() method is thread-safe, we only need to keep\r
-            // a single instance of the binder around\r
-            private static readonly FormCollectionModelBinder _binder = new FormCollectionModelBinder();\r
-\r
-            public override IModelBinder GetBinder() {\r
-                return _binder;\r
-            }\r
-\r
-            // this class is used for generating a FormCollection object\r
-            private sealed class FormCollectionModelBinder : IModelBinder {\r
-                public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-                    if (controllerContext == null) {\r
-                        throw new ArgumentNullException("controllerContext");\r
-                    }\r
-\r
-                    return new FormCollection(controllerContext.HttpContext.Request.Form);\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/FormMethod.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/FormMethod.cs
deleted file mode 100644 (file)
index 0c9ebc8..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public enum FormMethod {\r
-        Get,\r
-        Post\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HandleErrorAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HandleErrorAttribute.cs
deleted file mode 100644 (file)
index 0555051..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "This attribute is AllowMultiple = true and users might want to override behavior.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]\r
-    public class HandleErrorAttribute : FilterAttribute, IExceptionFilter {\r
-\r
-        private const string _defaultView = "Error";\r
-\r
-        private Type _exceptionType = typeof(Exception);\r
-        private string _master;\r
-        private string _view;\r
-\r
-        public Type ExceptionType {\r
-            get {\r
-                return _exceptionType;\r
-            }\r
-            set {\r
-                if (value == null) {\r
-                    throw new ArgumentNullException("value");\r
-                }\r
-                if (!typeof(Exception).IsAssignableFrom(value)) {\r
-                    throw new ArgumentException(String.Format(CultureInfo.CurrentUICulture,\r
-                        MvcResources.ExceptionViewAttribute_NonExceptionType, value.FullName));\r
-                }\r
-\r
-                _exceptionType = value;\r
-            }\r
-        }\r
-\r
-        public string Master {\r
-            get {\r
-                return _master ?? String.Empty;\r
-            }\r
-            set {\r
-                _master = value;\r
-            }\r
-        }\r
-\r
-        public string View {\r
-            get {\r
-                return (!String.IsNullOrEmpty(_view)) ? _view : _defaultView;\r
-            }\r
-            set {\r
-                _view = value;\r
-            }\r
-        }\r
-\r
-        public virtual void OnException(ExceptionContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            // If custom errors are disabled, we need to let the normal ASP.NET exception handler\r
-            // execute so that the user can see useful debugging information.\r
-            if (filterContext.ExceptionHandled || !filterContext.HttpContext.IsCustomErrorEnabled) {\r
-                return;\r
-            }\r
-\r
-            Exception exception = filterContext.Exception;\r
-\r
-            // If this is not an HTTP 500 (for example, if somebody throws an HTTP 404 from an action method),\r
-            // ignore it.\r
-            if (new HttpException(null, exception).GetHttpCode() != 500) {\r
-                return;\r
-            }\r
-\r
-            if (!ExceptionType.IsInstanceOfType(exception)) {\r
-                return;\r
-            }\r
-\r
-            string controllerName = (string)filterContext.RouteData.Values["controller"];\r
-            string actionName = (string)filterContext.RouteData.Values["action"];\r
-            HandleErrorInfo model = new HandleErrorInfo(filterContext.Exception, controllerName, actionName);\r
-            filterContext.Result = new ViewResult {\r
-                ViewName = View,\r
-                MasterName = Master,\r
-                ViewData = new ViewDataDictionary<HandleErrorInfo>(model),\r
-                TempData = filterContext.Controller.TempData\r
-            };\r
-            filterContext.ExceptionHandled = true;\r
-            filterContext.HttpContext.Response.Clear();\r
-            filterContext.HttpContext.Response.StatusCode = 500;\r
-\r
-            // Certain versions of IIS will sometimes use their own error page when\r
-            // they detect a server error. Setting this property indicates that we\r
-            // want it to try to render ASP.NET MVC's error page instead.\r
-            filterContext.HttpContext.Response.TrySkipIisCustomErrors = true;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HandleErrorInfo.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HandleErrorInfo.cs
deleted file mode 100644 (file)
index d02f911..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class HandleErrorInfo {\r
-\r
-        public HandleErrorInfo(Exception exception, string controllerName, string actionName) {\r
-            if (exception == null) {\r
-                throw new ArgumentNullException("exception");\r
-            }\r
-            if (String.IsNullOrEmpty(controllerName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "controllerName");\r
-            }\r
-            if (string.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-\r
-            Exception = exception;\r
-            ControllerName = controllerName;\r
-            ActionName = actionName;\r
-        }\r
-\r
-        public string ActionName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string ControllerName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public Exception Exception {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/.gitattributes b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/.gitattributes
deleted file mode 100644 (file)
index 9c08a48..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-/FormExtensions.cs -crlf
-/InputExtensions.cs -crlf
-/LinkExtensions.cs -crlf
-/MvcForm.cs -crlf
-/RenderPartialExtensions.cs -crlf
-/SelectExtensions.cs -crlf
-/TextAreaExtensions.cs -crlf
-/ValidationExtensions.cs -crlf
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/FormExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/FormExtensions.cs
deleted file mode 100644 (file)
index 287864d..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System.Collections.Generic;\r
-    using System.Web.Routing;\r
-\r
-    public static class FormExtensions {\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper) {\r
-            // generates <form action="{current url}" method="post">...</form>\r
-            string formAction = htmlHelper.ViewContext.HttpContext.Request.RawUrl;\r
-            return FormHelper(htmlHelper, formAction, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, object routeValues) {\r
-            return BeginForm(htmlHelper, null, null, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, RouteValueDictionary routeValues) {\r
-            return BeginForm(htmlHelper, null, null, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, FormMethod method) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues, FormMethod method) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues, FormMethod method) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, routeValues, method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, FormMethod method, object htmlAttributes) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), method, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues, FormMethod method, object htmlAttributes) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            string formAction = UrlHelper.GenerateUrl(null /* routeName */, actionName, controllerName, routeValues, htmlHelper.RouteCollection, htmlHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-            return FormHelper(htmlHelper, formAction, method, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, object routeValues) {\r
-            return BeginRouteForm(htmlHelper, null /* routeName */, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, RouteValueDictionary routeValues) {\r
-            return BeginRouteForm(htmlHelper, null /* routeName */, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, object routeValues) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, RouteValueDictionary routeValues) {\r
-            return BeginRouteForm(htmlHelper, routeName, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, FormMethod method) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, object routeValues, FormMethod method) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, RouteValueDictionary routeValues, FormMethod method) {\r
-            return BeginRouteForm(htmlHelper, routeName, routeValues, method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, FormMethod method, object htmlAttributes) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), method, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, object routeValues, FormMethod method, object htmlAttributes) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, RouteValueDictionary routeValues, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            string formAction = UrlHelper.GenerateUrl(routeName, null, null, routeValues, htmlHelper.RouteCollection, htmlHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-            return FormHelper(htmlHelper, formAction, method, htmlAttributes);\r
-        }\r
-\r
-        public static void EndForm(this HtmlHelper htmlHelper) {\r
-            HttpResponseBase httpResponse = htmlHelper.ViewContext.HttpContext.Response;\r
-            httpResponse.Write("</form>");\r
-        }\r
-\r
-        private static MvcForm FormHelper(this HtmlHelper htmlHelper, string formAction, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            TagBuilder tagBuilder = new TagBuilder("form");\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            // action is implicitly generated, so htmlAttributes take precedence.\r
-            tagBuilder.MergeAttribute("action", formAction);\r
-            // method is an explicit parameter, so it takes precedence over the htmlAttributes.\r
-            tagBuilder.MergeAttribute("method", HtmlHelper.GetFormMethodString(method), true);\r
-\r
-            HttpResponseBase httpResponse = htmlHelper.ViewContext.HttpContext.Response;\r
-            httpResponse.Write(tagBuilder.ToString(TagRenderMode.StartTag));\r
-            return new MvcForm(htmlHelper.ViewContext.HttpContext.Response);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/InputExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/InputExtensions.cs
deleted file mode 100644 (file)
index 1422cf1..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class InputExtensions {\r
-        public static string CheckBox(this HtmlHelper htmlHelper, string name) {\r
-            return CheckBox(htmlHelper, name, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string CheckBox(this HtmlHelper htmlHelper, string name, bool isChecked) {\r
-            return CheckBox(htmlHelper, name, isChecked, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string CheckBox(this HtmlHelper htmlHelper, string name, bool isChecked, object htmlAttributes) {\r
-            return CheckBox(htmlHelper, name, isChecked, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string CheckBox(this HtmlHelper htmlHelper, string name, object htmlAttributes) {\r
-            return CheckBox(htmlHelper, name, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string CheckBox(this HtmlHelper htmlHelper, string name, IDictionary<string, object> htmlAttributes) {\r
-            return htmlHelper.InputHelper(InputType.CheckBox, name, "true", true /* useViewData */, false /* isChecked */, true /* setId */, false /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        public static string CheckBox(this HtmlHelper htmlHelper, string name, bool isChecked, IDictionary<string, object> htmlAttributes) {\r
-            // checked is an explicit parameter, but the value attribute is implicit so the dictionary's must take\r
-            // precedence.\r
-            RouteValueDictionary attributes = htmlAttributes == null ? new RouteValueDictionary() : new RouteValueDictionary(htmlAttributes);\r
-            attributes.Remove("checked");\r
-            return htmlHelper.InputHelper(InputType.CheckBox, name, "true", false /* useViewData */, isChecked, true /* setId */, false /* isExplicitValue */, attributes);\r
-        }\r
-\r
-        public static string Hidden(this HtmlHelper htmlHelper, string name) {\r
-            return Hidden(htmlHelper, name, null /* value */);\r
-        }\r
-\r
-        public static string Hidden(this HtmlHelper htmlHelper, string name, object value) {\r
-            return Hidden(htmlHelper, name, value, (object)null /* hmtlAttributes */);\r
-        }\r
-\r
-        public static string Hidden(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return Hidden(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string Hidden(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            return InputHelper(htmlHelper, InputType.Hidden, name, value, (value == null) /* useViewData */, false /* isChecked */, true /* setId */, true /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        public static string Password(this HtmlHelper htmlHelper, string name) {\r
-            return Password(htmlHelper, name, null /* value */);\r
-        }\r
-\r
-        public static string Password(this HtmlHelper htmlHelper, string name, object value) {\r
-            return Password(htmlHelper, name, value, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string Password(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return Password(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string Password(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            return InputHelper(htmlHelper, InputType.Password, name, value, false /* useViewData */, false /* isChecked */, true /* setId */, true /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        public static string RadioButton(this HtmlHelper htmlHelper, string name, object value) {\r
-            return RadioButton(htmlHelper, name, value, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string RadioButton(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return RadioButton(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RadioButton(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            // Determine whether or not to render the checked attribute based on the contents of ViewData.\r
-            string valueString = Convert.ToString(value, CultureInfo.CurrentCulture);\r
-            bool isChecked = (!String.IsNullOrEmpty(name)) && (String.Equals(htmlHelper.EvalString(name), valueString, StringComparison.OrdinalIgnoreCase));\r
-            // checked attributes is implicit, so we need to ensure that the dictionary takes precedence.\r
-            RouteValueDictionary attributes = htmlAttributes == null ? new RouteValueDictionary() : new RouteValueDictionary(htmlAttributes);\r
-            if (attributes.ContainsKey("checked")) {\r
-                return htmlHelper.InputHelper(InputType.Radio, name, value, false, false, true, true /* isExplicitValue */, attributes);\r
-            }\r
-\r
-            return RadioButton(htmlHelper, name, value, isChecked, htmlAttributes);\r
-        }\r
-\r
-        public static string RadioButton(this HtmlHelper htmlHelper, string name, object value, bool isChecked) {\r
-            return RadioButton(htmlHelper, name, value, isChecked, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string RadioButton(this HtmlHelper htmlHelper, string name, object value, bool isChecked, object htmlAttributes) {\r
-            return RadioButton(htmlHelper, name, value, isChecked, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RadioButton(this HtmlHelper htmlHelper, string name, object value, bool isChecked, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-            if (value == null) {\r
-                throw new ArgumentNullException("value");\r
-            }\r
-            // checked attribute is an explicit parameter so it takes precedence.\r
-            RouteValueDictionary attributes = htmlAttributes == null ? new RouteValueDictionary() : new RouteValueDictionary(htmlAttributes);\r
-            attributes.Remove("checked");\r
-            return htmlHelper.InputHelper(InputType.Radio, name, value, false, isChecked, true, true /* isExplicitValue */, attributes);\r
-        }\r
-\r
-        public static string TextBox(this HtmlHelper htmlHelper, string name) {\r
-            return TextBox(htmlHelper, name, null /* value */);\r
-        }\r
-\r
-        public static string TextBox(this HtmlHelper htmlHelper, string name, object value) {\r
-            return TextBox(htmlHelper, name, value, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string TextBox(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return TextBox(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string TextBox(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            return InputHelper(htmlHelper, InputType.Text, name, value, (value == null) /* useViewData */, false /* isChecked */, true /* setId */, true /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        private static string InputHelper(this HtmlHelper htmlHelper, InputType inputType, string name, object value, bool useViewData, bool isChecked, bool setId, bool isExplicitValue, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            TagBuilder tagBuilder = new TagBuilder("input");\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            tagBuilder.MergeAttribute("type", HtmlHelper.GetInputTypeString(inputType));\r
-            tagBuilder.MergeAttribute("name", name, true);\r
-\r
-            string valueParameter = Convert.ToString(value, CultureInfo.CurrentCulture);\r
-            bool usedModelState = false;\r
-\r
-            switch (inputType) {\r
-                case InputType.CheckBox:\r
-                    bool? modelStateWasChecked = htmlHelper.GetModelStateValue(name, typeof(bool)) as bool?;\r
-                    if (modelStateWasChecked.HasValue) {\r
-                        isChecked = modelStateWasChecked.Value;\r
-                        usedModelState = true;\r
-                    }\r
-                    goto case InputType.Radio;\r
-                case InputType.Radio:\r
-                    if (!usedModelState) {\r
-                        string modelStateValue = htmlHelper.GetModelStateValue(name, typeof(string)) as string;\r
-                        if (modelStateValue != null) {\r
-                            isChecked = String.Equals(modelStateValue, valueParameter, StringComparison.Ordinal);\r
-                            usedModelState = true;\r
-                        }\r
-                    }\r
-                    if (!usedModelState && useViewData) {\r
-                        isChecked = htmlHelper.EvalBoolean(name);\r
-                    }\r
-                    if (isChecked) {\r
-                        tagBuilder.MergeAttribute("checked", "checked");\r
-                    }\r
-                    tagBuilder.MergeAttribute("value", valueParameter, isExplicitValue);\r
-                    break;\r
-                case InputType.Password:\r
-                    if (value != null) {\r
-                        tagBuilder.MergeAttribute("value", valueParameter, isExplicitValue);\r
-                    }\r
-                    break;\r
-                default:\r
-                    string attemptedValue = (string)htmlHelper.GetModelStateValue(name, typeof(string));\r
-                    tagBuilder.MergeAttribute("value", attemptedValue ?? ((useViewData) ? htmlHelper.EvalString(name) : valueParameter), isExplicitValue);\r
-                    break;\r
-            }\r
-\r
-            if (setId) {\r
-                tagBuilder.GenerateId(name);\r
-            }\r
-\r
-            // If there are any errors for a named field, we add the css attribute.\r
-            ModelState modelState;\r
-            if (htmlHelper.ViewData.ModelState.TryGetValue(name, out modelState)) {\r
-                if (modelState.Errors.Count > 0) {\r
-                    tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);\r
-                }\r
-            }\r
-\r
-            if (inputType == InputType.CheckBox) {\r
-                // Render an additional <input type="hidden".../> for checkboxes. This\r
-                // addresses scenarios where unchecked checkboxes are not sent in the request.\r
-                // Sending a hidden input makes it possible to know that the checkbox was present\r
-                // on the page when the request was submitted.\r
-                StringBuilder inputItemBuilder = new StringBuilder();\r
-                inputItemBuilder.Append(tagBuilder.ToString(TagRenderMode.SelfClosing));\r
-\r
-                TagBuilder hiddenInput = new TagBuilder("input");\r
-                hiddenInput.MergeAttribute("type", HtmlHelper.GetInputTypeString(InputType.Hidden));\r
-                hiddenInput.MergeAttribute("name", name);\r
-                hiddenInput.MergeAttribute("value", "false");\r
-                inputItemBuilder.Append(hiddenInput.ToString(TagRenderMode.SelfClosing));\r
-                return inputItemBuilder.ToString();\r
-            }\r
-\r
-            return tagBuilder.ToString(TagRenderMode.SelfClosing);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/LinkExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/LinkExtensions.cs
deleted file mode 100644 (file)
index 9c30810..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class LinkExtensions {\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, new RouteValueDictionary(), new RouteValueDictionary());\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, object routeValues) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, new RouteValueDictionary(routeValues), new RouteValueDictionary());\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, object routeValues, object htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, RouteValueDictionary routeValues) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, routeValues, new RouteValueDictionary());\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName) {\r
-            return ActionLink(htmlHelper, linkText, actionName, controllerName, new RouteValueDictionary(), new RouteValueDictionary());\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, object routeValues, object htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, controllerName, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return HtmlHelper.GenerateLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, null/* routeName */, actionName, controllerName, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, object routeValues, object htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, controllerName, protocol, hostName, fragment, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return HtmlHelper.GenerateLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, null /* routeName */, actionName, controllerName, protocol, hostName, fragment, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, object routeValues) {\r
-            return RouteLink(htmlHelper, linkText, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, RouteValueDictionary routeValues) {\r
-            return RouteLink(htmlHelper, linkText, routeValues, new RouteValueDictionary());\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, object routeValues) {\r
-            return RouteLink(htmlHelper, linkText, routeName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, RouteValueDictionary routeValues) {\r
-            return RouteLink(htmlHelper, linkText, routeName, routeValues, new RouteValueDictionary());\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, object routeValues, object htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, null /* routeName */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, object routeValues, object htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, routeName, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return HtmlHelper.GenerateRouteLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, routeName, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, string protocol, string hostName, string fragment, object routeValues, object htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, routeName, protocol, hostName, fragment, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return HtmlHelper.GenerateRouteLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, routeName, protocol, hostName, fragment, routeValues, htmlAttributes);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/MvcForm.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/MvcForm.cs
deleted file mode 100644 (file)
index c2e29a9..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class MvcForm : IDisposable {\r
-        private bool _disposed;\r
-        private readonly HttpResponseBase _httpResponse;\r
-\r
-        public MvcForm(HttpResponseBase httpResponse) {\r
-            if (httpResponse == null) {\r
-                throw new ArgumentNullException("httpResponse");\r
-            }\r
-            _httpResponse = httpResponse;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Dispose() {\r
-            Dispose(true /* disposing */);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        protected virtual void Dispose(bool disposing) {\r
-            if (!_disposed) {\r
-                _disposed = true;\r
-                _httpResponse.Write("</form>");\r
-            }\r
-        }\r
-\r
-        public void EndForm() {\r
-            Dispose(true);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/RenderPartialExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/RenderPartialExtensions.cs
deleted file mode 100644 (file)
index bb483bd..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-\r
-    public static class RenderPartialExtensions {\r
-        // Renders the partial view with the parent's view data\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, htmlHelper.ViewData, null, ViewEngines.Engines);\r
-        }\r
-\r
-        // Renders the partial view with the given view data\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName, ViewDataDictionary viewData) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, viewData, null, ViewEngines.Engines);\r
-        }\r
-\r
-        // Renders the partial view with an empty view data and the given model\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName, object model) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, htmlHelper.ViewData, model, ViewEngines.Engines);\r
-        }\r
-\r
-        // Renders the partial view with a copy of the given view data plus the given model\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName, object model, ViewDataDictionary viewData) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, viewData, model, ViewEngines.Engines);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/SelectExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/SelectExtensions.cs
deleted file mode 100644 (file)
index 479bf38..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-    \r
-    public static class SelectExtensions {\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name, string optionLabel) {\r
-            return SelectInternal(htmlHelper, optionLabel, name, null/* selectList */, false /* allowMultiple */, (IDictionary<string, object>)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, string optionLabel) {\r
-            return DropDownList(htmlHelper, name, selectList, optionLabel, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, string optionLabel, object htmlAttributes) {\r
-            return DropDownList(htmlHelper, name, selectList, optionLabel, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name) {\r
-            return SelectInternal(htmlHelper, null /* optionLabel */, name, null /* selectList */, false /* allowMultiple */, (IDictionary<string, object>)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList) {\r
-            return DropDownList(htmlHelper, name, selectList, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, object htmlAttributes) {\r
-            return DropDownList(htmlHelper, name, selectList, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters",\r
-            Justification = "This type is appropriate for indicating a single selection.")]\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, IDictionary<string, object> htmlAttributes) {\r
-            return SelectInternal(htmlHelper, null /* optionLabel */, name, selectList, false /* allowMultiple */, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters",\r
-            Justification = "This type is appropriate for indicating a single selection.")]\r
-        public static string DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, string optionLabel, IDictionary<string, object> htmlAttributes) {\r
-            return SelectInternal(htmlHelper, optionLabel, name, selectList, false /* allowMultiple */, htmlAttributes);\r
-        }\r
-\r
-        public static string ListBox(this HtmlHelper htmlHelper, string name) {\r
-            return SelectInternal(htmlHelper, null/* optionLabel */, name, null/* selectList */, true/* allowMultiple */, (IDictionary<string, object>)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string ListBox(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList) {\r
-            return ListBox(htmlHelper, name, selectList, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        public static string ListBox(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, object htmlAttributes) {\r
-            return ListBox(htmlHelper, name, selectList, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string ListBox(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, IDictionary<string, object> htmlAttributes) {\r
-            return SelectInternal(htmlHelper, null /* optionLabel */, name, selectList, true /* allowMultiple */, htmlAttributes);\r
-        }\r
-\r
-        private static IEnumerable<SelectListItem> GetSelectData(this HtmlHelper htmlHelper, string name) {\r
-            object o = null;\r
-            if (htmlHelper.ViewData != null) {\r
-                o = htmlHelper.ViewData.Eval(name);\r
-            }\r
-            if (o == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.HtmlHelper_MissingSelectData,\r
-                        name,\r
-                        "IEnumerable<SelectListItem>"));\r
-            }\r
-            IEnumerable<SelectListItem> selectList = o as IEnumerable<SelectListItem>;\r
-            if (selectList == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.HtmlHelper_WrongSelectDataType,\r
-                        name,\r
-                        o.GetType().FullName,\r
-                        "IEnumerable<SelectListItem>"));\r
-            }\r
-            return selectList;\r
-        }\r
-\r
-        private static string ListItemToOption(SelectListItem item) {\r
-            TagBuilder builder = new TagBuilder("option") {\r
-                InnerHtml = HttpUtility.HtmlEncode(item.Text)\r
-            };\r
-            if (item.Value != null) {\r
-                builder.Attributes["value"] = item.Value;\r
-            }\r
-            if (item.Selected) {\r
-                builder.Attributes["selected"] = "selected";\r
-            }\r
-            return builder.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        private static string SelectInternal(this HtmlHelper htmlHelper, string optionLabel, string name, IEnumerable<SelectListItem> selectList, bool allowMultiple, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            bool usedViewData = false;\r
-\r
-            // If we got a null selectList, try to use ViewData to get the list of items.\r
-            if (selectList == null) {\r
-                selectList = htmlHelper.GetSelectData(name);\r
-                usedViewData = true;\r
-            }\r
-\r
-            object defaultValue = (allowMultiple) ? htmlHelper.GetModelStateValue(name, typeof(string[])) : htmlHelper.GetModelStateValue(name, typeof(string));\r
-\r
-            // If we haven't already used ViewData to get the entire list of items then we need to\r
-            // use the ViewData-supplied value before using the parameter-supplied value.\r
-            if (!usedViewData) {\r
-                if (defaultValue == null) {\r
-                    defaultValue = htmlHelper.ViewData.Eval(name);\r
-                }\r
-            }\r
-\r
-            if (defaultValue != null) {\r
-                IEnumerable defaultValues = (allowMultiple) ? defaultValue as IEnumerable : new[] { defaultValue };\r
-                IEnumerable<string> values = from object value in defaultValues select Convert.ToString(value, CultureInfo.CurrentCulture);\r
-                HashSet<string> selectedValues = new HashSet<string>(values, StringComparer.OrdinalIgnoreCase);\r
-                List<SelectListItem> newSelectList = new List<SelectListItem>();\r
-\r
-                foreach (SelectListItem item in selectList) {\r
-                    item.Selected = (item.Value != null) ? selectedValues.Contains(item.Value) : selectedValues.Contains(item.Text);\r
-                    newSelectList.Add(item);\r
-                }\r
-                selectList = newSelectList;\r
-            }\r
-\r
-            // Convert each ListItem to an <option> tag\r
-            StringBuilder listItemBuilder = new StringBuilder();\r
-\r
-            // Make optionLabel the first item that gets rendered.\r
-            if (optionLabel != null) {\r
-                listItemBuilder.AppendLine(ListItemToOption(new SelectListItem() { Text = optionLabel, Value = String.Empty, Selected = false }));\r
-            }\r
-\r
-            foreach (SelectListItem item in selectList) {\r
-                listItemBuilder.AppendLine(ListItemToOption(item));\r
-            }\r
-\r
-            TagBuilder tagBuilder = new TagBuilder("select") {\r
-                InnerHtml = listItemBuilder.ToString()\r
-            };\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            tagBuilder.MergeAttribute("name", name);\r
-            tagBuilder.GenerateId(name);\r
-            if (allowMultiple) {\r
-                tagBuilder.MergeAttribute("multiple", "multiple");\r
-            }\r
-\r
-            // If there are any errors for a named field, we add the css attribute.\r
-            ModelState modelState;\r
-            if (htmlHelper.ViewData.ModelState.TryGetValue(name, out modelState)) {\r
-                if (modelState.Errors.Count > 0) {\r
-                    tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);\r
-                }\r
-            }\r
-\r
-            return tagBuilder.ToString(TagRenderMode.Normal);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/TextAreaExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/TextAreaExtensions.cs
deleted file mode 100644 (file)
index e867fd1..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class TextAreaExtensions {\r
-        // These values are similar to the defaults used by WebForms\r
-        // when using <asp:TextBox TextMode="MultiLine"> without specifying\r
-        // the Rows and Columns attributes.\r
-        private const int TextAreaRows = 2;\r
-        private const int TextAreaColumns = 20;\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name) {\r
-            return TextArea(htmlHelper, name, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name, object htmlAttributes) {\r
-            return TextArea(htmlHelper, name, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name, IDictionary<string, object> htmlAttributes) {\r
-            // Add implicit parameters\r
-            Dictionary<string, object> implicitAttributes = new Dictionary<string, object>();\r
-            implicitAttributes.Add("rows", TextAreaRows.ToString(CultureInfo.InvariantCulture));\r
-            implicitAttributes.Add("cols", TextAreaColumns.ToString(CultureInfo.InvariantCulture));\r
-            return TextAreaHelper(htmlHelper, name, true /* useViewData */, null /* value */, implicitAttributes, null /* explicitParameters */, htmlAttributes);\r
-        }\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name, string value) {\r
-            return TextArea(htmlHelper, name, value, (object) null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name, string value, object htmlAttributes) {\r
-            return TextArea(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name, string value, IDictionary<string, object> htmlAttributes) {\r
-            // Add implicit parameters\r
-            Dictionary<string, object> implicitAttributes = new Dictionary<string, object>();\r
-            implicitAttributes.Add("rows", TextAreaRows.ToString(CultureInfo.InvariantCulture));\r
-            implicitAttributes.Add("cols", TextAreaColumns.ToString(CultureInfo.InvariantCulture));\r
-            return TextAreaHelper(htmlHelper, name, (value == null) /* useViewData */, value, implicitAttributes, null /* explicitParameters */, htmlAttributes);\r
-        }\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name, string value, int rows, int columns, object htmlAttributes) {\r
-            return TextArea(htmlHelper, name, value, rows, columns, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string TextArea(this HtmlHelper htmlHelper, string name, string value, int rows, int columns, IDictionary<string, object> htmlAttributes) {\r
-            if (rows <= 0) {\r
-                throw new ArgumentOutOfRangeException("rows", MvcResources.HtmlHelper_TextAreaParameterOutOfRange);\r
-            }\r
-            if (columns <= 0) {\r
-                throw new ArgumentOutOfRangeException("columns", MvcResources.HtmlHelper_TextAreaParameterOutOfRange);\r
-            }\r
-\r
-            Dictionary<string, object> explicitParameters = new Dictionary<string, object>();\r
-            explicitParameters.Add("rows", rows.ToString(CultureInfo.InvariantCulture));\r
-            explicitParameters.Add("cols", columns.ToString(CultureInfo.InvariantCulture));\r
-            return TextAreaHelper(htmlHelper, name, (value == null) /* useViewData */, value, null /* implictAttributes */, explicitParameters, htmlAttributes);\r
-        }\r
-\r
-        private static string TextAreaHelper(this HtmlHelper htmlHelper, string name, bool useViewData, string value, IDictionary<string, object> implicitAttributes, IDictionary<string, object> explicitParameters, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            TagBuilder tagBuilder = new TagBuilder("textarea");\r
-            // Add implicit attributes.\r
-            tagBuilder.MergeAttributes(implicitAttributes);\r
-            tagBuilder.GenerateId(name);\r
-            // Merge htmlAttributes.\r
-            tagBuilder.MergeAttributes(htmlAttributes, true);\r
-            // Override all the attributes with explicit parameters.\r
-            tagBuilder.MergeAttributes(explicitParameters, true);\r
-            tagBuilder.MergeAttribute("name", name, true);\r
-\r
-            // If there are any errors for a named field, we add the css attribute.\r
-            ModelState modelState;\r
-            if (htmlHelper.ViewData.ModelState.TryGetValue(name, out modelState)) {\r
-                if (modelState.Errors.Count > 0) {\r
-                    tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);\r
-                }\r
-            }\r
-\r
-            // The first newline is always trimmed when a TextArea is rendered, so we add an extra one\r
-            // in case the value being rendered is something like "\r\nHello".\r
-            // The attempted value receives precedence over the explicitly supplied value parameter.\r
-            string attemptedValue = (string)htmlHelper.GetModelStateValue(name, typeof(string));\r
-            tagBuilder.SetInnerText(Environment.NewLine + (attemptedValue ?? ((useViewData) ? htmlHelper.EvalString(name) : value)));\r
-            return tagBuilder.ToString(TagRenderMode.Normal);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/ValidationExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Html/ValidationExtensions.cs
deleted file mode 100644 (file)
index 47a7abf..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class ValidationExtensions {\r
-\r
-        private static string _resourceClassKey;\r
-\r
-        public static string ResourceClassKey {\r
-            get {\r
-                return _resourceClassKey ?? String.Empty;\r
-            }\r
-            set {\r
-                _resourceClassKey = value;\r
-            }\r
-        }\r
-\r
-        private static string GetInvalidPropertyValueResource(HttpContextBase httpContext) {\r
-            string resourceValue = null;\r
-            if (!String.IsNullOrEmpty(ResourceClassKey) && (httpContext != null)) {\r
-                // If the user specified a ResourceClassKey try to load the resource they specified.\r
-                // If the class key is invalid, an exception will be thrown.\r
-                // If the class key is valid but the resource is not found, it returns null, in which\r
-                // case it will fall back to the MVC default error message.\r
-                resourceValue = httpContext.GetGlobalResourceObject(ResourceClassKey, "InvalidPropertyValue", CultureInfo.CurrentUICulture) as string;\r
-            }\r
-            return resourceValue ?? MvcResources.Common_ValueNotValidForProperty;\r
-        }\r
-\r
-        private static string GetUserErrorMessageOrDefault(HttpContextBase httpContext, ModelError error, ModelState modelState) {\r
-            if (!String.IsNullOrEmpty(error.ErrorMessage)) {\r
-                return error.ErrorMessage;\r
-            }\r
-            if (modelState == null) {\r
-                return null;\r
-            }\r
-\r
-            string attemptedValue = (modelState.Value != null) ? modelState.Value.AttemptedValue : null;\r
-            return String.Format(CultureInfo.CurrentCulture, GetInvalidPropertyValueResource(httpContext), attemptedValue);\r
-        }\r
-\r
-        public static string ValidationMessage(this HtmlHelper htmlHelper, string modelName) {\r
-            return ValidationMessage(htmlHelper, modelName, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string ValidationMessage(this HtmlHelper htmlHelper, string modelName, object htmlAttributes) {\r
-            return ValidationMessage(htmlHelper, modelName, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames",\r
-            Justification = "'validationMessage' refers to the message that will be rendered by the ValidationMessage helper.")]\r
-        public static string ValidationMessage(this HtmlHelper htmlHelper, string modelName, string validationMessage) {\r
-            return ValidationMessage(htmlHelper, modelName, validationMessage, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames",\r
-            Justification = "'validationMessage' refers to the message that will be rendered by the ValidationMessage helper.")]\r
-        public static string ValidationMessage(this HtmlHelper htmlHelper, string modelName, string validationMessage, object htmlAttributes) {\r
-            return ValidationMessage(htmlHelper, modelName, validationMessage, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string ValidationMessage(this HtmlHelper htmlHelper, string modelName, IDictionary<string, object> htmlAttributes) {\r
-            return ValidationMessage(htmlHelper, modelName, null /* validationMessage */, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames",\r
-            Justification = "'validationMessage' refers to the message that will be rendered by the ValidationMessage helper.")]\r
-        public static string ValidationMessage(this HtmlHelper htmlHelper, string modelName, string validationMessage, IDictionary<string, object> htmlAttributes) {\r
-            if (modelName == null) {\r
-                throw new ArgumentNullException("modelName");\r
-            }\r
-\r
-            if (!htmlHelper.ViewData.ModelState.ContainsKey(modelName)) {\r
-                return null;\r
-            }\r
-\r
-            ModelState modelState = htmlHelper.ViewData.ModelState[modelName];\r
-            ModelErrorCollection modelErrors = (modelState == null) ? null : modelState.Errors;\r
-            ModelError modelError = ((modelErrors == null) || (modelErrors.Count == 0)) ? null : modelErrors[0];\r
-\r
-            if (modelError == null) {\r
-                return null;\r
-            }\r
-\r
-            TagBuilder builder = new TagBuilder("span");\r
-            builder.MergeAttributes(htmlAttributes);\r
-            builder.MergeAttribute("class", HtmlHelper.ValidationMessageCssClassName);\r
-            builder.SetInnerText(String.IsNullOrEmpty(validationMessage) ? GetUserErrorMessageOrDefault(htmlHelper.ViewContext.HttpContext, modelError, modelState) : validationMessage);\r
-\r
-            return builder.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        public static string ValidationSummary(this HtmlHelper htmlHelper) {\r
-            return ValidationSummary(htmlHelper, null /* message */);\r
-        }\r
-\r
-        public static string ValidationSummary(this HtmlHelper htmlHelper, string message) {\r
-            return ValidationSummary(htmlHelper, message, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static string ValidationSummary(this HtmlHelper htmlHelper, string message, object htmlAttributes) {\r
-            return ValidationSummary(htmlHelper, message, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static string ValidationSummary(this HtmlHelper htmlHelper, string message, IDictionary<string, object> htmlAttributes) {\r
-            // Nothing to do if there aren't any errors\r
-            if (htmlHelper.ViewData.ModelState.IsValid) {\r
-                return null;\r
-            }\r
-\r
-            string messageSpan;\r
-            if (!String.IsNullOrEmpty(message)) {\r
-                TagBuilder spanTag = new TagBuilder("span");\r
-                spanTag.MergeAttributes(htmlAttributes);\r
-                spanTag.MergeAttribute("class", HtmlHelper.ValidationSummaryCssClassName);\r
-                spanTag.SetInnerText(message);\r
-                messageSpan = spanTag.ToString(TagRenderMode.Normal) + Environment.NewLine;\r
-            }\r
-            else {\r
-                messageSpan = null;\r
-            }\r
-\r
-            StringBuilder htmlSummary = new StringBuilder();\r
-            TagBuilder unorderedList = new TagBuilder("ul");\r
-            unorderedList.MergeAttributes(htmlAttributes);\r
-            unorderedList.MergeAttribute("class", HtmlHelper.ValidationSummaryCssClassName);\r
-\r
-            foreach (ModelState modelState in htmlHelper.ViewData.ModelState.Values) {\r
-                foreach (ModelError modelError in modelState.Errors) {\r
-                    string errorText = GetUserErrorMessageOrDefault(htmlHelper.ViewContext.HttpContext, modelError, null /* modelState */);\r
-                    if (!String.IsNullOrEmpty(errorText)) {\r
-                        TagBuilder listItem = new TagBuilder("li");\r
-                        listItem.SetInnerText(errorText);\r
-                        htmlSummary.AppendLine(listItem.ToString(TagRenderMode.Normal));\r
-                    }\r
-                }\r
-            }\r
-\r
-            unorderedList.InnerHtml = htmlSummary.ToString();\r
-\r
-            return messageSpan + unorderedList.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HtmlHelper.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HtmlHelper.cs
deleted file mode 100644 (file)
index b7148d8..0000000
+++ /dev/null
@@ -1,280 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    [SuppressMessage("Microsoft.Security", "CA2112:SecuredTypesShouldNotExposeFields",\r
-        Justification = "Public fields for CSS names do not contain secure information.")]\r
-    public class HtmlHelper {\r
-\r
-        private static string _idAttributeDotReplacement;\r
-\r
-        public static readonly string ValidationInputCssClassName = "input-validation-error";\r
-        public static readonly string ValidationMessageCssClassName = "field-validation-error";\r
-        public static readonly string ValidationSummaryCssClassName = "validation-summary-errors";\r
-\r
-        private AntiForgeryDataSerializer _serializer;\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection) {\r
-            if (viewContext == null) {\r
-                throw new ArgumentNullException("viewContext");\r
-            }\r
-            if (viewDataContainer == null) {\r
-                throw new ArgumentNullException("viewDataContainer");\r
-            }\r
-            if (routeCollection == null) {\r
-                throw new ArgumentNullException("routeCollection");\r
-            }\r
-            ViewContext = viewContext;\r
-            ViewDataContainer = viewDataContainer;\r
-            RouteCollection = routeCollection;\r
-        }\r
-\r
-        public static string IdAttributeDotReplacement {\r
-            get {\r
-                if (String.IsNullOrEmpty(_idAttributeDotReplacement)) {\r
-                    _idAttributeDotReplacement = "_";\r
-                }\r
-                return _idAttributeDotReplacement;\r
-            }\r
-            set {\r
-                _idAttributeDotReplacement = value;\r
-            }\r
-        }\r
-\r
-        public RouteCollection RouteCollection {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal AntiForgeryDataSerializer Serializer {\r
-            get {\r
-                if (_serializer == null) {\r
-                    _serializer = new AntiForgeryDataSerializer();\r
-                }\r
-                return _serializer;\r
-            }\r
-            set {\r
-                _serializer = value;\r
-            }\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                return ViewDataContainer.ViewData;\r
-            }\r
-        }\r
-\r
-        public IViewDataContainer ViewDataContainer {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string AntiForgeryToken() {\r
-            return AntiForgeryToken(null /* salt */);\r
-        }\r
-\r
-        public string AntiForgeryToken(string salt) {\r
-            return AntiForgeryToken(salt, null /* domain */, null /* path */);\r
-        }\r
-\r
-        public string AntiForgeryToken(string salt, string domain, string path) {\r
-            string formValue = GetAntiForgeryTokenAndSetCookie(salt, domain, path);\r
-            string fieldName = AntiForgeryData.GetAntiForgeryTokenName(null);\r
-\r
-            TagBuilder builder = new TagBuilder("input");\r
-            builder.Attributes["type"] = "hidden";\r
-            builder.Attributes["name"] = fieldName;\r
-            builder.Attributes["value"] = formValue;\r
-            return builder.ToString(TagRenderMode.SelfClosing);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public string AttributeEncode(string value) {\r
-            return (!String.IsNullOrEmpty(value)) ? HttpUtility.HtmlAttributeEncode(value) : String.Empty;\r
-        }\r
-\r
-        public string AttributeEncode(object value) {\r
-            return AttributeEncode(Convert.ToString(value, CultureInfo.InvariantCulture));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public string Encode(string value) {\r
-            return (!String.IsNullOrEmpty(value)) ? HttpUtility.HtmlEncode(value) : String.Empty;\r
-        }\r
-\r
-        public string Encode(object value) {\r
-            return Encode(Convert.ToString(value, CultureInfo.CurrentCulture));\r
-        }\r
-\r
-        internal string EvalString(string key) {\r
-            return Convert.ToString(ViewData.Eval(key), CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        internal bool EvalBoolean(string key) {\r
-            return Convert.ToBoolean(ViewData.Eval(key), CultureInfo.InvariantCulture);\r
-        }\r
-\r
-        internal static IView FindPartialView(ViewContext viewContext, string partialViewName, ViewEngineCollection viewEngineCollection) {\r
-            ViewEngineResult result = viewEngineCollection.FindPartialView(viewContext, partialViewName);\r
-            if (result.View != null) {\r
-                return result.View;\r
-            }\r
-\r
-            StringBuilder locationsText = new StringBuilder();\r
-            foreach (string location in result.SearchedLocations) {\r
-                locationsText.AppendLine();\r
-                locationsText.Append(location);\r
-            }\r
-\r
-            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Common_PartialViewNotFound, partialViewName, locationsText));\r
-        }\r
-\r
-        public static string GenerateLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string actionName, string controllerName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateLink(requestContext, routeCollection, linkText, routeName, actionName, controllerName, null/* protocol */, null/* hostName */, null/* fragment */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string GenerateLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateLinkInternal(requestContext, routeCollection, linkText, routeName, actionName, controllerName, protocol, hostName, fragment, routeValues, htmlAttributes, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        private static string GenerateLinkInternal(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes, bool includeImplicitMvcValues) {\r
-            string url = UrlHelper.GenerateUrl(routeName, actionName, controllerName, protocol, hostName, fragment, routeValues, routeCollection, requestContext, includeImplicitMvcValues);\r
-            TagBuilder tagBuilder = new TagBuilder("a") {\r
-                InnerHtml = (!String.IsNullOrEmpty(linkText)) ? HttpUtility.HtmlEncode(linkText) : String.Empty\r
-            };\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            tagBuilder.MergeAttribute("href", url);\r
-            return tagBuilder.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        public static string GenerateRouteLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateRouteLink(requestContext, routeCollection, linkText, routeName, null/* protocol */, null/* hostName */, null/* fragment */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string GenerateRouteLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateLinkInternal(requestContext, routeCollection, linkText, routeName, null /* actionName */, null /* controllerName */, protocol, hostName, fragment, routeValues, htmlAttributes, false /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        private string GetAntiForgeryTokenAndSetCookie(string salt, string domain, string path) {\r
-            string cookieName = AntiForgeryData.GetAntiForgeryTokenName(ViewContext.HttpContext.Request.ApplicationPath);\r
-\r
-            AntiForgeryData cookieToken;\r
-            HttpCookie cookie = ViewContext.HttpContext.Request.Cookies[cookieName];\r
-            if (cookie != null) {\r
-                cookieToken = Serializer.Deserialize(cookie.Value);\r
-            }\r
-            else {\r
-                cookieToken = AntiForgeryData.NewToken();\r
-                string cookieValue = Serializer.Serialize(cookieToken);\r
-\r
-                HttpCookie newCookie = new HttpCookie(cookieName, cookieValue) { HttpOnly = true, Domain = domain };\r
-                if (!String.IsNullOrEmpty(path)) {\r
-                    newCookie.Path = path;\r
-                }\r
-                ViewContext.HttpContext.Response.Cookies.Set(newCookie);\r
-            }\r
-\r
-            AntiForgeryData formToken = new AntiForgeryData(cookieToken) {\r
-                CreationDate = DateTime.Now,\r
-                Salt = salt\r
-            };\r
-            string formValue = Serializer.Serialize(formToken);\r
-            return formValue;\r
-        }\r
-\r
-        public static string GetFormMethodString(FormMethod method) {\r
-            switch (method) {\r
-                case FormMethod.Get:\r
-                    return "get";\r
-                case FormMethod.Post:\r
-                    return "post";\r
-                default:\r
-                    return "post";\r
-            }\r
-        }\r
-\r
-        public static string GetInputTypeString(InputType inputType) {\r
-            switch (inputType) {\r
-                case InputType.CheckBox:\r
-                    return "checkbox";\r
-                case InputType.Hidden:\r
-                    return "hidden";\r
-                case InputType.Password:\r
-                    return "password";\r
-                case InputType.Radio:\r
-                    return "radio";\r
-                case InputType.Text:\r
-                    return "text";\r
-                default:\r
-                    return "text";\r
-            }\r
-        }\r
-\r
-        internal object GetModelStateValue(string key, Type destinationType) {\r
-            ModelState modelState;\r
-            if (ViewData.ModelState.TryGetValue(key, out modelState)) {\r
-                return modelState.Value.ConvertTo(destinationType, null /* culture */);\r
-            }\r
-            return null;\r
-        }\r
-\r
-        internal virtual void RenderPartialInternal(string partialViewName, ViewDataDictionary viewData, object model, ViewEngineCollection viewEngineCollection) {\r
-            if (String.IsNullOrEmpty(partialViewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "partialViewName");\r
-            }\r
-\r
-            ViewDataDictionary newViewData = null;\r
-\r
-            if (model == null) {\r
-                if (viewData == null) {\r
-                    newViewData = new ViewDataDictionary(ViewData);\r
-                }\r
-                else {\r
-                    newViewData = new ViewDataDictionary(viewData);\r
-                }\r
-            }\r
-            else {\r
-                if (viewData == null) {\r
-                    newViewData = new ViewDataDictionary(model);\r
-                }\r
-                else {\r
-                    newViewData = new ViewDataDictionary(viewData) { Model = model };\r
-                }\r
-            }\r
-\r
-            ViewContext newViewContext = new ViewContext(ViewContext, ViewContext.View, newViewData, ViewContext.TempData);\r
-            IView view = FindPartialView(newViewContext, partialViewName, viewEngineCollection);\r
-            view.Render(newViewContext, ViewContext.HttpContext.Response.Output);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HtmlHelper`1.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HtmlHelper`1.cs
deleted file mode 100644 (file)
index 09367fe..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public class HtmlHelper<TModel> : HtmlHelper where TModel : class {\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection)\r
-            : base(viewContext, viewDataContainer, routeCollection) {\r
-\r
-            _viewData = new ViewDataDictionary<TModel>(viewDataContainer.ViewData);\r
-        }\r
-\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                return _viewData;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpAntiForgeryException.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpAntiForgeryException.cs
deleted file mode 100644 (file)
index 8a8cf34..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Runtime.Serialization;\r
-    using System.Web;\r
-\r
-    [Serializable]\r
-    public sealed class HttpAntiForgeryException : HttpException {\r
-\r
-        public HttpAntiForgeryException() {\r
-        }\r
-\r
-        private HttpAntiForgeryException(SerializationInfo info, StreamingContext context)\r
-            : base(info, context) {\r
-        }\r
-\r
-        public HttpAntiForgeryException(string message)\r
-            : base(message) {\r
-        }\r
-\r
-        public HttpAntiForgeryException(string message, Exception innerException)\r
-            : base(message, innerException) {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpPostedFileBaseModelBinder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpPostedFileBaseModelBinder.cs
deleted file mode 100644 (file)
index f8b4ece..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-\r
-    public class HttpPostedFileBaseModelBinder : IModelBinder {\r
-\r
-        public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (bindingContext == null) {\r
-                throw new ArgumentNullException("bindingContext");\r
-            }\r
-\r
-            HttpPostedFileBase theFile = controllerContext.HttpContext.Request.Files[bindingContext.ModelName];\r
-\r
-            // case 1: there was no <input type="file" ... /> element in the post\r
-            if (theFile == null) {\r
-                return null;\r
-            }\r
-\r
-            // case 2: there was an <input type="file" ... /> element in the post, but it was left blank\r
-            if (theFile.ContentLength == 0 && String.IsNullOrEmpty(theFile.FileName)) {\r
-                return null;\r
-            }\r
-\r
-            // case 3: the file was posted\r
-            return theFile;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpUnauthorizedResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpUnauthorizedResult.cs
deleted file mode 100644 (file)
index 74d5489..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public class HttpUnauthorizedResult : ActionResult {\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            // 401 is the HTTP status code for unauthorized access - setting this\r
-            // will cause the active authentication module to execute its default\r
-            // unauthorized handler\r
-            context.HttpContext.Response.StatusCode = 401;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpVerbs.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/HttpVerbs.cs
deleted file mode 100644 (file)
index b9506c1..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [Flags]\r
-    public enum HttpVerbs {\r
-        Get = 1 << 0,\r
-        Post = 1 << 1,\r
-        Put = 1 << 2,\r
-        Delete = 1 << 3,\r
-        Head = 1 << 4\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IActionFilter.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IActionFilter.cs
deleted file mode 100644 (file)
index 2cc7f3e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IActionFilter {\r
-        void OnActionExecuting(ActionExecutingContext filterContext);\r
-        void OnActionExecuted(ActionExecutedContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IActionInvoker.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IActionInvoker.cs
deleted file mode 100644 (file)
index 9ab878d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IActionInvoker {\r
-        bool InvokeAction(ControllerContext controllerContext, string actionName);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IAuthorizationFilter.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IAuthorizationFilter.cs
deleted file mode 100644 (file)
index 93ab7b3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IAuthorizationFilter {\r
-        void OnAuthorization(AuthorizationContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IBuildManager.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IBuildManager.cs
deleted file mode 100644 (file)
index e79c862..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections;\r
-\r
-    // REVIEW: Should we make this public?\r
-    internal interface IBuildManager {\r
-        object CreateInstanceFromVirtualPath(string virtualPath, Type requiredBaseType);\r
-        ICollection GetReferencedAssemblies();\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IController.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IController.cs
deleted file mode 100644 (file)
index d5bb4ca..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public interface IController {\r
-        void Execute(RequestContext requestContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IControllerFactory.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IControllerFactory.cs
deleted file mode 100644 (file)
index 316774f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public interface IControllerFactory {\r
-        IController CreateController(RequestContext requestContext, string controllerName);\r
-        void ReleaseController(IController controller);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IExceptionFilter.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IExceptionFilter.cs
deleted file mode 100644 (file)
index ede6fd3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IExceptionFilter {\r
-        void OnException(ExceptionContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IModelBinder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IModelBinder.cs
deleted file mode 100644 (file)
index d6ce039..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IModelBinder {\r
-        object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IResultFilter.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IResultFilter.cs
deleted file mode 100644 (file)
index c00395f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IResultFilter {\r
-        void OnResultExecuting(ResultExecutingContext filterContext);\r
-        void OnResultExecuted(ResultExecutedContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ITempDataProvider.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ITempDataProvider.cs
deleted file mode 100644 (file)
index 3361130..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public interface ITempDataProvider {\r
-        IDictionary<string, object> LoadTempData(ControllerContext controllerContext);\r
-        void SaveTempData(ControllerContext controllerContext, IDictionary<string, object> values);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IView.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IView.cs
deleted file mode 100644 (file)
index 97d044c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.IO;\r
-\r
-    public interface IView {\r
-        void Render(ViewContext viewContext, TextWriter writer);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IViewDataContainer.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IViewDataContainer.cs
deleted file mode 100644 (file)
index c1bfacb..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public interface IViewDataContainer {\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This is the mechanism by which the ViewPage / ViewUserControl get their ViewDataDictionary objects.")]\r
-        ViewDataDictionary ViewData { get; set; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IViewEngine.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IViewEngine.cs
deleted file mode 100644 (file)
index 9950ce7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IViewEngine {\r
-        ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache);\r
-        ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache);\r
-        void ReleaseView(ControllerContext controllerContext, IView view);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/IViewLocationCache.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/IViewLocationCache.cs
deleted file mode 100644 (file)
index 824950b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web;\r
-\r
-    public interface IViewLocationCache {\r
-        string GetViewLocation(HttpContextBase httpContext, string key);\r
-        void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/InputType.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/InputType.cs
deleted file mode 100644 (file)
index a4a39d8..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public enum InputType {\r
-        CheckBox,\r
-        Hidden,\r
-        Password,\r
-        Radio,\r
-        Text\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/JavaScriptResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/JavaScriptResult.cs
deleted file mode 100644 (file)
index 4ee833e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public class JavaScriptResult : ActionResult {\r
-\r
-        public string Script {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-            response.ContentType = "application/x-javascript";\r
-\r
-            if (Script != null) {\r
-                response.Write(Script);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/JsonResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/JsonResult.cs
deleted file mode 100644 (file)
index f19d145..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Script.Serialization;\r
-\r
-    public class JsonResult : ActionResult {\r
-\r
-        public Encoding ContentEncoding {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ContentType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public object Data {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-\r
-            if (!String.IsNullOrEmpty(ContentType)) {\r
-                response.ContentType = ContentType;\r
-            }\r
-            else {\r
-                response.ContentType = "application/json";\r
-            }\r
-            if (ContentEncoding != null) {\r
-                response.ContentEncoding = ContentEncoding;\r
-            }\r
-            if (Data != null) {\r
-                // The JavaScriptSerializer type was marked as obsolete prior to .NET Framework 3.5 SP1\r
-#pragma warning disable 0618\r
-                JavaScriptSerializer serializer = new JavaScriptSerializer();\r
-                response.Write(serializer.Serialize(Data));\r
-#pragma warning restore 0618\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinderAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinderAttribute.cs
deleted file mode 100644 (file)
index b057c73..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(ValidTargets, AllowMultiple = false, Inherited = false)]\r
-    public sealed class ModelBinderAttribute : CustomModelBinderAttribute {\r
-\r
-        public ModelBinderAttribute(Type binderType) {\r
-            if (binderType == null) {\r
-                throw new ArgumentNullException("binderType");\r
-            }\r
-            if (!typeof(IModelBinder).IsAssignableFrom(binderType)) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture,\r
-                    MvcResources.ModelBinderAttribute_TypeNotIModelBinder, binderType.FullName);\r
-                throw new ArgumentException(message, "binderType");\r
-            }\r
-\r
-            BinderType = binderType;\r
-        }\r
-\r
-        public Type BinderType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override IModelBinder GetBinder() {\r
-            try {\r
-                return (IModelBinder)Activator.CreateInstance(BinderType);\r
-            }\r
-            catch (Exception ex) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ModelBinderAttribute_ErrorCreatingModelBinder,\r
-                        BinderType.FullName),\r
-                    ex);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinderDictionary.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinderDictionary.cs
deleted file mode 100644 (file)
index 0a1a4f5..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ModelBinderDictionary : IDictionary<Type, IModelBinder> {\r
-\r
-        private IModelBinder _defaultBinder;\r
-        private readonly Dictionary<Type, IModelBinder> _innerDictionary = new Dictionary<Type, IModelBinder>();\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public int Count {\r
-            get {\r
-                return _innerDictionary.Count;\r
-            }\r
-        }\r
-\r
-        public IModelBinder DefaultBinder {\r
-            get {\r
-                if (_defaultBinder == null) {\r
-                    _defaultBinder = new DefaultModelBinder();\r
-                }\r
-                return _defaultBinder;\r
-            }\r
-            set {\r
-                _defaultBinder = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((IDictionary<Type, IModelBinder>)_innerDictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<Type> Keys {\r
-            get {\r
-                return _innerDictionary.Keys;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public IModelBinder this[Type key] {\r
-            get {\r
-                IModelBinder binder;\r
-                _innerDictionary.TryGetValue(key, out binder);\r
-                return binder;\r
-            }\r
-            set {\r
-                _innerDictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<IModelBinder> Values {\r
-            get {\r
-                return _innerDictionary.Values;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(KeyValuePair<Type, IModelBinder> item) {\r
-            ((IDictionary<Type, IModelBinder>)_innerDictionary).Add(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(Type key, IModelBinder value) {\r
-            _innerDictionary.Add(key, value);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Clear() {\r
-            _innerDictionary.Clear();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Contains(KeyValuePair<Type, IModelBinder> item) {\r
-            return ((IDictionary<Type, IModelBinder>)_innerDictionary).Contains(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool ContainsKey(Type key) {\r
-            return _innerDictionary.ContainsKey(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void CopyTo(KeyValuePair<Type, IModelBinder>[] array, int arrayIndex) {\r
-            ((IDictionary<Type, IModelBinder>)_innerDictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        public IModelBinder GetBinder(Type modelType) {\r
-            return GetBinder(modelType, true /* fallbackToDefault */);\r
-        }\r
-\r
-        public virtual IModelBinder GetBinder(Type modelType, bool fallbackToDefault) {\r
-            if (modelType == null) {\r
-                throw new ArgumentNullException("modelType");\r
-            }\r
-\r
-            return GetBinder(modelType, (fallbackToDefault) ? DefaultBinder : null);\r
-        }\r
-\r
-        private IModelBinder GetBinder(Type modelType, IModelBinder fallbackBinder) {\r
-            // Try to look up a binder for this type. We use this order of precedence:\r
-            // 1. Binder registered in the global table\r
-            // 2. Binder attribute defined on the type\r
-            // 3. Supplied fallback binder\r
-\r
-            IModelBinder binder;\r
-            if (_innerDictionary.TryGetValue(modelType, out binder)) {\r
-                return binder;\r
-            }\r
-\r
-            binder = ModelBinders.GetBinderFromAttributes(modelType,\r
-                () => String.Format(CultureInfo.CurrentUICulture, MvcResources.ModelBinderDictionary_MultipleAttributes, modelType.FullName));\r
-\r
-            return binder ?? fallbackBinder;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public IEnumerator<KeyValuePair<Type, IModelBinder>> GetEnumerator() {\r
-            return _innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(KeyValuePair<Type, IModelBinder> item) {\r
-            return ((IDictionary<Type, IModelBinder>)_innerDictionary).Remove(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(Type key) {\r
-            return _innerDictionary.Remove(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool TryGetValue(Type key, out IModelBinder value) {\r
-            return _innerDictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)_innerDictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinders.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBinders.cs
deleted file mode 100644 (file)
index b8aa238..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-    using System.Web;\r
-\r
-    public static class ModelBinders {\r
-\r
-        private static readonly ModelBinderDictionary _binders = CreateDefaultBinderDictionary();\r
-\r
-        public static ModelBinderDictionary Binders {\r
-            get {\r
-                return _binders;\r
-            }\r
-        }\r
-\r
-        internal static IModelBinder GetBinderFromAttributes(ICustomAttributeProvider element, Func<string> errorMessageAccessor) {\r
-            // this method is used to get a custom binder based on the attributes of the element passed to it.\r
-            // it will return null if a binder cannot be detected based on the attributes alone.\r
-\r
-            CustomModelBinderAttribute[] attrs = (CustomModelBinderAttribute[])element.GetCustomAttributes(typeof(CustomModelBinderAttribute), true /* inherit */);\r
-            if (attrs == null) {\r
-                return null;\r
-            }\r
-\r
-            switch (attrs.Length) {\r
-                case 0:\r
-                    return null;\r
-\r
-                case 1:\r
-                    IModelBinder binder = attrs[0].GetBinder();\r
-                    return binder;\r
-\r
-                default:\r
-                    string errorMessage = errorMessageAccessor();\r
-                    throw new InvalidOperationException(errorMessage);\r
-            }\r
-        }\r
-\r
-        private static ModelBinderDictionary CreateDefaultBinderDictionary() {\r
-            // We can't add a binder to the HttpPostedFileBase type as an attribute, so we'll just\r
-            // prepopulate the dictionary as a convenience to users.\r
-\r
-            ModelBinderDictionary binders = new ModelBinderDictionary() {\r
-                { typeof(HttpPostedFileBase), new HttpPostedFileBaseModelBinder() }\r
-            };\r
-            return binders;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBindingContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelBindingContext.cs
deleted file mode 100644 (file)
index e355333..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ModelBindingContext {\r
-\r
-        private static readonly Predicate<string> _defaultPropertyFilter = _ => true;\r
-\r
-        private string _modelName;\r
-        private ModelStateDictionary _modelState;\r
-        private Predicate<string> _propertyFilter;\r
-\r
-        public bool FallbackToEmptyPrefix {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public object Model {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ModelName {\r
-            get {\r
-                if (_modelName == null) {\r
-                    _modelName = String.Empty;\r
-                }\r
-                return _modelName;\r
-            }\r
-            set {\r
-                _modelName = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The containing type is mutable.")]\r
-        public ModelStateDictionary ModelState {\r
-            get {\r
-                if (_modelState == null) {\r
-                    _modelState = new ModelStateDictionary();\r
-                }\r
-                return _modelState;\r
-            }\r
-            set {\r
-                _modelState = value;\r
-            }\r
-        }\r
-\r
-        public Type ModelType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public Predicate<string> PropertyFilter {\r
-            get {\r
-                if (_propertyFilter == null) {\r
-                    _propertyFilter = _defaultPropertyFilter;\r
-                }\r
-                return _propertyFilter;\r
-            }\r
-            set {\r
-                _propertyFilter = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The containing type is mutable.")]\r
-        public IDictionary<string, ValueProviderResult> ValueProvider {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelError.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelError.cs
deleted file mode 100644 (file)
index a6fb177..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [Serializable]\r
-    public class ModelError {\r
-\r
-        public ModelError(Exception exception)\r
-            : this(exception, null /* errorMessage */) {\r
-        }\r
-\r
-        public ModelError(Exception exception, string errorMessage)\r
-            : this(errorMessage) {\r
-            if (exception == null) {\r
-                throw new ArgumentNullException("exception");\r
-            }\r
-\r
-            Exception = exception;\r
-        }\r
-\r
-        public ModelError(string errorMessage) {\r
-            ErrorMessage = errorMessage ?? String.Empty;\r
-        }\r
-\r
-        public Exception Exception {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string ErrorMessage {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelErrorCollection.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelErrorCollection.cs
deleted file mode 100644 (file)
index 61898dd..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.ObjectModel;\r
-\r
-    [Serializable]\r
-    public class ModelErrorCollection : Collection<ModelError> {\r
-\r
-        public void Add(Exception exception) {\r
-            Add(new ModelError(exception));\r
-        }\r
-\r
-        public void Add(string errorMessage) {\r
-            Add(new ModelError(errorMessage));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelState.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelState.cs
deleted file mode 100644 (file)
index 38c5860..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    [Serializable]\r
-    public class ModelState {\r
-\r
-        private ModelErrorCollection _errors = new ModelErrorCollection();\r
-\r
-        public ValueProviderResult Value {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ModelErrorCollection Errors {\r
-            get {\r
-                return _errors;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelStateDictionary.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ModelStateDictionary.cs
deleted file mode 100644 (file)
index c03ea9d..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-\r
-    [Serializable]\r
-    public class ModelStateDictionary : IDictionary<string, ModelState> {\r
-\r
-        private readonly Dictionary<string, ModelState> _innerDictionary = new Dictionary<string, ModelState>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public ModelStateDictionary() {\r
-        }\r
-\r
-        public ModelStateDictionary(ModelStateDictionary dictionary) {\r
-            if (dictionary == null) {\r
-                throw new ArgumentNullException("dictionary");\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                _innerDictionary.Add(entry.Key, entry.Value);\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public int Count {\r
-            get {\r
-                return _innerDictionary.Count;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((IDictionary<string, ModelState>)_innerDictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        public bool IsValid {\r
-            get {\r
-                return Values.All(modelState => modelState.Errors.Count == 0);\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<string> Keys {\r
-            get {\r
-                return _innerDictionary.Keys;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ModelState this[string key] {\r
-            get {\r
-                ModelState value;\r
-                _innerDictionary.TryGetValue(key, out value);\r
-                return value;\r
-            }\r
-            set {\r
-                _innerDictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<ModelState> Values {\r
-            get {\r
-                return _innerDictionary.Values;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(KeyValuePair<string, ModelState> item) {\r
-            ((IDictionary<string, ModelState>)_innerDictionary).Add(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(string key, ModelState value) {\r
-            _innerDictionary.Add(key, value);\r
-        }\r
-\r
-        public void AddModelError(string key, Exception exception) {\r
-            GetModelStateForKey(key).Errors.Add(exception);\r
-        }\r
-\r
-        public void AddModelError(string key, string errorMessage) {\r
-            GetModelStateForKey(key).Errors.Add(errorMessage);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Clear() {\r
-            _innerDictionary.Clear();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Contains(KeyValuePair<string, ModelState> item) {\r
-            return ((IDictionary<string, ModelState>)_innerDictionary).Contains(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool ContainsKey(string key) {\r
-            return _innerDictionary.ContainsKey(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void CopyTo(KeyValuePair<string, ModelState>[] array, int arrayIndex) {\r
-            ((IDictionary<string, ModelState>)_innerDictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public IEnumerator<KeyValuePair<string, ModelState>> GetEnumerator() {\r
-            return _innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        private ModelState GetModelStateForKey(string key) {\r
-            if (key == null) {\r
-                throw new ArgumentNullException("key");\r
-            }\r
-\r
-            ModelState modelState;\r
-            if (!TryGetValue(key, out modelState)) {\r
-                modelState = new ModelState();\r
-                this[key] = modelState;\r
-            }\r
-\r
-            return modelState;\r
-        }\r
-\r
-        public bool IsValidField(string key) {\r
-            if (key == null) {\r
-                throw new ArgumentNullException("key");\r
-            }\r
-\r
-            // if the key is not found in the dictionary, we just say that it's valid (since there are no errors)\r
-            return DictionaryHelpers.FindKeysWithPrefix(this, key).All(entry => entry.Value.Errors.Count == 0);\r
-        }\r
-\r
-        public void Merge(ModelStateDictionary dictionary) {\r
-            if (dictionary == null) {\r
-                return;\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                this[entry.Key] = entry.Value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(KeyValuePair<string, ModelState> item) {\r
-            return ((IDictionary<string, ModelState>)_innerDictionary).Remove(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(string key) {\r
-            return _innerDictionary.Remove(key);\r
-        }\r
-\r
-        public void SetModelValue(string key, ValueProviderResult value) {\r
-            GetModelStateForKey(key).Value = value;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool TryGetValue(string key, out ModelState value) {\r
-            return _innerDictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)_innerDictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/MultiSelectList.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/MultiSelectList.cs
deleted file mode 100644 (file)
index 6d046b5..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Web.UI;\r
-\r
-    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]\r
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Multi",\r
-        Justification = "Common shorthand for 'multiple'.")]\r
-    public class MultiSelectList : IEnumerable<SelectListItem> {\r
-\r
-        public MultiSelectList(IEnumerable items)\r
-            : this(items, null /* selectedValues */) {\r
-        }\r
-\r
-        public MultiSelectList(IEnumerable items, IEnumerable selectedValues)\r
-            : this(items, null /* dataValuefield */, null /* dataTextField */, selectedValues) {\r
-        }\r
-\r
-        public MultiSelectList(IEnumerable items, string dataValueField, string dataTextField)\r
-            : this(items, dataValueField, dataTextField, null /* selectedValues */) {\r
-        }\r
-\r
-        public MultiSelectList(IEnumerable items, string dataValueField, string dataTextField, IEnumerable selectedValues) {\r
-            if (items == null) {\r
-                throw new ArgumentNullException("items");\r
-            }\r
-\r
-            Items = items;\r
-            DataValueField = dataValueField;\r
-            DataTextField = dataTextField;\r
-            SelectedValues = selectedValues;\r
-        }\r
-\r
-        public string DataTextField {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string DataValueField {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IEnumerable Items {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IEnumerable SelectedValues {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual IEnumerator<SelectListItem> GetEnumerator() {\r
-            return GetListItems().GetEnumerator();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "Operation performs conversions and returns a unique instance on each call.")]\r
-        internal IList<SelectListItem> GetListItems() {\r
-            return (!String.IsNullOrEmpty(DataValueField)) ?\r
-                GetListItemsWithValueField() :\r
-                GetListItemsWithoutValueField();\r
-        }\r
-\r
-        private IList<SelectListItem> GetListItemsWithValueField() {\r
-            HashSet<string> selectedValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-            if (SelectedValues != null) {\r
-                selectedValues.UnionWith(from object value in SelectedValues select Convert.ToString(value, CultureInfo.CurrentCulture));\r
-            }\r
-\r
-            var listItems = from object item in Items\r
-                            let value = Eval(item, DataValueField)\r
-                            select new SelectListItem {\r
-                                Value = value,\r
-                                Text = Eval(item, DataTextField),\r
-                                Selected = selectedValues.Contains(value)\r
-                            };\r
-            return listItems.ToList();\r
-        }\r
-\r
-        private IList<SelectListItem> GetListItemsWithoutValueField() {\r
-            HashSet<object> selectedValues = new HashSet<object>();\r
-            if (SelectedValues != null) {\r
-                selectedValues.UnionWith(SelectedValues.Cast<object>());\r
-            }\r
-\r
-            var listItems = from object item in Items\r
-                            select new SelectListItem {\r
-                                Text = Eval(item, DataTextField),\r
-                                Selected = selectedValues.Contains(item)\r
-                            };\r
-            return listItems.ToList();\r
-        }\r
-\r
-        private static string Eval(object container, string expression) {\r
-            object value = container;\r
-            if (!String.IsNullOrEmpty(expression)) {\r
-                value = DataBinder.Eval(container, expression);\r
-            }\r
-            return Convert.ToString(value, CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return GetEnumerator();\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/MvcHandler.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/MvcHandler.cs
deleted file mode 100644 (file)
index a02846e..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Reflection;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-    using System.Web.SessionState;\r
-\r
-    [SuppressMessage("Microsoft.Security", "CA2112:SecuredTypesShouldNotExposeFields", Justification = "There's nothing secret about the value of this field.")]\r
-    public class MvcHandler : IHttpHandler, IRequiresSessionState {\r
-        private ControllerBuilder _controllerBuilder;\r
-        private static string MvcVersion = GetMvcVersionString();\r
-\r
-        public static readonly string MvcVersionHeaderName = "X-AspNetMvc-Version";\r
-\r
-        public MvcHandler(RequestContext requestContext) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-            RequestContext = requestContext;\r
-        }\r
-\r
-        protected virtual bool IsReusable {\r
-            get {\r
-                return false;\r
-            }\r
-        }\r
-\r
-        internal ControllerBuilder ControllerBuilder {\r
-            get {\r
-                if (_controllerBuilder == null) {\r
-                    _controllerBuilder = ControllerBuilder.Current;\r
-                }\r
-                return _controllerBuilder;\r
-            }\r
-            set {\r
-                _controllerBuilder = value;\r
-            }\r
-        }\r
-\r
-        public static bool DisableMvcResponseHeader {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public RequestContext RequestContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected internal virtual void AddVersionHeader(HttpContextBase httpContext) {\r
-            if (!DisableMvcResponseHeader) {\r
-                httpContext.Response.AppendHeader(MvcVersionHeaderName, MvcVersion);\r
-            }\r
-        }\r
-\r
-        private static string GetMvcVersionString() {\r
-            // DevDiv 216459:\r
-            // This code originally used Assembly.GetName(), but that requires FileIOPermission, which isn't granted in\r
-            // medium trust. However, Assembly.FullName *is* accessible in medium trust.\r
-            return new AssemblyName(typeof(MvcHandler).Assembly.FullName).Version.ToString(2);\r
-        }\r
-\r
-        protected virtual void ProcessRequest(HttpContext httpContext) {\r
-            HttpContextBase iHttpContext = new HttpContextWrapper(httpContext);\r
-            ProcessRequest(iHttpContext);\r
-        }\r
-\r
-        protected internal virtual void ProcessRequest(HttpContextBase httpContext) {\r
-            AddVersionHeader(httpContext);\r
-\r
-            // Get the controller type\r
-            string controllerName = RequestContext.RouteData.GetRequiredString("controller");\r
-\r
-            // Instantiate the controller and call Execute\r
-            IControllerFactory factory = ControllerBuilder.GetControllerFactory();\r
-            IController controller = factory.CreateController(RequestContext, controllerName);\r
-            if (controller == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ControllerBuilder_FactoryReturnedNull,\r
-                        factory.GetType(),\r
-                        controllerName));\r
-            }\r
-            try {\r
-                controller.Execute(RequestContext);\r
-            }\r
-            finally {\r
-                factory.ReleaseController(controller);\r
-            }\r
-        }\r
-\r
-        #region IHttpHandler Members\r
-        bool IHttpHandler.IsReusable {\r
-            get {\r
-                return IsReusable;\r
-            }\r
-        }\r
-\r
-        void IHttpHandler.ProcessRequest(HttpContext httpContext) {\r
-            ProcessRequest(httpContext);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/MvcHttpHandler.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/MvcHttpHandler.cs
deleted file mode 100644 (file)
index 25f7d7b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-    using System.Web.SessionState;\r
-\r
-    public class MvcHttpHandler : UrlRoutingHandler, IRequiresSessionState {\r
-\r
-        protected override void VerifyAndProcessRequest(IHttpHandler httpHandler, HttpContextBase httpContext) {\r
-            if (httpHandler == null) {\r
-                throw new ArgumentNullException("httpHandler");\r
-            }\r
-\r
-            httpHandler.ProcessRequest(HttpContext.Current);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/MvcRouteHandler.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/MvcRouteHandler.cs
deleted file mode 100644 (file)
index 5d2bbaa..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public class MvcRouteHandler : IRouteHandler {\r
-        protected virtual IHttpHandler GetHttpHandler(RequestContext requestContext) {\r
-            return new MvcHandler(requestContext);\r
-        }\r
-\r
-        #region IRouteHandler Members\r
-        IHttpHandler IRouteHandler.GetHttpHandler(RequestContext requestContext) {\r
-            return GetHttpHandler(requestContext);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/NameValueCollectionExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/NameValueCollectionExtensions.cs
deleted file mode 100644 (file)
index 7faf9f0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.Specialized;\r
-\r
-    public static class NameValueCollectionExtensions {\r
-\r
-        public static void CopyTo(this NameValueCollection collection, IDictionary<string, object> destination) {\r
-            CopyTo(collection, destination, false /* replaceEntries */);\r
-        }\r
-\r
-        public static void CopyTo(this NameValueCollection collection, IDictionary<string, object> destination, bool replaceEntries) {\r
-            if (collection == null) {\r
-                throw new ArgumentNullException("collection");\r
-            }\r
-            if (destination == null) {\r
-                throw new ArgumentNullException("destination");\r
-            }\r
-\r
-            foreach (string key in collection.Keys) {\r
-                if (replaceEntries || !destination.ContainsKey(key)) {\r
-                    destination[key] = collection[key];\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/NonActionAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/NonActionAttribute.cs
deleted file mode 100644 (file)
index c50ef63..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Reflection;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class NonActionAttribute : ActionMethodSelectorAttribute {\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            return false;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/NullViewLocationCache.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/NullViewLocationCache.cs
deleted file mode 100644 (file)
index dbfc9ae..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Text;\r
-\r
-    internal sealed class NullViewLocationCache : IViewLocationCache {\r
-\r
-        #region IViewLocationCache Members\r
-        public string GetViewLocation(HttpContextBase httpContext, string key) {\r
-            return null;\r
-        }\r
-\r
-        public void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath) {\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/OutputCacheAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/OutputCacheAttribute.cs
deleted file mode 100644 (file)
index 7966479..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web;\r
-    using System.Web.UI;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "Unsealed so that subclassed types can set properties in the default constructor.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public class OutputCacheAttribute : ActionFilterAttribute {\r
-\r
-        private OutputCacheParameters _cacheSettings = new OutputCacheParameters();\r
-\r
-        public string CacheProfile {\r
-            get {\r
-                return _cacheSettings.CacheProfile ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.CacheProfile = value;\r
-            }\r
-        }\r
-\r
-        internal OutputCacheParameters CacheSettings {\r
-            get {\r
-                return _cacheSettings;\r
-            }\r
-        }\r
-\r
-        public int Duration {\r
-            get {\r
-                return _cacheSettings.Duration;\r
-            }\r
-            set {\r
-                _cacheSettings.Duration = value;\r
-            }\r
-        }\r
-\r
-        public OutputCacheLocation Location {\r
-            get {\r
-                return _cacheSettings.Location;\r
-            }\r
-            set {\r
-                _cacheSettings.Location = value;\r
-            }\r
-        }\r
-\r
-        public bool NoStore {\r
-            get {\r
-                return _cacheSettings.NoStore;\r
-            }\r
-            set {\r
-                _cacheSettings.NoStore = value;\r
-            }\r
-        }\r
-\r
-        public string SqlDependency {\r
-            get {\r
-                return _cacheSettings.SqlDependency ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.SqlDependency = value;\r
-            }\r
-        }\r
-\r
-        public string VaryByContentEncoding {\r
-            get {\r
-                return _cacheSettings.VaryByContentEncoding ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByContentEncoding = value;\r
-            }\r
-        }\r
-\r
-        public string VaryByCustom {\r
-            get {\r
-                return _cacheSettings.VaryByCustom ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByCustom = value;\r
-            }\r
-        }\r
-\r
-        public string VaryByHeader {\r
-            get {\r
-                return _cacheSettings.VaryByHeader ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByHeader = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Param",\r
-            Justification = "Matches the @ OutputCache page directive.")]\r
-        public string VaryByParam {\r
-            get {\r
-                return _cacheSettings.VaryByParam ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByParam = value;\r
-            }\r
-        }\r
-\r
-        public override void OnResultExecuting(ResultExecutingContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            // we need to call ProcessRequest() since there's no other way to set the Page.Response intrinsic\r
-            OutputCachedPage page = new OutputCachedPage(_cacheSettings);\r
-            page.ProcessRequest(HttpContext.Current);\r
-        }\r
-\r
-        private sealed class OutputCachedPage : Page {\r
-            private OutputCacheParameters _cacheSettings;\r
-\r
-            public OutputCachedPage(OutputCacheParameters cacheSettings) {\r
-                // Tracing requires Page IDs to be unique.\r
-                ID = Guid.NewGuid().ToString();\r
-                _cacheSettings = cacheSettings;\r
-            }\r
-\r
-            protected override void FrameworkInitialize() {\r
-                // when you put the <%@ OutputCache %> directive on a page, the generated code calls InitOutputCache() from here\r
-                base.FrameworkInitialize();\r
-                InitOutputCache(_cacheSettings);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ParameterBindingInfo.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ParameterBindingInfo.cs
deleted file mode 100644 (file)
index 09334b8..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public abstract class ParameterBindingInfo {\r
-\r
-        public virtual IModelBinder Binder {\r
-            get {\r
-                return null;\r
-            }\r
-        }\r
-\r
-        public virtual ICollection<string> Exclude {\r
-            get {\r
-                return new string[0];\r
-            }\r
-        }\r
-\r
-        public virtual ICollection<string> Include {\r
-            get {\r
-                return new string[0];\r
-            }\r
-        }\r
-\r
-        public virtual string Prefix {\r
-            get {\r
-                return null;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ParameterDescriptor.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ParameterDescriptor.cs
deleted file mode 100644 (file)
index e600f91..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Reflection;\r
-\r
-    public abstract class ParameterDescriptor : ICustomAttributeProvider {\r
-\r
-        private static readonly EmptyParameterBindingInfo _emptyBindingInfo = new EmptyParameterBindingInfo();\r
-\r
-        public abstract ActionDescriptor ActionDescriptor {\r
-            get;\r
-        }\r
-\r
-        public virtual ParameterBindingInfo BindingInfo {\r
-            get {\r
-                return _emptyBindingInfo;\r
-            }\r
-        }\r
-\r
-        public abstract string ParameterName {\r
-            get;\r
-        }\r
-\r
-        public abstract Type ParameterType {\r
-            get;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual object[] GetCustomAttributes(bool inherit) {\r
-            return GetCustomAttributes(typeof(object), inherit);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return (object[])Array.CreateInstance(attributeType, 0);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public virtual bool IsDefined(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-        private sealed class EmptyParameterBindingInfo : ParameterBindingInfo {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/PartialViewResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/PartialViewResult.cs
deleted file mode 100644 (file)
index 86f9fb1..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class PartialViewResult : ViewResultBase {\r
-\r
-        protected override ViewEngineResult FindView(ControllerContext context) {\r
-            ViewEngineResult result = ViewEngineCollection.FindPartialView(context, ViewName);\r
-            if (result.View != null) {\r
-                return result;\r
-            }\r
-\r
-            // we need to generate an exception containing all the locations we searched\r
-            StringBuilder locationsText = new StringBuilder();\r
-            foreach (string location in result.SearchedLocations) {\r
-                locationsText.AppendLine();\r
-                locationsText.Append(location);\r
-            }\r
-            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Common_PartialViewNotFound, ViewName, locationsText));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/PathHelpers.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/PathHelpers.cs
deleted file mode 100644 (file)
index cb5be74..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Specialized;\r
-    using System.Web;\r
-\r
-    internal static class PathHelpers {\r
-\r
-        private const string _urlRewriterServerVar = "HTTP_X_ORIGINAL_URL";\r
-\r
-        // this method can accept an app-relative path or an absolute path for contentPath\r
-        public static string GenerateClientUrl(HttpContextBase httpContext, string contentPath) {\r
-            if (String.IsNullOrEmpty(contentPath)) {\r
-                return contentPath;\r
-            }\r
-\r
-            // many of the methods we call internally can't handle query strings properly, so just strip it out for\r
-            // the time being\r
-            string query;\r
-            contentPath = StripQuery(contentPath, out query);\r
-\r
-            return GenerateClientUrlInternal(httpContext, contentPath) + query;\r
-        }\r
-\r
-        private static string GenerateClientUrlInternal(HttpContextBase httpContext, string contentPath) {\r
-            if (String.IsNullOrEmpty(contentPath)) {\r
-                return contentPath;\r
-            }\r
-\r
-            // can't call VirtualPathUtility.IsAppRelative since it throws on some inputs\r
-            bool isAppRelative = contentPath[0] == '~';\r
-            if (isAppRelative) {\r
-                string absoluteContentPath = VirtualPathUtility.ToAbsolute(contentPath, httpContext.Request.ApplicationPath);\r
-                string modifiedAbsoluteContentPath = httpContext.Response.ApplyAppPathModifier(absoluteContentPath);\r
-                return GenerateClientUrlInternal(httpContext, modifiedAbsoluteContentPath);\r
-            }\r
-\r
-            // we only want to manipulate the path if URL rewriting is active, else we risk breaking the generated URL\r
-            NameValueCollection serverVars = httpContext.Request.ServerVariables;\r
-            bool urlRewriterIsEnabled = (serverVars != null && serverVars[_urlRewriterServerVar] != null);\r
-            if (!urlRewriterIsEnabled) {\r
-                return contentPath;\r
-            }\r
-\r
-            // Since the rawUrl represents what the user sees in his browser, it is what we want to use as the base\r
-            // of our absolute paths. For example, consider mysite.example.com/foo, which is internally\r
-            // rewritten to content.example.com/mysite/foo. When we want to generate a link to ~/bar, we want to\r
-            // base it from / instead of /foo, otherwise the user ends up seeing mysite.example.com/foo/bar,\r
-            // which is incorrect.\r
-            string relativeUrlToDestination = MakeRelative(httpContext.Request.Path, contentPath);\r
-            string absoluteUrlToDestination = MakeAbsolute(httpContext.Request.RawUrl, relativeUrlToDestination);\r
-            return absoluteUrlToDestination;\r
-        }\r
-\r
-        public static string MakeAbsolute(string basePath, string relativePath) {\r
-            // The Combine() method can't handle query strings on the base path, so we trim it off.\r
-            string query;\r
-            basePath = StripQuery(basePath, out query);\r
-            return VirtualPathUtility.Combine(basePath, relativePath);\r
-        }\r
-\r
-        public static string MakeRelative(string fromPath, string toPath) {\r
-            string relativeUrl = VirtualPathUtility.MakeRelative(fromPath, toPath);\r
-            if (String.IsNullOrEmpty(relativeUrl) || relativeUrl[0] == '?') {\r
-                // Sometimes VirtualPathUtility.MakeRelative() will return an empty string when it meant to return '.',\r
-                // but links to {empty string} are browser dependent. We replace it with an explicit path to force\r
-                // consistency across browsers.\r
-                relativeUrl = "./" + relativeUrl;\r
-            }\r
-            return relativeUrl;\r
-        }\r
-\r
-        private static string StripQuery(string path, out string query) {\r
-            int queryIndex = path.IndexOf('?');\r
-            if (queryIndex >= 0) {\r
-                query = path.Substring(queryIndex);\r
-                return path.Substring(0, queryIndex);\r
-            }\r
-            else {\r
-                query = null;\r
-                return path;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ReaderWriterCache`2.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ReaderWriterCache`2.cs
deleted file mode 100644 (file)
index faf4fda..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Threading;\r
-\r
-    internal abstract class ReaderWriterCache<TKey, TValue> {\r
-\r
-        private readonly Dictionary<TKey, TValue> _cache;\r
-        private readonly ReaderWriterLock _rwLock = new ReaderWriterLock();\r
-\r
-        protected ReaderWriterCache()\r
-            : this(null) {\r
-        }\r
-\r
-        protected ReaderWriterCache(IEqualityComparer<TKey> comparer) {\r
-            _cache = new Dictionary<TKey, TValue>(comparer);\r
-        }\r
-\r
-        protected Dictionary<TKey, TValue> Cache {\r
-            get {\r
-                return _cache;\r
-            }\r
-        }\r
-\r
-        protected TValue FetchOrCreateItem(TKey key, Func<TValue> creator) {\r
-            // first, see if the item already exists in the cache\r
-            _rwLock.AcquireReaderLock(Timeout.Infinite);\r
-            try {\r
-                TValue existingEntry;\r
-                if (_cache.TryGetValue(key, out existingEntry)) {\r
-                    return existingEntry;\r
-                }\r
-            }\r
-            finally {\r
-                _rwLock.ReleaseReaderLock();\r
-            }\r
-\r
-            // insert the new item into the cache\r
-            TValue newEntry = creator();\r
-            _rwLock.AcquireWriterLock(Timeout.Infinite);\r
-            try {\r
-                TValue existingEntry;\r
-                if (_cache.TryGetValue(key, out existingEntry)) {\r
-                    // another thread already inserted an item, so use that one\r
-                    return existingEntry;\r
-                }\r
-\r
-                _cache[key] = newEntry;\r
-                return newEntry;\r
-            }\r
-            finally {\r
-                _rwLock.ReleaseWriterLock();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/RedirectResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/RedirectResult.cs
deleted file mode 100644 (file)
index d6038fb..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    // represents a result that performs a redirection given some URI\r
-    public class RedirectResult : ActionResult {\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "0#",\r
-            Justification = "Response.Redirect() takes its URI as a string parameter.")]\r
-        public RedirectResult(string url) {\r
-            if (String.IsNullOrEmpty(url)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "url");\r
-            }\r
-\r
-            Url = url;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings",\r
-            Justification = "Response.Redirect() takes its URI as a string parameter.")]\r
-        public string Url {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            string destinationUrl = UrlHelper.Content(Url, context.HttpContext);\r
-            context.HttpContext.Response.Redirect(destinationUrl, false /* endResponse */);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/RedirectToRouteResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/RedirectToRouteResult.cs
deleted file mode 100644 (file)
index aa8f3d9..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    // represents a result that performs a redirection given some values dictionary\r
-    public class RedirectToRouteResult : ActionResult {\r
-\r
-        private RouteCollection _routes;\r
-\r
-        public RedirectToRouteResult(RouteValueDictionary routeValues) :\r
-            this(null, routeValues) {\r
-        }\r
-\r
-        public RedirectToRouteResult(string routeName, RouteValueDictionary routeValues) {\r
-            RouteName = routeName ?? String.Empty;\r
-            RouteValues = routeValues ?? new RouteValueDictionary();\r
-        }\r
-\r
-        public string RouteName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public RouteValueDictionary RouteValues {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal RouteCollection Routes {\r
-            get {\r
-                if (_routes == null) {\r
-                    _routes = RouteTable.Routes;\r
-                }\r
-                return _routes;\r
-            }\r
-            set {\r
-                _routes = value;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            string destinationUrl = UrlHelper.GenerateUrl(RouteName, null /* actionName */, null /* controllerName */, RouteValues, Routes, context.RequestContext, false /* includeImplicitMvcValues */);\r
-            if (String.IsNullOrEmpty(destinationUrl)) {\r
-                throw new InvalidOperationException(MvcResources.ActionRedirectResult_NoRouteMatched);\r
-            }\r
-\r
-            context.HttpContext.Response.Redirect(destinationUrl, false /* endResponse */);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedActionDescriptor.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedActionDescriptor.cs
deleted file mode 100644 (file)
index c8282d9..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ReflectedActionDescriptor : ActionDescriptor {\r
-\r
-        private readonly static ActionMethodDispatcherCache _staticDispatcherCache = new ActionMethodDispatcherCache();\r
-        private ActionMethodDispatcherCache _instanceDispatcherCache;\r
-\r
-        private readonly string _actionName;\r
-        private readonly ControllerDescriptor _controllerDescriptor;\r
-        private ParameterDescriptor[] _parametersCache;\r
-\r
-        public ReflectedActionDescriptor(MethodInfo methodInfo, string actionName, ControllerDescriptor controllerDescriptor)\r
-            : this(methodInfo, actionName, controllerDescriptor, true /* validateMethod */) {\r
-        }\r
-\r
-        internal ReflectedActionDescriptor(MethodInfo methodInfo, string actionName, ControllerDescriptor controllerDescriptor, bool validateMethod) {\r
-            if (methodInfo == null) {\r
-                throw new ArgumentNullException("methodInfo");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-            if (controllerDescriptor == null) {\r
-                throw new ArgumentNullException("controllerDescriptor");\r
-            }\r
-\r
-            if (validateMethod) {\r
-                string failedMessage = VerifyActionMethodIsCallable(methodInfo);\r
-                if (failedMessage != null) {\r
-                    throw new ArgumentException(failedMessage, "methodInfo");\r
-                }\r
-            }\r
-\r
-            MethodInfo = methodInfo;\r
-            _actionName = actionName;\r
-            _controllerDescriptor = controllerDescriptor;\r
-        }\r
-\r
-        public override string ActionName {\r
-            get {\r
-                return _actionName;\r
-            }\r
-        }\r
-\r
-        public override ControllerDescriptor ControllerDescriptor {\r
-            get {\r
-                return _controllerDescriptor;\r
-            }\r
-        }\r
-\r
-        internal ActionMethodDispatcherCache DispatcherCache {\r
-            get {\r
-                if (_instanceDispatcherCache == null) {\r
-                    _instanceDispatcherCache = _staticDispatcherCache;\r
-                }\r
-                return _instanceDispatcherCache;\r
-            }\r
-            set {\r
-                _instanceDispatcherCache = value;\r
-            }\r
-        }\r
-\r
-        public MethodInfo MethodInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override object Execute(ControllerContext controllerContext, IDictionary<string, object> parameters) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (parameters == null) {\r
-                throw new ArgumentNullException("parameters");\r
-            }\r
-\r
-            ParameterInfo[] parameterInfos = MethodInfo.GetParameters();\r
-            var rawParameterValues = from parameterInfo in parameterInfos\r
-                                     select ExtractParameterFromDictionary(parameterInfo, parameters, MethodInfo);\r
-            object[] parametersArray = rawParameterValues.ToArray();\r
-\r
-            ActionMethodDispatcher dispatcher = DispatcherCache.GetDispatcher(MethodInfo);\r
-            object actionReturnValue = dispatcher.Execute(controllerContext.Controller, parametersArray);\r
-            return actionReturnValue;\r
-        }\r
-\r
-        private static object ExtractParameterFromDictionary(ParameterInfo parameterInfo, IDictionary<string, object> parameters, MethodInfo methodInfo) {\r
-            object value;\r
-\r
-            if (!parameters.TryGetValue(parameterInfo.Name, out value)) {\r
-                // the key should always be present, even if the parameter value is null\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_ParameterNotInDictionary,\r
-                    parameterInfo.Name, parameterInfo.ParameterType, methodInfo, methodInfo.DeclaringType);\r
-                throw new ArgumentException(message, "parameters");\r
-            }\r
-\r
-            if (value == null && !TypeHelpers.TypeAllowsNullValue(parameterInfo.ParameterType)) {\r
-                // tried to pass a null value for a non-nullable parameter type\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_ParameterCannotBeNull,\r
-                    parameterInfo.Name, parameterInfo.ParameterType, methodInfo, methodInfo.DeclaringType);\r
-                throw new ArgumentException(message, "parameters");\r
-            }\r
-\r
-            if (value != null && !parameterInfo.ParameterType.IsInstanceOfType(value)) {\r
-                // value was supplied but is not of the proper type\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_ParameterValueHasWrongType,\r
-                    parameterInfo.Name, methodInfo, methodInfo.DeclaringType, value.GetType(), parameterInfo.ParameterType);\r
-                throw new ArgumentException(message, "parameters");\r
-            }\r
-\r
-            return value;\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return MethodInfo.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return MethodInfo.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override FilterInfo GetFilters() {\r
-            // Enumerable.OrderBy() is a stable sort, so this method preserves scope ordering.\r
-            FilterAttribute[] typeFilters = (FilterAttribute[])MethodInfo.ReflectedType.GetCustomAttributes(typeof(FilterAttribute), true /* inherit */);\r
-            FilterAttribute[] methodFilters = (FilterAttribute[])MethodInfo.GetCustomAttributes(typeof(FilterAttribute), true /* inherit */);\r
-            List<FilterAttribute> orderedFilters = typeFilters.Concat(methodFilters).OrderBy(attr => attr.Order).ToList();\r
-\r
-            FilterInfo filterInfo = new FilterInfo();\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.ActionFilters);\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.AuthorizationFilters);\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.ExceptionFilters);\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.ResultFilters);\r
-            return filterInfo;\r
-        }\r
-\r
-        public override ParameterDescriptor[] GetParameters() {\r
-            ParameterDescriptor[] parameters = LazilyFetchParametersCollection();\r
-\r
-            // need to clone array so that user modifications aren't accidentally stored\r
-            return (ParameterDescriptor[])parameters.Clone();\r
-        }\r
-\r
-        public override ICollection<ActionSelector> GetSelectors() {\r
-            ActionMethodSelectorAttribute[] attrs = (ActionMethodSelectorAttribute[])MethodInfo.GetCustomAttributes(typeof(ActionMethodSelectorAttribute), true /* inherit */);\r
-            ActionSelector[] selectors = Array.ConvertAll(attrs, attr => (ActionSelector)(controllerContext => attr.IsValidForRequest(controllerContext, MethodInfo)));\r
-            return selectors;\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return MethodInfo.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-        private ParameterDescriptor[] LazilyFetchParametersCollection() {\r
-            return DescriptorUtil.LazilyFetchOrCreateDescriptors<ParameterInfo, ParameterDescriptor>(\r
-                ref _parametersCache /* cacheLocation */,\r
-                MethodInfo.GetParameters /* initializer */,\r
-                parameterInfo => new ReflectedParameterDescriptor(parameterInfo, this) /* converter */);\r
-        }\r
-\r
-        private static void MergeFiltersIntoList<TFilter>(IList<FilterAttribute> allFilters, IList<TFilter> destFilters) where TFilter : class {\r
-            foreach (FilterAttribute filter in allFilters) {\r
-                TFilter castFilter = filter as TFilter;\r
-                if (castFilter != null) {\r
-                    destFilters.Add(castFilter);\r
-                }\r
-            }\r
-        }\r
-\r
-        internal static ReflectedActionDescriptor TryCreateDescriptor(MethodInfo methodInfo, string name, ControllerDescriptor controllerDescriptor) {\r
-            ReflectedActionDescriptor descriptor = new ReflectedActionDescriptor(methodInfo, name, controllerDescriptor, false /* validateMethod */);\r
-            string failedMessage = VerifyActionMethodIsCallable(methodInfo);\r
-            return (failedMessage == null) ? descriptor : null;\r
-        }\r
-\r
-        private static string VerifyActionMethodIsCallable(MethodInfo methodInfo) {\r
-            // we can't call instance methods where the 'this' parameter is a type other than ControllerBase\r
-            if (!methodInfo.IsStatic && !typeof(ControllerBase).IsAssignableFrom(methodInfo.ReflectedType)) {\r
-                return String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType,\r
-                    methodInfo, methodInfo.ReflectedType.FullName);\r
-            }\r
-\r
-            // we can't call methods with open generic type parameters\r
-            if (methodInfo.ContainsGenericParameters) {\r
-                return String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_CannotCallOpenGenericMethods,\r
-                    methodInfo, methodInfo.ReflectedType.FullName);\r
-            }\r
-\r
-            // we can't call methods with ref/out parameters\r
-            ParameterInfo[] parameterInfos = methodInfo.GetParameters();\r
-            foreach (ParameterInfo parameterInfo in parameterInfos) {\r
-                if (parameterInfo.IsOut || parameterInfo.ParameterType.IsByRef) {\r
-                    return String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters,\r
-                        methodInfo, methodInfo.ReflectedType.FullName, parameterInfo);\r
-                }\r
-            }\r
-\r
-            // we can call this method\r
-            return null;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedControllerDescriptor.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedControllerDescriptor.cs
deleted file mode 100644 (file)
index 990f136..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ReflectedControllerDescriptor : ControllerDescriptor {\r
-\r
-        private ActionDescriptor[] _canonicalActionsCache;\r
-        private readonly Type _controllerType;\r
-        private readonly ActionMethodSelector _selector;\r
-\r
-        public ReflectedControllerDescriptor(Type controllerType) {\r
-            if (controllerType == null) {\r
-                throw new ArgumentNullException("controllerType");\r
-            }\r
-\r
-            _controllerType = controllerType;\r
-            _selector = new ActionMethodSelector(_controllerType);\r
-        }\r
-\r
-        public sealed override Type ControllerType {\r
-            get {\r
-                return _controllerType;\r
-            }\r
-        }\r
-\r
-        public override ActionDescriptor FindAction(ControllerContext controllerContext, string actionName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-\r
-            MethodInfo matched = _selector.FindActionMethod(controllerContext, actionName);\r
-            if (matched == null) {\r
-                return null;\r
-            }\r
-\r
-            return new ReflectedActionDescriptor(matched, actionName, this);\r
-        }\r
-\r
-        private MethodInfo[] GetAllActionMethodsFromSelector() {\r
-            List<MethodInfo> allValidMethods = new List<MethodInfo>();\r
-            allValidMethods.AddRange(_selector.AliasedMethods);\r
-            allValidMethods.AddRange(_selector.NonAliasedMethods.SelectMany(g => g));\r
-            return allValidMethods.ToArray();\r
-        }\r
-\r
-        public override ActionDescriptor[] GetCanonicalActions() {\r
-            ActionDescriptor[] actions = LazilyFetchCanonicalActionsCollection();\r
-\r
-            // need to clone array so that user modifications aren't accidentally stored\r
-            return (ActionDescriptor[])actions.Clone();\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return ControllerType.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return ControllerType.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return ControllerType.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-        private ActionDescriptor[] LazilyFetchCanonicalActionsCollection() {\r
-            return DescriptorUtil.LazilyFetchOrCreateDescriptors<MethodInfo, ActionDescriptor>(\r
-                ref _canonicalActionsCache /* cacheLocation */,\r
-                GetAllActionMethodsFromSelector /* initializer */,\r
-                methodInfo => ReflectedActionDescriptor.TryCreateDescriptor(methodInfo, methodInfo.Name, this) /* converter */);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedParameterBindingInfo.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedParameterBindingInfo.cs
deleted file mode 100644 (file)
index 0281765..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Globalization;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    internal class ReflectedParameterBindingInfo : ParameterBindingInfo {\r
-\r
-        private ICollection<string> _exclude = new string[0];\r
-        private ICollection<string> _include = new string[0];\r
-        private readonly ParameterInfo _parameterInfo;\r
-        private string _prefix;\r
-\r
-        public ReflectedParameterBindingInfo(ParameterInfo parameterInfo) {\r
-            _parameterInfo = parameterInfo;\r
-            ReadSettingsFromBindAttribute();\r
-        }\r
-\r
-        public override IModelBinder Binder {\r
-            get {\r
-                IModelBinder binder = ModelBinders.GetBinderFromAttributes(_parameterInfo,\r
-                    () => String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedParameterBindingInfo_MultipleConverterAttributes,\r
-                        _parameterInfo.Name, _parameterInfo.Member));\r
-\r
-                return binder;\r
-            }\r
-        }\r
-\r
-        public override ICollection<string> Exclude {\r
-            get {\r
-                return _exclude;\r
-            }\r
-        }\r
-\r
-        public override ICollection<string> Include {\r
-            get {\r
-                return _include;\r
-            }\r
-        }\r
-\r
-        public override string Prefix {\r
-            get {\r
-                return _prefix;\r
-            }\r
-        }\r
-\r
-        private void ReadSettingsFromBindAttribute() {\r
-            BindAttribute attr = (BindAttribute)Attribute.GetCustomAttribute(_parameterInfo, typeof(BindAttribute));\r
-            if (attr == null) {\r
-                return;\r
-            }\r
-\r
-            _exclude = new ReadOnlyCollection<string>(AuthorizeAttribute.SplitString(attr.Exclude));\r
-            _include = new ReadOnlyCollection<string>(AuthorizeAttribute.SplitString(attr.Include));\r
-            _prefix = attr.Prefix;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedParameterDescriptor.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ReflectedParameterDescriptor.cs
deleted file mode 100644 (file)
index 7eec02f..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    public class ReflectedParameterDescriptor : ParameterDescriptor {\r
-\r
-        private readonly ActionDescriptor _actionDescriptor;\r
-        private readonly ReflectedParameterBindingInfo _bindingInfo;\r
-\r
-        public ReflectedParameterDescriptor(ParameterInfo parameterInfo, ActionDescriptor actionDescriptor) {\r
-            if (parameterInfo == null) {\r
-                throw new ArgumentNullException("parameterInfo");\r
-            }\r
-            if (actionDescriptor == null) {\r
-                throw new ArgumentNullException("actionDescriptor");\r
-            }\r
-\r
-            ParameterInfo = parameterInfo;\r
-            _actionDescriptor = actionDescriptor;\r
-            _bindingInfo = new ReflectedParameterBindingInfo(parameterInfo);\r
-        }\r
-\r
-        public override ActionDescriptor ActionDescriptor {\r
-            get {\r
-                return _actionDescriptor;\r
-            }\r
-        }\r
-\r
-        public override ParameterBindingInfo BindingInfo {\r
-            get {\r
-                return _bindingInfo;\r
-            }\r
-        }\r
-\r
-        public ParameterInfo ParameterInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override string ParameterName {\r
-            get {\r
-                return ParameterInfo.Name;\r
-            }\r
-        }\r
-\r
-        public override Type ParameterType {\r
-            get {\r
-                return ParameterInfo.ParameterType;\r
-            }\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return ParameterInfo.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return ParameterInfo.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return ParameterInfo.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/.gitattributes b/mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/.gitattributes
deleted file mode 100644 (file)
index 7ab7b27..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MvcResources.Designer.cs -crlf
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/MvcResources.Designer.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/MvcResources.Designer.cs
deleted file mode 100644 (file)
index a26d952..0000000
+++ /dev/null
@@ -1,477 +0,0 @@
-//------------------------------------------------------------------------------\r
-// <auto-generated>\r
-//     This code was generated by a tool.\r
-//     Runtime Version:2.0.50727.3053\r
-//\r
-//     Changes to this file may cause incorrect behavior and will be lost if\r
-//     the code is regenerated.\r
-// </auto-generated>\r
-//------------------------------------------------------------------------------\r
-\r
-namespace System.Web.Mvc.Resources {\r
-    using System;\r
-    \r
-    \r
-    /// <summary>\r
-    ///   A strongly-typed resource class, for looking up localized strings, etc.\r
-    /// </summary>\r
-    // This class was auto-generated by the StronglyTypedResourceBuilder\r
-    // class via a tool like ResGen or Visual Studio.\r
-    // To add or remove a member, edit your .ResX file then rerun ResGen\r
-    // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]\r
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    internal class MvcResources {\r
-        \r
-        private static global::System.Resources.ResourceManager resourceMan;\r
-        \r
-        private static global::System.Globalization.CultureInfo resourceCulture;\r
-        \r
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]\r
-        internal MvcResources() {\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Returns the cached ResourceManager instance used by this class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Resources.ResourceManager ResourceManager {\r
-            get {\r
-                if (object.ReferenceEquals(resourceMan, null)) {\r
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Web.Mvc.Resources.MvcResources", typeof(MvcResources).Assembly);\r
-                    resourceMan = temp;\r
-                }\r
-                return resourceMan;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Overrides the current thread's CurrentUICulture property for all\r
-        ///   resource lookups using this strongly typed resource class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Globalization.CultureInfo Culture {\r
-            get {\r
-                return resourceCulture;\r
-            }\r
-            set {\r
-                resourceCulture = value;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The current request for action &apos;{0}&apos; on controller type &apos;{1}&apos; is ambiguous between the following action methods:{2}.\r
-        /// </summary>\r
-        internal static string ActionMethodSelector_AmbiguousMatch {\r
-            get {\r
-                return ResourceManager.GetString("ActionMethodSelector_AmbiguousMatch", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to {0} on type {1}.\r
-        /// </summary>\r
-        internal static string ActionMethodSelector_AmbiguousMatchType {\r
-            get {\r
-                return ResourceManager.GetString("ActionMethodSelector_AmbiguousMatchType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to No route in the route table matches the supplied values..\r
-        /// </summary>\r
-        internal static string ActionRedirectResult_NoRouteMatched {\r
-            get {\r
-                return ResourceManager.GetString("ActionRedirectResult_NoRouteMatched", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A required anti-forgery token was not supplied or was invalid..\r
-        /// </summary>\r
-        internal static string AntiForgeryToken_ValidationFailed {\r
-            get {\r
-                return ResourceManager.GetString("AntiForgeryToken_ValidationFailed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value &apos;{0}&apos; is outside the valid range of the enumeration type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string Common_InvalidEnumValue {\r
-            get {\r
-                return ResourceManager.GetString("Common_InvalidEnumValue", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Value cannot be null or empty..\r
-        /// </summary>\r
-        internal static string Common_NullOrEmpty {\r
-            get {\r
-                return ResourceManager.GetString("Common_NullOrEmpty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The partial view &apos;{0}&apos; could not be found. The following locations were searched:{1}.\r
-        /// </summary>\r
-        internal static string Common_PartialViewNotFound {\r
-            get {\r
-                return ResourceManager.GetString("Common_PartialViewNotFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The property &apos;{0}&apos; cannot be null or empty..\r
-        /// </summary>\r
-        internal static string Common_PropertyCannotBeNullOrEmpty {\r
-            get {\r
-                return ResourceManager.GetString("Common_PropertyCannotBeNullOrEmpty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value &apos;{0}&apos; is invalid..\r
-        /// </summary>\r
-        internal static string Common_ValueNotValidForProperty {\r
-            get {\r
-                return ResourceManager.GetString("Common_ValueNotValidForProperty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The view &apos;{0}&apos; or its master could not be found. The following locations were searched:{1}.\r
-        /// </summary>\r
-        internal static string Common_ViewNotFound {\r
-            get {\r
-                return ResourceManager.GetString("Common_ViewNotFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A public action method &apos;{0}&apos; could not be found on controller &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string Controller_UnknownAction {\r
-            get {\r
-                return ResourceManager.GetString("Controller_UnknownAction", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The model of type &apos;{0}&apos; was not successfully updated..\r
-        /// </summary>\r
-        internal static string Controller_UpdateModel_UpdateUnsuccessful {\r
-            get {\r
-                return ResourceManager.GetString("Controller_UpdateModel_UpdateUnsuccessful", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to There was an error creating the IControllerFactory &apos;{0}&apos;. Check that it has a public parameterless constructor..\r
-        /// </summary>\r
-        internal static string ControllerBuilder_ErrorCreatingControllerFactory {\r
-            get {\r
-                return ResourceManager.GetString("ControllerBuilder_ErrorCreatingControllerFactory", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The IControllerFactory &apos;{0}&apos; did not return a controller for a controller named &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ControllerBuilder_FactoryReturnedNull {\r
-            get {\r
-                return ResourceManager.GetString("ControllerBuilder_FactoryReturnedNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller factory type &apos;{0}&apos; must implement the IControllerFactory interface..\r
-        /// </summary>\r
-        internal static string ControllerBuilder_MissingIControllerFactory {\r
-            get {\r
-                return ResourceManager.GetString("ControllerBuilder_MissingIControllerFactory", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller name &apos;{0}&apos; is ambiguous between the following types:{1}.\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_ControllerNameAmbiguous {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_ControllerNameAmbiguous", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An error occurred while creating a controller of type &apos;{0}&apos;. If the controller doesn&apos;t have a controller factory, ensure that it has a parameterless public constructor..\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_ErrorCreatingController {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_ErrorCreatingController", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller for path &apos;{0}&apos; could not be found or it does not implement IController..\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_NoControllerFound {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_NoControllerFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller type &apos;{0}&apos; must implement IController..\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_TypeDoesNotSubclassControllerBase {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_TypeDoesNotSubclassControllerBase", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A value is required..\r
-        /// </summary>\r
-        internal static string DefaultModelBinder_ValueRequired {\r
-            get {\r
-                return ResourceManager.GetString("DefaultModelBinder_ValueRequired", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The total number of ticks for the TimeSpan must be greater than 0..\r
-        /// </summary>\r
-        internal static string DefaultViewLocationCache_NegativeTimeSpan {\r
-            get {\r
-                return ResourceManager.GetString("DefaultViewLocationCache_NegativeTimeSpan", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type &apos;{0}&apos; does not inherit from Exception..\r
-        /// </summary>\r
-        internal static string ExceptionViewAttribute_NonExceptionType {\r
-            get {\r
-                return ResourceManager.GetString("ExceptionViewAttribute_NonExceptionType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Order must be greater than or equal to -1..\r
-        /// </summary>\r
-        internal static string FilterAttribute_OrderOutOfRange {\r
-            get {\r
-                return ResourceManager.GetString("FilterAttribute_OrderOutOfRange", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to There is no ViewData item with the key &apos;{0}&apos; of type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string HtmlHelper_MissingSelectData {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_MissingSelectData", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value must be greater than or equal to zero..\r
-        /// </summary>\r
-        internal static string HtmlHelper_TextAreaParameterOutOfRange {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_TextAreaParameterOutOfRange", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ViewData item with the key &apos;{0}&apos; is of type &apos;{1}&apos; but needs to be of type &apos;{2}&apos;..\r
-        /// </summary>\r
-        internal static string HtmlHelper_WrongSelectDataType {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_WrongSelectDataType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to There was an error creating the IModelBinder &apos;{0}&apos;. Check that it has a public parameterless constructor..\r
-        /// </summary>\r
-        internal static string ModelBinderAttribute_ErrorCreatingModelBinder {\r
-            get {\r
-                return ResourceManager.GetString("ModelBinderAttribute_ErrorCreatingModelBinder", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type &apos;{0}&apos; does not implement the IModelBinder interface..\r
-        /// </summary>\r
-        internal static string ModelBinderAttribute_TypeNotIModelBinder {\r
-            get {\r
-                return ResourceManager.GetString("ModelBinderAttribute_TypeNotIModelBinder", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type &apos;{0}&apos; contains multiple attributes inheriting from CustomModelBinderAttribute..\r
-        /// </summary>\r
-        internal static string ModelBinderDictionary_MultipleAttributes {\r
-            get {\r
-                return ResourceManager.GetString("ModelBinderDictionary_MultipleAttributes", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot create a descriptor for instance method &apos;{0}&apos; on type &apos;{1}&apos; since the type does not subclass ControllerBase..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot call action method &apos;{0}&apos; on controller &apos;{1}&apos; since the parameter &apos;{2}&apos; is passed by reference..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot call action method &apos;{0}&apos; on controller &apos;{1}&apos; since it is a generic method..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_CannotCallOpenGenericMethods {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_CannotCallOpenGenericMethods", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameters dictionary contains a null entry for parameter &apos;{0}&apos; of non-nullable type &apos;{1}&apos; for method &apos;{2}&apos; in &apos;{3}&apos;. To make a parameter optional its type should be either a reference type or a Nullable type..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_ParameterCannotBeNull {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_ParameterCannotBeNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameters dictionary does not contain an entry for parameter &apos;{0}&apos; of type &apos;{1}&apos; for method &apos;{2}&apos; in &apos;{3}&apos;. The dictionary must contain an entry for each parameter, even parameters with null values..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_ParameterNotInDictionary {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_ParameterNotInDictionary", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameters dictionary contains an invalid entry for parameter &apos;{0}&apos; for method &apos;{1}&apos; in &apos;{2}&apos;. The dictionary contains a value of type &apos;{3}&apos;, but the parameter requires a value of type &apos;{4}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_ParameterValueHasWrongType {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_ParameterValueHasWrongType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameter &apos;{0}&apos; on method &apos;{1}&apos; contains multiple attributes inheriting from CustomModelBinderAttribute..\r
-        /// </summary>\r
-        internal static string ReflectedParameterBindingInfo_MultipleConverterAttributes {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedParameterBindingInfo_MultipleConverterAttributes", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The SessionStateTempDataProvider requires SessionState to be enabled..\r
-        /// </summary>\r
-        internal static string SessionStateTempDataProvider_SessionStateDisabled {\r
-            get {\r
-                return ResourceManager.GetString("SessionStateTempDataProvider_SessionStateDisabled", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameter conversion from type &apos;{0}&apos; to type &apos;{1}&apos; failed. See the inner exception for more information..\r
-        /// </summary>\r
-        internal static string ValueProviderResult_ConversionThrew {\r
-            get {\r
-                return ResourceManager.GetString("ValueProviderResult_ConversionThrew", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameter conversion from type &apos;{0}&apos; to type &apos;{1}&apos; failed because no TypeConverter can convert between these types..\r
-        /// </summary>\r
-        internal static string ValueProviderResult_NoConverterExists {\r
-            get {\r
-                return ResourceManager.GetString("ValueProviderResult_NoConverterExists", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The model item passed into the dictionary is of type &apos;{0}&apos; but this dictionary requires a model item of type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ViewDataDictionary_WrongTModelType {\r
-            get {\r
-                return ResourceManager.GetString("ViewDataDictionary_WrongTModelType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A ViewMasterPage can only be used with content pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;..\r
-        /// </summary>\r
-        internal static string ViewMasterPage_RequiresViewPage {\r
-            get {\r
-                return ResourceManager.GetString("ViewMasterPage_RequiresViewPage", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ViewUserControl &apos;{0}&apos; cannot find an IViewDataContainer. The ViewUserControl must be inside a ViewPage, ViewMasterPage, or another ViewUserControl..\r
-        /// </summary>\r
-        internal static string ViewUserControl_RequiresViewDataProvider {\r
-            get {\r
-                return ResourceManager.GetString("ViewUserControl_RequiresViewDataProvider", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A ViewUserControl can only be used inside pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;..\r
-        /// </summary>\r
-        internal static string ViewUserControl_RequiresViewPage {\r
-            get {\r
-                return ResourceManager.GetString("ViewUserControl_RequiresViewPage", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A master name cannot be specified when the view is a ViewUserControl..\r
-        /// </summary>\r
-        internal static string WebFormViewEngine_UserControlCannotHaveMaster {\r
-            get {\r
-                return ResourceManager.GetString("WebFormViewEngine_UserControlCannotHaveMaster", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The view found at &apos;{0}&apos; could not be created..\r
-        /// </summary>\r
-        internal static string WebFormViewEngine_ViewCouldNotBeCreated {\r
-            get {\r
-                return ResourceManager.GetString("WebFormViewEngine_ViewCouldNotBeCreated", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The view at &apos;{0}&apos; must derive from ViewPage, ViewPage&lt;TViewData&gt;, ViewUserControl, or ViewUserControl&lt;TViewData&gt;..\r
-        /// </summary>\r
-        internal static string WebFormViewEngine_WrongViewBase {\r
-            get {\r
-                return ResourceManager.GetString("WebFormViewEngine_WrongViewBase", resourceCulture);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/MvcResources.resx b/mcs/class/System.Web.Mvc/System.Web.Mvc/Resources/MvcResources.resx
deleted file mode 100644 (file)
index fb940f7..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ActionMethodSelector_AmbiguousMatch" xml:space="preserve">
-    <value>The current request for action '{0}' on controller type '{1}' is ambiguous between the following action methods:{2}</value>
-  </data>
-  <data name="ActionRedirectResult_NoRouteMatched" xml:space="preserve">
-    <value>No route in the route table matches the supplied values.</value>
-  </data>
-  <data name="Common_InvalidEnumValue" xml:space="preserve">
-    <value>The value '{0}' is outside the valid range of the enumeration type '{1}'.</value>
-  </data>
-  <data name="Common_NullOrEmpty" xml:space="preserve">
-    <value>Value cannot be null or empty.</value>
-  </data>
-  <data name="Common_PartialViewNotFound" xml:space="preserve">
-    <value>The partial view '{0}' could not be found. The following locations were searched:{1}</value>
-  </data>
-  <data name="Common_PropertyCannotBeNullOrEmpty" xml:space="preserve">
-    <value>The property '{0}' cannot be null or empty.</value>
-  </data>
-  <data name="Common_ViewNotFound" xml:space="preserve">
-    <value>The view '{0}' or its master could not be found. The following locations were searched:{1}</value>
-  </data>
-  <data name="ControllerBuilder_ErrorCreatingControllerFactory" xml:space="preserve">
-    <value>There was an error creating the IControllerFactory '{0}'. Check that it has a public parameterless constructor.</value>
-  </data>
-  <data name="ControllerBuilder_FactoryReturnedNull" xml:space="preserve">
-    <value>The IControllerFactory '{0}' did not return a controller for a controller named '{1}'.</value>
-  </data>
-  <data name="ControllerBuilder_MissingIControllerFactory" xml:space="preserve">
-    <value>The controller factory type '{0}' must implement the IControllerFactory interface.</value>
-  </data>
-  <data name="Controller_UnknownAction" xml:space="preserve">
-    <value>A public action method '{0}' could not be found on controller '{1}'.</value>
-  </data>
-  <data name="DefaultControllerFactory_ControllerNameAmbiguous" xml:space="preserve">
-    <value>The controller name '{0}' is ambiguous between the following types:{1}</value>
-  </data>
-  <data name="DefaultControllerFactory_ErrorCreatingController" xml:space="preserve">
-    <value>An error occurred while creating a controller of type '{0}'. If the controller doesn't have a controller factory, ensure that it has a parameterless public constructor.</value>
-  </data>
-  <data name="DefaultControllerFactory_NoControllerFound" xml:space="preserve">
-    <value>The controller for path '{0}' could not be found or it does not implement IController.</value>
-  </data>
-  <data name="DefaultControllerFactory_TypeDoesNotSubclassControllerBase" xml:space="preserve">
-    <value>The controller type '{0}' must implement IController.</value>
-  </data>
-  <data name="ValueProviderResult_ConversionThrew" xml:space="preserve">
-    <value>The parameter conversion from type '{0}' to type '{1}' failed. See the inner exception for more information.</value>
-  </data>
-  <data name="ValueProviderResult_NoConverterExists" xml:space="preserve">
-    <value>The parameter conversion from type '{0}' to type '{1}' failed because no TypeConverter can convert between these types.</value>
-  </data>
-  <data name="ExceptionViewAttribute_NonExceptionType" xml:space="preserve">
-    <value>The type '{0}' does not inherit from Exception.</value>
-  </data>
-  <data name="FilterAttribute_OrderOutOfRange" xml:space="preserve">
-    <value>Order must be greater than or equal to -1.</value>
-  </data>
-  <data name="HtmlHelper_MissingSelectData" xml:space="preserve">
-    <value>There is no ViewData item with the key '{0}' of type '{1}'.</value>
-  </data>
-  <data name="HtmlHelper_TextAreaParameterOutOfRange" xml:space="preserve">
-    <value>The value must be greater than or equal to zero.</value>
-  </data>
-  <data name="HtmlHelper_WrongSelectDataType" xml:space="preserve">
-    <value>The ViewData item with the key '{0}' is of type '{1}' but needs to be of type '{2}'.</value>
-  </data>
-  <data name="ModelBinderAttribute_ErrorCreatingModelBinder" xml:space="preserve">
-    <value>There was an error creating the IModelBinder '{0}'. Check that it has a public parameterless constructor.</value>
-  </data>
-  <data name="ModelBinderAttribute_TypeNotIModelBinder" xml:space="preserve">
-    <value>The type '{0}' does not implement the IModelBinder interface.</value>
-  </data>
-  <data name="ModelBinderDictionary_MultipleAttributes" xml:space="preserve">
-    <value>The type '{0}' contains multiple attributes inheriting from CustomModelBinderAttribute.</value>
-  </data>
-  <data name="SessionStateTempDataProvider_SessionStateDisabled" xml:space="preserve">
-    <value>The SessionStateTempDataProvider requires SessionState to be enabled.</value>
-  </data>
-  <data name="ViewDataDictionary_WrongTModelType" xml:space="preserve">
-    <value>The model item passed into the dictionary is of type '{0}' but this dictionary requires a model item of type '{1}'.</value>
-  </data>
-  <data name="ViewMasterPage_RequiresViewPage" xml:space="preserve">
-    <value>A ViewMasterPage can only be used with content pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;.</value>
-  </data>
-  <data name="ViewUserControl_RequiresViewDataProvider" xml:space="preserve">
-    <value>The ViewUserControl '{0}' cannot find an IViewDataContainer. The ViewUserControl must be inside a ViewPage, ViewMasterPage, or another ViewUserControl.</value>
-  </data>
-  <data name="ViewUserControl_RequiresViewPage" xml:space="preserve">
-    <value>A ViewUserControl can only be used inside pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;.</value>
-  </data>
-  <data name="WebFormViewEngine_UserControlCannotHaveMaster" xml:space="preserve">
-    <value>A master name cannot be specified when the view is a ViewUserControl.</value>
-  </data>
-  <data name="WebFormViewEngine_ViewCouldNotBeCreated" xml:space="preserve">
-    <value>The view found at '{0}' could not be created.</value>
-  </data>
-  <data name="WebFormViewEngine_WrongViewBase" xml:space="preserve">
-    <value>The view at '{0}' must derive from ViewPage, ViewPage&lt;TViewData&gt;, ViewUserControl, or ViewUserControl&lt;TViewData&gt;.</value>
-  </data>
-  <data name="Common_ValueNotValidForProperty" xml:space="preserve">
-    <value>The value '{0}' is invalid.</value>
-  </data>
-  <data name="ActionMethodSelector_AmbiguousMatchType" xml:space="preserve">
-    <value>{0} on type {1}</value>
-  </data>
-  <data name="Controller_UpdateModel_UpdateUnsuccessful" xml:space="preserve">
-    <value>The model of type '{0}' was not successfully updated.</value>
-  </data>
-  <data name="DefaultModelBinder_ValueRequired" xml:space="preserve">
-    <value>A value is required.</value>
-  </data>
-  <data name="ReflectedActionDescriptor_ParameterCannotBeNull" xml:space="preserve">
-    <value>The parameters dictionary contains a null entry for parameter '{0}' of non-nullable type '{1}' for method '{2}' in '{3}'. To make a parameter optional its type should be either a reference type or a Nullable type.</value>
-  </data>
-  <data name="ReflectedActionDescriptor_ParameterNotInDictionary" xml:space="preserve">
-    <value>The parameters dictionary does not contain an entry for parameter '{0}' of type '{1}' for method '{2}' in '{3}'. The dictionary must contain an entry for each parameter, even parameters with null values.</value>
-  </data>
-  <data name="ReflectedActionDescriptor_ParameterValueHasWrongType" xml:space="preserve">
-    <value>The parameters dictionary contains an invalid entry for parameter '{0}' for method '{1}' in '{2}'. The dictionary contains a value of type '{3}', but the parameter requires a value of type '{4}'.</value>
-  </data>
-  <data name="ReflectedParameterBindingInfo_MultipleConverterAttributes" xml:space="preserve">
-    <value>The parameter '{0}' on method '{1}' contains multiple attributes inheriting from CustomModelBinderAttribute.</value>
-  </data>
-  <data name="ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType" xml:space="preserve">
-    <value>Cannot create a descriptor for instance method '{0}' on type '{1}' since the type does not subclass ControllerBase.</value>
-  </data>
-  <data name="ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters" xml:space="preserve">
-    <value>Cannot call action method '{0}' on controller '{1}' since the parameter '{2}' is passed by reference.</value>
-  </data>
-  <data name="ReflectedActionDescriptor_CannotCallOpenGenericMethods" xml:space="preserve">
-    <value>Cannot call action method '{0}' on controller '{1}' since it is a generic method.</value>
-  </data>
-  <data name="DefaultViewLocationCache_NegativeTimeSpan" xml:space="preserve">
-    <value>The total number of ticks for the TimeSpan must be greater than 0.</value>
-  </data>
-  <data name="AntiForgeryToken_ValidationFailed" xml:space="preserve">
-    <value>A required anti-forgery token was not supplied or was invalid.</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ResultExecutedContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ResultExecutedContext.cs
deleted file mode 100644 (file)
index aec1a1f..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ResultExecutedContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public ResultExecutedContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ResultExecutedContext(ControllerContext controllerContext, ActionResult result, bool canceled, Exception exception)\r
-            : base(controllerContext) {\r
-            if (result == null) {\r
-                throw new ArgumentNullException("result");\r
-            }\r
-\r
-            Result = result;\r
-            Canceled = canceled;\r
-            Exception = exception;\r
-        }\r
-\r
-        public virtual bool Canceled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual Exception Exception {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public bool ExceptionHandled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ResultExecutingContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ResultExecutingContext.cs
deleted file mode 100644 (file)
index 893bfd0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ResultExecutingContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public ResultExecutingContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ResultExecutingContext(ControllerContext controllerContext, ActionResult result)\r
-            : base(controllerContext) {\r
-            if (result == null) {\r
-                throw new ArgumentNullException("result");\r
-            }\r
-\r
-            Result = result;\r
-        }\r
-\r
-        public bool Cancel {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/RouteCollectionExtensions.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/RouteCollectionExtensions.cs
deleted file mode 100644 (file)
index 1d9056e..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Routing;\r
-\r
-    public static class RouteCollectionExtensions {\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static void IgnoreRoute(this RouteCollection routes, string url) {\r
-            IgnoreRoute(routes, url, null /* constraints */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static void IgnoreRoute(this RouteCollection routes, string url, object constraints) {\r
-            if (routes == null) {\r
-                throw new ArgumentNullException("routes");\r
-            }\r
-            if (url == null) {\r
-                throw new ArgumentNullException("url");\r
-            }\r
-\r
-            IgnoreRouteInternal route = new IgnoreRouteInternal(url) {\r
-                Constraints = new RouteValueDictionary(constraints)\r
-            };\r
-\r
-            routes.Add(route);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url) {\r
-            return MapRoute(routes, name, url, null /* defaults */, (object)null /* constraints */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults) {\r
-            return MapRoute(routes, name, url, defaults, (object)null /* constraints */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults, object constraints) {\r
-            return MapRoute(routes, name, url, defaults, constraints, null /* namespaces */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, string[] namespaces) {\r
-            return MapRoute(routes, name, url, null /* defaults */, null /* constraints */, namespaces);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults, string[] namespaces) {\r
-            return MapRoute(routes, name, url, defaults, null /* constraints */, namespaces);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults, object constraints, string[] namespaces) {\r
-            if (routes == null) {\r
-                throw new ArgumentNullException("routes");\r
-            }\r
-            if (url == null) {\r
-                throw new ArgumentNullException("url");\r
-            }\r
-\r
-            Route route = new Route(url, new MvcRouteHandler()) {\r
-                Defaults = new RouteValueDictionary(defaults),\r
-                Constraints = new RouteValueDictionary(constraints)\r
-            };\r
-\r
-            if ((namespaces != null) && (namespaces.Length > 0)) {\r
-                route.DataTokens = new RouteValueDictionary();\r
-                route.DataTokens["Namespaces"] = namespaces;\r
-            }\r
-\r
-            routes.Add(name, route);\r
-\r
-            return route;\r
-        }\r
-\r
-        private sealed class IgnoreRouteInternal : Route {\r
-            public IgnoreRouteInternal(string url)\r
-                : base(url, new StopRoutingHandler()) {\r
-            }\r
-\r
-            public override VirtualPathData GetVirtualPath(RequestContext requestContext, RouteValueDictionary routeValues) {\r
-                // Never match during route generation. This avoids the scenario where an IgnoreRoute with\r
-                // fairly relaxed constraints ends up eagerly matching all generated URLs.\r
-                return null;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/RouteValuesHelpers.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/RouteValuesHelpers.cs
deleted file mode 100644 (file)
index d227cb4..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.Web.Routing;\r
-\r
-    internal static class RouteValuesHelpers {\r
-        public static RouteValueDictionary GetRouteValues(RouteValueDictionary routeValues) {\r
-            return (routeValues != null) ? new RouteValueDictionary(routeValues) : new RouteValueDictionary();\r
-        }\r
-\r
-        public static RouteValueDictionary MergeRouteValues(string actionName, string controllerName, RouteValueDictionary implicitRouteValues, RouteValueDictionary routeValues, bool includeImplicitMvcValues) {\r
-            // Create a new dictionary containing implicit and auto-generated values\r
-            RouteValueDictionary mergedRouteValues = new RouteValueDictionary();\r
-\r
-            if (includeImplicitMvcValues) {\r
-                // We only include MVC-specific values like 'controller' and 'action' if we are generating an action link.\r
-                // If we are generating a route link [as to MapRoute("Foo", "any/url", new { controller = ... })], including\r
-                // the current controller name will cause the route match to fail if the current controller is not the same\r
-                // as the destination controller.\r
-\r
-                object implicitValue;\r
-                if (implicitRouteValues != null && implicitRouteValues.TryGetValue("action", out implicitValue)) {\r
-                    mergedRouteValues["action"] = implicitValue;\r
-                }\r
-\r
-                if (implicitRouteValues != null && implicitRouteValues.TryGetValue("controller", out implicitValue)) {\r
-                    mergedRouteValues["controller"] = implicitValue;\r
-                }\r
-            }\r
-\r
-            // Merge values from the user's dictionary/object\r
-            if (routeValues != null) {\r
-                foreach (KeyValuePair<string, object> routeElement in GetRouteValues(routeValues)) {\r
-                    mergedRouteValues[routeElement.Key] = routeElement.Value;\r
-                }\r
-            }\r
-\r
-            // Merge explicit parameters when not null\r
-            if (actionName != null) {\r
-                mergedRouteValues["action"] = actionName;\r
-            }\r
-\r
-            if (controllerName != null) {\r
-                mergedRouteValues["controller"] = controllerName;\r
-            }\r
-\r
-            return mergedRouteValues;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/SelectList.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/SelectList.cs
deleted file mode 100644 (file)
index 9c85624..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections;\r
-    using System.Diagnostics.CodeAnalysis;    \r
-\r
-    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]\r
-    public class SelectList : MultiSelectList {\r
-\r
-        public SelectList(IEnumerable items)\r
-            : this(items, null /* selectedValue */) {\r
-        }\r
-\r
-        public SelectList(IEnumerable items, object selectedValue)\r
-            : this(items, null /* dataValuefield */, null /* dataTextField */, selectedValue) {\r
-        }\r
-\r
-        public SelectList(IEnumerable items, string dataValueField, string dataTextField)\r
-            : this(items, dataValueField, dataTextField, null /* selectedValue */) {\r
-        }\r
-\r
-        public SelectList(IEnumerable items, string dataValueField, string dataTextField, object selectedValue)\r
-            : base(items, dataValueField, dataTextField, ToEnumerable(selectedValue)) {\r
-            SelectedValue = selectedValue;\r
-        }\r
-\r
-        public object SelectedValue {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        private static IEnumerable ToEnumerable(object selectedValue) {\r
-            return (selectedValue != null) ? new object[] { selectedValue } : null;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/SelectListItem.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/SelectListItem.cs
deleted file mode 100644 (file)
index 962bf36..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public class SelectListItem {\r
-\r
-        public bool Selected {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string Text {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string Value {\r
-            get;\r
-            set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/SessionStateTempDataProvider.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/SessionStateTempDataProvider.cs
deleted file mode 100644 (file)
index 427922c..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class SessionStateTempDataProvider : ITempDataProvider {\r
-        internal const string TempDataSessionStateKey = "__ControllerTempData";\r
-\r
-        public virtual IDictionary<string, object> LoadTempData(ControllerContext controllerContext) {\r
-            HttpContextBase httpContext = controllerContext.HttpContext;\r
-            \r
-            if (httpContext.Session == null) {\r
-                throw new InvalidOperationException(MvcResources.SessionStateTempDataProvider_SessionStateDisabled);\r
-            }\r
-\r
-            Dictionary<string, object> tempDataDictionary = httpContext.Session[TempDataSessionStateKey] as Dictionary<string, object>;\r
-\r
-            if (tempDataDictionary != null) {\r
-                // If we got it from Session, remove it so that no other request gets it\r
-                httpContext.Session.Remove(TempDataSessionStateKey);\r
-                return tempDataDictionary;\r
-            }\r
-            else {\r
-                return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-            }\r
-        }\r
-\r
-        public virtual void SaveTempData(ControllerContext controllerContext, IDictionary<string, object> values) {\r
-            HttpContextBase httpContext = controllerContext.HttpContext;\r
-\r
-            if (httpContext.Session == null) {\r
-                throw new InvalidOperationException(MvcResources.SessionStateTempDataProvider_SessionStateDisabled);\r
-            }\r
-\r
-            httpContext.Session[TempDataSessionStateKey] = values;\r
-        }        \r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/TagBuilder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/TagBuilder.cs
deleted file mode 100644 (file)
index c2b0ea8..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class TagBuilder {\r
-        private string _idAttributeDotReplacement;\r
-\r
-        private const string _attributeFormat = @" {0}=""{1}""";\r
-        private const string _elementFormatEndTag = "</{0}>";\r
-        private const string _elementFormatNormal = "<{0}{1}>{2}</{0}>";\r
-        private const string _elementFormatSelfClosing = "<{0}{1} />";\r
-        private const string _elementFormatStartTag = "<{0}{1}>";\r
-\r
-        private string _innerHtml;\r
-\r
-        public TagBuilder(string tagName) {\r
-            if (String.IsNullOrEmpty(tagName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "tagName");\r
-            }\r
-\r
-            TagName = tagName;\r
-            Attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);\r
-        }\r
-\r
-        public IDictionary<string, string> Attributes {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string IdAttributeDotReplacement {\r
-            get {\r
-                if (String.IsNullOrEmpty(_idAttributeDotReplacement)) {\r
-                    _idAttributeDotReplacement = HtmlHelper.IdAttributeDotReplacement;\r
-                }\r
-                return _idAttributeDotReplacement;\r
-            }\r
-            set {\r
-                _idAttributeDotReplacement = value;\r
-            }\r
-        }\r
-\r
-        public string InnerHtml {\r
-            get {\r
-                return _innerHtml ?? String.Empty;\r
-            }\r
-            set {\r
-                _innerHtml = value;\r
-            }\r
-        }\r
-\r
-        public string TagName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public void AddCssClass(string value) {\r
-            string currentValue;\r
-\r
-            if (Attributes.TryGetValue("class", out currentValue)) {\r
-                Attributes["class"] = value + " " + currentValue;\r
-            }\r
-            else {\r
-                Attributes["class"] = value;\r
-            }\r
-        }\r
-\r
-        public void GenerateId(string name) {\r
-            if (!String.IsNullOrEmpty(name)) {\r
-                MergeAttribute("id", name.Replace(".", IdAttributeDotReplacement));\r
-            }\r
-        }\r
-\r
-        private string GetAttributesString() {\r
-            StringBuilder sb = new StringBuilder();\r
-            foreach (var attribute in Attributes) {\r
-                string key = attribute.Key;\r
-                string value = HttpUtility.HtmlAttributeEncode(attribute.Value);\r
-                sb.AppendFormat(CultureInfo.InvariantCulture, _attributeFormat, key, value);\r
-            }\r
-            return sb.ToString();\r
-        }\r
-\r
-        public void MergeAttribute(string key, string value) {\r
-            MergeAttribute(key, value, false /* replaceExisting */);\r
-        }\r
-\r
-        public void MergeAttribute(string key, string value, bool replaceExisting) {\r
-            if (String.IsNullOrEmpty(key)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "key");\r
-            }\r
-\r
-            if (replaceExisting || !Attributes.ContainsKey(key)) {\r
-                Attributes[key] = value;\r
-            }\r
-        }\r
-\r
-        public void MergeAttributes<TKey, TValue>(IDictionary<TKey, TValue> attributes) {\r
-            MergeAttributes(attributes, false /* replaceExisting */);\r
-        }\r
-\r
-        public void MergeAttributes<TKey, TValue>(IDictionary<TKey, TValue> attributes, bool replaceExisting) {\r
-            if (attributes != null) {\r
-                foreach (var entry in attributes) {\r
-                    string key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);\r
-                    string value = Convert.ToString(entry.Value, CultureInfo.InvariantCulture);\r
-                    MergeAttribute(key, value, replaceExisting);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void SetInnerText(string innerText) {\r
-            InnerHtml = HttpUtility.HtmlEncode(innerText);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public override string ToString() {\r
-            return ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        public string ToString(TagRenderMode renderMode) {\r
-            switch (renderMode) {\r
-                case TagRenderMode.StartTag:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatStartTag, TagName, GetAttributesString());\r
-                case TagRenderMode.EndTag:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatEndTag, TagName);\r
-                case TagRenderMode.SelfClosing:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatSelfClosing, TagName, GetAttributesString());\r
-                default:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatNormal, TagName, GetAttributesString(), InnerHtml);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/TagRenderMode.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/TagRenderMode.cs
deleted file mode 100644 (file)
index 8f889e7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public enum TagRenderMode {\r
-        Normal,\r
-        StartTag,\r
-        EndTag,\r
-        SelfClosing\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/TempDataDictionary.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/TempDataDictionary.cs
deleted file mode 100644 (file)
index bfaf3f8..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Runtime.Serialization;\r
-\r
-    [Serializable]\r
-    public class TempDataDictionary : IDictionary<string, object>, ISerializable {\r
-        internal const string _tempDataSerializationKey = "__tempData";\r
-\r
-        internal Dictionary<string, object> _data;\r
-        private HashSet<string> _initialKeys;\r
-        private HashSet<string> _modifiedKeys;        \r
-\r
-        public TempDataDictionary() {\r
-            _initialKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-            _modifiedKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-            _data = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-        protected TempDataDictionary(SerializationInfo info, StreamingContext context) {\r
-            _initialKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-            _modifiedKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-            _data = info.GetValue(_tempDataSerializationKey, typeof(Dictionary<string, object>)) as Dictionary<string, object>;\r
-        }\r
-\r
-        public int Count {\r
-            [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-            get {\r
-                return _data.Count;\r
-            }\r
-        }\r
-\r
-        public Dictionary<string, object>.KeyCollection Keys {\r
-            get {\r
-                return _data.Keys;\r
-            }\r
-        }\r
-\r
-        public void Load(ControllerContext controllerContext, ITempDataProvider tempDataProvider) {\r
-            IDictionary<string, object> providerDictionary = tempDataProvider.LoadTempData(controllerContext);\r
-            _data = (providerDictionary != null) ? new Dictionary<string, object>(providerDictionary, StringComparer.OrdinalIgnoreCase) : \r
-                new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-            _initialKeys = new HashSet<string>(_data.Keys);\r
-            _modifiedKeys.Clear();\r
-        }\r
-\r
-        public void Save(ControllerContext controllerContext, ITempDataProvider tempDataProvider) {\r
-            if (_modifiedKeys.Count > 0) {\r
-\r
-                // Apply change tracking.\r
-                foreach (string x in _initialKeys) {\r
-                    if (!_modifiedKeys.Contains(x)) {\r
-                        _data.Remove(x);\r
-                    }\r
-                }\r
-\r
-                // Store the dictionary\r
-                tempDataProvider.SaveTempData(controllerContext, _data);\r
-            }\r
-        }\r
-\r
-        public Dictionary<string, object>.ValueCollection Values {\r
-            get {\r
-                return _data.Values;\r
-            }\r
-        }\r
-\r
-        public object this[string key] {\r
-            [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-            get {\r
-                object value;\r
-                if (TryGetValue(key, out value)) {\r
-                    return value;\r
-                }\r
-                return null;\r
-            }\r
-            [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-            set {\r
-                _data[key] = value;\r
-                _modifiedKeys.Add(key);\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(string key, object value) {\r
-            _data.Add(key, value);\r
-            _modifiedKeys.Add(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Clear() {\r
-            _data.Clear();\r
-            _modifiedKeys.Clear();\r
-            _initialKeys.Clear();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool ContainsKey(string key) {\r
-            return _data.ContainsKey(key);\r
-        }\r
-\r
-        public bool ContainsValue(object value) {\r
-            return _data.ContainsValue(value);\r
-        }\r
-\r
-        public Dictionary<string, object>.Enumerator GetEnumerator() {\r
-            return _data.GetEnumerator();\r
-        }\r
-\r
-        protected virtual void GetObjectData(SerializationInfo info, StreamingContext context) {\r
-            info.AddValue(_tempDataSerializationKey, _data);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(string key) {\r
-            _initialKeys.Remove(key);\r
-            _modifiedKeys.Remove(key);\r
-            return _data.Remove(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool TryGetValue(string key, out object value) {\r
-            return _data.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region IDictionary<string, object> Implementation\r
-        ICollection<string> IDictionary<string, object>.Keys {\r
-            [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-            get {\r
-                return ((IDictionary<string, object>)_data).Keys;\r
-            }\r
-        }\r
-\r
-        ICollection<object> IDictionary<string, object>.Values {\r
-            [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-            get {\r
-                return ((IDictionary<string, object>)_data).Values;\r
-            }\r
-        }\r
-        #endregion\r
-\r
-        #region IEnumerable<KeyValuePair<string, object>> Implementation\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator() {\r
-            return ((IEnumerable<KeyValuePair<string, object>>)_data).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-        #region ICollection<KeyValuePair<string, object>> Implementation\r
-        bool ICollection<KeyValuePair<string, object>>.IsReadOnly {\r
-            [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-            get {\r
-                return ((ICollection<KeyValuePair<string, object>>)_data).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        void ICollection<KeyValuePair<string, object>>.CopyTo(KeyValuePair<string, object>[] array, int index) {\r
-            ((ICollection<KeyValuePair<string, object>>)_data).CopyTo(array, index);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        void ICollection<KeyValuePair<string, object>>.Add(KeyValuePair<string, object> keyValuePair) {\r
-            _modifiedKeys.Add(keyValuePair.Key);\r
-            ((ICollection<KeyValuePair<string, object>>)_data).Add(keyValuePair);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        bool ICollection<KeyValuePair<string, object>>.Contains(KeyValuePair<string, object> keyValuePair) {\r
-            return ((ICollection<KeyValuePair<string, object>>)_data).Contains(keyValuePair);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        bool ICollection<KeyValuePair<string, object>>.Remove(KeyValuePair<string, object> keyValuePair) {\r
-            _modifiedKeys.Remove(keyValuePair.Key);\r
-            return ((ICollection<KeyValuePair<string, object>>)_data).Remove(keyValuePair);\r
-        }\r
-        #endregion\r
-\r
-        #region IEnumerable Implementation\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)_data).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-        #region ISerializable Members\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context) {\r
-            GetObjectData(info, context);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/TypeHelpers.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/TypeHelpers.cs
deleted file mode 100644 (file)
index 4306e44..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    internal static class TypeHelpers {\r
-\r
-        public static bool TypeAllowsNullValue(Type type) {\r
-            // reference types allow null values\r
-            if (!type.IsValueType) {\r
-                return true;\r
-            }\r
-\r
-            // nullable value types allow null values\r
-            // code lifted from System.Nullable.GetUnderlyingType()\r
-            if (type.IsGenericType && !type.IsGenericTypeDefinition && (type.GetGenericTypeDefinition() == typeof(Nullable<>))) {\r
-                return true;\r
-            }\r
-\r
-            // no other types allow null values\r
-            return false;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/UrlHelper.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/UrlHelper.cs
deleted file mode 100644 (file)
index e861213..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public class UrlHelper {\r
-        public UrlHelper(RequestContext requestContext)\r
-            : this(requestContext, RouteTable.Routes) {\r
-        }\r
-\r
-        public UrlHelper(RequestContext requestContext, RouteCollection routeCollection) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-            if (routeCollection == null) {\r
-                throw new ArgumentNullException("routeCollection");\r
-            }\r
-            RequestContext = requestContext;\r
-            RouteCollection = routeCollection;\r
-        }\r
-\r
-        public RequestContext RequestContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public RouteCollection RouteCollection {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string Action(string actionName) {\r
-            return GenerateUrl(null /* routeName */, actionName, null, (RouteValueDictionary)null /* routeValues */);\r
-        }\r
-\r
-        public string Action(string actionName, object routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, null /* controllerName */, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public string Action(string actionName, RouteValueDictionary routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, null /* controllerName */, routeValues);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, (RouteValueDictionary)null /* routeValues */);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, object routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, routeValues);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, object routeValues, string protocol) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, protocol, null /* hostName */, null /* fragment */, new RouteValueDictionary(routeValues), RouteCollection, RequestContext, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, RouteValueDictionary routeValues, string protocol, string hostName) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, protocol, hostName, null /* fragment */, routeValues, RouteCollection, RequestContext, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        public string Content(string contentPath) {\r
-            return Content(contentPath, RequestContext.HttpContext);\r
-        }\r
-\r
-        internal static string Content(string contentPath, HttpContextBase httpContext) {\r
-            if (String.IsNullOrEmpty(contentPath)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "contentPath");\r
-            }\r
-\r
-            if (contentPath[0] == '~') {\r
-                return PathHelpers.GenerateClientUrl(httpContext, contentPath);\r
-            }\r
-            else {\r
-                return contentPath;\r
-            }\r
-        }\r
-\r
-        //REVIEW: Should we have an overload that takes Uri?\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings",\r
-            Justification = "Needs to take same parameters as HttpUtility.UrlEncode()")]\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public string Encode(string url) {\r
-            return HttpUtility.UrlEncode(url);\r
-        }\r
-\r
-        private string GenerateUrl(string routeName, string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            return GenerateUrl(routeName, actionName, controllerName, routeValues, RouteCollection, RequestContext, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        internal static string GenerateUrl(string routeName, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, RouteCollection routeCollection, RequestContext requestContext, bool includeImplicitMvcValues) {\r
-            string url = GenerateUrl(routeName, actionName, controllerName, routeValues, routeCollection, requestContext, includeImplicitMvcValues);\r
-\r
-            if (url != null) {\r
-                if (!String.IsNullOrEmpty(fragment)) {\r
-                    url = url + "#" + fragment;\r
-                }\r
-\r
-                if (!String.IsNullOrEmpty(protocol) || !String.IsNullOrEmpty(hostName)) {\r
-                    Uri requestUrl = requestContext.HttpContext.Request.Url;\r
-                    protocol = (!String.IsNullOrEmpty(protocol)) ? protocol : Uri.UriSchemeHttp;\r
-                    hostName = (!String.IsNullOrEmpty(hostName)) ? hostName : requestUrl.Host;\r
-\r
-                    string port = String.Empty;\r
-                    string requestProtocol = requestUrl.Scheme;\r
-\r
-                    if (String.Equals(protocol, requestProtocol, StringComparison.OrdinalIgnoreCase)) {\r
-                        port = requestUrl.IsDefaultPort ? String.Empty : (":" + Convert.ToString(requestUrl.Port, CultureInfo.InvariantCulture));\r
-                    }\r
-\r
-                    url = protocol + Uri.SchemeDelimiter + hostName + port + url;\r
-                }\r
-            }\r
-\r
-            return url;\r
-        }\r
-\r
-        internal static string GenerateUrl(string routeName, string actionName, string controllerName, RouteValueDictionary routeValues, RouteCollection routeCollection, RequestContext requestContext, bool includeImplicitMvcValues) {\r
-            RouteValueDictionary mergedRouteValues = RouteValuesHelpers.MergeRouteValues(actionName, controllerName, requestContext.RouteData.Values, routeValues, includeImplicitMvcValues);\r
-\r
-            VirtualPathData vpd = routeCollection.GetVirtualPath(requestContext, routeName, mergedRouteValues);\r
-            if (vpd == null) {\r
-                return null;\r
-            }\r
-\r
-            string modifiedUrl = PathHelpers.GenerateClientUrl(requestContext.HttpContext, vpd.VirtualPath);\r
-            return modifiedUrl;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(object routeValues) {\r
-            return RouteUrl(null /* routeName */, routeValues);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(RouteValueDictionary routeValues) {\r
-            return RouteUrl(null /* routeName */, routeValues);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName) {\r
-            return RouteUrl(routeName, (object)null /* routeValues */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, object routeValues) {\r
-            return RouteUrl(routeName, routeValues, null /* protocol */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, RouteValueDictionary routeValues) {\r
-            return RouteUrl(routeName, routeValues, null /* protocol */, null /* hostName */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, object routeValues, string protocol) {\r
-            return GenerateUrl(routeName, null /* actionName */, null /* controllerName */, protocol, null /* hostName */, null /* fragment */, new RouteValueDictionary(routeValues), RouteCollection, RequestContext, false /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, RouteValueDictionary routeValues, string protocol, string hostName) {\r
-            return GenerateUrl(routeName, null /* actionName */, null /* controllerName */, protocol, hostName, null /* fragment */, routeValues, RouteCollection, RequestContext, false /* includeImplicitMvcValues */);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs
deleted file mode 100644 (file)
index a03581a..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class ValidateAntiForgeryTokenAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        private string _salt;\r
-        private AntiForgeryDataSerializer _serializer;\r
-\r
-        public string Salt {\r
-            get {\r
-                return _salt ?? String.Empty;\r
-            }\r
-            set {\r
-                _salt = value;\r
-            }\r
-        }\r
-\r
-        internal AntiForgeryDataSerializer Serializer {\r
-            get {\r
-                if (_serializer == null) {\r
-                    _serializer = new AntiForgeryDataSerializer();\r
-                }\r
-                return _serializer;\r
-            }\r
-            set {\r
-                _serializer = value;\r
-            }\r
-        }\r
-\r
-        private bool ValidateFormToken(AntiForgeryData token) {\r
-            return (String.Equals(Salt, token.Salt, StringComparison.Ordinal));\r
-        }\r
-\r
-        private static HttpAntiForgeryException CreateValidationException() {\r
-            return new HttpAntiForgeryException(MvcResources.AntiForgeryToken_ValidationFailed);\r
-        }\r
-\r
-        public void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            string fieldName = AntiForgeryData.GetAntiForgeryTokenName(null);\r
-            string cookieName = AntiForgeryData.GetAntiForgeryTokenName(filterContext.HttpContext.Request.ApplicationPath);\r
-\r
-            HttpCookie cookie = filterContext.HttpContext.Request.Cookies[cookieName];\r
-            if (cookie == null || String.IsNullOrEmpty(cookie.Value)) {\r
-                // error: cookie token is missing\r
-                throw CreateValidationException();\r
-            }\r
-            AntiForgeryData cookieToken = Serializer.Deserialize(cookie.Value);\r
-\r
-            string formValue = filterContext.HttpContext.Request.Form[fieldName];\r
-            if (String.IsNullOrEmpty(formValue)) {\r
-                // error: form token is missing\r
-                throw CreateValidationException();\r
-            }\r
-            AntiForgeryData formToken = Serializer.Deserialize(formValue);\r
-\r
-            if (!String.Equals(cookieToken.Value, formToken.Value, StringComparison.Ordinal)) {\r
-                // error: form token does not match cookie token\r
-                throw CreateValidationException();\r
-            }\r
-\r
-            if (!ValidateFormToken(formToken)) {\r
-                // error: custom validation failed\r
-                throw CreateValidationException();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ValidateInputAttribute.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ValidateInputAttribute.cs
deleted file mode 100644 (file)
index 7e07f99..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "No compelling performance reason to seal this type.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public class ValidateInputAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        public ValidateInputAttribute(bool enableValidation) {\r
-            EnableValidation = enableValidation;\r
-        }\r
-\r
-        public bool EnableValidation {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public virtual void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            filterContext.Controller.ValidateRequest = EnableValidation;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ValueProviderDictionary.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ValueProviderDictionary.cs
deleted file mode 100644 (file)
index 5722378..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Collections.Specialized;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Routing;\r
-\r
-    public class ValueProviderDictionary : IDictionary<string, ValueProviderResult> {\r
-\r
-        private readonly Dictionary<string, ValueProviderResult> _dictionary = new Dictionary<string, ValueProviderResult>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public ValueProviderDictionary(ControllerContext controllerContext) {\r
-            ControllerContext = controllerContext;\r
-            if (controllerContext != null) {\r
-                PopulateDictionary();\r
-            }\r
-        }\r
-\r
-        public ControllerContext ControllerContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public int Count {\r
-            get {\r
-                return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Count;\r
-            }\r
-        }\r
-\r
-        internal Dictionary<string, ValueProviderResult> Dictionary {\r
-            get {\r
-                return _dictionary;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<string> Keys {\r
-            get {\r
-                return Dictionary.Keys;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ValueProviderResult this[string key] {\r
-            get {\r
-                ValueProviderResult result;\r
-                Dictionary.TryGetValue(key, out result);\r
-                return result;\r
-            }\r
-            set {\r
-                Dictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<ValueProviderResult> Values {\r
-            get {\r
-                return Dictionary.Values;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(KeyValuePair<string, ValueProviderResult> item) {\r
-            ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Add(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(string key, ValueProviderResult value) {\r
-            Dictionary.Add(key, value);\r
-        }\r
-\r
-        private void AddToDictionaryIfNotPresent(string key, ValueProviderResult result) {\r
-            if (!String.IsNullOrEmpty(key)) {\r
-                if (!Dictionary.ContainsKey(key)) {\r
-                    Dictionary.Add(key, result);\r
-                }\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Clear() {\r
-            ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Clear();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Contains(KeyValuePair<string, ValueProviderResult> item) {\r
-            return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Contains(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool ContainsKey(string key) {\r
-            return Dictionary.ContainsKey(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void CopyTo(KeyValuePair<string, ValueProviderResult>[] array, int arrayIndex) {\r
-            ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public IEnumerator<KeyValuePair<string, ValueProviderResult>> GetEnumerator() {\r
-            return ((IEnumerable<KeyValuePair<string, ValueProviderResult>>)Dictionary).GetEnumerator();\r
-        }\r
-\r
-        private void PopulateDictionary() {\r
-            CultureInfo currentCulture = CultureInfo.CurrentCulture;\r
-            CultureInfo invariantCulture = CultureInfo.InvariantCulture;\r
-\r
-            // We use this order of precedence to populate the dictionary:\r
-            // 1. Request form submission (should be culture-aware)\r
-            // 2. Values from the RouteData (could be from the typed-in URL or from the route's default values)\r
-            // 3. URI query string\r
-\r
-            NameValueCollection form = ControllerContext.HttpContext.Request.Form;\r
-            if (form != null) {\r
-                string[] keys = form.AllKeys;\r
-                foreach (string key in keys) {\r
-                    string[] rawValue = form.GetValues(key);\r
-                    string attemptedValue = form[key];\r
-                    ValueProviderResult result = new ValueProviderResult(rawValue, attemptedValue, currentCulture);\r
-                    AddToDictionaryIfNotPresent(key, result);\r
-                }\r
-            }\r
-\r
-            RouteValueDictionary routeValues = ControllerContext.RouteData.Values;\r
-            if (routeValues != null) {\r
-                foreach (var kvp in routeValues) {\r
-                    string key = kvp.Key;\r
-                    object rawValue = kvp.Value;\r
-                    string attemptedValue = Convert.ToString(rawValue, invariantCulture);\r
-                    ValueProviderResult result = new ValueProviderResult(rawValue, attemptedValue, invariantCulture);\r
-                    AddToDictionaryIfNotPresent(key, result);\r
-                }\r
-            }\r
-\r
-            NameValueCollection queryString = ControllerContext.HttpContext.Request.QueryString;\r
-            if (queryString != null) {\r
-                string[] keys = queryString.AllKeys;\r
-                foreach (string key in keys) {\r
-                    string[] rawValue = queryString.GetValues(key);\r
-                    string attemptedValue = queryString[key];\r
-                    ValueProviderResult result = new ValueProviderResult(rawValue, attemptedValue, invariantCulture);\r
-                    AddToDictionaryIfNotPresent(key, result);\r
-                }\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(KeyValuePair<string, ValueProviderResult> item) {\r
-            return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Remove(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(string key) {\r
-            return Dictionary.Remove(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool TryGetValue(string key, out ValueProviderResult value) {\r
-            return Dictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)Dictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ValueProviderResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ValueProviderResult.cs
deleted file mode 100644 (file)
index 1cbf3ef..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.ComponentModel;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [Serializable]\r
-    public class ValueProviderResult {\r
-\r
-        private static readonly CultureInfo _staticCulture = CultureInfo.InvariantCulture;\r
-        private CultureInfo _instanceCulture;\r
-\r
-        // default constructor so that subclassed types can set the properties themselves\r
-        protected ValueProviderResult() {\r
-        }\r
-\r
-        public ValueProviderResult(object rawValue, string attemptedValue, CultureInfo culture) {\r
-            RawValue = rawValue;\r
-            AttemptedValue = attemptedValue;\r
-            Culture = culture;\r
-        }\r
-\r
-        public string AttemptedValue {\r
-            get;\r
-            protected set;\r
-        }\r
-\r
-        public CultureInfo Culture {\r
-            get {\r
-                if (_instanceCulture == null) {\r
-                    _instanceCulture = _staticCulture;\r
-                }\r
-                return _instanceCulture;\r
-            }\r
-            protected set {\r
-                _instanceCulture = value;\r
-            }\r
-        }\r
-\r
-        public object RawValue {\r
-            get;\r
-            protected set;\r
-        }\r
-\r
-        private static object ConvertSimpleType(CultureInfo culture, object value, Type destinationType) {\r
-            if (value == null || destinationType.IsInstanceOfType(value)) {\r
-                return value;\r
-            }\r
-\r
-            // if this is a user-input value but the user didn't type anything, return no value\r
-            string valueAsString = value as string;\r
-            if (valueAsString != null && valueAsString.Length == 0) {\r
-                return null;\r
-            }\r
-\r
-            TypeConverter converter = TypeDescriptor.GetConverter(destinationType);\r
-            bool canConvertFrom = converter.CanConvertFrom(value.GetType());\r
-            if (!canConvertFrom) {\r
-                converter = TypeDescriptor.GetConverter(value.GetType());\r
-            }\r
-            if (!(canConvertFrom || converter.CanConvertTo(destinationType))) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ValueProviderResult_NoConverterExists,\r
-                    value.GetType().FullName, destinationType.FullName);\r
-                throw new InvalidOperationException(message);\r
-            }\r
-\r
-            try {\r
-                object convertedValue = (canConvertFrom) ?\r
-                     converter.ConvertFrom(null /* context */, culture, value) :\r
-                     converter.ConvertTo(null /* context */, culture, value, destinationType);\r
-                return convertedValue;\r
-            }\r
-            catch (Exception ex) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ValueProviderResult_ConversionThrew,\r
-                    value.GetType().FullName, destinationType.FullName);\r
-                throw new InvalidOperationException(message, ex);\r
-            }\r
-        }\r
-\r
-        public object ConvertTo(Type type) {\r
-            return ConvertTo(type, null /* culture */);\r
-        }\r
-\r
-        public virtual object ConvertTo(Type type, CultureInfo culture) {\r
-            if (type == null) {\r
-                throw new ArgumentNullException("type");\r
-            }\r
-\r
-            CultureInfo cultureToUse = culture ?? Culture;\r
-            return UnwrapPossibleArrayType(cultureToUse, RawValue, type);\r
-        }\r
-\r
-        private static object UnwrapPossibleArrayType(CultureInfo culture, object value, Type destinationType) {\r
-            if (value == null || destinationType.IsInstanceOfType(value)) {\r
-                return value;\r
-            }\r
-\r
-            // array conversion results in four cases, as below\r
-            Array valueAsArray = value as Array;\r
-            if (destinationType.IsArray) {\r
-                Type destinationElementType = destinationType.GetElementType();\r
-                if (valueAsArray != null) {\r
-                    // case 1: both destination + source type are arrays, so convert each element\r
-                    IList converted = Array.CreateInstance(destinationElementType, valueAsArray.Length);\r
-                    for (int i = 0; i < valueAsArray.Length; i++) {\r
-                        converted[i] = ConvertSimpleType(culture, valueAsArray.GetValue(i), destinationElementType);\r
-                    }\r
-                    return converted;\r
-                }\r
-                else {\r
-                    // case 2: destination type is array but source is single element, so wrap element in array + convert\r
-                    object element = ConvertSimpleType(culture, value, destinationElementType);\r
-                    IList converted = Array.CreateInstance(destinationElementType, 1);\r
-                    converted[0] = element;\r
-                    return converted;\r
-                }\r
-            }\r
-            else if (valueAsArray != null) {\r
-                // case 3: destination type is single element but source is array, so extract first element + convert\r
-                if (valueAsArray.Length > 0) {\r
-                    value = valueAsArray.GetValue(0);\r
-                    return ConvertSimpleType(culture, value, destinationType);\r
-                }\r
-                else {\r
-                    // case 3(a): source is empty array, so can't perform conversion\r
-                    return null;\r
-                }\r
-            }\r
-            // case 4: both destination + source type are single elements, so convert\r
-            return ConvertSimpleType(culture, value, destinationType);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewContext.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewContext.cs
deleted file mode 100644 (file)
index c691d59..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ViewContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public ViewContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ViewContext(ControllerContext controllerContext, IView view, ViewDataDictionary viewData, TempDataDictionary tempData)\r
-            : base(controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (view == null) {\r
-                throw new ArgumentNullException("view");\r
-            }\r
-            if (viewData == null) {\r
-                throw new ArgumentNullException("viewData");\r
-            }\r
-            if (tempData == null) {\r
-                throw new ArgumentNullException("tempData");\r
-            }\r
-\r
-            View = view;\r
-            ViewData = viewData;\r
-            TempData = tempData;\r
-        }\r
-\r
-        public virtual IView View {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The property setter is only here to support mocking this type and should not be called at runtime.")]\r
-        public virtual ViewDataDictionary ViewData {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The property setter is only here to support mocking this type and should not be called at runtime.")]\r
-        public virtual TempDataDictionary TempData {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewDataDictionary.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewDataDictionary.cs
deleted file mode 100644 (file)
index b64312a..0000000
+++ /dev/null
@@ -1,325 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    // TODO: Unit test ModelState interaction with VDD\r
-\r
-    public class ViewDataDictionary : IDictionary<string, object> {\r
-\r
-        private readonly Dictionary<string, object> _innerDictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-        private object _model;\r
-        private readonly ModelStateDictionary _modelState = new ModelStateDictionary();\r
-\r
-        public ViewDataDictionary()\r
-            : this((object)null) {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "See note on SetModel() method.")]\r
-        public ViewDataDictionary(object model) {\r
-            Model = model;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "See note on SetModel() method.")]\r
-        public ViewDataDictionary(ViewDataDictionary dictionary) {\r
-            if (dictionary == null) {\r
-                throw new ArgumentNullException("dictionary");\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                _innerDictionary.Add(entry.Key, entry.Value);\r
-            }\r
-            foreach (var entry in dictionary.ModelState) {\r
-                ModelState.Add(entry.Key, entry.Value);\r
-            }\r
-            Model = dictionary.Model;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public int Count {\r
-            get {\r
-                return _innerDictionary.Count;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((IDictionary<string, object>)_innerDictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<string> Keys {\r
-            get {\r
-                return _innerDictionary.Keys;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return _model;\r
-            }\r
-            set {\r
-                SetModel(value);\r
-            }\r
-        }\r
-\r
-        public ModelStateDictionary ModelState {\r
-            get {\r
-                return _modelState;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public object this[string key] {\r
-            get {\r
-                object value;\r
-                _innerDictionary.TryGetValue(key, out value);\r
-                return value;\r
-            }\r
-            set {\r
-                _innerDictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public ICollection<object> Values {\r
-            get {\r
-                return _innerDictionary.Values;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(KeyValuePair<string, object> item) {\r
-            ((IDictionary<string, object>)_innerDictionary).Add(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Add(string key, object value) {\r
-            _innerDictionary.Add(key, value);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void Clear() {\r
-            _innerDictionary.Clear();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Contains(KeyValuePair<string, object> item) {\r
-            return ((IDictionary<string, object>)_innerDictionary).Contains(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool ContainsKey(string key) {\r
-            return _innerDictionary.ContainsKey(key);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex) {\r
-            ((IDictionary<string, object>)_innerDictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Eval",\r
-            Justification = "Commonly used shorthand for Evaluate.")]\r
-        public object Eval(string expression) {\r
-            if (String.IsNullOrEmpty(expression)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "expression");\r
-            }\r
-\r
-            return ViewDataEvaluator.Eval(this, expression);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Eval",\r
-            Justification = "Commonly used shorthand for Evaluate.")]\r
-        public string Eval(string expression, string format) {\r
-            object value = Eval(expression);\r
-\r
-            if (value == null) {\r
-                return String.Empty;\r
-            }\r
-\r
-            if (String.IsNullOrEmpty(format)) {\r
-                return Convert.ToString(value, CultureInfo.CurrentCulture);\r
-            }\r
-            else {\r
-                return String.Format(CultureInfo.CurrentCulture, format, value);\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public IEnumerator<KeyValuePair<string, object>> GetEnumerator() {\r
-            return _innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(KeyValuePair<string, object> item) {\r
-            return ((IDictionary<string, object>)_innerDictionary).Remove(item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool Remove(string key) {\r
-            return _innerDictionary.Remove(key);\r
-        }\r
-\r
-        // This method will execute before the derived type's instance constructor executes. Derived types must\r
-        // be aware of this and should plan accordingly. For example, the logic in SetModel() should be simple\r
-        // enough so as not to depend on the "this" pointer referencing a fully constructed object.\r
-        protected virtual void SetModel(object value) {\r
-            _model = value;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        public bool TryGetValue(string key, out object value) {\r
-            return _innerDictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        internal static class ViewDataEvaluator {\r
-            public static object Eval(ViewDataDictionary vdd, string expression) {\r
-                //Given an expression "foo.bar.baz" we look up the following (pseudocode):\r
-                //  this["foo.bar.baz.quux"]\r
-                //  this["foo.bar.baz"]["quux"]\r
-                //  this["foo.bar"]["baz.quux]\r
-                //  this["foo.bar"]["baz"]["quux"]\r
-                //  this["foo"]["bar.baz.quux"]\r
-                //  this["foo"]["bar.baz"]["quux"]\r
-                //  this["foo"]["bar"]["baz.quux"]\r
-                //  this["foo"]["bar"]["baz"]["quux"]\r
-\r
-                object evaluated = EvalComplexExpression(vdd, expression);\r
-                return evaluated;\r
-            }\r
-\r
-            private static object EvalComplexExpression(object indexableObject, string expression) {\r
-                foreach (ExpressionPair expressionPair in GetRightToLeftExpressions(expression)) {\r
-                    string subExpression = expressionPair.Left;\r
-                    string postExpression = expressionPair.Right;\r
-\r
-                    object subtarget = GetPropertyValue(indexableObject, subExpression);\r
-                    if (subtarget != null) {\r
-                        if (String.IsNullOrEmpty(postExpression))\r
-                            return subtarget;\r
-\r
-                        object potential = EvalComplexExpression(subtarget, postExpression);\r
-                        if (potential != null) {\r
-                            return potential;\r
-                        }\r
-                    }\r
-                }\r
-                return null;\r
-            }\r
-\r
-            private static IEnumerable<ExpressionPair> GetRightToLeftExpressions(string expression) {\r
-                // Produces an enumeration of all the combinations of complex property names\r
-                // given a complex expression. See the list above for an example of the result\r
-                // of the enumeration.\r
-\r
-                yield return new ExpressionPair(expression, String.Empty);\r
-\r
-                int lastDot = expression.LastIndexOf('.');\r
-\r
-                string subExpression = expression;\r
-                string postExpression = string.Empty;\r
-\r
-                while (lastDot > -1) {\r
-                    subExpression = expression.Substring(0, lastDot);\r
-                    postExpression = expression.Substring(lastDot + 1);\r
-                    yield return new ExpressionPair(subExpression, postExpression);\r
-\r
-                    lastDot = subExpression.LastIndexOf('.');\r
-                }\r
-            }\r
-\r
-            private static object GetIndexedPropertyValue(object indexableObject, string key) {\r
-                Type indexableType = indexableObject.GetType();\r
-\r
-                ViewDataDictionary vdd = indexableObject as ViewDataDictionary;\r
-                if (vdd != null) {\r
-                    return vdd[key];\r
-                }\r
-\r
-                MethodInfo containsKeyMethod = indexableType.GetMethod("ContainsKey", BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(string) }, null);\r
-                if (containsKeyMethod != null) {\r
-                    if (!(bool)containsKeyMethod.Invoke(indexableObject, new object[] { key })) {\r
-                        return null;\r
-                    }\r
-                }\r
-\r
-                PropertyInfo info = indexableType.GetProperty("Item", BindingFlags.Public | BindingFlags.Instance, null, null, new Type[] { typeof(string) }, null);\r
-                if (info != null) {\r
-                    return info.GetValue(indexableObject, new object[] { key });\r
-                }\r
-\r
-                PropertyInfo objectInfo = indexableType.GetProperty("Item", BindingFlags.Public | BindingFlags.Instance, null, null, new Type[] { typeof(object) }, null);\r
-                if (objectInfo != null) {\r
-                    return objectInfo.GetValue(indexableObject, new object[] { key });\r
-                }\r
-                return null;\r
-            }\r
-\r
-            private static object GetPropertyValue(object container, string propertyName) {\r
-                // This method handles one "segment" of a complex property expression\r
-\r
-                // First, we try to evaluate the property based on its indexer\r
-                object value = GetIndexedPropertyValue(container, propertyName);\r
-                if (value != null) {\r
-                    return value;\r
-                }\r
-\r
-                // If the indexer didn't return anything useful, continue...\r
-\r
-                // If the container is a ViewDataDictionary then treat its Model property\r
-                // as the container instead of the ViewDataDictionary itself.\r
-                ViewDataDictionary vdd = container as ViewDataDictionary;\r
-                if (vdd != null) {\r
-                    container = vdd.Model;\r
-                }\r
-\r
-                // Second, we try to use PropertyDescriptors and treat the expression as a property name\r
-                PropertyDescriptor descriptor = TypeDescriptor.GetProperties(container).Find(propertyName, true);\r
-                if (descriptor == null) {\r
-                    return null;\r
-                }\r
-\r
-                return descriptor.GetValue(container);\r
-            }\r
-\r
-            private struct ExpressionPair {\r
-                public readonly string Left;\r
-                public readonly string Right;\r
-\r
-                public ExpressionPair(string left, string right) {\r
-                    Left = left;\r
-                    Right = right;\r
-                }\r
-            }\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)_innerDictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewDataDictionary`1.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewDataDictionary`1.cs
deleted file mode 100644 (file)
index d1ed109..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ViewDataDictionary<TModel> : ViewDataDictionary where TModel : class {\r
-        public ViewDataDictionary() :\r
-            base() {\r
-        }\r
-\r
-        public ViewDataDictionary(TModel model) :\r
-            base(model) {\r
-        }\r
-\r
-        public ViewDataDictionary(ViewDataDictionary viewDataDictionary) :\r
-            base(viewDataDictionary) {\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return (TModel)base.Model;\r
-            }\r
-            set {\r
-                SetModel(value);\r
-            }\r
-        }\r
-\r
-        protected override void SetModel(object value) {\r
-            TModel model = value as TModel;\r
-\r
-            // If there was a value but the cast failed, throw an exception\r
-            if ((value != null) && (model == null)) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(CultureInfo.CurrentUICulture,\r
-                        MvcResources.ViewDataDictionary_WrongTModelType, value.GetType(), typeof(TModel)));\r
-            }\r
-\r
-            base.SetModel(value);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngineCollection.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngineCollection.cs
deleted file mode 100644 (file)
index bab47ac..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ViewEngineCollection : Collection<IViewEngine> {\r
-\r
-        public ViewEngineCollection() {\r
-        }\r
-\r
-        public ViewEngineCollection(IList<IViewEngine> list)\r
-            : base(list) {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        protected override void InsertItem(int index, IViewEngine item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.InsertItem(index, item);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        protected override void SetItem(int index, IViewEngine item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.SetItem(index, item);\r
-        }\r
-\r
-        private ViewEngineResult Find(Func<IViewEngine, ViewEngineResult> cacheLocator, Func<IViewEngine, ViewEngineResult> locator) {\r
-            ViewEngineResult result;\r
-\r
-            foreach (IViewEngine engine in Items) {\r
-                if (engine != null) {\r
-                    result = cacheLocator(engine);\r
-\r
-                    if (result.View != null) {\r
-                        return result;\r
-                    }\r
-                }\r
-            }\r
-\r
-            List<string> searched = new List<string>();\r
-\r
-            foreach (IViewEngine engine in Items) {\r
-                if (engine != null) {\r
-                    result = locator(engine);\r
-\r
-                    if (result.View != null) {\r
-                        return result;\r
-                    }\r
-\r
-                    searched.AddRange(result.SearchedLocations);\r
-                }\r
-            }\r
-\r
-            return new ViewEngineResult(searched);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (string.IsNullOrEmpty(partialViewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "partialViewName");\r
-            }\r
-            Func<IViewEngine, ViewEngineResult> cacheLocator = e => e.FindPartialView(controllerContext, partialViewName, true);\r
-            Func<IViewEngine, ViewEngineResult> locator = e => e.FindPartialView(controllerContext, partialViewName, false);\r
-            return Find(cacheLocator, locator);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (string.IsNullOrEmpty(viewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "viewName");\r
-            }\r
-            Func<IViewEngine, ViewEngineResult> cacheLocator = e => e.FindView(controllerContext, viewName, masterName, true);\r
-            Func<IViewEngine, ViewEngineResult> locator = e => e.FindView(controllerContext, viewName, masterName, false);\r
-            return Find(cacheLocator, locator);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngineResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngineResult.cs
deleted file mode 100644 (file)
index 97a1b31..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-\r
-    public class ViewEngineResult {\r
-\r
-        public ViewEngineResult(IEnumerable<string> searchedLocations) {\r
-            if (searchedLocations == null) {\r
-                throw new ArgumentNullException("searchedLocations");\r
-            }\r
-\r
-            SearchedLocations = searchedLocations;\r
-        }\r
-\r
-        public ViewEngineResult(IView view, IViewEngine viewEngine) {\r
-            if (view == null) {\r
-                throw new ArgumentNullException("view");\r
-            }\r
-            if (viewEngine == null) {\r
-                throw new ArgumentNullException("viewEngine");\r
-            }\r
-\r
-            View = view;\r
-            ViewEngine = viewEngine;\r
-        }\r
-\r
-        public IEnumerable<string> SearchedLocations {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IView View {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IViewEngine ViewEngine {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngines.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewEngines.cs
deleted file mode 100644 (file)
index af4c016..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public static class ViewEngines {\r
-\r
-        private readonly static ViewEngineCollection _engines = new ViewEngineCollection {\r
-            new WebFormViewEngine() \r
-        };\r
-\r
-        public static ViewEngineCollection Engines {\r
-            get {\r
-                return _engines;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewMasterPage.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewMasterPage.cs
deleted file mode 100644 (file)
index 371f4a4..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    public class ViewMasterPage : MasterPage {\r
-        public AjaxHelper Ajax {\r
-            get {\r
-                return ViewPage.Ajax;\r
-            }\r
-        }\r
-\r
-        public HtmlHelper Html {\r
-            get {\r
-                return ViewPage.Html;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                return ViewPage.TempData;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get {\r
-                return ViewPage.Url;\r
-            }\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get {\r
-                return ViewPage.ViewContext;\r
-            }\r
-        }\r
-\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                return ViewPage.ViewData;\r
-            }\r
-        }\r
-\r
-        internal ViewPage ViewPage {\r
-            get {\r
-                ViewPage viewPage = Page as ViewPage;\r
-                if (viewPage == null) {\r
-                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, MvcResources.ViewMasterPage_RequiresViewPage));\r
-                }\r
-                return viewPage;\r
-            }\r
-        }\r
-\r
-        public HtmlTextWriter Writer {\r
-            get {\r
-                return ViewPage.Writer;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewMasterPage`1.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewMasterPage`1.cs
deleted file mode 100644 (file)
index a8e4d99..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public class ViewMasterPage<TModel> : ViewMasterPage where TModel : class {\r
-        private AjaxHelper<TModel> _ajaxHelper;\r
-        private HtmlHelper<TModel> _htmlHelper;\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public new AjaxHelper<TModel> Ajax {\r
-            get {\r
-                if (_ajaxHelper == null) {\r
-                    _ajaxHelper = new AjaxHelper<TModel>(ViewContext, ViewPage);\r
-                }\r
-                return _ajaxHelper;\r
-            }\r
-        }\r
-\r
-        public new HtmlHelper<TModel> Html {\r
-            get {\r
-                if (_htmlHelper == null) {\r
-                    _htmlHelper = new HtmlHelper<TModel>(ViewContext, ViewPage);\r
-                }\r
-                return _htmlHelper;\r
-            }\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    _viewData = new ViewDataDictionary<TModel>(ViewPage.ViewData);\r
-                }\r
-                return _viewData;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPage.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPage.cs
deleted file mode 100644 (file)
index f96318c..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web;\r
-    using System.Web.UI;\r
-\r
-    [FileLevelControlBuilder(typeof(ViewPageControlBuilder))]\r
-    public class ViewPage : Page, IViewDataContainer {\r
-\r
-        private string _masterLocation;\r
-        private ViewDataDictionary _viewData;\r
-\r
-        public AjaxHelper Ajax {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public HtmlHelper Html {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string MasterLocation {\r
-            get {\r
-                return _masterLocation ?? String.Empty;\r
-            }\r
-            set {\r
-                _masterLocation = value;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                return ViewContext.TempData;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This is the mechanism by which the ViewPage gets its ViewDataDictionary object.")]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    SetViewData(new ViewDataDictionary());\r
-                }\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        public HtmlTextWriter Writer {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public virtual void InitHelpers() {\r
-            Ajax = new AjaxHelper(ViewContext, this);\r
-            Html = new HtmlHelper(ViewContext, this);\r
-            Url = new UrlHelper(ViewContext.RequestContext);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2109:ReviewVisibleEventHandlers")]\r
-        protected override void OnPreInit(EventArgs e) {\r
-            base.OnPreInit(e);\r
-\r
-            if (!String.IsNullOrEmpty(MasterLocation)) {\r
-                MasterPageFile = MasterLocation;\r
-            }\r
-        }\r
-\r
-        protected override void Render(HtmlTextWriter writer) {\r
-            Writer = writer;\r
-            try {\r
-                base.Render(writer);\r
-            }\r
-            finally {\r
-                Writer = null;\r
-            }\r
-        }\r
-\r
-        public virtual void RenderView(ViewContext viewContext) {\r
-            ViewContext = viewContext;\r
-            InitHelpers();\r
-            // Tracing requires Page IDs to be unique.\r
-            ID = Guid.NewGuid().ToString();\r
-            ProcessRequest(HttpContext.Current);\r
-        }\r
-\r
-        protected virtual void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = viewData;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPageControlBuilder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPageControlBuilder.cs
deleted file mode 100644 (file)
index cf494c2..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.CodeDom;\r
-    using System.Web.UI;\r
-\r
-    internal sealed class ViewPageControlBuilder : FileLevelPageControlBuilder {\r
-        public string PageBaseType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ProcessGeneratedCode(\r
-            CodeCompileUnit codeCompileUnit,\r
-            CodeTypeDeclaration baseType,\r
-            CodeTypeDeclaration derivedType,\r
-            CodeMemberMethod buildMethod,\r
-            CodeMemberMethod dataBindingMethod) {\r
-\r
-            // If we find got a base class string, use it\r
-            if (PageBaseType != null) {\r
-                derivedType.BaseTypes[0] = new CodeTypeReference(PageBaseType);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPage`1.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewPage`1.cs
deleted file mode 100644 (file)
index 3d0b2b4..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ViewPage<TModel> : ViewPage where TModel : class {\r
-\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public new AjaxHelper<TModel> Ajax {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public new HtmlHelper<TModel> Html {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    SetViewData(new ViewDataDictionary<TModel>());\r
-                }\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        public override void InitHelpers() {\r
-            base.InitHelpers();\r
-\r
-            Ajax = new AjaxHelper<TModel>(ViewContext, this);\r
-            Html = new HtmlHelper<TModel>(ViewContext, this);\r
-        }\r
-\r
-        protected override void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = new ViewDataDictionary<TModel>(viewData);\r
-\r
-            base.SetViewData(_viewData);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewResult.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewResult.cs
deleted file mode 100644 (file)
index 49b8a85..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ViewResult : ViewResultBase {\r
-        private string _masterName;\r
-\r
-        public string MasterName {\r
-            get {\r
-                return _masterName ?? String.Empty;\r
-            }\r
-            set {\r
-                _masterName = value;\r
-            }\r
-        }\r
-\r
-        protected override ViewEngineResult FindView(ControllerContext context) {\r
-            ViewEngineResult result = ViewEngineCollection.FindView(context, ViewName, MasterName);\r
-            if (result.View != null) {\r
-                return result;\r
-            }\r
-\r
-            // we need to generate an exception containing all the locations we searched\r
-            StringBuilder locationsText = new StringBuilder();\r
-            foreach (string location in result.SearchedLocations) {\r
-                locationsText.AppendLine();\r
-                locationsText.Append(location);\r
-            }\r
-            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Common_ViewNotFound, ViewName, locationsText));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewResultBase.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewResultBase.cs
deleted file mode 100644 (file)
index 397d460..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public abstract class ViewResultBase : ActionResult {\r
-        private TempDataDictionary _tempData;\r
-        private ViewDataDictionary _viewData;\r
-        private ViewEngineCollection _viewEngineCollection;\r
-        private string _viewName;\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This entire type is meant to be mutable.")]\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                if (_tempData == null) {\r
-                    _tempData = new TempDataDictionary();\r
-                }\r
-                return _tempData;\r
-            }\r
-            set {\r
-                _tempData = value;\r
-            }\r
-        }\r
-\r
-        public IView View {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This entire type is meant to be mutable.")]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    _viewData = new ViewDataDictionary();\r
-                }\r
-                return _viewData;\r
-            }\r
-            set {\r
-                _viewData = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This entire type is meant to be mutable.")]\r
-        public ViewEngineCollection ViewEngineCollection {\r
-            get {\r
-                return _viewEngineCollection ?? ViewEngines.Engines;\r
-            }\r
-            set {\r
-                _viewEngineCollection = value;\r
-            }\r
-        }\r
-\r
-        public string ViewName {\r
-            get {\r
-                return _viewName ?? String.Empty;\r
-            }\r
-            set {\r
-                _viewName = value;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-            if (String.IsNullOrEmpty(ViewName)) {\r
-                ViewName = context.RouteData.GetRequiredString("action");\r
-            }\r
-\r
-            ViewEngineResult result = null;\r
-\r
-            if (View == null) {\r
-                result = FindView(context);\r
-                View = result.View;\r
-            }\r
-\r
-            ViewContext viewContext = new ViewContext(context, View, ViewData, TempData);\r
-            View.Render(viewContext, context.HttpContext.Response.Output);\r
-\r
-            if (result != null) {\r
-                result.ViewEngine.ReleaseView(context, View);\r
-            }\r
-        }\r
-\r
-        protected abstract ViewEngineResult FindView(ControllerContext context);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewType.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewType.cs
deleted file mode 100644 (file)
index 39afcc9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.ComponentModel;\r
-    using System.Web.UI;\r
-\r
-    [ControlBuilder(typeof(ViewTypeControlBuilder))]\r
-    [NonVisualControl]\r
-    public class ViewType : Control {\r
-        private string _typeName;\r
-\r
-        [DefaultValue("")]\r
-        public string TypeName {\r
-            get {\r
-                return _typeName ?? String.Empty;\r
-            }\r
-            set {\r
-                _typeName = value;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewTypeControlBuilder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewTypeControlBuilder.cs
deleted file mode 100644 (file)
index 0a30653..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.CodeDom;\r
-    using System.Collections;\r
-    using System.Web.UI;\r
-\r
-    internal sealed class ViewTypeControlBuilder : ControlBuilder {\r
-        private string _typeName;\r
-\r
-        public override void Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, string tagName, string id, IDictionary attribs) {\r
-            base.Init(parser, parentBuilder, type, tagName, id, attribs);\r
-\r
-            _typeName = (string)attribs["typename"];\r
-        }\r
-\r
-        public override void ProcessGeneratedCode(\r
-            CodeCompileUnit codeCompileUnit,\r
-            CodeTypeDeclaration baseType,\r
-            CodeTypeDeclaration derivedType,\r
-            CodeMemberMethod buildMethod,\r
-            CodeMemberMethod dataBindingMethod) {\r
-\r
-            // Override the view's base type with the explicit base type\r
-            derivedType.BaseTypes[0] = new CodeTypeReference(_typeName);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewTypeParserFilter.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewTypeParserFilter.cs
deleted file mode 100644 (file)
index 545ec73..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Web.UI;\r
-\r
-    internal class ViewTypeParserFilter : PageParserFilter {\r
-\r
-        private string _viewBaseType;\r
-        private DirectiveType _directiveType = DirectiveType.Unknown;\r
-        private bool _viewTypeControlAdded;\r
-\r
-        public override void PreprocessDirective(string directiveName, IDictionary attributes) {\r
-            base.PreprocessDirective(directiveName, attributes);\r
-\r
-            string defaultBaseType = null;\r
-\r
-            // If we recognize the directive, keep track of what it was. If we don't recognize\r
-            // the directive then just stop.\r
-            switch (directiveName) {\r
-                case "page":\r
-                    _directiveType = DirectiveType.Page;\r
-                    defaultBaseType = typeof(ViewPage).FullName;\r
-                    break;\r
-                case "control":\r
-                    _directiveType = DirectiveType.UserControl;\r
-                    defaultBaseType = typeof(ViewUserControl).FullName;\r
-                    break;\r
-                case "master":\r
-                    _directiveType = DirectiveType.Master;\r
-                    defaultBaseType = typeof(ViewMasterPage).FullName;\r
-                    break;\r
-            }\r
-\r
-            if (_directiveType == DirectiveType.Unknown) {\r
-                // If we're processing an unknown directive (e.g. a register directive), stop processing\r
-                return;\r
-            }\r
-\r
-            // Look for an inherit attribute\r
-            string inherits = (string)attributes["inherits"];\r
-            if (!String.IsNullOrEmpty(inherits)) {\r
-                // If it doesn't look like a generic type, don't do anything special,\r
-                // and let the parser do its normal processing\r
-                if (IsGenericTypeString(inherits)) {\r
-                    // Remove the inherits attribute so the parser doesn't blow up\r
-                    attributes["inherits"] = defaultBaseType;\r
-\r
-                    // Remember the full type string so we can later give it to the ControlBuilder\r
-                    _viewBaseType = inherits;\r
-                }\r
-            }\r
-        }\r
-\r
-        private static bool IsGenericTypeString(string typeName) {\r
-            // Detect C# and VB generic syntax\r
-            // REVIEW: what about other languages?\r
-            return typeName.IndexOfAny(new char[] { '<', '(' }) >= 0;\r
-        }\r
-\r
-        public override void ParseComplete(ControlBuilder rootBuilder) {\r
-            base.ParseComplete(rootBuilder);\r
-\r
-            // If it's our page ControlBuilder, give it the base type string\r
-            ViewPageControlBuilder pageBuilder = rootBuilder as ViewPageControlBuilder;\r
-            if (pageBuilder != null) {\r
-                pageBuilder.PageBaseType = _viewBaseType;\r
-            }\r
-            ViewUserControlControlBuilder userControlBuilder = rootBuilder as ViewUserControlControlBuilder;\r
-            if (userControlBuilder != null) {\r
-                userControlBuilder.UserControlBaseType = _viewBaseType;\r
-            }\r
-        }\r
-\r
-        public override bool ProcessCodeConstruct(CodeConstructType codeType, string code) {\r
-            if (codeType == CodeConstructType.ExpressionSnippet &&\r
-                !_viewTypeControlAdded &&\r
-                _viewBaseType != null &&\r
-                _directiveType == DirectiveType.Master) {\r
-\r
-                // If we're dealing with a master page that needs to have its base type set, do it here.\r
-                // It's done by adding the ViewType control, which has a builder that sets the base type.\r
-\r
-                // The code currently assumes that the file in question contains a code snippet, since\r
-                // that's the item we key off of in order to know when to add the ViewType control.\r
-\r
-                Hashtable attribs = new Hashtable();\r
-                attribs["typename"] = _viewBaseType;\r
-                AddControl(typeof(ViewType), attribs);\r
-                _viewTypeControlAdded = true;\r
-            }\r
-\r
-            return base.ProcessCodeConstruct(codeType, code);\r
-        }\r
-\r
-        // Everything else in this class is unrelated to our 'inherits' handling.\r
-        // Since PageParserFilter blocks everything by default, we need to unblock it\r
-\r
-        public override bool AllowCode {\r
-            get {\r
-                return true;\r
-            }\r
-        }\r
-\r
-        public override bool AllowBaseType(Type baseType) {\r
-            return true;\r
-        }\r
-\r
-        public override bool AllowControl(Type controlType, ControlBuilder builder) {\r
-            return true;\r
-        }\r
-\r
-        public override bool AllowVirtualReference(string referenceVirtualPath, VirtualReferenceType referenceType) {\r
-            return true;\r
-        }\r
-\r
-        public override bool AllowServerSideInclude(string includeVirtualPath) {\r
-            return true;\r
-        }\r
-\r
-        public override int NumberOfControlsAllowed {\r
-            get {\r
-                return -1;\r
-            }\r
-        }\r
-\r
-        public override int NumberOfDirectDependenciesAllowed {\r
-            get {\r
-                return -1;\r
-            }\r
-        }\r
-\r
-        public override int TotalNumberOfDependenciesAllowed {\r
-            get {\r
-                return -1;\r
-            }\r
-        }\r
-\r
-        private enum DirectiveType {\r
-            Unknown,\r
-            Page,\r
-            UserControl,\r
-            Master,\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControl.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControl.cs
deleted file mode 100644 (file)
index e33501d..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    [FileLevelControlBuilder(typeof(ViewUserControlControlBuilder))]\r
-    public class ViewUserControl : UserControl, IViewDataContainer {\r
-        private AjaxHelper _ajaxHelper;\r
-        private HtmlHelper _htmlHelper;\r
-        private ViewContext _viewContext;\r
-        private ViewDataDictionary _viewData;\r
-        private string _viewDataKey;\r
-\r
-        public AjaxHelper Ajax {\r
-            get {\r
-                if (_ajaxHelper == null) {\r
-                    _ajaxHelper = new AjaxHelper(ViewContext, this);\r
-                }\r
-                return _ajaxHelper;\r
-            }\r
-        }\r
-\r
-        public HtmlHelper Html {\r
-            get {\r
-                if (_htmlHelper == null) {\r
-                    _htmlHelper = new HtmlHelper(ViewContext, this);\r
-                }\r
-                return _htmlHelper;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                return ViewPage.TempData;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get {\r
-                return ViewPage.Url;\r
-            }\r
-        }\r
-\r
-        [Browsable(false)]\r
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]\r
-        public ViewContext ViewContext {\r
-            get {\r
-                return _viewContext ?? ViewPage.ViewContext;\r
-            }\r
-            set {\r
-                _viewContext = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This is the mechanism by which the ViewUserControl gets its ViewDataDictionary object.")]\r
-        [Browsable(false)]\r
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                EnsureViewData();\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        [DefaultValue("")]\r
-        public string ViewDataKey {\r
-            get {\r
-                return _viewDataKey ?? String.Empty;\r
-            }\r
-            set {\r
-                _viewDataKey = value;\r
-            }\r
-        }\r
-\r
-        internal ViewPage ViewPage {\r
-            get {\r
-                ViewPage viewPage = Page as ViewPage;\r
-                if (viewPage == null) {\r
-                    throw new InvalidOperationException(MvcResources.ViewUserControl_RequiresViewPage);\r
-                }\r
-                return viewPage;\r
-            }\r
-        }\r
-\r
-        public HtmlTextWriter Writer {\r
-            get {\r
-                return ViewPage.Writer;\r
-            }\r
-        }\r
-\r
-        protected virtual void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = viewData;\r
-        }\r
-\r
-        protected void EnsureViewData() {\r
-            if (_viewData != null) {\r
-                return;\r
-            }\r
-\r
-            // Get the ViewData for this ViewUserControl, optionally using the specified ViewDataKey\r
-            IViewDataContainer vdc = GetViewDataContainer(this);\r
-            if (vdc == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ViewUserControl_RequiresViewDataProvider,\r
-                        AppRelativeVirtualPath));\r
-            }\r
-\r
-            ViewDataDictionary myViewData = vdc.ViewData;\r
-\r
-            // If we have a ViewDataKey, try to extract the ViewData from the dictionary, otherwise\r
-            // return the container's ViewData.\r
-            if (!String.IsNullOrEmpty(ViewDataKey)) {\r
-                object target = myViewData.Eval(ViewDataKey);\r
-                myViewData = target as ViewDataDictionary ?? new ViewDataDictionary(myViewData) { Model = target };\r
-            }\r
-\r
-            SetViewData(myViewData);\r
-        }\r
-\r
-        private static IViewDataContainer GetViewDataContainer(Control control) {\r
-            // Walk up the control hierarchy until we find someone that implements IViewDataContainer\r
-            while (control != null) {\r
-                control = control.Parent;\r
-                IViewDataContainer vdc = control as IViewDataContainer;\r
-                if (vdc != null) {\r
-                    return vdc;\r
-                }\r
-            }\r
-            return null;\r
-        }\r
-\r
-        public virtual void RenderView(ViewContext viewContext) {\r
-            // TODO: Remove this hack. Without it, the browser appears to always load cached output\r
-            viewContext.HttpContext.Response.Cache.SetExpires(DateTime.Now);\r
-            ViewUserControlContainerPage containerPage = new ViewUserControlContainerPage(this);\r
-            // Tracing requires Page IDs to be unique.\r
-            ID = Guid.NewGuid().ToString();\r
-\r
-            RenderViewAndRestoreContentType(containerPage, viewContext);\r
-        }\r
-\r
-        internal static void RenderViewAndRestoreContentType(ViewPage containerPage, ViewContext viewContext) {\r
-            // We need to restore the Content-Type since Page.SetIntrinsics() will reset it. It's not possible\r
-            // to work around the call to SetIntrinsics() since the control's render method requires the\r
-            // containing page's Response property to be non-null, and SetIntrinsics() is the only way to set\r
-            // this.\r
-            string savedContentType = viewContext.HttpContext.Response.ContentType;\r
-            containerPage.RenderView(viewContext);\r
-            viewContext.HttpContext.Response.ContentType = savedContentType;\r
-        }\r
-\r
-        private sealed class ViewUserControlContainerPage : ViewPage {\r
-            public ViewUserControlContainerPage(ViewUserControl userControl) {\r
-                Controls.Add(userControl);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControlControlBuilder.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControlControlBuilder.cs
deleted file mode 100644 (file)
index 8bd473a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.CodeDom;\r
-    using System.Web.UI;\r
-\r
-    internal sealed class ViewUserControlControlBuilder : FileLevelUserControlBuilder {\r
-        internal string UserControlBaseType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ProcessGeneratedCode(\r
-            CodeCompileUnit codeCompileUnit,\r
-            CodeTypeDeclaration baseType,\r
-            CodeTypeDeclaration derivedType,\r
-            CodeMemberMethod buildMethod,\r
-            CodeMemberMethod dataBindingMethod) {\r
-\r
-            // If we find got a base class string, use it\r
-            if (UserControlBaseType != null) {\r
-                derivedType.BaseTypes[0] = new CodeTypeReference(UserControlBaseType);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControl`1.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/ViewUserControl`1.cs
deleted file mode 100644 (file)
index 41e1949..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ViewUserControl<TModel> : ViewUserControl where TModel : class {\r
-        private AjaxHelper<TModel> _ajaxHelper;\r
-        private HtmlHelper<TModel> _htmlHelper;\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public new AjaxHelper<TModel> Ajax {\r
-            get {\r
-                if (_ajaxHelper == null) {\r
-                    _ajaxHelper = new AjaxHelper<TModel>(ViewContext, this);\r
-                }\r
-                return _ajaxHelper;\r
-            }\r
-        }\r
-\r
-        public new HtmlHelper<TModel> Html {\r
-            get {\r
-                if (_htmlHelper == null) {\r
-                    _htmlHelper = new HtmlHelper<TModel>(ViewContext, this);\r
-                }\r
-                return _htmlHelper;\r
-            }\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }            \r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                EnsureViewData();\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        protected override void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = new ViewDataDictionary<TModel>(viewData);\r
-\r
-            base.SetViewData(_viewData);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/VirtualPathProviderViewEngine.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/VirtualPathProviderViewEngine.cs
deleted file mode 100644 (file)
index 72c64e4..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Web;\r
-    using System.Web.Hosting;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public abstract class VirtualPathProviderViewEngine : IViewEngine {\r
-        // format is ":ViewCacheEntry:{cacheType}:{prefix}:{name}:{controllerName}:"\r
-        private const string _cacheKeyFormat = ":ViewCacheEntry:{0}:{1}:{2}:{3}:";\r
-        private const string _cacheKeyPrefix_Master = "Master";\r
-        private const string _cacheKeyPrefix_Partial = "Partial";\r
-        private const string _cacheKeyPrefix_View = "View";\r
-        private static readonly string[] _emptyLocations = new string[0];\r
-\r
-        private VirtualPathProvider _vpp;\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] MasterLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] PartialViewLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public IViewLocationCache ViewLocationCache {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] ViewLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        protected VirtualPathProvider VirtualPathProvider {\r
-            get {\r
-                if (_vpp == null) {\r
-                    _vpp = HostingEnvironment.VirtualPathProvider;\r
-                }\r
-                return _vpp;\r
-            }\r
-            set {\r
-                _vpp = value;\r
-            }\r
-        }\r
-\r
-        protected VirtualPathProviderViewEngine() {\r
-            if (HttpContext.Current == null || HttpContext.Current.IsDebuggingEnabled) {\r
-                ViewLocationCache = DefaultViewLocationCache.Null;\r
-            }\r
-            else {\r
-                ViewLocationCache = new DefaultViewLocationCache();\r
-            }\r
-        }\r
-\r
-        private string CreateCacheKey(string prefix, string name, string controllerName) {\r
-            return String.Format(CultureInfo.InvariantCulture, _cacheKeyFormat,\r
-                GetType().AssemblyQualifiedName, prefix, name, controllerName);\r
-        }\r
-\r
-        protected abstract IView CreatePartialView(ControllerContext controllerContext, string partialPath);\r
-\r
-        protected abstract IView CreateView(ControllerContext controllerContext, string viewPath, string masterPath);\r
-\r
-        protected virtual bool FileExists(ControllerContext controllerContext, string virtualPath) {\r
-            return VirtualPathProvider.FileExists(virtualPath);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(partialViewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "partialViewName");\r
-            }\r
-\r
-            string[] searched;\r
-            string controllerName = controllerContext.RouteData.GetRequiredString("controller");\r
-            string partialPath = GetPath(controllerContext, PartialViewLocationFormats, "PartialViewLocationFormats", partialViewName, controllerName, _cacheKeyPrefix_Partial, useCache, out searched);\r
-\r
-            if (String.IsNullOrEmpty(partialPath)) {\r
-                return new ViewEngineResult(searched);\r
-            }\r
-\r
-            return new ViewEngineResult(CreatePartialView(controllerContext, partialPath), this);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(viewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "viewName");\r
-            }\r
-\r
-            string[] viewLocationsSearched;\r
-            string[] masterLocationsSearched;\r
-\r
-            string controllerName = controllerContext.RouteData.GetRequiredString("controller");\r
-            string viewPath = GetPath(controllerContext, ViewLocationFormats, "ViewLocationFormats", viewName, controllerName, _cacheKeyPrefix_View, useCache, out viewLocationsSearched);\r
-            string masterPath = GetPath(controllerContext, MasterLocationFormats, "MasterLocationFormats", masterName, controllerName, _cacheKeyPrefix_Master, useCache, out masterLocationsSearched);\r
-\r
-            if (String.IsNullOrEmpty(viewPath) || (String.IsNullOrEmpty(masterPath) && !String.IsNullOrEmpty(masterName))) {\r
-                return new ViewEngineResult(viewLocationsSearched.Union(masterLocationsSearched));\r
-            }\r
-\r
-            return new ViewEngineResult(CreateView(controllerContext, viewPath, masterPath), this);\r
-        }\r
-\r
-        private string GetPath(ControllerContext controllerContext, string[] locations, string locationsPropertyName, string name, string controllerName, string cacheKeyPrefix, bool useCache, out string[] searchedLocations) {\r
-            searchedLocations = _emptyLocations;\r
-\r
-            if (String.IsNullOrEmpty(name)) {\r
-                return String.Empty;\r
-            }\r
-\r
-            if (locations == null || locations.Length == 0) {\r
-                throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                    MvcResources.Common_PropertyCannotBeNullOrEmpty, locationsPropertyName));\r
-            }\r
-\r
-            bool nameRepresentsPath = IsSpecificPath(name);\r
-            string cacheKey = CreateCacheKey(cacheKeyPrefix, name, (nameRepresentsPath) ? String.Empty : controllerName);\r
-\r
-            if (useCache) {\r
-                string result = ViewLocationCache.GetViewLocation(controllerContext.HttpContext, cacheKey);\r
-                if (result != null) {\r
-                    return result;\r
-                }\r
-            }\r
-\r
-            return (nameRepresentsPath) ?\r
-                GetPathFromSpecificName(controllerContext, name, cacheKey, ref searchedLocations) :\r
-                GetPathFromGeneralName(controllerContext, locations, name, controllerName, cacheKey, ref searchedLocations);\r
-        }\r
-\r
-        private string GetPathFromGeneralName(ControllerContext controllerContext, string[] locations, string name, string controllerName, string cacheKey, ref string[] searchedLocations) {\r
-            string result = String.Empty;\r
-            searchedLocations = new string[locations.Length];\r
-\r
-            for (int i = 0; i < locations.Length; i++) {\r
-                string virtualPath = String.Format(CultureInfo.InvariantCulture, locations[i], name, controllerName);\r
-\r
-                if (FileExists(controllerContext, virtualPath)) {\r
-                    searchedLocations = _emptyLocations;\r
-                    result = virtualPath;\r
-                    ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, cacheKey, result);\r
-                    break;\r
-                }\r
-\r
-                searchedLocations[i] = virtualPath;\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private string GetPathFromSpecificName(ControllerContext controllerContext, string name, string cacheKey, ref string[] searchedLocations) {\r
-            string result = name;\r
-\r
-            if (!FileExists(controllerContext, name)) {\r
-                result = String.Empty;\r
-                searchedLocations = new[] { name };\r
-            }\r
-\r
-            ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, cacheKey, result);\r
-            return result;\r
-        }\r
-\r
-        private static bool IsSpecificPath(string name) {\r
-            char c = name[0];\r
-            return (c == '~' || c == '/');\r
-        }\r
-\r
-        public virtual void ReleaseView(ControllerContext controllerContext, IView view) {\r
-            IDisposable disposable = view as IDisposable;\r
-            if (disposable != null) {\r
-                disposable.Dispose();\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/WebFormView.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/WebFormView.cs
deleted file mode 100644 (file)
index 7167d8c..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class WebFormView : IView {\r
-\r
-        private IBuildManager _buildManager;\r
-\r
-        public WebFormView(string viewPath)\r
-            : this(viewPath, null) {\r
-        }\r
-\r
-        public WebFormView(string viewPath, string masterPath) {\r
-            if (String.IsNullOrEmpty(viewPath)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "viewPath");\r
-            }\r
-\r
-            ViewPath = viewPath;\r
-            MasterPath = masterPath ?? String.Empty;\r
-        }\r
-\r
-        internal IBuildManager BuildManager {\r
-            get {\r
-                if (_buildManager == null) {\r
-                    _buildManager = new BuildManagerWrapper();\r
-                }\r
-                return _buildManager;\r
-            }\r
-            set {\r
-                _buildManager = value;\r
-            }\r
-        }\r
-\r
-        public string MasterPath {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string ViewPath {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public virtual void Render(ViewContext viewContext, TextWriter writer) {\r
-            if (viewContext == null) {\r
-                throw new ArgumentNullException("viewContext");\r
-            }\r
-\r
-            object viewInstance = BuildManager.CreateInstanceFromVirtualPath(ViewPath, typeof(object));\r
-            if (viewInstance == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.WebFormViewEngine_ViewCouldNotBeCreated,\r
-                        ViewPath));\r
-            }\r
-\r
-            ViewPage viewPage = viewInstance as ViewPage;\r
-            if (viewPage != null) {\r
-                RenderViewPage(viewContext, viewPage);\r
-                return;\r
-            }\r
-\r
-            ViewUserControl viewUserControl = viewInstance as ViewUserControl;\r
-            if (viewUserControl != null) {\r
-                RenderViewUserControl(viewContext, viewUserControl);\r
-                return;\r
-            }\r
-\r
-            throw new InvalidOperationException(\r
-                String.Format(\r
-                    CultureInfo.CurrentUICulture,\r
-                    MvcResources.WebFormViewEngine_WrongViewBase,\r
-                    ViewPath));\r
-        }\r
-\r
-        private void RenderViewPage(ViewContext context, ViewPage page) {\r
-            if (!String.IsNullOrEmpty(MasterPath)) {\r
-                page.MasterLocation = MasterPath;\r
-            }\r
-\r
-            page.ViewData = context.ViewData;\r
-            page.RenderView(context);\r
-        }\r
-\r
-        private void RenderViewUserControl(ViewContext context, ViewUserControl control) {\r
-            if (!String.IsNullOrEmpty(MasterPath)) {\r
-                throw new InvalidOperationException(MvcResources.WebFormViewEngine_UserControlCannotHaveMaster);\r
-            }\r
-\r
-            control.ViewData = context.ViewData;\r
-            control.RenderView(context);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/System.Web.Mvc/WebFormViewEngine.cs b/mcs/class/System.Web.Mvc/System.Web.Mvc/WebFormViewEngine.cs
deleted file mode 100644 (file)
index 4dd4223..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Net;\r
-    using System.Web;\r
-\r
-    public class WebFormViewEngine : VirtualPathProviderViewEngine {\r
-\r
-        private IBuildManager _buildManager;\r
-\r
-        public WebFormViewEngine() {\r
-            MasterLocationFormats = new[] {\r
-                "~/Views/{1}/{0}.master",\r
-                "~/Views/Shared/{0}.master"\r
-            };\r
-\r
-            ViewLocationFormats = new[] {\r
-                "~/Views/{1}/{0}.aspx",\r
-                "~/Views/{1}/{0}.ascx",\r
-                "~/Views/Shared/{0}.aspx",\r
-                "~/Views/Shared/{0}.ascx"\r
-            };\r
-\r
-            PartialViewLocationFormats = ViewLocationFormats;\r
-        }\r
-\r
-        internal IBuildManager BuildManager {\r
-            get {\r
-                if (_buildManager == null) {\r
-                    _buildManager = new BuildManagerWrapper();\r
-                }\r
-                return _buildManager;\r
-            }\r
-            set {\r
-                _buildManager = value;\r
-            }\r
-        }\r
-\r
-        protected override IView CreatePartialView(ControllerContext controllerContext, string partialPath) {\r
-            return new WebFormView(partialPath, null);\r
-        }\r
-\r
-        protected override IView CreateView(ControllerContext controllerContext, string viewPath, string masterPath) {\r
-            return new WebFormView(viewPath, masterPath);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",\r
-            Justification = "Exceptions are interpreted as indicating that the file does not exist.")]\r
-        protected override bool FileExists(ControllerContext controllerContext, string virtualPath) {\r
-            try {\r
-                object viewInstance = BuildManager.CreateInstanceFromVirtualPath(virtualPath, typeof(object));\r
-\r
-                return viewInstance != null;\r
-            }\r
-            catch (HttpException he) {\r
-                if (he.GetHttpCode() == (int)HttpStatusCode.NotFound) {\r
-                    // If BuildManager returns a 404 (Not Found) that means the file did not exist\r
-                    return false;\r
-                }\r
-                else {\r
-                    // All other error codes imply other errors such as compilation or parsing errors\r
-                    throw;\r
-                }\r
-            }\r
-            catch {\r
-                return false;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc/license.htm b/mcs/class/System.Web.Mvc/license.htm
deleted file mode 100644 (file)
index 1d07132..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>\r
-<head><title>Microsoft Public License (Ms-PL)</title></head>\r
-<body>\r
-<pre>Microsoft Public License (Ms-PL)\r
-\r
-This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.\r
-\r
-1. Definitions\r
-\r
-The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.\r
-\r
-A "contribution" is the original software, or any additions or changes to the software.\r
-\r
-A "contributor" is any person that distributes its contribution under this license.\r
-\r
-"Licensed patents" are a contributor's patent claims that read directly on its contribution.\r
-\r
-2. Grant of Rights\r
-\r
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.\r
-\r
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.\r
-\r
-3. Conditions and Limitations\r
-\r
-(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.\r
-\r
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.\r
-\r
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.\r
-\r
-(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.\r
-\r
-(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.</pre>\r
-</body>
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc2/.gitattributes b/mcs/class/System.Web.Mvc2/.gitattributes
deleted file mode 100644 (file)
index fec239f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/GlobalSuppressions.cs -crlf
diff --git a/mcs/class/System.Web.Mvc2/ChangeLog b/mcs/class/System.Web.Mvc2/ChangeLog
deleted file mode 100644 (file)
index 801d9d0..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-2010-05-28  Robert Jordan  <robertj@gmx.net>
-
-       * Makefile, *.dll.sources: disambiguate between Mvc and Mvc2
-       by using a distinct LIBRARY. Needed because the current
-       build system does not pay attention to LIBRARY_COMPAT
-       while building *.reponse  and *.makefrag.
-
-2010-03-18  Marek Habersack  <mhabersack@novell.com>
-
-       * Makefile: include resources in compilation
-
-2010-02-09  Marek Habersack  <mhabersack@novell.com>
-
-       * Makefile: added references to
-       System.ComponentModel.DataAnnotations and System.Data.Linq
-
diff --git a/mcs/class/System.Web.Mvc2/GlobalSuppressions.cs b/mcs/class/System.Web.Mvc2/GlobalSuppressions.cs
deleted file mode 100644 (file)
index 71130ae..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage \r
-// attributes that are applied to this project. \r
-// Project-level suppressions either have no target or are given \r
-// a specific target and scoped to a namespace, type, member, etc. \r
-//\r
-// To add a suppression to this file, right-click the message in the \r
-// Error List, point to "Suppress Message(s)", and click \r
-// "In Project Suppression File". \r
-// You do not need to add suppressions to this file manually. \r
-\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Scope = "member", Target = "System.Web.Mvc.TempDataDictionary.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Object>>.Contains(System.Collections.Generic.KeyValuePair`2<System.String,System.Object>)",\r
-    Justification = "There are no defined scenarios for wanting to derive from this class, but we don't want to prevent it either.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Scope = "member", Target = "System.Web.Mvc.TempDataDictionary.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Object>>.CopyTo(System.Collections.Generic.KeyValuePair`2<System.String,System.Object>[],System.Int32)",\r
-    Justification = "There are no defined scenarios for wanting to derive from this class, but we don't want to prevent it either.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Scope = "member", Target = "System.Web.Mvc.TempDataDictionary.#System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<System.String,System.Object>>.IsReadOnly",\r
-    Justification = "There are no defined scenarios for wanting to derive from this class, but we don't want to prevent it either.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.Web.Mvc.Ajax",\r
-    Justification = "Helpers reside within a separate namespace to support alternate helper classes.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Portability", "CA1903:UseOnlyApiFromTargetedFramework", MessageId = "System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",\r
-    Justification = "MVC has a .NET Framework 3.5 SP1 dependency.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Portability", "CA1903:UseOnlyApiFromTargetedFramework", MessageId = "System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",\r
-    Justification = "MVC has a .NET Framework 3.5 SP1 dependency.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Portability", "CA1903:UseOnlyApiFromTargetedFramework", MessageId = "System.ComponentModel.DataAnnotations, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",\r
-    Justification = "MVC has a .NET Framework 3.5 SP1 dependency.")]\r
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Portability", "CA1903:UseOnlyApiFromTargetedFramework", MessageId = "System.Data.Entity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",\r
-    Justification = "MVC has a .NET Framework 3.5 SP1 dependency.")]\r
diff --git a/mcs/class/System.Web.Mvc2/Makefile b/mcs/class/System.Web.Mvc2/Makefile
deleted file mode 100644 (file)
index 618435b..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-thisdir = class/System.Web.Mvc2
-SUBDIRS = 
-include ../../build/rules.make
-
-LIBRARY = System.Web.Mvc2.dll
-LIBRARY_NAME = System.Web.Mvc.dll
-
-RESX_DIST =  System.Web.Mvc/Resources/MvcResources.resx
-
-LIB_MCS_FLAGS = \
-               /warn:1 \
-               /keyfile:../winfx.pub \
-               /r:System.dll \
-               /r:System.Core.dll \
-               /r:System.Configuration.dll \
-               /r:System.Data.dll \
-               /r:System.Xml.dll \
-               /r:System.Web.dll \
-               /r:System.Web.Abstractions.dll \
-               /r:System.Web.Routing.dll \
-               /r:System.Web.Extensions.dll \
-               /r:System.ComponentModel.DataAnnotations.dll \
-               /r:System.Data.Linq.dll \
-               $(foreach r, $(RESOURCES), /resource:$(r),System.Web.Mvc.Resources.$(notdir $(r)))
-
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5 -d:MONO
-endif
-
-EXTRA_DISTFILES = $(RESX_DIST)
-
-# This is a .NET 3.5+ assembly - it must be built ONLY in the 2.0 profile
-VALID_PROFILE := $(filter net_2_0, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Web.Mvc.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-else
-RESOURCES = $(RESX_DIST:.resx=.resources)
-endif
-
-include ../../build/library.make
-
-$(build_lib): $(RESOURCES)
-
-$(RESOURCES): %.resources: %.resx
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
diff --git a/mcs/class/System.Web.Mvc2/Properties/.gitattributes b/mcs/class/System.Web.Mvc2/Properties/.gitattributes
deleted file mode 100644 (file)
index f7d8287..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/AssemblyInfo.cs -crlf
diff --git a/mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs b/mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 82e6226..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-using System;\r
-using System.Diagnostics.CodeAnalysis;\r
-using System.Reflection;\r
-using System.Resources;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-using System.Security;\r
-\r
-// General Information about an assembly is controlled through the following \r
-// set of attributes. Change these attribute values to modify the information\r
-// associated with an assembly.\r
-[assembly: AssemblyTitle("System.Web.Mvc.dll")]\r
-[assembly: AssemblyDescription("System.Web.Mvc.dll")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("Microsoft Corporation")]\r
-[assembly: AssemblyProduct("Microsoft® .NET Framework")]\r
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// Setting ComVisible to false makes the types in this assembly not visible \r
-// to COM components.  If you need to access a type in this assembly from \r
-// COM, set the ComVisible attribute to true on that type.\r
-[assembly: ComVisible(false)]\r
-\r
-// The following GUID is for the ID of the typelib if this project is exposed to COM\r
-[assembly: Guid("4b5f4208-c6b0-4c37-9a41-63325ffa52ad")]\r
-\r
-// Version information for an assembly consists of the following four values:\r
-//\r
-//      Major Version\r
-//      Minor Version \r
-//      Build Number\r
-//      Revision\r
-//\r
-// You can specify all the values or you can default the Build and Revision Numbers \r
-// by using the '*' as shown below:\r
-// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.0.0")]\r
-[assembly: AssemblyFileVersion("2.0.50217.0")]\r
-\r
-[assembly: AllowPartiallyTrustedCallers]\r
-[assembly: SecurityTransparent]\r
-[assembly: CLSCompliant(true)]\r
-[assembly: NeutralResourcesLanguage("en-US")]\r
-\r
-[assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames",\r
-    Justification = "Assembly is delay-signed.")]\r
-\r
-[assembly: AssemblyDelaySign (true)]\r
diff --git a/mcs/class/System.Web.Mvc2/Properties/ChangeLog b/mcs/class/System.Web.Mvc2/Properties/ChangeLog
deleted file mode 100644 (file)
index 6e4c8c6..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-2010-02-09  Marek Habersack  <mhabersack@novell.com>
-
-       * AssemblyInfo.cs: added Mono-specific attributes to delay-sign
-       the assembly and use the winfs.pub key
-
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc.csproj b/mcs/class/System.Web.Mvc2/System.Web.Mvc.csproj
deleted file mode 100644 (file)
index a47c382..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3D3FFD8A-624D-4E9B-954B-E1C105507975}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>System.Web</RootNamespace>\r
-    <AssemblyName>System.Web.Mvc</AssemblyName>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>\r
-    <BaseAddress>1609891840</BaseAddress>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>..\..\bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>..\..\bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="System" />\r
-    <Reference Include="System.ComponentModel.DataAnnotations">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.configuration" />\r
-    <Reference Include="System.Core">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Data.Entity">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Data.Linq">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Web" />\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Web.Abstractions">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Web.Extensions">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Web.Routing">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Xml" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Mvc\AssociatedMetadataProvider.cs" />\r
-    <Compile Include="Mvc\ActionExecutedContext.cs" />\r
-    <Compile Include="Mvc\ActionExecutingContext.cs" />\r
-    <Compile Include="Mvc\AntiForgeryData.cs" />\r
-    <Compile Include="Mvc\AntiForgeryDataSerializer.cs" />\r
-    <Compile Include="Mvc\ClientDataTypeModelValidatorProvider.cs" />\r
-    <Compile Include="Mvc\AssociatedValidatorProvider.cs" />\r
-    <Compile Include="Mvc\Async\ActionDescriptorCreator.cs" />\r
-    <Compile Include="Mvc\Async\AsyncActionDescriptor.cs" />\r
-    <Compile Include="Mvc\Async\AsyncActionMethodSelector.cs" />\r
-    <Compile Include="Mvc\Async\AsyncControllerActionInvoker.cs" />\r
-    <Compile Include="Mvc\Async\SynchronousOperationException.cs" />\r
-    <Compile Include="Mvc\Async\AsyncManager.cs" />\r
-    <Compile Include="Mvc\AsyncTimeoutAttribute.cs" />\r
-    <Compile Include="Mvc\Async\BeginInvokeDelegate.cs" />\r
-    <Compile Include="Mvc\Async\AsyncResultWrapper.cs" />\r
-    <Compile Include="Mvc\Async\AsyncVoid.cs" />\r
-    <Compile Include="Mvc\AsyncController.cs" />\r
-    <Compile Include="Mvc\Async\AsyncUtil.cs" />\r
-    <Compile Include="Mvc\Async\IAsyncController.cs" />\r
-    <Compile Include="Mvc\Async\IAsyncActionInvoker.cs" />\r
-    <Compile Include="Mvc\Async\IAsyncManagerContainer.cs" />\r
-    <Compile Include="Mvc\UrlParameter.cs" />\r
-    <Compile Include="Mvc\FormValueProvider.cs" />\r
-    <Compile Include="Mvc\FormValueProviderFactory.cs" />\r
-    <Compile Include="Mvc\HttpFileCollectionValueProvider.cs" />\r
-    <Compile Include="Mvc\HttpFileCollectionValueProviderFactory.cs" />\r
-    <Compile Include="Mvc\QueryStringValueProvider.cs" />\r
-    <Compile Include="Mvc\QueryStringValueProviderFactory.cs" />\r
-    <Compile Include="Mvc\RangeAttributeAdapter.cs" />\r
-    <Compile Include="Mvc\RegularExpressionAttributeAdapter.cs" />\r
-    <Compile Include="Mvc\RequiredAttributeAdapter.cs" />\r
-    <Compile Include="Mvc\RouteDataValueProvider.cs" />\r
-    <Compile Include="Mvc\RouteDataValueProviderFactory.cs" />\r
-    <Compile Include="Mvc\StringLengthAttributeAdapter.cs" />\r
-    <Compile Include="Mvc\TypeCacheUtil.cs" />\r
-    <Compile Include="Mvc\TypeCacheSerializer.cs" />\r
-    <Compile Include="Mvc\Html\DisplayTextExtensions.cs" />\r
-    <Compile Include="Mvc\NoAsyncTimeoutAttribute.cs" />\r
-    <Compile Include="Mvc\Async\OperationCounter.cs" />\r
-    <Compile Include="Mvc\Async\ReflectedAsyncActionDescriptor.cs" />\r
-    <Compile Include="Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />\r
-    <Compile Include="Mvc\Async\Trigger.cs" />\r
-    <Compile Include="Mvc\Async\TriggerListener.cs" />\r
-    <Compile Include="Mvc\Async\SimpleAsyncResult.cs" />\r
-    <Compile Include="Mvc\Async\EndInvokeDelegate.cs" />\r
-    <Compile Include="Mvc\Async\EndInvokeDelegate`1.cs" />\r
-    <Compile Include="Mvc\Async\SynchronizationContextUtil.cs" />\r
-    <Compile Include="Mvc\AuthorizationContext.cs" />\r
-    <Compile Include="Mvc\ByteArrayModelBinder.cs" />\r
-    <Compile Include="Mvc\ControllerContext.cs" />\r
-    <Compile Include="Mvc\Html\ChildActionExtensions.cs" />\r
-    <Compile Include="Mvc\ParameterInfoUtil.cs" />\r
-    <Compile Include="Mvc\HttpHandlerUtil.cs" />\r
-    <Compile Include="Mvc\ChildActionOnlyAttribute.cs" />\r
-    <Compile Include="Mvc\TypeDescriptorHelper.cs" />\r
-    <Compile Include="Mvc\ValueProviderFactories.cs" />\r
-    <Compile Include="Mvc\ValueProviderFactory.cs" />\r
-    <Compile Include="Mvc\ValueProviderFactoryCollection.cs" />\r
-    <Compile Include="Mvc\ValueProviderCollection.cs" />\r
-    <Compile Include="Mvc\DictionaryValueProvider`1.cs" />\r
-    <Compile Include="Mvc\NameValueCollectionValueProvider.cs" />\r
-    <Compile Include="Mvc\ValueProviderUtil.cs" />\r
-    <Compile Include="Mvc\IValueProvider.cs" />\r
-    <Compile Include="Mvc\DataErrorInfoModelValidatorProvider.cs" />\r
-    <Compile Include="Mvc\ModelValidatorProviderCollection.cs" />\r
-    <Compile Include="Mvc\DataAnnotationsModelMetadata.cs" />\r
-    <Compile Include="Mvc\HiddenInputAttribute.cs" />\r
-    <Compile Include="Mvc\HttpGetAttribute.cs" />\r
-    <Compile Include="Mvc\HttpPutAttribute.cs" />\r
-    <Compile Include="Mvc\HttpDeleteAttribute.cs" />\r
-    <Compile Include="Mvc\DynamicTypeGenerator.cs" />\r
-    <Compile Include="Mvc\ModelClientValidationRequiredRule.cs" />\r
-    <Compile Include="Mvc\ModelClientValidationRangeRule.cs" />\r
-    <Compile Include="Mvc\ModelClientValidationStringLengthRule.cs" />\r
-    <Compile Include="Mvc\MvcHtmlString.cs" />\r
-    <Compile Include="Mvc\DataAnnotationsModelValidator.cs" />\r
-    <Compile Include="Mvc\DataAnnotationsModelValidatorProvider.cs" />\r
-    <Compile Include="Mvc\DataAnnotationsModelValidator`1.cs" />\r
-    <Compile Include="Mvc\EmptyModelValidatorProvider.cs" />\r
-    <Compile Include="Mvc\ExpressionHelper.cs" />\r
-    <Compile Include="Mvc\FieldValidationMetadata.cs" />\r
-    <Compile Include="Mvc\FormContext.cs" />\r
-    <Compile Include="Mvc\JsonRequestBehavior.cs" />\r
-    <Compile Include="Mvc\ModelClientValidationRegexRule.cs" />\r
-    <Compile Include="Mvc\ModelClientValidationRule.cs" />\r
-    <Compile Include="Mvc\ModelValidationResult.cs" />\r
-    <Compile Include="Mvc\ModelValidator.cs" />\r
-    <Compile Include="Mvc\ModelValidatorProvider.cs" />\r
-    <Compile Include="Mvc\ModelValidatorProviders.cs" />\r
-    <Compile Include="Mvc\RequireHttpsAttribute.cs" />\r
-    <Compile Include="Mvc\HttpRequestExtensions.cs" />\r
-    <Compile Include="Mvc\DataAnnotationsModelMetadataProvider.cs" />\r
-    <Compile Include="Mvc\EmptyModelMetadataProvider.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\ExpressionParser.cs" />\r
-    <Compile Include="Mvc\ModelMetadata.cs" />\r
-    <Compile Include="Mvc\ModelMetadataProvider.cs" />\r
-    <Compile Include="Mvc\ModelMetadataProviders.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\CompiledExpressionDelegate`2.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\ParserContext.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\HashCodeCombiner.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\ExpressionFingerprint.cs" />\r
-    <Compile Include="Mvc\ExpressionUtil\FastTrack`2.cs" />\r
-    <Compile Include="Mvc\AreaHelpers.cs" />\r
-    <Compile Include="Mvc\AreaRegistration.cs" />\r
-    <Compile Include="Mvc\AreaRegistrationContext.cs" />\r
-    <Compile Include="Mvc\Error.cs" />\r
-    <Compile Include="Mvc\IRouteWithArea.cs" />\r
-    <Compile Include="Mvc\Async\SingleEntryGate.cs" />\r
-    <Compile Include="Mvc\Html\PartialExtensions.cs" />\r
-    <Compile Include="Mvc\LinqBinaryModelBinder.cs" />\r
-    <Compile Include="Mvc\TryGetValueDelegate.cs" />\r
-    <Compile Include="Mvc\ViewDataInfo.cs" />\r
-    <Compile Include="Mvc\Html\DefaultDisplayTemplates.cs" />\r
-    <Compile Include="Mvc\Html\DefaultEditorTemplates.cs" />\r
-    <Compile Include="Mvc\Html\DisplayExtensions.cs" />\r
-    <Compile Include="Mvc\Html\EditorExtensions.cs" />\r
-    <Compile Include="Mvc\Html\LabelExtensions.cs" />\r
-    <Compile Include="Mvc\Html\TemplateHelpers.cs" />\r
-    <Compile Include="Mvc\HttpPostAttribute.cs" />\r
-    <Compile Include="Mvc\PathHelpers.cs" />\r
-    <Compile Include="Mvc\ExceptionContext.cs" />\r
-    <Compile Include="Mvc\ResultExecutedContext.cs" />\r
-    <Compile Include="Mvc\ResultExecutingContext.cs" />\r
-    <Compile Include="Mvc\TemplateInfo.cs" />\r
-    <Compile Include="Mvc\ValidateAntiForgeryTokenAttribute.cs" />\r
-    <Compile Include="Mvc\HttpAntiForgeryException.cs" />\r
-    <Compile Include="Mvc\JavaScriptResult.cs" />\r
-    <Compile Include="Mvc\ActionDescriptor.cs" />\r
-    <Compile Include="Mvc\ActionMethodDispatcher.cs" />\r
-    <Compile Include="Mvc\ActionMethodSelector.cs" />\r
-    <Compile Include="Mvc\ActionMethodSelectorAttribute.cs" />\r
-    <Compile Include="Mvc\ActionNameSelectorAttribute.cs" />\r
-    <Compile Include="Mvc\AuthorizeAttribute.cs" />\r
-    <Compile Include="Mvc\Ajax\AjaxOptions.cs" />\r
-    <Compile Include="Mvc\Ajax\AjaxExtensions.cs" />\r
-    <Compile Include="Mvc\ActionMethodDispatcherCache.cs" />\r
-    <Compile Include="Mvc\BindAttribute.cs" />\r
-    <Compile Include="Mvc\ControllerBase.cs" />\r
-    <Compile Include="Mvc\ActionNameAttribute.cs" />\r
-    <Compile Include="Mvc\AcceptVerbsAttribute.cs" />\r
-    <Compile Include="Mvc\AjaxHelper`1.cs" />\r
-    <Compile Include="Mvc\HtmlHelper`1.cs" />\r
-    <Compile Include="Mvc\DictionaryHelpers.cs" />\r
-    <Compile Include="Mvc\AjaxRequestExtensions.cs" />\r
-    <Compile Include="Mvc\ModelBinderDictionary.cs" />\r
-    <Compile Include="Mvc\ValueProviderDictionary.cs" />\r
-    <Compile Include="Mvc\ViewContext.cs" />\r
-    <Compile Include="Mvc\ViewTemplateUserControl.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewTemplateUserControl`1.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewType.cs" />\r
-    <Compile Include="Mvc\ViewTypeControlBuilder.cs" />\r
-    <Compile Include="Mvc\ViewUserControlControlBuilder.cs">\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewPageControlBuilder.cs">\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewTypeParserFilter.cs" />\r
-    <Compile Include="Mvc\DefaultViewLocationCache.cs" />\r
-    <Compile Include="Mvc\FormCollection.cs" />\r
-    <Compile Include="Mvc\HttpPostedFileBaseModelBinder.cs" />\r
-    <Compile Include="Mvc\NullViewLocationCache.cs" />\r
-    <Compile Include="Mvc\ValidateInputAttribute.cs" />\r
-    <Compile Include="Mvc\FileContentResult.cs" />\r
-    <Compile Include="Mvc\FilePathResult.cs" />\r
-    <Compile Include="Mvc\FileResult.cs" />\r
-    <Compile Include="Mvc\FileStreamResult.cs" />\r
-    <Compile Include="Mvc\InputType.cs" />\r
-    <Compile Include="Mvc\ControllerDescriptorCache.cs" />\r
-    <Compile Include="Mvc\ReflectedParameterBindingInfo.cs" />\r
-    <Compile Include="Mvc\ParameterBindingInfo.cs" />\r
-    <Compile Include="Mvc\ReaderWriterCache`2.cs" />\r
-    <Compile Include="Mvc\DescriptorUtil.cs" />\r
-    <Compile Include="Mvc\ReflectedControllerDescriptor.cs" />\r
-    <Compile Include="Mvc\ControllerDescriptor.cs" />\r
-    <Compile Include="Mvc\ActionSelector.cs" />\r
-    <Compile Include="Mvc\ReflectedActionDescriptor.cs" />\r
-    <Compile Include="Mvc\Html\MvcForm.cs" />\r
-    <Compile Include="Mvc\HttpVerbs.cs" />\r
-    <Compile Include="Mvc\DefaultModelBinder.cs" />\r
-    <Compile Include="Mvc\ModelBindingContext.cs" />\r
-    <Compile Include="Mvc\ParameterDescriptor.cs" />\r
-    <Compile Include="Mvc\RouteValuesHelpers.cs" />\r
-    <Compile Include="Mvc\SelectListItem.cs" />\r
-    <Compile Include="Mvc\TagRenderMode.cs" />\r
-    <Compile Include="Mvc\ReflectedParameterDescriptor.cs" />\r
-    <Compile Include="Mvc\ValueProviderResult.cs" />\r
-    <Compile Include="Mvc\CustomModelBinderAttribute.cs" />\r
-    <Compile Include="Mvc\FormMethod.cs" />\r
-    <Compile Include="Mvc\Html\FormExtensions.cs" />\r
-    <Compile Include="Mvc\Html\InputExtensions.cs">\r
-      <SubType>Code</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\Html\RenderPartialExtensions.cs" />\r
-    <Compile Include="Mvc\Html\SelectExtensions.cs" />\r
-    <Compile Include="Mvc\Html\TextAreaExtensions.cs" />\r
-    <Compile Include="Mvc\Html\ValidationExtensions.cs" />\r
-    <Compile Include="Mvc\IModelBinder.cs" />\r
-    <Compile Include="Mvc\Html\LinkExtensions.cs" />\r
-    <Compile Include="Mvc\ModelBinderAttribute.cs" />\r
-    <Compile Include="Mvc\ModelBinders.cs" />\r
-    <Compile Include="Mvc\ModelStateDictionary.cs" />\r
-    <Compile Include="Mvc\ModelState.cs" />\r
-    <Compile Include="Mvc\ModelErrorCollection.cs" />\r
-    <Compile Include="Mvc\ModelError.cs" />\r
-    <Compile Include="Mvc\Ajax\InsertionMode.cs" />\r
-    <Compile Include="Mvc\HandleErrorAttribute.cs" />\r
-    <Compile Include="Mvc\HandleErrorInfo.cs" />\r
-    <Compile Include="Mvc\HttpUnauthorizedResult.cs" />\r
-    <Compile Include="Mvc\IActionInvoker.cs" />\r
-    <Compile Include="Mvc\IView.cs" />\r
-    <Compile Include="Mvc\IViewLocationCache.cs" />\r
-    <Compile Include="Mvc\MvcHttpHandler.cs" />\r
-    <Compile Include="Mvc\PartialViewResult.cs" />\r
-    <Compile Include="Mvc\SessionStateTempDataProvider.cs" />\r
-    <Compile Include="Mvc\ITempDataProvider.cs" />\r
-    <Compile Include="Mvc\OutputCacheAttribute.cs" />\r
-    <Compile Include="Mvc\FilterInfo.cs" />\r
-    <Compile Include="GlobalSuppressions.cs" />\r
-    <Compile Include="Mvc\ActionFilterAttribute.cs" />\r
-    <Compile Include="Mvc\ActionResult.cs" />\r
-    <Compile Include="Mvc\AjaxHelper.cs" />\r
-    <Compile Include="Mvc\BuildManagerWrapper.cs" />\r
-    <Compile Include="Mvc\Controller.cs" />\r
-    <Compile Include="Mvc\ControllerActionInvoker.cs" />\r
-    <Compile Include="Mvc\ControllerBuilder.cs" />\r
-    <Compile Include="Mvc\ControllerTypeCache.cs" />\r
-    <Compile Include="Mvc\ContentResult.cs" />\r
-    <Compile Include="Mvc\FilterAttribute.cs" />\r
-    <Compile Include="Mvc\IResultFilter.cs" />\r
-    <Compile Include="Mvc\IExceptionFilter.cs" />\r
-    <Compile Include="Mvc\IAuthorizationFilter.cs" />\r
-    <Compile Include="Mvc\JsonResult.cs" />\r
-    <Compile Include="Mvc\NameValueCollectionExtensions.cs" />\r
-    <Compile Include="Mvc\ViewDataDictionary`1.cs" />\r
-    <Compile Include="Mvc\EmptyResult.cs" />\r
-    <Compile Include="Mvc\MultiSelectList.cs" />\r
-    <Compile Include="Mvc\RedirectResult.cs" />\r
-    <Compile Include="Mvc\RedirectToRouteResult.cs" />\r
-    <Compile Include="Mvc\DefaultControllerFactory.cs" />\r
-    <Compile Include="Mvc\HtmlHelper.cs" />\r
-    <Compile Include="Mvc\IActionFilter.cs" />\r
-    <Compile Include="Mvc\IBuildManager.cs" />\r
-    <Compile Include="Mvc\IController.cs" />\r
-    <Compile Include="Mvc\IControllerFactory.cs" />\r
-    <Compile Include="Mvc\IViewDataContainer.cs" />\r
-    <Compile Include="Mvc\IViewEngine.cs" />\r
-    <Compile Include="Mvc\MvcHandler.cs" />\r
-    <Compile Include="Mvc\MvcRouteHandler.cs" />\r
-    <Compile Include="Mvc\NonActionAttribute.cs" />\r
-    <Compile Include="Mvc\RouteCollectionExtensions.cs" />\r
-    <Compile Include="Mvc\SelectList.cs" />\r
-    <Compile Include="Mvc\TagBuilder.cs" />\r
-    <Compile Include="Mvc\TempDataDictionary.cs" />\r
-    <Compile Include="Mvc\TypeHelpers.cs" />\r
-    <Compile Include="Mvc\UrlHelper.cs" />\r
-    <Compile Include="Mvc\ViewDataDictionary.cs" />\r
-    <Compile Include="Mvc\ViewEngineCollection.cs" />\r
-    <Compile Include="Mvc\ViewEngineResult.cs" />\r
-    <Compile Include="Mvc\ViewEngines.cs" />\r
-    <Compile Include="Mvc\ViewMasterPage.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewMasterPage`1.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewPage.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewPage`1.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewResult.cs" />\r
-    <Compile Include="Mvc\ViewResultBase.cs" />\r
-    <Compile Include="Mvc\ViewUserControl.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\ViewUserControl`1.cs">\r
-      <SubType>ASPXCodeBehind</SubType>\r
-    </Compile>\r
-    <Compile Include="Mvc\VirtualPathProviderViewEngine.cs" />\r
-    <Compile Include="Mvc\WebFormView.cs" />\r
-    <Compile Include="Mvc\WebFormViewEngine.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Mvc\Resources\MvcResources.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>MvcResources.resx</DependentUpon>\r
-    </Compile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Mvc\Resources\MvcResources.resx">\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>MvcResources.Designer.cs</LastGenOutput>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <CodeAnalysisDictionary Include="..\CustomDictionary.xml" />\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-</Project>
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/.gitattributes b/mcs/class/System.Web.Mvc2/System.Web.Mvc/.gitattributes
deleted file mode 100644 (file)
index 18abbf3..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-/AcceptVerbsAttribute.cs -crlf
-/ActionDescriptor.cs -crlf
-/ActionExecutedContext.cs -crlf
-/ActionExecutingContext.cs -crlf
-/ActionFilterAttribute.cs -crlf
-/ActionMethodDispatcher.cs -crlf
-/ActionMethodDispatcherCache.cs -crlf
-/ActionMethodSelector.cs -crlf
-/ActionMethodSelectorAttribute.cs -crlf
-/ActionNameAttribute.cs -crlf
-/ActionNameSelectorAttribute.cs -crlf
-/ActionResult.cs -crlf
-/ActionSelector.cs -crlf
-/AjaxHelper.cs -crlf
-/AjaxHelper`1.cs -crlf
-/AjaxRequestExtensions.cs -crlf
-/AntiForgeryData.cs -crlf
-/AntiForgeryDataSerializer.cs -crlf
-/AreaHelpers.cs -crlf
-/AreaRegistration.cs -crlf
-/AreaRegistrationContext.cs -crlf
-/AssociatedMetadataProvider.cs -crlf
-/AssociatedValidatorProvider.cs -crlf
-/AsyncController.cs -crlf
-/AsyncTimeoutAttribute.cs -crlf
-/AuthorizationContext.cs -crlf
-/AuthorizeAttribute.cs -crlf
-/BindAttribute.cs -crlf
-/BuildManagerWrapper.cs -crlf
-/ByteArrayModelBinder.cs -crlf
-/ChildActionOnlyAttribute.cs -crlf
-/ClientDataTypeModelValidatorProvider.cs -crlf
-/ContentResult.cs -crlf
-/Controller.cs -crlf
-/ControllerActionInvoker.cs -crlf
-/ControllerBase.cs -crlf
-/ControllerBuilder.cs -crlf
-/ControllerContext.cs -crlf
-/ControllerDescriptor.cs -crlf
-/ControllerDescriptorCache.cs -crlf
-/ControllerTypeCache.cs -crlf
-/CustomModelBinderAttribute.cs -crlf
-/DataAnnotationsModelMetadata.cs -crlf
-/DataAnnotationsModelMetadataProvider.cs -crlf
-/DataAnnotationsModelValidator.cs -crlf
-/DataAnnotationsModelValidatorProvider.cs -crlf
-/DataAnnotationsModelValidator`1.cs -crlf
-/DataErrorInfoModelValidatorProvider.cs -crlf
-/DefaultControllerFactory.cs -crlf
-/DefaultModelBinder.cs -crlf
-/DefaultViewLocationCache.cs -crlf
-/DescriptorUtil.cs -crlf
-/DictionaryHelpers.cs -crlf
-/DictionaryValueProvider`1.cs -crlf
-/DynamicTypeGenerator.cs -crlf
-/EmptyModelMetadataProvider.cs -crlf
-/EmptyModelValidatorProvider.cs -crlf
-/EmptyResult.cs -crlf
-/Error.cs -crlf
-/ExceptionContext.cs -crlf
-/ExpressionHelper.cs -crlf
-/FieldValidationMetadata.cs -crlf
-/FileContentResult.cs -crlf
-/FilePathResult.cs -crlf
-/FileResult.cs -crlf
-/FileStreamResult.cs -crlf
-/FilterAttribute.cs -crlf
-/FilterInfo.cs -crlf
-/FormCollection.cs -crlf
-/FormContext.cs -crlf
-/FormMethod.cs -crlf
-/FormValueProvider.cs -crlf
-/FormValueProviderFactory.cs -crlf
-/HandleErrorAttribute.cs -crlf
-/HandleErrorInfo.cs -crlf
-/HiddenInputAttribute.cs -crlf
-/HtmlHelper.cs -crlf
-/HtmlHelper`1.cs -crlf
-/HttpAntiForgeryException.cs -crlf
-/HttpDeleteAttribute.cs -crlf
-/HttpFileCollectionValueProvider.cs -crlf
-/HttpFileCollectionValueProviderFactory.cs -crlf
-/HttpGetAttribute.cs -crlf
-/HttpHandlerUtil.cs -crlf
-/HttpPostAttribute.cs -crlf
-/HttpPostedFileBaseModelBinder.cs -crlf
-/HttpPutAttribute.cs -crlf
-/HttpRequestExtensions.cs -crlf
-/HttpUnauthorizedResult.cs -crlf
-/HttpVerbs.cs -crlf
-/IActionFilter.cs -crlf
-/IActionInvoker.cs -crlf
-/IAuthorizationFilter.cs -crlf
-/IBuildManager.cs -crlf
-/IController.cs -crlf
-/IControllerFactory.cs -crlf
-/IExceptionFilter.cs -crlf
-/IModelBinder.cs -crlf
-/IResultFilter.cs -crlf
-/IRouteWithArea.cs -crlf
-/ITempDataProvider.cs -crlf
-/IValueProvider.cs -crlf
-/IView.cs -crlf
-/IViewDataContainer.cs -crlf
-/IViewEngine.cs -crlf
-/IViewLocationCache.cs -crlf
-/InputType.cs -crlf
-/JavaScriptResult.cs -crlf
-/JsonRequestBehavior.cs -crlf
-/JsonResult.cs -crlf
-/LinqBinaryModelBinder.cs -crlf
-/ModelBinderAttribute.cs -crlf
-/ModelBinderDictionary.cs -crlf
-/ModelBinders.cs -crlf
-/ModelBindingContext.cs -crlf
-/ModelClientValidationRangeRule.cs -crlf
-/ModelClientValidationRegexRule.cs -crlf
-/ModelClientValidationRequiredRule.cs -crlf
-/ModelClientValidationRule.cs -crlf
-/ModelClientValidationStringLengthRule.cs -crlf
-/ModelError.cs -crlf
-/ModelErrorCollection.cs -crlf
-/ModelMetadata.cs -crlf
-/ModelMetadataProvider.cs -crlf
-/ModelMetadataProviders.cs -crlf
-/ModelState.cs -crlf
-/ModelStateDictionary.cs -crlf
-/ModelValidationResult.cs -crlf
-/ModelValidator.cs -crlf
-/ModelValidatorProvider.cs -crlf
-/ModelValidatorProviderCollection.cs -crlf
-/ModelValidatorProviders.cs -crlf
-/MultiSelectList.cs -crlf
-/MvcHandler.cs -crlf
-/MvcHtmlString.cs -crlf
-/MvcHttpHandler.cs -crlf
-/MvcRouteHandler.cs -crlf
-/NameValueCollectionExtensions.cs -crlf
-/NameValueCollectionValueProvider.cs -crlf
-/NoAsyncTimeoutAttribute.cs -crlf
-/NonActionAttribute.cs -crlf
-/NullViewLocationCache.cs -crlf
-/OutputCacheAttribute.cs -crlf
-/ParameterBindingInfo.cs -crlf
-/ParameterDescriptor.cs -crlf
-/ParameterInfoUtil.cs -crlf
-/PartialViewResult.cs -crlf
-/PathHelpers.cs -crlf
-/QueryStringValueProvider.cs -crlf
-/QueryStringValueProviderFactory.cs -crlf
-/RangeAttributeAdapter.cs -crlf
-/ReaderWriterCache`2.cs -crlf
-/RedirectResult.cs -crlf
-/RedirectToRouteResult.cs -crlf
-/ReflectedActionDescriptor.cs -crlf
-/ReflectedControllerDescriptor.cs -crlf
-/ReflectedParameterBindingInfo.cs -crlf
-/ReflectedParameterDescriptor.cs -crlf
-/RegularExpressionAttributeAdapter.cs -crlf
-/RequireHttpsAttribute.cs -crlf
-/RequiredAttributeAdapter.cs -crlf
-/ResultExecutedContext.cs -crlf
-/ResultExecutingContext.cs -crlf
-/RouteCollectionExtensions.cs -crlf
-/RouteDataValueProvider.cs -crlf
-/RouteDataValueProviderFactory.cs -crlf
-/RouteValuesHelpers.cs -crlf
-/SelectList.cs -crlf
-/SelectListItem.cs -crlf
-/SessionStateTempDataProvider.cs -crlf
-/StringLengthAttributeAdapter.cs -crlf
-/TagBuilder.cs -crlf
-/TagRenderMode.cs -crlf
-/TempDataDictionary.cs -crlf
-/TemplateInfo.cs -crlf
-/TryGetValueDelegate.cs -crlf
-/TypeCacheSerializer.cs -crlf
-/TypeCacheUtil.cs -crlf
-/TypeDescriptorHelper.cs -crlf
-/TypeHelpers.cs -crlf
-/UrlHelper.cs -crlf
-/UrlParameter.cs -crlf
-/ValidateAntiForgeryTokenAttribute.cs -crlf
-/ValidateInputAttribute.cs -crlf
-/ValueProviderCollection.cs -crlf
-/ValueProviderDictionary.cs -crlf
-/ValueProviderFactories.cs -crlf
-/ValueProviderFactory.cs -crlf
-/ValueProviderFactoryCollection.cs -crlf
-/ValueProviderResult.cs -crlf
-/ValueProviderUtil.cs -crlf
-/ViewContext.cs -crlf
-/ViewDataDictionary.cs -crlf
-/ViewDataDictionary`1.cs -crlf
-/ViewDataInfo.cs -crlf
-/ViewEngineCollection.cs -crlf
-/ViewEngineResult.cs -crlf
-/ViewEngines.cs -crlf
-/ViewMasterPage.cs -crlf
-/ViewMasterPage`1.cs -crlf
-/ViewPage.cs -crlf
-/ViewPageControlBuilder.cs -crlf
-/ViewPage`1.cs -crlf
-/ViewResult.cs -crlf
-/ViewResultBase.cs -crlf
-/ViewTemplateUserControl.cs -crlf
-/ViewTemplateUserControl`1.cs -crlf
-/ViewType.cs -crlf
-/ViewTypeControlBuilder.cs -crlf
-/ViewTypeParserFilter.cs -crlf
-/ViewUserControl.cs -crlf
-/ViewUserControlControlBuilder.cs -crlf
-/ViewUserControl`1.cs -crlf
-/VirtualPathProviderViewEngine.cs -crlf
-/WebFormView.cs -crlf
-/WebFormViewEngine.cs -crlf
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AcceptVerbsAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AcceptVerbsAttribute.cs
deleted file mode 100644 (file)
index c0924a4..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Design", "CA1019:DefineAccessorsForAttributeArguments",\r
-        Justification = "The accessor is exposed as an ICollection<string>.")]\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class AcceptVerbsAttribute : ActionMethodSelectorAttribute {\r
-        public AcceptVerbsAttribute(HttpVerbs verbs)\r
-            : this(EnumToArray(verbs)) {\r
-        }\r
-\r
-        public AcceptVerbsAttribute(params string[] verbs) {\r
-            if (verbs == null || verbs.Length == 0) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "verbs");\r
-            }\r
-\r
-            Verbs = new ReadOnlyCollection<string>(verbs);\r
-        }\r
-\r
-        public ICollection<string> Verbs {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        private static void AddEntryToList(HttpVerbs verbs, HttpVerbs match, List<string> verbList, string entryText) {\r
-            if ((verbs & match) != 0) {\r
-                verbList.Add(entryText);\r
-            }\r
-        }\r
-\r
-        internal static string[] EnumToArray(HttpVerbs verbs) {\r
-            List<string> verbList = new List<string>();\r
-\r
-            AddEntryToList(verbs, HttpVerbs.Get, verbList, "GET");\r
-            AddEntryToList(verbs, HttpVerbs.Post, verbList, "POST");\r
-            AddEntryToList(verbs, HttpVerbs.Put, verbList, "PUT");\r
-            AddEntryToList(verbs, HttpVerbs.Delete, verbList, "DELETE");\r
-            AddEntryToList(verbs, HttpVerbs.Head, verbList, "HEAD");\r
-\r
-            return verbList.ToArray();\r
-        }\r
-\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            string incomingVerb = controllerContext.HttpContext.Request.GetHttpMethodOverride();\r
-\r
-            return Verbs.Contains(incomingVerb, StringComparer.OrdinalIgnoreCase);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionDescriptor.cs
deleted file mode 100644 (file)
index 4041d79..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public abstract class ActionDescriptor : ICustomAttributeProvider {\r
-\r
-        private readonly static AllowMultipleAttributesCache _allowMultiplAttributesCache = new AllowMultipleAttributesCache();\r
-        private readonly static ActionMethodDispatcherCache _staticDispatcherCache = new ActionMethodDispatcherCache();\r
-        private ActionMethodDispatcherCache _instanceDispatcherCache;\r
-\r
-        private static readonly ActionSelector[] _emptySelectors = new ActionSelector[0];\r
-\r
-        public abstract string ActionName {\r
-            get;\r
-        }\r
-\r
-        public abstract ControllerDescriptor ControllerDescriptor {\r
-            get;\r
-        }\r
-\r
-        internal ActionMethodDispatcherCache DispatcherCache {\r
-            get {\r
-                if (_instanceDispatcherCache == null) {\r
-                    _instanceDispatcherCache = _staticDispatcherCache;\r
-                }\r
-                return _instanceDispatcherCache;\r
-            }\r
-            set {\r
-                _instanceDispatcherCache = value;\r
-            }\r
-        }\r
-\r
-        public abstract object Execute(ControllerContext controllerContext, IDictionary<string, object> parameters);\r
-\r
-        internal static object ExtractParameterFromDictionary(ParameterInfo parameterInfo, IDictionary<string, object> parameters, MethodInfo methodInfo) {\r
-            object value;\r
-\r
-            if (!parameters.TryGetValue(parameterInfo.Name, out value)) {\r
-                // the key should always be present, even if the parameter value is null\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_ParameterNotInDictionary,\r
-                    parameterInfo.Name, parameterInfo.ParameterType, methodInfo, methodInfo.DeclaringType);\r
-                throw new ArgumentException(message, "parameters");\r
-            }\r
-\r
-            if (value == null && !TypeHelpers.TypeAllowsNullValue(parameterInfo.ParameterType)) {\r
-                // tried to pass a null value for a non-nullable parameter type\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_ParameterCannotBeNull,\r
-                    parameterInfo.Name, parameterInfo.ParameterType, methodInfo, methodInfo.DeclaringType);\r
-                throw new ArgumentException(message, "parameters");\r
-            }\r
-\r
-            if (value != null && !parameterInfo.ParameterType.IsInstanceOfType(value)) {\r
-                // value was supplied but is not of the proper type\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_ParameterValueHasWrongType,\r
-                    parameterInfo.Name, methodInfo, methodInfo.DeclaringType, value.GetType(), parameterInfo.ParameterType);\r
-                throw new ArgumentException(message, "parameters");\r
-            }\r
-\r
-            return value;\r
-        }\r
-\r
-        internal static object ExtractParameterOrDefaultFromDictionary(ParameterInfo parameterInfo, IDictionary<string, object> parameters) {\r
-            Type parameterType = parameterInfo.ParameterType;\r
-\r
-            object value;\r
-            parameters.TryGetValue(parameterInfo.Name, out value);\r
-\r
-            // if wrong type, replace with default instance\r
-            if (parameterType.IsInstanceOfType(value)) {\r
-                return value;\r
-            }\r
-            else {\r
-                object defaultValue;\r
-                if (ParameterInfoUtil.TryGetDefaultValue(parameterInfo, out defaultValue)) {\r
-                    return defaultValue;\r
-                }\r
-                else {\r
-                    return TypeHelpers.GetDefaultValue(parameterType);\r
-                }\r
-            }\r
-        }\r
-\r
-        public virtual object[] GetCustomAttributes(bool inherit) {\r
-            return GetCustomAttributes(typeof(object), inherit);\r
-        }\r
-\r
-        public virtual object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return (object[])Array.CreateInstance(attributeType, 0);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "This method may perform non-trivial work.")]\r
-        public virtual FilterInfo GetFilters() {\r
-            return new FilterInfo();\r
-        }\r
-\r
-        internal static FilterInfo GetFilters(MethodInfo methodInfo) {\r
-            // Enumerable.OrderBy() is a stable sort, so this method preserves scope ordering.\r
-            FilterAttribute[] typeFilters = (FilterAttribute[])methodInfo.ReflectedType.GetCustomAttributes(typeof(FilterAttribute), true /* inherit */);\r
-            FilterAttribute[] methodFilters = (FilterAttribute[])methodInfo.GetCustomAttributes(typeof(FilterAttribute), true /* inherit */);\r
-            List<FilterAttribute> orderedFilters = RemoveOverriddenFilters(typeFilters.Concat(methodFilters)).OrderBy(attr => attr.Order).ToList();\r
-\r
-            FilterInfo filterInfo = new FilterInfo();\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.ActionFilters);\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.AuthorizationFilters);\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.ExceptionFilters);\r
-            MergeFiltersIntoList(orderedFilters, filterInfo.ResultFilters);\r
-            return filterInfo;\r
-        }\r
-\r
-        public abstract ParameterDescriptor[] GetParameters();\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "This method may perform non-trivial work.")]\r
-        public virtual ICollection<ActionSelector> GetSelectors() {\r
-            return _emptySelectors;\r
-        }\r
-\r
-        public virtual bool IsDefined(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-        internal static void MergeFiltersIntoList<TFilter>(IList<FilterAttribute> allFilters, IList<TFilter> destFilters) where TFilter : class {\r
-            foreach (FilterAttribute filter in allFilters) {\r
-                TFilter castFilter = filter as TFilter;\r
-                if (castFilter != null) {\r
-                    destFilters.Add(castFilter);\r
-                }\r
-            }\r
-        }\r
-\r
-        internal static IEnumerable<FilterAttribute> RemoveOverriddenFilters(IEnumerable<FilterAttribute> filters) {\r
-            // If an attribute is declared on both the controller and on an action method and that attribute's\r
-            // type has AllowMultiple = false (which is the default for attributes), we should ignore the attributes\r
-            // declared on the controller. The CLR's reflection implementation follows a similar algorithm when it\r
-            // encounters an overridden virtual method where both the base and the override contain some\r
-            // AllowMultiple = false attribute.\r
-\r
-            // Key = attribute type\r
-            // Value = -1 if AllowMultiple true, last index of this attribute type if AllowMultiple false\r
-            Dictionary<Type, int> attrsIndexes = new Dictionary<Type, int>();\r
-\r
-            FilterAttribute[] filtersList = filters.ToArray();\r
-            for (int i = 0; i < filtersList.Length; i++) {\r
-                FilterAttribute filter = filtersList[i];\r
-                Type filterType = filter.GetType();\r
-\r
-                int lastIndex;\r
-                if (attrsIndexes.TryGetValue(filterType, out lastIndex)) {\r
-                    if (lastIndex >= 0) {\r
-                        // this filter already exists and AllowMultiple = false, so clear last entry\r
-                        filtersList[lastIndex] = null;\r
-                        attrsIndexes[filterType] = i;\r
-                    }\r
-                }\r
-                else {\r
-                    // not found - add to dictionary\r
-                    // exactly one AttributeUsageAttribute will always be present\r
-                    bool allowMultiple = _allowMultiplAttributesCache.IsMultiUseAttribute(filterType);\r
-                    attrsIndexes[filterType] = (allowMultiple) ? -1 : i;\r
-                }\r
-            }\r
-\r
-            // any duplicated attributes have now been nulled out, so just return remaining attributes\r
-            return filtersList.Where(attr => attr != null);\r
-        }\r
-\r
-        internal static string VerifyActionMethodIsCallable(MethodInfo methodInfo) {\r
-            // we can't call instance methods where the 'this' parameter is a type other than ControllerBase\r
-            if (!methodInfo.IsStatic && !typeof(ControllerBase).IsAssignableFrom(methodInfo.ReflectedType)) {\r
-                return String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType,\r
-                    methodInfo, methodInfo.ReflectedType.FullName);\r
-            }\r
-\r
-            // we can't call methods with open generic type parameters\r
-            if (methodInfo.ContainsGenericParameters) {\r
-                return String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_CannotCallOpenGenericMethods,\r
-                    methodInfo, methodInfo.ReflectedType.FullName);\r
-            }\r
-\r
-            // we can't call methods with ref/out parameters\r
-            ParameterInfo[] parameterInfos = methodInfo.GetParameters();\r
-            foreach (ParameterInfo parameterInfo in parameterInfos) {\r
-                if (parameterInfo.IsOut || parameterInfo.ParameterType.IsByRef) {\r
-                    return String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters,\r
-                        methodInfo, methodInfo.ReflectedType.FullName, parameterInfo);\r
-                }\r
-            }\r
-\r
-            // we can call this method\r
-            return null;\r
-        }\r
-\r
-        private sealed class AllowMultipleAttributesCache : ReaderWriterCache<Type, bool> {\r
-            public bool IsMultiUseAttribute(Type attributeType) {\r
-                return FetchOrCreateItem(attributeType, () => AttributeUsageAllowsMultiple(attributeType));\r
-            }\r
-\r
-            private static bool AttributeUsageAllowsMultiple(Type type) {\r
-                return (((AttributeUsageAttribute[])type.GetCustomAttributes(typeof(AttributeUsageAttribute), true))[0]).AllowMultiple;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionExecutedContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionExecutedContext.cs
deleted file mode 100644 (file)
index 1dfaa17..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ActionExecutedContext : ControllerContext {\r
-\r
-        private ActionResult _result;\r
-\r
-        // parameterless constructor used for mocking\r
-        public ActionExecutedContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ActionExecutedContext(ControllerContext controllerContext, ActionDescriptor actionDescriptor, bool canceled, Exception exception)\r
-            : base(controllerContext) {\r
-            if (actionDescriptor == null) {\r
-                throw new ArgumentNullException("actionDescriptor");\r
-            }\r
-\r
-            ActionDescriptor = actionDescriptor;\r
-            Canceled = canceled;\r
-            Exception = exception;\r
-        }\r
-\r
-        public virtual ActionDescriptor ActionDescriptor {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual bool Canceled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual Exception Exception {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public bool ExceptionHandled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get {\r
-                return _result ?? EmptyResult.Instance;\r
-            }\r
-            set {\r
-                _result = value;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionExecutingContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionExecutingContext.cs
deleted file mode 100644 (file)
index 4cc21e0..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ActionExecutingContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public ActionExecutingContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ActionExecutingContext(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary<string, object> actionParameters)\r
-            : base(controllerContext) {\r
-            if (actionDescriptor == null) {\r
-                throw new ArgumentNullException("actionDescriptor");\r
-            }\r
-            if (actionParameters == null) {\r
-                throw new ArgumentNullException("actionParameters");\r
-            }\r
-\r
-            ActionDescriptor = actionDescriptor;\r
-            ActionParameters = actionParameters;\r
-        }\r
-\r
-        public virtual ActionDescriptor ActionDescriptor {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The property setter is only here to support mocking this type and should not be called at runtime.")]\r
-        public virtual IDictionary<string, object> ActionParameters {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionFilterAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionFilterAttribute.cs
deleted file mode 100644 (file)
index 1069ccc..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public abstract class ActionFilterAttribute : FilterAttribute, IActionFilter, IResultFilter {\r
-\r
-        // The OnXxx() methods are virtual rather than abstract so that a developer need override\r
-        // only the ones that interest him.\r
-\r
-        public virtual void OnActionExecuting(ActionExecutingContext filterContext) {\r
-        }\r
-\r
-        public virtual void OnActionExecuted(ActionExecutedContext filterContext) {\r
-        }\r
-\r
-        public virtual void OnResultExecuting(ResultExecutingContext filterContext) {\r
-        }\r
-\r
-        public virtual void OnResultExecuted(ResultExecutedContext filterContext) {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodDispatcher.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodDispatcher.cs
deleted file mode 100644 (file)
index 0adafe2..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-\r
-    // The methods in this class don't perform error checking; that is the responsibility of the\r
-    // caller.\r
-    internal sealed class ActionMethodDispatcher {\r
-\r
-        private delegate object ActionExecutor(ControllerBase controller, object[] parameters);\r
-        private delegate void VoidActionExecutor(ControllerBase controller, object[] parameters);\r
-\r
-        private ActionExecutor _executor;\r
-\r
-        public ActionMethodDispatcher(MethodInfo methodInfo) {\r
-            _executor = GetExecutor(methodInfo);\r
-            MethodInfo = methodInfo;\r
-        }\r
-\r
-        public MethodInfo MethodInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public object Execute(ControllerBase controller, object[] parameters) {\r
-            return _executor(controller, parameters);\r
-        }\r
-\r
-        private static ActionExecutor GetExecutor(MethodInfo methodInfo) {\r
-            // Parameters to executor\r
-            ParameterExpression controllerParameter = Expression.Parameter(typeof(ControllerBase), "controller");\r
-            ParameterExpression parametersParameter = Expression.Parameter(typeof(object[]), "parameters");\r
-\r
-            // Build parameter list\r
-            List<Expression> parameters = new List<Expression>();\r
-            ParameterInfo[] paramInfos = methodInfo.GetParameters();\r
-            for (int i = 0; i < paramInfos.Length; i++) {\r
-                ParameterInfo paramInfo = paramInfos[i];\r
-                BinaryExpression valueObj = Expression.ArrayIndex(parametersParameter, Expression.Constant(i));\r
-                UnaryExpression valueCast = Expression.Convert(valueObj, paramInfo.ParameterType);\r
-\r
-                // valueCast is "(Ti) parameters[i]"\r
-                parameters.Add(valueCast);\r
-            }\r
-\r
-            // Call method\r
-            UnaryExpression instanceCast = (!methodInfo.IsStatic) ? Expression.Convert(controllerParameter, methodInfo.ReflectedType) : null;\r
-            MethodCallExpression methodCall = methodCall = Expression.Call(instanceCast, methodInfo, parameters);\r
-\r
-            // methodCall is "((TController) controller) method((T0) parameters[0], (T1) parameters[1], ...)"\r
-            // Create function\r
-            if (methodCall.Type == typeof(void)) {\r
-                Expression<VoidActionExecutor> lambda = Expression.Lambda<VoidActionExecutor>(methodCall, controllerParameter, parametersParameter);\r
-                VoidActionExecutor voidExecutor = lambda.Compile();\r
-                return WrapVoidAction(voidExecutor);\r
-            }\r
-            else {\r
-                // must coerce methodCall to match ActionExecutor signature\r
-                UnaryExpression castMethodCall = Expression.Convert(methodCall, typeof(object));\r
-                Expression<ActionExecutor> lambda = Expression.Lambda<ActionExecutor>(castMethodCall, controllerParameter, parametersParameter);\r
-                return lambda.Compile();\r
-            }\r
-        }\r
-\r
-        private static ActionExecutor WrapVoidAction(VoidActionExecutor executor) {\r
-            return delegate(ControllerBase controller, object[] parameters) {\r
-                executor(controller, parameters);\r
-                return null;\r
-            };\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodDispatcherCache.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodDispatcherCache.cs
deleted file mode 100644 (file)
index 61b5333..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    internal sealed class ActionMethodDispatcherCache : ReaderWriterCache<MethodInfo,ActionMethodDispatcher> {\r
-\r
-        public ActionMethodDispatcherCache() {\r
-        }\r
-\r
-        public ActionMethodDispatcher GetDispatcher(MethodInfo methodInfo) {\r
-            return FetchOrCreateItem(methodInfo, () => new ActionMethodDispatcher(methodInfo));\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodSelector.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodSelector.cs
deleted file mode 100644 (file)
index 4b765db..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    internal sealed class ActionMethodSelector {\r
-\r
-        public ActionMethodSelector(Type controllerType) {\r
-            ControllerType = controllerType;\r
-            PopulateLookupTables();\r
-        }\r
-\r
-        public Type ControllerType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public MethodInfo[] AliasedMethods {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ILookup<string, MethodInfo> NonAliasedMethods {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        private AmbiguousMatchException CreateAmbiguousMatchException(List<MethodInfo> ambiguousMethods, string actionName) {\r
-            StringBuilder exceptionMessageBuilder = new StringBuilder();\r
-            foreach (MethodInfo methodInfo in ambiguousMethods) {\r
-                string controllerAction = Convert.ToString(methodInfo, CultureInfo.CurrentUICulture);\r
-                string controllerType = methodInfo.DeclaringType.FullName;\r
-                exceptionMessageBuilder.AppendLine();\r
-                exceptionMessageBuilder.AppendFormat(CultureInfo.CurrentUICulture, MvcResources.ActionMethodSelector_AmbiguousMatchType, controllerAction, controllerType);\r
-            }\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ActionMethodSelector_AmbiguousMatch,\r
-                actionName, ControllerType.Name, exceptionMessageBuilder);\r
-            return new AmbiguousMatchException(message);\r
-        }\r
-\r
-        public MethodInfo FindActionMethod(ControllerContext controllerContext, string actionName) {\r
-            List<MethodInfo> methodsMatchingName = GetMatchingAliasedMethods(controllerContext, actionName);\r
-            methodsMatchingName.AddRange(NonAliasedMethods[actionName]);\r
-            List<MethodInfo> finalMethods = RunSelectionFilters(controllerContext, methodsMatchingName);\r
-\r
-            switch (finalMethods.Count) {\r
-                case 0:\r
-                    return null;\r
-\r
-                case 1:\r
-                    return finalMethods[0];\r
-\r
-                default:\r
-                    throw CreateAmbiguousMatchException(finalMethods, actionName);\r
-            }\r
-        }\r
-\r
-        internal List<MethodInfo> GetMatchingAliasedMethods(ControllerContext controllerContext, string actionName) {\r
-            // find all aliased methods which are opting in to this request\r
-            // to opt in, all attributes defined on the method must return true\r
-\r
-            var methods = from methodInfo in AliasedMethods\r
-                          let attrs = (ActionNameSelectorAttribute[])methodInfo.GetCustomAttributes(typeof(ActionNameSelectorAttribute), true /* inherit */)\r
-                          where attrs.All(attr => attr.IsValidName(controllerContext, actionName, methodInfo))\r
-                          select methodInfo;\r
-            return methods.ToList();\r
-        }\r
-\r
-        private static bool IsMethodDecoratedWithAliasingAttribute(MethodInfo methodInfo) {\r
-            return methodInfo.IsDefined(typeof(ActionNameSelectorAttribute), true /* inherit */);\r
-        }\r
-\r
-        private static bool IsValidActionMethod(MethodInfo methodInfo) {\r
-            return !(methodInfo.IsSpecialName ||\r
-                     methodInfo.GetBaseDefinition().DeclaringType.IsAssignableFrom(typeof(Controller)));\r
-        }\r
-\r
-        private void PopulateLookupTables() {\r
-            MethodInfo[] allMethods = ControllerType.GetMethods(BindingFlags.InvokeMethod | BindingFlags.Instance | BindingFlags.Public);\r
-            MethodInfo[] actionMethods = Array.FindAll(allMethods, IsValidActionMethod);\r
-\r
-            AliasedMethods = Array.FindAll(actionMethods, IsMethodDecoratedWithAliasingAttribute);\r
-            NonAliasedMethods = actionMethods.Except(AliasedMethods).ToLookup(method => method.Name, StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-        private static List<MethodInfo> RunSelectionFilters(ControllerContext controllerContext, List<MethodInfo> methodInfos) {\r
-            // remove all methods which are opting out of this request\r
-            // to opt out, at least one attribute defined on the method must return false\r
-\r
-            List<MethodInfo> matchesWithSelectionAttributes = new List<MethodInfo>();\r
-            List<MethodInfo> matchesWithoutSelectionAttributes = new List<MethodInfo>();\r
-\r
-            foreach (MethodInfo methodInfo in methodInfos) {\r
-                ActionMethodSelectorAttribute[] attrs = (ActionMethodSelectorAttribute[])methodInfo.GetCustomAttributes(typeof(ActionMethodSelectorAttribute), true /* inherit */);\r
-                if (attrs.Length == 0) {\r
-                    matchesWithoutSelectionAttributes.Add(methodInfo);\r
-                }\r
-                else if (attrs.All(attr => attr.IsValidForRequest(controllerContext, methodInfo))) {\r
-                    matchesWithSelectionAttributes.Add(methodInfo);\r
-                }\r
-            }\r
-\r
-            // if a matching action method had a selection attribute, consider it more specific than a matching action method\r
-            // without a selection attribute\r
-            return (matchesWithSelectionAttributes.Count > 0) ? matchesWithSelectionAttributes : matchesWithoutSelectionAttributes;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodSelectorAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionMethodSelectorAttribute.cs
deleted file mode 100644 (file)
index 0a2fd29..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public abstract class ActionMethodSelectorAttribute : Attribute {\r
-        public abstract bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionNameAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionNameAttribute.cs
deleted file mode 100644 (file)
index 46ef66a..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class ActionNameAttribute : ActionNameSelectorAttribute {\r
-\r
-        public ActionNameAttribute(string name) {\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            Name = name;\r
-        }\r
-\r
-        public string Name {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override bool IsValidName(ControllerContext controllerContext, string actionName, MethodInfo methodInfo) {\r
-            return String.Equals(actionName, Name, StringComparison.OrdinalIgnoreCase);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionNameSelectorAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionNameSelectorAttribute.cs
deleted file mode 100644 (file)
index 5ec4134..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public abstract class ActionNameSelectorAttribute : Attribute {\r
-        public abstract bool IsValidName(ControllerContext controllerContext, string actionName, MethodInfo methodInfo);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionResult.cs
deleted file mode 100644 (file)
index 11bc79c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public abstract class ActionResult {\r
-\r
-        public abstract void ExecuteResult(ControllerContext context);\r
-\r
-    }\r
-\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionSelector.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ActionSelector.cs
deleted file mode 100644 (file)
index 59891d6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public delegate bool ActionSelector(ControllerContext controllerContext);\r
-\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/.gitattributes b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/.gitattributes
deleted file mode 100644 (file)
index 34c273d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/AjaxExtensions.cs -crlf
-/AjaxOptions.cs -crlf
-/InsertionMode.cs -crlf
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/AjaxExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/AjaxExtensions.cs
deleted file mode 100644 (file)
index a34122f..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Ajax {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web;\r
-    using System.Web.Mvc;\r
-    using System.Web.Mvc.Html;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class AjaxExtensions {\r
-        private const string LinkOnClickFormat = "Sys.Mvc.AsyncHyperlink.handleClick(this, new Sys.UI.DomEvent(event), {0});";\r
-        private const string FormOnClickValue = "Sys.Mvc.AsyncForm.handleClick(this, new Sys.UI.DomEvent(event));";\r
-        private const string FormOnSubmitFormat = "Sys.Mvc.AsyncForm.handleSubmit(this, new Sys.UI.DomEvent(event), {0});";\r
-        private const string _globalizationScript = @"<script type=""text/javascript"" src=""{0}""></script>";\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, ajaxOptions);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, null /* values */, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            RouteValueDictionary newValues = new RouteValueDictionary(routeValues);\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, newValues, ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(null, actionName, controllerName, routeValues, ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-\r
-            return MvcHtmlString.Create(GenerateLink(linkText, targetUrl, GetAjaxOptions(ajaxOptions), htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            RouteValueDictionary newValues = new RouteValueDictionary(routeValues);\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return ActionLink(ajaxHelper, linkText, actionName, controllerName, protocol, hostName, fragment, newValues, ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this AjaxHelper ajaxHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(null /* routeName */, actionName, controllerName, protocol, hostName, fragment, routeValues, ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-\r
-            return MvcHtmlString.Create(GenerateLink(linkText, targetUrl, ajaxOptions, htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, AjaxOptions ajaxOptions) {\r
-            string formAction = ajaxHelper.ViewContext.HttpContext.Request.RawUrl;\r
-            return FormHelper(ajaxHelper, formAction, ajaxOptions, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, ajaxOptions);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return BeginForm(ajaxHelper, actionName, (string)null /* controllerName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, controllerName, null /* values */, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            RouteValueDictionary newValues = new RouteValueDictionary(routeValues);\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return BeginForm(ajaxHelper, actionName, controllerName, newValues, ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginForm(ajaxHelper, actionName, controllerName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this AjaxHelper ajaxHelper, string actionName, string controllerName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            // get target URL\r
-            string formAction = UrlHelper.GenerateUrl(null, actionName, controllerName, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-            return FormHelper(ajaxHelper, formAction, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, AjaxOptions ajaxOptions) {\r
-            return BeginRouteForm(ajaxHelper, routeName, null /* routeValues */, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginRouteForm(ajaxHelper, routeName, (object)routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            Dictionary<string, object> newAttributes = ObjectToCaseSensitiveDictionary(htmlAttributes);\r
-            return BeginRouteForm(ajaxHelper, routeName, new RouteValueDictionary(routeValues), ajaxOptions, newAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return BeginRouteForm(ajaxHelper, routeName, routeValues, ajaxOptions, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this AjaxHelper ajaxHelper, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            string formAction = UrlHelper.GenerateUrl(routeName, null /* actionName */, null /* controllerName */, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-            return FormHelper(ajaxHelper, formAction, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        private static MvcForm FormHelper(this AjaxHelper ajaxHelper, string formAction, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            TagBuilder builder = new TagBuilder("form");\r
-            builder.MergeAttributes(htmlAttributes);\r
-            builder.MergeAttribute("action", formAction);\r
-            builder.MergeAttribute("method", "post");\r
-            builder.MergeAttribute("onclick", FormOnClickValue);\r
-            builder.MergeAttribute("onsubmit", GenerateAjaxScript(GetAjaxOptions(ajaxOptions), FormOnSubmitFormat));\r
-\r
-            if (ajaxHelper.ViewContext.ClientValidationEnabled) {\r
-                // forms must have an ID for client validation\r
-                builder.GenerateId(ajaxHelper.ViewContext.FormIdGenerator());\r
-            }\r
-\r
-            ajaxHelper.ViewContext.Writer.Write(builder.ToString(TagRenderMode.StartTag));\r
-            MvcForm theForm = new MvcForm(ajaxHelper.ViewContext);\r
-\r
-            if (ajaxHelper.ViewContext.ClientValidationEnabled) {\r
-                ajaxHelper.ViewContext.FormContext.FormId = builder.Attributes["id"];\r
-            }\r
-\r
-            return theForm;\r
-        }\r
-\r
-        public static MvcHtmlString GlobalizationScript(this AjaxHelper ajaxHelper) {\r
-            return GlobalizationScript(ajaxHelper, CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "ajaxHelper",\r
-            Justification = "This is an extension method")]\r
-        public static MvcHtmlString GlobalizationScript(this AjaxHelper ajaxHelper, CultureInfo cultureInfo) {\r
-            return GlobalizationScriptHelper(AjaxHelper.GlobalizationScriptPath, cultureInfo);\r
-        }\r
-\r
-        private static MvcHtmlString GlobalizationScriptHelper(string scriptPath, CultureInfo cultureInfo) {\r
-            if (cultureInfo == null) {\r
-                throw new ArgumentNullException("cultureInfo");\r
-            }\r
-\r
-            string src = VirtualPathUtility.AppendTrailingSlash(scriptPath) + cultureInfo.Name + ".js";\r
-            string scriptWithCorrectNewLines = _globalizationScript.Replace("\r\n", Environment.NewLine);\r
-            string formatted = String.Format(CultureInfo.InvariantCulture, scriptWithCorrectNewLines, src);\r
-\r
-            return MvcHtmlString.Create(formatted);\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, object routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             ObjectToCaseSensitiveDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, routeValues, ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, null /* routeName */, routeValues, ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(), ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(), ajaxOptions, ObjectToCaseSensitiveDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(), ajaxOptions, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, object routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             new Dictionary<string, object>());\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, object routeValues, AjaxOptions ajaxOptions, object htmlAttributes) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, new RouteValueDictionary(routeValues), ajaxOptions,\r
-                             ObjectToCaseSensitiveDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions) {\r
-            return RouteLink(ajaxHelper, linkText, routeName, routeValues, ajaxOptions, new Dictionary<string, object>());\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(routeName, null /* actionName */, null /* controllerName */, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-\r
-            return MvcHtmlString.Create(GenerateLink(linkText, targetUrl, GetAjaxOptions(ajaxOptions), htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this AjaxHelper ajaxHelper, string linkText, string routeName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-\r
-            string targetUrl = UrlHelper.GenerateUrl(routeName, null /* actionName */, null /* controllerName */, protocol, hostName, fragment, routeValues ?? new RouteValueDictionary(), ajaxHelper.RouteCollection, ajaxHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-\r
-            return MvcHtmlString.Create(GenerateLink(linkText, targetUrl, GetAjaxOptions(ajaxOptions), htmlAttributes));\r
-        }\r
-\r
-        internal static string InsertionModeToString(InsertionMode insertionMode) {\r
-            switch (insertionMode) {\r
-                case InsertionMode.Replace:\r
-                    return "Sys.Mvc.InsertionMode.replace";\r
-                case InsertionMode.InsertBefore:\r
-                    return "Sys.Mvc.InsertionMode.insertBefore";\r
-                case InsertionMode.InsertAfter:\r
-                    return "Sys.Mvc.InsertionMode.insertAfter";\r
-                default:\r
-                    return ((int)insertionMode).ToString(CultureInfo.InvariantCulture);\r
-            }\r
-        }\r
-\r
-        private static Dictionary<string, object> ObjectToCaseSensitiveDictionary(object values) {\r
-            Dictionary<string, object> dict = new Dictionary<string, object>(StringComparer.Ordinal);\r
-            if (values != null) {\r
-                foreach (PropertyDescriptor prop in TypeDescriptor.GetProperties(values)) {\r
-                    object val = prop.GetValue(values);\r
-                    dict[prop.Name] = val;\r
-                }\r
-            }\r
-            return dict;\r
-        }\r
-\r
-        private static string GenerateLink(string linkText, string targetUrl, AjaxOptions ajaxOptions, IDictionary<string, object> htmlAttributes) {\r
-            TagBuilder tag = new TagBuilder("a") {\r
-                InnerHtml = HttpUtility.HtmlEncode(linkText)\r
-            };\r
-\r
-            tag.MergeAttributes(htmlAttributes);\r
-            tag.MergeAttribute("href", targetUrl);\r
-            tag.MergeAttribute("onclick", GenerateAjaxScript(ajaxOptions, LinkOnClickFormat));\r
-\r
-            return tag.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        private static string GenerateAjaxScript(AjaxOptions ajaxOptions, string scriptFormat) {\r
-            string optionsString = ajaxOptions.ToJavascriptString();\r
-            return String.Format(CultureInfo.InvariantCulture, scriptFormat, optionsString);\r
-        }\r
-\r
-        private static AjaxOptions GetAjaxOptions(AjaxOptions ajaxOptions) {\r
-            return (ajaxOptions != null) ? ajaxOptions : new AjaxOptions();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/AjaxOptions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/AjaxOptions.cs
deleted file mode 100644 (file)
index ca04c64..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Ajax {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class AjaxOptions {\r
-        private string _confirm;\r
-        private string _httpMethod;\r
-        private InsertionMode _insertionMode = InsertionMode.Replace;\r
-        private string _loadingElementId;\r
-        private string _onBegin;\r
-        private string _onComplete;\r
-        private string _onFailure;\r
-        private string _onSuccess;\r
-        private string _updateTargetId;\r
-        private string _url;\r
-\r
-        public string Confirm {\r
-            get {\r
-                return _confirm ?? String.Empty;\r
-            }\r
-            set {\r
-                _confirm = value;\r
-            }\r
-        }\r
-\r
-        public string HttpMethod {\r
-            get {\r
-                return _httpMethod ?? String.Empty;\r
-            }\r
-            set {\r
-                _httpMethod = value;\r
-            }\r
-        }\r
-\r
-        public InsertionMode InsertionMode {\r
-            get {\r
-                return _insertionMode;\r
-            }\r
-            set {\r
-                switch (value) {\r
-                    case InsertionMode.Replace:\r
-                    case InsertionMode.InsertAfter:\r
-                    case InsertionMode.InsertBefore:\r
-                        _insertionMode = value;\r
-                        return;\r
-\r
-                    default:\r
-                        throw new ArgumentOutOfRangeException("value");\r
-                }\r
-            }\r
-        }\r
-\r
-        public string LoadingElementId {\r
-            get {\r
-                return _loadingElementId ?? String.Empty;\r
-            }\r
-            set {\r
-                _loadingElementId = value;\r
-            }\r
-        }\r
-\r
-        public string OnBegin {\r
-            get {\r
-                return _onBegin ?? String.Empty;\r
-            }\r
-            set {\r
-                _onBegin = value;\r
-            }\r
-        }\r
-\r
-        public string OnComplete {\r
-            get {\r
-                return _onComplete ?? String.Empty;\r
-            }\r
-            set {\r
-                _onComplete = value;\r
-            }\r
-        }\r
-\r
-        public string OnFailure {\r
-            get {\r
-                return _onFailure ?? String.Empty;\r
-            }\r
-            set {\r
-                _onFailure = value;\r
-            }\r
-        }\r
-\r
-        public string OnSuccess {\r
-            get {\r
-                return _onSuccess ?? String.Empty;\r
-            }\r
-            set {\r
-                _onSuccess = value;\r
-            }\r
-        }\r
-\r
-        public string UpdateTargetId {\r
-            get {\r
-                return _updateTargetId ?? String.Empty;\r
-            }\r
-            set {\r
-                _updateTargetId = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings",\r
-            Justification = "This property is used by the optionsBuilder which always accepts a string.")]\r
-        public string Url {\r
-            get {\r
-                return _url ?? String.Empty;\r
-            }\r
-            set {\r
-                _url = value;\r
-            }\r
-        }\r
-\r
-        internal string ToJavascriptString() {\r
-            // creates a string of the form { key1: value1, key2 : value2, ... }\r
-            StringBuilder optionsBuilder = new StringBuilder("{");\r
-            optionsBuilder.Append(String.Format(CultureInfo.InvariantCulture, " insertionMode: {0},", AjaxExtensions.InsertionModeToString(InsertionMode)));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("confirm", Confirm));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("httpMethod", HttpMethod));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("loadingElementId", LoadingElementId));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("updateTargetId", UpdateTargetId));\r
-            optionsBuilder.Append(PropertyStringIfSpecified("url", Url));\r
-            optionsBuilder.Append(EventStringIfSpecified("onBegin", OnBegin));\r
-            optionsBuilder.Append(EventStringIfSpecified("onComplete", OnComplete));\r
-            optionsBuilder.Append(EventStringIfSpecified("onFailure", OnFailure));\r
-            optionsBuilder.Append(EventStringIfSpecified("onSuccess", OnSuccess));\r
-            optionsBuilder.Length--;\r
-            optionsBuilder.Append(" }");\r
-            return optionsBuilder.ToString();\r
-        }\r
-\r
-        private static string EventStringIfSpecified(string propertyName, string handler) {\r
-            if (!String.IsNullOrEmpty(handler)) {\r
-                return String.Format(CultureInfo.InvariantCulture, " {0}: Function.createDelegate(this, {1}),", propertyName, handler.ToString());\r
-            }\r
-            return String.Empty;\r
-        }\r
-\r
-        private static string PropertyStringIfSpecified(string propertyName, string propertyValue) {\r
-            if (!String.IsNullOrEmpty(propertyValue)) {\r
-                string escapedPropertyValue = propertyValue.Replace("'", @"\'");\r
-                return String.Format(CultureInfo.InvariantCulture, " {0}: '{1}',", propertyName, escapedPropertyValue);\r
-            }\r
-            return String.Empty;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/InsertionMode.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Ajax/InsertionMode.cs
deleted file mode 100644 (file)
index de0eb4e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Ajax {\r
-    public enum InsertionMode {\r
-        Replace = 0,\r
-        InsertBefore = 1,\r
-        InsertAfter = 2\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxHelper.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxHelper.cs
deleted file mode 100644 (file)
index 7324a52..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Text;\r
-    using System.Web.Routing;\r
-    using System.Web.Script.Serialization;\r
-\r
-    public class AjaxHelper {\r
-\r
-        private static string _globalizationScriptPath;\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection) {\r
-            if (viewContext == null) {\r
-                throw new ArgumentNullException("viewContext");\r
-            }\r
-            if (viewDataContainer == null) {\r
-                throw new ArgumentNullException("viewDataContainer");\r
-            }\r
-            if (routeCollection == null) {\r
-                throw new ArgumentNullException("routeCollection");\r
-            }\r
-            ViewContext = viewContext;\r
-            ViewDataContainer = viewDataContainer;\r
-            RouteCollection = routeCollection;\r
-        }\r
-\r
-        public static string GlobalizationScriptPath {\r
-            get {\r
-                if (String.IsNullOrEmpty(_globalizationScriptPath)) {\r
-                    _globalizationScriptPath = "~/Scripts/Globalization";\r
-                }\r
-                return _globalizationScriptPath;\r
-            }\r
-            set {\r
-                _globalizationScriptPath = value;\r
-            }\r
-        }\r
-\r
-        public RouteCollection RouteCollection {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                return ViewDataContainer.ViewData;\r
-            }\r
-        }\r
-\r
-        public IViewDataContainer ViewDataContainer {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "Instance method for consistency with other helpers.")]\r
-        public string JavaScriptStringEncode(string message) {\r
-            if (String.IsNullOrEmpty(message)) {\r
-                return message;\r
-            }\r
-            \r
-            StringBuilder builder = new StringBuilder();\r
-            JavaScriptSerializer serializer = new JavaScriptSerializer();\r
-            serializer.Serialize(message, builder);\r
-            return builder.ToString(1, builder.Length - 2); // remove first + last quote\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxHelper`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxHelper`1.cs
deleted file mode 100644 (file)
index 1e1f2b9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public class AjaxHelper<TModel> : AjaxHelper {\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public AjaxHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection)\r
-            : base(viewContext, viewDataContainer, routeCollection) {\r
-\r
-            _viewData = new ViewDataDictionary<TModel>(viewDataContainer.ViewData);\r
-        }\r
-\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                return _viewData;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxRequestExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AjaxRequestExtensions.cs
deleted file mode 100644 (file)
index 411c250..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public static class AjaxRequestExtensions {\r
-\r
-        public static bool IsAjaxRequest(this HttpRequestBase request) {\r
-            if (request == null) {\r
-                throw new ArgumentNullException("request");\r
-            }\r
-            \r
-            return (request["X-Requested-With"] == "XMLHttpRequest") || ((request.Headers != null) && (request.Headers["X-Requested-With"] == "XMLHttpRequest"));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AntiForgeryData.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AntiForgeryData.cs
deleted file mode 100644 (file)
index 82252d4..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Security.Cryptography;\r
-    using System.Security.Principal;\r
-    using System.Text;\r
-\r
-    internal sealed class AntiForgeryData {\r
-\r
-        private const string AntiForgeryTokenFieldName = "__RequestVerificationToken";\r
-\r
-        private const int TokenLength = 128 / 8;\r
-        private readonly static RNGCryptoServiceProvider _prng = new RNGCryptoServiceProvider();\r
-\r
-        private DateTime _creationDate = DateTime.UtcNow;\r
-        private string _salt;\r
-        private string _username;\r
-        private string _value;\r
-\r
-        public AntiForgeryData() {\r
-        }\r
-\r
-        // copy constructor\r
-        public AntiForgeryData(AntiForgeryData token) {\r
-            if (token == null) {\r
-                throw new ArgumentNullException("token");\r
-            }\r
-\r
-            CreationDate = token.CreationDate;\r
-            Salt = token.Salt;\r
-            Username = token.Username;\r
-            Value = token.Value;\r
-        }\r
-\r
-        public DateTime CreationDate {\r
-            get {\r
-                return _creationDate;\r
-            }\r
-            set {\r
-                _creationDate = value;\r
-            }\r
-        }\r
-\r
-        public string Salt {\r
-            get {\r
-                return _salt ?? String.Empty;\r
-            }\r
-            set {\r
-                _salt = value;\r
-            }\r
-        }\r
-\r
-        public string Username {\r
-            get {\r
-                return _username ?? String.Empty;\r
-            }\r
-            set {\r
-                _username = value;\r
-            }\r
-        }\r
-\r
-        public string Value {\r
-            get {\r
-                return _value ?? String.Empty;\r
-            }\r
-            set {\r
-                _value = value;\r
-            }\r
-        }\r
-\r
-        private static string Base64EncodeForCookieName(string s) {\r
-            byte[] rawBytes = Encoding.UTF8.GetBytes(s);\r
-            string base64String = Convert.ToBase64String(rawBytes);\r
-\r
-            // replace base64-specific characters with characters that are safe for a cookie name\r
-            return base64String.Replace('+', '.').Replace('/', '-').Replace('=', '_');\r
-        }\r
-\r
-        private static string GenerateRandomTokenString() {\r
-            byte[] tokenBytes = new byte[TokenLength];\r
-            _prng.GetBytes(tokenBytes);\r
-\r
-            string token = Convert.ToBase64String(tokenBytes);\r
-            return token;\r
-        }\r
-\r
-        // If the app path is provided, we're generating a cookie name rather than a field name, and the cookie names should\r
-        // be unique so that a development server cookie and an IIS cookie - both running on localhost - don't stomp on\r
-        // each other.\r
-        internal static string GetAntiForgeryTokenName(string appPath) {\r
-            if (String.IsNullOrEmpty(appPath)) {\r
-                return AntiForgeryTokenFieldName;\r
-            }\r
-            else {\r
-                return AntiForgeryTokenFieldName + "_" + Base64EncodeForCookieName(appPath);\r
-            }\r
-        }\r
-\r
-        internal static string GetUsername(IPrincipal user) {\r
-            if (user != null) {\r
-                IIdentity identity = user.Identity;\r
-                if (identity != null && identity.IsAuthenticated) {\r
-                    return identity.Name;\r
-                }\r
-            }\r
-\r
-            return String.Empty;\r
-        }\r
-\r
-        public static AntiForgeryData NewToken() {\r
-            string tokenString = GenerateRandomTokenString();\r
-            return new AntiForgeryData() {\r
-                Value = tokenString\r
-            };\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AntiForgeryDataSerializer.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AntiForgeryDataSerializer.cs
deleted file mode 100644 (file)
index cb06831..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.IO;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    internal class AntiForgeryDataSerializer {\r
-\r
-        private IStateFormatter _formatter;\r
-\r
-        protected internal IStateFormatter Formatter {\r
-            get {\r
-                if (_formatter == null) {\r
-                    _formatter = FormatterGenerator.GetFormatter();\r
-                }\r
-                return _formatter;\r
-            }\r
-            set {\r
-                _formatter = value;\r
-            }\r
-        }\r
-\r
-        private static HttpAntiForgeryException CreateValidationException(Exception innerException) {\r
-            return new HttpAntiForgeryException(MvcResources.AntiForgeryToken_ValidationFailed, innerException);\r
-        }\r
-\r
-        public virtual AntiForgeryData Deserialize(string serializedToken) {\r
-            if (String.IsNullOrEmpty(serializedToken)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "serializedToken");\r
-            }\r
-\r
-            // call property getter outside try { } block so that exceptions bubble up for debugging\r
-            IStateFormatter formatter = Formatter;\r
-\r
-            try {\r
-                object[] deserializedObj = (object[])formatter.Deserialize(serializedToken);\r
-                return new AntiForgeryData() {\r
-                    Salt = (string)deserializedObj[0],\r
-                    Value = (string)deserializedObj[1],\r
-                    CreationDate = (DateTime)deserializedObj[2],\r
-                    Username = (string)deserializedObj[3]\r
-                };\r
-            }\r
-            catch (Exception ex) {\r
-                throw CreateValidationException(ex);\r
-            }\r
-        }\r
-\r
-        public virtual string Serialize(AntiForgeryData token) {\r
-            if (token == null) {\r
-                throw new ArgumentNullException("token");\r
-            }\r
-\r
-            object[] objToSerialize = new object[] {\r
-                token.Salt,\r
-                token.Value,\r
-                token.CreationDate,\r
-                token.Username\r
-            };\r
-\r
-            string serializedValue = Formatter.Serialize(objToSerialize);\r
-            return serializedValue;\r
-        }\r
-\r
-        // See http://www.yoda.arachsys.com/csharp/singleton.html (fifth version - fully lazy) for the singleton pattern\r
-        // used here. We need to defer the call to TokenPersister.CreateFormatterGenerator() until we're actually\r
-        // servicing a request, else HttpContext.Current might be invalid in TokenPersister.CreateFormatterGenerator().\r
-        private static class FormatterGenerator {\r
-\r
-            public static readonly Func<IStateFormatter> GetFormatter = TokenPersister.CreateFormatterGenerator();\r
-\r
-            [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline",\r
-                Justification = "This type must not be marked 'beforefieldinit'.")]\r
-            static FormatterGenerator() {\r
-            }\r
-\r
-            // This type is very difficult to unit-test because Page.ProcessRequest() requires mocking\r
-            // much of the hosting environment. For now, we can perform functional tests of this feature.\r
-            private sealed class TokenPersister : PageStatePersister {\r
-                private TokenPersister(Page page)\r
-                    : base(page) {\r
-                }\r
-\r
-                public static Func<IStateFormatter> CreateFormatterGenerator() {\r
-                    // This code instantiates a page and tricks it into thinking that it's servicing\r
-                    // a postback scenario with encrypted ViewState, which is required to make the\r
-                    // StateFormatter properly decrypt data. Specifically, this code sets the\r
-                    // internal Page.ContainsEncryptedViewState flag.\r
-                    TextWriter writer = TextWriter.Null;\r
-                    HttpResponse response = new HttpResponse(writer);\r
-                    HttpRequest request = new HttpRequest("DummyFile.aspx", HttpContext.Current.Request.Url.ToString(), "__EVENTTARGET=true&__VIEWSTATEENCRYPTED=true");\r
-                    HttpContext context = new HttpContext(request, response);\r
-\r
-                    Page page = new Page() {\r
-                        EnableViewStateMac = true,\r
-                        ViewStateEncryptionMode = ViewStateEncryptionMode.Always\r
-                    };\r
-                    page.ProcessRequest(context);\r
-\r
-                    return () => new TokenPersister(page).StateFormatter;\r
-                }\r
-\r
-                public override void Load() {\r
-                    throw new NotImplementedException();\r
-                }\r
-\r
-                public override void Save() {\r
-                    throw new NotImplementedException();\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaHelpers.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaHelpers.cs
deleted file mode 100644 (file)
index 723f834..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Routing;\r
-\r
-    internal static class AreaHelpers {\r
-\r
-        public static string GetAreaName(RouteBase route) {\r
-            IRouteWithArea routeWithArea = route as IRouteWithArea;\r
-            if (routeWithArea != null) {\r
-                return routeWithArea.Area;\r
-            }\r
-\r
-            Route castRoute = route as Route;\r
-            if (castRoute != null && castRoute.DataTokens != null) {\r
-                return castRoute.DataTokens["area"] as string;\r
-            }\r
-\r
-            return null;\r
-        }\r
-\r
-        public static string GetAreaName(RouteData routeData) {\r
-            object area;\r
-            if (routeData.DataTokens.TryGetValue("area", out area)) {\r
-                return area as string;\r
-            }\r
-\r
-            return GetAreaName(routeData.Route);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaRegistration.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaRegistration.cs
deleted file mode 100644 (file)
index 5725ddf..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Web.Routing;\r
-\r
-    public abstract class AreaRegistration {\r
-\r
-        private const string _typeCacheName = "MVC-AreaRegistrationTypeCache.xml";\r
-\r
-        public abstract string AreaName {\r
-            get;\r
-        }\r
-\r
-        internal void CreateContextAndRegister(RouteCollection routes, object state) {\r
-            AreaRegistrationContext context = new AreaRegistrationContext(AreaName, routes, state);\r
-\r
-            string thisNamespace = GetType().Namespace;\r
-            if (thisNamespace != null) {\r
-                context.Namespaces.Add(thisNamespace + ".*");\r
-            }\r
-\r
-            RegisterArea(context);\r
-        }\r
-\r
-        private static bool IsAreaRegistrationType(Type type) {\r
-            return\r
-                typeof(AreaRegistration).IsAssignableFrom(type) &&\r
-                type.GetConstructor(Type.EmptyTypes) != null;\r
-        }\r
-\r
-        public static void RegisterAllAreas() {\r
-            RegisterAllAreas(null);\r
-        }\r
-\r
-        public static void RegisterAllAreas(object state) {\r
-            RegisterAllAreas(RouteTable.Routes, new BuildManagerWrapper(), state);\r
-        }\r
-\r
-        internal static void RegisterAllAreas(RouteCollection routes, IBuildManager buildManager, object state) {\r
-            List<Type> areaRegistrationTypes = TypeCacheUtil.GetFilteredTypesFromAssemblies(_typeCacheName, IsAreaRegistrationType, buildManager);\r
-            foreach (Type areaRegistrationType in areaRegistrationTypes) {\r
-                AreaRegistration registration = (AreaRegistration)Activator.CreateInstance(areaRegistrationType);\r
-                registration.CreateContextAndRegister(routes, state);\r
-            }\r
-        }\r
-\r
-        public abstract void RegisterArea(AreaRegistrationContext context);\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaRegistrationContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AreaRegistrationContext.cs
deleted file mode 100644 (file)
index 869c1ac..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Web.Routing;\r
-\r
-    public class AreaRegistrationContext {\r
-\r
-        private readonly HashSet<string> _namespaces = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public AreaRegistrationContext(string areaName, RouteCollection routes)\r
-            : this(areaName, routes, null) {\r
-        }\r
-\r
-        public AreaRegistrationContext(string areaName, RouteCollection routes, object state) {\r
-            if (String.IsNullOrEmpty(areaName)) {\r
-                throw Error.ParameterCannotBeNullOrEmpty("areaName");\r
-            }\r
-            if (routes == null) {\r
-                throw new ArgumentNullException("routes");\r
-            }\r
-\r
-            AreaName = areaName;\r
-            Routes = routes;\r
-            State = state;\r
-        }\r
-\r
-        public string AreaName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ICollection<string> Namespaces {\r
-            get {\r
-                return _namespaces;\r
-            }\r
-        }\r
-\r
-        public RouteCollection Routes {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public object State {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public Route MapRoute(string name, string url) {\r
-            return MapRoute(name, url, (object)null /* defaults */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public Route MapRoute(string name, string url, object defaults) {\r
-            return MapRoute(name, url, defaults, (object)null /* constraints */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public Route MapRoute(string name, string url, object defaults, object constraints) {\r
-            return MapRoute(name, url, defaults, constraints, null /* namespaces */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public Route MapRoute(string name, string url, string[] namespaces) {\r
-            return MapRoute(name, url, (object)null /* defaults */, namespaces);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public Route MapRoute(string name, string url, object defaults, string[] namespaces) {\r
-            return MapRoute(name, url, defaults, null /* constraints */, namespaces);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public Route MapRoute(string name, string url, object defaults, object constraints, string[] namespaces) {\r
-            if (namespaces == null && Namespaces != null) {\r
-                namespaces = Namespaces.ToArray();\r
-            }\r
-\r
-            Route route = Routes.MapRoute(name, url, defaults, constraints, namespaces);\r
-            route.DataTokens["area"] = AreaName;\r
-\r
-            // disabling the namespace lookup fallback mechanism keeps this areas from accidentally picking up\r
-            // controllers belonging to other areas\r
-            bool useNamespaceFallback = (namespaces == null || namespaces.Length == 0);\r
-            route.DataTokens["UseNamespaceFallback"] = useNamespaceFallback;\r
-\r
-            return route;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AssociatedMetadataProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AssociatedMetadataProvider.cs
deleted file mode 100644 (file)
index bd9248f..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.ComponentModel.DataAnnotations;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    // This class provides a good implementation of ModelMetadataProvider for people who will be\r
-    // using traditional classes with properties. It uses the buddy class support from\r
-    // DataAnnotations, and consolidates the three operations down to a single override\r
-    // for reading the attribute values and creating the metadata class.\r
-    public abstract class AssociatedMetadataProvider : ModelMetadataProvider {\r
-        protected abstract ModelMetadata CreateMetadata(IEnumerable<Attribute> attributes, Type containerType, Func<object> modelAccessor, Type modelType, string propertyName);\r
-\r
-        protected virtual IEnumerable<Attribute> FilterAttributes(Type containerType, PropertyDescriptor propertyDescriptor, IEnumerable<Attribute> attributes) {\r
-            if (typeof(ViewPage).IsAssignableFrom(containerType) || typeof(ViewUserControl).IsAssignableFrom(containerType)) {\r
-                return attributes.Where(a => !(a is ReadOnlyAttribute));\r
-            }\r
-\r
-            return attributes;\r
-        }\r
-\r
-        public override IEnumerable<ModelMetadata> GetMetadataForProperties(object container, Type containerType) {\r
-            if (containerType == null) {\r
-                throw new ArgumentNullException("containerType");\r
-            }\r
-\r
-            return GetMetadataForPropertiesImpl(container, containerType);\r
-        }\r
-\r
-        private IEnumerable<ModelMetadata> GetMetadataForPropertiesImpl(object container, Type containerType) {\r
-            foreach (PropertyDescriptor property in GetTypeDescriptor(containerType).GetProperties()) {\r
-                Func<object> modelAccessor = container == null ? null : GetPropertyValueAccessor(container, property);\r
-                yield return GetMetadataForProperty(modelAccessor, containerType, property);\r
-            }\r
-        }\r
-\r
-        public override ModelMetadata GetMetadataForProperty(Func<object> modelAccessor, Type containerType, string propertyName) {\r
-            if (containerType == null) {\r
-                throw new ArgumentNullException("containerType");\r
-            }\r
-            if (String.IsNullOrEmpty(propertyName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "propertyName");\r
-            }\r
-\r
-            ICustomTypeDescriptor typeDescriptor = GetTypeDescriptor(containerType);\r
-            PropertyDescriptor property = typeDescriptor.GetProperties().Find(propertyName, true);\r
-            if (property == null) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.Common_PropertyNotFound,\r
-                        containerType.FullName, propertyName));\r
-            }\r
-\r
-            return GetMetadataForProperty(modelAccessor, containerType, property);\r
-        }\r
-\r
-        protected virtual ModelMetadata GetMetadataForProperty(Func<object> modelAccessor, Type containerType, PropertyDescriptor propertyDescriptor) {\r
-            IEnumerable<Attribute> attributes = FilterAttributes(containerType, propertyDescriptor, propertyDescriptor.Attributes.Cast<Attribute>());\r
-            return CreateMetadata(attributes, containerType, modelAccessor, propertyDescriptor.PropertyType, propertyDescriptor.Name);\r
-        }\r
-\r
-        public override ModelMetadata GetMetadataForType(Func<object> modelAccessor, Type modelType) {\r
-            if (modelType == null) {\r
-                throw new ArgumentNullException("modelType");\r
-            }\r
-\r
-            IEnumerable<Attribute> attributes = GetTypeDescriptor(modelType).GetAttributes().Cast<Attribute>();\r
-            return CreateMetadata(attributes, null /* containerType */, modelAccessor, modelType, null /* propertyName */);\r
-        }\r
-\r
-        private static Func<object> GetPropertyValueAccessor(object container, PropertyDescriptor property) {\r
-            return () => property.GetValue(container);\r
-        }\r
-\r
-        protected virtual ICustomTypeDescriptor GetTypeDescriptor(Type type) {\r
-            return TypeDescriptorHelper.Get(type);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AssociatedValidatorProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AssociatedValidatorProvider.cs
deleted file mode 100644 (file)
index f7b280a..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.ComponentModel.DataAnnotations;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public abstract class AssociatedValidatorProvider : ModelValidatorProvider {\r
-        protected virtual ICustomTypeDescriptor GetTypeDescriptor(Type type) {\r
-            return TypeDescriptorHelper.Get(type);\r
-        }\r
-\r
-        public override sealed IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context) {\r
-            if (metadata == null) {\r
-                throw new ArgumentNullException("metadata");\r
-            }\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            if (metadata.ContainerType != null && !String.IsNullOrEmpty(metadata.PropertyName)) {\r
-                return GetValidatorsForProperty(metadata, context);\r
-            }\r
-\r
-            return GetValidatorsForType(metadata, context);\r
-        }\r
-\r
-        protected abstract IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context, IEnumerable<Attribute> attributes);\r
-\r
-        private IEnumerable<ModelValidator> GetValidatorsForProperty(ModelMetadata metadata, ControllerContext context) {\r
-            ICustomTypeDescriptor typeDescriptor = GetTypeDescriptor(metadata.ContainerType);\r
-            PropertyDescriptor property = typeDescriptor.GetProperties().Find(metadata.PropertyName, true);\r
-            if (property == null) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.Common_PropertyNotFound,\r
-                        metadata.ContainerType.FullName, metadata.PropertyName),\r
-                    "metadata");\r
-            }\r
-\r
-            return GetValidators(metadata, context, property.Attributes.OfType<Attribute>());\r
-        }\r
-\r
-        private IEnumerable<ModelValidator> GetValidatorsForType(ModelMetadata metadata, ControllerContext context) {\r
-            return GetValidators(metadata, context, GetTypeDescriptor(metadata.ModelType).GetAttributes().Cast<Attribute>());\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/.gitattributes b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/.gitattributes
deleted file mode 100644 (file)
index b0ad6f8..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/ActionDescriptorCreator.cs -crlf
-/AsyncActionDescriptor.cs -crlf
-/AsyncActionMethodSelector.cs -crlf
-/AsyncControllerActionInvoker.cs -crlf
-/AsyncManager.cs -crlf
-/AsyncResultWrapper.cs -crlf
-/AsyncUtil.cs -crlf
-/AsyncVoid.cs -crlf
-/BeginInvokeDelegate.cs -crlf
-/EndInvokeDelegate.cs -crlf
-/EndInvokeDelegate`1.cs -crlf
-/IAsyncActionInvoker.cs -crlf
-/IAsyncController.cs -crlf
-/IAsyncManagerContainer.cs -crlf
-/OperationCounter.cs -crlf
-/ReflectedAsyncActionDescriptor.cs -crlf
-/ReflectedAsyncControllerDescriptor.cs -crlf
-/SimpleAsyncResult.cs -crlf
-/SingleEntryGate.cs -crlf
-/SynchronizationContextUtil.cs -crlf
-/SynchronousOperationException.cs -crlf
-/Trigger.cs -crlf
-/TriggerListener.cs -crlf
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ActionDescriptorCreator.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ActionDescriptorCreator.cs
deleted file mode 100644 (file)
index 19e1179..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-\r
-    internal delegate ActionDescriptor ActionDescriptorCreator(string actionName, ControllerDescriptor controllerDescriptor);\r
-\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncActionDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncActionDescriptor.cs
deleted file mode 100644 (file)
index 2b9ff2f..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Collections.Generic;\r
-\r
-    public abstract class AsyncActionDescriptor : ActionDescriptor {\r
-\r
-        public abstract IAsyncResult BeginExecute(ControllerContext controllerContext, IDictionary<string, object> parameters, AsyncCallback callback, object state);\r
-\r
-        public abstract object EndExecute(IAsyncResult asyncResult);\r
-\r
-        public override object Execute(ControllerContext controllerContext, IDictionary<string, object> parameters) {\r
-            // execute an asynchronous task synchronously\r
-            IAsyncResult asyncResult = BeginExecute(controllerContext, parameters, null, null);\r
-            AsyncUtil.WaitForAsyncResultCompletion(asyncResult, controllerContext.HttpContext.ApplicationInstance); // blocks\r
-            return EndExecute(asyncResult);\r
-        }\r
-\r
-        internal static AsyncManager GetAsyncManager(ControllerBase controller) {\r
-            IAsyncManagerContainer helperContainer = controller as IAsyncManagerContainer;\r
-            if (helperContainer == null) {\r
-                throw Error.AsyncCommon_ControllerMustImplementIAsyncManagerContainer(controller.GetType());\r
-            }\r
-\r
-            return helperContainer.AsyncManager;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncActionMethodSelector.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncActionMethodSelector.cs
deleted file mode 100644 (file)
index efd00b1..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    internal sealed class AsyncActionMethodSelector {\r
-\r
-        public AsyncActionMethodSelector(Type controllerType) {\r
-            ControllerType = controllerType;\r
-            PopulateLookupTables();\r
-        }\r
-\r
-        public Type ControllerType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public MethodInfo[] AliasedMethods {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ILookup<string, MethodInfo> NonAliasedMethods {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        private AmbiguousMatchException CreateAmbiguousActionMatchException(IEnumerable<MethodInfo> ambiguousMethods, string actionName) {\r
-            string ambiguityList = CreateAmbiguousMatchList(ambiguousMethods);\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ActionMethodSelector_AmbiguousMatch,\r
-                actionName, ControllerType.Name, ambiguityList);\r
-            return new AmbiguousMatchException(message);\r
-        }\r
-\r
-        private AmbiguousMatchException CreateAmbiguousMethodMatchException(IEnumerable<MethodInfo> ambiguousMethods, string methodName) {\r
-            string ambiguityList = CreateAmbiguousMatchList(ambiguousMethods);\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.AsyncActionMethodSelector_AmbiguousMethodMatch,\r
-                methodName, ControllerType.Name, ambiguityList);\r
-            return new AmbiguousMatchException(message);\r
-        }\r
-\r
-        private static string CreateAmbiguousMatchList(IEnumerable<MethodInfo> ambiguousMethods) {\r
-            StringBuilder exceptionMessageBuilder = new StringBuilder();\r
-            foreach (MethodInfo methodInfo in ambiguousMethods) {\r
-                exceptionMessageBuilder.AppendLine();\r
-                exceptionMessageBuilder.AppendFormat(CultureInfo.CurrentUICulture, MvcResources.ActionMethodSelector_AmbiguousMatchType, methodInfo, methodInfo.DeclaringType.FullName);\r
-            }\r
-\r
-            return exceptionMessageBuilder.ToString();\r
-        }\r
-\r
-        public ActionDescriptorCreator FindAction(ControllerContext controllerContext, string actionName) {\r
-            List<MethodInfo> methodsMatchingName = GetMatchingAliasedMethods(controllerContext, actionName);\r
-            methodsMatchingName.AddRange(NonAliasedMethods[actionName]);\r
-            List<MethodInfo> finalMethods = RunSelectionFilters(controllerContext, methodsMatchingName);\r
-\r
-            switch (finalMethods.Count) {\r
-                case 0:\r
-                    return null;\r
-\r
-                case 1:\r
-                    MethodInfo entryMethod = finalMethods[0];\r
-                    return GetActionDescriptorDelegate(entryMethod);\r
-\r
-                default:\r
-                    throw CreateAmbiguousActionMatchException(finalMethods, actionName);\r
-            }\r
-        }\r
-\r
-        private ActionDescriptorCreator GetActionDescriptorDelegate(MethodInfo entryMethod) {\r
-            // Is this the FooAsync() / FooCompleted() pattern?\r
-            if (IsAsyncSuffixedMethod(entryMethod)) {\r
-                string completionMethodName = entryMethod.Name.Substring(0, entryMethod.Name.Length - "Async".Length) + "Completed";\r
-                MethodInfo completionMethod = GetMethodByName(completionMethodName);\r
-                if (completionMethod != null) {\r
-                    return (actionName, controllerDescriptor) => new ReflectedAsyncActionDescriptor(entryMethod, completionMethod, actionName, controllerDescriptor);\r
-                }\r
-                else {\r
-                    throw Error.AsyncActionMethodSelector_CouldNotFindMethod(completionMethodName, ControllerType);\r
-                }\r
-            }\r
-\r
-            // Fallback to synchronous method\r
-            return (actionName, controllerDescriptor) => new ReflectedActionDescriptor(entryMethod, actionName, controllerDescriptor);\r
-        }\r
-\r
-        private static string GetCanonicalMethodName(MethodInfo methodInfo) {\r
-            string methodName = methodInfo.Name;\r
-            return (IsAsyncSuffixedMethod(methodInfo))\r
-                ? methodName.Substring(0, methodName.Length - "Async".Length)\r
-                : methodName;\r
-        }\r
-\r
-        internal List<MethodInfo> GetMatchingAliasedMethods(ControllerContext controllerContext, string actionName) {\r
-            // find all aliased methods which are opting in to this request\r
-            // to opt in, all attributes defined on the method must return true\r
-\r
-            var methods = from methodInfo in AliasedMethods\r
-                          let attrs = (ActionNameSelectorAttribute[])methodInfo.GetCustomAttributes(typeof(ActionNameSelectorAttribute), true /* inherit */)\r
-                          where attrs.All(attr => attr.IsValidName(controllerContext, actionName, methodInfo))\r
-                          select methodInfo;\r
-            return methods.ToList();\r
-        }\r
-\r
-        private static bool IsAsyncSuffixedMethod(MethodInfo methodInfo) {\r
-            return methodInfo.Name.EndsWith("Async", StringComparison.OrdinalIgnoreCase);\r
-        }\r
-\r
-        private static bool IsCompletedSuffixedMethod(MethodInfo methodInfo) {\r
-            return methodInfo.Name.EndsWith("Completed", StringComparison.OrdinalIgnoreCase);\r
-        }\r
-\r
-        private static bool IsMethodDecoratedWithAliasingAttribute(MethodInfo methodInfo) {\r
-            return methodInfo.IsDefined(typeof(ActionNameSelectorAttribute), true /* inherit */);\r
-        }\r
-\r
-        private MethodInfo GetMethodByName(string methodName) {\r
-            List<MethodInfo> methods = (from MethodInfo methodInfo in ControllerType.GetMember(methodName, MemberTypes.Method, BindingFlags.Instance | BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.IgnoreCase)\r
-                                        where IsValidActionMethod(methodInfo, false /* stripInfrastructureMethods */)\r
-                                        select methodInfo).ToList();\r
-\r
-            switch (methods.Count) {\r
-                case 0:\r
-                    return null;\r
-\r
-                case 1:\r
-                    return methods[0];\r
-\r
-                default:\r
-                    throw CreateAmbiguousMethodMatchException(methods, methodName);\r
-            }\r
-        }\r
-\r
-        private static bool IsValidActionMethod(MethodInfo methodInfo) {\r
-            return IsValidActionMethod(methodInfo, true /* stripInfrastructureMethods */);\r
-        }\r
-\r
-        private static bool IsValidActionMethod(MethodInfo methodInfo, bool stripInfrastructureMethods) {\r
-            if (methodInfo.IsSpecialName) {\r
-                // not a normal method, e.g. a constructor or an event\r
-                return false;\r
-            }\r
-\r
-            if (methodInfo.GetBaseDefinition().DeclaringType.IsAssignableFrom(typeof(AsyncController))) {\r
-                // is a method on Object, ControllerBase, Controller, or AsyncController\r
-                return false;\r
-            };\r
-\r
-            if (stripInfrastructureMethods) {\r
-                if (IsCompletedSuffixedMethod(methodInfo)) {\r
-                    // do not match FooCompleted() methods, as these are infrastructure methods\r
-                    return false;\r
-                }\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private void PopulateLookupTables() {\r
-            MethodInfo[] allMethods = ControllerType.GetMethods(BindingFlags.InvokeMethod | BindingFlags.Instance | BindingFlags.Public);\r
-            MethodInfo[] actionMethods = Array.FindAll(allMethods, IsValidActionMethod);\r
-\r
-            AliasedMethods = Array.FindAll(actionMethods, IsMethodDecoratedWithAliasingAttribute);\r
-            NonAliasedMethods = actionMethods.Except(AliasedMethods).ToLookup(GetCanonicalMethodName, StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-        private static List<MethodInfo> RunSelectionFilters(ControllerContext controllerContext, List<MethodInfo> methodInfos) {\r
-            // remove all methods which are opting out of this request\r
-            // to opt out, at least one attribute defined on the method must return false\r
-\r
-            List<MethodInfo> matchesWithSelectionAttributes = new List<MethodInfo>();\r
-            List<MethodInfo> matchesWithoutSelectionAttributes = new List<MethodInfo>();\r
-\r
-            foreach (MethodInfo methodInfo in methodInfos) {\r
-                ActionMethodSelectorAttribute[] attrs = (ActionMethodSelectorAttribute[])methodInfo.GetCustomAttributes(typeof(ActionMethodSelectorAttribute), true /* inherit */);\r
-                if (attrs.Length == 0) {\r
-                    matchesWithoutSelectionAttributes.Add(methodInfo);\r
-                }\r
-                else if (attrs.All(attr => attr.IsValidForRequest(controllerContext, methodInfo))) {\r
-                    matchesWithSelectionAttributes.Add(methodInfo);\r
-                }\r
-            }\r
-\r
-            // if a matching action method had a selection attribute, consider it more specific than a matching action method\r
-            // without a selection attribute\r
-            return (matchesWithSelectionAttributes.Count > 0) ? matchesWithSelectionAttributes : matchesWithoutSelectionAttributes;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncControllerActionInvoker.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncControllerActionInvoker.cs
deleted file mode 100644 (file)
index cf1349e..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Threading;\r
-\r
-    public class AsyncControllerActionInvoker : ControllerActionInvoker, IAsyncActionInvoker {\r
-\r
-        private static readonly object _invokeActionTag = new object();\r
-        private static readonly object _invokeActionMethodTag = new object();\r
-        private static readonly object _invokeActionMethodWithFiltersTag = new object();\r
-\r
-        public virtual IAsyncResult BeginInvokeAction(ControllerContext controllerContext, string actionName, AsyncCallback callback, object state) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw Error.ParameterCannotBeNullOrEmpty("actionName");\r
-            }\r
-\r
-            ControllerDescriptor controllerDescriptor = GetControllerDescriptor(controllerContext);\r
-            ActionDescriptor actionDescriptor = controllerDescriptor.FindAction(controllerContext, actionName);\r
-            if (actionDescriptor != null) {\r
-                FilterInfo filterInfo = GetFilters(controllerContext, actionDescriptor);\r
-                Action continuation = null;\r
-\r
-                BeginInvokeDelegate beginDelegate = delegate(AsyncCallback asyncCallback, object asyncState) {\r
-                    try {\r
-                        AuthorizationContext authContext = InvokeAuthorizationFilters(controllerContext, filterInfo.AuthorizationFilters, actionDescriptor);\r
-                        if (authContext.Result != null) {\r
-                            // the auth filter signaled that we should let it short-circuit the request\r
-                            continuation = () => InvokeActionResult(controllerContext, authContext.Result);\r
-                        }\r
-                        else {\r
-                            if (controllerContext.Controller.ValidateRequest) {\r
-                                ValidateRequest(controllerContext);\r
-                            }\r
-\r
-                            IDictionary<string, object> parameters = GetParameterValues(controllerContext, actionDescriptor);\r
-                            IAsyncResult asyncResult = BeginInvokeActionMethodWithFilters(controllerContext, filterInfo.ActionFilters, actionDescriptor, parameters, asyncCallback, asyncState);\r
-                            continuation = () => {\r
-                                ActionExecutedContext postActionContext = EndInvokeActionMethodWithFilters(asyncResult);\r
-                                InvokeActionResultWithFilters(controllerContext, filterInfo.ResultFilters, postActionContext.Result);\r
-                            };\r
-                            return asyncResult;\r
-                        }\r
-                    }\r
-                    catch (ThreadAbortException) {\r
-                        // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                        // the filters don't see this as an error.\r
-                        throw;\r
-                    }\r
-                    catch (Exception ex) {\r
-                        // something blew up, so execute the exception filters\r
-                        ExceptionContext exceptionContext = InvokeExceptionFilters(controllerContext, filterInfo.ExceptionFilters, ex);\r
-                        if (!exceptionContext.ExceptionHandled) {\r
-                            throw;\r
-                        }\r
-\r
-                        continuation = () => InvokeActionResult(controllerContext, exceptionContext.Result);\r
-                    }\r
-\r
-                    return BeginInvokeAction_MakeSynchronousAsyncResult(asyncCallback, asyncState);\r
-                };\r
-\r
-                EndInvokeDelegate<bool> endDelegate = delegate(IAsyncResult asyncResult) {\r
-                    try {\r
-                        continuation();\r
-                    }\r
-                    catch (ThreadAbortException) {\r
-                        // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                        // the filters don't see this as an error.\r
-                        throw;\r
-                    }\r
-                    catch (Exception ex) {\r
-                        // something blew up, so execute the exception filters\r
-                        ExceptionContext exceptionContext = InvokeExceptionFilters(controllerContext, filterInfo.ExceptionFilters, ex);\r
-                        if (!exceptionContext.ExceptionHandled) {\r
-                            throw;\r
-                        }\r
-                        InvokeActionResult(controllerContext, exceptionContext.Result);\r
-                    }\r
-\r
-                    return true;\r
-                };\r
-\r
-                return AsyncResultWrapper.Begin(callback, state, beginDelegate, endDelegate, _invokeActionTag);\r
-            }\r
-            else {\r
-                // Notify the controller that no action was found.\r
-                return BeginInvokeAction_ActionNotFound(callback, state);\r
-            }\r
-        }\r
-\r
-        private static IAsyncResult BeginInvokeAction_ActionNotFound(AsyncCallback callback, object state) {\r
-            BeginInvokeDelegate beginDelegate = BeginInvokeAction_MakeSynchronousAsyncResult;\r
-\r
-            EndInvokeDelegate<bool> endDelegate = delegate(IAsyncResult asyncResult) {\r
-                return false;\r
-            };\r
-\r
-            return AsyncResultWrapper.Begin(callback, state, beginDelegate, endDelegate, _invokeActionTag);\r
-        }\r
-\r
-        private static IAsyncResult BeginInvokeAction_MakeSynchronousAsyncResult(AsyncCallback callback, object state) {\r
-            SimpleAsyncResult asyncResult = new SimpleAsyncResult(state);\r
-            asyncResult.MarkCompleted(true /* completedSynchronously */, callback);\r
-            return asyncResult;\r
-        }\r
-\r
-        protected internal virtual IAsyncResult BeginInvokeActionMethod(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters, AsyncCallback callback, object state) {\r
-            AsyncActionDescriptor asyncActionDescriptor = actionDescriptor as AsyncActionDescriptor;\r
-            if (asyncActionDescriptor != null) {\r
-                return BeginInvokeAsynchronousActionMethod(controllerContext, asyncActionDescriptor, parameters, callback, state);\r
-            }\r
-            else {\r
-                return BeginInvokeSynchronousActionMethod(controllerContext, actionDescriptor, parameters, callback, state);\r
-            }\r
-        }\r
-\r
-        protected internal virtual IAsyncResult BeginInvokeActionMethodWithFilters(ControllerContext controllerContext, IList<IActionFilter> filters, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters, AsyncCallback callback, object state) {\r
-            Func<ActionExecutedContext> endContinuation = null;\r
-\r
-            BeginInvokeDelegate beginDelegate = delegate(AsyncCallback asyncCallback, object asyncState) {\r
-                ActionExecutingContext preContext = new ActionExecutingContext(controllerContext, actionDescriptor, parameters);\r
-                IAsyncResult innerAsyncResult = null;\r
-\r
-                Func<Func<ActionExecutedContext>> beginContinuation = () => {\r
-                    innerAsyncResult = BeginInvokeActionMethod(controllerContext, actionDescriptor, parameters, asyncCallback, asyncState);\r
-                    return () =>\r
-                        new ActionExecutedContext(controllerContext, actionDescriptor, false /* canceled */, null /* exception */) {\r
-                            Result = EndInvokeActionMethod(innerAsyncResult)\r
-                        };\r
-                };\r
-\r
-                // need to reverse the filter list because the continuations are built up backward\r
-                Func<Func<ActionExecutedContext>> thunk = filters.Reverse().Aggregate(beginContinuation,\r
-                    (next, filter) => () => InvokeActionMethodFilterAsynchronously(filter, preContext, next));\r
-                endContinuation = thunk();\r
-\r
-                if (innerAsyncResult != null) {\r
-                    // we're just waiting for the inner result to complete\r
-                    return innerAsyncResult;\r
-                }\r
-                else {\r
-                    // something was short-circuited and the action was not called, so this was a synchronous operation\r
-                    SimpleAsyncResult newAsyncResult = new SimpleAsyncResult(asyncState);\r
-                    newAsyncResult.MarkCompleted(true /* completedSynchronously */, asyncCallback);\r
-                    return newAsyncResult;\r
-                }\r
-            };\r
-\r
-            EndInvokeDelegate<ActionExecutedContext> endDelegate = delegate(IAsyncResult asyncResult) {\r
-                return endContinuation();\r
-            };\r
-\r
-            return AsyncResultWrapper.Begin(callback, state, beginDelegate, endDelegate, _invokeActionMethodWithFiltersTag);\r
-        }\r
-\r
-        private IAsyncResult BeginInvokeAsynchronousActionMethod(ControllerContext controllerContext, AsyncActionDescriptor actionDescriptor, IDictionary<string, object> parameters, AsyncCallback callback, object state) {\r
-            BeginInvokeDelegate beginDelegate = delegate(AsyncCallback asyncCallback, object asyncState) {\r
-                return actionDescriptor.BeginExecute(controllerContext, parameters, asyncCallback, asyncState);\r
-            };\r
-\r
-            EndInvokeDelegate<ActionResult> endDelegate = delegate(IAsyncResult asyncResult) {\r
-                object returnValue = actionDescriptor.EndExecute(asyncResult);\r
-                ActionResult result = CreateActionResult(controllerContext, actionDescriptor, returnValue);\r
-                return result;\r
-            };\r
-\r
-            return AsyncResultWrapper.Begin(callback, state, beginDelegate, endDelegate, _invokeActionMethodTag);\r
-        }\r
-\r
-        private IAsyncResult BeginInvokeSynchronousActionMethod(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters, AsyncCallback callback, object state) {\r
-            return AsyncResultWrapper.BeginSynchronous(callback, state,\r
-                () => InvokeSynchronousActionMethod(controllerContext, actionDescriptor, parameters),\r
-                _invokeActionMethodTag);\r
-        }\r
-\r
-        public virtual bool EndInvokeAction(IAsyncResult asyncResult) {\r
-            return AsyncResultWrapper.End<bool>(asyncResult, _invokeActionTag);\r
-        }\r
-\r
-        protected internal virtual ActionResult EndInvokeActionMethod(IAsyncResult asyncResult) {\r
-            return AsyncResultWrapper.End<ActionResult>(asyncResult, _invokeActionMethodTag);\r
-        }\r
-\r
-        protected internal virtual ActionExecutedContext EndInvokeActionMethodWithFilters(IAsyncResult asyncResult) {\r
-            return AsyncResultWrapper.End<ActionExecutedContext>(asyncResult, _invokeActionMethodWithFiltersTag);\r
-        }\r
-\r
-        protected override ControllerDescriptor GetControllerDescriptor(ControllerContext controllerContext) {\r
-            Type controllerType = controllerContext.Controller.GetType();\r
-            ControllerDescriptor controllerDescriptor = DescriptorCache.GetDescriptor(controllerType, () => new ReflectedAsyncControllerDescriptor(controllerType));\r
-            return controllerDescriptor;\r
-        }\r
-\r
-        internal static Func<ActionExecutedContext> InvokeActionMethodFilterAsynchronously(IActionFilter filter, ActionExecutingContext preContext, Func<Func<ActionExecutedContext>> nextInChain) {\r
-            filter.OnActionExecuting(preContext);\r
-            if (preContext.Result != null) {\r
-                ActionExecutedContext shortCircuitedPostContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, true /* canceled */, null /* exception */) {\r
-                    Result = preContext.Result\r
-                };\r
-                return () => shortCircuitedPostContext;\r
-            }\r
-\r
-            // There is a nested try / catch block here that contains much the same logic as the outer block.\r
-            // Since an exception can occur on either side of the asynchronous invocation, we need guards on\r
-            // on both sides. In the code below, the second side is represented by the nested delegate. This\r
-            // is really just a parallel of the synchronous ControllerActionInvoker.InvokeActionMethodFilter()\r
-            // method.\r
-\r
-            try {\r
-                Func<ActionExecutedContext> continuation = nextInChain();\r
-\r
-                // add our own continuation, then return the new function\r
-                return () => {\r
-                    ActionExecutedContext postContext;\r
-                    bool wasError = true;\r
-\r
-                    try {\r
-                        postContext = continuation();\r
-                        wasError = false;\r
-                    }\r
-                    catch (ThreadAbortException) {\r
-                        // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                        // the filters don't see this as an error.\r
-                        postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, null /* exception */);\r
-                        filter.OnActionExecuted(postContext);\r
-                        throw;\r
-                    }\r
-                    catch (Exception ex) {\r
-                        postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, ex);\r
-                        filter.OnActionExecuted(postContext);\r
-                        if (!postContext.ExceptionHandled) {\r
-                            throw;\r
-                        }\r
-                    }\r
-                    if (!wasError) {\r
-                        filter.OnActionExecuted(postContext);\r
-                    }\r
-\r
-                    return postContext;\r
-                };\r
-            }\r
-            catch (ThreadAbortException) {\r
-                // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                // the filters don't see this as an error.\r
-                ActionExecutedContext postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, null /* exception */);\r
-                filter.OnActionExecuted(postContext);\r
-                throw;\r
-            }\r
-            catch (Exception ex) {\r
-                ActionExecutedContext postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, ex);\r
-                filter.OnActionExecuted(postContext);\r
-                if (postContext.ExceptionHandled) {\r
-                    return () => postContext;\r
-                }\r
-                else {\r
-                    throw;\r
-                }\r
-            }\r
-        }\r
-\r
-        private ActionResult InvokeSynchronousActionMethod(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters) {\r
-            return base.InvokeActionMethod(controllerContext, actionDescriptor, parameters);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncManager.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncManager.cs
deleted file mode 100644 (file)
index 082f460..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Threading;\r
-\r
-    public class AsyncManager {\r
-\r
-        private readonly SynchronizationContext _syncContext;\r
-\r
-        // default timeout is 45 sec\r
-        // from: http://msdn.microsoft.com/en-us/library/system.web.ui.page.asynctimeout.aspx\r
-        private int _timeout = 45 * 1000;\r
-\r
-        public AsyncManager()\r
-            : this(null /* syncContext */) {\r
-        }\r
-\r
-        public AsyncManager(SynchronizationContext syncContext) {\r
-            _syncContext = syncContext ?? SynchronizationContextUtil.GetSynchronizationContext();\r
-\r
-            OutstandingOperations = new OperationCounter();\r
-            OutstandingOperations.Completed += delegate { Finish(); };\r
-\r
-            Parameters = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-        public OperationCounter OutstandingOperations {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IDictionary<string, object> Parameters {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public event EventHandler Finished;\r
-\r
-        // the developer may call this function to signal that all operations are complete instead of\r
-        // waiting for the operation counter to reach zero\r
-        public virtual void Finish() {\r
-            EventHandler handler = Finished;\r
-            if (handler != null) {\r
-                handler(this, EventArgs.Empty);\r
-            }\r
-        }\r
-\r
-        // executes a callback in the current synchronization context, which gives access to HttpContext and related items\r
-        public virtual void Sync(Action action) {\r
-            _syncContext.Sync(action);\r
-        }\r
-\r
-        // measured in milliseconds, Timeout.Infinite means 'no timeout'\r
-        public int Timeout {\r
-            get {\r
-                return _timeout;\r
-            }\r
-            set {\r
-                if (value < -1) {\r
-                    throw Error.AsyncCommon_InvalidTimeout("value");\r
-                }\r
-                _timeout = value;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncResultWrapper.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncResultWrapper.cs
deleted file mode 100644 (file)
index 1f42f51..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Threading;\r
-\r
-    // This class is used for the following pattern:\r
-\r
-    // public IAsyncResult BeginInner(..., callback, state);\r
-    // public TInnerResult EndInner(asyncResult);\r
-    // public IAsyncResult BeginOuter(..., callback, state);\r
-    // public TOuterResult EndOuter(asyncResult);\r
-\r
-    // That is, Begin/EndOuter() wrap Begin/EndInner(), potentially with pre- and post-processing.\r
-\r
-    internal static class AsyncResultWrapper {\r
-\r
-        // helper methods\r
-\r
-        private static Func<AsyncVoid> MakeVoidDelegate(Action action) {\r
-            return () => {\r
-                action();\r
-                return default(AsyncVoid);\r
-            };\r
-        }\r
-\r
-        private static EndInvokeDelegate<AsyncVoid> MakeVoidDelegate(EndInvokeDelegate endDelegate) {\r
-            return ar => {\r
-                endDelegate(ar);\r
-                return default(AsyncVoid);\r
-            };\r
-        }\r
-\r
-        // kicks off an asynchronous operation\r
-\r
-        public static IAsyncResult Begin<TResult>(AsyncCallback callback, object state, BeginInvokeDelegate beginDelegate, EndInvokeDelegate<TResult> endDelegate) {\r
-            return Begin<TResult>(callback, state, beginDelegate, endDelegate, null /* tag */);\r
-        }\r
-\r
-        public static IAsyncResult Begin<TResult>(AsyncCallback callback, object state, BeginInvokeDelegate beginDelegate, EndInvokeDelegate<TResult> endDelegate, object tag) {\r
-            return Begin<TResult>(callback, state, beginDelegate, endDelegate, tag, Timeout.Infinite);\r
-        }\r
-\r
-        public static IAsyncResult Begin<TResult>(AsyncCallback callback, object state, BeginInvokeDelegate beginDelegate, EndInvokeDelegate<TResult> endDelegate, object tag, int timeout) {\r
-            WrappedAsyncResult<TResult> asyncResult = new WrappedAsyncResult<TResult>(beginDelegate, endDelegate, tag);\r
-            asyncResult.Begin(callback, state, timeout);\r
-            return asyncResult;\r
-        }\r
-\r
-        public static IAsyncResult Begin(AsyncCallback callback, object state, BeginInvokeDelegate beginDelegate, EndInvokeDelegate endDelegate) {\r
-            return Begin(callback, state, beginDelegate, endDelegate, null /* tag */);\r
-        }\r
-\r
-        public static IAsyncResult Begin(AsyncCallback callback, object state, BeginInvokeDelegate beginDelegate, EndInvokeDelegate endDelegate, object tag) {\r
-            return Begin(callback, state, beginDelegate, endDelegate, tag, Timeout.Infinite);\r
-        }\r
-\r
-        public static IAsyncResult Begin(AsyncCallback callback, object state, BeginInvokeDelegate beginDelegate, EndInvokeDelegate endDelegate, object tag, int timeout) {\r
-            return Begin<AsyncVoid>(callback, state, beginDelegate, MakeVoidDelegate(endDelegate), tag, timeout);\r
-        }\r
-\r
-        // wraps a synchronous operation in an asynchronous wrapper, but still completes synchronously\r
-\r
-        public static IAsyncResult BeginSynchronous<TResult>(AsyncCallback callback, object state, Func<TResult> func) {\r
-            return BeginSynchronous<TResult>(callback, state, func, null /* tag */);\r
-        }\r
-\r
-        public static IAsyncResult BeginSynchronous<TResult>(AsyncCallback callback, object state, Func<TResult> func, object tag) {\r
-            // Begin() doesn't perform any work on its own and returns immediately.\r
-            BeginInvokeDelegate beginDelegate = (asyncCallback, asyncState) => {\r
-                SimpleAsyncResult innerAsyncResult = new SimpleAsyncResult(asyncState);\r
-                innerAsyncResult.MarkCompleted(true /* completedSynchronously */, asyncCallback);\r
-                return innerAsyncResult;\r
-            };\r
-\r
-            // The End() method blocks.\r
-            EndInvokeDelegate<TResult> endDelegate = _ => {\r
-                return func();\r
-            };\r
-\r
-            WrappedAsyncResult<TResult> asyncResult = new WrappedAsyncResult<TResult>(beginDelegate, endDelegate, tag);\r
-            asyncResult.Begin(callback, state, Timeout.Infinite);\r
-            return asyncResult;\r
-        }\r
-\r
-        public static IAsyncResult BeginSynchronous(AsyncCallback callback, object state, Action action) {\r
-            return BeginSynchronous(callback, state, action, null /* tag */);\r
-        }\r
-\r
-        public static IAsyncResult BeginSynchronous(AsyncCallback callback, object state, Action action, object tag) {\r
-            return BeginSynchronous<AsyncVoid>(callback, state, MakeVoidDelegate(action), tag);\r
-        }\r
-\r
-        // completes an asynchronous operation\r
-\r
-        public static TResult End<TResult>(IAsyncResult asyncResult) {\r
-            return End<TResult>(asyncResult, null /* tag */);\r
-        }\r
-\r
-        public static TResult End<TResult>(IAsyncResult asyncResult, object tag) {\r
-            return WrappedAsyncResult<TResult>.Cast(asyncResult, tag).End();\r
-        }\r
-\r
-        public static void End(IAsyncResult asyncResult) {\r
-            End(asyncResult, null /* tag */);\r
-        }\r
-\r
-        public static void End(IAsyncResult asyncResult, object tag) {\r
-            End<AsyncVoid>(asyncResult, tag);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable",\r
-            Justification = "The Timer will be disposed of either when it fires or when the operation completes successfully.")]\r
-        private sealed class WrappedAsyncResult<TResult> : IAsyncResult {\r
-\r
-            private readonly BeginInvokeDelegate _beginDelegate;\r
-            private readonly object _beginDelegateLockObj = new object();\r
-            private readonly EndInvokeDelegate<TResult> _endDelegate;\r
-            private readonly SingleEntryGate _endExecutedGate = new SingleEntryGate(); // prevent End() from being called twice\r
-            private readonly SingleEntryGate _handleCallbackGate = new SingleEntryGate(); // prevent callback from being handled multiple times\r
-            private IAsyncResult _innerAsyncResult;\r
-            private AsyncCallback _originalCallback;\r
-            private readonly object _tag; // prevent an instance of this type from being passed to the wrong End() method\r
-            private volatile bool _timedOut;\r
-            private Timer _timer;\r
-\r
-            public WrappedAsyncResult(BeginInvokeDelegate beginDelegate, EndInvokeDelegate<TResult> endDelegate, object tag) {\r
-                _beginDelegate = beginDelegate;\r
-                _endDelegate = endDelegate;\r
-                _tag = tag;\r
-            }\r
-\r
-            public object AsyncState {\r
-                get {\r
-                    return _innerAsyncResult.AsyncState;\r
-                }\r
-            }\r
-\r
-            public WaitHandle AsyncWaitHandle {\r
-                get {\r
-                    return _innerAsyncResult.AsyncWaitHandle;\r
-                }\r
-            }\r
-\r
-            public bool CompletedSynchronously {\r
-                get {\r
-                    return _innerAsyncResult.CompletedSynchronously;\r
-                }\r
-            }\r
-\r
-            public bool IsCompleted {\r
-                get {\r
-                    return _innerAsyncResult.IsCompleted;\r
-                }\r
-            }\r
-\r
-            // kicks off the process, instantiates a timer if requested\r
-            public void Begin(AsyncCallback callback, object state, int timeout) {\r
-                _originalCallback = callback;\r
-                bool completedSynchronously;\r
-\r
-                // Force the target Begin() operation to complete before the callback can continue,\r
-                // since the target operation might perform post-processing of the data.\r
-                lock (_beginDelegateLockObj) {\r
-                    _innerAsyncResult = _beginDelegate(HandleAsynchronousCompletion, state);\r
-\r
-                    completedSynchronously = _innerAsyncResult.CompletedSynchronously;\r
-                    if (!completedSynchronously) {\r
-                        if (timeout > Timeout.Infinite) {\r
-                            CreateTimer(timeout);\r
-                        }\r
-                    }\r
-                }\r
-\r
-                if (completedSynchronously) {\r
-                    if (callback != null) {\r
-                        callback(this);\r
-                    }\r
-                }\r
-            }\r
-\r
-            public static WrappedAsyncResult<TResult> Cast(IAsyncResult asyncResult, object tag) {\r
-                if (asyncResult == null) {\r
-                    throw new ArgumentNullException("asyncResult");\r
-                }\r
-\r
-                WrappedAsyncResult<TResult> castResult = asyncResult as WrappedAsyncResult<TResult>;\r
-                if (castResult != null && Object.Equals(castResult._tag, tag)) {\r
-                    return castResult;\r
-                }\r
-                else {\r
-                    throw Error.AsyncCommon_InvalidAsyncResult("asyncResult");\r
-                }\r
-            }\r
-\r
-            private void CreateTimer(int timeout) {\r
-                // this method should be called within a lock(_beginDelegateLockObj)\r
-                _timer = new Timer(HandleTimeout, null, timeout, Timeout.Infinite /* disable periodic signaling */);\r
-            }\r
-\r
-            public TResult End() {\r
-                if (!_endExecutedGate.TryEnter()) {\r
-                    throw Error.AsyncCommon_AsyncResultAlreadyConsumed();\r
-                }\r
-\r
-                if (_timedOut) {\r
-                    throw new TimeoutException();\r
-                }\r
-                WaitForBeginToCompleteAndDestroyTimer();\r
-\r
-                return _endDelegate(_innerAsyncResult);\r
-            }\r
-\r
-            private void ExecuteAsynchronousCallback(bool timedOut) {\r
-                WaitForBeginToCompleteAndDestroyTimer();\r
-\r
-                if (_handleCallbackGate.TryEnter()) {\r
-                    _timedOut = timedOut;\r
-                    if (_originalCallback != null) {\r
-                        _originalCallback(this);\r
-                    }\r
-                }\r
-            }\r
-\r
-            private void HandleAsynchronousCompletion(IAsyncResult asyncResult) {\r
-                if (asyncResult.CompletedSynchronously) {\r
-                    // If the operation completed synchronously, the WrappedAsyncResult.Begin() method will handle it.\r
-                    return;\r
-                }\r
-\r
-                ExecuteAsynchronousCallback(false /* timedOut */);\r
-            }\r
-\r
-            private void HandleTimeout(object state) {\r
-                ExecuteAsynchronousCallback(true /* timedOut */);\r
-            }\r
-\r
-            private void WaitForBeginToCompleteAndDestroyTimer() {\r
-                lock (_beginDelegateLockObj) {\r
-                    // Wait for the target Begin() method to complete, as it might be performing\r
-                    // post-processing. This also forces a memory barrier, so _innerAsyncResult\r
-                    // is guaranteed to be non-null at this point.\r
-\r
-                    if (_timer != null) {\r
-                        _timer.Dispose();\r
-                    }\r
-                    _timer = null;\r
-                }\r
-            }\r
-\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncUtil.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncUtil.cs
deleted file mode 100644 (file)
index 64484cf..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Threading;\r
-\r
-    internal static class AsyncUtil {\r
-\r
-        public static void WaitForAsyncResultCompletion(IAsyncResult asyncResult, HttpApplication app) {\r
-            // based on HttpServerUtility.ExecuteInternal()\r
-\r
-            if (!asyncResult.IsCompleted) {\r
-                // suspend app lock while waiting, else might deadlock\r
-                bool needToRelock = false;\r
-\r
-                try {\r
-                    // .NET 2.0+ will not allow a ThreadAbortException to be thrown while a\r
-                    // thread is inside a finally block, so this pattern ensures that the\r
-                    // value of 'needToRelock' is correct.\r
-                    try { }\r
-                    finally {\r
-                        Monitor.Exit(app);\r
-                        needToRelock = true;\r
-                    }\r
-\r
-                    WaitHandle waitHandle = asyncResult.AsyncWaitHandle;\r
-\r
-                    if (waitHandle != null) {\r
-                        waitHandle.WaitOne();\r
-                    }\r
-                    else {\r
-                        while (!asyncResult.IsCompleted) {\r
-                            Thread.Sleep(1);\r
-                        }\r
-                    }\r
-                }\r
-                finally {\r
-                    if (needToRelock) {\r
-                        Monitor.Enter(app);\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        public static AsyncCallback WrapCallbackForSynchronizedExecution(AsyncCallback callback, SynchronizationContext syncContext) {\r
-            if (callback == null || syncContext == null) {\r
-                return callback;\r
-            }\r
-\r
-            AsyncCallback newCallback = delegate(IAsyncResult asyncResult) {\r
-                if (asyncResult.CompletedSynchronously) {\r
-                    callback(asyncResult);\r
-                }\r
-                else {\r
-                    // Only take the application lock if this request completed asynchronously,\r
-                    // else we might end up in a deadlock situation.\r
-                    syncContext.Sync(() => callback(asyncResult));\r
-                }\r
-            };\r
-\r
-            return newCallback;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncVoid.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/AsyncVoid.cs
deleted file mode 100644 (file)
index 95a81ce..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-\r
-    // Dummy type used for passing something resembling 'void' to the async delegate functions\r
-    internal struct AsyncVoid {\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/BeginInvokeDelegate.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/BeginInvokeDelegate.cs
deleted file mode 100644 (file)
index 5d568f4..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-\r
-    internal delegate IAsyncResult BeginInvokeDelegate(AsyncCallback callback, object state);\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/EndInvokeDelegate.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/EndInvokeDelegate.cs
deleted file mode 100644 (file)
index 11308df..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-\r
-    internal delegate void EndInvokeDelegate(IAsyncResult asyncResult);\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/EndInvokeDelegate`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/EndInvokeDelegate`1.cs
deleted file mode 100644 (file)
index 9e83896..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-\r
-    internal delegate TResult EndInvokeDelegate<TResult>(IAsyncResult asyncResult);\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncActionInvoker.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncActionInvoker.cs
deleted file mode 100644 (file)
index acd624b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-\r
-    public interface IAsyncActionInvoker : IActionInvoker {\r
-        IAsyncResult BeginInvokeAction(ControllerContext controllerContext, string actionName, AsyncCallback callback, object state);\r
-        bool EndInvokeAction(IAsyncResult asyncResult);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncController.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncController.cs
deleted file mode 100644 (file)
index fe256e8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System.Web.Routing;\r
-\r
-    public interface IAsyncController : IController {\r
-        IAsyncResult BeginExecute(RequestContext requestContext, AsyncCallback callback, object state);\r
-        void EndExecute(IAsyncResult asyncResult);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncManagerContainer.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/IAsyncManagerContainer.cs
deleted file mode 100644 (file)
index f9aa6ad..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-\r
-    public interface IAsyncManagerContainer {\r
-\r
-        AsyncManager AsyncManager {\r
-            get;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/OperationCounter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/OperationCounter.cs
deleted file mode 100644 (file)
index 519f6ed..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Threading;\r
-\r
-    public sealed class OperationCounter {\r
-\r
-        private int _count;\r
-\r
-        public int Count {\r
-            get {\r
-                return Thread.VolatileRead(ref _count);\r
-            }\r
-        }\r
-\r
-        public event EventHandler Completed;\r
-\r
-        private int AddAndExecuteCallbackIfCompleted(int value) {\r
-            int newCount = Interlocked.Add(ref _count, value);\r
-            if (newCount == 0) {\r
-                OnCompleted();\r
-            }\r
-\r
-            return newCount;\r
-        }\r
-\r
-        public int Decrement() {\r
-            return AddAndExecuteCallbackIfCompleted(-1);\r
-        }\r
-\r
-        public int Decrement(int value) {\r
-            return AddAndExecuteCallbackIfCompleted(-value);\r
-        }\r
-\r
-        public int Increment() {\r
-            return AddAndExecuteCallbackIfCompleted(1);\r
-        }\r
-\r
-        public int Increment(int value) {\r
-            return AddAndExecuteCallbackIfCompleted(value);\r
-        }\r
-\r
-        private void OnCompleted() {\r
-            EventHandler handler = Completed;\r
-            if (handler != null) {\r
-                handler(this, EventArgs.Empty);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ReflectedAsyncActionDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ReflectedAsyncActionDescriptor.cs
deleted file mode 100644 (file)
index 397a5a2..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Threading;\r
-\r
-    public class ReflectedAsyncActionDescriptor : AsyncActionDescriptor {\r
-\r
-        private readonly object _executeTag = new object();\r
-\r
-        private readonly string _actionName;\r
-        private readonly ControllerDescriptor _controllerDescriptor;\r
-        private ParameterDescriptor[] _parametersCache;\r
-\r
-        public ReflectedAsyncActionDescriptor(MethodInfo asyncMethodInfo, MethodInfo completedMethodInfo, string actionName, ControllerDescriptor controllerDescriptor)\r
-            : this(asyncMethodInfo, completedMethodInfo, actionName, controllerDescriptor, true /* validateMethods */) {\r
-        }\r
-\r
-        internal ReflectedAsyncActionDescriptor(MethodInfo asyncMethodInfo, MethodInfo completedMethodInfo, string actionName, ControllerDescriptor controllerDescriptor, bool validateMethods) {\r
-            if (asyncMethodInfo == null) {\r
-                throw new ArgumentNullException("asyncMethodInfo");\r
-            }\r
-            if (completedMethodInfo == null) {\r
-                throw new ArgumentNullException("completedMethodInfo");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw Error.ParameterCannotBeNullOrEmpty("actionName");\r
-            }\r
-            if (controllerDescriptor == null) {\r
-                throw new ArgumentNullException("controllerDescriptor");\r
-            }\r
-\r
-            if (validateMethods) {\r
-                string asyncFailedMessage = VerifyActionMethodIsCallable(asyncMethodInfo);\r
-                if (asyncFailedMessage != null) {\r
-                    throw new ArgumentException(asyncFailedMessage, "asyncMethodInfo");\r
-                }\r
-\r
-                string completedFailedMessage = VerifyActionMethodIsCallable(completedMethodInfo);\r
-                if (completedFailedMessage != null) {\r
-                    throw new ArgumentException(completedFailedMessage, "completedMethodInfo");\r
-                }\r
-            }\r
-\r
-            AsyncMethodInfo = asyncMethodInfo;\r
-            CompletedMethodInfo = completedMethodInfo;\r
-            _actionName = actionName;\r
-            _controllerDescriptor = controllerDescriptor;\r
-        }\r
-\r
-        public override string ActionName {\r
-            get {\r
-                return _actionName;\r
-            }\r
-        }\r
-\r
-        public MethodInfo AsyncMethodInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public MethodInfo CompletedMethodInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override ControllerDescriptor ControllerDescriptor {\r
-            get {\r
-                return _controllerDescriptor;\r
-            }\r
-        }\r
-\r
-        public override IAsyncResult BeginExecute(ControllerContext controllerContext, IDictionary<string, object> parameters, AsyncCallback callback, object state) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (parameters == null) {\r
-                throw new ArgumentNullException("parameters");\r
-            }\r
-\r
-            AsyncManager asyncManager = GetAsyncManager(controllerContext.Controller);\r
-\r
-            BeginInvokeDelegate beginDelegate = delegate(AsyncCallback asyncCallback, object asyncState) {\r
-                // call the XxxAsync() method\r
-                ParameterInfo[] parameterInfos = AsyncMethodInfo.GetParameters();\r
-                var rawParameterValues = from parameterInfo in parameterInfos\r
-                                         select ExtractParameterFromDictionary(parameterInfo, parameters, AsyncMethodInfo);\r
-                object[] parametersArray = rawParameterValues.ToArray();\r
-\r
-                TriggerListener listener = new TriggerListener();\r
-                SimpleAsyncResult asyncResult = new SimpleAsyncResult(asyncState);\r
-\r
-                // hook the Finished event to notify us upon completion\r
-                Trigger finishTrigger = listener.CreateTrigger();\r
-                asyncManager.Finished += delegate { finishTrigger.Fire(); };\r
-                asyncManager.OutstandingOperations.Increment();\r
-\r
-                // to simplify the logic, force the rest of the pipeline to execute in an asynchronous callback\r
-                listener.SetContinuation(() => ThreadPool.QueueUserWorkItem(_ => asyncResult.MarkCompleted(false /* completedSynchronously */, asyncCallback)));\r
-\r
-                // the inner operation might complete synchronously, so all setup work has to be done before this point\r
-                ActionMethodDispatcher dispatcher = DispatcherCache.GetDispatcher(AsyncMethodInfo);\r
-                dispatcher.Execute(controllerContext.Controller, parametersArray); // ignore return value from this method\r
-\r
-                // now that the XxxAsync() method has completed, kick off any pending operations\r
-                asyncManager.OutstandingOperations.Decrement();\r
-                listener.Activate();\r
-                return asyncResult;\r
-            };\r
-\r
-            EndInvokeDelegate<object> endDelegate = delegate(IAsyncResult asyncResult) {\r
-                // call the XxxCompleted() method\r
-                ParameterInfo[] completionParametersInfos = CompletedMethodInfo.GetParameters();\r
-                var rawCompletionParameterValues = from parameterInfo in completionParametersInfos\r
-                                                   select ExtractParameterOrDefaultFromDictionary(parameterInfo, asyncManager.Parameters);\r
-                object[] completionParametersArray = rawCompletionParameterValues.ToArray();\r
-\r
-                ActionMethodDispatcher dispatcher = DispatcherCache.GetDispatcher(CompletedMethodInfo);\r
-                object actionReturnValue = dispatcher.Execute(controllerContext.Controller, completionParametersArray);\r
-                return actionReturnValue;\r
-            };\r
-\r
-            return AsyncResultWrapper.Begin(callback, state, beginDelegate, endDelegate, _executeTag, asyncManager.Timeout);\r
-        }\r
-\r
-        public override object EndExecute(IAsyncResult asyncResult) {\r
-            return AsyncResultWrapper.End<object>(asyncResult, _executeTag);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return AsyncMethodInfo.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return AsyncMethodInfo.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override FilterInfo GetFilters() {\r
-            // By default, we only look at filters on the XxxAsync() method.\r
-            return GetFilters(AsyncMethodInfo);\r
-        }\r
-\r
-        public override ParameterDescriptor[] GetParameters() {\r
-            ParameterDescriptor[] parameters = LazilyFetchParametersCollection();\r
-\r
-            // need to clone array so that user modifications aren't accidentally stored\r
-            return (ParameterDescriptor[])parameters.Clone();\r
-        }\r
-\r
-        public override ICollection<ActionSelector> GetSelectors() {\r
-            // By default, we only look at filters on the XxxAsync() method.\r
-\r
-            ActionMethodSelectorAttribute[] attrs = (ActionMethodSelectorAttribute[])AsyncMethodInfo.GetCustomAttributes(typeof(ActionMethodSelectorAttribute), true /* inherit */);\r
-            ActionSelector[] selectors = Array.ConvertAll(attrs, attr => (ActionSelector)(controllerContext => attr.IsValidForRequest(controllerContext, AsyncMethodInfo)));\r
-            return selectors;\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return AsyncMethodInfo.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-        private ParameterDescriptor[] LazilyFetchParametersCollection() {\r
-            return DescriptorUtil.LazilyFetchOrCreateDescriptors<ParameterInfo, ParameterDescriptor>(\r
-                ref _parametersCache /* cacheLocation */,\r
-                AsyncMethodInfo.GetParameters /* initializer */,\r
-                parameterInfo => new ReflectedParameterDescriptor(parameterInfo, this) /* converter */);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ReflectedAsyncControllerDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/ReflectedAsyncControllerDescriptor.cs
deleted file mode 100644 (file)
index ebbc938..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-\r
-    public class ReflectedAsyncControllerDescriptor : ControllerDescriptor {\r
-\r
-        private static readonly ActionDescriptor[] _emptyCanonicalActions = new ActionDescriptor[0];\r
-\r
-        private readonly Type _controllerType;\r
-        private readonly AsyncActionMethodSelector _selector;\r
-\r
-        public ReflectedAsyncControllerDescriptor(Type controllerType) {\r
-            if (controllerType == null) {\r
-                throw new ArgumentNullException("controllerType");\r
-            }\r
-\r
-            _controllerType = controllerType;\r
-            _selector = new AsyncActionMethodSelector(_controllerType);\r
-        }\r
-\r
-        public sealed override Type ControllerType {\r
-            get {\r
-                return _controllerType;\r
-            }\r
-        }\r
-\r
-        public override ActionDescriptor FindAction(ControllerContext controllerContext, string actionName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw Error.ParameterCannotBeNullOrEmpty("actionName");\r
-            }\r
-\r
-            ActionDescriptorCreator creator = _selector.FindAction(controllerContext, actionName);\r
-            if (creator == null) {\r
-                return null;\r
-            }\r
-\r
-            return creator(actionName, this);\r
-        }\r
-\r
-        public override ActionDescriptor[] GetCanonicalActions() {\r
-            // everything is looked up dymanically, so there are no 'canonical' actions\r
-            return _emptyCanonicalActions;\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return ControllerType.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return ControllerType.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return ControllerType.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SimpleAsyncResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SimpleAsyncResult.cs
deleted file mode 100644 (file)
index 74f39b5..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Threading;\r
-\r
-    internal sealed class SimpleAsyncResult : IAsyncResult {\r
-\r
-        private readonly object _asyncState;\r
-        private bool _completedSynchronously;\r
-        private volatile bool _isCompleted;\r
-\r
-        public SimpleAsyncResult(object asyncState) {\r
-            _asyncState = asyncState;\r
-        }\r
-\r
-        public object AsyncState {\r
-            get {\r
-                return _asyncState;\r
-            }\r
-        }\r
-\r
-        // ASP.NET IAsyncResult objects should never expose a WaitHandle due to potential deadlocking\r
-        public WaitHandle AsyncWaitHandle {\r
-            get {\r
-                return null;\r
-            }\r
-        }\r
-\r
-        public bool CompletedSynchronously {\r
-            get {\r
-                return _completedSynchronously;\r
-            }\r
-        }\r
-\r
-        public bool IsCompleted {\r
-            get {\r
-                return _isCompleted;\r
-            }\r
-        }\r
-\r
-        // Proper order of execution:\r
-        // 1. Set the CompletedSynchronously property to the correct value\r
-        // 2. Set the IsCompleted flag\r
-        // 3. Execute the callback\r
-        // 4. Signal the WaitHandle (which we don't have)\r
-        public void MarkCompleted(bool completedSynchronously, AsyncCallback callback) {\r
-            _completedSynchronously = completedSynchronously;\r
-            _isCompleted = true;\r
-\r
-            if (callback != null) {\r
-                callback(this);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SingleEntryGate.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SingleEntryGate.cs
deleted file mode 100644 (file)
index c3e63a1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Threading;\r
-\r
-    // used to synchronize access to a single-use consumable resource\r
-    internal sealed class SingleEntryGate {\r
-\r
-        private const int NOT_ENTERED = 0;\r
-        private const int ENTERED = 1;\r
-\r
-        private int _status;\r
-\r
-        // returns true if this is the first call to TryEnter(), false otherwise\r
-        public bool TryEnter() {\r
-            int oldStatus = Interlocked.Exchange(ref _status, ENTERED);\r
-            return (oldStatus == NOT_ENTERED);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SynchronizationContextUtil.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SynchronizationContextUtil.cs
deleted file mode 100644 (file)
index 5988091..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Threading;\r
-\r
-    internal static class SynchronizationContextUtil {\r
-\r
-        public static SynchronizationContext GetSynchronizationContext() {\r
-            // In a runtime environment, SynchronizationContext.Current will be set to an instance\r
-            // of AspNetSynchronizationContext. In a unit test environment, the Current property\r
-            // won't be set and we have to create one on the fly.\r
-            return SynchronizationContext.Current ?? new SynchronizationContext();\r
-        }\r
-\r
-        public static T Sync<T>(this SynchronizationContext syncContext, Func<T> func) {\r
-            T theValue = default(T);\r
-            Exception thrownException = null;\r
-\r
-            syncContext.Send(o => {\r
-                try {\r
-                    theValue = func();\r
-                }\r
-                catch (Exception ex) {\r
-                    // by default, the AspNetSynchronizationContext type will swallow thrown exceptions,\r
-                    // so we need to save and propagate them\r
-                    thrownException = ex;\r
-                }\r
-            }, null);\r
-\r
-            if (thrownException != null) {\r
-                throw Error.SynchronizationContextUtil_ExceptionThrown(thrownException);\r
-            }\r
-            return theValue;\r
-        }\r
-\r
-        public static void Sync(this SynchronizationContext syncContext, Action action) {\r
-            Sync<AsyncVoid>(syncContext, () => {\r
-                action();\r
-                return default(AsyncVoid);\r
-            });\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SynchronousOperationException.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/SynchronousOperationException.cs
deleted file mode 100644 (file)
index 8836e26..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Runtime.Serialization;\r
-\r
-    // This exception type is thrown by the SynchronizationContextUtil helper class since the AspNetSynchronizationContext\r
-    // type swallows exceptions. The inner exception contains the data the user cares about.\r
-\r
-    [Serializable]\r
-    public sealed class SynchronousOperationException : HttpException {\r
-\r
-        public SynchronousOperationException() {\r
-        }\r
-\r
-        private SynchronousOperationException(SerializationInfo info, StreamingContext context)\r
-            : base(info, context) {\r
-        }\r
-\r
-        public SynchronousOperationException(string message)\r
-            : base(message) {\r
-        }\r
-\r
-        public SynchronousOperationException(string message, Exception innerException)\r
-            : base(message, innerException) {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/Trigger.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/Trigger.cs
deleted file mode 100644 (file)
index 3ac944c..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Runtime.Serialization;\r
-\r
-    // Provides a trigger for the TriggerListener class.\r
-\r
-    internal sealed class Trigger {\r
-\r
-        private readonly Action _fireAction;\r
-\r
-        // Constructor should only be called by TriggerListener.\r
-        internal Trigger(Action fireAction) {\r
-            _fireAction = fireAction;\r
-        }\r
-\r
-        public void Fire() {\r
-            _fireAction();\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/TriggerListener.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Async/TriggerListener.cs
deleted file mode 100644 (file)
index eed5096..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Async {\r
-    using System;\r
-    using System.Threading;\r
-\r
-    // This class is used to wait for triggers and a continuation. When the continuation has been provded\r
-    // and all triggers have been fired, the continuation is called. Similar to WaitHandle.WaitAll().\r
-    // New instances of this type are initially in the inactive state; activation is enabled by a call\r
-    // to Activate().\r
-\r
-    // This class is thread-safe.\r
-\r
-    internal sealed class TriggerListener {\r
-\r
-        private readonly Trigger _activateTrigger;\r
-        private volatile Action _continuation;\r
-        private readonly SingleEntryGate _continuationFiredGate = new SingleEntryGate();\r
-        private int _outstandingTriggers;\r
-        private readonly Trigger _setContinuationTrigger;\r
-\r
-        public TriggerListener() {\r
-            _activateTrigger = CreateTrigger();\r
-            _setContinuationTrigger = CreateTrigger();\r
-        }\r
-\r
-        public void Activate() {\r
-            _activateTrigger.Fire();\r
-        }\r
-\r
-        public Trigger CreateTrigger() {\r
-            Interlocked.Increment(ref _outstandingTriggers);\r
-\r
-            SingleEntryGate triggerFiredGate = new SingleEntryGate();\r
-            return new Trigger(() => {\r
-                if (triggerFiredGate.TryEnter()) {\r
-                    HandleTriggerFired();\r
-                }\r
-            });\r
-        }\r
-\r
-        private void HandleTriggerFired() {\r
-            if (Interlocked.Decrement(ref _outstandingTriggers) == 0) {\r
-                if (_continuationFiredGate.TryEnter()) {\r
-                    _continuation();\r
-                }\r
-            }\r
-        }\r
-\r
-        public void SetContinuation(Action continuation) {\r
-            if (continuation != null) {\r
-                _continuation = continuation;\r
-                _setContinuationTrigger.Fire();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AsyncController.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AsyncController.cs
deleted file mode 100644 (file)
index 975ce4f..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Mvc.Async;\r
-    using System.Web.Routing;\r
-\r
-    public abstract class AsyncController : Controller, IAsyncManagerContainer, IAsyncController {\r
-\r
-        private static readonly object _executeTag = new object();\r
-        private static readonly object _executeCoreTag = new object();\r
-\r
-        private readonly AsyncManager _asyncManager = new AsyncManager();\r
-\r
-        public AsyncManager AsyncManager {\r
-            get {\r
-                return _asyncManager;\r
-            }\r
-        }\r
-\r
-        protected virtual IAsyncResult BeginExecute(RequestContext requestContext, AsyncCallback callback, object state) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-\r
-            VerifyExecuteCalledOnce();\r
-            Initialize(requestContext);\r
-            return AsyncResultWrapper.Begin(callback, state, BeginExecuteCore, EndExecuteCore, _executeTag);\r
-        }\r
-\r
-        protected virtual IAsyncResult BeginExecuteCore(AsyncCallback callback, object state) {\r
-            // If code in this method needs to be updated, please also check the ExecuteCore() method\r
-            // of Controller to see if that code also must be updated.\r
-\r
-            PossiblyLoadTempData();\r
-            try {\r
-                string actionName = RouteData.GetRequiredString("action");\r
-                IActionInvoker invoker = ActionInvoker;\r
-                IAsyncActionInvoker asyncInvoker = invoker as IAsyncActionInvoker;\r
-                if (asyncInvoker != null) {\r
-                    // asynchronous invocation\r
-                    BeginInvokeDelegate beginDelegate = delegate(AsyncCallback asyncCallback, object asyncState) {\r
-                        return asyncInvoker.BeginInvokeAction(ControllerContext, actionName, asyncCallback, asyncState);\r
-                    };\r
-\r
-                    EndInvokeDelegate endDelegate = delegate(IAsyncResult asyncResult) {\r
-                        if (!asyncInvoker.EndInvokeAction(asyncResult)) {\r
-                            HandleUnknownAction(actionName);\r
-                        }\r
-                    };\r
-\r
-                    return AsyncResultWrapper.Begin(callback, state, beginDelegate, endDelegate, _executeCoreTag);\r
-                }\r
-                else {\r
-                    // synchronous invocation\r
-                    Action action = () => {\r
-                        if (!invoker.InvokeAction(ControllerContext, actionName)) {\r
-                            HandleUnknownAction(actionName);\r
-                        }\r
-                    };\r
-                    return AsyncResultWrapper.BeginSynchronous(callback, state, action, _executeCoreTag);\r
-                }\r
-            }\r
-            catch {\r
-                PossiblySaveTempData();\r
-                throw;\r
-            }\r
-        }\r
-\r
-        protected override IActionInvoker CreateActionInvoker() {\r
-            return new AsyncControllerActionInvoker();\r
-        }\r
-\r
-        protected virtual void EndExecute(IAsyncResult asyncResult) {\r
-            AsyncResultWrapper.End(asyncResult, _executeTag);\r
-        }\r
-\r
-        protected virtual void EndExecuteCore(IAsyncResult asyncResult) {\r
-            // If code in this method needs to be updated, please also check the ExecuteCore() method\r
-            // of Controller to see if that code also must be updated.\r
-\r
-            try {\r
-                AsyncResultWrapper.End(asyncResult, _executeCoreTag);\r
-            }\r
-            finally {\r
-                PossiblySaveTempData();\r
-            }\r
-        }\r
-\r
-        #region IAsyncController Members\r
-        IAsyncResult IAsyncController.BeginExecute(RequestContext requestContext, AsyncCallback callback, object state) {\r
-            return BeginExecute(requestContext, callback, state);\r
-        }\r
-\r
-        void IAsyncController.EndExecute(IAsyncResult asyncResult) {\r
-            EndExecute(asyncResult);\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AsyncTimeoutAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AsyncTimeoutAttribute.cs
deleted file mode 100644 (file)
index 9622e25..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Mvc.Async;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "Unsealed so that subclassed types can set properties in the default constructor.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public class AsyncTimeoutAttribute : ActionFilterAttribute {\r
-\r
-        // duration is specified in milliseconds\r
-        public AsyncTimeoutAttribute(int duration) {\r
-            if (duration < -1) {\r
-                throw Error.AsyncCommon_InvalidTimeout("duration");\r
-            }\r
-\r
-            Duration = duration;\r
-        }\r
-\r
-        public int Duration {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override void OnActionExecuting(ActionExecutingContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            IAsyncManagerContainer container = filterContext.Controller as IAsyncManagerContainer;\r
-            if (container == null) {\r
-                throw Error.AsyncCommon_ControllerMustImplementIAsyncManagerContainer(filterContext.Controller.GetType());\r
-            }\r
-\r
-            container.AsyncManager.Timeout = Duration;\r
-\r
-            base.OnActionExecuting(filterContext);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AuthorizationContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AuthorizationContext.cs
deleted file mode 100644 (file)
index 8cd6808..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class AuthorizationContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public AuthorizationContext() {\r
-        }\r
-\r
-        [Obsolete("The recommended alternative is the constructor AuthorizationContext(ControllerContext controllerContext, ActionDescriptor actionDescriptor).")]\r
-        public AuthorizationContext(ControllerContext controllerContext)\r
-            : base(controllerContext) {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public AuthorizationContext(ControllerContext controllerContext, ActionDescriptor actionDescriptor)\r
-            : base(controllerContext) {\r
-            if (actionDescriptor == null) {\r
-                throw new ArgumentNullException("actionDescriptor");\r
-            }\r
-\r
-            ActionDescriptor = actionDescriptor;\r
-        }\r
-\r
-        public virtual ActionDescriptor ActionDescriptor {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/AuthorizeAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/AuthorizeAttribute.cs
deleted file mode 100644 (file)
index 3b07bca..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Security.Principal;\r
-    using System.Web;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "Unsealed so that subclassed types can set properties in the default constructor or override our behavior.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]\r
-    public class AuthorizeAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        private readonly object _typeId = new object();\r
-\r
-        private string _roles;\r
-        private string[] _rolesSplit = new string[0];\r
-        private string _users;\r
-        private string[] _usersSplit = new string[0];\r
-\r
-        public string Roles {\r
-            get {\r
-                return _roles ?? String.Empty;\r
-            }\r
-            set {\r
-                _roles = value;\r
-                _rolesSplit = SplitString(value);\r
-            }\r
-        }\r
-\r
-        public override object TypeId {\r
-            get {\r
-                return _typeId;\r
-            }\r
-        }\r
-\r
-        public string Users {\r
-            get {\r
-                return _users ?? String.Empty;\r
-            }\r
-            set {\r
-                _users = value;\r
-                _usersSplit = SplitString(value);\r
-            }\r
-        }\r
-\r
-        // This method must be thread-safe since it is called by the thread-safe OnCacheAuthorization() method.\r
-        protected virtual bool AuthorizeCore(HttpContextBase httpContext) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-\r
-            IPrincipal user = httpContext.User;\r
-            if (!user.Identity.IsAuthenticated) {\r
-                return false;\r
-            }\r
-\r
-            if (_usersSplit.Length > 0 && !_usersSplit.Contains(user.Identity.Name, StringComparer.OrdinalIgnoreCase)) {\r
-                return false;\r
-            }\r
-\r
-            if (_rolesSplit.Length > 0 && !_rolesSplit.Any(user.IsInRole)) {\r
-                return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        private void CacheValidateHandler(HttpContext context, object data, ref HttpValidationStatus validationStatus) {\r
-            validationStatus = OnCacheAuthorization(new HttpContextWrapper(context));\r
-        }\r
-\r
-        public virtual void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            if (AuthorizeCore(filterContext.HttpContext)) {\r
-                // ** IMPORTANT **\r
-                // Since we're performing authorization at the action level, the authorization code runs\r
-                // after the output caching module. In the worst case this could allow an authorized user\r
-                // to cause the page to be cached, then an unauthorized user would later be served the\r
-                // cached page. We work around this by telling proxies not to cache the sensitive page,\r
-                // then we hook our custom authorization code into the caching mechanism so that we have\r
-                // the final say on whether a page should be served from the cache.\r
-\r
-                HttpCachePolicyBase cachePolicy = filterContext.HttpContext.Response.Cache;\r
-                cachePolicy.SetProxyMaxAge(new TimeSpan(0));\r
-                cachePolicy.AddValidationCallback(CacheValidateHandler, null /* data */);\r
-            }\r
-            else {\r
-                HandleUnauthorizedRequest(filterContext);\r
-            }\r
-        }\r
-\r
-        protected virtual void HandleUnauthorizedRequest(AuthorizationContext filterContext) {\r
-            // Returns HTTP 401 - see comment in HttpUnauthorizedResult.cs.\r
-            filterContext.Result = new HttpUnauthorizedResult();\r
-        }\r
-\r
-        // This method must be thread-safe since it is called by the caching module.\r
-        protected virtual HttpValidationStatus OnCacheAuthorization(HttpContextBase httpContext) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-\r
-            bool isAuthorized = AuthorizeCore(httpContext);\r
-            return (isAuthorized) ? HttpValidationStatus.Valid : HttpValidationStatus.IgnoreThisRequest;\r
-        }\r
-\r
-        internal static string[] SplitString(string original) {\r
-            if (String.IsNullOrEmpty(original)) {\r
-                return new string[0];\r
-            }\r
-\r
-            var split = from piece in original.Split(',')\r
-                        let trimmed = piece.Trim()\r
-                        where !String.IsNullOrEmpty(trimmed)\r
-                        select trimmed;\r
-            return split.ToArray();\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/BindAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/BindAttribute.cs
deleted file mode 100644 (file)
index 5f3b1be..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Linq;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]\r
-    public sealed class BindAttribute : Attribute {\r
-\r
-        private string _exclude;\r
-        private string[] _excludeSplit = new string[0];\r
-        private string _include;\r
-        private string[] _includeSplit = new string[0];\r
-\r
-        public string Exclude {\r
-            get {\r
-                return _exclude ?? String.Empty;\r
-            }\r
-            set {\r
-                _exclude = value;\r
-                _excludeSplit = AuthorizeAttribute.SplitString(value);\r
-            }\r
-        }\r
-\r
-        public string Include {\r
-            get {\r
-                return _include ?? String.Empty;\r
-            }\r
-            set {\r
-                _include = value;\r
-                _includeSplit = AuthorizeAttribute.SplitString(value);\r
-            }\r
-        }\r
-\r
-        public string Prefix {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        internal static bool IsPropertyAllowed(string propertyName, string[] includeProperties, string[] excludeProperties) {\r
-            // We allow a property to be bound if its both in the include list AND not in the exclude list.\r
-            // An empty include list implies all properties are allowed.\r
-            // An empty exclude list implies no properties are disallowed.\r
-            bool includeProperty = (includeProperties == null) || (includeProperties.Length == 0) || includeProperties.Contains(propertyName, StringComparer.OrdinalIgnoreCase);\r
-            bool excludeProperty = (excludeProperties != null) && excludeProperties.Contains(propertyName, StringComparer.OrdinalIgnoreCase);\r
-            return includeProperty && !excludeProperty;\r
-        }\r
-\r
-        public bool IsPropertyAllowed(string propertyName) {\r
-            return IsPropertyAllowed(propertyName, _includeSplit, _excludeSplit);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/BuildManagerWrapper.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/BuildManagerWrapper.cs
deleted file mode 100644 (file)
index f8959ec..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections;\r
-    using System.IO;\r
-    using System.Web.Compilation;\r
-\r
-    internal sealed class BuildManagerWrapper : IBuildManager {\r
-        private static readonly Func<string, Stream> _readCachedFileDelegate =\r
-            TypeHelpers.CreateDelegate<Func<string, Stream>>(typeof(BuildManager), "ReadCachedFile", null /* thisParameter */);\r
-        private static readonly Func<string, Stream> _createCachedFileDelegate =\r
-            TypeHelpers.CreateDelegate<Func<string, Stream>>(typeof(BuildManager), "CreateCachedFile", null /* thisParameter */);\r
-\r
-        #region IBuildManager Members\r
-        object IBuildManager.CreateInstanceFromVirtualPath(string virtualPath, Type requiredBaseType) {\r
-            return BuildManager.CreateInstanceFromVirtualPath(virtualPath, requiredBaseType);\r
-        }\r
-\r
-        ICollection IBuildManager.GetReferencedAssemblies() {\r
-            return BuildManager.GetReferencedAssemblies();\r
-        }\r
-\r
-        // ASP.NET 4 methods\r
-        Stream IBuildManager.ReadCachedFile(string fileName) {\r
-            return (_readCachedFileDelegate != null) ? _readCachedFileDelegate(fileName) : null;\r
-        }\r
-\r
-        Stream IBuildManager.CreateCachedFile(string fileName) {\r
-            return (_createCachedFileDelegate != null) ? _createCachedFileDelegate(fileName) : null;\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ByteArrayModelBinder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ByteArrayModelBinder.cs
deleted file mode 100644 (file)
index ad62a13..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public class ByteArrayModelBinder : IModelBinder {\r
-        public virtual object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            if (bindingContext == null) {\r
-                throw new ArgumentNullException("bindingContext");\r
-            }\r
-\r
-            ValueProviderResult valueResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);\r
-\r
-            // case 1: there was no <input ... /> element containing this data\r
-            if (valueResult == null) {\r
-                return null;\r
-            }\r
-\r
-            string value = valueResult.AttemptedValue;\r
-\r
-            // case 2: there was an <input ... /> element but it was left blank\r
-            if (String.IsNullOrEmpty(value)) {\r
-                return null;\r
-            }\r
-\r
-            // Future proofing. If the byte array is actually an instance of System.Data.Linq.Binary\r
-            // then we need to remove these quotes put in place by the ToString() method.\r
-            string realValue = value.Replace("\"", String.Empty);\r
-            return Convert.FromBase64String(realValue);\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ChildActionOnlyAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ChildActionOnlyAttribute.cs
deleted file mode 100644 (file)
index 398546b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class ChildActionOnlyAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        public void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            if (!filterContext.IsChildAction) {\r
-                throw Error.ChildActionOnlyAttribute_MustBeInChildRequest(filterContext.ActionDescriptor);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ClientDataTypeModelValidatorProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ClientDataTypeModelValidatorProvider.cs
deleted file mode 100644 (file)
index 54c2519..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ClientDataTypeModelValidatorProvider : ModelValidatorProvider {\r
-\r
-        private static readonly HashSet<Type> _numericTypes = new HashSet<Type>(new Type[] {\r
-            typeof(byte), typeof(sbyte),\r
-            typeof(short), typeof(ushort),\r
-            typeof(int), typeof(uint),\r
-            typeof(long), typeof(ulong),\r
-            typeof(float), typeof(double), typeof(decimal)\r
-        });\r
-\r
-        public override IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context) {\r
-            if (metadata == null) {\r
-                throw new ArgumentNullException("metadata");\r
-            }\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            return GetValidatorsImpl(metadata, context);\r
-        }\r
-\r
-        private static IEnumerable<ModelValidator> GetValidatorsImpl(ModelMetadata metadata, ControllerContext context) {\r
-            Type type = metadata.ModelType;\r
-            if (IsNumericType(type)) {\r
-                yield return new NumericModelValidator(metadata, context);\r
-            }\r
-        }\r
-\r
-        private static bool IsNumericType(Type type) {\r
-            Type underlyingType = Nullable.GetUnderlyingType(type); // strip off the Nullable<>\r
-            return _numericTypes.Contains(underlyingType ?? type);\r
-        }\r
-\r
-        internal sealed class NumericModelValidator : ModelValidator {\r
-            public NumericModelValidator(ModelMetadata metadata, ControllerContext controllerContext)\r
-                : base(metadata, controllerContext) {\r
-            }\r
-\r
-            public override IEnumerable<ModelClientValidationRule> GetClientValidationRules() {\r
-                ModelClientValidationRule rule = new ModelClientValidationRule() {\r
-                    ValidationType = "number",\r
-                    ErrorMessage = MakeErrorString(Metadata.GetDisplayName())\r
-                };\r
-\r
-                return new ModelClientValidationRule[] { rule };\r
-            }\r
-\r
-            private static string MakeErrorString(string displayName) {\r
-                // use CurrentCulture since this message is intended for the site visitor\r
-                return String.Format(CultureInfo.CurrentCulture, MvcResources.ClientDataTypeModelValidatorProvider_FieldMustBeNumeric, displayName);\r
-            }\r
-\r
-            public override IEnumerable<ModelValidationResult> Validate(object container) {\r
-                // this is not a server-side validator\r
-                return Enumerable.Empty<ModelValidationResult>();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ContentResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ContentResult.cs
deleted file mode 100644 (file)
index 37ecb71..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Text;\r
-    using System.Web;\r
-\r
-    public class ContentResult : ActionResult {\r
-\r
-        public string Content {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public Encoding ContentEncoding {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ContentType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-\r
-            if (!String.IsNullOrEmpty(ContentType)) {\r
-                response.ContentType = ContentType;\r
-            }\r
-            if (ContentEncoding != null) {\r
-                response.ContentEncoding = ContentEncoding;\r
-            }\r
-            if (Content != null) {\r
-                response.Write(Content);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Controller.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Controller.cs
deleted file mode 100644 (file)
index 04f4bc4..0000000
+++ /dev/null
@@ -1,599 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Security.Principal;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public abstract class Controller : ControllerBase, IActionFilter, IAuthorizationFilter, IDisposable, IExceptionFilter, IResultFilter {\r
-\r
-        private IActionInvoker _actionInvoker;\r
-        private ModelBinderDictionary _binders;\r
-        private RouteCollection _routeCollection;\r
-        private ITempDataProvider _tempDataProvider;\r
-\r
-        public IActionInvoker ActionInvoker {\r
-            get {\r
-                if (_actionInvoker == null) {\r
-                    _actionInvoker = CreateActionInvoker();\r
-                }\r
-                return _actionInvoker;\r
-            }\r
-            set {\r
-                _actionInvoker = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "Property is settable so that the dictionary can be provided for unit testing purposes.")]\r
-        protected internal ModelBinderDictionary Binders {\r
-            get {\r
-                if (_binders == null) {\r
-                    _binders = ModelBinders.Binders;\r
-                }\r
-                return _binders;\r
-            }\r
-            set {\r
-                _binders = value;\r
-            }\r
-        }\r
-\r
-        public HttpContextBase HttpContext {\r
-            get {\r
-                return ControllerContext == null ? null : ControllerContext.HttpContext;\r
-            }\r
-        }\r
-\r
-        public ModelStateDictionary ModelState {\r
-            get {\r
-                return ViewData.ModelState;\r
-            }\r
-        }\r
-\r
-        public HttpRequestBase Request {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Request;\r
-            }\r
-        }\r
-\r
-        public HttpResponseBase Response {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Response;\r
-            }\r
-        }\r
-\r
-        internal RouteCollection RouteCollection {\r
-            get {\r
-                if (_routeCollection == null) {\r
-                    _routeCollection = RouteTable.Routes;\r
-                }\r
-                return _routeCollection;\r
-            }\r
-            set {\r
-                _routeCollection = value;\r
-            }\r
-        }\r
-\r
-        public RouteData RouteData {\r
-            get {\r
-                return ControllerContext == null ? null : ControllerContext.RouteData;\r
-            }\r
-        }\r
-\r
-        public HttpServerUtilityBase Server {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Server;\r
-            }\r
-        }\r
-\r
-        public HttpSessionStateBase Session {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.Session;\r
-            }\r
-        }\r
-\r
-        public ITempDataProvider TempDataProvider {\r
-            get {\r
-                if (_tempDataProvider == null) {\r
-                    _tempDataProvider = CreateTempDataProvider();\r
-                }\r
-                return _tempDataProvider;\r
-            }\r
-            set {\r
-                _tempDataProvider = value;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public IPrincipal User {\r
-            get {\r
-                return HttpContext == null ? null : HttpContext.User;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "'Content' refers to ContentResult type; 'content' refers to ContentResult.Content property.")]\r
-        protected internal ContentResult Content(string content) {\r
-            return Content(content, null /* contentType */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "'Content' refers to ContentResult type; 'content' refers to ContentResult.Content property.")]\r
-        protected internal ContentResult Content(string content, string contentType) {\r
-            return Content(content, contentType, null /* contentEncoding */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "'Content' refers to ContentResult type; 'content' refers to ContentResult.Content property.")]\r
-        protected internal virtual ContentResult Content(string content, string contentType, Encoding contentEncoding) {\r
-            return new ContentResult {\r
-                Content = content,\r
-                ContentType = contentType,\r
-                ContentEncoding = contentEncoding\r
-            };\r
-        }\r
-\r
-        protected virtual IActionInvoker CreateActionInvoker() {\r
-            return new ControllerActionInvoker();\r
-        }\r
-\r
-        protected virtual ITempDataProvider CreateTempDataProvider() {\r
-            return new SessionStateTempDataProvider();\r
-        }\r
-\r
-        // The default invoker will never match methods defined on the Controller type, so\r
-        // the Dispose() method is not web-callable.  However, in general, since implicitly-\r
-        // implemented interface methods are public, they are web-callable unless decorated with\r
-        // [NonAction].\r
-        public void Dispose() {\r
-            Dispose(true /* disposing */);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        protected virtual void Dispose(bool disposing) {\r
-        }\r
-\r
-        protected override void ExecuteCore() {\r
-            // If code in this method needs to be updated, please also check the BeginExecuteCore() and\r
-            // EndExecuteCore() methods of AsyncController to see if that code also must be updated.\r
-\r
-            PossiblyLoadTempData();\r
-            try {\r
-                string actionName = RouteData.GetRequiredString("action");\r
-                if (!ActionInvoker.InvokeAction(ControllerContext, actionName)) {\r
-                    HandleUnknownAction(actionName);\r
-                }\r
-            }\r
-            finally {\r
-                PossiblySaveTempData();\r
-            }\r
-        }\r
-\r
-        protected internal FileContentResult File(byte[] fileContents, string contentType) {\r
-            return File(fileContents, contentType, null /* fileDownloadName */);\r
-        }\r
-\r
-        protected internal virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName) {\r
-            return new FileContentResult(fileContents, contentType) { FileDownloadName = fileDownloadName };\r
-        }\r
-\r
-        protected internal FileStreamResult File(Stream fileStream, string contentType) {\r
-            return File(fileStream, contentType, null /* fileDownloadName */);\r
-        }\r
-\r
-        protected internal virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName) {\r
-            return new FileStreamResult(fileStream, contentType) { FileDownloadName = fileDownloadName };\r
-        }\r
-\r
-        protected internal FilePathResult File(string fileName, string contentType) {\r
-            return File(fileName, contentType, null /* fileDownloadName */);\r
-        }\r
-\r
-        protected internal virtual FilePathResult File(string fileName, string contentType, string fileDownloadName) {\r
-            return new FilePathResult(fileName, contentType) { FileDownloadName = fileDownloadName };\r
-        }\r
-\r
-        protected virtual void HandleUnknownAction(string actionName) {\r
-            throw new HttpException(404, String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Controller_UnknownAction, actionName, GetType().FullName));\r
-        }\r
-\r
-        protected internal virtual JavaScriptResult JavaScript(string script) {\r
-            return new JavaScriptResult { Script = script };\r
-        }\r
-\r
-        protected internal JsonResult Json(object data) {\r
-            return Json(data, null /* contentType */, null /* contentEncoding */, JsonRequestBehavior.DenyGet);\r
-        }\r
-\r
-        protected internal JsonResult Json(object data, string contentType) {\r
-            return Json(data, contentType, null /* contentEncoding */, JsonRequestBehavior.DenyGet);\r
-        }\r
-\r
-        protected internal virtual JsonResult Json(object data, string contentType, Encoding contentEncoding) {\r
-            return Json(data, contentType, contentEncoding, JsonRequestBehavior.DenyGet);\r
-        }\r
-\r
-        protected internal JsonResult Json(object data, JsonRequestBehavior behavior) {\r
-            return Json(data, null /* contentType */, null /* contentEncoding */, behavior);\r
-        }\r
-\r
-        protected internal JsonResult Json(object data, string contentType, JsonRequestBehavior behavior) {\r
-            return Json(data, contentType, null /* contentEncoding */, behavior);\r
-        }\r
-\r
-        protected internal virtual JsonResult Json(object data, string contentType, Encoding contentEncoding, JsonRequestBehavior behavior) {\r
-            return new JsonResult {\r
-                Data = data,\r
-                ContentType = contentType,\r
-                ContentEncoding = contentEncoding,\r
-                JsonRequestBehavior = behavior\r
-            };\r
-        }\r
-\r
-        protected override void Initialize(RequestContext requestContext) {\r
-            base.Initialize(requestContext);\r
-            Url = new UrlHelper(requestContext);\r
-        }\r
-\r
-        protected virtual void OnActionExecuting(ActionExecutingContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnActionExecuted(ActionExecutedContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnAuthorization(AuthorizationContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnException(ExceptionContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnResultExecuted(ResultExecutedContext filterContext) {\r
-        }\r
-\r
-        protected virtual void OnResultExecuting(ResultExecutingContext filterContext) {\r
-        }\r
-\r
-        protected internal PartialViewResult PartialView() {\r
-            return PartialView(null /* viewName */, null /* model */);\r
-        }\r
-\r
-        protected internal PartialViewResult PartialView(object model) {\r
-            return PartialView(null /* viewName */, model);\r
-        }\r
-\r
-        protected internal PartialViewResult PartialView(string viewName) {\r
-            return PartialView(viewName, null /* model */);\r
-        }\r
-\r
-        protected internal virtual PartialViewResult PartialView(string viewName, object model) {\r
-            if (model != null) {\r
-                ViewData.Model = model;\r
-            }\r
-\r
-            return new PartialViewResult {\r
-                ViewName = viewName,\r
-                ViewData = ViewData,\r
-                TempData = TempData\r
-            };\r
-        }\r
-\r
-        internal void PossiblyLoadTempData() {\r
-            if (!ControllerContext.IsChildAction) {\r
-                TempData.Load(ControllerContext, TempDataProvider);\r
-            }\r
-        }\r
-\r
-        internal void PossiblySaveTempData() {\r
-            if (!ControllerContext.IsChildAction) {\r
-                TempData.Save(ControllerContext, TempDataProvider);\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "Instance method for consistency with other helpers.")]\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "0#",\r
-            Justification = "Response.Redirect() takes its URI as a string parameter.")]\r
-        protected internal virtual RedirectResult Redirect(string url) {\r
-            if (String.IsNullOrEmpty(url)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "url");\r
-            }\r
-            return new RedirectResult(url);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName) {\r
-            return RedirectToAction(actionName, (RouteValueDictionary)null);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, object routeValues) {\r
-            return RedirectToAction(actionName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, RouteValueDictionary routeValues) {\r
-            return RedirectToAction(actionName, null /* controllerName */, routeValues);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, string controllerName) {\r
-            return RedirectToAction(actionName, controllerName, (RouteValueDictionary)null);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToAction(string actionName, string controllerName, object routeValues) {\r
-            return RedirectToAction(actionName, controllerName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal virtual RedirectToRouteResult RedirectToAction(string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            RouteValueDictionary mergedRouteValues;\r
-\r
-            if (RouteData == null) {\r
-                mergedRouteValues = RouteValuesHelpers.MergeRouteValues(actionName, controllerName, null, routeValues, true /* includeImplicitMvcValues */);\r
-            }\r
-            else {\r
-                mergedRouteValues = RouteValuesHelpers.MergeRouteValues(actionName, controllerName, RouteData.Values, routeValues, true /* includeImplicitMvcValues */);\r
-            }\r
-\r
-            return new RedirectToRouteResult(mergedRouteValues);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(object routeValues) {\r
-            return RedirectToRoute(new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(RouteValueDictionary routeValues) {\r
-            return RedirectToRoute(null /* routeName */, routeValues);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(string routeName) {\r
-            return RedirectToRoute(routeName, (RouteValueDictionary)null);\r
-        }\r
-\r
-        protected internal RedirectToRouteResult RedirectToRoute(string routeName, object routeValues) {\r
-            return RedirectToRoute(routeName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        protected internal virtual RedirectToRouteResult RedirectToRoute(string routeName, RouteValueDictionary routeValues) {\r
-            return new RedirectToRouteResult(routeName, RouteValuesHelpers.GetRouteValues(routeValues));\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model) where TModel : class {\r
-            return TryUpdateModel(model, null, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix) where TModel : class {\r
-            return TryUpdateModel(model, prefix, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string[] includeProperties) where TModel : class {\r
-            return TryUpdateModel(model, null, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties) where TModel : class {\r
-            return TryUpdateModel(model, prefix, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {\r
-            return TryUpdateModel(model, prefix, includeProperties, excludeProperties, ValueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, IValueProvider valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, null, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, IValueProvider valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, prefix, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string[] includeProperties, IValueProvider valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, null, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, IValueProvider valueProvider) where TModel : class {\r
-            return TryUpdateModel(model, prefix, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties, IValueProvider valueProvider) where TModel : class {\r
-            if (model == null) {\r
-                throw new ArgumentNullException("model");\r
-            }\r
-            if (valueProvider == null) {\r
-                throw new ArgumentNullException("valueProvider");\r
-            }\r
-\r
-            Predicate<string> propertyFilter = propertyName => BindAttribute.IsPropertyAllowed(propertyName, includeProperties, excludeProperties);\r
-            IModelBinder binder = Binders.GetBinder(typeof(TModel));\r
-\r
-            ModelBindingContext bindingContext = new ModelBindingContext() {\r
-                ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(() => model, typeof(TModel)),\r
-                ModelName = prefix,\r
-                ModelState = ModelState,\r
-                PropertyFilter = propertyFilter,\r
-                ValueProvider = valueProvider\r
-            };\r
-            binder.BindModel(ControllerContext, bindingContext);\r
-            return ModelState.IsValid;\r
-        }\r
-\r
-        protected internal bool TryValidateModel(object model) {\r
-            return TryValidateModel(model, null /* prefix */);\r
-        }\r
-\r
-        protected internal bool TryValidateModel(object model, string prefix) {\r
-            if (model == null) {\r
-                throw new ArgumentNullException("model");\r
-            }\r
-\r
-            ModelMetadata metadata = ModelMetadataProviders.Current.GetMetadataForType(() => model, model.GetType());\r
-\r
-            foreach (ModelValidationResult validationResult in ModelValidator.GetModelValidator(metadata, ControllerContext).Validate(null)) {\r
-                ModelState.AddModelError(DefaultModelBinder.CreateSubPropertyName(prefix, validationResult.MemberName), validationResult.Message);\r
-            }\r
-\r
-            return ModelState.IsValid;\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model) where TModel : class {\r
-            UpdateModel(model, null, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix) where TModel : class {\r
-            UpdateModel(model, prefix, null, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string[] includeProperties) where TModel : class {\r
-            UpdateModel(model, null, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties) where TModel : class {\r
-            UpdateModel(model, prefix, includeProperties, null, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {\r
-            UpdateModel(model, prefix, includeProperties, excludeProperties, ValueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, IValueProvider valueProvider) where TModel : class {\r
-            UpdateModel(model, null, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, IValueProvider valueProvider) where TModel : class {\r
-            UpdateModel(model, prefix, null, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string[] includeProperties, IValueProvider valueProvider) where TModel : class {\r
-            UpdateModel(model, null, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, IValueProvider valueProvider) where TModel : class {\r
-            UpdateModel(model, prefix, includeProperties, null, valueProvider);\r
-        }\r
-\r
-        protected internal void UpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties, IValueProvider valueProvider) where TModel : class {\r
-            bool success = TryUpdateModel(model, prefix, includeProperties, excludeProperties, valueProvider);\r
-            if (!success) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.Controller_UpdateModel_UpdateUnsuccessful,\r
-                    typeof(TModel).FullName);\r
-                throw new InvalidOperationException(message);\r
-            }\r
-        }\r
-\r
-        protected internal void ValidateModel(object model) {\r
-            ValidateModel(model, null /* prefix */);\r
-        }\r
-\r
-        protected internal void ValidateModel(object model, string prefix) {\r
-            if (!TryValidateModel(model, prefix)) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.Controller_Validate_ValidationFailed,\r
-                        model.GetType().FullName\r
-                    )\r
-                );\r
-            }\r
-        }\r
-\r
-        protected internal ViewResult View() {\r
-            return View(null /* viewName */, null /* masterName */, null /* model */);\r
-        }\r
-\r
-        protected internal ViewResult View(object model) {\r
-            return View(null /* viewName */, null /* masterName */, model);\r
-        }\r
-\r
-        protected internal ViewResult View(string viewName) {\r
-            return View(viewName, null /* masterName */, null /* model */);\r
-        }\r
-\r
-        protected internal ViewResult View(string viewName, string masterName) {\r
-            return View(viewName, masterName, null /* model */);\r
-        }\r
-\r
-        protected internal ViewResult View(string viewName, object model) {\r
-            return View(viewName, null /* masterName */, model);\r
-        }\r
-\r
-        protected internal virtual ViewResult View(string viewName, string masterName, object model) {\r
-            if (model != null) {\r
-                ViewData.Model = model;\r
-            }\r
-\r
-            return new ViewResult {\r
-                ViewName = viewName,\r
-                MasterName = masterName,\r
-                ViewData = ViewData,\r
-                TempData = TempData\r
-            };\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "The method name 'View' is a convenient shorthand for 'CreateViewResult'.")]\r
-        protected internal ViewResult View(IView view) {\r
-            return View(view, null /* model */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", MessageId = "0#",\r
-            Justification = "The method name 'View' is a convenient shorthand for 'CreateViewResult'.")]\r
-        protected internal virtual ViewResult View(IView view, object model) {\r
-            if (model != null) {\r
-                ViewData.Model = model;\r
-            }\r
-\r
-            return new ViewResult {\r
-                View = view,\r
-                ViewData = ViewData,\r
-                TempData = TempData\r
-            };\r
-        }\r
-\r
-        #region IActionFilter Members\r
-        void IActionFilter.OnActionExecuting(ActionExecutingContext filterContext) {\r
-            OnActionExecuting(filterContext);\r
-        }\r
-\r
-        void IActionFilter.OnActionExecuted(ActionExecutedContext filterContext) {\r
-            OnActionExecuted(filterContext);\r
-        }\r
-        #endregion\r
-\r
-        #region IAuthorizationFilter Members\r
-        void IAuthorizationFilter.OnAuthorization(AuthorizationContext filterContext) {\r
-            OnAuthorization(filterContext);\r
-        }\r
-        #endregion\r
-\r
-        #region IExceptionFilter Members\r
-        void IExceptionFilter.OnException(ExceptionContext filterContext) {\r
-            OnException(filterContext);\r
-        }\r
-        #endregion\r
-\r
-        #region IResultFilter Members\r
-        void IResultFilter.OnResultExecuting(ResultExecutingContext filterContext) {\r
-            OnResultExecuting(filterContext);\r
-        }\r
-\r
-        void IResultFilter.OnResultExecuted(ResultExecutedContext filterContext) {\r
-            OnResultExecuted(filterContext);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerActionInvoker.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerActionInvoker.cs
deleted file mode 100644 (file)
index aad3e81..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Threading;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ControllerActionInvoker : IActionInvoker {\r
-\r
-        private readonly static ControllerDescriptorCache _staticDescriptorCache = new ControllerDescriptorCache();\r
-\r
-        private ModelBinderDictionary _binders;\r
-        private ControllerDescriptorCache _instanceDescriptorCache;\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "Property is settable so that the dictionary can be provided for unit testing purposes.")]\r
-        protected internal ModelBinderDictionary Binders {\r
-            get {\r
-                if (_binders == null) {\r
-                    _binders = ModelBinders.Binders;\r
-                }\r
-                return _binders;\r
-            }\r
-            set {\r
-                _binders = value;\r
-            }\r
-        }\r
-\r
-        internal ControllerDescriptorCache DescriptorCache {\r
-            get {\r
-                if (_instanceDescriptorCache == null) {\r
-                    _instanceDescriptorCache = _staticDescriptorCache;\r
-                }\r
-                return _instanceDescriptorCache;\r
-            }\r
-            set {\r
-                _instanceDescriptorCache = value;\r
-            }\r
-        }\r
-\r
-        private static void AddControllerToFilterList<TFilter>(ControllerBase controller, IList<TFilter> filterList) where TFilter : class {\r
-            TFilter controllerAsFilter = controller as TFilter;\r
-            if (controllerAsFilter != null) {\r
-                filterList.Insert(0, controllerAsFilter);\r
-            }\r
-        }\r
-\r
-        protected virtual ActionResult CreateActionResult(ControllerContext controllerContext, ActionDescriptor actionDescriptor, object actionReturnValue) {\r
-            if (actionReturnValue == null) {\r
-                return new EmptyResult();\r
-            }\r
-\r
-            ActionResult actionResult = (actionReturnValue as ActionResult) ??\r
-                new ContentResult { Content = Convert.ToString(actionReturnValue, CultureInfo.InvariantCulture) };\r
-            return actionResult;\r
-        }\r
-\r
-        protected virtual ControllerDescriptor GetControllerDescriptor(ControllerContext controllerContext) {\r
-            Type controllerType = controllerContext.Controller.GetType();\r
-            ControllerDescriptor controllerDescriptor = DescriptorCache.GetDescriptor(controllerType, () => new ReflectedControllerDescriptor(controllerType));\r
-            return controllerDescriptor;\r
-        }\r
-\r
-        protected virtual ActionDescriptor FindAction(ControllerContext controllerContext, ControllerDescriptor controllerDescriptor, string actionName) {\r
-            ActionDescriptor actionDescriptor = controllerDescriptor.FindAction(controllerContext, actionName);\r
-            return actionDescriptor;\r
-        }\r
-\r
-        protected virtual FilterInfo GetFilters(ControllerContext controllerContext, ActionDescriptor actionDescriptor) {\r
-            FilterInfo filters = actionDescriptor.GetFilters();\r
-\r
-            // if the current controller implements one of the filter interfaces, it should be added to the list at position 0\r
-            ControllerBase controller = controllerContext.Controller;\r
-            AddControllerToFilterList(controller, filters.ActionFilters);\r
-            AddControllerToFilterList(controller, filters.ResultFilters);\r
-            AddControllerToFilterList(controller, filters.AuthorizationFilters);\r
-            AddControllerToFilterList(controller, filters.ExceptionFilters);\r
-\r
-            return filters;\r
-        }\r
-\r
-        private IModelBinder GetModelBinder(ParameterDescriptor parameterDescriptor) {\r
-            // look on the parameter itself, then look in the global table\r
-            return parameterDescriptor.BindingInfo.Binder ?? Binders.GetBinder(parameterDescriptor.ParameterType);\r
-        }\r
-\r
-        protected virtual object GetParameterValue(ControllerContext controllerContext, ParameterDescriptor parameterDescriptor) {\r
-            // collect all of the necessary binding properties\r
-            Type parameterType = parameterDescriptor.ParameterType;\r
-            IModelBinder binder = GetModelBinder(parameterDescriptor);\r
-            IValueProvider valueProvider = controllerContext.Controller.ValueProvider;\r
-            string parameterName = parameterDescriptor.BindingInfo.Prefix ?? parameterDescriptor.ParameterName;\r
-            Predicate<string> propertyFilter = GetPropertyFilter(parameterDescriptor);\r
-\r
-            // finally, call into the binder\r
-            ModelBindingContext bindingContext = new ModelBindingContext() {\r
-                FallbackToEmptyPrefix = (parameterDescriptor.BindingInfo.Prefix == null), // only fall back if prefix not specified\r
-                ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, parameterType),\r
-                ModelName = parameterName,\r
-                ModelState = controllerContext.Controller.ViewData.ModelState,\r
-                PropertyFilter = propertyFilter,\r
-                ValueProvider = valueProvider\r
-            };\r
-\r
-            object result = binder.BindModel(controllerContext, bindingContext);\r
-            return result ?? parameterDescriptor.DefaultValue;\r
-        }\r
-\r
-        protected virtual IDictionary<string, object> GetParameterValues(ControllerContext controllerContext, ActionDescriptor actionDescriptor) {\r
-            Dictionary<string, object> parametersDict = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-            ParameterDescriptor[] parameterDescriptors = actionDescriptor.GetParameters();\r
-\r
-            foreach (ParameterDescriptor parameterDescriptor in parameterDescriptors) {\r
-                parametersDict[parameterDescriptor.ParameterName] = GetParameterValue(controllerContext, parameterDescriptor);\r
-            }\r
-            return parametersDict;\r
-        }\r
-\r
-        private static Predicate<string> GetPropertyFilter(ParameterDescriptor parameterDescriptor) {\r
-            ParameterBindingInfo bindingInfo = parameterDescriptor.BindingInfo;\r
-            return propertyName => BindAttribute.IsPropertyAllowed(propertyName, bindingInfo.Include.ToArray(), bindingInfo.Exclude.ToArray());\r
-        }\r
-\r
-        public virtual bool InvokeAction(ControllerContext controllerContext, string actionName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-\r
-            ControllerDescriptor controllerDescriptor = GetControllerDescriptor(controllerContext);\r
-            ActionDescriptor actionDescriptor = FindAction(controllerContext, controllerDescriptor, actionName);\r
-            if (actionDescriptor != null) {\r
-                FilterInfo filterInfo = GetFilters(controllerContext, actionDescriptor);\r
-\r
-                try {\r
-                    AuthorizationContext authContext = InvokeAuthorizationFilters(controllerContext, filterInfo.AuthorizationFilters, actionDescriptor);\r
-                    if (authContext.Result != null) {\r
-                        // the auth filter signaled that we should let it short-circuit the request\r
-                        InvokeActionResult(controllerContext, authContext.Result);\r
-                    }\r
-                    else {\r
-                        if (controllerContext.Controller.ValidateRequest) {\r
-                            ValidateRequest(controllerContext);\r
-                        }\r
-\r
-                        IDictionary<string, object> parameters = GetParameterValues(controllerContext, actionDescriptor);\r
-                        ActionExecutedContext postActionContext = InvokeActionMethodWithFilters(controllerContext, filterInfo.ActionFilters, actionDescriptor, parameters);\r
-                        InvokeActionResultWithFilters(controllerContext, filterInfo.ResultFilters, postActionContext.Result);\r
-                    }\r
-                }\r
-                catch (ThreadAbortException) {\r
-                    // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                    // the filters don't see this as an error.\r
-                    throw;\r
-                }\r
-                catch (Exception ex) {\r
-                    // something blew up, so execute the exception filters\r
-                    ExceptionContext exceptionContext = InvokeExceptionFilters(controllerContext, filterInfo.ExceptionFilters, ex);\r
-                    if (!exceptionContext.ExceptionHandled) {\r
-                        throw;\r
-                    }\r
-                    InvokeActionResult(controllerContext, exceptionContext.Result);\r
-                }\r
-\r
-                return true;\r
-            }\r
-\r
-            // notify controller that no method matched\r
-            return false;\r
-        }\r
-\r
-        protected virtual ActionResult InvokeActionMethod(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters) {\r
-            object returnValue = actionDescriptor.Execute(controllerContext, parameters);\r
-            ActionResult result = CreateActionResult(controllerContext, actionDescriptor, returnValue);\r
-            return result;\r
-        }\r
-\r
-        internal static ActionExecutedContext InvokeActionMethodFilter(IActionFilter filter, ActionExecutingContext preContext, Func<ActionExecutedContext> continuation) {\r
-            filter.OnActionExecuting(preContext);\r
-            if (preContext.Result != null) {\r
-                return new ActionExecutedContext(preContext, preContext.ActionDescriptor, true /* canceled */, null /* exception */) {\r
-                    Result = preContext.Result\r
-                };\r
-            }\r
-\r
-            bool wasError = false;\r
-            ActionExecutedContext postContext = null;\r
-            try {\r
-                postContext = continuation();\r
-            }\r
-            catch (ThreadAbortException) {\r
-                // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                // the filters don't see this as an error.\r
-                postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, null /* exception */);\r
-                filter.OnActionExecuted(postContext);\r
-                throw;\r
-            }\r
-            catch (Exception ex) {\r
-                wasError = true;\r
-                postContext = new ActionExecutedContext(preContext, preContext.ActionDescriptor, false /* canceled */, ex);\r
-                filter.OnActionExecuted(postContext);\r
-                if (!postContext.ExceptionHandled) {\r
-                    throw;\r
-                }\r
-            }\r
-            if (!wasError) {\r
-                filter.OnActionExecuted(postContext);\r
-            }\r
-            return postContext;\r
-        }\r
-\r
-        protected virtual ActionExecutedContext InvokeActionMethodWithFilters(ControllerContext controllerContext, IList<IActionFilter> filters, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters) {\r
-            ActionExecutingContext preContext = new ActionExecutingContext(controllerContext, actionDescriptor, parameters);\r
-            Func<ActionExecutedContext> continuation = () =>\r
-                new ActionExecutedContext(controllerContext, actionDescriptor, false /* canceled */, null /* exception */) {\r
-                    Result = InvokeActionMethod(controllerContext, actionDescriptor, parameters)\r
-                };\r
-\r
-            // need to reverse the filter list because the continuations are built up backward\r
-            Func<ActionExecutedContext> thunk = filters.Reverse().Aggregate(continuation,\r
-                (next, filter) => () => InvokeActionMethodFilter(filter, preContext, next));\r
-            return thunk();\r
-        }\r
-\r
-        protected virtual void InvokeActionResult(ControllerContext controllerContext, ActionResult actionResult) {\r
-            actionResult.ExecuteResult(controllerContext);\r
-        }\r
-\r
-        internal static ResultExecutedContext InvokeActionResultFilter(IResultFilter filter, ResultExecutingContext preContext, Func<ResultExecutedContext> continuation) {\r
-            filter.OnResultExecuting(preContext);\r
-            if (preContext.Cancel) {\r
-                return new ResultExecutedContext(preContext, preContext.Result, true /* canceled */, null /* exception */);\r
-            }\r
-\r
-            bool wasError = false;\r
-            ResultExecutedContext postContext = null;\r
-            try {\r
-                postContext = continuation();\r
-            }\r
-            catch (ThreadAbortException) {\r
-                // This type of exception occurs as a result of Response.Redirect(), but we special-case so that\r
-                // the filters don't see this as an error.\r
-                postContext = new ResultExecutedContext(preContext, preContext.Result, false /* canceled */, null /* exception */);\r
-                filter.OnResultExecuted(postContext);\r
-                throw;\r
-            }\r
-            catch (Exception ex) {\r
-                wasError = true;\r
-                postContext = new ResultExecutedContext(preContext, preContext.Result, false /* canceled */, ex);\r
-                filter.OnResultExecuted(postContext);\r
-                if (!postContext.ExceptionHandled) {\r
-                    throw;\r
-                }\r
-            }\r
-            if (!wasError) {\r
-                filter.OnResultExecuted(postContext);\r
-            }\r
-            return postContext;\r
-        }\r
-\r
-        protected virtual ResultExecutedContext InvokeActionResultWithFilters(ControllerContext controllerContext, IList<IResultFilter> filters, ActionResult actionResult) {\r
-            ResultExecutingContext preContext = new ResultExecutingContext(controllerContext, actionResult);\r
-            Func<ResultExecutedContext> continuation = delegate {\r
-                InvokeActionResult(controllerContext, actionResult);\r
-                return new ResultExecutedContext(controllerContext, actionResult, false /* canceled */, null /* exception */);\r
-            };\r
-\r
-            // need to reverse the filter list because the continuations are built up backward\r
-            Func<ResultExecutedContext> thunk = filters.Reverse().Aggregate(continuation,\r
-                (next, filter) => () => InvokeActionResultFilter(filter, preContext, next));\r
-            return thunk();\r
-        }\r
-\r
-        protected virtual AuthorizationContext InvokeAuthorizationFilters(ControllerContext controllerContext, IList<IAuthorizationFilter> filters, ActionDescriptor actionDescriptor) {\r
-            AuthorizationContext context = new AuthorizationContext(controllerContext, actionDescriptor);\r
-            foreach (IAuthorizationFilter filter in filters) {\r
-                filter.OnAuthorization(context);\r
-                // short-circuit evaluation\r
-                if (context.Result != null) {\r
-                    break;\r
-                }\r
-            }\r
-\r
-            return context;\r
-        }\r
-\r
-        protected virtual ExceptionContext InvokeExceptionFilters(ControllerContext controllerContext, IList<IExceptionFilter> filters, Exception exception) {\r
-            ExceptionContext context = new ExceptionContext(controllerContext, exception);\r
-            foreach (IExceptionFilter filter in filters) {\r
-                filter.OnException(context);\r
-            }\r
-\r
-            return context;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "rawUrl",\r
-            Justification = "We only care about the property getter's side effects, not the returned value.")]\r
-        internal static void ValidateRequest(ControllerContext controllerContext) {\r
-            if (controllerContext.IsChildAction) {\r
-                return;\r
-            }\r
-\r
-            // DevDiv 214040: Enable Request Validation by default for all controller requests\r
-            // \r
-            // Note that we grab the Request's RawUrl to force it to be validated. Calling ValidateInput()\r
-            // doesn't actually validate anything. It just sets flags indicating that on the next usage of\r
-            // certain inputs that they should be validated. We special case RawUrl because the URL has already\r
-            // been consumed by routing and thus might contain dangerous data. By forcing the RawUrl to be\r
-            // re-read we're making sure that it gets validated by ASP.NET.\r
-\r
-            controllerContext.HttpContext.Request.ValidateInput();\r
-            string rawUrl = controllerContext.HttpContext.Request.RawUrl;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerBase.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerBase.cs
deleted file mode 100644 (file)
index b5902bd..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Async;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public abstract class ControllerBase : IController {\r
-\r
-        private readonly SingleEntryGate _executeWasCalledGate = new SingleEntryGate();\r
-\r
-        private TempDataDictionary _tempDataDictionary;\r
-        private bool _validateRequest = true;\r
-        private IValueProvider _valueProvider;\r
-        private ViewDataDictionary _viewDataDictionary;\r
-\r
-        public ControllerContext ControllerContext {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This property is settable so that unit tests can provide mock implementations.")]\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                if (ControllerContext != null && ControllerContext.IsChildAction) {\r
-                    return ControllerContext.ParentActionViewContext.TempData;\r
-                }\r
-                if (_tempDataDictionary == null) {\r
-                    _tempDataDictionary = new TempDataDictionary();\r
-                }\r
-                return _tempDataDictionary;\r
-            }\r
-            set {\r
-                _tempDataDictionary = value;\r
-            }\r
-        }\r
-\r
-        public bool ValidateRequest {\r
-            get {\r
-                return _validateRequest;\r
-            }\r
-            set {\r
-                _validateRequest = value;\r
-            }\r
-        }\r
-\r
-        public IValueProvider ValueProvider {\r
-            get {\r
-                if (_valueProvider == null) {\r
-                    _valueProvider = ValueProviderFactories.Factories.GetValueProvider(ControllerContext);\r
-                }\r
-                return _valueProvider;\r
-            }\r
-            set {\r
-                _valueProvider = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This property is settable so that unit tests can provide mock implementations.")]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                if (_viewDataDictionary == null) {\r
-                    _viewDataDictionary = new ViewDataDictionary();\r
-                }\r
-                return _viewDataDictionary;\r
-            }\r
-            set {\r
-                _viewDataDictionary = value;\r
-            }\r
-        }\r
-\r
-        protected virtual void Execute(RequestContext requestContext) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-\r
-            VerifyExecuteCalledOnce();\r
-            Initialize(requestContext);\r
-            ExecuteCore();\r
-        }\r
-\r
-        protected abstract void ExecuteCore();\r
-\r
-        protected virtual void Initialize(RequestContext requestContext) {\r
-            ControllerContext = new ControllerContext(requestContext, this);\r
-        }\r
-\r
-        internal void VerifyExecuteCalledOnce() {\r
-            if (!_executeWasCalledGate.TryEnter()) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ControllerBase_CannotHandleMultipleRequests, GetType());\r
-                throw new InvalidOperationException(message);\r
-            }\r
-        }\r
-\r
-        #region IController Members\r
-        void IController.Execute(RequestContext requestContext) {\r
-            Execute(requestContext);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerBuilder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerBuilder.cs
deleted file mode 100644 (file)
index c86f740..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ControllerBuilder {\r
-\r
-        private Func<IControllerFactory> _factoryThunk;\r
-        private static ControllerBuilder _instance = new ControllerBuilder();\r
-        private HashSet<string> _namespaces = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public ControllerBuilder() {\r
-            SetControllerFactory(new DefaultControllerFactory() {\r
-                ControllerBuilder = this\r
-            });\r
-        }\r
-\r
-        public static ControllerBuilder Current {\r
-            get {\r
-                return _instance;\r
-            }\r
-        }\r
-\r
-        public HashSet<string> DefaultNamespaces {\r
-            get {\r
-                return _namespaces;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "Calling method multiple times might return different objects.")]\r
-        public IControllerFactory GetControllerFactory() {\r
-            IControllerFactory controllerFactoryInstance = _factoryThunk();\r
-            return controllerFactoryInstance;\r
-        }\r
-\r
-        public void SetControllerFactory(IControllerFactory controllerFactory) {\r
-            if (controllerFactory == null) {\r
-                throw new ArgumentNullException("controllerFactory");\r
-            }\r
-\r
-            _factoryThunk = () => controllerFactory;\r
-        }\r
-\r
-        public void SetControllerFactory(Type controllerFactoryType) {\r
-            if (controllerFactoryType == null) {\r
-                throw new ArgumentNullException("controllerFactoryType");\r
-            }\r
-            if (!typeof(IControllerFactory).IsAssignableFrom(controllerFactoryType)) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ControllerBuilder_MissingIControllerFactory,\r
-                        controllerFactoryType),\r
-                    "controllerFactoryType");\r
-            }\r
-\r
-            _factoryThunk = delegate() {\r
-                try {\r
-                    return (IControllerFactory)Activator.CreateInstance(controllerFactoryType);\r
-                }\r
-                catch (Exception ex) {\r
-                    throw new InvalidOperationException(\r
-                        String.Format(\r
-                            CultureInfo.CurrentUICulture,\r
-                            MvcResources.ControllerBuilder_ErrorCreatingControllerFactory,\r
-                            controllerFactoryType),\r
-                        ex);\r
-                }\r
-            };\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerContext.cs
deleted file mode 100644 (file)
index 2262501..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web;\r
-    using System.Web.Routing;\r
-    using System.Web.Mvc.Html;\r
-\r
-    // Though many of the properties on ControllerContext and its subclassed types are virtual, there are still sealed\r
-    // properties (like ControllerContext.RequestContext, ActionExecutingContext.Result, etc.). If these properties\r
-    // were virtual, a mocking framework might override them with incorrect behavior (property getters would return\r
-    // null, property setters would be no-ops). By sealing these properties, we are forcing them to have the default\r
-    // "get or store a value" semantics that they were intended to have.\r
-\r
-    public class ControllerContext {\r
-\r
-        private HttpContextBase _httpContext;\r
-        private RequestContext _requestContext;\r
-        private RouteData _routeData;\r
-\r
-        internal const string PARENT_ACTION_VIEWCONTEXT = "ParentActionViewContext";\r
-\r
-        // parameterless constructor used for mocking\r
-        public ControllerContext() {\r
-        }\r
-\r
-        // copy constructor - allows for subclassed types to take an existing ControllerContext as a parameter\r
-        // and we'll automatically set the appropriate properties\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        protected ControllerContext(ControllerContext controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            Controller = controllerContext.Controller;\r
-            RequestContext = controllerContext.RequestContext;\r
-        }\r
-\r
-        public ControllerContext(HttpContextBase httpContext, RouteData routeData, ControllerBase controller)\r
-            : this(new RequestContext(httpContext, routeData), controller) {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ControllerContext(RequestContext requestContext, ControllerBase controller) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-            if (controller == null) {\r
-                throw new ArgumentNullException("controller");\r
-            }\r
-\r
-            RequestContext = requestContext;\r
-            Controller = controller;\r
-        }\r
-\r
-        public virtual ControllerBase Controller {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual HttpContextBase HttpContext {\r
-            get {\r
-                if (_httpContext == null) {\r
-                    _httpContext = (_requestContext != null) ? _requestContext.HttpContext : new EmptyHttpContext();\r
-                }\r
-                return _httpContext;\r
-            }\r
-            set {\r
-                _httpContext = value;\r
-            }\r
-        }\r
-\r
-        public virtual bool IsChildAction {\r
-            get {\r
-                RouteData routeData = RouteData;\r
-                if (routeData == null) {\r
-                    return false;\r
-                }\r
-                return routeData.DataTokens.ContainsKey(PARENT_ACTION_VIEWCONTEXT);\r
-            }\r
-        }\r
-\r
-        public ViewContext ParentActionViewContext {\r
-            get {\r
-                return RouteData.DataTokens[PARENT_ACTION_VIEWCONTEXT] as ViewContext;\r
-            }\r
-        }\r
-\r
-        public RequestContext RequestContext {\r
-            get {\r
-                if (_requestContext == null) {\r
-                    // still need explicit calls to constructors since the property getters are virtual and might return null\r
-                    HttpContextBase httpContext = HttpContext ?? new EmptyHttpContext();\r
-                    RouteData routeData = RouteData ?? new RouteData();\r
-\r
-                    _requestContext = new RequestContext(httpContext, routeData);\r
-                }\r
-                return _requestContext;\r
-            }\r
-            set {\r
-                _requestContext = value;\r
-            }\r
-        }\r
-\r
-        public virtual RouteData RouteData {\r
-            get {\r
-                if (_routeData == null) {\r
-                    _routeData = (_requestContext != null) ? _requestContext.RouteData : new RouteData();\r
-                }\r
-                return _routeData;\r
-            }\r
-            set {\r
-                _routeData = value;\r
-            }\r
-        }\r
-\r
-        private sealed class EmptyHttpContext : HttpContextBase {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerDescriptor.cs
deleted file mode 100644 (file)
index abb7c23..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    public abstract class ControllerDescriptor : ICustomAttributeProvider {\r
-\r
-        public virtual string ControllerName {\r
-            get {\r
-                string typeName = ControllerType.Name;\r
-                if (typeName.EndsWith("Controller", StringComparison.OrdinalIgnoreCase)) {\r
-                    return typeName.Substring(0, typeName.Length - "Controller".Length);\r
-                }\r
-\r
-                return typeName;\r
-            }\r
-        }\r
-\r
-        public abstract Type ControllerType {\r
-            get;\r
-        }\r
-\r
-        public abstract ActionDescriptor FindAction(ControllerContext controllerContext, string actionName);\r
-\r
-        public abstract ActionDescriptor[] GetCanonicalActions();\r
-\r
-        public virtual object[] GetCustomAttributes(bool inherit) {\r
-            return GetCustomAttributes(typeof(object), inherit);\r
-        }\r
-\r
-        public virtual object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return (object[])Array.CreateInstance(attributeType, 0);\r
-        }\r
-\r
-        public virtual bool IsDefined(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerDescriptorCache.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerDescriptorCache.cs
deleted file mode 100644 (file)
index 43ed25e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    internal sealed class ControllerDescriptorCache : ReaderWriterCache<Type, ControllerDescriptor> {\r
-\r
-        public ControllerDescriptorCache() {\r
-        }\r
-\r
-        public ControllerDescriptor GetDescriptor(Type controllerType, Func<ControllerDescriptor> creator) {\r
-            return FetchOrCreateItem(controllerType, creator);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerTypeCache.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ControllerTypeCache.cs
deleted file mode 100644 (file)
index bea8005..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-\r
-    internal sealed class ControllerTypeCache {\r
-\r
-        private const string _typeCacheName = "MVC-ControllerTypeCache.xml";\r
-\r
-        private Dictionary<string, ILookup<string, Type>> _cache;\r
-        private object _lockObj = new object();\r
-\r
-        internal int Count {\r
-            get {\r
-                int count = 0;\r
-                foreach (var lookup in _cache.Values) {\r
-                    foreach (var grouping in lookup) {\r
-                        count += grouping.Count();\r
-                    }\r
-                }\r
-                return count;\r
-            }\r
-        }\r
-\r
-        public void EnsureInitialized(IBuildManager buildManager) {\r
-            if (_cache == null) {\r
-                lock (_lockObj) {\r
-                    if (_cache == null) {\r
-                        List<Type> controllerTypes = TypeCacheUtil.GetFilteredTypesFromAssemblies(_typeCacheName, IsControllerType, buildManager);\r
-                        var groupedByName = controllerTypes.GroupBy(\r
-                            t => t.Name.Substring(0, t.Name.Length - "Controller".Length),\r
-                            StringComparer.OrdinalIgnoreCase);\r
-                        _cache = groupedByName.ToDictionary(\r
-                            g => g.Key,\r
-                            g => g.ToLookup(t => t.Namespace ?? String.Empty, StringComparer.OrdinalIgnoreCase),\r
-                            StringComparer.OrdinalIgnoreCase);\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        public ICollection<Type> GetControllerTypes(string controllerName, HashSet<string> namespaces) {\r
-            HashSet<Type> matchingTypes = new HashSet<Type>();\r
-\r
-            ILookup<string, Type> nsLookup;\r
-            if (_cache.TryGetValue(controllerName, out nsLookup)) {\r
-                // this friendly name was located in the cache, now cycle through namespaces\r
-                if (namespaces != null) {\r
-                    foreach (string requestedNamespace in namespaces) {\r
-                        foreach (var targetNamespaceGrouping in nsLookup) {\r
-                            if (IsNamespaceMatch(requestedNamespace, targetNamespaceGrouping.Key)) {\r
-                                matchingTypes.UnionWith(targetNamespaceGrouping);\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-                else {\r
-                    // if the namespaces parameter is null, search *every* namespace\r
-                    foreach (var nsGroup in nsLookup) {\r
-                        matchingTypes.UnionWith(nsGroup);\r
-                    }\r
-                }\r
-            }\r
-\r
-            return matchingTypes;\r
-        }\r
-\r
-        internal static bool IsControllerType(Type t) {\r
-            return\r
-                t != null &&\r
-                t.IsPublic &&\r
-                t.Name.EndsWith("Controller", StringComparison.OrdinalIgnoreCase) &&\r
-                !t.IsAbstract &&\r
-                typeof(IController).IsAssignableFrom(t);\r
-        }\r
-\r
-        internal static bool IsNamespaceMatch(string requestedNamespace, string targetNamespace) {\r
-            // degenerate cases\r
-            if (requestedNamespace == null) {\r
-                return false;\r
-            }\r
-            else if (requestedNamespace.Length == 0) {\r
-                return true;\r
-            }\r
-\r
-            if (!requestedNamespace.EndsWith(".*", StringComparison.OrdinalIgnoreCase)) {\r
-                // looking for exact namespace match\r
-                return String.Equals(requestedNamespace, targetNamespace, StringComparison.OrdinalIgnoreCase);\r
-            }\r
-            else {\r
-                // looking for exact or sub-namespace match\r
-                requestedNamespace = requestedNamespace.Substring(0, requestedNamespace.Length - ".*".Length);\r
-                if (!targetNamespace.StartsWith(requestedNamespace, StringComparison.OrdinalIgnoreCase)) {\r
-                    return false;\r
-                }\r
-\r
-                if (requestedNamespace.Length == targetNamespace.Length) {\r
-                    // exact match\r
-                    return true;\r
-                }\r
-                else if (targetNamespace[requestedNamespace.Length] == '.') {\r
-                    // good prefix match, e.g. requestedNamespace = "Foo.Bar" and targetNamespace = "Foo.Bar.Baz"\r
-                    return true;\r
-                }\r
-                else {\r
-                    // bad prefix match, e.g. requestedNamespace = "Foo.Bar" and targetNamespace = "Foo.Bar2"\r
-                    return false;\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/CustomModelBinderAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/CustomModelBinderAttribute.cs
deleted file mode 100644 (file)
index c086781..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    [AttributeUsage(ValidTargets, AllowMultiple = false, Inherited = false)]\r
-    public abstract class CustomModelBinderAttribute : Attribute {\r
-\r
-        internal const AttributeTargets ValidTargets = AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Parameter | AttributeTargets.Struct;\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "This method can potentially perform a non-trivial amount of work.")]\r
-        public abstract IModelBinder GetBinder();\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelMetadata.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelMetadata.cs
deleted file mode 100644 (file)
index aba69fa..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel.DataAnnotations;\r
-    using System.Globalization;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class DataAnnotationsModelMetadata : ModelMetadata {\r
-        private DisplayColumnAttribute _displayColumnAttribute;\r
-\r
-        public DataAnnotationsModelMetadata(DataAnnotationsModelMetadataProvider provider, Type containerType,\r
-                                            Func<object> modelAccessor, Type modelType, string propertyName,\r
-                                            DisplayColumnAttribute displayColumnAttribute)\r
-            : base(provider, containerType, modelAccessor, modelType, propertyName) {\r
-            _displayColumnAttribute = displayColumnAttribute;\r
-        }\r
-\r
-        protected override string GetSimpleDisplayText() {\r
-            if (Model != null) {\r
-                if (_displayColumnAttribute != null && !String.IsNullOrEmpty(_displayColumnAttribute.DisplayColumn)) {\r
-                    PropertyInfo displayColumnProperty = ModelType.GetProperty(_displayColumnAttribute.DisplayColumn, BindingFlags.Public | BindingFlags.IgnoreCase | BindingFlags.Instance);\r
-                    ValidateDisplayColumnAttribute(_displayColumnAttribute, displayColumnProperty, ModelType);\r
-\r
-                    object simpleDisplayTextValue = displayColumnProperty.GetValue(Model, new object[0]);\r
-                    if (simpleDisplayTextValue != null) {\r
-                        return simpleDisplayTextValue.ToString();\r
-                    }\r
-                }\r
-            }\r
-\r
-            return base.GetSimpleDisplayText();\r
-        }\r
-\r
-        private static void ValidateDisplayColumnAttribute(DisplayColumnAttribute displayColumnAttribute, PropertyInfo displayColumnProperty, Type modelType) {\r
-            if (displayColumnProperty == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.DataAnnotationsModelMetadataProvider_UnknownProperty,\r
-                        modelType.FullName, displayColumnAttribute.DisplayColumn));\r
-            }\r
-            if (displayColumnProperty.GetGetMethod() == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.DataAnnotationsModelMetadataProvider_UnreadableProperty,\r
-                        modelType.FullName, displayColumnAttribute.DisplayColumn));\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelMetadataProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelMetadataProvider.cs
deleted file mode 100644 (file)
index 7dffa9b..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.ComponentModel.DataAnnotations;\r
-    using System.Linq;\r
-\r
-    public class DataAnnotationsModelMetadataProvider : AssociatedMetadataProvider {\r
-        protected override ModelMetadata CreateMetadata(IEnumerable<Attribute> attributes, Type containerType, Func<object> modelAccessor, Type modelType, string propertyName) {\r
-            List<Attribute> attributeList = new List<Attribute>(attributes);\r
-            DisplayColumnAttribute displayColumnAttribute = attributeList.OfType<DisplayColumnAttribute>().FirstOrDefault();\r
-            DataAnnotationsModelMetadata result = new DataAnnotationsModelMetadata(this, containerType, modelAccessor, modelType, propertyName, displayColumnAttribute);\r
-\r
-            // Do [HiddenInput] before [UIHint], so you can override the template hint\r
-            HiddenInputAttribute hiddenInputAttribute = attributeList.OfType<HiddenInputAttribute>().FirstOrDefault();\r
-            if (hiddenInputAttribute != null) {\r
-                result.TemplateHint = "HiddenInput";\r
-                result.HideSurroundingHtml = !hiddenInputAttribute.DisplayValue;\r
-            }\r
-\r
-            // We prefer [UIHint("...", PresentationLayer = "MVC")] but will fall back to [UIHint("...")]\r
-            IEnumerable<UIHintAttribute> uiHintAttributes = attributeList.OfType<UIHintAttribute>();\r
-            UIHintAttribute uiHintAttribute = uiHintAttributes.FirstOrDefault(a => String.Equals(a.PresentationLayer, "MVC", StringComparison.OrdinalIgnoreCase))\r
-                                           ?? uiHintAttributes.FirstOrDefault(a => String.IsNullOrEmpty(a.PresentationLayer));\r
-            if (uiHintAttribute != null) {\r
-                result.TemplateHint = uiHintAttribute.UIHint;\r
-            }\r
-\r
-            DataTypeAttribute dataTypeAttribute = attributeList.OfType<DataTypeAttribute>().FirstOrDefault();\r
-            if (dataTypeAttribute != null) {\r
-                result.DataTypeName = dataTypeAttribute.GetDataTypeName();\r
-            }\r
-\r
-            ReadOnlyAttribute readOnlyAttribute = attributeList.OfType<ReadOnlyAttribute>().FirstOrDefault();\r
-            if (readOnlyAttribute != null) {\r
-                result.IsReadOnly = readOnlyAttribute.IsReadOnly;\r
-            }\r
-\r
-            DisplayFormatAttribute displayFormatAttribute = attributeList.OfType<DisplayFormatAttribute>().FirstOrDefault();\r
-            if (displayFormatAttribute == null && dataTypeAttribute != null) {\r
-                displayFormatAttribute = dataTypeAttribute.DisplayFormat;\r
-            }\r
-            if (displayFormatAttribute != null) {\r
-                result.NullDisplayText = displayFormatAttribute.NullDisplayText;\r
-                result.DisplayFormatString = displayFormatAttribute.DataFormatString;\r
-                result.ConvertEmptyStringToNull = displayFormatAttribute.ConvertEmptyStringToNull;\r
-\r
-                if (displayFormatAttribute.ApplyFormatInEditMode) {\r
-                    result.EditFormatString = displayFormatAttribute.DataFormatString;\r
-                }\r
-            }\r
-\r
-            ScaffoldColumnAttribute scaffoldColumnAttribute = attributeList.OfType<ScaffoldColumnAttribute>().FirstOrDefault();\r
-            if (scaffoldColumnAttribute != null) {\r
-                result.ShowForDisplay = result.ShowForEdit = scaffoldColumnAttribute.Scaffold;\r
-            }\r
-\r
-            DisplayNameAttribute displayNameAttribute = attributeList.OfType<DisplayNameAttribute>().FirstOrDefault();\r
-            if (displayNameAttribute != null) {\r
-                result.DisplayName = displayNameAttribute.DisplayName;\r
-            }\r
-\r
-            RequiredAttribute requiredAttribute = attributeList.OfType<RequiredAttribute>().FirstOrDefault();\r
-            if (requiredAttribute != null) {\r
-                result.IsRequired = true;\r
-            }\r
-\r
-            return result;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidator.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidator.cs
deleted file mode 100644 (file)
index 7b83c66..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
-    public class DataAnnotationsModelValidator : ModelValidator {\r
-        public DataAnnotationsModelValidator(ModelMetadata metadata, ControllerContext context, ValidationAttribute attribute)\r
-            : base(metadata, context) {\r
-\r
-            if (attribute == null) {\r
-                throw new ArgumentNullException("attribute");\r
-            }\r
-\r
-            Attribute = attribute;\r
-        }\r
-\r
-        protected internal ValidationAttribute Attribute { get; private set; }\r
-\r
-        protected internal string ErrorMessage {\r
-            get {\r
-                return Attribute.FormatErrorMessage(Metadata.GetDisplayName());\r
-            }\r
-        }\r
-\r
-        public override bool IsRequired {\r
-            get {\r
-                return Attribute is RequiredAttribute;\r
-            }\r
-        }\r
-\r
-        internal static ModelValidator Create(ModelMetadata metadata, ControllerContext context, ValidationAttribute attribute) {\r
-            return new DataAnnotationsModelValidator(metadata, context, attribute);\r
-        }\r
-\r
-        public override IEnumerable<ModelValidationResult> Validate(object container) {\r
-            if (!Attribute.IsValid(Metadata.Model)) {\r
-                yield return new ModelValidationResult {\r
-                    Message = ErrorMessage\r
-                };\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidatorProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidatorProvider.cs
deleted file mode 100644 (file)
index 3e0c97f..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel.DataAnnotations;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Threading;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public delegate ModelValidator DataAnnotationsModelValidationFactory(ModelMetadata metadata, ControllerContext context, ValidationAttribute attribute);\r
-\r
-    public class DataAnnotationsModelValidatorProvider : AssociatedValidatorProvider {\r
-        private static bool _addImplicitRequiredAttributeForValueTypes = true;\r
-        private static ReaderWriterLockSlim _adaptersLock = new ReaderWriterLockSlim();\r
-\r
-        internal static DataAnnotationsModelValidationFactory DefaultAttributeFactory = DataAnnotationsModelValidator.Create;\r
-        internal static Dictionary<Type, DataAnnotationsModelValidationFactory> AttributeFactories = new Dictionary<Type, DataAnnotationsModelValidationFactory>() {\r
-            {\r
-                typeof(RangeAttribute),\r
-                (metadata, context, attribute) => new RangeAttributeAdapter(metadata, context, (RangeAttribute)attribute)\r
-            },\r
-            {\r
-                typeof(RegularExpressionAttribute),\r
-                (metadata, context, attribute) => new RegularExpressionAttributeAdapter(metadata, context, (RegularExpressionAttribute)attribute)\r
-            },\r
-            {\r
-                typeof(RequiredAttribute),\r
-                (metadata, context, attribute) => new RequiredAttributeAdapter(metadata, context, (RequiredAttribute)attribute)\r
-            },\r
-            {\r
-                typeof(StringLengthAttribute),\r
-                (metadata, context, attribute) => new StringLengthAttributeAdapter(metadata, context, (StringLengthAttribute)attribute)\r
-            },\r
-        };\r
-\r
-        public static bool AddImplicitRequiredAttributeForValueTypes {\r
-            get {\r
-                return _addImplicitRequiredAttributeForValueTypes;\r
-            }\r
-            set {\r
-                _addImplicitRequiredAttributeForValueTypes = value;\r
-            }\r
-        }\r
-\r
-        protected override IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context, IEnumerable<Attribute> attributes) {\r
-            _adaptersLock.EnterReadLock();\r
-\r
-            try {\r
-                List<ModelValidator> results = new List<ModelValidator>();\r
-\r
-                if (AddImplicitRequiredAttributeForValueTypes &&\r
-                        metadata.IsRequired &&\r
-                        !attributes.Any(a => a is RequiredAttribute)) {\r
-                    attributes = attributes.Concat(new[] { new RequiredAttribute() });\r
-                }\r
-\r
-                foreach (ValidationAttribute attribute in attributes.OfType<ValidationAttribute>()) {\r
-                    DataAnnotationsModelValidationFactory factory;\r
-                    if (!AttributeFactories.TryGetValue(attribute.GetType(), out factory)) {\r
-                        factory = DefaultAttributeFactory;\r
-                    }\r
-                    results.Add(factory(metadata, context, attribute));\r
-                }\r
-\r
-                return results;\r
-            }\r
-            finally {\r
-                _adaptersLock.ExitReadLock();\r
-            }\r
-        }\r
-\r
-        public static void RegisterAdapter(Type attributeType, Type adapterType) {\r
-            ValidateAttributeType(attributeType);\r
-            ValidateAdapterType(adapterType);\r
-            ConstructorInfo constructor = GetAdapterConstructor(attributeType, adapterType);\r
-\r
-            _adaptersLock.EnterWriteLock();\r
-\r
-            try {\r
-                AttributeFactories[attributeType] = (metadata, context, attribute) => (ModelValidator)constructor.Invoke(new object[] { metadata, context, attribute });\r
-            }\r
-            finally {\r
-                _adaptersLock.ExitWriteLock();\r
-            }\r
-        }\r
-\r
-        public static void RegisterAdapterFactory(Type attributeType, DataAnnotationsModelValidationFactory factory) {\r
-            ValidateAttributeType(attributeType);\r
-            ValidateFactory(factory);\r
-\r
-            _adaptersLock.EnterWriteLock();\r
-\r
-            try {\r
-                AttributeFactories[attributeType] = factory;\r
-            }\r
-            finally {\r
-                _adaptersLock.ExitWriteLock();\r
-            }\r
-        }\r
-\r
-        public static void RegisterDefaultAdapter(Type adapterType) {\r
-            ValidateAdapterType(adapterType);\r
-            ConstructorInfo constructor = GetAdapterConstructor(typeof(ValidationAttribute), adapterType);\r
-\r
-            DefaultAttributeFactory = (metadata, context, attribute) => (ModelValidator)constructor.Invoke(new object[] { metadata, context, attribute });\r
-        }\r
-\r
-        public static void RegisterDefaultAdapterFactory(DataAnnotationsModelValidationFactory factory) {\r
-            ValidateFactory(factory);\r
-\r
-            DefaultAttributeFactory = factory;\r
-        }\r
-\r
-        // Helpers\r
-\r
-        private static ConstructorInfo GetAdapterConstructor(Type attributeType, Type adapterType) {\r
-            ConstructorInfo constructor = adapterType.GetConstructor(new[] { typeof(ModelMetadata), typeof(ControllerContext), attributeType });\r
-            if (constructor == null) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.DataAnnotationsModelValidatorProvider_ConstructorRequirements,\r
-                        adapterType.FullName,\r
-                        typeof(ModelMetadata).FullName,\r
-                        typeof(ControllerContext).FullName,\r
-                        attributeType.FullName\r
-                    ),\r
-                    "adapterType"\r
-                );\r
-            }\r
-\r
-            return constructor;\r
-        }\r
-\r
-        private static void ValidateAdapterType(Type adapterType) {\r
-            if (adapterType == null) {\r
-                throw new ArgumentNullException("adapterType");\r
-            }\r
-            if (!typeof(ModelValidator).IsAssignableFrom(adapterType)) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.Common_TypeMustDriveFromType,\r
-                        adapterType.FullName,\r
-                        typeof(ModelValidator).FullName\r
-                    ),\r
-                    "adapterType"\r
-                );\r
-            }\r
-        }\r
-\r
-        private static void ValidateAttributeType(Type attributeType) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-            if (!typeof(ValidationAttribute).IsAssignableFrom(attributeType)) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.Common_TypeMustDriveFromType,\r
-                        attributeType.FullName,\r
-                        typeof(ValidationAttribute).FullName\r
-                    ),\r
-                    "attributeType");\r
-            }\r
-        }\r
-\r
-        private static void ValidateFactory(DataAnnotationsModelValidationFactory factory) {\r
-            if (factory == null) {\r
-                throw new ArgumentNullException("factory");\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidator`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataAnnotationsModelValidator`1.cs
deleted file mode 100644 (file)
index d8d9812..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
-    public class DataAnnotationsModelValidator<TAttribute> : DataAnnotationsModelValidator where TAttribute : ValidationAttribute {\r
-        public DataAnnotationsModelValidator(ModelMetadata metadata, ControllerContext context, TAttribute attribute)\r
-            : base(metadata, context, attribute) { }\r
-\r
-        protected new TAttribute Attribute {\r
-            get {\r
-                return (TAttribute)base.Attribute;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataErrorInfoModelValidatorProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DataErrorInfoModelValidatorProvider.cs
deleted file mode 100644 (file)
index eb10e5a..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.Linq;\r
-\r
-    public class DataErrorInfoModelValidatorProvider : ModelValidatorProvider {\r
-\r
-        public override IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context) {\r
-            if (metadata == null) {\r
-                throw new ArgumentNullException("metadata");\r
-            }\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            return GetValidatorsImpl(metadata, context);\r
-        }\r
-\r
-        private static IEnumerable<ModelValidator> GetValidatorsImpl(ModelMetadata metadata, ControllerContext context) {\r
-            // If the metadata describes a model that implements IDataErrorInfo, we should call its\r
-            // Error property at the appropriate time.\r
-            if (TypeImplementsIDataErrorInfo(metadata.ModelType)) {\r
-                yield return new DataErrorInfoClassModelValidator(metadata, context);\r
-            }\r
-\r
-            // If the metadata describes a property of a container that implements IDataErrorInfo,\r
-            // we should call its Item indexer at the appropriate time.\r
-            if (TypeImplementsIDataErrorInfo(metadata.ContainerType)) {\r
-                yield return new DataErrorInfoPropertyModelValidator(metadata, context);\r
-            }\r
-        }\r
-\r
-        private static bool TypeImplementsIDataErrorInfo(Type type) {\r
-            return typeof(IDataErrorInfo).IsAssignableFrom(type);\r
-        }\r
-\r
-        internal sealed class DataErrorInfoClassModelValidator : ModelValidator {\r
-            public DataErrorInfoClassModelValidator(ModelMetadata metadata, ControllerContext controllerContext)\r
-                : base(metadata, controllerContext) {\r
-            }\r
-            public override IEnumerable<ModelValidationResult> Validate(object container) {\r
-                IDataErrorInfo castModel = Metadata.Model as IDataErrorInfo;\r
-                if (castModel != null) {\r
-                    string errorMessage = castModel.Error;\r
-                    if (!String.IsNullOrEmpty(errorMessage)) {\r
-                        return new ModelValidationResult[] {\r
-                            new ModelValidationResult() { Message = errorMessage }\r
-                        };\r
-                    }\r
-                }\r
-                return Enumerable.Empty<ModelValidationResult>();\r
-            }\r
-        }\r
-\r
-        internal sealed class DataErrorInfoPropertyModelValidator : ModelValidator {\r
-            public DataErrorInfoPropertyModelValidator(ModelMetadata metadata, ControllerContext controllerContext)\r
-                : base(metadata, controllerContext) {\r
-            }\r
-            public override IEnumerable<ModelValidationResult> Validate(object container) {\r
-                IDataErrorInfo castContainer = container as IDataErrorInfo;\r
-                if (castContainer != null && !String.Equals(Metadata.PropertyName, "error", StringComparison.OrdinalIgnoreCase)) {\r
-                    string errorMessage = castContainer[Metadata.PropertyName];\r
-                    if (!String.IsNullOrEmpty(errorMessage)) {\r
-                        return new ModelValidationResult[] {\r
-                            new ModelValidationResult() { Message = errorMessage }\r
-                        };\r
-                    }\r
-                }\r
-                return Enumerable.Empty<ModelValidationResult>();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultControllerFactory.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultControllerFactory.cs
deleted file mode 100644 (file)
index bb65189..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public class DefaultControllerFactory : IControllerFactory {\r
-\r
-        private IBuildManager _buildManager;\r
-        private ControllerBuilder _controllerBuilder;\r
-        private ControllerTypeCache _instanceControllerTypeCache;\r
-        private static ControllerTypeCache _staticControllerTypeCache = new ControllerTypeCache();\r
-\r
-        internal IBuildManager BuildManager {\r
-            get {\r
-                if (_buildManager == null) {\r
-                    _buildManager = new BuildManagerWrapper();\r
-                }\r
-                return _buildManager;\r
-            }\r
-            set {\r
-                _buildManager = value;\r
-            }\r
-        }\r
-\r
-        internal ControllerBuilder ControllerBuilder {\r
-            get {\r
-                return _controllerBuilder ?? ControllerBuilder.Current;\r
-            }\r
-            set {\r
-                _controllerBuilder = value;\r
-            }\r
-        }\r
-\r
-        internal ControllerTypeCache ControllerTypeCache {\r
-            get {\r
-                return _instanceControllerTypeCache ?? _staticControllerTypeCache;\r
-            }\r
-            set {\r
-                _instanceControllerTypeCache = value;\r
-            }\r
-        }\r
-\r
-        internal static InvalidOperationException CreateAmbiguousControllerException(RouteBase route, string controllerName, ICollection<Type> matchingTypes) {\r
-            // we need to generate an exception containing all the controller types\r
-            StringBuilder typeList = new StringBuilder();\r
-            foreach (Type matchedType in matchingTypes) {\r
-                typeList.AppendLine();\r
-                typeList.Append(matchedType.FullName);\r
-            }\r
-\r
-            string errorText;\r
-            Route castRoute = route as Route;\r
-            if (castRoute != null) {\r
-                errorText = String.Format(CultureInfo.CurrentUICulture, MvcResources.DefaultControllerFactory_ControllerNameAmbiguous_WithRouteUrl,\r
-                    controllerName, castRoute.Url, typeList);\r
-            }\r
-            else {\r
-                errorText = String.Format(CultureInfo.CurrentUICulture, MvcResources.DefaultControllerFactory_ControllerNameAmbiguous_WithoutRouteUrl,\r
-                    controllerName, typeList);\r
-            }\r
-\r
-            return new InvalidOperationException(errorText);\r
-        }\r
-\r
-        public virtual IController CreateController(RequestContext requestContext, string controllerName) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-            if (String.IsNullOrEmpty(controllerName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "controllerName");\r
-            }\r
-            Type controllerType = GetControllerType(requestContext, controllerName);\r
-            IController controller = GetControllerInstance(requestContext, controllerType);\r
-            return controller;\r
-        }\r
-\r
-        protected internal virtual IController GetControllerInstance(RequestContext requestContext, Type controllerType) {\r
-            if (controllerType == null) {\r
-                throw new HttpException(404,\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.DefaultControllerFactory_NoControllerFound,\r
-                        requestContext.HttpContext.Request.Path));\r
-            }\r
-            if (!typeof(IController).IsAssignableFrom(controllerType)) {\r
-                throw new ArgumentException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.DefaultControllerFactory_TypeDoesNotSubclassControllerBase,\r
-                        controllerType),\r
-                    "controllerType");\r
-            }\r
-            try {\r
-                return (IController)Activator.CreateInstance(controllerType);\r
-            }\r
-            catch (Exception ex) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.DefaultControllerFactory_ErrorCreatingController,\r
-                        controllerType),\r
-                    ex);\r
-            }\r
-        }\r
-\r
-        protected internal virtual Type GetControllerType(RequestContext requestContext, string controllerName) {\r
-            if (String.IsNullOrEmpty(controllerName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "controllerName");\r
-            }\r
-\r
-            // first search in the current route's namespace collection\r
-            object routeNamespacesObj;\r
-            Type match;\r
-            if (requestContext != null && requestContext.RouteData.DataTokens.TryGetValue("Namespaces", out routeNamespacesObj)) {\r
-                IEnumerable<string> routeNamespaces = routeNamespacesObj as IEnumerable<string>;\r
-                if (routeNamespaces != null && routeNamespaces.Any()) {\r
-                    HashSet<string> nsHash = new HashSet<string>(routeNamespaces, StringComparer.OrdinalIgnoreCase);\r
-                    match = GetControllerTypeWithinNamespaces(requestContext.RouteData.Route, controllerName, nsHash);\r
-\r
-                    // the UseNamespaceFallback key might not exist, in which case its value is implicitly "true"\r
-                    if (match != null || false.Equals(requestContext.RouteData.DataTokens["UseNamespaceFallback"])) {\r
-                        // got a match or the route requested we stop looking\r
-                        return match;\r
-                    }\r
-                }\r
-            }\r
-\r
-            // then search in the application's default namespace collection\r
-            if (ControllerBuilder.DefaultNamespaces.Count > 0) {\r
-                HashSet<string> nsDefaults = new HashSet<string>(ControllerBuilder.DefaultNamespaces, StringComparer.OrdinalIgnoreCase);\r
-                match = GetControllerTypeWithinNamespaces(requestContext.RouteData.Route, controllerName, nsDefaults);\r
-                if (match != null) {\r
-                    return match;\r
-                }\r
-            }\r
-\r
-            // if all else fails, search every namespace\r
-            return GetControllerTypeWithinNamespaces(requestContext.RouteData.Route, controllerName, null /* namespaces */);\r
-        }\r
-\r
-        private Type GetControllerTypeWithinNamespaces(RouteBase route, string controllerName, HashSet<string> namespaces) {\r
-            // Once the master list of controllers has been created we can quickly index into it\r
-            ControllerTypeCache.EnsureInitialized(BuildManager);\r
-\r
-            ICollection<Type> matchingTypes = ControllerTypeCache.GetControllerTypes(controllerName, namespaces);\r
-            switch (matchingTypes.Count) {\r
-                case 0:\r
-                    // no matching types\r
-                    return null;\r
-\r
-                case 1:\r
-                    // single matching type\r
-                    return matchingTypes.First();\r
-\r
-                default:\r
-                    // multiple matching types\r
-                    throw CreateAmbiguousControllerException(route, controllerName, matchingTypes);\r
-            }\r
-        }\r
-\r
-        public virtual void ReleaseController(IController controller) {\r
-            IDisposable disposable = controller as IDisposable;\r
-            if (disposable != null) {\r
-                disposable.Dispose();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultModelBinder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultModelBinder.cs
deleted file mode 100644 (file)
index 02507e6..0000000
+++ /dev/null
@@ -1,709 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Runtime.CompilerServices;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class DefaultModelBinder : IModelBinder {\r
-\r
-        private ModelBinderDictionary _binders;\r
-        private static string _resourceClassKey;\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "Property is settable so that the dictionary can be provided for unit testing purposes.")]\r
-        protected internal ModelBinderDictionary Binders {\r
-            get {\r
-                if (_binders == null) {\r
-                    _binders = ModelBinders.Binders;\r
-                }\r
-                return _binders;\r
-            }\r
-            set {\r
-                _binders = value;\r
-            }\r
-        }\r
-\r
-        public static string ResourceClassKey {\r
-            get {\r
-                return _resourceClassKey ?? String.Empty;\r
-            }\r
-            set {\r
-                _resourceClassKey = value;\r
-            }\r
-        }\r
-\r
-        private static void AddValueRequiredMessageToModelState(ControllerContext controllerContext, ModelStateDictionary modelState, string modelStateKey, Type elementType, object value) {\r
-            if (value == null && !TypeHelpers.TypeAllowsNullValue(elementType) && modelState.IsValidField(modelStateKey)) {\r
-                modelState.AddModelError(modelStateKey, GetValueRequiredResource(controllerContext));\r
-            }\r
-        }\r
-\r
-        internal void BindComplexElementalModel(ControllerContext controllerContext, ModelBindingContext bindingContext, object model) {\r
-            // need to replace the property filter + model object and create an inner binding context\r
-            ModelBindingContext newBindingContext = CreateComplexElementalModelBindingContext(controllerContext, bindingContext, model);\r
-\r
-            // validation\r
-            if (OnModelUpdating(controllerContext, newBindingContext)) {\r
-                BindProperties(controllerContext, newBindingContext);\r
-                OnModelUpdated(controllerContext, newBindingContext);\r
-            }\r
-        }\r
-\r
-        internal object BindComplexModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            object model = bindingContext.Model;\r
-            Type modelType = bindingContext.ModelType;\r
-\r
-            // if we're being asked to create an array, create a list instead, then coerce to an array after the list is created\r
-            if (model == null && modelType.IsArray) {\r
-                Type elementType = modelType.GetElementType();\r
-                Type listType = typeof(List<>).MakeGenericType(elementType);\r
-                object collection = CreateModel(controllerContext, bindingContext, listType);\r
-\r
-                ModelBindingContext arrayBindingContext = new ModelBindingContext() {\r
-                    ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(() => collection, listType),\r
-                    ModelName = bindingContext.ModelName,\r
-                    ModelState = bindingContext.ModelState,\r
-                    PropertyFilter = bindingContext.PropertyFilter,\r
-                    ValueProvider = bindingContext.ValueProvider\r
-                };\r
-                IList list = (IList)UpdateCollection(controllerContext, arrayBindingContext, elementType);\r
-\r
-                if (list == null) {\r
-                    return null;\r
-                }\r
-\r
-                Array array = Array.CreateInstance(elementType, list.Count);\r
-                list.CopyTo(array, 0);\r
-                return array;\r
-            }\r
-\r
-            if (model == null) {\r
-                model = CreateModel(controllerContext, bindingContext, modelType);\r
-            }\r
-\r
-            // special-case IDictionary<,> and ICollection<>\r
-            Type dictionaryType = TypeHelpers.ExtractGenericInterface(modelType, typeof(IDictionary<,>));\r
-            if (dictionaryType != null) {\r
-                Type[] genericArguments = dictionaryType.GetGenericArguments();\r
-                Type keyType = genericArguments[0];\r
-                Type valueType = genericArguments[1];\r
-\r
-                ModelBindingContext dictionaryBindingContext = new ModelBindingContext() {\r
-                    ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(() => model, modelType),\r
-                    ModelName = bindingContext.ModelName,\r
-                    ModelState = bindingContext.ModelState,\r
-                    PropertyFilter = bindingContext.PropertyFilter,\r
-                    ValueProvider = bindingContext.ValueProvider\r
-                };\r
-                object dictionary = UpdateDictionary(controllerContext, dictionaryBindingContext, keyType, valueType);\r
-                return dictionary;\r
-            }\r
-\r
-            Type enumerableType = TypeHelpers.ExtractGenericInterface(modelType, typeof(IEnumerable<>));\r
-            if (enumerableType != null) {\r
-                Type elementType = enumerableType.GetGenericArguments()[0];\r
-\r
-                Type collectionType = typeof(ICollection<>).MakeGenericType(elementType);\r
-                if (collectionType.IsInstanceOfType(model)) {\r
-                    ModelBindingContext collectionBindingContext = new ModelBindingContext() {\r
-                        ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(() => model, modelType),\r
-                        ModelName = bindingContext.ModelName,\r
-                        ModelState = bindingContext.ModelState,\r
-                        PropertyFilter = bindingContext.PropertyFilter,\r
-                        ValueProvider = bindingContext.ValueProvider\r
-                    };\r
-                    object collection = UpdateCollection(controllerContext, collectionBindingContext, elementType);\r
-                    return collection;\r
-                }\r
-            }\r
-\r
-            // otherwise, just update the properties on the complex type\r
-            BindComplexElementalModel(controllerContext, bindingContext, model);\r
-            return model;\r
-        }\r
-\r
-        public virtual object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            if (bindingContext == null) {\r
-                throw new ArgumentNullException("bindingContext");\r
-            }\r
-\r
-            bool performedFallback = false;\r
-\r
-            if (!String.IsNullOrEmpty(bindingContext.ModelName) && !bindingContext.ValueProvider.ContainsPrefix(bindingContext.ModelName)) {\r
-                // We couldn't find any entry that began with the prefix. If this is the top-level element, fall back\r
-                // to the empty prefix.\r
-                if (bindingContext.FallbackToEmptyPrefix) {\r
-                    bindingContext = new ModelBindingContext() {\r
-                        ModelMetadata = bindingContext.ModelMetadata,\r
-                        ModelState = bindingContext.ModelState,\r
-                        PropertyFilter = bindingContext.PropertyFilter,\r
-                        ValueProvider = bindingContext.ValueProvider\r
-                    };\r
-                    performedFallback = true;\r
-                }\r
-                else {\r
-                    return null;\r
-                }\r
-            }\r
-\r
-            // Simple model = int, string, etc.; determined by calling TypeConverter.CanConvertFrom(typeof(string))\r
-            // or by seeing if a value in the request exactly matches the name of the model we're binding.\r
-            // Complex type = everything else.\r
-            if (!performedFallback) {\r
-                ValueProviderResult vpResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);\r
-                if (vpResult != null) {\r
-                    return BindSimpleModel(controllerContext, bindingContext, vpResult);\r
-                }\r
-            }\r
-            if (!bindingContext.ModelMetadata.IsComplexType) {\r
-                return null;\r
-            }\r
-\r
-            return BindComplexModel(controllerContext, bindingContext);\r
-        }\r
-\r
-        private void BindProperties(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            IEnumerable<PropertyDescriptor> properties = GetFilteredModelProperties(controllerContext, bindingContext);\r
-            foreach (PropertyDescriptor property in properties) {\r
-                BindProperty(controllerContext, bindingContext, property);\r
-            }\r
-        }\r
-\r
-        protected virtual void BindProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor) {\r
-            // need to skip properties that aren't part of the request, else we might hit a StackOverflowException\r
-            string fullPropertyKey = CreateSubPropertyName(bindingContext.ModelName, propertyDescriptor.Name);\r
-            if (!bindingContext.ValueProvider.ContainsPrefix(fullPropertyKey)) {\r
-                return;\r
-            }\r
-\r
-            // call into the property's model binder\r
-            IModelBinder propertyBinder = Binders.GetBinder(propertyDescriptor.PropertyType);\r
-            object originalPropertyValue = propertyDescriptor.GetValue(bindingContext.Model);\r
-            ModelMetadata propertyMetadata = bindingContext.PropertyMetadata[propertyDescriptor.Name];\r
-            propertyMetadata.Model = originalPropertyValue;\r
-            ModelBindingContext innerBindingContext = new ModelBindingContext() {\r
-                ModelMetadata = propertyMetadata,\r
-                ModelName = fullPropertyKey,\r
-                ModelState = bindingContext.ModelState,\r
-                ValueProvider = bindingContext.ValueProvider\r
-            };\r
-            object newPropertyValue = GetPropertyValue(controllerContext, innerBindingContext, propertyDescriptor, propertyBinder);\r
-            propertyMetadata.Model = newPropertyValue;\r
-\r
-            // validation\r
-            ModelState modelState = bindingContext.ModelState[fullPropertyKey];\r
-            if (modelState == null || modelState.Errors.Count == 0) {\r
-                if (OnPropertyValidating(controllerContext, bindingContext, propertyDescriptor, newPropertyValue)) {\r
-                    SetProperty(controllerContext, bindingContext, propertyDescriptor, newPropertyValue);\r
-                    OnPropertyValidated(controllerContext, bindingContext, propertyDescriptor, newPropertyValue);\r
-                }\r
-            }\r
-            else {\r
-                SetProperty(controllerContext, bindingContext, propertyDescriptor, newPropertyValue);\r
-\r
-                // Convert FormatExceptions (type conversion failures) into InvalidValue messages\r
-                foreach (ModelError error in modelState.Errors.Where(err => String.IsNullOrEmpty(err.ErrorMessage) && err.Exception != null).ToList()) {\r
-                    for (Exception exception = error.Exception; exception != null; exception = exception.InnerException) {\r
-                        if (exception is FormatException) {\r
-                            string displayName = propertyMetadata.GetDisplayName();\r
-                            string errorMessageTemplate = GetValueInvalidResource(controllerContext);\r
-                            string errorMessage = String.Format(CultureInfo.CurrentUICulture, errorMessageTemplate, modelState.Value.AttemptedValue, displayName);\r
-                            modelState.Errors.Remove(error);\r
-                            modelState.Errors.Add(errorMessage);\r
-                            break;\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        internal object BindSimpleModel(ControllerContext controllerContext, ModelBindingContext bindingContext, ValueProviderResult valueProviderResult) {\r
-            bindingContext.ModelState.SetModelValue(bindingContext.ModelName, valueProviderResult);\r
-\r
-            // if the value provider returns an instance of the requested data type, we can just short-circuit\r
-            // the evaluation and return that instance\r
-            if (bindingContext.ModelType.IsInstanceOfType(valueProviderResult.RawValue)) {\r
-                return valueProviderResult.RawValue;\r
-            }\r
-\r
-            // since a string is an IEnumerable<char>, we want it to skip the two checks immediately following\r
-            if (bindingContext.ModelType != typeof(string)) {\r
-\r
-                // conversion results in 3 cases, as below\r
-                if (bindingContext.ModelType.IsArray) {\r
-                    // case 1: user asked for an array\r
-                    // ValueProviderResult.ConvertTo() understands array types, so pass in the array type directly\r
-                    object modelArray = ConvertProviderResult(bindingContext.ModelState, bindingContext.ModelName, valueProviderResult, bindingContext.ModelType);\r
-                    return modelArray;\r
-                }\r
-\r
-                Type enumerableType = TypeHelpers.ExtractGenericInterface(bindingContext.ModelType, typeof(IEnumerable<>));\r
-                if (enumerableType != null) {\r
-                    // case 2: user asked for a collection rather than an array\r
-                    // need to call ConvertTo() on the array type, then copy the array to the collection\r
-                    object modelCollection = CreateModel(controllerContext, bindingContext, bindingContext.ModelType);\r
-                    Type elementType = enumerableType.GetGenericArguments()[0];\r
-                    Type arrayType = elementType.MakeArrayType();\r
-                    object modelArray = ConvertProviderResult(bindingContext.ModelState, bindingContext.ModelName, valueProviderResult, arrayType);\r
-\r
-                    Type collectionType = typeof(ICollection<>).MakeGenericType(elementType);\r
-                    if (collectionType.IsInstanceOfType(modelCollection)) {\r
-                        CollectionHelpers.ReplaceCollection(elementType, modelCollection, modelArray);\r
-                    }\r
-                    return modelCollection;\r
-                }\r
-            }\r
-\r
-            // case 3: user asked for an individual element\r
-            object model = ConvertProviderResult(bindingContext.ModelState, bindingContext.ModelName, valueProviderResult, bindingContext.ModelType);\r
-            return model;\r
-        }\r
-\r
-        private static bool CanUpdateReadonlyTypedReference(Type type) {\r
-            // value types aren't strictly immutable, but because they have copy-by-value semantics\r
-            // we can't update a value type that is marked readonly\r
-            if (type.IsValueType) {\r
-                return false;\r
-            }\r
-\r
-            // arrays are mutable, but because we can't change their length we shouldn't try\r
-            // to update an array that is referenced readonly\r
-            if (type.IsArray) {\r
-                return false;\r
-            }\r
-\r
-            // special-case known common immutable types\r
-            if (type == typeof(string)) {\r
-                return false;\r
-            }\r
-\r
-            return true;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Globalization", "CA1304:SpecifyCultureInfo", MessageId = "System.Web.Mvc.ValueProviderResult.ConvertTo(System.Type)",\r
-            Justification = "The target object should make the correct culture determination, not this method.")]\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",\r
-            Justification = "We're recording this exception so that we can act on it later.")]\r
-        private static object ConvertProviderResult(ModelStateDictionary modelState, string modelStateKey, ValueProviderResult valueProviderResult, Type destinationType) {\r
-            try {\r
-                object convertedValue = valueProviderResult.ConvertTo(destinationType);\r
-                return convertedValue;\r
-            }\r
-            catch (Exception ex) {\r
-                modelState.AddModelError(modelStateKey, ex);\r
-                return null;\r
-            }\r
-        }\r
-\r
-        internal ModelBindingContext CreateComplexElementalModelBindingContext(ControllerContext controllerContext, ModelBindingContext bindingContext, object model) {\r
-            BindAttribute bindAttr = (BindAttribute)GetTypeDescriptor(controllerContext, bindingContext).GetAttributes()[typeof(BindAttribute)];\r
-            Predicate<string> newPropertyFilter = (bindAttr != null)\r
-                ? propertyName => bindAttr.IsPropertyAllowed(propertyName) && bindingContext.PropertyFilter(propertyName)\r
-                : bindingContext.PropertyFilter;\r
-\r
-            ModelBindingContext newBindingContext = new ModelBindingContext() {\r
-                ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(() => model, bindingContext.ModelType),\r
-                ModelName = bindingContext.ModelName,\r
-                ModelState = bindingContext.ModelState,\r
-                PropertyFilter = newPropertyFilter,\r
-                ValueProvider = bindingContext.ValueProvider\r
-            };\r
-\r
-            return newBindingContext;\r
-        }\r
-\r
-        protected virtual object CreateModel(ControllerContext controllerContext, ModelBindingContext bindingContext, Type modelType) {\r
-            Type typeToCreate = modelType;\r
-\r
-            // we can understand some collection interfaces, e.g. IList<>, IDictionary<,>\r
-            if (modelType.IsGenericType) {\r
-                Type genericTypeDefinition = modelType.GetGenericTypeDefinition();\r
-                if (genericTypeDefinition == typeof(IDictionary<,>)) {\r
-                    typeToCreate = typeof(Dictionary<,>).MakeGenericType(modelType.GetGenericArguments());\r
-                }\r
-                else if (genericTypeDefinition == typeof(IEnumerable<>) || genericTypeDefinition == typeof(ICollection<>) || genericTypeDefinition == typeof(IList<>)) {\r
-                    typeToCreate = typeof(List<>).MakeGenericType(modelType.GetGenericArguments());\r
-                }\r
-            }\r
-\r
-            // fallback to the type's default constructor\r
-            return Activator.CreateInstance(typeToCreate);\r
-        }\r
-\r
-        protected static string CreateSubIndexName(string prefix, int index) {\r
-            return String.Format(CultureInfo.InvariantCulture, "{0}[{1}]", prefix, index);\r
-        }\r
-\r
-        protected static string CreateSubIndexName(string prefix, string index) {\r
-            return String.Format(CultureInfo.InvariantCulture, "{0}[{1}]", prefix, index);\r
-        }\r
-\r
-        protected internal static string CreateSubPropertyName(string prefix, string propertyName) {\r
-            if (String.IsNullOrEmpty(prefix)) {\r
-                return propertyName;\r
-            }\r
-            else if (String.IsNullOrEmpty(propertyName)) {\r
-                return prefix;\r
-            }\r
-            else {\r
-                return prefix + "." + propertyName;\r
-            }\r
-        }\r
-\r
-        protected IEnumerable<PropertyDescriptor> GetFilteredModelProperties(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            PropertyDescriptorCollection properties = GetModelProperties(controllerContext, bindingContext);\r
-            Predicate<string> propertyFilter = bindingContext.PropertyFilter;\r
-\r
-            return from PropertyDescriptor property in properties\r
-                   where ShouldUpdateProperty(property, propertyFilter)\r
-                   select property;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Globalization", "CA1304:SpecifyCultureInfo", MessageId = "System.Web.Mvc.ValueProviderResult.ConvertTo(System.Type)",\r
-            Justification = "ValueProviderResult already handles culture conversion appropriately.")]\r
-        private static void GetIndexes(ModelBindingContext bindingContext, out bool stopOnIndexNotFound, out IEnumerable<string> indexes) {\r
-            string indexKey = CreateSubPropertyName(bindingContext.ModelName, "index");\r
-            ValueProviderResult vpResult = bindingContext.ValueProvider.GetValue(indexKey);\r
-\r
-            if (vpResult != null) {\r
-                string[] indexesArray = vpResult.ConvertTo(typeof(string[])) as string[];\r
-                if (indexesArray != null) {\r
-                    stopOnIndexNotFound = false;\r
-                    indexes = indexesArray;\r
-                    return;\r
-                }\r
-            }\r
-\r
-            // just use a simple zero-based system\r
-            stopOnIndexNotFound = true;\r
-            indexes = GetZeroBasedIndexes();\r
-        }\r
-\r
-        protected virtual PropertyDescriptorCollection GetModelProperties(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            return GetTypeDescriptor(controllerContext, bindingContext).GetProperties();\r
-        }\r
-\r
-        protected virtual object GetPropertyValue(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor, IModelBinder propertyBinder) {\r
-            object value = propertyBinder.BindModel(controllerContext, bindingContext);\r
-\r
-            if (bindingContext.ModelMetadata.ConvertEmptyStringToNull && Object.Equals(value, String.Empty)) {\r
-                return null;\r
-            }\r
-\r
-            return value;\r
-        }\r
-\r
-        protected virtual ICustomTypeDescriptor GetTypeDescriptor(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            return TypeDescriptorHelper.Get(bindingContext.ModelType);\r
-        }\r
-\r
-        // If the user specified a ResourceClassKey try to load the resource they specified.\r
-        // If the class key is invalid, an exception will be thrown.\r
-        // If the class key is valid but the resource is not found, it returns null, in which\r
-        // case it will fall back to the MVC default error message.\r
-        private static string GetUserResourceString(ControllerContext controllerContext, string resourceName) {\r
-            string result = null;\r
-\r
-            if (!String.IsNullOrEmpty(ResourceClassKey) && (controllerContext != null) && (controllerContext.HttpContext != null)) {\r
-                result = controllerContext.HttpContext.GetGlobalResourceObject(ResourceClassKey, resourceName, CultureInfo.CurrentUICulture) as string;\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private static string GetValueInvalidResource(ControllerContext controllerContext) {\r
-            return GetUserResourceString(controllerContext, "PropertyValueInvalid") ?? MvcResources.DefaultModelBinder_ValueInvalid;\r
-        }\r
-\r
-        private static string GetValueRequiredResource(ControllerContext controllerContext) {\r
-            return GetUserResourceString(controllerContext, "PropertyValueRequired") ?? MvcResources.DefaultModelBinder_ValueRequired;\r
-        }\r
-\r
-        private static IEnumerable<string> GetZeroBasedIndexes() {\r
-            for (int i = 0; ; i++) {\r
-                yield return i.ToString(CultureInfo.InvariantCulture);\r
-            }\r
-        }\r
-\r
-        protected static bool IsModelValid(ModelBindingContext bindingContext) {\r
-            if (bindingContext == null) {\r
-                throw new ArgumentNullException("bindingContext");\r
-            }\r
-            if (String.IsNullOrEmpty(bindingContext.ModelName)) {\r
-                return bindingContext.ModelState.IsValid;\r
-            }\r
-            return bindingContext.ModelState.IsValidField(bindingContext.ModelName);\r
-        }\r
-\r
-        protected virtual void OnModelUpdated(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            Dictionary<string, bool> startedValid = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase);\r
-\r
-            foreach (ModelValidationResult validationResult in ModelValidator.GetModelValidator(bindingContext.ModelMetadata, controllerContext).Validate(null)) {\r
-                string subPropertyName = CreateSubPropertyName(bindingContext.ModelName, validationResult.MemberName);\r
-\r
-                if (!startedValid.ContainsKey(subPropertyName)) {\r
-                    startedValid[subPropertyName] = bindingContext.ModelState.IsValidField(subPropertyName);\r
-                }\r
-\r
-                if (startedValid[subPropertyName]) {\r
-                    bindingContext.ModelState.AddModelError(subPropertyName, validationResult.Message);\r
-                }\r
-            }\r
-        }\r
-\r
-        protected virtual bool OnModelUpdating(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            // default implementation does nothing\r
-            return true;\r
-        }\r
-\r
-        protected virtual void OnPropertyValidated(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor, object value) {\r
-            // default implementation does nothing\r
-        }\r
-\r
-        protected virtual bool OnPropertyValidating(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor, object value) {\r
-            // default implementation does nothing\r
-            return true;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",\r
-            Justification = "We're recording this exception so that we can act on it later.")]\r
-        protected virtual void SetProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor, object value) {\r
-\r
-            ModelMetadata propertyMetadata = bindingContext.PropertyMetadata[propertyDescriptor.Name];\r
-            propertyMetadata.Model = value;\r
-            string modelStateKey = CreateSubPropertyName(bindingContext.ModelName, propertyMetadata.PropertyName);\r
-\r
-            // If the value is null, and the validation system can find a Required validator for\r
-            // us, we'd prefer to run it before we attempt to set the value; otherwise, property\r
-            // setters which throw on null (f.e., Entity Framework properties which are backed by\r
-            // non-nullable strings in the DB) will get their error message in ahead of us.\r
-            //\r
-            // We are effectively using the special validator -- Required -- as a helper to the\r
-            // binding system, which is why this code is here instead of in the Validating/Validated\r
-            // methods, which are really the old-school validation hooks.\r
-            if (value == null && bindingContext.ModelState.IsValidField(modelStateKey)) {\r
-                ModelValidator requiredValidator = ModelValidatorProviders.Providers.GetValidators(propertyMetadata, controllerContext).Where(v => v.IsRequired).FirstOrDefault();\r
-                if (requiredValidator != null) {\r
-                    foreach (ModelValidationResult validationResult in requiredValidator.Validate(bindingContext.Model)) {\r
-                        bindingContext.ModelState.AddModelError(modelStateKey, validationResult.Message);\r
-                    }\r
-                }\r
-            }\r
-\r
-            bool isNullValueOnNonNullableType =\r
-                value == null &&\r
-                !TypeHelpers.TypeAllowsNullValue(propertyDescriptor.PropertyType);\r
-\r
-            // Try to set a value into the property unless we know it will fail (read-only\r
-            // properties and null values with non-nullable types)\r
-            if (!propertyDescriptor.IsReadOnly && !isNullValueOnNonNullableType) {\r
-                try {\r
-                    propertyDescriptor.SetValue(bindingContext.Model, value);\r
-                }\r
-                catch (Exception ex) {\r
-                    // Only add if we're not already invalid\r
-                    if (bindingContext.ModelState.IsValidField(modelStateKey)) {\r
-                        bindingContext.ModelState.AddModelError(modelStateKey, ex);\r
-                    }\r
-                }\r
-            }\r
-\r
-            // Last chance for an error on null values with non-nullable types, we'll use\r
-            // the default "A value is required." message.\r
-            if (isNullValueOnNonNullableType && bindingContext.ModelState.IsValidField(modelStateKey)) {\r
-                bindingContext.ModelState.AddModelError(modelStateKey, GetValueRequiredResource(controllerContext));\r
-            }\r
-        }\r
-\r
-        private static bool ShouldUpdateProperty(PropertyDescriptor property, Predicate<string> propertyFilter) {\r
-            if (property.IsReadOnly && !CanUpdateReadonlyTypedReference(property.PropertyType)) {\r
-                return false;\r
-            }\r
-\r
-            // if this property is rejected by the filter, move on\r
-            if (!propertyFilter(property.Name)) {\r
-                return false;\r
-            }\r
-\r
-            // otherwise, allow\r
-            return true;\r
-        }\r
-\r
-        internal object UpdateCollection(ControllerContext controllerContext, ModelBindingContext bindingContext, Type elementType) {\r
-            bool stopOnIndexNotFound;\r
-            IEnumerable<string> indexes;\r
-            GetIndexes(bindingContext, out stopOnIndexNotFound, out indexes);\r
-            IModelBinder elementBinder = Binders.GetBinder(elementType);\r
-\r
-            // build up a list of items from the request\r
-            List<object> modelList = new List<object>();\r
-            foreach (string currentIndex in indexes) {\r
-                string subIndexKey = CreateSubIndexName(bindingContext.ModelName, currentIndex);\r
-                if (!bindingContext.ValueProvider.ContainsPrefix(subIndexKey)) {\r
-                    if (stopOnIndexNotFound) {\r
-                        // we ran out of elements to pull\r
-                        break;\r
-                    }\r
-                    else {\r
-                        continue;\r
-                    }\r
-                }\r
-\r
-                ModelBindingContext innerContext = new ModelBindingContext() {\r
-                    ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, elementType),\r
-                    ModelName = subIndexKey,\r
-                    ModelState = bindingContext.ModelState,\r
-                    PropertyFilter = bindingContext.PropertyFilter,\r
-                    ValueProvider = bindingContext.ValueProvider\r
-                };\r
-                object thisElement = elementBinder.BindModel(controllerContext, innerContext);\r
-\r
-                // we need to merge model errors up\r
-                AddValueRequiredMessageToModelState(controllerContext, bindingContext.ModelState, subIndexKey, elementType, thisElement);\r
-                modelList.Add(thisElement);\r
-            }\r
-\r
-            // if there weren't any elements at all in the request, just return\r
-            if (modelList.Count == 0) {\r
-                return null;\r
-            }\r
-\r
-            // replace the original collection\r
-            object collection = bindingContext.Model;\r
-            CollectionHelpers.ReplaceCollection(elementType, collection, modelList);\r
-            return collection;\r
-        }\r
-\r
-        internal object UpdateDictionary(ControllerContext controllerContext, ModelBindingContext bindingContext, Type keyType, Type valueType) {\r
-            bool stopOnIndexNotFound;\r
-            IEnumerable<string> indexes;\r
-            GetIndexes(bindingContext, out stopOnIndexNotFound, out indexes);\r
-\r
-            IModelBinder keyBinder = Binders.GetBinder(keyType);\r
-            IModelBinder valueBinder = Binders.GetBinder(valueType);\r
-\r
-            // build up a list of items from the request\r
-            List<KeyValuePair<object, object>> modelList = new List<KeyValuePair<object, object>>();\r
-            foreach (string currentIndex in indexes) {\r
-                string subIndexKey = CreateSubIndexName(bindingContext.ModelName, currentIndex);\r
-                string keyFieldKey = CreateSubPropertyName(subIndexKey, "key");\r
-                string valueFieldKey = CreateSubPropertyName(subIndexKey, "value");\r
-\r
-                if (!(bindingContext.ValueProvider.ContainsPrefix(keyFieldKey) && bindingContext.ValueProvider.ContainsPrefix(valueFieldKey))) {\r
-                    if (stopOnIndexNotFound) {\r
-                        // we ran out of elements to pull\r
-                        break;\r
-                    }\r
-                    else {\r
-                        continue;\r
-                    }\r
-                }\r
-\r
-                // bind the key\r
-                ModelBindingContext keyBindingContext = new ModelBindingContext() {\r
-                    ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, keyType),\r
-                    ModelName = keyFieldKey,\r
-                    ModelState = bindingContext.ModelState,\r
-                    ValueProvider = bindingContext.ValueProvider\r
-                };\r
-                object thisKey = keyBinder.BindModel(controllerContext, keyBindingContext);\r
-\r
-                // we need to merge model errors up\r
-                AddValueRequiredMessageToModelState(controllerContext, bindingContext.ModelState, keyFieldKey, keyType, thisKey);\r
-                if (!keyType.IsInstanceOfType(thisKey)) {\r
-                    // we can't add an invalid key, so just move on\r
-                    continue;\r
-                }\r
-\r
-                // bind the value\r
-                ModelBindingContext valueBindingContext = new ModelBindingContext() {\r
-                    ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, valueType),\r
-                    ModelName = valueFieldKey,\r
-                    ModelState = bindingContext.ModelState,\r
-                    PropertyFilter = bindingContext.PropertyFilter,\r
-                    ValueProvider = bindingContext.ValueProvider\r
-                };\r
-                object thisValue = valueBinder.BindModel(controllerContext, valueBindingContext);\r
-\r
-                // we need to merge model errors up\r
-                AddValueRequiredMessageToModelState(controllerContext, bindingContext.ModelState, valueFieldKey, valueType, thisValue);\r
-                KeyValuePair<object, object> kvp = new KeyValuePair<object, object>(thisKey, thisValue);\r
-                modelList.Add(kvp);\r
-            }\r
-\r
-            // if there weren't any elements at all in the request, just return\r
-            if (modelList.Count == 0) {\r
-                return null;\r
-            }\r
-\r
-            // replace the original collection\r
-            object dictionary = bindingContext.Model;\r
-            CollectionHelpers.ReplaceDictionary(keyType, valueType, dictionary, modelList);\r
-            return dictionary;\r
-        }\r
-\r
-        // This helper type is used because we're working with strongly-typed collections, but we don't know the Ts\r
-        // ahead of time. By using the generic methods below, we can consolidate the collection-specific code in a\r
-        // single helper type rather than having reflection-based calls spread throughout the DefaultModelBinder type.\r
-        // There is a single point of entry to each of the methods below, so they're fairly simple to maintain.\r
-\r
-        private static class CollectionHelpers {\r
-\r
-            private static readonly MethodInfo _replaceCollectionMethod = typeof(CollectionHelpers).GetMethod("ReplaceCollectionImpl", BindingFlags.Static | BindingFlags.NonPublic);\r
-            private static readonly MethodInfo _replaceDictionaryMethod = typeof(CollectionHelpers).GetMethod("ReplaceDictionaryImpl", BindingFlags.Static | BindingFlags.NonPublic);\r
-\r
-            [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]\r
-            public static void ReplaceCollection(Type collectionType, object collection, object newContents) {\r
-                MethodInfo targetMethod = _replaceCollectionMethod.MakeGenericMethod(collectionType);\r
-                targetMethod.Invoke(null, new object[] { collection, newContents });\r
-            }\r
-\r
-            private static void ReplaceCollectionImpl<T>(ICollection<T> collection, IEnumerable newContents) {\r
-                collection.Clear();\r
-                if (newContents != null) {\r
-                    foreach (object item in newContents) {\r
-                        // if the item was not a T, some conversion failed. the error message will be propagated,\r
-                        // but in the meanwhile we need to make a placeholder element in the array.\r
-                        T castItem = (item is T) ? (T)item : default(T);\r
-                        collection.Add(castItem);\r
-                    }\r
-                }\r
-            }\r
-\r
-            [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]\r
-            public static void ReplaceDictionary(Type keyType, Type valueType, object dictionary, object newContents) {\r
-                MethodInfo targetMethod = _replaceDictionaryMethod.MakeGenericMethod(keyType, valueType);\r
-                targetMethod.Invoke(null, new object[] { dictionary, newContents });\r
-            }\r
-\r
-            private static void ReplaceDictionaryImpl<TKey, TValue>(IDictionary<TKey, TValue> dictionary, IEnumerable<KeyValuePair<object, object>> newContents) {\r
-                dictionary.Clear();\r
-                foreach (KeyValuePair<object, object> item in newContents) {\r
-                    // if the item was not a T, some conversion failed. the error message will be propagated,\r
-                    // but in the meanwhile we need to make a placeholder element in the dictionary.\r
-                    TKey castKey = (TKey)item.Key; // this cast shouldn't fail\r
-                    TValue castValue = (item.Value is TValue) ? (TValue)item.Value : default(TValue);\r
-                    dictionary[castKey] = castValue;\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultViewLocationCache.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DefaultViewLocationCache.cs
deleted file mode 100644 (file)
index f0479f4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Caching;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Security", "CA2112:SecuredTypesShouldNotExposeFields",\r
-        Justification = "The Null field does not have access to secure information")]\r
-    public class DefaultViewLocationCache : IViewLocationCache {\r
-        private static readonly TimeSpan _defaultTimeSpan = new TimeSpan(0, 15, 0);\r
-\r
-        public DefaultViewLocationCache()\r
-            : this(_defaultTimeSpan) {\r
-        }\r
-\r
-        public DefaultViewLocationCache(TimeSpan timeSpan) {\r
-            if (timeSpan.Ticks < 0) {\r
-                throw new InvalidOperationException(MvcResources.DefaultViewLocationCache_NegativeTimeSpan);\r
-            }\r
-            TimeSpan = timeSpan;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes",\r
-            Justification = "The reference type is immutable. ")]\r
-        public static readonly IViewLocationCache Null = new NullViewLocationCache();\r
-\r
-        public TimeSpan TimeSpan {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        #region IViewLocationCache Members\r
-        public string GetViewLocation(HttpContextBase httpContext, string key) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-            return (string)httpContext.Cache[key];\r
-        }\r
-\r
-        public void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath) {\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-            httpContext.Cache.Insert(key, virtualPath, null /* dependencies */, Cache.NoAbsoluteExpiration, TimeSpan);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DescriptorUtil.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DescriptorUtil.cs
deleted file mode 100644 (file)
index a19c90f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Linq;\r
-    using System.Threading;\r
-\r
-    internal static class DescriptorUtil {\r
-\r
-        public static TDescriptor[] LazilyFetchOrCreateDescriptors<TReflection, TDescriptor>(ref TDescriptor[] cacheLocation, Func<TReflection[]> initializer, Func<TReflection, TDescriptor> converter) {\r
-            // did we already calculate this once?\r
-            TDescriptor[] existingCache = Interlocked.CompareExchange(ref cacheLocation, null, null);\r
-            if (existingCache != null) {\r
-                return existingCache;\r
-            }\r
-\r
-            TReflection[] memberInfos = initializer();\r
-            TDescriptor[] descriptors = memberInfos.Select(converter).Where(descriptor => descriptor != null).ToArray();\r
-            TDescriptor[] updatedCache = Interlocked.CompareExchange(ref cacheLocation, descriptors, null);\r
-            return updatedCache ?? descriptors;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DictionaryHelpers.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DictionaryHelpers.cs
deleted file mode 100644 (file)
index 7eb761f..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-\r
-    internal static class DictionaryHelpers {\r
-\r
-        public static IEnumerable<KeyValuePair<string, TValue>> FindKeysWithPrefix<TValue>(IDictionary<string, TValue> dictionary, string prefix) {\r
-            TValue exactMatchValue;\r
-            if (dictionary.TryGetValue(prefix, out exactMatchValue)) {\r
-                yield return new KeyValuePair<string, TValue>(prefix, exactMatchValue);\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                string key = entry.Key;\r
-\r
-                if (key.Length <= prefix.Length) {\r
-                    continue;\r
-                }\r
-\r
-                if (!key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) {\r
-                    continue;\r
-                }\r
-\r
-                char charAfterPrefix = key[prefix.Length];\r
-                switch (charAfterPrefix) {\r
-                    case '[':\r
-                    case '.':\r
-                        yield return entry;\r
-                        break;\r
-                }\r
-            }\r
-        }\r
-\r
-        public static bool DoesAnyKeyHavePrefix<TValue>(IDictionary<string, TValue> dictionary, string prefix) {\r
-            return FindKeysWithPrefix(dictionary, prefix).Any();\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DictionaryValueProvider`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DictionaryValueProvider`1.cs
deleted file mode 100644 (file)
index b1e8845..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-\r
-    public class DictionaryValueProvider<TValue> : IValueProvider {\r
-\r
-        private readonly HashSet<string> _prefixes = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-        private readonly Dictionary<string, ValueProviderResult> _values = new Dictionary<string, ValueProviderResult>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public DictionaryValueProvider(IDictionary<string, TValue> dictionary, CultureInfo culture) {\r
-            if (dictionary == null) {\r
-                throw new ArgumentNullException("dictionary");\r
-            }\r
-\r
-            AddValues(dictionary, culture);\r
-        }\r
-\r
-        private void AddValues(IDictionary<string, TValue> dictionary, CultureInfo culture) {\r
-            if (dictionary.Count > 0) {\r
-                _prefixes.Add("");\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                _prefixes.UnionWith(ValueProviderUtil.GetPrefixes(entry.Key));\r
-\r
-                object rawValue = entry.Value;\r
-                string attemptedValue = Convert.ToString(rawValue, culture);\r
-                _values[entry.Key] = new ValueProviderResult(rawValue, attemptedValue, culture);\r
-            }\r
-        }\r
-\r
-        public virtual bool ContainsPrefix(string prefix) {\r
-            if (prefix == null) {\r
-                throw new ArgumentNullException("prefix");\r
-            }\r
-\r
-            return _prefixes.Contains(prefix);\r
-        }\r
-\r
-        public virtual ValueProviderResult GetValue(string key) {\r
-            if (key == null) {\r
-                throw new ArgumentNullException("key");\r
-            }\r
-\r
-            ValueProviderResult vpResult;\r
-            _values.TryGetValue(key, out vpResult);\r
-            return vpResult;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/DynamicTypeGenerator.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/DynamicTypeGenerator.cs
deleted file mode 100644 (file)
index eefc9f8..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Reflection.Emit;\r
-    using System.Security;\r
-\r
-    internal static class DynamicTypeGenerator {\r
-\r
-        private static readonly ModuleBuilder _dynamicModule = CreateDynamicModule();\r
-\r
-        private static ModuleBuilder CreateDynamicModule() {\r
-            // DDB 226615 - since MVC is [SecurityTransparent], the dynamic assembly must declare itself likewise\r
-            CustomAttributeBuilder builder = new CustomAttributeBuilder(\r
-                typeof(SecurityTransparentAttribute).GetConstructor(Type.EmptyTypes), new object[0]);\r
-            CustomAttributeBuilder[] assemblyAttributes = new CustomAttributeBuilder[] { builder };\r
-            AssemblyBuilder dynamicAssembly = AppDomain.CurrentDomain.DefineDynamicAssembly(\r
-                new AssemblyName("System.Web.Mvc.{Dynamic}"), AssemblyBuilderAccess.Run, assemblyAttributes);\r
-            ModuleBuilder dynamicModule = dynamicAssembly.DefineDynamicModule("System.Web.Mvc.{Dynamic}.dll");\r
-            return dynamicModule;\r
-        }\r
-\r
-        // Creates a new dynamic type that is a subclassed type of baseType and also implements methods of the specified\r
-        // interfaces. The base type must already have method signatures that implicitly implement the given\r
-        // interfaces. The signatures of all public (e.g. not private / internal) constructors from the baseType\r
-        // will be duplicated for the subclassed type and the new constructors made public.\r
-        public static Type GenerateType(string dynamicTypeName, Type baseType, IEnumerable<Type> interfaceTypes) {\r
-            TypeBuilder newType = _dynamicModule.DefineType(\r
-                "System.Web.Mvc.{Dynamic}." + dynamicTypeName,\r
-                TypeAttributes.AutoLayout | TypeAttributes.Public | TypeAttributes.Class,\r
-                baseType);\r
-\r
-            foreach (Type interfaceType in interfaceTypes) {\r
-                newType.AddInterfaceImplementation(interfaceType);\r
-                foreach (MethodInfo interfaceMethod in interfaceType.GetMethods()) {\r
-                    ImplementInterfaceMethod(newType, interfaceMethod);\r
-                }\r
-            }\r
-\r
-            // generate new constructors for each accessible base constructor\r
-            foreach (ConstructorInfo ctor in baseType.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) {\r
-                switch (ctor.Attributes & MethodAttributes.MemberAccessMask) {\r
-                    case MethodAttributes.Family:\r
-                    case MethodAttributes.Public:\r
-                    case MethodAttributes.FamORAssem:\r
-                        ImplementConstructor(newType, ctor);\r
-                        break;\r
-                }\r
-            }\r
-\r
-            Type bakedType = newType.CreateType();\r
-            return bakedType;\r
-        }\r
-\r
-        // generates this constructor:\r
-        // public NewType(param0, param1, ...) : base(param0, param1, ...) { }\r
-        private static void ImplementConstructor(TypeBuilder newType, ConstructorInfo baseCtor) {\r
-            ParameterInfo[] parameters = baseCtor.GetParameters();\r
-            Type[] parameterTypes = (from p in parameters select p.ParameterType).ToArray();\r
-\r
-            ConstructorBuilder newCtor = newType.DefineConstructor(\r
-                (baseCtor.Attributes & ~MethodAttributes.MemberAccessMask) | MethodAttributes.Public /* force public constructor */,\r
-                baseCtor.CallingConvention, parameterTypes);\r
-\r
-            // parameter 0 is 'this', so we start at index 1\r
-            for (int i = 0; i < parameters.Length; i++) {\r
-                newCtor.DefineParameter(i + 1, parameters[i].Attributes, parameters[i].Name);\r
-            }\r
-\r
-            // load all arguments (including 'this') in proper order, then call and return\r
-            ILGenerator ilGen = newCtor.GetILGenerator();\r
-            for (int i = 0; i <= parameterTypes.Length; i++) {\r
-                ilGen.Emit(OpCodes.Ldarg_S, (byte)i);\r
-            }\r
-            ilGen.Emit(OpCodes.Call, baseCtor);\r
-            ilGen.Emit(OpCodes.Ret);\r
-        }\r
-\r
-        // generates this explicit interface method:\r
-        // public new Interface.Method(param0, param1, ...) {\r
-        //   return base.Method(param0, param1, ...);\r
-        // }\r
-        private static void ImplementInterfaceMethod(TypeBuilder newType, MethodInfo interfaceMethod) {\r
-            ParameterInfo[] parameters = interfaceMethod.GetParameters();\r
-            Type[] parameterTypes = (from p in parameters select p.ParameterType).ToArray();\r
-\r
-            // based on http://msdn.microsoft.com/en-us/library/system.reflection.emit.typebuilder.definemethodoverride.aspx\r
-            MethodBuilder newMethod = newType.DefineMethod(interfaceMethod.DeclaringType.Name + "." + interfaceMethod.Name,\r
-                MethodAttributes.Private | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual | MethodAttributes.Final,\r
-                interfaceMethod.ReturnType, parameterTypes);\r
-\r
-            MethodInfo baseMethod = newType.BaseType.GetMethod(interfaceMethod.Name, parameterTypes);\r
-\r
-            // parameter 0 is 'this', so we start at index 1\r
-            for (int i = 0; i < parameters.Length; i++) {\r
-                newMethod.DefineParameter(i + 1, parameters[i].Attributes, parameters[i].Name);\r
-            }\r
-\r
-            // load all arguments (including 'this') in proper order, then call and return\r
-            ILGenerator ilGen = newMethod.GetILGenerator();\r
-            for (int i = 0; i <= parameterTypes.Length; i++) {\r
-                ilGen.Emit(OpCodes.Ldarg_S, (byte)i);\r
-            }\r
-            ilGen.Emit(OpCodes.Call, baseMethod);\r
-            ilGen.Emit(OpCodes.Ret);\r
-\r
-            // finally, hook the new method up to the interface mapping\r
-            newType.DefineMethodOverride(newMethod, interfaceMethod);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyModelMetadataProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyModelMetadataProvider.cs
deleted file mode 100644 (file)
index 984924b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Reflection;\r
-\r
-    public class EmptyModelMetadataProvider : AssociatedMetadataProvider {\r
-        protected override ModelMetadata CreateMetadata(IEnumerable<Attribute> attributes, Type containerType, Func<object> modelAccessor, Type modelType, string propertyName) {\r
-            return new ModelMetadata(this, containerType, modelAccessor, modelType, propertyName);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyModelValidatorProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyModelValidatorProvider.cs
deleted file mode 100644 (file)
index 63fb1a2..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-\r
-    public class EmptyModelValidatorProvider : ModelValidatorProvider {\r
-        public override IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context) {\r
-            return Enumerable.Empty<ModelValidator>();\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/EmptyResult.cs
deleted file mode 100644 (file)
index 3fef8ee..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    // represents a result that doesn't do anything, like a controller action returning null\r
-    public class EmptyResult : ActionResult {\r
-\r
-        private static readonly EmptyResult _singleton = new EmptyResult();\r
-\r
-        internal static EmptyResult Instance {\r
-            get {\r
-                return _singleton;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Error.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Error.cs
deleted file mode 100644 (file)
index 26e86f8..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Async;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    internal static class Error {\r
-\r
-        public static InvalidOperationException AsyncActionMethodSelector_CouldNotFindMethod(string methodName, Type controllerType) {\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.AsyncActionMethodSelector_CouldNotFindMethod,\r
-                methodName, controllerType);\r
-            return new InvalidOperationException(message);\r
-        }\r
-\r
-        public static InvalidOperationException AsyncCommon_AsyncResultAlreadyConsumed() {\r
-            return new InvalidOperationException(MvcResources.AsyncCommon_AsyncResultAlreadyConsumed);\r
-        }\r
-\r
-        public static InvalidOperationException AsyncCommon_ControllerMustImplementIAsyncManagerContainer(Type actualControllerType) {\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.AsyncCommon_ControllerMustImplementIAsyncManagerContainer,\r
-                actualControllerType);\r
-            return new InvalidOperationException(message);\r
-        }\r
-\r
-        public static ArgumentException AsyncCommon_InvalidAsyncResult(string parameterName) {\r
-            return new ArgumentException(MvcResources.AsyncCommon_InvalidAsyncResult, parameterName);\r
-        }\r
-\r
-        public static ArgumentOutOfRangeException AsyncCommon_InvalidTimeout(string parameterName) {\r
-            return new ArgumentOutOfRangeException(parameterName, MvcResources.AsyncCommon_InvalidTimeout);\r
-        }\r
-\r
-        public static InvalidOperationException ReflectedAsyncActionDescriptor_CannotExecuteSynchronously(string actionName) {\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedAsyncActionDescriptor_CannotExecuteSynchronously,\r
-                actionName);\r
-            return new InvalidOperationException(message);\r
-        }\r
-\r
-        public static InvalidOperationException ChildActionOnlyAttribute_MustBeInChildRequest(ActionDescriptor actionDescriptor) {\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ChildActionOnlyAttribute_MustBeInChildRequest,\r
-                actionDescriptor.ActionName);\r
-            return new InvalidOperationException(message);\r
-        }\r
-\r
-        public static ArgumentException ParameterCannotBeNullOrEmpty(string parameterName) {\r
-            return new ArgumentException(MvcResources.Common_NullOrEmpty, parameterName);\r
-        }\r
-\r
-        public static InvalidOperationException PropertyCannotBeNullOrEmpty(string propertyName) {\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.Common_PropertyCannotBeNullOrEmpty,\r
-                propertyName);\r
-            return new InvalidOperationException(message);\r
-        }\r
-\r
-        public static SynchronousOperationException SynchronizationContextUtil_ExceptionThrown(Exception innerException) {\r
-            return new SynchronousOperationException(MvcResources.SynchronizationContextUtil_ExceptionThrown, innerException);\r
-        }\r
-\r
-        public static InvalidOperationException ViewDataDictionary_WrongTModelType(Type valueType, Type modelType) {\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ViewDataDictionary_WrongTModelType,\r
-                valueType, modelType);\r
-            return new InvalidOperationException(message);\r
-        }\r
-\r
-        public static InvalidOperationException ViewDataDictionary_ModelCannotBeNull(Type modelType) {\r
-            string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ViewDataDictionary_ModelCannotBeNull,\r
-                modelType);\r
-            return new InvalidOperationException(message);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExceptionContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExceptionContext.cs
deleted file mode 100644 (file)
index 937dd23..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ExceptionContext : ControllerContext {\r
-\r
-        private ActionResult _result;\r
-\r
-        // parameterless constructor used for mocking\r
-        public ExceptionContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ExceptionContext(ControllerContext controllerContext, Exception exception)\r
-            : base(controllerContext) {\r
-            if (exception == null) {\r
-                throw new ArgumentNullException("exception");\r
-            }\r
-\r
-            Exception = exception;\r
-        }\r
-\r
-        public virtual Exception Exception {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public bool ExceptionHandled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ActionResult Result {\r
-            get {\r
-                return _result ?? EmptyResult.Instance;\r
-            }\r
-            set {\r
-                _result = value;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionHelper.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionHelper.cs
deleted file mode 100644 (file)
index e72d94d..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public static class ExpressionHelper {\r
-        public static string GetExpressionText(string expression) {\r
-            return\r
-                String.Equals(expression, "model", StringComparison.OrdinalIgnoreCase)\r
-                    ? String.Empty    // If it's exactly "model", then give them an empty string, to replicate the lambda behavior\r
-                    : expression;\r
-        }\r
-\r
-        public static string GetExpressionText(LambdaExpression expression) {\r
-            // Crack the expression string for property/field accessors to create its name\r
-            Stack<string> nameParts = new Stack<string>();\r
-            Expression part = expression.Body;\r
-\r
-            while (part != null) {\r
-                if (part.NodeType == ExpressionType.Call) {\r
-                    MethodCallExpression methodExpression = (MethodCallExpression)part;\r
-\r
-                    if (!IsSingleArgumentIndexer(methodExpression)) {\r
-                        break;\r
-                    }\r
-\r
-                    nameParts.Push(\r
-                        GetIndexerInvocation(\r
-                            methodExpression.Arguments.Single(),\r
-                            expression.Parameters.ToArray()\r
-                        )\r
-                    );\r
-\r
-                    part = methodExpression.Object;\r
-                }\r
-                else if (part.NodeType == ExpressionType.ArrayIndex) {\r
-                    BinaryExpression binaryExpression = (BinaryExpression)part;\r
-\r
-                    nameParts.Push(\r
-                        GetIndexerInvocation(\r
-                            binaryExpression.Right,\r
-                            expression.Parameters.ToArray()\r
-                        )\r
-                    );\r
-\r
-                    part = binaryExpression.Left;\r
-                }\r
-                else if (part.NodeType == ExpressionType.MemberAccess) {\r
-                    MemberExpression memberExpressionPart = (MemberExpression)part;\r
-                    nameParts.Push("." + memberExpressionPart.Member.Name);\r
-                    part = memberExpressionPart.Expression;\r
-                }\r
-                else {\r
-                    break;\r
-                }\r
-            }\r
-\r
-            // If it starts with "model", then strip that away\r
-            if (nameParts.Count > 0 && String.Equals(nameParts.Peek(), ".model", StringComparison.OrdinalIgnoreCase)) {\r
-                nameParts.Pop();\r
-            }\r
-\r
-            if (nameParts.Count > 0) {\r
-                return nameParts.Aggregate((left, right) => left + right).TrimStart('.');\r
-            }\r
-\r
-            return String.Empty;\r
-        }\r
-\r
-        private static string GetIndexerInvocation(Expression expression, ParameterExpression[] parameters) {\r
-            Expression converted = Expression.Convert(expression, typeof(object));\r
-            ParameterExpression fakeParameter = Expression.Parameter(typeof(object), null);\r
-            Expression<Func<object, object>> lambda = Expression.Lambda<Func<object, object>>(converted, fakeParameter);\r
-            Func<object, object> func;\r
-\r
-            try {\r
-                func = ExpressionUtil.CachedExpressionCompiler.Process(lambda);\r
-            }\r
-            catch (InvalidOperationException ex) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ExpressionHelper_InvalidIndexerExpression,\r
-                        expression,\r
-                        parameters[0].Name\r
-                    ),\r
-                    ex\r
-                );\r
-            }\r
-\r
-            return "[" + Convert.ToString(func(null), CultureInfo.InvariantCulture) + "]";\r
-        }\r
-\r
-        internal static bool IsSingleArgumentIndexer(Expression expression) {\r
-            MethodCallExpression methodExpression = expression as MethodCallExpression;\r
-            if (methodExpression == null || methodExpression.Arguments.Count != 1) {\r
-                return false;\r
-            }\r
-\r
-            return methodExpression.Method\r
-                                   .DeclaringType\r
-                                   .GetDefaultMembers()\r
-                                   .OfType<PropertyInfo>()\r
-                                   .Any(p => p.GetGetMethod() == methodExpression.Method);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/.gitattributes b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/.gitattributes
deleted file mode 100644 (file)
index 8da885c..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/BinaryExpressionFingerprint.cs -crlf
-/CachedExpressionCompiler.cs -crlf
-/CompiledExpressionDelegate`2.cs -crlf
-/ConditionalExpressionFingerprint.cs -crlf
-/ConstantExpressionFingerprint.cs -crlf
-/ExpressionFingerprint.cs -crlf
-/ExpressionParser.cs -crlf
-/FastTrack`2.cs -crlf
-/HashCodeCombiner.cs -crlf
-/MemberExpressionFingerprint.cs -crlf
-/MethodCallExpressionFingerprint.cs -crlf
-/ParameterExpressionFingerprint.cs -crlf
-/ParserContext.cs -crlf
-/UnaryExpressionFingerprint.cs -crlf
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/BinaryExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/BinaryExpressionFingerprint.cs
deleted file mode 100644 (file)
index 90e1fd4..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma warning disable 659 // overrides AddToHashCodeCombiner instead\r
-\r
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-\r
-    // BinaryExpression fingerprint class\r
-    // Useful for things like array[index]\r
-    //\r
-    // This particular fingerprint doesn't support the BinaryExpression.Conversion property,\r
-    // which is used in some coalescing operations.\r
-    [SuppressMessage("Microsoft.Usage", "CA2218:OverrideGetHashCodeOnOverridingEquals",\r
-        Justification = "Overrides AddToHashCodeCombiner() instead.")]\r
-    internal sealed class BinaryExpressionFingerprint : ExpressionFingerprint {\r
-\r
-        private BinaryExpressionFingerprint(BinaryExpression expression)\r
-            : base(expression) {\r
-            // don't care about UnaryExpression.IsLifted since it's not necessary to uniquely describe the expression,\r
-            // but IsLiftedToNull *is* required\r
-\r
-            IsLiftedToNull = expression.IsLiftedToNull;\r
-            Method = expression.Method;\r
-        }\r
-\r
-        public bool IsLiftedToNull {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ExpressionFingerprint Left {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public MethodInfo Method {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ExpressionFingerprint Right {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal override void AddToHashCodeCombiner(HashCodeCombiner combiner) {\r
-            base.AddToHashCodeCombiner(combiner);\r
-\r
-            combiner.AddInt32(IsLiftedToNull.GetHashCode());\r
-            combiner.AddFingerprint(Left);\r
-            combiner.AddObject(Method);\r
-            combiner.AddFingerprint(Right);\r
-        }\r
-\r
-        public static BinaryExpressionFingerprint Create(BinaryExpression expression, ParserContext parserContext) {\r
-            if (expression.Conversion != null) {\r
-                // we don't support the Conversion property\r
-                return null;\r
-            }\r
-\r
-            // if any fingerprinting fails, bail out\r
-            ExpressionFingerprint left = Create(expression.Left, parserContext);\r
-            if (left == null && expression.Left != null) {\r
-                return null;\r
-            }\r
-\r
-            ExpressionFingerprint right = Create(expression.Right, parserContext);\r
-            if (right == null && expression.Right != null) {\r
-                return null;\r
-            }\r
-\r
-            return new BinaryExpressionFingerprint(expression) {\r
-                Left = left,\r
-                Right = right\r
-            };\r
-        }\r
-\r
-        public override bool Equals(object obj) {\r
-            BinaryExpressionFingerprint other = obj as BinaryExpressionFingerprint;\r
-            if (other == null) {\r
-                return false;\r
-            }\r
-\r
-            return (this.IsLiftedToNull == other.IsLiftedToNull\r
-                && Object.Equals(this.Left, other.Left)\r
-                && this.Method == other.Method\r
-                && Object.Equals(this.Right, other.Right)\r
-                && base.Equals(other));\r
-        }\r
-\r
-        public override Expression ToExpression(ParserContext parserContext) {\r
-            Expression leftExpr = ToExpression(Left, parserContext);\r
-            Expression rightExpr = ToExpression(Right, parserContext);\r
-            return Expression.MakeBinary(NodeType, leftExpr, rightExpr, IsLiftedToNull, Method);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/CachedExpressionCompiler.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/CachedExpressionCompiler.cs
deleted file mode 100644 (file)
index 29078b6..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Linq.Expressions;\r
-\r
-    internal static class CachedExpressionCompiler {\r
-\r
-        // This is the entry point to the cached expression tree compiler. The processor will perform a series of checks\r
-        // and optimizations in order to return a fully-compiled func as quickly as possible to the caller. If the\r
-        // input expression is particularly obscure, the system will fall back to a slow but correct compilation step.\r
-        public static Func<TModel, TValue> Process<TModel, TValue>(Expression<Func<TModel, TValue>> lambdaExpression) {\r
-            return Processor<TModel, TValue>.GetFunc(lambdaExpression);\r
-        }\r
-\r
-        private static class Processor<TModel, TValue> {\r
-\r
-            private static readonly Cache _cache = new Cache();\r
-\r
-            public static Func<TModel, TValue> GetFunc(Expression<Func<TModel, TValue>> lambdaExpression) {\r
-                // look for common patterns that don't need to be fingerprinted\r
-                Func<TModel, TValue> func = GetFuncFastTrack(lambdaExpression);\r
-                if (func != null) {\r
-                    return func;\r
-                }\r
-\r
-                // not a common pattern, so try fingerprinting (slower, but cached)\r
-                func = GetFuncFingerprinted(lambdaExpression);\r
-                if (func != null) {\r
-                    return func;\r
-                }\r
-\r
-                // pattern not recognized by fingerprinting routine, so compile directly (slowest)\r
-                return GetFuncSlow(lambdaExpression);\r
-            }\r
-\r
-            private static Func<TModel, TValue> GetFuncFastTrack(Expression<Func<TModel, TValue>> lambdaExpression) {\r
-                ParameterExpression modelParameter = lambdaExpression.Parameters[0];\r
-                Expression body = lambdaExpression.Body;\r
-\r
-                return FastTrack<TModel, TValue>.GetFunc(modelParameter, body);\r
-            }\r
-\r
-            private static Func<TModel, TValue> GetFuncFingerprinted(Expression<Func<TModel, TValue>> lambdaExpression) {\r
-                ParserContext context = ExpressionParser.Parse(lambdaExpression);\r
-                if (context.Fingerprint == null) {\r
-                    // fingerprinting failed\r
-                    return null;\r
-                }\r
-\r
-                object[] hoistedValues = context.HoistedValues.ToArray();\r
-                var del = _cache.GetDelegate(context);\r
-                return model => del(model, hoistedValues);\r
-            }\r
-\r
-            private static Func<TModel, TValue> GetFuncSlow(Expression<Func<TModel, TValue>> lambdaExpression) {\r
-                Func<TModel, TValue> del = lambdaExpression.Compile();\r
-                return del;\r
-            }\r
-\r
-            private sealed class Cache : ReaderWriterCache<ExpressionFingerprint, CompiledExpressionDelegate<TModel, TValue>> {\r
-                private static CompiledExpressionDelegate<TModel, TValue> CreateDelegate(ParserContext context) {\r
-                    var bodyExpr = context.Fingerprint.ToExpression(context);\r
-                    var lambdaExpr = Expression.Lambda<CompiledExpressionDelegate<TModel, TValue>>(bodyExpr, context.ModelParameter, ParserContext.HoistedValuesParameter);\r
-                    var del = lambdaExpr.Compile();\r
-                    return del;\r
-                }\r
-                public CompiledExpressionDelegate<TModel, TValue> GetDelegate(ParserContext context) {\r
-                    return FetchOrCreateItem(context.Fingerprint, () => CreateDelegate(context));\r
-                }\r
-            }\r
-\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/CompiledExpressionDelegate`2.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/CompiledExpressionDelegate`2.cs
deleted file mode 100644 (file)
index dc95a90..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-\r
-    internal delegate TValue CompiledExpressionDelegate<TModel, TValue>(TModel model, object[] hoistedValues);\r
-\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ConditionalExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ConditionalExpressionFingerprint.cs
deleted file mode 100644 (file)
index 80e29f0..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma warning disable 659 // overrides AddToHashCodeCombiner instead\r
-\r
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq.Expressions;\r
-\r
-    // ConditionalExpression fingerprint class\r
-    // Expression of form (test) ? ifTrue : ifFalse\r
-    [SuppressMessage("Microsoft.Usage", "CA2218:OverrideGetHashCodeOnOverridingEquals",\r
-        Justification = "Overrides AddToHashCodeCombiner() instead.")]\r
-    internal sealed class ConditionalExpressionFingerprint : ExpressionFingerprint {\r
-\r
-        private ConditionalExpressionFingerprint(ConditionalExpression expression)\r
-            : base(expression) {\r
-        }\r
-\r
-        public ExpressionFingerprint Test {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ExpressionFingerprint IfTrue {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ExpressionFingerprint IfFalse {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal override void AddToHashCodeCombiner(HashCodeCombiner combiner) {\r
-            base.AddToHashCodeCombiner(combiner);\r
-\r
-            combiner.AddFingerprint(Test);\r
-            combiner.AddFingerprint(IfTrue);\r
-            combiner.AddFingerprint(IfFalse);\r
-        }\r
-\r
-        public static ConditionalExpressionFingerprint Create(ConditionalExpression expression, ParserContext parserContext) {\r
-            // if any fingerprinting fails, bail out\r
-            ExpressionFingerprint test = Create(expression.Test, parserContext);\r
-            if (test == null && expression.Test != null) {\r
-                return null;\r
-            }\r
-\r
-            ExpressionFingerprint ifTrue = Create(expression.IfTrue, parserContext);\r
-            if (ifTrue == null && expression.IfTrue != null) {\r
-                return null;\r
-            }\r
-\r
-            ExpressionFingerprint ifFalse = Create(expression.IfFalse, parserContext);\r
-            if (ifFalse == null && expression.IfFalse != null) {\r
-                return null;\r
-            }\r
-\r
-            return new ConditionalExpressionFingerprint(expression) {\r
-                Test = test,\r
-                IfTrue = ifTrue,\r
-                IfFalse = ifFalse\r
-            };\r
-        }\r
-\r
-        public override bool Equals(object obj) {\r
-            ConditionalExpressionFingerprint other = obj as ConditionalExpressionFingerprint;\r
-            if (other == null) {\r
-                return false;\r
-            }\r
-\r
-            return (Object.Equals(this.Test, other.Test)\r
-                && Object.Equals(this.IfTrue, other.IfTrue)\r
-                && Object.Equals(this.IfFalse, other.IfFalse)\r
-                && base.Equals(other));\r
-        }\r
-\r
-        public override Expression ToExpression(ParserContext parserContext) {\r
-            Expression testExpr = ToExpression(Test, parserContext);\r
-            Expression ifTrueExpr = ToExpression(IfTrue, parserContext);\r
-            Expression ifFalseExpr = ToExpression(IfFalse, parserContext);\r
-            return Expression.Condition(testExpr, ifTrueExpr, ifFalseExpr);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ConstantExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ConstantExpressionFingerprint.cs
deleted file mode 100644 (file)
index 96e08bc..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma warning disable 659 // overrides AddToHashCodeCombiner instead\r
-\r
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq.Expressions;\r
-\r
-    // ConstantExpression fingerprint class\r
-    //\r
-    // A ConstantExpression might represent a captured local variable, so we can't compile\r
-    // the value directly into the cached function. Instead, a placeholder is generated\r
-    // and the value is hoisted into a local variables array. This placeholder can then\r
-    // be compiled and cached, and the array lookup happens at runtime.\r
-    [SuppressMessage("Microsoft.Usage", "CA2218:OverrideGetHashCodeOnOverridingEquals",\r
-        Justification = "Overrides AddToHashCodeCombiner() instead.")]\r
-    internal sealed class ConstantExpressionFingerprint : ExpressionFingerprint {\r
-\r
-        private ConstantExpressionFingerprint(ConstantExpression expression)\r
-            : base(expression) {\r
-        }\r
-\r
-        public int HoistedLocalsIndex {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal override void AddToHashCodeCombiner(HashCodeCombiner combiner) {\r
-            base.AddToHashCodeCombiner(combiner);\r
-\r
-            combiner.AddInt32(HoistedLocalsIndex);\r
-        }\r
-\r
-        public static ConstantExpressionFingerprint Create(ConstantExpression expression, ParserContext parserContext) {\r
-            ConstantExpressionFingerprint fingerprint = new ConstantExpressionFingerprint(expression) {\r
-                HoistedLocalsIndex = parserContext.HoistedValues.Count\r
-            };\r
-\r
-            parserContext.HoistedValues.Add(expression.Value);\r
-            return fingerprint;\r
-        }\r
-\r
-        public override bool Equals(object obj) {\r
-            ConstantExpressionFingerprint other = obj as ConstantExpressionFingerprint;\r
-            if (other == null) {\r
-                return false;\r
-            }\r
-\r
-            return (this.HoistedLocalsIndex == other.HoistedLocalsIndex\r
-                && base.Equals(other));\r
-        }\r
-\r
-        public override Expression ToExpression(ParserContext parserContext) {\r
-            // (Type) HoistedValues[HoistedLocalsIndex]\r
-            BinaryExpression arrayIndex = Expression.ArrayIndex(ParserContext.HoistedValuesParameter, Expression.Constant(HoistedLocalsIndex));\r
-            UnaryExpression castExpr = Expression.Convert(arrayIndex, Type);\r
-            return castExpr;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ExpressionFingerprint.cs
deleted file mode 100644 (file)
index c942d9b..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-\r
-    // Expression fingerprint class\r
-    // Contains information used for generalizing, comparing, and recreating Expression instances\r
-    //\r
-    // Since Expression objects are immutable and are recreated for every invocation of an expression\r
-    // helper method, they can't be compared directly. Fingerprinting Expression objects allows\r
-    // information about them to be abstracted away, and the fingerprints can be directly compared.\r
-    // Consider the process of fingerprinting that all values (parameters, constants, etc.) are hoisted\r
-    // and replaced with dummies. What remains can be decomposed into a sequence of operations on specific\r
-    // types and specific inputs.\r
-    //\r
-    // Some sample fingerprints:\r
-    //\r
-    // 2 + 4 -> OP_ADD(CONST:int, CONST:int):int\r
-    // 2 + 8 -> OP_ADD(CONST:int, CONST:int):int\r
-    // 2.0 + 4.0 -> OP_ADD(CONST:double, CONST:double):double\r
-    //\r
-    // 2 + 4 and 2 + 8 have the same fingerprint, but 2.0 + 4.0 has a different fingerprint since its\r
-    // underlying types differ.\r
-    //\r
-    // "Hello " + "world" -> OP_ADD(CONST:string, CONST:string):string\r
-    // "Hello " + {model} -> OP_ADD(CONST:string, PARAM:string):string\r
-    //\r
-    // These string concatenations have different fingerprints since the inputs are provided differently:\r
-    // one is a hoisted local, the other is a parameter.\r
-    //\r
-    // ({model} ?? "sample").Length -> MEMBER_ACCESS(String.Length, OP_COALESCE(PARAM:string, CONST:string):string):int\r
-    // ({model} ?? "other sample").Length -> MEMBER_ACCESS(String.Length, OP_COALESCE(PARAM:string, CONST:string):string):int\r
-    //\r
-    // These expressions have the same fingerprint.\r
-    internal abstract class ExpressionFingerprint {\r
-\r
-        protected ExpressionFingerprint(Expression expression) {\r
-            // since the fingerprints are cached potentially forever, don't keep a reference\r
-            // to the original expression\r
-\r
-            NodeType = expression.NodeType;\r
-            Type = expression.Type;\r
-        }\r
-\r
-        // the type of expression node, e.g. OP_ADD, MEMBER_ACCESS, etc.\r
-        public ExpressionType NodeType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        // the CLR type resulting from this expression, e.g. int, string, etc.\r
-        public Type Type {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal virtual void AddToHashCodeCombiner(HashCodeCombiner combiner) {\r
-            combiner.AddObject(NodeType);\r
-            combiner.AddObject(Type);\r
-        }\r
-\r
-        public static ExpressionFingerprint Create(Expression expression, ParserContext parserContext) {\r
-            {\r
-                BinaryExpression binaryExpression = expression as BinaryExpression;\r
-                if (binaryExpression != null) {\r
-                    return BinaryExpressionFingerprint.Create(binaryExpression, parserContext);\r
-                }\r
-            }\r
-\r
-            {\r
-                ConditionalExpression conditionalExpression = expression as ConditionalExpression;\r
-                if (conditionalExpression != null) {\r
-                    return ConditionalExpressionFingerprint.Create(conditionalExpression, parserContext);\r
-                }\r
-            }\r
-\r
-            {\r
-                ConstantExpression constantExpression = expression as ConstantExpression;\r
-                if (constantExpression != null) {\r
-                    return ConstantExpressionFingerprint.Create(constantExpression, parserContext);\r
-                }\r
-            }\r
-\r
-            {\r
-                MemberExpression memberExpression = expression as MemberExpression;\r
-                if (memberExpression != null) {\r
-                    return MemberExpressionFingerprint.Create(memberExpression, parserContext);\r
-                }\r
-            }\r
-\r
-            {\r
-                MethodCallExpression methodCallExpression = expression as MethodCallExpression;\r
-                if (methodCallExpression != null) {\r
-                    return MethodCallExpressionFingerprint.Create(methodCallExpression, parserContext);\r
-                }\r
-            }\r
-\r
-            {\r
-                ParameterExpression parameterExpression = expression as ParameterExpression;\r
-                if (parameterExpression != null) {\r
-                    return ParameterExpressionFingerprint.Create(parameterExpression, parserContext);\r
-                }\r
-            }\r
-\r
-            {\r
-                UnaryExpression unaryExpression = expression as UnaryExpression;\r
-                if (unaryExpression != null) {\r
-                    return UnaryExpressionFingerprint.Create(unaryExpression, parserContext);\r
-                }\r
-            }\r
-\r
-            // unknown expression\r
-            return null;\r
-        }\r
-\r
-        public static ReadOnlyCollection<ExpressionFingerprint> Create(IEnumerable<Expression> expressions, ParserContext parserContext) {\r
-            List<ExpressionFingerprint> fingerprints = new List<ExpressionFingerprint>();\r
-            foreach (Expression expression in expressions) {\r
-                ExpressionFingerprint fingerprint = Create(expression, parserContext);\r
-                if (fingerprint == null && expression != null) {\r
-                    // something couldn't be parsed properly\r
-                    return null;\r
-                }\r
-                else {\r
-                    fingerprints.Add(fingerprint);\r
-                }\r
-            }\r
-            return new ReadOnlyCollection<ExpressionFingerprint>(fingerprints);\r
-        }\r
-\r
-        public override int GetHashCode() {\r
-            HashCodeCombiner combiner = new HashCodeCombiner();\r
-            combiner.AddObject(GetType());\r
-            AddToHashCodeCombiner(combiner);\r
-            return combiner.CombinedHash;\r
-        }\r
-\r
-        public override bool Equals(object obj) {\r
-            ExpressionFingerprint other = obj as ExpressionFingerprint;\r
-            if (other == null) {\r
-                return false;\r
-            }\r
-\r
-            return (this.NodeType == other.NodeType\r
-                && this.Type == other.Type\r
-                && this.GetType() == other.GetType());\r
-        }\r
-\r
-        protected static Expression ToExpression(ExpressionFingerprint fingerprint, ParserContext parserContext) {\r
-            return (fingerprint != null) ? fingerprint.ToExpression(parserContext) : null;\r
-        }\r
-\r
-        protected static IEnumerable<Expression> ToExpression(IEnumerable<ExpressionFingerprint> fingerprints, ParserContext parserContext) {\r
-            return from fingerprint in fingerprints select ToExpression(fingerprint, parserContext);\r
-        }\r
-\r
-        public abstract Expression ToExpression(ParserContext parserContext);\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ExpressionParser.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ExpressionParser.cs
deleted file mode 100644 (file)
index f277a9f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Linq.Expressions;\r
-\r
-    internal static class ExpressionParser {\r
-\r
-        public static ParserContext Parse<TModel, TValue>(Expression<Func<TModel, TValue>> expression) {\r
-            ParserContext context = new ParserContext() {\r
-                ModelParameter = expression.Parameters[0]\r
-            };\r
-\r
-            Expression body = expression.Body;\r
-            context.Fingerprint = ExpressionFingerprint.Create(body, context);\r
-            return context;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/FastTrack`2.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/FastTrack`2.cs
deleted file mode 100644 (file)
index ec20c8c..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-\r
-    internal static class FastTrack<TModel, TValue> {\r
-\r
-        private static Func<TModel, TValue> _identityFunc;\r
-\r
-        private static readonly ConstMemberLookupCache _constMemberLookupCache = new ConstMemberLookupCache();\r
-        private static readonly ModelMemberLookupCache _modelMemberLookupCache = new ModelMemberLookupCache();\r
-\r
-        public static Func<TModel, TValue> GetFunc(ParameterExpression modelParameter, Expression body) {\r
-            { // model => model\r
-                if (modelParameter == body) {\r
-                    return GetIdentityFunc();\r
-                }\r
-            }\r
-\r
-            { // model => {const}\r
-                ConstantExpression constantExpression = body as ConstantExpression;\r
-                if (constantExpression != null) {\r
-                    TValue value = (TValue)constantExpression.Value;\r
-                    return _ => value;\r
-                }\r
-            }\r
-\r
-            {\r
-                MemberExpression memberExpression = body as MemberExpression;\r
-                if (memberExpression != null) {\r
-                    if (memberExpression.Expression == null) {\r
-                        // model => {static member}\r
-                        return GetModelMemberLookupFunc(memberExpression.Member, true /* isStatic */);\r
-                    }\r
-                    else if (memberExpression.Expression == modelParameter) {\r
-                        // model => model.Member\r
-                        return GetModelMemberLookupFunc(memberExpression.Member, false /* isStatic */);\r
-                    }\r
-                    else {\r
-                        ConstantExpression constantExpression = memberExpression.Expression as ConstantExpression;\r
-                        if (constantExpression != null) {\r
-                            // model => {const}.Member, e.g. captured local variable in a foreach\r
-                            return GetConstMemberLookupFunc(memberExpression.Member, constantExpression.Value);\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            // don't know how to fast-track\r
-            return null;\r
-        }\r
-\r
-        private static Func<TModel, TValue> GetIdentityFunc() {\r
-            // don't need to worry about locking since all identity funcs are the same\r
-            if (_identityFunc == null) {\r
-                ParameterExpression modelParameter = Expression.Parameter(typeof(TModel), "model");\r
-                Expression<Func<TModel, TValue>> identityLambda = Expression.Lambda<Func<TModel, TValue>>(modelParameter, modelParameter);\r
-                _identityFunc = identityLambda.Compile();\r
-            }\r
-\r
-            return _identityFunc;\r
-        }\r
-\r
-        private static Func<TModel, TValue> GetModelMemberLookupFunc(MemberInfo member, bool isStatic) {\r
-            return _modelMemberLookupCache.GetFunc(member, isStatic);\r
-        }\r
-\r
-        private static Func<TModel, TValue> GetConstMemberLookupFunc(MemberInfo member, object constValue) {\r
-            Func<object, TValue> innerFunc = _constMemberLookupCache.GetFunc(member);\r
-            return _ => innerFunc(constValue);\r
-        }\r
-\r
-        private sealed class ConstMemberLookupCache : ReaderWriterCache<MemberInfo, Func<object, TValue>> {\r
-            private static Func<object, TValue> CreateFunc(MemberInfo member) {\r
-                ParameterExpression constParam = Expression.Parameter(typeof(object), "constValue");\r
-                // cast is necessary since the constant value comes in as a standard 'object'\r
-                UnaryExpression castExpr = Expression.Convert(constParam, member.DeclaringType);\r
-                MemberExpression memberExpr = Expression.MakeMemberAccess(castExpr, member);\r
-                Expression<Func<object, TValue>> lambda = Expression.Lambda<Func<object, TValue>>(memberExpr, constParam);\r
-                return lambda.Compile();\r
-            }\r
-            public Func<object, TValue> GetFunc(MemberInfo member) {\r
-                return FetchOrCreateItem(member, () => CreateFunc(member));\r
-            }\r
-        }\r
-\r
-        private sealed class ModelMemberLookupCache : ReaderWriterCache<MemberInfo, Func<TModel, TValue>> {\r
-            private static Func<TModel, TValue> CreateFunc(MemberInfo member, bool isStatic) {\r
-                ParameterExpression modelParam = Expression.Parameter(typeof(TModel), "model");\r
-                MemberExpression memberExpr = Expression.MakeMemberAccess((!isStatic) ? modelParam : null, member);\r
-                Expression<Func<TModel, TValue>> lambda = Expression.Lambda<Func<TModel, TValue>>(memberExpr, modelParam);\r
-                return lambda.Compile();\r
-            }\r
-            public Func<TModel, TValue> GetFunc(MemberInfo member, bool isStatic) {\r
-                return FetchOrCreateItem(member, () => CreateFunc(member, isStatic));\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/HashCodeCombiner.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/HashCodeCombiner.cs
deleted file mode 100644 (file)
index 5abdded..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Collections;\r
-\r
-    // based on System.Web.Util.HashCodeCombiner\r
-    internal class HashCodeCombiner {\r
-\r
-        private long _combinedHash64 = 0x1505L;\r
-\r
-        public void AddFingerprint(ExpressionFingerprint fingerprint) {\r
-            if (fingerprint != null) {\r
-                fingerprint.AddToHashCodeCombiner(this);\r
-            }\r
-            else {\r
-                AddInt32(0);\r
-            }\r
-        }\r
-\r
-        public void AddEnumerable(IEnumerable e) {\r
-            if (e == null) {\r
-                AddInt32(0);\r
-            }\r
-            else {\r
-                int count = 0;\r
-                foreach (object o in e) {\r
-                    AddObject(o);\r
-                    count++;\r
-                }\r
-                AddInt32(count);\r
-            }\r
-        }\r
-\r
-        public void AddInt32(int i) {\r
-            _combinedHash64 = ((_combinedHash64 << 5) + _combinedHash64) ^ i;\r
-        }\r
-\r
-        public void AddObject(object o) {\r
-            int oHashCode = (o != null) ? o.GetHashCode() : 0;\r
-            AddInt32(oHashCode);\r
-        }\r
-\r
-        public int CombinedHash {\r
-            get {\r
-                return _combinedHash64.GetHashCode();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/MemberExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/MemberExpressionFingerprint.cs
deleted file mode 100644 (file)
index 6a55769..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-#pragma warning disable 659 // overrides AddToHashCodeCombiner instead\r
-\r
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-\r
-    // MemberExpression fingerprint class\r
-    // Expression of form xxx.FieldOrProperty\r
-    [SuppressMessage("Microsoft.Usage", "CA2218:OverrideGetHashCodeOnOverridingEquals",\r
-        Justification = "Overrides AddToHashCodeCombiner() instead.")]\r
-    internal sealed class MemberExpressionFingerprint : ExpressionFingerprint {\r
-\r
-        private MemberExpressionFingerprint(MemberExpression expression)\r
-            : base(expression) {\r
-\r
-            Member = expression.Member;\r
-        }\r
-\r
-        public MemberInfo Member {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ExpressionFingerprint Target {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal override void AddToHashCodeCombiner(HashCodeCombiner combiner) {\r
-            base.AddToHashCodeCombiner(combiner);\r
-\r
-            combiner.AddObject(Member);\r
-            combiner.AddFingerprint(Target);\r
-        }\r
-\r
-        public static MemberExpressionFingerprint Create(MemberExpression expression, ParserContext parserContext) {\r
-            ExpressionFingerprint target = Create(expression.Expression, parserContext);\r
-            if (target == null && expression.Expression != null) {\r
-                return null;\r
-            }\r
-\r
-            return new MemberExpressionFingerprint(expression) {\r
-                Target = target\r
-            };\r
-        }\r
-\r
-        public override bool Equals(object obj) {\r
-            MemberExpressionFingerprint other = obj as MemberExpressionFingerprint;\r
-            if (other == null) {\r
-                return false;\r
-            }\r
-\r
-            return (this.Member == other.Member\r
-                && Object.Equals(this.Target, other.Target)\r
-                && base.Equals(other));\r
-        }\r
-\r
-        public override Expression ToExpression(ParserContext parserContext) {\r
-            Expression targetExpr = ToExpression(Target, parserContext);\r
-            return Expression.MakeMemberAccess(targetExpr, Member);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/MethodCallExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/MethodCallExpressionFingerprint.cs
deleted file mode 100644 (file)
index 7b8455c..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-#pragma warning disable 659 // overrides AddToHashCodeCombiner instead\r
-\r
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-\r
-    // MethodCallExpression fingerprint class\r
-    // Expression of form xxx.Foo(...), xxx[...] (get_Item()), etc.\r
-    [SuppressMessage("Microsoft.Usage", "CA2218:OverrideGetHashCodeOnOverridingEquals",\r
-        Justification = "Overrides AddToHashCodeCombiner() instead.")]\r
-    internal sealed class MethodCallExpressionFingerprint : ExpressionFingerprint {\r
-\r
-        private MethodCallExpressionFingerprint(MethodCallExpression expression)\r
-            : base(expression) {\r
-\r
-            Method = expression.Method;\r
-        }\r
-\r
-        public ReadOnlyCollection<ExpressionFingerprint> Arguments {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public MethodInfo Method {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ExpressionFingerprint Target {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal override void AddToHashCodeCombiner(HashCodeCombiner combiner) {\r
-            base.AddToHashCodeCombiner(combiner);\r
-\r
-            combiner.AddEnumerable(Arguments);\r
-            combiner.AddObject(Method);\r
-            combiner.AddFingerprint(Target);\r
-        }\r
-\r
-        public static MethodCallExpressionFingerprint Create(MethodCallExpression expression, ParserContext parserContext) {\r
-            ReadOnlyCollection<ExpressionFingerprint> arguments = Create(expression.Arguments, parserContext);\r
-            if (arguments == null) {\r
-                return null;\r
-            }\r
-\r
-            ExpressionFingerprint target = Create(expression.Object, parserContext);\r
-            if (target == null && expression.Object != null) {\r
-                return null;\r
-            }\r
-\r
-            return new MethodCallExpressionFingerprint(expression) {\r
-                Arguments = arguments,\r
-                Target = target\r
-            };\r
-        }\r
-\r
-        public override bool Equals(object obj) {\r
-            MethodCallExpressionFingerprint other = obj as MethodCallExpressionFingerprint;\r
-            if (other == null) {\r
-                return false;\r
-            }\r
-\r
-            return (this.Arguments.SequenceEqual(other.Arguments)\r
-                && this.Method == other.Method\r
-                && Object.Equals(this.Target, other.Target)\r
-                && base.Equals(other));\r
-        }\r
-\r
-        public override Expression ToExpression(ParserContext parserContext) {\r
-            Expression targetExpr = ToExpression(Target, parserContext);\r
-            IEnumerable<Expression> argumentsExpr = ToExpression(Arguments, parserContext);\r
-            return Expression.Call(targetExpr, Method, argumentsExpr);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ParameterExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ParameterExpressionFingerprint.cs
deleted file mode 100644 (file)
index 399f686..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Linq.Expressions;\r
-\r
-    // ParameterExpression fingerprint class\r
-    // Specifically, instances of this type represent the model parameter\r
-    internal sealed class ParameterExpressionFingerprint : ExpressionFingerprint {\r
-\r
-        private ParameterExpressionFingerprint(ParameterExpression expression)\r
-            : base(expression) {\r
-        }\r
-\r
-        public static ParameterExpressionFingerprint Create(ParameterExpression expression, ParserContext parserContext) {\r
-            if (expression == parserContext.ModelParameter) {\r
-                return new ParameterExpressionFingerprint(expression);\r
-            }\r
-            else {\r
-                // degenerate case - uncaptured parameter expression passed into the system\r
-                return null;\r
-            }\r
-        }\r
-\r
-        public override Expression ToExpression(ParserContext parserContext) {\r
-            // The only time an instance of this class exists is if it represents the actual model parameter,\r
-            // so just return it directly.\r
-            return parserContext.ModelParameter;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ParserContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/ParserContext.cs
deleted file mode 100644 (file)
index 38281c3..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Linq.Expressions;\r
-    using System.Collections.Generic;\r
-\r
-    internal class ParserContext {\r
-\r
-        public static readonly ParameterExpression HoistedValuesParameter = Expression.Parameter(typeof(object[]), "hoistedValues");\r
-\r
-        public ExpressionFingerprint Fingerprint;\r
-        public readonly List<object> HoistedValues = new List<object>();\r
-        public ParameterExpression ModelParameter;\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/UnaryExpressionFingerprint.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ExpressionUtil/UnaryExpressionFingerprint.cs
deleted file mode 100644 (file)
index 8ba8cfa..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma warning disable 659 // overrides AddToHashCodeCombiner instead\r
-\r
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.ExpressionUtil {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-\r
-    // UnaryExpression fingerprint class\r
-    // The most common appearance of a UnaryExpression is a cast or other conversion operator\r
-    [SuppressMessage("Microsoft.Usage", "CA2218:OverrideGetHashCodeOnOverridingEquals",\r
-        Justification = "Overrides AddToHashCodeCombiner() instead.")]\r
-    internal sealed class UnaryExpressionFingerprint : ExpressionFingerprint {\r
-\r
-        private UnaryExpressionFingerprint(UnaryExpression expression)\r
-            : base(expression) {\r
-            // don't care about UnaryExpression.IsLifted / IsLiftedToNull since they're not necessary to uniquely describe the expression\r
-\r
-            Method = expression.Method;\r
-        }\r
-\r
-        public MethodInfo Method {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ExpressionFingerprint Operand {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal override void AddToHashCodeCombiner(HashCodeCombiner combiner) {\r
-            base.AddToHashCodeCombiner(combiner);\r
-\r
-            combiner.AddObject(Method);\r
-            combiner.AddFingerprint(Operand);\r
-        }\r
-\r
-        public static UnaryExpressionFingerprint Create(UnaryExpression expression, ParserContext parserContext) {\r
-            ExpressionFingerprint operand = Create(expression.Operand, parserContext);\r
-            if (operand == null && expression.Operand != null) {\r
-                // couldn't convert the operand, so bail\r
-                return null;\r
-            }\r
-\r
-            return new UnaryExpressionFingerprint(expression) {\r
-                Operand = operand\r
-            };\r
-        }\r
-\r
-        public override bool Equals(object obj) {\r
-            UnaryExpressionFingerprint other = obj as UnaryExpressionFingerprint;\r
-            if (other == null) {\r
-                return false;\r
-            }\r
-\r
-            return (this.Method == other.Method\r
-                && Object.Equals(this.Operand, other.Operand)\r
-                && base.Equals(other));\r
-        }\r
-\r
-        public override Expression ToExpression(ParserContext parserContext) {\r
-            Expression operandExpr = ToExpression(Operand, parserContext);\r
-\r
-            // in .NET 3.5 SP1, Expression.MakeUnary() throws if NodeType is UnaryPlus, so special-case\r
-            if (NodeType == ExpressionType.UnaryPlus) {\r
-                return Expression.UnaryPlus(operandExpr, Method);\r
-            }\r
-            else {\r
-                return Expression.MakeUnary(NodeType, operandExpr, Type, Method);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FieldValidationMetadata.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FieldValidationMetadata.cs
deleted file mode 100644 (file)
index 5dda044..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-\r
-    public class FieldValidationMetadata {\r
-\r
-        private string _fieldName;\r
-        private readonly Collection<ModelClientValidationRule> _validationRules = new Collection<ModelClientValidationRule>();\r
-\r
-        public string FieldName {\r
-            get {\r
-                return _fieldName ?? String.Empty;\r
-            }\r
-            set {\r
-                _fieldName = value;\r
-            }\r
-        }\r
-\r
-        public bool ReplaceValidationMessageContents {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ValidationMessageId {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ICollection<ModelClientValidationRule> ValidationRules {\r
-            get {\r
-                return _validationRules;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FileContentResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FileContentResult.cs
deleted file mode 100644 (file)
index 8a2fdc0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web;\r
-\r
-    public class FileContentResult : FileResult {\r
-\r
-        public FileContentResult(byte[] fileContents, string contentType)\r
-            : base(contentType) {\r
-            if (fileContents == null) {\r
-                throw new ArgumentNullException("fileContents");\r
-            }\r
-\r
-            FileContents = fileContents;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays",\r
-            Justification = "There's no reason to tamper-proof this array since it's supplied to the type's constructor.")]\r
-        public byte[] FileContents {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected override void WriteFile(HttpResponseBase response) {\r
-            response.OutputStream.Write(FileContents, 0, FileContents.Length);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FilePathResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FilePathResult.cs
deleted file mode 100644 (file)
index 550113f..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class FilePathResult : FileResult {\r
-\r
-        public FilePathResult(string fileName, string contentType)\r
-            : base(contentType) {\r
-            if (String.IsNullOrEmpty(fileName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "fileName");\r
-            }\r
-\r
-            FileName = fileName;\r
-        }\r
-\r
-        public string FileName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected override void WriteFile(HttpResponseBase response) {\r
-            response.TransmitFile(FileName);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FileResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FileResult.cs
deleted file mode 100644 (file)
index 8127e46..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Net.Mime;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public abstract class FileResult : ActionResult {\r
-\r
-        protected FileResult(string contentType) {\r
-            if (String.IsNullOrEmpty(contentType)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "contentType");\r
-            }\r
-\r
-            ContentType = contentType;\r
-        }\r
-\r
-        private string _fileDownloadName;\r
-\r
-        public string ContentType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string FileDownloadName {\r
-            get {\r
-                return _fileDownloadName ?? String.Empty;\r
-            }\r
-            set {\r
-                _fileDownloadName = value;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-            response.ContentType = ContentType;\r
-\r
-            if (!String.IsNullOrEmpty(FileDownloadName)) {\r
-                // From RFC 2183, Sec. 2.3:\r
-                // The sender may want to suggest a filename to be used if the entity is\r
-                // detached and stored in a separate file. If the receiving MUA writes\r
-                // the entity to a file, the suggested filename should be used as a\r
-                // basis for the actual filename, where possible.\r
-                string headerValue = ContentDispositionUtil.GetHeaderValue(FileDownloadName);\r
-                context.HttpContext.Response.AddHeader("Content-Disposition", headerValue);\r
-            }\r
-\r
-            WriteFile(response);\r
-        }\r
-\r
-        protected abstract void WriteFile(HttpResponseBase response);\r
-\r
-        private static class ContentDispositionUtil {\r
-            private const string _hexDigits = "0123456789ABCDEF";\r
-\r
-            private static void AddByteToStringBuilder(byte b, StringBuilder builder) {\r
-                builder.Append('%');\r
-\r
-                int i = b;\r
-                AddHexDigitToStringBuilder(i >> 4, builder);\r
-                AddHexDigitToStringBuilder(i % 16, builder);\r
-            }\r
-\r
-            private static void AddHexDigitToStringBuilder(int digit, StringBuilder builder) {\r
-                builder.Append(_hexDigits[digit]);\r
-            }\r
-\r
-            private static string CreateRfc2231HeaderValue(string filename) {\r
-                StringBuilder builder = new StringBuilder("attachment; filename*=UTF-8''");\r
-\r
-                byte[] filenameBytes = Encoding.UTF8.GetBytes(filename);\r
-                foreach (byte b in filenameBytes) {\r
-                    if (IsByteValidHeaderValueCharacter(b)) {\r
-                        builder.Append((char)b);\r
-                    }\r
-                    else {\r
-                        AddByteToStringBuilder(b, builder);\r
-                    }\r
-                }\r
-\r
-                return builder.ToString();\r
-            }\r
-\r
-            public static string GetHeaderValue(string fileName) {\r
-                try {\r
-                    // first, try using the .NET built-in generator\r
-                    ContentDisposition disposition = new ContentDisposition() { FileName = fileName };\r
-                    return disposition.ToString();\r
-                }\r
-                catch (FormatException) {\r
-                    // otherwise, fall back to RFC 2231 extensions generator\r
-                    return CreateRfc2231HeaderValue(fileName);\r
-                }\r
-            }\r
-\r
-            // Application of RFC 2231 Encoding to Hypertext Transfer Protocol (HTTP) Header Fields, sec. 3.2\r
-            // http://greenbytes.de/tech/webdav/draft-reschke-rfc2231-in-http-latest.html\r
-            private static bool IsByteValidHeaderValueCharacter(byte b) {\r
-                if ((byte)'0' <= b && b <= (byte)'9') {\r
-                    return true; // is digit\r
-                }\r
-                if ((byte)'a' <= b && b <= (byte)'z') {\r
-                    return true; // lowercase letter\r
-                }\r
-                if ((byte)'A' <= b && b <= (byte)'Z') {\r
-                    return true; // uppercase letter\r
-                }\r
-\r
-                switch (b) {\r
-                    case (byte)'-':\r
-                    case (byte)'.':\r
-                    case (byte)'_':\r
-                    case (byte)'~':\r
-                    case (byte)':':\r
-                    case (byte)'!':\r
-                    case (byte)'$':\r
-                    case (byte)'&':\r
-                    case (byte)'+':\r
-                        return true;\r
-                }\r
-\r
-                return false;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FileStreamResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FileStreamResult.cs
deleted file mode 100644 (file)
index a6e1a6f..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.IO;\r
-    using System.Web;\r
-\r
-    public class FileStreamResult : FileResult {\r
-\r
-        // default buffer size as defined in BufferedStream type\r
-        private const int _bufferSize = 0x1000;\r
-\r
-        public FileStreamResult(Stream fileStream, string contentType)\r
-            : base(contentType) {\r
-            if (fileStream == null) {\r
-                throw new ArgumentNullException("fileStream");\r
-            }\r
-\r
-            FileStream = fileStream;\r
-        }\r
-\r
-        public Stream FileStream {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected override void WriteFile(HttpResponseBase response) {\r
-            // grab chunks of data and write to the output stream\r
-            Stream outputStream = response.OutputStream;\r
-            using (FileStream) {\r
-                byte[] buffer = new byte[_bufferSize];\r
-\r
-                while (true) {\r
-                    int bytesRead = FileStream.Read(buffer, 0, _bufferSize);\r
-                    if (bytesRead == 0) {\r
-                        // no more data\r
-                        break;\r
-                    }\r
-\r
-                    outputStream.Write(buffer, 0, bytesRead);\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FilterAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FilterAttribute.cs
deleted file mode 100644 (file)
index 1cda086..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public abstract class FilterAttribute : Attribute {\r
-\r
-        private int _order = -1;\r
-\r
-        public int Order {\r
-            get {\r
-                return _order;\r
-            }\r
-            set {\r
-                if (value < -1) {\r
-                    throw new ArgumentOutOfRangeException("value",\r
-                        MvcResources.FilterAttribute_OrderOutOfRange);\r
-                }\r
-                _order = value;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FilterInfo.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FilterInfo.cs
deleted file mode 100644 (file)
index 031ffe3..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public class FilterInfo {\r
-\r
-        private List<IActionFilter> _actionFilters = new List<IActionFilter>();\r
-        private List<IAuthorizationFilter> _authorizationFilters = new List<IAuthorizationFilter>();\r
-        private List<IExceptionFilter> _exceptionFilters = new List<IExceptionFilter>();\r
-        private List<IResultFilter> _resultFilters = new List<IResultFilter>();\r
-\r
-        public IList<IActionFilter> ActionFilters {\r
-            get {\r
-                return _actionFilters;\r
-            }\r
-        }\r
-\r
-        public IList<IAuthorizationFilter> AuthorizationFilters {\r
-            get {\r
-                return _authorizationFilters;\r
-            }\r
-        }\r
-\r
-        public IList<IExceptionFilter> ExceptionFilters {\r
-            get {\r
-                return _exceptionFilters;\r
-            }\r
-        }\r
-\r
-        public IList<IResultFilter> ResultFilters {\r
-            get {\r
-                return _resultFilters;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormCollection.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormCollection.cs
deleted file mode 100644 (file)
index 3736bae..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Specialized;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable",\r
-        Justification = "It is not anticipated that users will need to serialize this type.")]\r
-    [SuppressMessage("Microsoft.Design", "CA1035:ICollectionImplementationsHaveStronglyTypedMembers",\r
-        Justification = "It is not anticipated that users will call FormCollection.CopyTo().")]\r
-    [FormCollectionBinder]\r
-    public sealed class FormCollection : NameValueCollection, IValueProvider {\r
-\r
-        public FormCollection() {\r
-        }\r
-\r
-        public FormCollection(NameValueCollection collection) {\r
-            if (collection == null) {\r
-                throw new ArgumentNullException("collection");\r
-            }\r
-\r
-            Add(collection);\r
-        }\r
-\r
-        public ValueProviderResult GetValue(string name) {\r
-            if (name == null) {\r
-                throw new ArgumentNullException("name");\r
-            }\r
-\r
-            string[] rawValue = GetValues(name);\r
-            if (rawValue == null) {\r
-                return null;\r
-            }\r
-\r
-            string attemptedValue = this[name];\r
-            return new ValueProviderResult(rawValue, attemptedValue, CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        public IValueProvider ToValueProvider() {\r
-            return this;\r
-        }\r
-\r
-        #region IValueProvider Members\r
-        bool IValueProvider.ContainsPrefix(string prefix) {\r
-            return ValueProviderUtil.CollectionContainsPrefix(AllKeys, prefix);\r
-        }\r
-\r
-        ValueProviderResult IValueProvider.GetValue(string key) {\r
-            return GetValue(key);\r
-        }\r
-        #endregion\r
-\r
-        private sealed class FormCollectionBinderAttribute : CustomModelBinderAttribute {\r
-\r
-            // since the FormCollectionModelBinder.BindModel() method is thread-safe, we only need to keep\r
-            // a single instance of the binder around\r
-            private static readonly FormCollectionModelBinder _binder = new FormCollectionModelBinder();\r
-\r
-            public override IModelBinder GetBinder() {\r
-                return _binder;\r
-            }\r
-\r
-            // this class is used for generating a FormCollection object\r
-            private sealed class FormCollectionModelBinder : IModelBinder {\r
-                public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-                    if (controllerContext == null) {\r
-                        throw new ArgumentNullException("controllerContext");\r
-                    }\r
-\r
-                    return new FormCollection(controllerContext.HttpContext.Request.Form);\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormContext.cs
deleted file mode 100644 (file)
index a2c6ec8..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Script.Serialization;\r
-\r
-    public class FormContext {\r
-\r
-        private readonly Dictionary<string, FieldValidationMetadata> _fieldValidators = new Dictionary<string, FieldValidationMetadata>();\r
-\r
-        public IDictionary<string, FieldValidationMetadata> FieldValidators {\r
-            get {\r
-                return _fieldValidators;\r
-            }\r
-        }\r
-\r
-        public string FormId {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public bool ReplaceValidationSummary {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ValidationSummaryId {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "Performs a potentially time-consuming conversion.")]\r
-        public string GetJsonValidationMetadata() {\r
-            JavaScriptSerializer serializer = new JavaScriptSerializer();\r
-\r
-            SortedDictionary<string, object> dict = new SortedDictionary<string, object>() {\r
-                { "Fields", FieldValidators.Values },\r
-                { "FormId", FormId }\r
-            };\r
-            if (!String.IsNullOrEmpty(ValidationSummaryId)) {\r
-                dict["ValidationSummaryId"] = ValidationSummaryId;\r
-            }\r
-            dict["ReplaceValidationSummary"] = ReplaceValidationSummary;\r
-\r
-            return serializer.Serialize(dict);\r
-        }\r
-\r
-        public FieldValidationMetadata GetValidationMetadataForField(string fieldName) {\r
-            return GetValidationMetadataForField(fieldName, false /* createIfNotFound */);\r
-        }\r
-\r
-        public FieldValidationMetadata GetValidationMetadataForField(string fieldName, bool createIfNotFound) {\r
-            if (String.IsNullOrEmpty(fieldName)) {\r
-                throw Error.ParameterCannotBeNullOrEmpty("fieldName");\r
-            }\r
-\r
-            FieldValidationMetadata metadata;\r
-            if (!FieldValidators.TryGetValue(fieldName, out metadata)) {\r
-                if (createIfNotFound) {\r
-                    metadata = new FieldValidationMetadata() {\r
-                        FieldName = fieldName\r
-                    };\r
-                    FieldValidators[fieldName] = metadata;\r
-                }\r
-            }\r
-            return metadata;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormMethod.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormMethod.cs
deleted file mode 100644 (file)
index 0c9ebc8..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public enum FormMethod {\r
-        Get,\r
-        Post\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormValueProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormValueProvider.cs
deleted file mode 100644 (file)
index 7349734..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Specialized;\r
-    using System.Globalization;\r
-\r
-    public sealed class FormValueProvider : NameValueCollectionValueProvider {\r
-\r
-        public FormValueProvider(ControllerContext controllerContext)\r
-            : base(controllerContext.HttpContext.Request.Form, CultureInfo.CurrentCulture) {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormValueProviderFactory.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/FormValueProviderFactory.cs
deleted file mode 100644 (file)
index 686f3ab..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public sealed class FormValueProviderFactory : ValueProviderFactory {\r
-\r
-        public override IValueProvider GetValueProvider(ControllerContext controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            return new FormValueProvider(controllerContext);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HandleErrorAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HandleErrorAttribute.cs
deleted file mode 100644 (file)
index 99b40cf..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "This attribute is AllowMultiple = true and users might want to override behavior.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]\r
-    public class HandleErrorAttribute : FilterAttribute, IExceptionFilter {\r
-\r
-        private const string _defaultView = "Error";\r
-\r
-        private readonly object _typeId = new object();\r
-\r
-        private Type _exceptionType = typeof(Exception);\r
-        private string _master;\r
-        private string _view;\r
-\r
-        public Type ExceptionType {\r
-            get {\r
-                return _exceptionType;\r
-            }\r
-            set {\r
-                if (value == null) {\r
-                    throw new ArgumentNullException("value");\r
-                }\r
-                if (!typeof(Exception).IsAssignableFrom(value)) {\r
-                    throw new ArgumentException(String.Format(CultureInfo.CurrentUICulture,\r
-                        MvcResources.ExceptionViewAttribute_NonExceptionType, value.FullName));\r
-                }\r
-\r
-                _exceptionType = value;\r
-            }\r
-        }\r
-\r
-        public string Master {\r
-            get {\r
-                return _master ?? String.Empty;\r
-            }\r
-            set {\r
-                _master = value;\r
-            }\r
-        }\r
-\r
-        public override object TypeId {\r
-            get {\r
-                return _typeId;\r
-            }\r
-        }\r
-\r
-        public string View {\r
-            get {\r
-                return (!String.IsNullOrEmpty(_view)) ? _view : _defaultView;\r
-            }\r
-            set {\r
-                _view = value;\r
-            }\r
-        }\r
-\r
-        public virtual void OnException(ExceptionContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-            if (filterContext.IsChildAction) {\r
-                return;\r
-            }\r
-\r
-            // If custom errors are disabled, we need to let the normal ASP.NET exception handler\r
-            // execute so that the user can see useful debugging information.\r
-            if (filterContext.ExceptionHandled || !filterContext.HttpContext.IsCustomErrorEnabled) {\r
-                return;\r
-            }\r
-\r
-            Exception exception = filterContext.Exception;\r
-\r
-            // If this is not an HTTP 500 (for example, if somebody throws an HTTP 404 from an action method),\r
-            // ignore it.\r
-            if (new HttpException(null, exception).GetHttpCode() != 500) {\r
-                return;\r
-            }\r
-\r
-            if (!ExceptionType.IsInstanceOfType(exception)) {\r
-                return;\r
-            }\r
-\r
-            string controllerName = (string)filterContext.RouteData.Values["controller"];\r
-            string actionName = (string)filterContext.RouteData.Values["action"];\r
-            HandleErrorInfo model = new HandleErrorInfo(filterContext.Exception, controllerName, actionName);\r
-            filterContext.Result = new ViewResult {\r
-                ViewName = View,\r
-                MasterName = Master,\r
-                ViewData = new ViewDataDictionary<HandleErrorInfo>(model),\r
-                TempData = filterContext.Controller.TempData\r
-            };\r
-            filterContext.ExceptionHandled = true;\r
-            filterContext.HttpContext.Response.Clear();\r
-            filterContext.HttpContext.Response.StatusCode = 500;\r
-\r
-            // Certain versions of IIS will sometimes use their own error page when\r
-            // they detect a server error. Setting this property indicates that we\r
-            // want it to try to render ASP.NET MVC's error page instead.\r
-            filterContext.HttpContext.Response.TrySkipIisCustomErrors = true;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HandleErrorInfo.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HandleErrorInfo.cs
deleted file mode 100644 (file)
index d02f911..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class HandleErrorInfo {\r
-\r
-        public HandleErrorInfo(Exception exception, string controllerName, string actionName) {\r
-            if (exception == null) {\r
-                throw new ArgumentNullException("exception");\r
-            }\r
-            if (String.IsNullOrEmpty(controllerName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "controllerName");\r
-            }\r
-            if (string.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-\r
-            Exception = exception;\r
-            ControllerName = controllerName;\r
-            ActionName = actionName;\r
-        }\r
-\r
-        public string ActionName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string ControllerName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public Exception Exception {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HiddenInputAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HiddenInputAttribute.cs
deleted file mode 100644 (file)
index b1778d4..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]\r
-    public sealed class HiddenInputAttribute : Attribute {\r
-        public HiddenInputAttribute() {\r
-            DisplayValue = true;\r
-        }\r
-\r
-        public bool DisplayValue { get; set; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/.gitattributes b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/.gitattributes
deleted file mode 100644 (file)
index adba85f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/ChildActionExtensions.cs -crlf
-/DefaultDisplayTemplates.cs -crlf
-/DefaultEditorTemplates.cs -crlf
-/DisplayExtensions.cs -crlf
-/DisplayTextExtensions.cs -crlf
-/EditorExtensions.cs -crlf
-/FormExtensions.cs -crlf
-/InputExtensions.cs -crlf
-/LabelExtensions.cs -crlf
-/LinkExtensions.cs -crlf
-/MvcForm.cs -crlf
-/PartialExtensions.cs -crlf
-/RenderPartialExtensions.cs -crlf
-/SelectExtensions.cs -crlf
-/TemplateHelpers.cs -crlf
-/TextAreaExtensions.cs -crlf
-/ValidationExtensions.cs -crlf
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/ChildActionExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/ChildActionExtensions.cs
deleted file mode 100644 (file)
index cd22769..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Linq;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class ChildActionExtensions {\r
-\r
-        // Action\r
-\r
-        public static MvcHtmlString Action(this HtmlHelper htmlHelper, string actionName) {\r
-            return Action(htmlHelper, actionName, null /* controllerName */, null /* routeValues */);\r
-        }\r
-\r
-        public static MvcHtmlString Action(this HtmlHelper htmlHelper, string actionName, object routeValues) {\r
-            return Action(htmlHelper, actionName, null /* controllerName */, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static MvcHtmlString Action(this HtmlHelper htmlHelper, string actionName, RouteValueDictionary routeValues) {\r
-            return Action(htmlHelper, actionName, null /* controllerName */, routeValues);\r
-        }\r
-\r
-        public static MvcHtmlString Action(this HtmlHelper htmlHelper, string actionName, string controllerName) {\r
-            return Action(htmlHelper, actionName, controllerName, null /* routeValues */);\r
-        }\r
-\r
-        public static MvcHtmlString Action(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues) {\r
-            return Action(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static MvcHtmlString Action(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            StringWriter writer = new StringWriter(CultureInfo.CurrentCulture);\r
-            ActionHelper(htmlHelper, actionName, controllerName, routeValues, writer);\r
-            return MvcHtmlString.Create(writer.ToString());\r
-        }\r
-\r
-        // RenderAction\r
-\r
-        public static void RenderAction(this HtmlHelper htmlHelper, string actionName) {\r
-            RenderAction(htmlHelper, actionName, null /* controllerName */, null /* routeValues */);\r
-        }\r
-\r
-        public static void RenderAction(this HtmlHelper htmlHelper, string actionName, object routeValues) {\r
-            RenderAction(htmlHelper, actionName, null /* controllerName */, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static void RenderAction(this HtmlHelper htmlHelper, string actionName, RouteValueDictionary routeValues) {\r
-            RenderAction(htmlHelper, actionName, null /* controllerName */, routeValues);\r
-        }\r
-\r
-        public static void RenderAction(this HtmlHelper htmlHelper, string actionName, string controllerName) {\r
-            RenderAction(htmlHelper, actionName, controllerName, null /* routeValues */);\r
-        }\r
-\r
-        public static void RenderAction(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues) {\r
-            RenderAction(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static void RenderAction(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            ActionHelper(htmlHelper, actionName, controllerName, routeValues, htmlHelper.ViewContext.Writer);\r
-        }\r
-\r
-        // Helpers\r
-\r
-        internal static void ActionHelper(HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues, TextWriter textWriter) {\r
-            if (htmlHelper == null) {\r
-                throw new ArgumentNullException("htmlHelper");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-\r
-            routeValues = MergeDictionaries(routeValues, htmlHelper.ViewContext.RouteData.Values);\r
-            routeValues["action"] = actionName;\r
-            if (!String.IsNullOrEmpty(controllerName)) {\r
-                routeValues["controller"] = controllerName;\r
-            }\r
-\r
-            bool usingAreas;\r
-            VirtualPathData vpd = htmlHelper.RouteCollection.GetVirtualPathForArea(htmlHelper.ViewContext.RequestContext, null /* name */, routeValues, out usingAreas);\r
-            if (vpd == null) {\r
-                throw new InvalidOperationException(MvcResources.Common_NoRouteMatched);\r
-            }\r
-\r
-            if (usingAreas) {\r
-                routeValues.Remove("area");\r
-            }\r
-            RouteData routeData = CreateRouteData(vpd.Route, routeValues, vpd.DataTokens, htmlHelper.ViewContext);\r
-            HttpContextBase httpContext = htmlHelper.ViewContext.HttpContext;\r
-            RequestContext requestContext = new RequestContext(httpContext, routeData);\r
-            ChildActionMvcHandler handler = new ChildActionMvcHandler(requestContext);\r
-            httpContext.Server.Execute(HttpHandlerUtil.WrapForServerExecute(handler), textWriter, true /* preserveForm */);\r
-        }\r
-\r
-        private static RouteData CreateRouteData(RouteBase route, RouteValueDictionary routeValues, RouteValueDictionary dataTokens, ViewContext parentViewContext) {\r
-            RouteData routeData = new RouteData();\r
-\r
-            foreach (KeyValuePair<string, object> kvp in routeValues) {\r
-                routeData.Values.Add(kvp.Key, kvp.Value);\r
-            }\r
-\r
-            foreach (KeyValuePair<string, object> kvp in dataTokens) {\r
-                routeData.DataTokens.Add(kvp.Key, kvp.Value);\r
-            }\r
-\r
-            routeData.Route = route;\r
-            routeData.DataTokens[ControllerContext.PARENT_ACTION_VIEWCONTEXT] = parentViewContext;\r
-            return routeData;\r
-        }\r
-\r
-        private static RouteValueDictionary MergeDictionaries(params RouteValueDictionary[] dictionaries) {\r
-            // Merge existing route values with the user provided values\r
-            var result = new RouteValueDictionary();\r
-\r
-            foreach (RouteValueDictionary dictionary in dictionaries.Where(d => d != null)) {\r
-                foreach (KeyValuePair<string, object> kvp in dictionary) {\r
-                    if (!result.ContainsKey(kvp.Key)) {\r
-                        result.Add(kvp.Key, kvp.Value);\r
-                    }\r
-                }\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        internal class ChildActionMvcHandler : MvcHandler {\r
-            public ChildActionMvcHandler(RequestContext context)\r
-                : base(context) {\r
-            }\r
-\r
-            protected internal override void AddVersionHeader(HttpContextBase httpContext) {\r
-                // No version header for child actions\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultDisplayTemplates.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultDisplayTemplates.cs
deleted file mode 100644 (file)
index 1d4d64b..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Data;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI.WebControls;\r
-\r
-    internal static class DefaultDisplayTemplates {\r
-        internal static string BooleanTemplate(HtmlHelper html) {\r
-            bool? value = null;\r
-            if (html.ViewContext.ViewData.Model != null) {\r
-                value = Convert.ToBoolean(html.ViewContext.ViewData.Model, CultureInfo.InvariantCulture);\r
-            }\r
-\r
-            return html.ViewContext.ViewData.ModelMetadata.IsNullableValueType\r
-                        ? BooleanTemplateDropDownList(value)\r
-                        : BooleanTemplateCheckbox(value ?? false);\r
-        }\r
-\r
-        private static string BooleanTemplateCheckbox(bool value) {\r
-            TagBuilder inputTag = new TagBuilder("input");\r
-            inputTag.AddCssClass("check-box");\r
-            inputTag.Attributes["disabled"] = "disabled";\r
-            inputTag.Attributes["type"] = "checkbox";\r
-            if (value) {\r
-                inputTag.Attributes["checked"] = "checked";\r
-            }\r
-\r
-            return inputTag.ToString(TagRenderMode.SelfClosing);\r
-        }\r
-\r
-        private static string BooleanTemplateDropDownList(bool? value) {\r
-            StringBuilder builder = new StringBuilder();\r
-\r
-            TagBuilder selectTag = new TagBuilder("select");\r
-            selectTag.AddCssClass("list-box");\r
-            selectTag.AddCssClass("tri-state");\r
-            selectTag.Attributes["disabled"] = "disabled";\r
-            builder.Append(selectTag.ToString(TagRenderMode.StartTag));\r
-\r
-            foreach (SelectListItem item in DefaultEditorTemplates.TriStateValues(value)) {\r
-                builder.Append(SelectExtensions.ListItemToOption(item));\r
-            }\r
-\r
-            builder.Append(selectTag.ToString(TagRenderMode.EndTag));\r
-            return builder.ToString();\r
-        }\r
-\r
-        internal static string CollectionTemplate(HtmlHelper html) {\r
-            return CollectionTemplate(html, TemplateHelpers.TemplateHelper);\r
-        }\r
-\r
-        internal static string CollectionTemplate(HtmlHelper html, TemplateHelpers.TemplateHelperDelegate templateHelper) {\r
-            object model = html.ViewContext.ViewData.ModelMetadata.Model;\r
-            if (model == null) {\r
-                return String.Empty;\r
-            }\r
-\r
-            IEnumerable collection = model as IEnumerable;\r
-            if (collection == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.Templates_TypeMustImplementIEnumerable,\r
-                        model.GetType().FullName\r
-                    )\r
-                );\r
-            }\r
-\r
-            Type typeInCollection = typeof(string);\r
-            Type genericEnumerableType = TypeHelpers.ExtractGenericInterface(collection.GetType(), typeof(IEnumerable<>));\r
-            if (genericEnumerableType != null) {\r
-                typeInCollection = genericEnumerableType.GetGenericArguments()[0];\r
-            }\r
-            bool typeInCollectionIsNullableValueType = TypeHelpers.IsNullableValueType(typeInCollection);\r
-\r
-            string oldPrefix = html.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix;\r
-\r
-            try {\r
-                html.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = String.Empty;\r
-\r
-                string fieldNameBase = oldPrefix;\r
-                StringBuilder result = new StringBuilder();\r
-                int index = 0;\r
-\r
-                foreach (object item in collection) {\r
-                    Type itemType = typeInCollection;\r
-                    if (item != null && !typeInCollectionIsNullableValueType) {\r
-                        itemType = item.GetType();\r
-                    }\r
-                    ModelMetadata metadata = ModelMetadataProviders.Current.GetMetadataForType(() => item, itemType);\r
-                    string fieldName = String.Format(CultureInfo.InvariantCulture, "{0}[{1}]", fieldNameBase, index++);\r
-                    string output = templateHelper(html, metadata, fieldName, null /* templateName */, DataBoundControlMode.ReadOnly, null /* additionalViewData */);\r
-                    result.Append(output);\r
-                }\r
-\r
-                return result.ToString();\r
-            }\r
-            finally {\r
-                html.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = oldPrefix;\r
-            }\r
-        }\r
-\r
-        internal static string DecimalTemplate(HtmlHelper html) {\r
-            if (html.ViewContext.ViewData.TemplateInfo.FormattedModelValue == html.ViewContext.ViewData.ModelMetadata.Model) {\r
-                html.ViewContext.ViewData.TemplateInfo.FormattedModelValue = String.Format(CultureInfo.CurrentCulture, "{0:0.00}", html.ViewContext.ViewData.ModelMetadata.Model);\r
-            }\r
-\r
-            return StringTemplate(html);\r
-        }\r
-\r
-        internal static string EmailAddressTemplate(HtmlHelper html) {\r
-            return String.Format(CultureInfo.InvariantCulture,\r
-                                 "<a href=\"mailto:{0}\">{1}</a>",\r
-                                 html.AttributeEncode(html.ViewContext.ViewData.Model),\r
-                                 html.Encode(html.ViewContext.ViewData.TemplateInfo.FormattedModelValue));\r
-        }\r
-\r
-        internal static string HiddenInputTemplate(HtmlHelper html) {\r
-            if (html.ViewContext.ViewData.ModelMetadata.HideSurroundingHtml) {\r
-                return String.Empty;\r
-            }\r
-            return StringTemplate(html);\r
-        }\r
-\r
-        internal static string HtmlTemplate(HtmlHelper html) {\r
-            return html.ViewContext.ViewData.TemplateInfo.FormattedModelValue.ToString();\r
-        }\r
-\r
-        internal static string ObjectTemplate(HtmlHelper html) {\r
-            return ObjectTemplate(html, TemplateHelpers.TemplateHelper);\r
-        }\r
-\r
-        internal static string ObjectTemplate(HtmlHelper html, TemplateHelpers.TemplateHelperDelegate templateHelper) {\r
-            ViewDataDictionary viewData = html.ViewContext.ViewData;\r
-            TemplateInfo templateInfo = viewData.TemplateInfo;\r
-            ModelMetadata modelMetadata = viewData.ModelMetadata;\r
-            StringBuilder builder = new StringBuilder();\r
-\r
-            if (modelMetadata.Model == null) {    // DDB #225237\r
-                return modelMetadata.NullDisplayText;\r
-            }\r
-\r
-            if (templateInfo.TemplateDepth > 1) {    // DDB #224751\r
-                return modelMetadata.SimpleDisplayText;\r
-            }\r
-\r
-            foreach (ModelMetadata propertyMetadata in modelMetadata.Properties.Where(pm => ShouldShow(pm, templateInfo))) {\r
-                if (!propertyMetadata.HideSurroundingHtml) {\r
-                    string label = propertyMetadata.GetDisplayName();\r
-                    if (!String.IsNullOrEmpty(label)) {\r
-                        builder.AppendFormat(CultureInfo.InvariantCulture, "<div class=\"display-label\">{0}</div>", label);\r
-                        builder.AppendLine();\r
-                    }\r
-\r
-                    builder.Append("<div class=\"display-field\">");\r
-                }\r
-\r
-                builder.Append(templateHelper(html, propertyMetadata, propertyMetadata.PropertyName, null /* templateName */, DataBoundControlMode.ReadOnly, null /* additionalViewData */));\r
-\r
-                if (!propertyMetadata.HideSurroundingHtml) {\r
-                    builder.AppendLine("</div>");\r
-                }\r
-            }\r
-\r
-            return builder.ToString();\r
-        }\r
-\r
-        private static bool ShouldShow(ModelMetadata metadata, TemplateInfo templateInfo) {\r
-            return\r
-                metadata.ShowForDisplay\r
-#if false\r
-                && metadata.ModelType != typeof(EntityState)\r
-#endif\r
-                && !metadata.IsComplexType\r
-                && !templateInfo.Visited(metadata);\r
-        }\r
-\r
-        internal static string StringTemplate(HtmlHelper html) {\r
-            return html.Encode(html.ViewContext.ViewData.TemplateInfo.FormattedModelValue);\r
-        }\r
-\r
-        internal static string UrlTemplate(HtmlHelper html) {\r
-            return String.Format(CultureInfo.InvariantCulture,\r
-                                 "<a href=\"{0}\">{1}</a>",\r
-                                 html.AttributeEncode(html.ViewContext.ViewData.Model),\r
-                                 html.Encode(html.ViewContext.ViewData.TemplateInfo.FormattedModelValue));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultEditorTemplates.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultEditorTemplates.cs
deleted file mode 100644 (file)
index 3a5dc83..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Data;\r
-    using System.Data.Linq;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI.WebControls;\r
-\r
-    internal static class DefaultEditorTemplates {\r
-        internal static string BooleanTemplate(HtmlHelper html) {\r
-            bool? value = null;\r
-            if (html.ViewContext.ViewData.Model != null) {\r
-                value = Convert.ToBoolean(html.ViewContext.ViewData.Model, CultureInfo.InvariantCulture);\r
-            }\r
-\r
-            return html.ViewContext.ViewData.ModelMetadata.IsNullableValueType\r
-                        ? BooleanTemplateDropDownList(html, value)\r
-                        : BooleanTemplateCheckbox(html, value ?? false);\r
-        }\r
-\r
-        private static string BooleanTemplateCheckbox(HtmlHelper html, bool value) {\r
-            return html.CheckBox(String.Empty, value, CreateHtmlAttributes("check-box")).ToHtmlString();\r
-        }\r
-\r
-        private static string BooleanTemplateDropDownList(HtmlHelper html, bool? value) {\r
-            return html.DropDownList(String.Empty, TriStateValues(value), CreateHtmlAttributes("list-box tri-state")).ToHtmlString();\r
-\r
-        }\r
-\r
-        internal static string CollectionTemplate(HtmlHelper html) {\r
-            return CollectionTemplate(html, TemplateHelpers.TemplateHelper);\r
-        }\r
-\r
-        internal static string CollectionTemplate(HtmlHelper html, TemplateHelpers.TemplateHelperDelegate templateHelper) {\r
-            object model = html.ViewContext.ViewData.ModelMetadata.Model;\r
-            if (model == null) {\r
-                return String.Empty;\r
-            }\r
-\r
-            IEnumerable collection = model as IEnumerable;\r
-            if (collection == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentCulture,\r
-                        MvcResources.Templates_TypeMustImplementIEnumerable,\r
-                        model.GetType().FullName\r
-                    )\r
-                );\r
-            }\r
-\r
-            Type typeInCollection = typeof(string);\r
-            Type genericEnumerableType = TypeHelpers.ExtractGenericInterface(collection.GetType(), typeof(IEnumerable<>));\r
-            if (genericEnumerableType != null) {\r
-                typeInCollection = genericEnumerableType.GetGenericArguments()[0];\r
-            }\r
-            bool typeInCollectionIsNullableValueType = TypeHelpers.IsNullableValueType(typeInCollection);\r
-\r
-            string oldPrefix = html.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix;\r
-\r
-            try {\r
-                html.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = String.Empty;\r
-\r
-                string fieldNameBase = oldPrefix;\r
-                StringBuilder result = new StringBuilder();\r
-                int index = 0;\r
-\r
-                foreach (object item in collection) {\r
-                    Type itemType = typeInCollection;\r
-                    if (item != null && !typeInCollectionIsNullableValueType) {\r
-                        itemType = item.GetType();\r
-                    }\r
-                    ModelMetadata metadata = ModelMetadataProviders.Current.GetMetadataForType(() => item, itemType);\r
-                    string fieldName = String.Format(CultureInfo.InvariantCulture, "{0}[{1}]", fieldNameBase, index++);\r
-                    string output = templateHelper(html, metadata, fieldName, null /* templateName */, DataBoundControlMode.Edit, null /* additionalViewData */);\r
-                    result.Append(output);\r
-                }\r
-\r
-                return result.ToString();\r
-            }\r
-            finally {\r
-                html.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = oldPrefix;\r
-            }\r
-        }\r
-\r
-        internal static string DecimalTemplate(HtmlHelper html) {\r
-            if (html.ViewContext.ViewData.TemplateInfo.FormattedModelValue == html.ViewContext.ViewData.ModelMetadata.Model) {\r
-                html.ViewContext.ViewData.TemplateInfo.FormattedModelValue = String.Format(CultureInfo.CurrentCulture, "{0:0.00}", html.ViewContext.ViewData.ModelMetadata.Model);\r
-            }\r
-\r
-            return StringTemplate(html);\r
-        }\r
-\r
-        internal static string HiddenInputTemplate(HtmlHelper html) {\r
-            string result;\r
-\r
-            if (html.ViewContext.ViewData.ModelMetadata.HideSurroundingHtml) {\r
-                result = String.Empty;\r
-            }\r
-            else {\r
-                result = DefaultDisplayTemplates.StringTemplate(html);\r
-            }\r
-\r
-            object model = html.ViewContext.ViewData.Model;\r
-\r
-            Binary modelAsBinary = model as Binary;\r
-            if (modelAsBinary != null) {\r
-                model = Convert.ToBase64String(modelAsBinary.ToArray());\r
-            }\r
-            else {\r
-                byte[] modelAsByteArray = model as byte[];\r
-                if (modelAsByteArray != null) {\r
-                    model = Convert.ToBase64String(modelAsByteArray);\r
-                }\r
-            }\r
-\r
-            result += html.Hidden(String.Empty, model).ToHtmlString();\r
-            return result;\r
-        }\r
-\r
-        internal static string MultilineTextTemplate(HtmlHelper html) {\r
-            return html.TextArea(String.Empty,\r
-                                 html.ViewContext.ViewData.TemplateInfo.FormattedModelValue.ToString(),\r
-                                 0 /* rows */, 0 /* columns */,\r
-                                 CreateHtmlAttributes("text-box multi-line")).ToHtmlString();\r
-        }\r
-\r
-        private static IDictionary<string, object> CreateHtmlAttributes(string className) {\r
-            return new Dictionary<string, object>() {\r
-                { "class", className }\r
-            };\r
-        }\r
-\r
-        internal static string ObjectTemplate(HtmlHelper html) {\r
-            return ObjectTemplate(html, TemplateHelpers.TemplateHelper);\r
-        }\r
-\r
-        internal static string ObjectTemplate(HtmlHelper html, TemplateHelpers.TemplateHelperDelegate templateHelper) {\r
-            ViewDataDictionary viewData = html.ViewContext.ViewData;\r
-            TemplateInfo templateInfo = viewData.TemplateInfo;\r
-            ModelMetadata modelMetadata = viewData.ModelMetadata;\r
-            StringBuilder builder = new StringBuilder();\r
-\r
-            if (templateInfo.TemplateDepth > 1) {    // DDB #224751\r
-                return modelMetadata.Model == null ? modelMetadata.NullDisplayText : modelMetadata.SimpleDisplayText;\r
-            }\r
-\r
-            foreach (ModelMetadata propertyMetadata in modelMetadata.Properties.Where(pm => ShouldShow(pm, templateInfo))) {\r
-                if (!propertyMetadata.HideSurroundingHtml) {\r
-                    string label = LabelExtensions.LabelHelper(html, propertyMetadata, propertyMetadata.PropertyName).ToHtmlString();\r
-                    if (!String.IsNullOrEmpty(label)) {\r
-                        builder.AppendFormat(CultureInfo.InvariantCulture, "<div class=\"editor-label\">{0}</div>\r\n", label);\r
-                    }\r
-\r
-                    builder.Append("<div class=\"editor-field\">");\r
-                }\r
-\r
-                builder.Append(templateHelper(html, propertyMetadata, propertyMetadata.PropertyName, null /* templateName */, DataBoundControlMode.Edit, null /* additionalViewData */));\r
-\r
-                if (!propertyMetadata.HideSurroundingHtml) {\r
-                    builder.Append(" ");\r
-                    builder.Append(html.ValidationMessage(propertyMetadata.PropertyName));\r
-                    builder.Append("</div>\r\n");\r
-                }\r
-            }\r
-\r
-            return builder.ToString();\r
-        }\r
-\r
-        internal static string PasswordTemplate(HtmlHelper html) {\r
-            return html.Password(String.Empty,\r
-                                 html.ViewContext.ViewData.TemplateInfo.FormattedModelValue,\r
-                                 CreateHtmlAttributes("text-box single-line password")).ToHtmlString();\r
-        }\r
-\r
-        private static bool ShouldShow(ModelMetadata metadata, TemplateInfo templateInfo) {\r
-            return\r
-                metadata.ShowForEdit\r
-#if false\r
-                && metadata.ModelType != typeof(EntityState)\r
-#endif\r
-                && !metadata.IsComplexType\r
-                && !templateInfo.Visited(metadata);\r
-        }\r
-\r
-        internal static string StringTemplate(HtmlHelper html) {\r
-            return html.TextBox(String.Empty,\r
-                                html.ViewContext.ViewData.TemplateInfo.FormattedModelValue,\r
-                                CreateHtmlAttributes("text-box single-line")).ToHtmlString();\r
-        }\r
-\r
-        internal static List<SelectListItem> TriStateValues(bool? value) {\r
-            return new List<SelectListItem> {\r
-                new SelectListItem { Text = MvcResources.Common_TriState_NotSet, Value = String.Empty, Selected = !value.HasValue },\r
-                new SelectListItem { Text = MvcResources.Common_TriState_True, Value = "true", Selected = value.HasValue && value.Value },\r
-                new SelectListItem { Text = MvcResources.Common_TriState_False, Value = "false", Selected = value.HasValue && !value.Value },\r
-            };\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DisplayExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DisplayExtensions.cs
deleted file mode 100644 (file)
index 372caf0..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System.Linq.Expressions;\r
-    using System.Web.UI.WebControls;\r
-\r
-    public static class DisplayExtensions {\r
-        public static MvcHtmlString Display(this HtmlHelper html, string expression) {\r
-            return TemplateHelpers.Template(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, null /* additionalViewData */);\r
-        }\r
-\r
-        public static MvcHtmlString Display(this HtmlHelper html, string expression, object additionalViewData) {\r
-            return TemplateHelpers.Template(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, additionalViewData);\r
-        }\r
-\r
-        public static MvcHtmlString Display(this HtmlHelper html, string expression, string templateName) {\r
-            return TemplateHelpers.Template(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, null /* additionalViewData */);\r
-        }\r
-\r
-        public static MvcHtmlString Display(this HtmlHelper html, string expression, string templateName, object additionalViewData) {\r
-            return TemplateHelpers.Template(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, additionalViewData);\r
-        }\r
-\r
-        public static MvcHtmlString Display(this HtmlHelper html, string expression, string templateName, string htmlFieldName) {\r
-            return TemplateHelpers.Template(html, expression, templateName, htmlFieldName, DataBoundControlMode.ReadOnly, null /* additionalViewData */);\r
-        }\r
-\r
-        public static MvcHtmlString Display(this HtmlHelper html, string expression, string templateName, string htmlFieldName, object additionalViewData) {\r
-            return TemplateHelpers.Template(html, expression, templateName, htmlFieldName, DataBoundControlMode.ReadOnly, additionalViewData);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DisplayFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression) {\r
-            return TemplateHelpers.TemplateFor(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, null /* additionalViewData */);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DisplayFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, object additionalViewData) {\r
-            return TemplateHelpers.TemplateFor(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, additionalViewData);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DisplayFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, null /* additionalViewData */);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DisplayFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName, object additionalViewData) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.ReadOnly, additionalViewData);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DisplayFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName, string htmlFieldName) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, htmlFieldName, DataBoundControlMode.ReadOnly, null /* additionalViewData */);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DisplayFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName, string htmlFieldName, object additionalViewData) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, htmlFieldName, DataBoundControlMode.ReadOnly, additionalViewData);\r
-        }\r
-\r
-        public static MvcHtmlString DisplayForModel(this HtmlHelper html) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, null /* templateName */, DataBoundControlMode.ReadOnly, null /* additionalViewData */));\r
-        }\r
-\r
-        public static MvcHtmlString DisplayForModel(this HtmlHelper html, object additionalViewData) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, null /* templateName */, DataBoundControlMode.ReadOnly, additionalViewData));\r
-        }\r
-\r
-        public static MvcHtmlString DisplayForModel(this HtmlHelper html, string templateName) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, templateName, DataBoundControlMode.ReadOnly, null /* additionalViewData */));\r
-        }\r
-\r
-        public static MvcHtmlString DisplayForModel(this HtmlHelper html, string templateName, object additionalViewData) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, templateName, DataBoundControlMode.ReadOnly,   additionalViewData ));\r
-        }\r
-\r
-        public static MvcHtmlString DisplayForModel(this HtmlHelper html, string templateName, string htmlFieldName) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, htmlFieldName, templateName, DataBoundControlMode.ReadOnly, null /* additionalViewData */));\r
-        }\r
-\r
-        public static MvcHtmlString DisplayForModel(this HtmlHelper html, string templateName, string htmlFieldName, object additionalViewData) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, htmlFieldName, templateName, DataBoundControlMode.ReadOnly, additionalViewData));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DisplayTextExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DisplayTextExtensions.cs
deleted file mode 100644 (file)
index 272ab0e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Linq.Expressions;\r
-\r
-    public static class DisplayTextExtensions {\r
-        public static MvcHtmlString DisplayText(this HtmlHelper html, string name) {\r
-            return DisplayTextHelper(ModelMetadata.FromStringExpression(name, html.ViewContext.ViewData));\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DisplayTextFor<TModel, TResult>(this HtmlHelper<TModel> html, Expression<Func<TModel, TResult>> expression) {\r
-            return DisplayTextHelper(ModelMetadata.FromLambdaExpression(expression, html.ViewData));\r
-        }\r
-\r
-        private static MvcHtmlString DisplayTextHelper(ModelMetadata metadata) {\r
-            return MvcHtmlString.Create(metadata.SimpleDisplayText);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/EditorExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/EditorExtensions.cs
deleted file mode 100644 (file)
index b022f5c..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Linq.Expressions;\r
-    using System.Web.UI.WebControls;\r
-\r
-    public static class EditorExtensions {\r
-        public static MvcHtmlString Editor(this HtmlHelper html, string expression) {\r
-            return TemplateHelpers.Template(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.Edit, null /* additionalViewData */);\r
-        }\r
-\r
-        public static MvcHtmlString Editor(this HtmlHelper html, string expression, object additionalViewData) {\r
-            return TemplateHelpers.Template(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.Edit, additionalViewData);\r
-        }\r
-\r
-        public static MvcHtmlString Editor(this HtmlHelper html, string expression, string templateName) {\r
-            return TemplateHelpers.Template(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.Edit, null /* additionalViewData */);\r
-        }\r
-\r
-        public static MvcHtmlString Editor(this HtmlHelper html, string expression, string templateName, object additionalViewData) {\r
-            return TemplateHelpers.Template(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.Edit, additionalViewData);\r
-        }\r
-\r
-        public static MvcHtmlString Editor(this HtmlHelper html, string expression, string templateName, string htmlFieldName) {\r
-            return TemplateHelpers.Template(html, expression, templateName, htmlFieldName, DataBoundControlMode.Edit, null /* additionalViewData */);\r
-        }\r
-\r
-        public static MvcHtmlString Editor(this HtmlHelper html, string expression, string templateName, string htmlFieldName, object additionalViewData) {\r
-            return TemplateHelpers.Template(html, expression, templateName, htmlFieldName, DataBoundControlMode.Edit, additionalViewData);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString EditorFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression) {\r
-            return TemplateHelpers.TemplateFor(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.Edit, null /* additionalViewData */);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString EditorFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, object additionalViewData) {\r
-            return TemplateHelpers.TemplateFor(html, expression, null /* templateName */, null /* htmlFieldName */, DataBoundControlMode.Edit, additionalViewData);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString EditorFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.Edit, null /* additionalViewData */);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString EditorFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName, object additionalViewData) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, null /* htmlFieldName */, DataBoundControlMode.Edit, additionalViewData);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString EditorFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName, string htmlFieldName) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, htmlFieldName, DataBoundControlMode.Edit, null /* additionalViewData */);\r
-        }\r
-\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures",\r
-            Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString EditorFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression, string templateName, string htmlFieldName, object additionalViewData) {\r
-            return TemplateHelpers.TemplateFor(html, expression, templateName, htmlFieldName, DataBoundControlMode.Edit, additionalViewData);\r
-        }\r
-\r
-        public static MvcHtmlString EditorForModel(this HtmlHelper html) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, null /* templateName */, DataBoundControlMode.Edit, null /* additionalViewData */));\r
-        }\r
-\r
-        public static MvcHtmlString EditorForModel(this HtmlHelper html, object additionalViewData) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, null /* templateName */, DataBoundControlMode.Edit, additionalViewData));\r
-        }\r
-\r
-        public static MvcHtmlString EditorForModel(this HtmlHelper html, string templateName) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, templateName, DataBoundControlMode.Edit, null /* additionalViewData */));\r
-        }\r
-\r
-        public static MvcHtmlString EditorForModel(this HtmlHelper html, string templateName, object additionalViewData) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, String.Empty, templateName, DataBoundControlMode.Edit, additionalViewData));\r
-        }\r
-\r
-        public static MvcHtmlString EditorForModel(this HtmlHelper html, string templateName, string htmlFieldName) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, htmlFieldName, templateName, DataBoundControlMode.Edit, null /* additionalViewData */));\r
-        }\r
-\r
-        public static MvcHtmlString EditorForModel(this HtmlHelper html, string templateName, string htmlFieldName, object additionalViewData) {\r
-            return MvcHtmlString.Create(TemplateHelpers.TemplateHelper(html, html.ViewData.ModelMetadata, htmlFieldName, templateName, DataBoundControlMode.Edit, additionalViewData));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/FormExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/FormExtensions.cs
deleted file mode 100644 (file)
index b5df159..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System.Collections.Generic;\r
-    using System.Web.Routing;\r
-    using System.Globalization;\r
-\r
-    public static class FormExtensions {\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper) {\r
-            // generates <form action="{current url}" method="post">...</form>\r
-            string formAction = htmlHelper.ViewContext.HttpContext.Request.RawUrl;\r
-            return FormHelper(htmlHelper, formAction, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, object routeValues) {\r
-            return BeginForm(htmlHelper, null, null, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, RouteValueDictionary routeValues) {\r
-            return BeginForm(htmlHelper, null, null, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, FormMethod method) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues, FormMethod method) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues, FormMethod method) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, routeValues, method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, FormMethod method, object htmlAttributes) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(), method, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, object routeValues, FormMethod method, object htmlAttributes) {\r
-            return BeginForm(htmlHelper, actionName, controllerName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginForm(this HtmlHelper htmlHelper, string actionName, string controllerName, RouteValueDictionary routeValues, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            string formAction = UrlHelper.GenerateUrl(null /* routeName */, actionName, controllerName, routeValues, htmlHelper.RouteCollection, htmlHelper.ViewContext.RequestContext, true /* includeImplicitMvcValues */);\r
-            return FormHelper(htmlHelper, formAction, method, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, object routeValues) {\r
-            return BeginRouteForm(htmlHelper, null /* routeName */, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, RouteValueDictionary routeValues) {\r
-            return BeginRouteForm(htmlHelper, null /* routeName */, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, object routeValues) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(routeValues), FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, RouteValueDictionary routeValues) {\r
-            return BeginRouteForm(htmlHelper, routeName, routeValues, FormMethod.Post, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, FormMethod method) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, object routeValues, FormMethod method) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, RouteValueDictionary routeValues, FormMethod method) {\r
-            return BeginRouteForm(htmlHelper, routeName, routeValues, method, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, FormMethod method, object htmlAttributes) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(), method, htmlAttributes);\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, object routeValues, FormMethod method, object htmlAttributes) {\r
-            return BeginRouteForm(htmlHelper, routeName, new RouteValueDictionary(routeValues), method, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcForm BeginRouteForm(this HtmlHelper htmlHelper, string routeName, RouteValueDictionary routeValues, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            string formAction = UrlHelper.GenerateUrl(routeName, null, null, routeValues, htmlHelper.RouteCollection, htmlHelper.ViewContext.RequestContext, false /* includeImplicitMvcValues */);\r
-            return FormHelper(htmlHelper, formAction, method, htmlAttributes);\r
-        }\r
-\r
-        public static void EndForm(this HtmlHelper htmlHelper) {\r
-            htmlHelper.ViewContext.Writer.Write("</form>");\r
-            htmlHelper.ViewContext.OutputClientValidation();\r
-        }\r
-\r
-        private static MvcForm FormHelper(this HtmlHelper htmlHelper, string formAction, FormMethod method, IDictionary<string, object> htmlAttributes) {\r
-            TagBuilder tagBuilder = new TagBuilder("form");\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            // action is implicitly generated, so htmlAttributes take precedence.\r
-            tagBuilder.MergeAttribute("action", formAction);\r
-            // method is an explicit parameter, so it takes precedence over the htmlAttributes.\r
-            tagBuilder.MergeAttribute("method", HtmlHelper.GetFormMethodString(method), true);\r
-\r
-            if (htmlHelper.ViewContext.ClientValidationEnabled) {\r
-                // forms must have an ID for client validation\r
-                tagBuilder.GenerateId(htmlHelper.ViewContext.FormIdGenerator());\r
-            }\r
-\r
-            htmlHelper.ViewContext.Writer.Write(tagBuilder.ToString(TagRenderMode.StartTag));\r
-            MvcForm theForm = new MvcForm(htmlHelper.ViewContext);\r
-\r
-            if (htmlHelper.ViewContext.ClientValidationEnabled) {\r
-                htmlHelper.ViewContext.FormContext.FormId = tagBuilder.Attributes["id"];\r
-            }\r
-\r
-            return theForm;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/InputExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/InputExtensions.cs
deleted file mode 100644 (file)
index 5d56f83..0000000
+++ /dev/null
@@ -1,398 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Data.Linq;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq.Expressions;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class InputExtensions {\r
-        // CheckBox\r
-\r
-        public static MvcHtmlString CheckBox(this HtmlHelper htmlHelper, string name) {\r
-            return CheckBox(htmlHelper, name, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString CheckBox(this HtmlHelper htmlHelper, string name, bool isChecked) {\r
-            return CheckBox(htmlHelper, name, isChecked, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString CheckBox(this HtmlHelper htmlHelper, string name, bool isChecked, object htmlAttributes) {\r
-            return CheckBox(htmlHelper, name, isChecked, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString CheckBox(this HtmlHelper htmlHelper, string name, object htmlAttributes) {\r
-            return CheckBox(htmlHelper, name, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString CheckBox(this HtmlHelper htmlHelper, string name, IDictionary<string, object> htmlAttributes) {\r
-            return CheckBoxHelper(htmlHelper, name, null /* isChecked */, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString CheckBox(this HtmlHelper htmlHelper, string name, bool isChecked, IDictionary<string, object> htmlAttributes) {\r
-            return CheckBoxHelper(htmlHelper, name, isChecked, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString CheckBoxFor<TModel>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, bool>> expression) {\r
-            return CheckBoxFor(htmlHelper, expression, null /* htmlAttributes */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString CheckBoxFor<TModel>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, bool>> expression, object htmlAttributes) {\r
-            return CheckBoxFor(htmlHelper, expression, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString CheckBoxFor<TModel>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, bool>> expression, IDictionary<string, object> htmlAttributes) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-\r
-            ModelMetadata metadata = ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData);\r
-            bool? isChecked = null;\r
-            if (metadata.Model != null) {\r
-                bool modelChecked;\r
-                if (Boolean.TryParse(metadata.Model.ToString(), out modelChecked)) {\r
-                    isChecked = modelChecked;\r
-                }\r
-            }\r
-\r
-            return CheckBoxHelper(htmlHelper, ExpressionHelper.GetExpressionText(expression), isChecked, htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString CheckBoxHelper(HtmlHelper htmlHelper, string name, bool? isChecked, IDictionary<string, object> htmlAttributes) {\r
-            RouteValueDictionary attributes =\r
-                htmlAttributes == null ? new RouteValueDictionary()\r
-                                       : new RouteValueDictionary(htmlAttributes);\r
-\r
-            bool explicitValue = isChecked.HasValue;\r
-            if (explicitValue) {\r
-                attributes.Remove("checked");    // Explicit value must override dictionary\r
-            }\r
-\r
-            return InputHelper(htmlHelper, InputType.CheckBox, name, "true", !explicitValue /* useViewData */, isChecked ?? false, true /* setId */, false /* isExplicitValue */, attributes);\r
-        }\r
-\r
-        // Hidden\r
-\r
-        public static MvcHtmlString Hidden(this HtmlHelper htmlHelper, string name) {\r
-            return Hidden(htmlHelper, name, null /* value */, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString Hidden(this HtmlHelper htmlHelper, string name, object value) {\r
-            return Hidden(htmlHelper, name, value, null /* hmtlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString Hidden(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return Hidden(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString Hidden(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            return HiddenHelper(htmlHelper,\r
-                                value,\r
-                                value == null /* useViewData */,\r
-                                name,\r
-                                htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString HiddenFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression) {\r
-            return HiddenFor(htmlHelper, expression, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString HiddenFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, object htmlAttributes) {\r
-            return HiddenFor(htmlHelper, expression, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString HiddenFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IDictionary<string, object> htmlAttributes) {\r
-            return HiddenHelper(htmlHelper,\r
-                                ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData).Model,\r
-                                false,\r
-                                ExpressionHelper.GetExpressionText(expression),\r
-                                htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString HiddenHelper(HtmlHelper htmlHelper, object value, bool useViewData, string expression, IDictionary<string, object> htmlAttributes) {\r
-            Binary binaryValue = value as Binary;\r
-            if (binaryValue != null) {\r
-                value = binaryValue.ToArray();\r
-            }\r
-\r
-            byte[] byteArrayValue = value as byte[];\r
-            if (byteArrayValue != null) {\r
-                value = Convert.ToBase64String(byteArrayValue);\r
-            }\r
-\r
-            return InputHelper(htmlHelper, InputType.Hidden, expression, value, useViewData, false /* isChecked */, true /* setId */, true /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        // Password\r
-\r
-        public static MvcHtmlString Password(this HtmlHelper htmlHelper, string name) {\r
-            return Password(htmlHelper, name, null /* value */);\r
-        }\r
-\r
-        public static MvcHtmlString Password(this HtmlHelper htmlHelper, string name, object value) {\r
-            return Password(htmlHelper, name, value, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString Password(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return Password(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString Password(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            return PasswordHelper(htmlHelper, name, value, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString PasswordFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression) {\r
-            return PasswordFor(htmlHelper, expression, null /* htmlAttributes */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString PasswordFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, object htmlAttributes) {\r
-            return PasswordFor(htmlHelper, expression, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "Users cannot use anonymous methods with the LambdaExpression type")]\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString PasswordFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IDictionary<string, object> htmlAttributes) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-\r
-            return PasswordHelper(htmlHelper,\r
-                                  ExpressionHelper.GetExpressionText(expression),\r
-                                  null /* value */,\r
-                                  htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString PasswordHelper(HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            return InputHelper(htmlHelper, InputType.Password, name, value, false /* useViewData */, false /* isChecked */, true /* setId */, true /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        // RadioButton\r
-\r
-        public static MvcHtmlString RadioButton(this HtmlHelper htmlHelper, string name, object value) {\r
-            return RadioButton(htmlHelper, name, value, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString RadioButton(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return RadioButton(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RadioButton(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            // Determine whether or not to render the checked attribute based on the contents of ViewData.\r
-            string valueString = Convert.ToString(value, CultureInfo.CurrentCulture);\r
-            bool isChecked = (!String.IsNullOrEmpty(name)) && (String.Equals(htmlHelper.EvalString(name), valueString, StringComparison.OrdinalIgnoreCase));\r
-            // checked attributes is implicit, so we need to ensure that the dictionary takes precedence.\r
-            RouteValueDictionary attributes = htmlAttributes == null ? new RouteValueDictionary() : new RouteValueDictionary(htmlAttributes);\r
-            if (attributes.ContainsKey("checked")) {\r
-                return InputHelper(htmlHelper, InputType.Radio, name, value, false, false, true, true /* isExplicitValue */, attributes);\r
-            }\r
-\r
-            return RadioButton(htmlHelper, name, value, isChecked, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString RadioButton(this HtmlHelper htmlHelper, string name, object value, bool isChecked) {\r
-            return RadioButton(htmlHelper, name, value, isChecked, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString RadioButton(this HtmlHelper htmlHelper, string name, object value, bool isChecked, object htmlAttributes) {\r
-            return RadioButton(htmlHelper, name, value, isChecked, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RadioButton(this HtmlHelper htmlHelper, string name, object value, bool isChecked, IDictionary<string, object> htmlAttributes) {\r
-            if (value == null) {\r
-                throw new ArgumentNullException("value");\r
-            }\r
-            // checked attribute is an explicit parameter so it takes precedence.\r
-            RouteValueDictionary attributes = htmlAttributes == null ? new RouteValueDictionary() : new RouteValueDictionary(htmlAttributes);\r
-            attributes.Remove("checked");\r
-            return InputHelper(htmlHelper, InputType.Radio, name, value, false, isChecked, true, true /* isExplicitValue */, attributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString RadioButtonFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, object value) {\r
-            return RadioButtonFor(htmlHelper, expression, value, null /* htmlAttributes */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString RadioButtonFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, object value, object htmlAttributes) {\r
-            return RadioButtonFor(htmlHelper, expression, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString RadioButtonFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, object value, IDictionary<string, object> htmlAttributes) {\r
-            return RadioButtonHelper(htmlHelper,\r
-                                     ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData).Model,\r
-                                     ExpressionHelper.GetExpressionText(expression),\r
-                                     value,\r
-                                     null /* isChecked */,\r
-                                     htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString RadioButtonHelper(HtmlHelper htmlHelper, object model, string name, object value, bool? isChecked, IDictionary<string, object> htmlAttributes) {\r
-            if (value == null) {\r
-                throw new ArgumentNullException("value");\r
-            }\r
-\r
-            RouteValueDictionary attributes =\r
-                htmlAttributes == null ? new RouteValueDictionary()\r
-                                       : new RouteValueDictionary(htmlAttributes);\r
-\r
-            bool explicitValue = isChecked.HasValue;\r
-            if (explicitValue) {\r
-                attributes.Remove("checked");    // Explicit value must override dictionary\r
-            }\r
-            else {\r
-                string valueString = Convert.ToString(value, CultureInfo.CurrentCulture);\r
-                isChecked = model != null &&\r
-                            !String.IsNullOrEmpty(name) &&\r
-                            String.Equals(model.ToString(), valueString, StringComparison.OrdinalIgnoreCase);\r
-            }\r
-\r
-            return InputHelper(htmlHelper, InputType.Radio, name, value, false /* useViewData */, isChecked ?? false, true /* setId */, true /* isExplicitValue */, attributes);\r
-        }\r
-\r
-        // TextBox\r
-\r
-        public static MvcHtmlString TextBox(this HtmlHelper htmlHelper, string name) {\r
-            return TextBox(htmlHelper, name, null /* value */);\r
-        }\r
-\r
-        public static MvcHtmlString TextBox(this HtmlHelper htmlHelper, string name, object value) {\r
-            return TextBox(htmlHelper, name, value, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString TextBox(this HtmlHelper htmlHelper, string name, object value, object htmlAttributes) {\r
-            return TextBox(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString TextBox(this HtmlHelper htmlHelper, string name, object value, IDictionary<string, object> htmlAttributes) {\r
-            return InputHelper(htmlHelper, InputType.Text, name, value, (value == null) /* useViewData */, false /* isChecked */, true /* setId */, true /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextBoxFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression) {\r
-            return htmlHelper.TextBoxFor(expression, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextBoxFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, object htmlAttributes) {\r
-            return htmlHelper.TextBoxFor(expression, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextBoxFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IDictionary<string, object> htmlAttributes) {\r
-            return TextBoxHelper(htmlHelper,\r
-                                 ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData).Model,\r
-                                 ExpressionHelper.GetExpressionText(expression),\r
-                                 htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString TextBoxHelper(this HtmlHelper htmlHelper, object model, string expression, IDictionary<string, object> htmlAttributes) {\r
-            return InputHelper(htmlHelper, InputType.Text, expression, model, false /* useViewData */, false /* isChecked */, true /* setId */, true /* isExplicitValue */, htmlAttributes);\r
-        }\r
-\r
-        // Helper methods\r
-\r
-        private static MvcHtmlString InputHelper(HtmlHelper htmlHelper, InputType inputType, string name, object value, bool useViewData, bool isChecked, bool setId, bool isExplicitValue, IDictionary<string, object> htmlAttributes) {\r
-            name = htmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(name);\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            TagBuilder tagBuilder = new TagBuilder("input");\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            tagBuilder.MergeAttribute("type", HtmlHelper.GetInputTypeString(inputType));\r
-            tagBuilder.MergeAttribute("name", name, true);\r
-\r
-            string valueParameter = Convert.ToString(value, CultureInfo.CurrentCulture);\r
-            bool usedModelState = false;\r
-\r
-            switch (inputType) {\r
-                case InputType.CheckBox:\r
-                    bool? modelStateWasChecked = htmlHelper.GetModelStateValue(name, typeof(bool)) as bool?;\r
-                    if (modelStateWasChecked.HasValue) {\r
-                        isChecked = modelStateWasChecked.Value;\r
-                        usedModelState = true;\r
-                    }\r
-                    goto case InputType.Radio;\r
-                case InputType.Radio:\r
-                    if (!usedModelState) {\r
-                        string modelStateValue = htmlHelper.GetModelStateValue(name, typeof(string)) as string;\r
-                        if (modelStateValue != null) {\r
-                            isChecked = String.Equals(modelStateValue, valueParameter, StringComparison.Ordinal);\r
-                            usedModelState = true;\r
-                        }\r
-                    }\r
-                    if (!usedModelState && useViewData) {\r
-                        isChecked = htmlHelper.EvalBoolean(name);\r
-                    }\r
-                    if (isChecked) {\r
-                        tagBuilder.MergeAttribute("checked", "checked");\r
-                    }\r
-                    tagBuilder.MergeAttribute("value", valueParameter, isExplicitValue);\r
-                    break;\r
-                case InputType.Password:\r
-                    if (value != null) {\r
-                        tagBuilder.MergeAttribute("value", valueParameter, isExplicitValue);\r
-                    }\r
-                    break;\r
-                default:\r
-                    string attemptedValue = (string)htmlHelper.GetModelStateValue(name, typeof(string));\r
-                    tagBuilder.MergeAttribute("value", attemptedValue ?? ((useViewData) ? htmlHelper.EvalString(name) : valueParameter), isExplicitValue);\r
-                    break;\r
-            }\r
-\r
-            if (setId) {\r
-                tagBuilder.GenerateId(name);\r
-            }\r
-\r
-            // If there are any errors for a named field, we add the css attribute.\r
-            ModelState modelState;\r
-            if (htmlHelper.ViewData.ModelState.TryGetValue(name, out modelState)) {\r
-                if (modelState.Errors.Count > 0) {\r
-                    tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);\r
-                }\r
-            }\r
-\r
-            if (inputType == InputType.CheckBox) {\r
-                // Render an additional <input type="hidden".../> for checkboxes. This\r
-                // addresses scenarios where unchecked checkboxes are not sent in the request.\r
-                // Sending a hidden input makes it possible to know that the checkbox was present\r
-                // on the page when the request was submitted.\r
-                StringBuilder inputItemBuilder = new StringBuilder();\r
-                inputItemBuilder.Append(tagBuilder.ToString(TagRenderMode.SelfClosing));\r
-\r
-                TagBuilder hiddenInput = new TagBuilder("input");\r
-                hiddenInput.MergeAttribute("type", HtmlHelper.GetInputTypeString(InputType.Hidden));\r
-                hiddenInput.MergeAttribute("name", name);\r
-                hiddenInput.MergeAttribute("value", "false");\r
-                inputItemBuilder.Append(hiddenInput.ToString(TagRenderMode.SelfClosing));\r
-                return MvcHtmlString.Create(inputItemBuilder.ToString());\r
-            }\r
-\r
-            return tagBuilder.ToMvcHtmlString(TagRenderMode.SelfClosing);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/LabelExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/LabelExtensions.cs
deleted file mode 100644 (file)
index 4af88ea..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-\r
-    public static class LabelExtensions {\r
-        public static MvcHtmlString Label(this HtmlHelper html, string expression) {\r
-            return LabelHelper(html,\r
-                               ModelMetadata.FromStringExpression(expression, html.ViewData),\r
-                               expression);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString LabelFor<TModel, TValue>(this HtmlHelper<TModel> html, Expression<Func<TModel, TValue>> expression) {\r
-            return LabelHelper(html, \r
-                               ModelMetadata.FromLambdaExpression(expression, html.ViewData), \r
-                               ExpressionHelper.GetExpressionText(expression));\r
-        }\r
-\r
-        public static MvcHtmlString LabelForModel(this HtmlHelper html) {\r
-            return LabelHelper(html, html.ViewData.ModelMetadata, String.Empty);\r
-        }\r
-\r
-        internal static MvcHtmlString LabelHelper(HtmlHelper html, ModelMetadata metadata, string htmlFieldName) {\r
-            string labelText = metadata.DisplayName ?? metadata.PropertyName ?? htmlFieldName.Split('.').Last();\r
-            if (String.IsNullOrEmpty(labelText)) {\r
-                return MvcHtmlString.Empty;\r
-            }\r
-\r
-            TagBuilder tag = new TagBuilder("label");\r
-            tag.Attributes.Add("for", html.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldId(htmlFieldName));\r
-            tag.SetInnerText(labelText);\r
-            return tag.ToMvcHtmlString(TagRenderMode.Normal);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/LinkExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/LinkExtensions.cs
deleted file mode 100644 (file)
index 8250ff3..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class LinkExtensions {\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, new RouteValueDictionary(), new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, object routeValues) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, new RouteValueDictionary(routeValues), new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, object routeValues, object htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, RouteValueDictionary routeValues) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, routeValues, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, null /* controllerName */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName) {\r
-            return ActionLink(htmlHelper, linkText, actionName, controllerName, new RouteValueDictionary(), new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, object routeValues, object htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, controllerName, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return MvcHtmlString.Create(HtmlHelper.GenerateLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, null/* routeName */, actionName, controllerName, routeValues, htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, object routeValues, object htmlAttributes) {\r
-            return ActionLink(htmlHelper, linkText, actionName, controllerName, protocol, hostName, fragment, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ActionLink(this HtmlHelper htmlHelper, string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return MvcHtmlString.Create(HtmlHelper.GenerateLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, null /* routeName */, actionName, controllerName, protocol, hostName, fragment, routeValues, htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, object routeValues) {\r
-            return RouteLink(htmlHelper, linkText, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, RouteValueDictionary routeValues) {\r
-            return RouteLink(htmlHelper, linkText, routeValues, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName) {\r
-            return RouteLink(htmlHelper, linkText, routeName, (object)null /* routeValues */ );\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, object routeValues) {\r
-            return RouteLink(htmlHelper, linkText, routeName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, RouteValueDictionary routeValues) {\r
-            return RouteLink(htmlHelper, linkText, routeName, routeValues, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, object routeValues, object htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, null /* routeName */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, object routeValues, object htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, routeName, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return MvcHtmlString.Create(HtmlHelper.GenerateRouteLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, routeName, routeValues, htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, string protocol, string hostName, string fragment, object routeValues, object htmlAttributes) {\r
-            return RouteLink(htmlHelper, linkText, routeName, protocol, hostName, fragment, new RouteValueDictionary(routeValues), new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString RouteLink(this HtmlHelper htmlHelper, string linkText, string routeName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            if (String.IsNullOrEmpty(linkText)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "linkText");\r
-            }\r
-            return MvcHtmlString.Create(HtmlHelper.GenerateRouteLink(htmlHelper.ViewContext.RequestContext, htmlHelper.RouteCollection, linkText, routeName, protocol, hostName, fragment, routeValues, htmlAttributes));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/MvcForm.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/MvcForm.cs
deleted file mode 100644 (file)
index 6aa1d99..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.IO;\r
-\r
-    public class MvcForm : IDisposable {\r
-\r
-        private bool _disposed;\r
-        private readonly FormContext _originalFormContext;\r
-        private readonly ViewContext _viewContext;\r
-        private readonly TextWriter _writer;\r
-\r
-        [Obsolete("The recommended alternative is the constructor MvcForm(ViewContext viewContext).", true /* error */)]\r
-        public MvcForm(HttpResponseBase httpResponse) {\r
-            if (httpResponse == null) {\r
-                throw new ArgumentNullException("httpResponse");\r
-            }\r
-\r
-            _writer = httpResponse.Output;\r
-        }\r
-\r
-        public MvcForm(ViewContext viewContext) {\r
-            if (viewContext == null) {\r
-                throw new ArgumentNullException("viewContext");\r
-            }\r
-\r
-            _viewContext = viewContext;\r
-            _writer = viewContext.Writer;\r
-\r
-            // push the new FormContext\r
-            _originalFormContext = viewContext.FormContext;\r
-            viewContext.FormContext = new FormContext();\r
-        }\r
-\r
-        public void Dispose() {\r
-            Dispose(true /* disposing */);\r
-            GC.SuppressFinalize(this);\r
-        }\r
-\r
-        protected virtual void Dispose(bool disposing) {\r
-            if (!_disposed) {\r
-                _disposed = true;\r
-                _writer.Write("</form>");\r
-\r
-                // output client validation and restore the original form context\r
-                if (_viewContext != null) {\r
-                    _viewContext.OutputClientValidation();\r
-                    _viewContext.FormContext = _originalFormContext;\r
-                }\r
-            }\r
-        }\r
-\r
-        public void EndForm() {\r
-            Dispose(true);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/PartialExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/PartialExtensions.cs
deleted file mode 100644 (file)
index 8f488c6..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System.Globalization;\r
-    using System.IO;\r
-\r
-    public static class PartialExtensions {\r
-        public static MvcHtmlString Partial(this HtmlHelper htmlHelper, string partialViewName) {\r
-            return Partial(htmlHelper, partialViewName, null /* model */, htmlHelper.ViewData);\r
-        }\r
-\r
-        public static MvcHtmlString Partial(this HtmlHelper htmlHelper, string partialViewName, ViewDataDictionary viewData) {\r
-            return Partial(htmlHelper, partialViewName, null /* model */, viewData);\r
-        }\r
-\r
-        public static MvcHtmlString Partial(this HtmlHelper htmlHelper, string partialViewName, object model) {\r
-            return Partial(htmlHelper, partialViewName, model, htmlHelper.ViewData);\r
-        }\r
-\r
-        public static MvcHtmlString Partial(this HtmlHelper htmlHelper, string partialViewName, object model, ViewDataDictionary viewData) {\r
-            StringWriter writer = new StringWriter(CultureInfo.CurrentCulture);\r
-            htmlHelper.RenderPartialInternal(partialViewName, viewData, model, writer, ViewEngines.Engines);\r
-            return MvcHtmlString.Create(writer.ToString());\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/RenderPartialExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/RenderPartialExtensions.cs
deleted file mode 100644 (file)
index 3d25070..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    public static class RenderPartialExtensions {\r
-        // Renders the partial view with the parent's view data and model\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, htmlHelper.ViewData, null /* model */, htmlHelper.ViewContext.Writer, ViewEngines.Engines);\r
-        }\r
-\r
-        // Renders the partial view with the given view data and, implicitly, the given view data's model\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName, ViewDataDictionary viewData) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, viewData, null /* model */, htmlHelper.ViewContext.Writer, ViewEngines.Engines);\r
-        }\r
-\r
-        // Renders the partial view with an empty view data and the given model\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName, object model) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, htmlHelper.ViewData, model, htmlHelper.ViewContext.Writer, ViewEngines.Engines);\r
-        }\r
-\r
-        // Renders the partial view with a copy of the given view data plus the given model\r
-        public static void RenderPartial(this HtmlHelper htmlHelper, string partialViewName, object model, ViewDataDictionary viewData) {\r
-            htmlHelper.RenderPartialInternal(partialViewName, viewData, model, htmlHelper.ViewContext.Writer, ViewEngines.Engines);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/SelectExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/SelectExtensions.cs
deleted file mode 100644 (file)
index e3cf48b..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class SelectExtensions {\r
-\r
-        // DropDownList\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name) {\r
-            return DropDownList(htmlHelper, name, null /* selectList */, null /* optionLabel */, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name, string optionLabel) {\r
-            return DropDownList(htmlHelper, name, null /* selectList */, optionLabel, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList) {\r
-            return DropDownList(htmlHelper, name, selectList, null /* optionLabel */, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, object htmlAttributes) {\r
-            return DropDownList(htmlHelper, name, selectList, null /* optionLabel */, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, IDictionary<string, object> htmlAttributes) {\r
-            return DropDownList(htmlHelper, name, selectList, null /* optionLabel */, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, string optionLabel) {\r
-            return DropDownList(htmlHelper, name, selectList, optionLabel, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, string optionLabel, object htmlAttributes) {\r
-            return DropDownList(htmlHelper, name, selectList, optionLabel, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString DropDownList(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, string optionLabel, IDictionary<string, object> htmlAttributes) {\r
-            return DropDownListHelper(htmlHelper, name, selectList, optionLabel, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DropDownListFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList) {\r
-            return DropDownListFor(htmlHelper, expression, selectList, null /* optionLabel */, null /* htmlAttributes */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DropDownListFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList, object htmlAttributes) {\r
-            return DropDownListFor(htmlHelper, expression, selectList, null /* optionLabel */, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DropDownListFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList, IDictionary<string, object> htmlAttributes) {\r
-            return DropDownListFor(htmlHelper, expression, selectList, null /* optionLabel */, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DropDownListFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList, string optionLabel) {\r
-            return DropDownListFor(htmlHelper, expression, selectList, optionLabel, null /* htmlAttributes */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DropDownListFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList, string optionLabel, object htmlAttributes) {\r
-            return DropDownListFor(htmlHelper, expression, selectList, optionLabel, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "Users cannot use anonymous methods with the LambdaExpression type")]\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString DropDownListFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList, string optionLabel, IDictionary<string, object> htmlAttributes) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-\r
-            return DropDownListHelper(htmlHelper, ExpressionHelper.GetExpressionText(expression), selectList, optionLabel, htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString DropDownListHelper(HtmlHelper htmlHelper, string expression, IEnumerable<SelectListItem> selectList, string optionLabel, IDictionary<string, object> htmlAttributes) {\r
-            return SelectInternal(htmlHelper, optionLabel, expression, selectList, false /* allowMultiple */, htmlAttributes);\r
-        }\r
-\r
-        // ListBox\r
-\r
-        public static MvcHtmlString ListBox(this HtmlHelper htmlHelper, string name) {\r
-            return ListBox(htmlHelper, name, null /* selectList */, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString ListBox(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList) {\r
-            return ListBox(htmlHelper, name, selectList, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        public static MvcHtmlString ListBox(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, object htmlAttributes) {\r
-            return ListBox(htmlHelper, name, selectList, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ListBox(this HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, IDictionary<string, object> htmlAttributes) {\r
-            return ListBoxHelper(htmlHelper, name, selectList, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString ListBoxFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList) {\r
-            return ListBoxFor(htmlHelper, expression, selectList, null /* htmlAttributes */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString ListBoxFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList, object htmlAttributes) {\r
-            return ListBoxFor(htmlHelper, expression, selectList, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "Users cannot use anonymous methods with the LambdaExpression type")]\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString ListBoxFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IEnumerable<SelectListItem> selectList, IDictionary<string, object> htmlAttributes) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-\r
-            return ListBoxHelper(htmlHelper,\r
-                                 ExpressionHelper.GetExpressionText(expression),\r
-                                 selectList,\r
-                                 htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString ListBoxHelper(HtmlHelper htmlHelper, string name, IEnumerable<SelectListItem> selectList, IDictionary<string, object> htmlAttributes) {\r
-            return SelectInternal(htmlHelper, null /* optionLabel */, name, selectList, true /* allowMultiple */, htmlAttributes);\r
-        }\r
-\r
-        // Helper methods\r
-\r
-        private static IEnumerable<SelectListItem> GetSelectData(this HtmlHelper htmlHelper, string name) {\r
-            object o = null;\r
-            if (htmlHelper.ViewData != null) {\r
-                o = htmlHelper.ViewData.Eval(name);\r
-            }\r
-            if (o == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.HtmlHelper_MissingSelectData,\r
-                        name,\r
-                        "IEnumerable<SelectListItem>"));\r
-            }\r
-            IEnumerable<SelectListItem> selectList = o as IEnumerable<SelectListItem>;\r
-            if (selectList == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.HtmlHelper_WrongSelectDataType,\r
-                        name,\r
-                        o.GetType().FullName,\r
-                        "IEnumerable<SelectListItem>"));\r
-            }\r
-            return selectList;\r
-        }\r
-\r
-        internal static string ListItemToOption(SelectListItem item) {\r
-            TagBuilder builder = new TagBuilder("option") {\r
-                InnerHtml = HttpUtility.HtmlEncode(item.Text)\r
-            };\r
-            if (item.Value != null) {\r
-                builder.Attributes["value"] = item.Value;\r
-            }\r
-            if (item.Selected) {\r
-                builder.Attributes["selected"] = "selected";\r
-            }\r
-            return builder.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        private static MvcHtmlString SelectInternal(this HtmlHelper htmlHelper, string optionLabel, string name, IEnumerable<SelectListItem> selectList, bool allowMultiple, IDictionary<string, object> htmlAttributes) {\r
-            name = htmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(name);\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            bool usedViewData = false;\r
-\r
-            // If we got a null selectList, try to use ViewData to get the list of items.\r
-            if (selectList == null) {\r
-                selectList = htmlHelper.GetSelectData(name);\r
-                usedViewData = true;\r
-            }\r
-\r
-            object defaultValue = (allowMultiple) ? htmlHelper.GetModelStateValue(name, typeof(string[])) : htmlHelper.GetModelStateValue(name, typeof(string));\r
-\r
-            // If we haven't already used ViewData to get the entire list of items then we need to\r
-            // use the ViewData-supplied value before using the parameter-supplied value.\r
-            if (!usedViewData) {\r
-                if (defaultValue == null) {\r
-                    defaultValue = htmlHelper.ViewData.Eval(name);\r
-                }\r
-            }\r
-\r
-            if (defaultValue != null) {\r
-                IEnumerable defaultValues = (allowMultiple) ? defaultValue as IEnumerable : new[] { defaultValue };\r
-                IEnumerable<string> values = from object value in defaultValues select Convert.ToString(value, CultureInfo.CurrentCulture);\r
-                HashSet<string> selectedValues = new HashSet<string>(values, StringComparer.OrdinalIgnoreCase);\r
-                List<SelectListItem> newSelectList = new List<SelectListItem>();\r
-\r
-                foreach (SelectListItem item in selectList) {\r
-                    item.Selected = (item.Value != null) ? selectedValues.Contains(item.Value) : selectedValues.Contains(item.Text);\r
-                    newSelectList.Add(item);\r
-                }\r
-                selectList = newSelectList;\r
-            }\r
-\r
-            // Convert each ListItem to an <option> tag\r
-            StringBuilder listItemBuilder = new StringBuilder();\r
-\r
-            // Make optionLabel the first item that gets rendered.\r
-            if (optionLabel != null) {\r
-                listItemBuilder.AppendLine(ListItemToOption(new SelectListItem() { Text = optionLabel, Value = String.Empty, Selected = false }));\r
-            }\r
-\r
-            foreach (SelectListItem item in selectList) {\r
-                listItemBuilder.AppendLine(ListItemToOption(item));\r
-            }\r
-\r
-            TagBuilder tagBuilder = new TagBuilder("select") {\r
-                InnerHtml = listItemBuilder.ToString()\r
-            };\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            tagBuilder.MergeAttribute("name", name, true /* replaceExisting */);\r
-            tagBuilder.GenerateId(name);\r
-            if (allowMultiple) {\r
-                tagBuilder.MergeAttribute("multiple", "multiple");\r
-            }\r
-\r
-            // If there are any errors for a named field, we add the css attribute.\r
-            ModelState modelState;\r
-            if (htmlHelper.ViewData.ModelState.TryGetValue(name, out modelState)) {\r
-                if (modelState.Errors.Count > 0) {\r
-                    tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);\r
-                }\r
-            }\r
-\r
-            return tagBuilder.ToMvcHtmlString(TagRenderMode.Normal);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/TemplateHelpers.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/TemplateHelpers.cs
deleted file mode 100644 (file)
index b220233..0000000
+++ /dev/null
@@ -1,277 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-    using System.Web.UI.WebControls;\r
-\r
-    internal static class TemplateHelpers {\r
-        static readonly Dictionary<DataBoundControlMode, string> modeViewPaths =\r
-            new Dictionary<DataBoundControlMode, string> {\r
-                { DataBoundControlMode.ReadOnly, "DisplayTemplates" },\r
-                { DataBoundControlMode.Edit,     "EditorTemplates" }\r
-            };\r
-\r
-        static readonly Dictionary<string, Func<HtmlHelper, string>> defaultDisplayActions =\r
-            new Dictionary<string, Func<HtmlHelper, string>>(StringComparer.OrdinalIgnoreCase) {\r
-                { "EmailAddress",       DefaultDisplayTemplates.EmailAddressTemplate },\r
-                { "HiddenInput",        DefaultDisplayTemplates.HiddenInputTemplate },\r
-                { "Html",               DefaultDisplayTemplates.HtmlTemplate },\r
-                { "Text",               DefaultDisplayTemplates.StringTemplate },\r
-                { "Url",                DefaultDisplayTemplates.UrlTemplate },\r
-                { "Collection",         DefaultDisplayTemplates.CollectionTemplate },\r
-                { typeof(bool).Name,    DefaultDisplayTemplates.BooleanTemplate },\r
-                { typeof(decimal).Name, DefaultDisplayTemplates.DecimalTemplate },\r
-                { typeof(string).Name,  DefaultDisplayTemplates.StringTemplate },\r
-                { typeof(object).Name,  DefaultDisplayTemplates.ObjectTemplate },\r
-            };\r
-\r
-        static readonly Dictionary<string, Func<HtmlHelper, string>> defaultEditorActions =\r
-            new Dictionary<string, Func<HtmlHelper, string>>(StringComparer.OrdinalIgnoreCase) {\r
-                { "HiddenInput",        DefaultEditorTemplates.HiddenInputTemplate },\r
-                { "MultilineText",      DefaultEditorTemplates.MultilineTextTemplate },\r
-                { "Password",           DefaultEditorTemplates.PasswordTemplate },\r
-                { "Text",               DefaultEditorTemplates.StringTemplate },\r
-                { "Collection",         DefaultEditorTemplates.CollectionTemplate },\r
-                { typeof(bool).Name,    DefaultEditorTemplates.BooleanTemplate },\r
-                { typeof(decimal).Name, DefaultEditorTemplates.DecimalTemplate },\r
-                { typeof(string).Name,  DefaultEditorTemplates.StringTemplate },\r
-                { typeof(object).Name,  DefaultEditorTemplates.ObjectTemplate },\r
-            };\r
-\r
-        internal static string cacheItemId = Guid.NewGuid().ToString();\r
-\r
-        internal delegate string ExecuteTemplateDelegate(HtmlHelper html, ViewDataDictionary viewData, string templateName, DataBoundControlMode mode, GetViewNamesDelegate getViewNames);\r
-\r
-        internal static string ExecuteTemplate(HtmlHelper html, ViewDataDictionary viewData, string templateName, DataBoundControlMode mode, GetViewNamesDelegate getViewNames) {\r
-            Dictionary<string, ActionCacheItem> actionCache = GetActionCache(html);\r
-            Dictionary<string, Func<HtmlHelper, string>> defaultActions = mode == DataBoundControlMode.ReadOnly ? defaultDisplayActions : defaultEditorActions;\r
-            string modeViewPath = modeViewPaths[mode];\r
-\r
-            foreach (string viewName in getViewNames(viewData.ModelMetadata, templateName, viewData.ModelMetadata.TemplateHint, viewData.ModelMetadata.DataTypeName)) {\r
-                string fullViewName = modeViewPath + "/" + viewName;\r
-                ActionCacheItem cacheItem;\r
-\r
-                if (actionCache.TryGetValue(fullViewName, out cacheItem)) {\r
-                    if (cacheItem != null) {\r
-                        return cacheItem.Execute(html, viewData);\r
-                    }\r
-                }\r
-                else {\r
-                    ViewEngineResult viewEngineResult = ViewEngines.Engines.FindPartialView(html.ViewContext, fullViewName);\r
-                    if (viewEngineResult.View != null) {\r
-                        actionCache[fullViewName] = new ActionCacheViewItem { ViewName = fullViewName };\r
-\r
-                        StringWriter writer = new StringWriter(CultureInfo.InvariantCulture);\r
-                        viewEngineResult.View.Render(new ViewContext(html.ViewContext, viewEngineResult.View, viewData, html.ViewContext.TempData, writer), writer);\r
-                        return writer.ToString();\r
-                    }\r
-\r
-                    Func<HtmlHelper, string> defaultAction;\r
-                    if (defaultActions.TryGetValue(viewName, out defaultAction)) {\r
-                        actionCache[fullViewName] = new ActionCacheCodeItem { Action = defaultAction };\r
-                        return defaultAction(\r
-                            new HtmlHelper(\r
-                                new ViewContext(html.ViewContext, html.ViewContext.View, viewData, html.ViewContext.TempData, html.ViewContext.Writer),\r
-                                html.ViewDataContainer\r
-                            )\r
-                        );\r
-                    }\r
-\r
-                    actionCache[fullViewName] = null;\r
-                }\r
-            }\r
-\r
-            throw new InvalidOperationException(\r
-                String.Format(\r
-                    CultureInfo.CurrentCulture,\r
-                    MvcResources.TemplateHelpers_NoTemplate,\r
-                    viewData.ModelMetadata.RealModelType.FullName\r
-                )\r
-            );\r
-        }\r
-\r
-        internal static Dictionary<string, ActionCacheItem> GetActionCache(HtmlHelper html) {\r
-            HttpContextBase context = html.ViewContext.HttpContext;\r
-            Dictionary<string, ActionCacheItem> result;\r
-\r
-            if (!context.Items.Contains(cacheItemId)) {\r
-                result = new Dictionary<string, ActionCacheItem>();\r
-                context.Items[cacheItemId] = result;\r
-            }\r
-            else {\r
-                result = (Dictionary<string, ActionCacheItem>)context.Items[cacheItemId];\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        internal delegate IEnumerable<string> GetViewNamesDelegate(ModelMetadata metadata, params string[] templateHints);\r
-\r
-        internal static IEnumerable<string> GetViewNames(ModelMetadata metadata, params string[] templateHints) {\r
-            foreach (string templateHint in templateHints.Where(s => !String.IsNullOrEmpty(s))) {\r
-                yield return templateHint;\r
-            }\r
-\r
-            // We don't want to search for Nullable<T>, we want to search for T (which should handle both T and Nullable<T>)\r
-            Type fieldType = Nullable.GetUnderlyingType(metadata.RealModelType) ?? metadata.RealModelType;\r
-\r
-            // TODO: Make better string names for generic types\r
-            yield return fieldType.Name;\r
-\r
-            if (!metadata.IsComplexType) {\r
-                yield return "String";\r
-            }\r
-            else if (fieldType.IsInterface) {\r
-                if (typeof(IEnumerable).IsAssignableFrom(fieldType)) {\r
-                    yield return "Collection";\r
-                }\r
-\r
-                yield return "Object";\r
-            }\r
-            else {\r
-                bool isEnumerable = typeof(IEnumerable).IsAssignableFrom(fieldType);\r
-\r
-                while (true) {\r
-                    fieldType = fieldType.BaseType;\r
-                    if (fieldType == null)\r
-                        break;\r
-\r
-                    if (isEnumerable && fieldType == typeof(Object)) {\r
-                        yield return "Collection";\r
-                    }\r
-\r
-                    yield return fieldType.Name;\r
-                }\r
-            }\r
-        }\r
-\r
-        internal static MvcHtmlString Template(HtmlHelper html, string expression, string templateName, string htmlFieldName, DataBoundControlMode mode, object additionalViewData) {\r
-            return MvcHtmlString.Create(Template(html, expression, templateName, htmlFieldName, mode, additionalViewData, TemplateHelper));\r
-        }\r
-\r
-        // Unit testing version\r
-        internal static string Template(HtmlHelper html, string expression, string templateName, string htmlFieldName,\r
-                                        DataBoundControlMode mode, object additionalViewData, TemplateHelperDelegate templateHelper) {\r
-            return templateHelper(html,\r
-                                  ModelMetadata.FromStringExpression(expression, html.ViewData),\r
-                                  htmlFieldName ?? ExpressionHelper.GetExpressionText(expression),\r
-                                  templateName,\r
-                                  mode,\r
-                                  additionalViewData);\r
-        }\r
-\r
-        internal static MvcHtmlString TemplateFor<TContainer, TValue>(this HtmlHelper<TContainer> html, Expression<Func<TContainer, TValue>> expression,\r
-                                                                      string templateName, string htmlFieldName, DataBoundControlMode mode,\r
-                                                                      object additionalViewData) {\r
-            return MvcHtmlString.Create(TemplateFor(html, expression, templateName, htmlFieldName, mode, additionalViewData, TemplateHelper));\r
-        }\r
-\r
-        // Unit testing version\r
-        internal static string TemplateFor<TContainer, TValue>(this HtmlHelper<TContainer> html, Expression<Func<TContainer, TValue>> expression,\r
-                                                               string templateName, string htmlFieldName, DataBoundControlMode mode,\r
-                                                               object additionalViewData, TemplateHelperDelegate templateHelper) {\r
-            return templateHelper(html,\r
-                                  ModelMetadata.FromLambdaExpression(expression, html.ViewData),\r
-                                  htmlFieldName ?? ExpressionHelper.GetExpressionText(expression),\r
-                                  templateName,\r
-                                  mode,\r
-                                  additionalViewData);\r
-        }\r
-\r
-        internal delegate string TemplateHelperDelegate(HtmlHelper html, ModelMetadata metadata, string htmlFieldName, string templateName, DataBoundControlMode mode, object additionalViewData);\r
-\r
-        internal static string TemplateHelper(HtmlHelper html, ModelMetadata metadata, string htmlFieldName, string templateName, DataBoundControlMode mode, object additionalViewData) {\r
-            return TemplateHelper(html, metadata, htmlFieldName, templateName, mode, additionalViewData, ExecuteTemplate);\r
-        }\r
-\r
-        internal static string TemplateHelper(HtmlHelper html, ModelMetadata metadata, string htmlFieldName, string templateName, DataBoundControlMode mode, object additionalViewData, ExecuteTemplateDelegate executeTemplate) {\r
-            // TODO: Convert Editor into Display if model.IsReadOnly is true? Need to be careful about this because\r
-            // the Model property on the ViewPage/ViewUserControl is get-only, so the type descriptor automatically\r
-            // decorates it with a [ReadOnly] attribute...\r
-\r
-            if (metadata.ConvertEmptyStringToNull && String.Empty.Equals(metadata.Model)) {\r
-                metadata.Model = null;\r
-            }\r
-\r
-            object formattedModelValue = metadata.Model;\r
-            if (metadata.Model == null && mode == DataBoundControlMode.ReadOnly) {\r
-                formattedModelValue = metadata.NullDisplayText;\r
-            }\r
-\r
-            string formatString = mode == DataBoundControlMode.ReadOnly ? metadata.DisplayFormatString : metadata.EditFormatString;\r
-            if (metadata.Model != null && !String.IsNullOrEmpty(formatString)) {\r
-                formattedModelValue = String.Format(CultureInfo.CurrentCulture, formatString, metadata.Model);\r
-            }\r
-\r
-            // Normally this shouldn't happen, unless someone writes their own custom Object templates which\r
-            // don't check to make sure that the object hasn't already been displayed\r
-            object visitedObjectsKey = metadata.Model ?? metadata.RealModelType;\r
-            if (html.ViewDataContainer.ViewData.TemplateInfo.VisitedObjects.Contains(visitedObjectsKey)) {    // DDB #224750\r
-                return String.Empty;\r
-            }\r
-\r
-            ViewDataDictionary viewData = new ViewDataDictionary(html.ViewDataContainer.ViewData) {\r
-                Model = metadata.Model,\r
-                ModelMetadata = metadata,\r
-                TemplateInfo = new TemplateInfo {\r
-                    FormattedModelValue = formattedModelValue,\r
-                    HtmlFieldPrefix = html.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(htmlFieldName),\r
-                    VisitedObjects = new HashSet<object>(html.ViewContext.ViewData.TemplateInfo.VisitedObjects),    // DDB #224750\r
-                }\r
-            };\r
-\r
-            if (additionalViewData != null) {\r
-                foreach (KeyValuePair<string, object> kvp in new RouteValueDictionary(additionalViewData)) {\r
-                    viewData[kvp.Key] = kvp.Value;\r
-                }\r
-            }\r
-\r
-            viewData.TemplateInfo.VisitedObjects.Add(visitedObjectsKey);    // DDB #224750\r
-\r
-            return executeTemplate(html, viewData, templateName, mode, GetViewNames);\r
-        }\r
-\r
-        internal abstract class ActionCacheItem {\r
-            public abstract string Execute(HtmlHelper html, ViewDataDictionary viewData);\r
-        }\r
-\r
-        internal class ActionCacheCodeItem : ActionCacheItem {\r
-            public Func<HtmlHelper, string> Action { get; set; }\r
-\r
-            public override string Execute(HtmlHelper html, ViewDataDictionary viewData) {\r
-                ViewContext newViewContext = new ViewContext(html.ViewContext, html.ViewContext.View, viewData, html.ViewContext.TempData, html.ViewContext.Writer);\r
-                HtmlHelper newHtmlHelper = new HtmlHelper(newViewContext, html.ViewDataContainer);\r
-                return Action(newHtmlHelper);\r
-            }\r
-        }\r
-\r
-        internal class ActionCacheViewItem : ActionCacheItem {\r
-            public string ViewName { get; set; }\r
-\r
-            public override string Execute(HtmlHelper html, ViewDataDictionary viewData) {\r
-                ViewEngineResult viewEngineResult = ViewEngines.Engines.FindPartialView(html.ViewContext, ViewName);\r
-                StringWriter writer = new StringWriter(CultureInfo.InvariantCulture);\r
-                viewEngineResult.View.Render(new ViewContext(html.ViewContext, viewEngineResult.View, viewData, html.ViewContext.TempData, writer), writer);\r
-                return writer.ToString();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/TextAreaExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/TextAreaExtensions.cs
deleted file mode 100644 (file)
index 4443c43..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq.Expressions;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class TextAreaExtensions {\r
-        // These values are similar to the defaults used by WebForms\r
-        // when using <asp:TextBox TextMode="MultiLine"> without specifying\r
-        // the Rows and Columns attributes.\r
-        private const int TextAreaRows = 2;\r
-        private const int TextAreaColumns = 20;\r
-        private static Dictionary<string, object> implicitRowsAndColumns = new Dictionary<string, object> {\r
-            { "rows", TextAreaRows.ToString(CultureInfo.InvariantCulture) },\r
-            { "cols", TextAreaColumns.ToString(CultureInfo.InvariantCulture) },\r
-        };\r
-\r
-        private static Dictionary<string, object> GetRowsAndColumnsDictionary(int rows, int columns) {\r
-            if (rows < 0) {\r
-                throw new ArgumentOutOfRangeException("rows", MvcResources.HtmlHelper_TextAreaParameterOutOfRange);\r
-            }\r
-            if (columns < 0) {\r
-                throw new ArgumentOutOfRangeException("columns", MvcResources.HtmlHelper_TextAreaParameterOutOfRange);\r
-            }\r
-\r
-            Dictionary<string, object> result = new Dictionary<string, object>();\r
-            if (rows > 0) {\r
-                result.Add("rows", rows.ToString(CultureInfo.InvariantCulture));\r
-            }\r
-            if (columns > 0) {\r
-                result.Add("cols", columns.ToString(CultureInfo.InvariantCulture));\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name) {\r
-            return TextArea(htmlHelper, name, null /* value */, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name, object htmlAttributes) {\r
-            return TextArea(htmlHelper, name, null /* value */, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name, IDictionary<string, object> htmlAttributes) {\r
-            return TextArea(htmlHelper, name, null /* value */, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name, string value) {\r
-            return TextArea(htmlHelper, name, value, null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name, string value, object htmlAttributes) {\r
-            return TextArea(htmlHelper, name, value, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name, string value, IDictionary<string, object> htmlAttributes) {\r
-            ModelMetadata metadata = ModelMetadata.FromStringExpression(name, htmlHelper.ViewContext.ViewData);\r
-            if (value != null) {\r
-                metadata.Model = value;\r
-            }\r
-\r
-            return TextAreaHelper(htmlHelper, metadata, name, implicitRowsAndColumns, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name, string value, int rows, int columns, object htmlAttributes) {\r
-            return TextArea(htmlHelper, name, value, rows, columns, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString TextArea(this HtmlHelper htmlHelper, string name, string value, int rows, int columns, IDictionary<string, object> htmlAttributes) {\r
-            ModelMetadata metadata = ModelMetadata.FromStringExpression(name, htmlHelper.ViewContext.ViewData);\r
-            if (value != null) {\r
-                metadata.Model = value;\r
-            }\r
-\r
-            return TextAreaHelper(htmlHelper, metadata, name, GetRowsAndColumnsDictionary(rows, columns), htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextAreaFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression) {\r
-            return TextAreaFor(htmlHelper, expression, (IDictionary<string, object>)null);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextAreaFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, object htmlAttributes) {\r
-            return TextAreaFor(htmlHelper, expression, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextAreaFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, IDictionary<string, object> htmlAttributes) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-\r
-            return TextAreaHelper(htmlHelper,\r
-                                  ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData),\r
-                                  ExpressionHelper.GetExpressionText(expression),\r
-                                  implicitRowsAndColumns,\r
-                                  htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextAreaFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, int rows, int columns, object htmlAttributes) {\r
-            return TextAreaFor(htmlHelper, expression, rows, columns, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString TextAreaFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, int rows, int columns, IDictionary<string, object> htmlAttributes) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-\r
-            return TextAreaHelper(htmlHelper,\r
-                                  ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData),\r
-                                  ExpressionHelper.GetExpressionText(expression),\r
-                                  GetRowsAndColumnsDictionary(rows, columns),\r
-                                  htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Justification = "If this fails, it is because the string-based version had an empty 'name' parameter")]\r
-        private static MvcHtmlString TextAreaHelper(HtmlHelper htmlHelper, ModelMetadata modelMetadata, string expression, IDictionary<string, object> rowsAndColumns, IDictionary<string, object> htmlAttributes) {\r
-            string name = htmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(expression);\r
-            if (String.IsNullOrEmpty(name)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "name");\r
-            }\r
-\r
-            TagBuilder tagBuilder = new TagBuilder("textarea");\r
-            tagBuilder.GenerateId(name);\r
-            tagBuilder.MergeAttributes(htmlAttributes, true);\r
-            tagBuilder.MergeAttributes(rowsAndColumns, rowsAndColumns != implicitRowsAndColumns);  // Only force explicit rows/cols\r
-            tagBuilder.MergeAttribute("name", name, true);\r
-\r
-            // If there are any errors for a named field, we add the CSS attribute.\r
-            ModelState modelState;\r
-            if (htmlHelper.ViewData.ModelState.TryGetValue(name, out modelState) && modelState.Errors.Count > 0) {\r
-                tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);\r
-            }\r
-\r
-            string value;\r
-            if (modelState != null && modelState.Value != null) {\r
-                value = modelState.Value.AttemptedValue;\r
-            }\r
-            else if (modelMetadata.Model != null) {\r
-                value = modelMetadata.Model.ToString();\r
-            }\r
-            else {\r
-                value = String.Empty;\r
-            }\r
-\r
-            // The first newline is always trimmed when a TextArea is rendered, so we add an extra one\r
-            // in case the value being rendered is something like "\r\nHello".\r
-            tagBuilder.SetInnerText(Environment.NewLine + value);\r
-\r
-            return tagBuilder.ToMvcHtmlString(TagRenderMode.Normal);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/ValidationExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/ValidationExtensions.cs
deleted file mode 100644 (file)
index 1284a49..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc.Html {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public static class ValidationExtensions {\r
-\r
-        private const string _hiddenListItem = @"<li style=""display:none""></li>";\r
-        private static string _resourceClassKey;\r
-\r
-        public static string ResourceClassKey {\r
-            get {\r
-                return _resourceClassKey ?? String.Empty;\r
-            }\r
-            set {\r
-                _resourceClassKey = value;\r
-            }\r
-        }\r
-\r
-        private static FieldValidationMetadata ApplyFieldValidationMetadata(HtmlHelper htmlHelper, ModelMetadata modelMetadata, string modelName) {\r
-            FormContext formContext = htmlHelper.ViewContext.FormContext;\r
-            FieldValidationMetadata fieldMetadata = formContext.GetValidationMetadataForField(modelName, true /* createIfNotFound */);\r
-\r
-            // write rules to context object\r
-            IEnumerable<ModelValidator> validators = ModelValidatorProviders.Providers.GetValidators(modelMetadata, htmlHelper.ViewContext);\r
-            foreach (ModelClientValidationRule rule in validators.SelectMany(v => v.GetClientValidationRules())) {\r
-                fieldMetadata.ValidationRules.Add(rule);\r
-            }\r
-\r
-            return fieldMetadata;\r
-        }\r
-\r
-        private static string GetInvalidPropertyValueResource(HttpContextBase httpContext) {\r
-            string resourceValue = null;\r
-            if (!String.IsNullOrEmpty(ResourceClassKey) && (httpContext != null)) {\r
-                // If the user specified a ResourceClassKey try to load the resource they specified.\r
-                // If the class key is invalid, an exception will be thrown.\r
-                // If the class key is valid but the resource is not found, it returns null, in which\r
-                // case it will fall back to the MVC default error message.\r
-                resourceValue = httpContext.GetGlobalResourceObject(ResourceClassKey, "InvalidPropertyValue", CultureInfo.CurrentUICulture) as string;\r
-            }\r
-            return resourceValue ?? MvcResources.Common_ValueNotValidForProperty;\r
-        }\r
-\r
-        private static string GetUserErrorMessageOrDefault(HttpContextBase httpContext, ModelError error, ModelState modelState) {\r
-            if (!String.IsNullOrEmpty(error.ErrorMessage)) {\r
-                return error.ErrorMessage;\r
-            }\r
-            if (modelState == null) {\r
-                return null;\r
-            }\r
-\r
-            string attemptedValue = (modelState.Value != null) ? modelState.Value.AttemptedValue : null;\r
-            return String.Format(CultureInfo.CurrentCulture, GetInvalidPropertyValueResource(httpContext), attemptedValue);\r
-        }\r
-\r
-        // Validate\r
-\r
-        public static void Validate(this HtmlHelper htmlHelper, string modelName) {\r
-            if (modelName == null) {\r
-                throw new ArgumentNullException("modelName");\r
-            }\r
-\r
-            ValidateHelper(htmlHelper,\r
-                ModelMetadata.FromStringExpression(modelName, htmlHelper.ViewContext.ViewData),\r
-                modelName);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static void ValidateFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression) {\r
-            ValidateHelper(htmlHelper,\r
-                ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData),\r
-                ExpressionHelper.GetExpressionText(expression));\r
-        }\r
-\r
-        private static void ValidateHelper(HtmlHelper htmlHelper, ModelMetadata modelMetadata, string expression) {\r
-            FormContext formContext = htmlHelper.ViewContext.GetFormContextForClientValidation();\r
-            if (formContext == null) {\r
-                return; // nothing to do\r
-            }\r
-\r
-            string modelName = htmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(expression);\r
-            ApplyFieldValidationMetadata(htmlHelper, modelMetadata, modelName);\r
-        }\r
-\r
-        // ValidationMessage\r
-\r
-        public static MvcHtmlString ValidationMessage(this HtmlHelper htmlHelper, string modelName) {\r
-            return ValidationMessage(htmlHelper, modelName, null /* validationMessage */, new RouteValueDictionary());\r
-        }\r
-\r
-        public static MvcHtmlString ValidationMessage(this HtmlHelper htmlHelper, string modelName, object htmlAttributes) {\r
-            return ValidationMessage(htmlHelper, modelName, null /* validationMessage */, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", Justification = "'validationMessage' refers to the message that will be rendered by the ValidationMessage helper.")]\r
-        public static MvcHtmlString ValidationMessage(this HtmlHelper htmlHelper, string modelName, string validationMessage) {\r
-            return ValidationMessage(htmlHelper, modelName, validationMessage, new RouteValueDictionary());\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", Justification = "'validationMessage' refers to the message that will be rendered by the ValidationMessage helper.")]\r
-        public static MvcHtmlString ValidationMessage(this HtmlHelper htmlHelper, string modelName, string validationMessage, object htmlAttributes) {\r
-            return ValidationMessage(htmlHelper, modelName, validationMessage, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ValidationMessage(this HtmlHelper htmlHelper, string modelName, IDictionary<string, object> htmlAttributes) {\r
-            return ValidationMessage(htmlHelper, modelName, null /* validationMessage */, htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames", Justification = "'validationMessage' refers to the message that will be rendered by the ValidationMessage helper.")]\r
-        public static MvcHtmlString ValidationMessage(this HtmlHelper htmlHelper, string modelName, string validationMessage, IDictionary<string, object> htmlAttributes) {\r
-            if (modelName == null) {\r
-                throw new ArgumentNullException("modelName");\r
-            }\r
-\r
-            return ValidationMessageHelper(htmlHelper,\r
-                                           ModelMetadata.FromStringExpression(modelName, htmlHelper.ViewContext.ViewData),\r
-                                           modelName,\r
-                                           validationMessage,\r
-                                           htmlAttributes);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString ValidationMessageFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression) {\r
-            return ValidationMessageFor(htmlHelper, expression, null /* validationMessage */, new RouteValueDictionary());\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString ValidationMessageFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, string validationMessage) {\r
-            return ValidationMessageFor(htmlHelper, expression, validationMessage, new RouteValueDictionary());\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString ValidationMessageFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, string validationMessage, object htmlAttributes) {\r
-            return ValidationMessageFor(htmlHelper, expression, validationMessage, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static MvcHtmlString ValidationMessageFor<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, string validationMessage, IDictionary<string, object> htmlAttributes) {\r
-            return ValidationMessageHelper(htmlHelper,\r
-                                           ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData),\r
-                                           ExpressionHelper.GetExpressionText(expression),\r
-                                           validationMessage,\r
-                                           htmlAttributes);\r
-        }\r
-\r
-        private static MvcHtmlString ValidationMessageHelper(this HtmlHelper htmlHelper, ModelMetadata modelMetadata, string expression, string validationMessage, IDictionary<string, object> htmlAttributes) {\r
-            string modelName = htmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(expression);\r
-            FormContext formContext = htmlHelper.ViewContext.GetFormContextForClientValidation();\r
-\r
-            if (!htmlHelper.ViewData.ModelState.ContainsKey(modelName) && formContext == null) {\r
-                return null;\r
-            }\r
-\r
-            ModelState modelState = htmlHelper.ViewData.ModelState[modelName];\r
-            ModelErrorCollection modelErrors = (modelState == null) ? null : modelState.Errors;\r
-            ModelError modelError = ((modelErrors == null) || (modelErrors.Count == 0)) ? null : modelErrors[0];\r
-\r
-            if (modelError == null && formContext == null) {\r
-                return null;\r
-            }\r
-\r
-            TagBuilder builder = new TagBuilder("span");\r
-            builder.MergeAttributes(htmlAttributes);\r
-            builder.AddCssClass((modelError != null) ? HtmlHelper.ValidationMessageCssClassName : HtmlHelper.ValidationMessageValidCssClassName);\r
-\r
-            if (!String.IsNullOrEmpty(validationMessage)) {\r
-                builder.SetInnerText(validationMessage);\r
-            }\r
-            else if (modelError != null) {\r
-                builder.SetInnerText(GetUserErrorMessageOrDefault(htmlHelper.ViewContext.HttpContext, modelError, modelState));\r
-            }\r
-\r
-            if (formContext != null) {\r
-                // client validation always requires an ID\r
-                builder.GenerateId(modelName + ".validationMessage");\r
-\r
-                FieldValidationMetadata fieldMetadata = ApplyFieldValidationMetadata(htmlHelper, modelMetadata, modelName);\r
-                // rules will already have been written to the metadata object\r
-                fieldMetadata.ReplaceValidationMessageContents = (String.IsNullOrEmpty(validationMessage)); // only replace contents if no explicit message was specified\r
-                fieldMetadata.ValidationMessageId = builder.Attributes["id"];\r
-            }\r
-\r
-            return builder.ToMvcHtmlString(TagRenderMode.Normal);\r
-        }\r
-\r
-        // ValidationSummary\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper) {\r
-            return ValidationSummary(htmlHelper, false /* excludePropertyErrors */ );\r
-        }\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper, bool excludePropertyErrors) {\r
-            return ValidationSummary(htmlHelper, excludePropertyErrors, null /* message */);\r
-        }\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper, string message) {\r
-            return ValidationSummary(htmlHelper, false /* excludePropertyErrors */, message, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper, bool excludePropertyErrors, string message) {\r
-            return ValidationSummary(htmlHelper, excludePropertyErrors, message, (object)null /* htmlAttributes */);\r
-        }\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper, string message, object htmlAttributes) {\r
-            return ValidationSummary(htmlHelper, false /* excludePropertyErrors */, message, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper, bool excludePropertyErrors, string message, object htmlAttributes) {\r
-            return ValidationSummary(htmlHelper, excludePropertyErrors, message, new RouteValueDictionary(htmlAttributes));\r
-        }\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper, string message, IDictionary<string, object> htmlAttributes) {\r
-            return ValidationSummary(htmlHelper, false /* excludePropertyErrors */, message, htmlAttributes);\r
-        }\r
-\r
-        public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper, bool excludePropertyErrors, string message, IDictionary<string, object> htmlAttributes) {\r
-            if (htmlHelper == null) {\r
-                throw new ArgumentNullException("htmlHelper");\r
-            }\r
-\r
-            FormContext formContext = htmlHelper.ViewContext.GetFormContextForClientValidation();\r
-            if (formContext == null && htmlHelper.ViewData.ModelState.IsValid) {\r
-                return null;\r
-            }\r
-\r
-            string messageSpan;\r
-            if (!String.IsNullOrEmpty(message)) {\r
-                TagBuilder spanTag = new TagBuilder("span");\r
-                spanTag.SetInnerText(message);\r
-                messageSpan = spanTag.ToString(TagRenderMode.Normal) + Environment.NewLine;\r
-            }\r
-            else {\r
-                messageSpan = null;\r
-            }\r
-\r
-            StringBuilder htmlSummary = new StringBuilder();\r
-            TagBuilder unorderedList = new TagBuilder("ul");\r
-\r
-            IEnumerable<ModelState> modelStates = null;\r
-            if (excludePropertyErrors) {\r
-                ModelState ms;\r
-                htmlHelper.ViewData.ModelState.TryGetValue(htmlHelper.ViewData.TemplateInfo.HtmlFieldPrefix, out ms);\r
-                if (ms != null) {\r
-                    modelStates = new ModelState[] { ms };\r
-                }\r
-            }\r
-            else {\r
-                modelStates = htmlHelper.ViewData.ModelState.Values;\r
-            }\r
-\r
-            if (modelStates != null) {\r
-                foreach (ModelState modelState in modelStates) {\r
-                    foreach (ModelError modelError in modelState.Errors) {\r
-                        string errorText = GetUserErrorMessageOrDefault(htmlHelper.ViewContext.HttpContext, modelError, null /* modelState */);\r
-                        if (!String.IsNullOrEmpty(errorText)) {\r
-                            TagBuilder listItem = new TagBuilder("li");\r
-                            listItem.SetInnerText(errorText);\r
-                            htmlSummary.AppendLine(listItem.ToString(TagRenderMode.Normal));\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            if (htmlSummary.Length == 0) {\r
-                htmlSummary.AppendLine(_hiddenListItem);\r
-            }\r
-\r
-            unorderedList.InnerHtml = htmlSummary.ToString();\r
-\r
-            TagBuilder divBuilder = new TagBuilder("div");\r
-            divBuilder.MergeAttributes(htmlAttributes);\r
-            divBuilder.AddCssClass((htmlHelper.ViewData.ModelState.IsValid) ? HtmlHelper.ValidationSummaryValidCssClassName : HtmlHelper.ValidationSummaryCssClassName);\r
-            divBuilder.InnerHtml = messageSpan + unorderedList.ToString(TagRenderMode.Normal);\r
-\r
-            if (formContext != null) {\r
-                // client val summaries need an ID\r
-                divBuilder.GenerateId("validationSummary");\r
-                formContext.ValidationSummaryId = divBuilder.Attributes["id"];\r
-                formContext.ReplaceValidationSummary = !excludePropertyErrors;\r
-            }\r
-            return divBuilder.ToMvcHtmlString(TagRenderMode.Normal);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HtmlHelper.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HtmlHelper.cs
deleted file mode 100644 (file)
index ae08fcf..0000000
+++ /dev/null
@@ -1,361 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    [SuppressMessage("Microsoft.Security", "CA2112:SecuredTypesShouldNotExposeFields",\r
-        Justification = "Public fields for CSS names do not contain secure information.")]\r
-    public class HtmlHelper {\r
-\r
-        private delegate string HtmlEncoder(object value);\r
-        private static readonly HtmlEncoder _htmlEncoder = GetHtmlEncoder();\r
-\r
-        private static string _idAttributeDotReplacement;\r
-\r
-        public static readonly string ValidationInputCssClassName = "input-validation-error";\r
-        public static readonly string ValidationInputValidCssClassName = "input-validation-valid";\r
-        public static readonly string ValidationMessageCssClassName = "field-validation-error";\r
-        public static readonly string ValidationMessageValidCssClassName = "field-validation-valid";\r
-        public static readonly string ValidationSummaryCssClassName = "validation-summary-errors";\r
-        public static readonly string ValidationSummaryValidCssClassName = "validation-summary-valid";\r
-\r
-        private AntiForgeryDataSerializer _serializer;\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection) {\r
-            if (viewContext == null) {\r
-                throw new ArgumentNullException("viewContext");\r
-            }\r
-            if (viewDataContainer == null) {\r
-                throw new ArgumentNullException("viewDataContainer");\r
-            }\r
-            if (routeCollection == null) {\r
-                throw new ArgumentNullException("routeCollection");\r
-            }\r
-            ViewContext = viewContext;\r
-            ViewDataContainer = viewDataContainer;\r
-            RouteCollection = routeCollection;\r
-        }\r
-\r
-        public static string IdAttributeDotReplacement {\r
-            get {\r
-                if (String.IsNullOrEmpty(_idAttributeDotReplacement)) {\r
-                    _idAttributeDotReplacement = "_";\r
-                }\r
-                return _idAttributeDotReplacement;\r
-            }\r
-            set {\r
-                _idAttributeDotReplacement = value;\r
-            }\r
-        }\r
-\r
-        public RouteCollection RouteCollection {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal AntiForgeryDataSerializer Serializer {\r
-            get {\r
-                if (_serializer == null) {\r
-                    _serializer = new AntiForgeryDataSerializer();\r
-                }\r
-                return _serializer;\r
-            }\r
-            set {\r
-                _serializer = value;\r
-            }\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                return ViewDataContainer.ViewData;\r
-            }\r
-        }\r
-\r
-        public IViewDataContainer ViewDataContainer {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public MvcHtmlString AntiForgeryToken() {\r
-            return AntiForgeryToken(null /* salt */);\r
-        }\r
-\r
-        public MvcHtmlString AntiForgeryToken(string salt) {\r
-            return AntiForgeryToken(salt, null /* domain */, null /* path */);\r
-        }\r
-\r
-        public MvcHtmlString AntiForgeryToken(string salt, string domain, string path) {\r
-            string formValue = GetAntiForgeryTokenAndSetCookie(salt, domain, path);\r
-            string fieldName = AntiForgeryData.GetAntiForgeryTokenName(null);\r
-\r
-            TagBuilder builder = new TagBuilder("input");\r
-            builder.Attributes["type"] = "hidden";\r
-            builder.Attributes["name"] = fieldName;\r
-            builder.Attributes["value"] = formValue;\r
-            return builder.ToMvcHtmlString(TagRenderMode.SelfClosing);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public string AttributeEncode(string value) {\r
-            return (!String.IsNullOrEmpty(value)) ? HttpUtility.HtmlAttributeEncode(value) : String.Empty;\r
-        }\r
-\r
-        public string AttributeEncode(object value) {\r
-            return AttributeEncode(Convert.ToString(value, CultureInfo.InvariantCulture));\r
-        }\r
-\r
-        public void EnableClientValidation() {\r
-            ViewContext.ClientValidationEnabled = true;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public string Encode(string value) {\r
-            return (!String.IsNullOrEmpty(value)) ? HttpUtility.HtmlEncode(value) : String.Empty;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public string Encode(object value) {\r
-            return _htmlEncoder(value);\r
-        }\r
-\r
-        // method used if HttpUtility.HtmlEncode(object) method does not exist\r
-        private static string EncodeLegacy(object value) {\r
-            string stringVal = Convert.ToString(value, CultureInfo.CurrentCulture);\r
-            return (!String.IsNullOrEmpty(stringVal)) ? HttpUtility.HtmlEncode(stringVal) : String.Empty;\r
-        }\r
-\r
-        internal string EvalString(string key) {\r
-            return Convert.ToString(ViewData.Eval(key), CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        internal bool EvalBoolean(string key) {\r
-            return Convert.ToBoolean(ViewData.Eval(key), CultureInfo.InvariantCulture);\r
-        }\r
-\r
-        internal static IView FindPartialView(ViewContext viewContext, string partialViewName, ViewEngineCollection viewEngineCollection) {\r
-            ViewEngineResult result = viewEngineCollection.FindPartialView(viewContext, partialViewName);\r
-            if (result.View != null) {\r
-                return result.View;\r
-            }\r
-\r
-            StringBuilder locationsText = new StringBuilder();\r
-            foreach (string location in result.SearchedLocations) {\r
-                locationsText.AppendLine();\r
-                locationsText.Append(location);\r
-            }\r
-\r
-            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Common_PartialViewNotFound, partialViewName, locationsText));\r
-        }\r
-\r
-        public static string GenerateIdFromName(string name) {\r
-            return GenerateIdFromName(name, IdAttributeDotReplacement);\r
-        }\r
-\r
-        public static string GenerateIdFromName(string name, string idAttributeDotReplacement) {\r
-            if (name == null) {\r
-                throw new ArgumentNullException("name");\r
-            }\r
-            if (idAttributeDotReplacement == null) {\r
-                throw new ArgumentNullException("idAttributeDotReplacement");\r
-            }\r
-\r
-            return name.Replace(".", idAttributeDotReplacement);\r
-        }\r
-\r
-        public static string GenerateLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string actionName, string controllerName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateLink(requestContext, routeCollection, linkText, routeName, actionName, controllerName, null/* protocol */, null/* hostName */, null/* fragment */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string GenerateLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateLinkInternal(requestContext, routeCollection, linkText, routeName, actionName, controllerName, protocol, hostName, fragment, routeValues, htmlAttributes, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        private static string GenerateLinkInternal(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes, bool includeImplicitMvcValues) {\r
-            string url = UrlHelper.GenerateUrl(routeName, actionName, controllerName, protocol, hostName, fragment, routeValues, routeCollection, requestContext, includeImplicitMvcValues);\r
-            TagBuilder tagBuilder = new TagBuilder("a") {\r
-                InnerHtml = (!String.IsNullOrEmpty(linkText)) ? HttpUtility.HtmlEncode(linkText) : String.Empty\r
-            };\r
-            tagBuilder.MergeAttributes(htmlAttributes);\r
-            tagBuilder.MergeAttribute("href", url);\r
-            return tagBuilder.ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        public static string GenerateRouteLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateRouteLink(requestContext, routeCollection, linkText, routeName, null/* protocol */, null/* hostName */, null/* fragment */, routeValues, htmlAttributes);\r
-        }\r
-\r
-        public static string GenerateRouteLink(RequestContext requestContext, RouteCollection routeCollection, string linkText, string routeName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, IDictionary<string, object> htmlAttributes) {\r
-            return GenerateLinkInternal(requestContext, routeCollection, linkText, routeName, null /* actionName */, null /* controllerName */, protocol, hostName, fragment, routeValues, htmlAttributes, false /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        private string GetAntiForgeryTokenAndSetCookie(string salt, string domain, string path) {\r
-            string cookieName = AntiForgeryData.GetAntiForgeryTokenName(ViewContext.HttpContext.Request.ApplicationPath);\r
-\r
-            AntiForgeryData cookieToken;\r
-            HttpCookie cookie = ViewContext.HttpContext.Request.Cookies[cookieName];\r
-            if (cookie != null) {\r
-                cookieToken = Serializer.Deserialize(cookie.Value);\r
-            }\r
-            else {\r
-                cookieToken = AntiForgeryData.NewToken();\r
-                string cookieValue = Serializer.Serialize(cookieToken);\r
-\r
-                HttpCookie newCookie = new HttpCookie(cookieName, cookieValue) { HttpOnly = true, Domain = domain };\r
-                if (!String.IsNullOrEmpty(path)) {\r
-                    newCookie.Path = path;\r
-                }\r
-                ViewContext.HttpContext.Response.Cookies.Set(newCookie);\r
-            }\r
-\r
-            AntiForgeryData formToken = new AntiForgeryData(cookieToken) {\r
-                Salt = salt,\r
-                Username = AntiForgeryData.GetUsername(ViewContext.HttpContext.User)\r
-            };\r
-            string formValue = Serializer.Serialize(formToken);\r
-            return formValue;\r
-        }\r
-\r
-        public static string GetFormMethodString(FormMethod method) {\r
-            switch (method) {\r
-                case FormMethod.Get:\r
-                    return "get";\r
-                case FormMethod.Post:\r
-                    return "post";\r
-                default:\r
-                    return "post";\r
-            }\r
-        }\r
-\r
-        // selects the v3.5 (legacy) or v4 HTML encoder\r
-        private static HtmlEncoder GetHtmlEncoder() {\r
-            return TypeHelpers.CreateDelegate<HtmlEncoder>(TypeHelpers.SystemWebAssembly, "System.Web.HttpUtility", "HtmlEncode", null)\r
-                ?? EncodeLegacy;\r
-        }\r
-\r
-        public static string GetInputTypeString(InputType inputType) {\r
-            switch (inputType) {\r
-                case InputType.CheckBox:\r
-                    return "checkbox";\r
-                case InputType.Hidden:\r
-                    return "hidden";\r
-                case InputType.Password:\r
-                    return "password";\r
-                case InputType.Radio:\r
-                    return "radio";\r
-                case InputType.Text:\r
-                    return "text";\r
-                default:\r
-                    return "text";\r
-            }\r
-        }\r
-\r
-        internal object GetModelStateValue(string key, Type destinationType) {\r
-            ModelState modelState;\r
-            if (ViewData.ModelState.TryGetValue(key, out modelState)) {\r
-                if (modelState.Value != null) {\r
-                    return modelState.Value.ConvertTo(destinationType, null /* culture */);\r
-                }\r
-            }\r
-            return null;\r
-        }\r
-\r
-        public MvcHtmlString HttpMethodOverride(HttpVerbs httpVerb) {\r
-            string httpMethod;\r
-            switch (httpVerb) {\r
-                case HttpVerbs.Delete:\r
-                    httpMethod = "DELETE";\r
-                    break;\r
-                case HttpVerbs.Head:\r
-                    httpMethod = "HEAD";\r
-                    break;\r
-                case HttpVerbs.Put:\r
-                    httpMethod = "PUT";\r
-                    break;\r
-                default:\r
-                    throw new ArgumentException(MvcResources.HtmlHelper_InvalidHttpVerb, "httpVerb");\r
-            }\r
-\r
-            return HttpMethodOverride(httpMethod);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public MvcHtmlString HttpMethodOverride(string httpMethod) {\r
-            if (String.IsNullOrEmpty(httpMethod)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "httpMethod");\r
-            }\r
-            if (String.Equals(httpMethod, "GET", StringComparison.OrdinalIgnoreCase) ||\r
-                String.Equals(httpMethod, "POST", StringComparison.OrdinalIgnoreCase)) {\r
-                throw new ArgumentException(MvcResources.HtmlHelper_InvalidHttpMethod, "httpMethod");\r
-            }\r
-\r
-            TagBuilder tagBuilder = new TagBuilder("input");\r
-            tagBuilder.Attributes["type"] = "hidden";\r
-            tagBuilder.Attributes["name"] = HttpRequestExtensions.XHttpMethodOverrideKey;\r
-            tagBuilder.Attributes["value"] = httpMethod;\r
-\r
-            return tagBuilder.ToMvcHtmlString(TagRenderMode.SelfClosing);\r
-        }\r
-\r
-        internal virtual void RenderPartialInternal(string partialViewName, ViewDataDictionary viewData, object model, TextWriter writer, ViewEngineCollection viewEngineCollection) {\r
-            if (String.IsNullOrEmpty(partialViewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "partialViewName");\r
-            }\r
-\r
-            ViewDataDictionary newViewData = null;\r
-\r
-            if (model == null) {\r
-                if (viewData == null) {\r
-                    newViewData = new ViewDataDictionary(ViewData);\r
-                }\r
-                else {\r
-                    newViewData = new ViewDataDictionary(viewData);\r
-                }\r
-            }\r
-            else {\r
-                if (viewData == null) {\r
-                    newViewData = new ViewDataDictionary(model);\r
-                }\r
-                else {\r
-                    newViewData = new ViewDataDictionary(viewData) { Model = model };\r
-                }\r
-            }\r
-\r
-            ViewContext newViewContext = new ViewContext(ViewContext, ViewContext.View, newViewData, ViewContext.TempData, writer);\r
-            IView view = FindPartialView(newViewContext, partialViewName, viewEngineCollection);\r
-            view.Render(newViewContext, writer);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HtmlHelper`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HtmlHelper`1.cs
deleted file mode 100644 (file)
index 243f7f6..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public class HtmlHelper<TModel> : HtmlHelper {\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer)\r
-            : this(viewContext, viewDataContainer, RouteTable.Routes) {\r
-        }\r
-\r
-        public HtmlHelper(ViewContext viewContext, IViewDataContainer viewDataContainer, RouteCollection routeCollection)\r
-            : base(viewContext, viewDataContainer, routeCollection) {\r
-\r
-            _viewData = new ViewDataDictionary<TModel>(viewDataContainer.ViewData);\r
-        }\r
-\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                return _viewData;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpAntiForgeryException.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpAntiForgeryException.cs
deleted file mode 100644 (file)
index 8a8cf34..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Runtime.Serialization;\r
-    using System.Web;\r
-\r
-    [Serializable]\r
-    public sealed class HttpAntiForgeryException : HttpException {\r
-\r
-        public HttpAntiForgeryException() {\r
-        }\r
-\r
-        private HttpAntiForgeryException(SerializationInfo info, StreamingContext context)\r
-            : base(info, context) {\r
-        }\r
-\r
-        public HttpAntiForgeryException(string message)\r
-            : base(message) {\r
-        }\r
-\r
-        public HttpAntiForgeryException(string message, Exception innerException)\r
-            : base(message, innerException) {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpDeleteAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpDeleteAttribute.cs
deleted file mode 100644 (file)
index 1314f05..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-    using System.Web;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class HttpDeleteAttribute : ActionMethodSelectorAttribute {\r
-\r
-        private static readonly AcceptVerbsAttribute _innerAttribute = new AcceptVerbsAttribute(HttpVerbs.Delete);\r
-\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            return _innerAttribute.IsValidForRequest(controllerContext, methodInfo);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpFileCollectionValueProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpFileCollectionValueProvider.cs
deleted file mode 100644 (file)
index d67ec5e..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-\r
-    public sealed class HttpFileCollectionValueProvider : DictionaryValueProvider<HttpPostedFileBase[]> {\r
-\r
-        private static readonly Dictionary<string, HttpPostedFileBase[]> _emptyDictionary = new Dictionary<string, HttpPostedFileBase[]>();\r
-\r
-        public HttpFileCollectionValueProvider(ControllerContext controllerContext)\r
-            : base(GetHttpPostedFileDictionary(controllerContext), CultureInfo.InvariantCulture) {\r
-        }\r
-\r
-        private static Dictionary<string, HttpPostedFileBase[]> GetHttpPostedFileDictionary(ControllerContext controllerContext) {\r
-            HttpFileCollectionBase files = controllerContext.HttpContext.Request.Files;\r
-\r
-            // fast-track common case of no files\r
-            if (files.Count == 0) {\r
-                return _emptyDictionary;\r
-            }\r
-\r
-            // build up the 1:many file mapping\r
-            List<KeyValuePair<string, HttpPostedFileBase>> mapping = new List<KeyValuePair<string, HttpPostedFileBase>>();\r
-            string[] allKeys = files.AllKeys;\r
-            for (int i = 0; i < files.Count; i++) {\r
-                string key = allKeys[i];\r
-                if (key != null) {\r
-                    HttpPostedFileBase file = HttpPostedFileBaseModelBinder.ChooseFileOrNull(files[i]);\r
-                    mapping.Add(new KeyValuePair<string, HttpPostedFileBase>(key, file));\r
-                }\r
-            }\r
-\r
-            // turn the mapping into a 1:many dictionary\r
-            var grouped = mapping.GroupBy(el => el.Key, el => el.Value, StringComparer.OrdinalIgnoreCase);\r
-            return grouped.ToDictionary(g => g.Key, g => g.ToArray(), StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpFileCollectionValueProviderFactory.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpFileCollectionValueProviderFactory.cs
deleted file mode 100644 (file)
index 6eec3ce..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public sealed class HttpFileCollectionValueProviderFactory : ValueProviderFactory {\r
-\r
-        public override IValueProvider GetValueProvider(ControllerContext controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            return new HttpFileCollectionValueProvider(controllerContext);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpGetAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpGetAttribute.cs
deleted file mode 100644 (file)
index d2f2e9e..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-    using System.Web;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class HttpGetAttribute : ActionMethodSelectorAttribute {\r
-\r
-        private static readonly AcceptVerbsAttribute _innerAttribute = new AcceptVerbsAttribute(HttpVerbs.Get);\r
-\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            return _innerAttribute.IsValidForRequest(controllerContext, methodInfo);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpHandlerUtil.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpHandlerUtil.cs
deleted file mode 100644 (file)
index a9b1f8d..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    internal static class HttpHandlerUtil {\r
-\r
-        // Since Server.Execute() doesn't propagate HttpExceptions where the status code is\r
-        // anything other than 500, we need to wrap these exceptions ourselves.\r
-        public static IHttpHandler WrapForServerExecute(IHttpHandler httpHandler) {\r
-            IHttpAsyncHandler asyncHandler = httpHandler as IHttpAsyncHandler;\r
-            return (asyncHandler != null) ? new ServerExecuteHttpHandlerAsyncWrapper(asyncHandler) : new ServerExecuteHttpHandlerWrapper(httpHandler);\r
-        }\r
-\r
-        // Server.Execute() requires that the provided IHttpHandler subclass Page.\r
-        internal class ServerExecuteHttpHandlerWrapper : Page {\r
-            private readonly IHttpHandler _httpHandler;\r
-\r
-            public ServerExecuteHttpHandlerWrapper(IHttpHandler httpHandler) {\r
-                _httpHandler = httpHandler;\r
-            }\r
-\r
-            internal IHttpHandler InnerHandler {\r
-                get {\r
-                    return _httpHandler;\r
-                }\r
-            }\r
-\r
-            public override void ProcessRequest(HttpContext context) {\r
-                Wrap(() => _httpHandler.ProcessRequest(context));\r
-            }\r
-\r
-            protected static void Wrap(Action action) {\r
-                Wrap(delegate {\r
-                    action();\r
-                    return (object)null;\r
-                });\r
-            }\r
-\r
-            protected static TResult Wrap<TResult>(Func<TResult> func) {\r
-                try {\r
-                    return func();\r
-                }\r
-                catch (HttpException he) {\r
-                    if (he.GetHttpCode() == 500) {\r
-                        throw; // doesn't need to be wrapped\r
-                    }\r
-                    else {\r
-                        HttpException newHe = new HttpException(500, MvcResources.ViewPageHttpHandlerWrapper_ExceptionOccurred, he);\r
-                        throw newHe;\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        private sealed class ServerExecuteHttpHandlerAsyncWrapper : ServerExecuteHttpHandlerWrapper, IHttpAsyncHandler {\r
-            private readonly IHttpAsyncHandler _httpHandler;\r
-\r
-            public ServerExecuteHttpHandlerAsyncWrapper(IHttpAsyncHandler httpHandler)\r
-                : base(httpHandler) {\r
-                _httpHandler = httpHandler;\r
-            }\r
-\r
-            public IAsyncResult BeginProcessRequest(HttpContext context, AsyncCallback cb, object extraData) {\r
-                return Wrap(() => _httpHandler.BeginProcessRequest(context, cb, extraData));\r
-            }\r
-\r
-            public void EndProcessRequest(IAsyncResult result) {\r
-                Wrap(() => _httpHandler.EndProcessRequest(result));\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPostAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPostAttribute.cs
deleted file mode 100644 (file)
index 8a07d95..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-    using System.Web;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class HttpPostAttribute : ActionMethodSelectorAttribute {\r
-\r
-        private static readonly AcceptVerbsAttribute _innerAttribute = new AcceptVerbsAttribute(HttpVerbs.Post);\r
-\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            return _innerAttribute.IsValidForRequest(controllerContext, methodInfo);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPostedFileBaseModelBinder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPostedFileBaseModelBinder.cs
deleted file mode 100644 (file)
index 4adb369..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-\r
-    public class HttpPostedFileBaseModelBinder : IModelBinder {\r
-\r
-        public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (bindingContext == null) {\r
-                throw new ArgumentNullException("bindingContext");\r
-            }\r
-\r
-            HttpPostedFileBase theFile = controllerContext.HttpContext.Request.Files[bindingContext.ModelName];\r
-            return ChooseFileOrNull(theFile);\r
-        }\r
-\r
-        // helper that returns the original file if there was content uploaded, null if empty\r
-        internal static HttpPostedFileBase ChooseFileOrNull(HttpPostedFileBase rawFile) {\r
-            // case 1: there was no <input type="file" ... /> element in the post\r
-            if (rawFile == null) {\r
-                return null;\r
-            }\r
-\r
-            // case 2: there was an <input type="file" ... /> element in the post, but it was left blank\r
-            if (rawFile.ContentLength == 0 && String.IsNullOrEmpty(rawFile.FileName)) {\r
-                return null;\r
-            }\r
-\r
-            // case 3: the file was posted\r
-            return rawFile;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPutAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpPutAttribute.cs
deleted file mode 100644 (file)
index d438f3d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-    using System.Web;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class HttpPutAttribute : ActionMethodSelectorAttribute {\r
-\r
-        private static readonly AcceptVerbsAttribute _innerAttribute = new AcceptVerbsAttribute(HttpVerbs.Put);\r
-\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            return _innerAttribute.IsValidForRequest(controllerContext, methodInfo);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpRequestExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpRequestExtensions.cs
deleted file mode 100644 (file)
index 07a76e1..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public static class HttpRequestExtensions {\r
-        internal const string XHttpMethodOverrideKey = "X-HTTP-Method-Override";\r
-\r
-        public static string GetHttpMethodOverride(this HttpRequestBase request) {\r
-            if (request == null) {\r
-                throw new ArgumentNullException("request");\r
-            }\r
-\r
-            string incomingVerb = request.HttpMethod;\r
-\r
-            if (!String.Equals(incomingVerb, "POST", StringComparison.OrdinalIgnoreCase)) {\r
-                return incomingVerb;\r
-            }\r
-\r
-            string verbOverride = null;\r
-            string headerOverrideValue = request.Headers[XHttpMethodOverrideKey];\r
-            if (!String.IsNullOrEmpty(headerOverrideValue)) {\r
-                verbOverride = headerOverrideValue;\r
-            }\r
-            else {\r
-                string formOverrideValue = request.Form[XHttpMethodOverrideKey];\r
-                if (!String.IsNullOrEmpty(formOverrideValue)) {\r
-                    verbOverride = formOverrideValue;\r
-                }\r
-                else {\r
-                    string queryStringOverrideValue = request.QueryString[XHttpMethodOverrideKey];\r
-                    if (!String.IsNullOrEmpty(queryStringOverrideValue)) {\r
-                        verbOverride = queryStringOverrideValue;\r
-                    }\r
-                }\r
-            }\r
-            if (verbOverride != null) {\r
-                if (!String.Equals(verbOverride, "GET", StringComparison.OrdinalIgnoreCase) &&\r
-                    !String.Equals(verbOverride, "POST", StringComparison.OrdinalIgnoreCase)) {\r
-                    incomingVerb = verbOverride;\r
-                }\r
-            }\r
-            return incomingVerb;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpUnauthorizedResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpUnauthorizedResult.cs
deleted file mode 100644 (file)
index cae9d1d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public class HttpUnauthorizedResult : ActionResult {\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            // HTTP 401 is the status code for unauthorized access. Other code might\r
-            // intercept this and perform some special logic. For example, the\r
-            // FormsAuthenticationModule looks for 401 responses and instead redirects\r
-            // the user to the login page.\r
-            context.HttpContext.Response.StatusCode = 401;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpVerbs.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/HttpVerbs.cs
deleted file mode 100644 (file)
index b9506c1..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [Flags]\r
-    public enum HttpVerbs {\r
-        Get = 1 << 0,\r
-        Post = 1 << 1,\r
-        Put = 1 << 2,\r
-        Delete = 1 << 3,\r
-        Head = 1 << 4\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IActionFilter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IActionFilter.cs
deleted file mode 100644 (file)
index 2cc7f3e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IActionFilter {\r
-        void OnActionExecuting(ActionExecutingContext filterContext);\r
-        void OnActionExecuted(ActionExecutedContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IActionInvoker.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IActionInvoker.cs
deleted file mode 100644 (file)
index 9ab878d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IActionInvoker {\r
-        bool InvokeAction(ControllerContext controllerContext, string actionName);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IAuthorizationFilter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IAuthorizationFilter.cs
deleted file mode 100644 (file)
index 93ab7b3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IAuthorizationFilter {\r
-        void OnAuthorization(AuthorizationContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IBuildManager.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IBuildManager.cs
deleted file mode 100644 (file)
index 34eea42..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections;\r
-    using System.IO;\r
-\r
-    // REVIEW: Should we make this public?\r
-    internal interface IBuildManager {\r
-        object CreateInstanceFromVirtualPath(string virtualPath, Type requiredBaseType);\r
-        ICollection GetReferencedAssemblies();\r
-\r
-        // ASP.NET 4 methods\r
-        Stream ReadCachedFile(string fileName);\r
-        Stream CreateCachedFile(string fileName);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IController.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IController.cs
deleted file mode 100644 (file)
index d5bb4ca..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public interface IController {\r
-        void Execute(RequestContext requestContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IControllerFactory.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IControllerFactory.cs
deleted file mode 100644 (file)
index 316774f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public interface IControllerFactory {\r
-        IController CreateController(RequestContext requestContext, string controllerName);\r
-        void ReleaseController(IController controller);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IExceptionFilter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IExceptionFilter.cs
deleted file mode 100644 (file)
index ede6fd3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IExceptionFilter {\r
-        void OnException(ExceptionContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IModelBinder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IModelBinder.cs
deleted file mode 100644 (file)
index d6ce039..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IModelBinder {\r
-        object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IResultFilter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IResultFilter.cs
deleted file mode 100644 (file)
index c00395f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IResultFilter {\r
-        void OnResultExecuting(ResultExecutingContext filterContext);\r
-        void OnResultExecuted(ResultExecutedContext filterContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IRouteWithArea.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IRouteWithArea.cs
deleted file mode 100644 (file)
index 23eab10..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public interface IRouteWithArea {\r
-\r
-        string Area { get; }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ITempDataProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ITempDataProvider.cs
deleted file mode 100644 (file)
index 3361130..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public interface ITempDataProvider {\r
-        IDictionary<string, object> LoadTempData(ControllerContext controllerContext);\r
-        void SaveTempData(ControllerContext controllerContext, IDictionary<string, object> values);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IValueProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IValueProvider.cs
deleted file mode 100644 (file)
index 95c7e16..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public interface IValueProvider {\r
-        bool ContainsPrefix(string prefix);\r
-        ValueProviderResult GetValue(string key);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IView.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IView.cs
deleted file mode 100644 (file)
index 97d044c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.IO;\r
-\r
-    public interface IView {\r
-        void Render(ViewContext viewContext, TextWriter writer);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewDataContainer.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewDataContainer.cs
deleted file mode 100644 (file)
index c1bfacb..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public interface IViewDataContainer {\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This is the mechanism by which the ViewPage / ViewUserControl get their ViewDataDictionary objects.")]\r
-        ViewDataDictionary ViewData { get; set; }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewEngine.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewEngine.cs
deleted file mode 100644 (file)
index 9950ce7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public interface IViewEngine {\r
-        ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache);\r
-        ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache);\r
-        void ReleaseView(ControllerContext controllerContext, IView view);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewLocationCache.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/IViewLocationCache.cs
deleted file mode 100644 (file)
index 824950b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web;\r
-\r
-    public interface IViewLocationCache {\r
-        string GetViewLocation(HttpContextBase httpContext, string key);\r
-        void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/InputType.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/InputType.cs
deleted file mode 100644 (file)
index a4a39d8..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public enum InputType {\r
-        CheckBox,\r
-        Hidden,\r
-        Password,\r
-        Radio,\r
-        Text\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/JavaScriptResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/JavaScriptResult.cs
deleted file mode 100644 (file)
index 4ee833e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public class JavaScriptResult : ActionResult {\r
-\r
-        public string Script {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-            response.ContentType = "application/x-javascript";\r
-\r
-            if (Script != null) {\r
-                response.Write(Script);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/JsonRequestBehavior.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/JsonRequestBehavior.cs
deleted file mode 100644 (file)
index da9ee8f..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public enum JsonRequestBehavior {\r
-        AllowGet,\r
-        DenyGet,\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/JsonResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/JsonResult.cs
deleted file mode 100644 (file)
index 3950b09..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Script.Serialization;\r
-\r
-    public class JsonResult : ActionResult {\r
-\r
-        public JsonResult() {\r
-            JsonRequestBehavior = JsonRequestBehavior.DenyGet;\r
-        }\r
-\r
-        public Encoding ContentEncoding {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ContentType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public object Data {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public JsonRequestBehavior JsonRequestBehavior {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-            if (JsonRequestBehavior == JsonRequestBehavior.DenyGet &&\r
-                String.Equals(context.HttpContext.Request.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)) {\r
-                throw new InvalidOperationException(MvcResources.JsonRequest_GetNotAllowed);\r
-            }\r
-\r
-            HttpResponseBase response = context.HttpContext.Response;\r
-\r
-            if (!String.IsNullOrEmpty(ContentType)) {\r
-                response.ContentType = ContentType;\r
-            }\r
-            else {\r
-                response.ContentType = "application/json";\r
-            }\r
-            if (ContentEncoding != null) {\r
-                response.ContentEncoding = ContentEncoding;\r
-            }\r
-            if (Data != null) {\r
-                JavaScriptSerializer serializer = new JavaScriptSerializer();\r
-                response.Write(serializer.Serialize(Data));\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/LinqBinaryModelBinder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/LinqBinaryModelBinder.cs
deleted file mode 100644 (file)
index 4d5edcc..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Data.Linq;\r
-\r
-    public class LinqBinaryModelBinder : ByteArrayModelBinder {\r
-        public override object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) {\r
-            byte[] byteValue = (byte[])base.BindModel(controllerContext, bindingContext);\r
-            if (byteValue == null) {\r
-                return null;\r
-            }\r
-\r
-            return new Binary(byteValue);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinderAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinderAttribute.cs
deleted file mode 100644 (file)
index b057c73..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(ValidTargets, AllowMultiple = false, Inherited = false)]\r
-    public sealed class ModelBinderAttribute : CustomModelBinderAttribute {\r
-\r
-        public ModelBinderAttribute(Type binderType) {\r
-            if (binderType == null) {\r
-                throw new ArgumentNullException("binderType");\r
-            }\r
-            if (!typeof(IModelBinder).IsAssignableFrom(binderType)) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture,\r
-                    MvcResources.ModelBinderAttribute_TypeNotIModelBinder, binderType.FullName);\r
-                throw new ArgumentException(message, "binderType");\r
-            }\r
-\r
-            BinderType = binderType;\r
-        }\r
-\r
-        public Type BinderType {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override IModelBinder GetBinder() {\r
-            try {\r
-                return (IModelBinder)Activator.CreateInstance(BinderType);\r
-            }\r
-            catch (Exception ex) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ModelBinderAttribute_ErrorCreatingModelBinder,\r
-                        BinderType.FullName),\r
-                    ex);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinderDictionary.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinderDictionary.cs
deleted file mode 100644 (file)
index 964db46..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ModelBinderDictionary : IDictionary<Type, IModelBinder> {\r
-\r
-        private IModelBinder _defaultBinder;\r
-        private readonly Dictionary<Type, IModelBinder> _innerDictionary = new Dictionary<Type, IModelBinder>();\r
-\r
-        public int Count {\r
-            get {\r
-                return _innerDictionary.Count;\r
-            }\r
-        }\r
-\r
-        public IModelBinder DefaultBinder {\r
-            get {\r
-                if (_defaultBinder == null) {\r
-                    _defaultBinder = new DefaultModelBinder();\r
-                }\r
-                return _defaultBinder;\r
-            }\r
-            set {\r
-                _defaultBinder = value;\r
-            }\r
-        }\r
-\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((IDictionary<Type, IModelBinder>)_innerDictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        public ICollection<Type> Keys {\r
-            get {\r
-                return _innerDictionary.Keys;\r
-            }\r
-        }\r
-\r
-        public IModelBinder this[Type key] {\r
-            get {\r
-                IModelBinder binder;\r
-                _innerDictionary.TryGetValue(key, out binder);\r
-                return binder;\r
-            }\r
-            set {\r
-                _innerDictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        public ICollection<IModelBinder> Values {\r
-            get {\r
-                return _innerDictionary.Values;\r
-            }\r
-        }\r
-\r
-        public void Add(KeyValuePair<Type, IModelBinder> item) {\r
-            ((IDictionary<Type, IModelBinder>)_innerDictionary).Add(item);\r
-        }\r
-\r
-        public void Add(Type key, IModelBinder value) {\r
-            _innerDictionary.Add(key, value);\r
-        }\r
-\r
-        public void Clear() {\r
-            _innerDictionary.Clear();\r
-        }\r
-\r
-        public bool Contains(KeyValuePair<Type, IModelBinder> item) {\r
-            return ((IDictionary<Type, IModelBinder>)_innerDictionary).Contains(item);\r
-        }\r
-\r
-        public bool ContainsKey(Type key) {\r
-            return _innerDictionary.ContainsKey(key);\r
-        }\r
-\r
-        public void CopyTo(KeyValuePair<Type, IModelBinder>[] array, int arrayIndex) {\r
-            ((IDictionary<Type, IModelBinder>)_innerDictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        public IModelBinder GetBinder(Type modelType) {\r
-            return GetBinder(modelType, true /* fallbackToDefault */);\r
-        }\r
-\r
-        public virtual IModelBinder GetBinder(Type modelType, bool fallbackToDefault) {\r
-            if (modelType == null) {\r
-                throw new ArgumentNullException("modelType");\r
-            }\r
-\r
-            return GetBinder(modelType, (fallbackToDefault) ? DefaultBinder : null);\r
-        }\r
-\r
-        private IModelBinder GetBinder(Type modelType, IModelBinder fallbackBinder) {\r
-            // Try to look up a binder for this type. We use this order of precedence:\r
-            // 1. Binder registered in the global table\r
-            // 2. Binder attribute defined on the type\r
-            // 3. Supplied fallback binder\r
-\r
-            IModelBinder binder;\r
-            if (_innerDictionary.TryGetValue(modelType, out binder)) {\r
-                return binder;\r
-            }\r
-\r
-            binder = ModelBinders.GetBinderFromAttributes(modelType,\r
-                () => String.Format(CultureInfo.CurrentUICulture, MvcResources.ModelBinderDictionary_MultipleAttributes, modelType.FullName));\r
-\r
-            return binder ?? fallbackBinder;\r
-        }\r
-\r
-        public IEnumerator<KeyValuePair<Type, IModelBinder>> GetEnumerator() {\r
-            return _innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        public bool Remove(KeyValuePair<Type, IModelBinder> item) {\r
-            return ((IDictionary<Type, IModelBinder>)_innerDictionary).Remove(item);\r
-        }\r
-\r
-        public bool Remove(Type key) {\r
-            return _innerDictionary.Remove(key);\r
-        }\r
-\r
-        public bool TryGetValue(Type key, out IModelBinder value) {\r
-            return _innerDictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)_innerDictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinders.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBinders.cs
deleted file mode 100644 (file)
index f354b9d..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel;\r
-    using System.Data.Linq;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web;\r
-\r
-    public static class ModelBinders {\r
-\r
-        private static readonly ModelBinderDictionary _binders = CreateDefaultBinderDictionary();\r
-\r
-        public static ModelBinderDictionary Binders {\r
-            get {\r
-                return _binders;\r
-            }\r
-        }\r
-\r
-        internal static IModelBinder GetBinderFromAttributes(Type type, Func<string> errorMessageAccessor) {\r
-            AttributeCollection allAttrs = TypeDescriptorHelper.Get(type).GetAttributes();\r
-            CustomModelBinderAttribute[] filteredAttrs = allAttrs.OfType<CustomModelBinderAttribute>().ToArray();\r
-            return GetBinderFromAttributesImpl(filteredAttrs, errorMessageAccessor);\r
-        }\r
-\r
-        internal static IModelBinder GetBinderFromAttributes(ICustomAttributeProvider element, Func<string> errorMessageAccessor) {\r
-            CustomModelBinderAttribute[] attrs = (CustomModelBinderAttribute[])element.GetCustomAttributes(typeof(CustomModelBinderAttribute), true /* inherit */);\r
-            return GetBinderFromAttributesImpl(attrs, errorMessageAccessor);\r
-        }\r
-\r
-        private static IModelBinder GetBinderFromAttributesImpl(CustomModelBinderAttribute[] attrs, Func<string> errorMessageAccessor) {\r
-            // this method is used to get a custom binder based on the attributes of the element passed to it.\r
-            // it will return null if a binder cannot be detected based on the attributes alone.\r
-\r
-            if (attrs == null) {\r
-                return null;\r
-            }\r
-\r
-            switch (attrs.Length) {\r
-                case 0:\r
-                    return null;\r
-\r
-                case 1:\r
-                    IModelBinder binder = attrs[0].GetBinder();\r
-                    return binder;\r
-\r
-                default:\r
-                    string errorMessage = errorMessageAccessor();\r
-                    throw new InvalidOperationException(errorMessage);\r
-            }\r
-        }\r
-\r
-        private static ModelBinderDictionary CreateDefaultBinderDictionary() {\r
-            // We can't add a binder to the HttpPostedFileBase type as an attribute, so we'll just\r
-            // prepopulate the dictionary as a convenience to users.\r
-\r
-            ModelBinderDictionary binders = new ModelBinderDictionary() {\r
-                { typeof(HttpPostedFileBase), new HttpPostedFileBaseModelBinder() },\r
-                { typeof(byte[]), new ByteArrayModelBinder() },\r
-                { typeof(Binary), new LinqBinaryModelBinder() }\r
-            };\r
-            return binders;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBindingContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelBindingContext.cs
deleted file mode 100644 (file)
index c3f8fbd..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ModelBindingContext {\r
-\r
-        private static readonly Predicate<string> _defaultPropertyFilter = _ => true;\r
-\r
-        private string _modelName;\r
-        private ModelStateDictionary _modelState;\r
-        private Predicate<string> _propertyFilter;\r
-        private Dictionary<string, ModelMetadata> _propertyMetadata;\r
-\r
-        public ModelBindingContext()\r
-            : this(null) {\r
-        }\r
-\r
-        // copies certain values that won't change between parent and child objects,\r
-        // e.g. ValueProvider, ModelState\r
-        public ModelBindingContext(ModelBindingContext bindingContext) {\r
-            if (bindingContext != null) {\r
-                ModelState = bindingContext.ModelState;\r
-                ValueProvider = bindingContext.ValueProvider;\r
-            }\r
-        }\r
-\r
-        public bool FallbackToEmptyPrefix {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "Cannot remove setter as that's a breaking change")]\r
-        public object Model {\r
-            get {\r
-                return ModelMetadata.Model;\r
-            }\r
-            set {\r
-                throw new InvalidOperationException(MvcResources.ModelMetadata_PropertyNotSettable);\r
-            }\r
-        }\r
-\r
-        public ModelMetadata ModelMetadata {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string ModelName {\r
-            get {\r
-                if (_modelName == null) {\r
-                    _modelName = String.Empty;\r
-                }\r
-                return _modelName;\r
-            }\r
-            set {\r
-                _modelName = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Justification = "The containing type is mutable.")]\r
-        public ModelStateDictionary ModelState {\r
-            get {\r
-                if (_modelState == null) {\r
-                    _modelState = new ModelStateDictionary();\r
-                }\r
-                return _modelState;\r
-            }\r
-            set {\r
-                _modelState = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "Cannot remove setter as that's a breaking change")]\r
-        public Type ModelType {\r
-            get {\r
-                return ModelMetadata.ModelType;\r
-            }\r
-            set {\r
-                throw new InvalidOperationException(MvcResources.ModelMetadata_PropertyNotSettable);\r
-            }\r
-        }\r
-\r
-        public Predicate<string> PropertyFilter {\r
-            get {\r
-                if (_propertyFilter == null) {\r
-                    _propertyFilter = _defaultPropertyFilter;\r
-                }\r
-                return _propertyFilter;\r
-            }\r
-            set {\r
-                _propertyFilter = value;\r
-            }\r
-        }\r
-\r
-        public IDictionary<string, ModelMetadata> PropertyMetadata {\r
-            get {\r
-                if (_propertyMetadata == null) {\r
-                    _propertyMetadata = ModelMetadata.Properties.ToDictionary(m => m.PropertyName, StringComparer.OrdinalIgnoreCase);\r
-                }\r
-\r
-                return _propertyMetadata;\r
-            }\r
-        }\r
-\r
-        public IValueProvider ValueProvider {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRangeRule.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRangeRule.cs
deleted file mode 100644 (file)
index 0d12858..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public class ModelClientValidationRangeRule : ModelClientValidationRule {\r
-        public ModelClientValidationRangeRule(string errorMessage, object minValue, object maxValue) {\r
-            ErrorMessage = errorMessage;\r
-            ValidationType = "range";\r
-            ValidationParameters["minimum"] = minValue;\r
-            ValidationParameters["maximum"] = maxValue;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRegexRule.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRegexRule.cs
deleted file mode 100644 (file)
index a012da6..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public class ModelClientValidationRegexRule : ModelClientValidationRule {\r
-        public ModelClientValidationRegexRule(string errorMessage, string pattern) {\r
-            ErrorMessage = errorMessage;\r
-            ValidationType = "regularExpression";\r
-            ValidationParameters.Add("pattern", pattern);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRequiredRule.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRequiredRule.cs
deleted file mode 100644 (file)
index 6ae6dc9..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public class ModelClientValidationRequiredRule : ModelClientValidationRule {\r
-        public ModelClientValidationRequiredRule(string errorMessage) {\r
-            ErrorMessage = errorMessage;\r
-            ValidationType = "required";\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRule.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationRule.cs
deleted file mode 100644 (file)
index 99ed578..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-\r
-    public class ModelClientValidationRule {\r
-\r
-        private readonly Dictionary<string, object> _validationParameters = new Dictionary<string, object>();\r
-        private string _validationType;\r
-\r
-        public string ErrorMessage {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public IDictionary<string, object> ValidationParameters {\r
-            get {\r
-                return _validationParameters;\r
-            }\r
-        }\r
-\r
-        public string ValidationType {\r
-            get {\r
-                return _validationType ?? String.Empty;\r
-            }\r
-            set {\r
-                _validationType = value;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationStringLengthRule.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelClientValidationStringLengthRule.cs
deleted file mode 100644 (file)
index 92999ee..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public class ModelClientValidationStringLengthRule : ModelClientValidationRule {\r
-        public ModelClientValidationStringLengthRule(string errorMessage, int minimumLength, int maximumLength) {\r
-            ErrorMessage = errorMessage;\r
-            ValidationType = "stringLength";\r
-            ValidationParameters["minimumLength"] = minimumLength;\r
-            ValidationParameters["maximumLength"] = maximumLength;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelError.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelError.cs
deleted file mode 100644 (file)
index a6fb177..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    [Serializable]\r
-    public class ModelError {\r
-\r
-        public ModelError(Exception exception)\r
-            : this(exception, null /* errorMessage */) {\r
-        }\r
-\r
-        public ModelError(Exception exception, string errorMessage)\r
-            : this(errorMessage) {\r
-            if (exception == null) {\r
-                throw new ArgumentNullException("exception");\r
-            }\r
-\r
-            Exception = exception;\r
-        }\r
-\r
-        public ModelError(string errorMessage) {\r
-            ErrorMessage = errorMessage ?? String.Empty;\r
-        }\r
-\r
-        public Exception Exception {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string ErrorMessage {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelErrorCollection.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelErrorCollection.cs
deleted file mode 100644 (file)
index 61898dd..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.ObjectModel;\r
-\r
-    [Serializable]\r
-    public class ModelErrorCollection : Collection<ModelError> {\r
-\r
-        public void Add(Exception exception) {\r
-            Add(new ModelError(exception));\r
-        }\r
-\r
-        public void Add(string errorMessage) {\r
-            Add(new ModelError(errorMessage));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadata.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadata.cs
deleted file mode 100644 (file)
index 54a56d6..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Linq.Expressions;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.ExpressionUtil;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ModelMetadata {\r
-        // Explicit backing store for the things we want initialized by default, so don't have to call\r
-        // the protected virtual setters of an auto-generated property\r
-        private Dictionary<string, object> _additionalValues = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-        private readonly Type _containerType;\r
-        private bool _convertEmptyStringToNull = true;\r
-        private bool _isRequired;\r
-        private object _model;\r
-        private Func<object> _modelAccessor;\r
-        private readonly Type _modelType;\r
-        private IEnumerable<ModelMetadata> _properties;\r
-        private readonly string _propertyName;\r
-        private Type _realModelType;\r
-        private bool _showForDisplay = true;\r
-        private bool _showForEdit = true;\r
-        private string _simpleDisplayText;\r
-\r
-        public ModelMetadata(ModelMetadataProvider provider, Type containerType, Func<object> modelAccessor, Type modelType, string propertyName) {\r
-            if (provider == null) {\r
-                throw new ArgumentNullException("provider");\r
-            }\r
-            if (modelType == null) {\r
-                throw new ArgumentNullException("modelType");\r
-            }\r
-\r
-            Provider = provider;\r
-\r
-            _containerType = containerType;\r
-            _isRequired = !TypeHelpers.TypeAllowsNullValue(modelType);\r
-            _modelAccessor = modelAccessor;\r
-            _modelType = modelType;\r
-            _propertyName = propertyName;\r
-        }\r
-\r
-        public virtual Dictionary<string, object> AdditionalValues {\r
-            get {\r
-                return _additionalValues;\r
-            }\r
-        }\r
-\r
-        public Type ContainerType {\r
-            get {\r
-                return _containerType;\r
-            }\r
-        }\r
-\r
-        public virtual bool ConvertEmptyStringToNull {\r
-            get {\r
-                return _convertEmptyStringToNull;\r
-            }\r
-            set {\r
-                _convertEmptyStringToNull = value;\r
-            }\r
-        }\r
-\r
-        public virtual string DataTypeName {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual string Description {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual string DisplayFormatString {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods", Justification = "The method is a delegating helper to choose among multiple property values")]\r
-        public virtual string DisplayName {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual string EditFormatString {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual bool HideSurroundingHtml {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual bool IsComplexType {\r
-            get {\r
-                return !(TypeDescriptor.GetConverter(ModelType).CanConvertFrom(typeof(string)));\r
-            }\r
-        }\r
-\r
-        public bool IsNullableValueType {\r
-            get {\r
-                return TypeHelpers.IsNullableValueType(ModelType);\r
-            }\r
-        }\r
-\r
-        public virtual bool IsReadOnly {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual bool IsRequired {\r
-            get {\r
-                return _isRequired;\r
-            }\r
-            set {\r
-                _isRequired = value;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                if (_modelAccessor != null) {\r
-                    _model = _modelAccessor();\r
-                    _modelAccessor = null;\r
-                }\r
-                return _model;\r
-            }\r
-            set {\r
-                _model = value;\r
-                _modelAccessor = null;\r
-            }\r
-        }\r
-\r
-        public Type ModelType {\r
-            get {\r
-                return _modelType;\r
-            }\r
-        }\r
-\r
-        public virtual string NullDisplayText { get; set; }\r
-\r
-        public virtual IEnumerable<ModelMetadata> Properties {\r
-            get {\r
-                if (_properties == null) {\r
-                    _properties = Provider.GetMetadataForProperties(Model, RealModelType);\r
-                }\r
-                return _properties;\r
-            }\r
-        }\r
-\r
-        public string PropertyName {\r
-            get {\r
-                return _propertyName;\r
-            }\r
-        }\r
-\r
-        protected ModelMetadataProvider Provider {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        internal Type RealModelType {\r
-            get {\r
-                if (_realModelType == null) {\r
-                    _realModelType = ModelType;\r
-\r
-                    // Don't call GetType() if the model is Nullable<T>, because it will\r
-                    // turn Nullable<T> into T for non-null values\r
-                    if (Model != null && !TypeHelpers.IsNullableValueType(ModelType)) {\r
-                        _realModelType = Model.GetType();\r
-                    }\r
-                }\r
-\r
-                return _realModelType;\r
-            }\r
-        }\r
-\r
-        public virtual string ShortDisplayName {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual bool ShowForDisplay {\r
-            get {\r
-                return _showForDisplay;\r
-            }\r
-            set {\r
-                _showForDisplay = value;\r
-            }\r
-        }\r
-\r
-        public virtual bool ShowForEdit {\r
-            get {\r
-                return _showForEdit;\r
-            }\r
-            set {\r
-                _showForEdit = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods", Justification = "This property delegates to the method when the user has not yet set a simple display text value.")]\r
-        public virtual string SimpleDisplayText {\r
-            get {\r
-                if (_simpleDisplayText == null) {\r
-                    _simpleDisplayText = GetSimpleDisplayText();\r
-                }\r
-                return _simpleDisplayText;\r
-            }\r
-            set {\r
-                _simpleDisplayText = value;\r
-            }\r
-        }\r
-\r
-        public virtual string TemplateHint {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual string Watermark {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "This is an appropriate nesting of generic types")]\r
-        public static ModelMetadata FromLambdaExpression<TParameter, TValue>(Expression<Func<TParameter, TValue>> expression,\r
-                                                                             ViewDataDictionary<TParameter> viewData) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-            if (viewData == null) {\r
-                throw new ArgumentNullException("viewData");\r
-            }\r
-\r
-            string propertyName = null;\r
-            Type containerType = null;\r
-            bool legalExpression = false;\r
-\r
-            // Need to verify the expression is valid; it needs to at least end in something\r
-            // that we can convert to a meaningful string for model binding purposes\r
-\r
-            switch (expression.Body.NodeType) {\r
-                // ArrayIndex always means a single-dimensional indexer; multi-dimensional indexer is a method call to Get()\r
-                case ExpressionType.ArrayIndex:\r
-                    legalExpression = true;\r
-                    break;\r
-\r
-                // Only legal method call is a single argument indexer/DefaultMember call\r
-                case ExpressionType.Call:\r
-                    legalExpression = ExpressionHelper.IsSingleArgumentIndexer(expression.Body);\r
-                    break;\r
-\r
-                // Property/field access is always legal\r
-                case ExpressionType.MemberAccess:\r
-                    MemberExpression memberExpression = (MemberExpression)expression.Body;\r
-                    propertyName = memberExpression.Member is PropertyInfo ? memberExpression.Member.Name : null;\r
-                    containerType = memberExpression.Member.DeclaringType;\r
-                    legalExpression = true;\r
-                    break;\r
-\r
-                // Parameter expression means "model => model", so we delegate to FromModel\r
-                case ExpressionType.Parameter:\r
-                    return FromModel(viewData);\r
-            }\r
-\r
-            if (!legalExpression) {\r
-                throw new InvalidOperationException(MvcResources.TemplateHelpers_TemplateLimitations);\r
-            }\r
-\r
-            TParameter container = viewData.Model;\r
-            Func<object> modelAccessor = () =>\r
-            {\r
-                try {\r
-                    return CachedExpressionCompiler.Process(expression)(container);\r
-                }\r
-                catch (NullReferenceException) {\r
-                    return null;\r
-                }\r
-            };\r
-\r
-            return GetMetadataFromProvider(modelAccessor, typeof(TValue), propertyName, containerType);\r
-        }\r
-\r
-        private static ModelMetadata FromModel(ViewDataDictionary viewData) {\r
-            return viewData.ModelMetadata ?? GetMetadataFromProvider(null, typeof(string), null, null);\r
-        }\r
-\r
-        public static ModelMetadata FromStringExpression(string expression, ViewDataDictionary viewData) {\r
-            if (expression == null) {\r
-                throw new ArgumentNullException("expression");\r
-            }\r
-            if (viewData == null) {\r
-                throw new ArgumentNullException("viewData");\r
-            }\r
-            if (expression.Length == 0) {    // Empty string really means "model metadata for the current model"\r
-                return FromModel(viewData);\r
-            }\r
-\r
-            ViewDataInfo vdi = viewData.GetViewDataInfo(expression);\r
-            Type containerType = null;\r
-            Type modelType = null;\r
-            Func<object> modelAccessor = null;\r
-            string propertyName = null;\r
-\r
-            if (vdi != null) {\r
-                if (vdi.Container != null) {\r
-                    containerType = vdi.Container.GetType();\r
-                }\r
-\r
-                modelAccessor = () => vdi.Value;\r
-\r
-                if (vdi.PropertyDescriptor != null) {\r
-                    propertyName = vdi.PropertyDescriptor.Name;\r
-                    modelType = vdi.PropertyDescriptor.PropertyType;\r
-                }\r
-                else if (vdi.Value != null) {  // We only need to delay accessing properties (for LINQ to SQL)\r
-                    modelType = vdi.Value.GetType();\r
-                }\r
-            }\r
-            //  Try getting a property from ModelMetadata if we couldn't find an answer in ViewData\r
-            else if (viewData.ModelMetadata != null) {\r
-                ModelMetadata propertyMetadata = viewData.ModelMetadata.Properties.Where(p => p.PropertyName == expression).FirstOrDefault();\r
-                if (propertyMetadata != null) {\r
-                    return propertyMetadata;\r
-                }\r
-            }\r
-\r
-\r
-            return GetMetadataFromProvider(modelAccessor, modelType ?? typeof(string), propertyName, containerType);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "The method is a delegating helper to choose among multiple property values")]\r
-        public string GetDisplayName() {\r
-            return DisplayName ?? PropertyName ?? ModelType.Name;\r
-        }\r
-\r
-        private static ModelMetadata GetMetadataFromProvider(Func<object> modelAccessor, Type modelType, string propertyName, Type containerType) {\r
-            if (containerType != null && !String.IsNullOrEmpty(propertyName)) {\r
-                return ModelMetadataProviders.Current.GetMetadataForProperty(modelAccessor, containerType, propertyName);\r
-            }\r
-            return ModelMetadataProviders.Current.GetMetadataForType(modelAccessor, modelType);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "This method is used to resolve the simple display text when it was not explicitly set through other means.")]\r
-        protected virtual string GetSimpleDisplayText() {\r
-            if (Model == null) {\r
-                return NullDisplayText;\r
-            }\r
-\r
-            string toStringResult = Convert.ToString(Model, CultureInfo.CurrentCulture);\r
-            if (!toStringResult.Equals(Model.GetType().FullName, StringComparison.Ordinal)) {\r
-                return toStringResult;\r
-            }\r
-\r
-            ModelMetadata firstProperty = Properties.FirstOrDefault();\r
-            if (firstProperty == null) {\r
-                return String.Empty;\r
-            }\r
-\r
-            if (firstProperty.Model == null) {\r
-                return firstProperty.NullDisplayText;\r
-            }\r
-\r
-            return Convert.ToString(firstProperty.Model, CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "This method may perform non-trivial work.")]\r
-        public virtual IEnumerable<ModelValidator> GetValidators(ControllerContext context) {\r
-            return ModelValidatorProviders.Providers.GetValidators(this, context);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadataProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadataProvider.cs
deleted file mode 100644 (file)
index 6e92367..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public abstract class ModelMetadataProvider {\r
-        public abstract IEnumerable<ModelMetadata> GetMetadataForProperties(object container, Type containerType);\r
-\r
-        public abstract ModelMetadata GetMetadataForProperty(Func<object> modelAccessor, Type containerType, string propertyName);\r
-\r
-        public abstract ModelMetadata GetMetadataForType(Func<object> modelAccessor, Type modelType);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadataProviders.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelMetadataProviders.cs
deleted file mode 100644 (file)
index de948d1..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public static class ModelMetadataProviders {\r
-        private static ModelMetadataProvider _current = new DataAnnotationsModelMetadataProvider();\r
-\r
-        public static ModelMetadataProvider Current {\r
-            get {\r
-                return _current;\r
-            }\r
-            set {\r
-                _current = value ?? new EmptyModelMetadataProvider();\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelState.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelState.cs
deleted file mode 100644 (file)
index 38c5860..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    [Serializable]\r
-    public class ModelState {\r
-\r
-        private ModelErrorCollection _errors = new ModelErrorCollection();\r
-\r
-        public ValueProviderResult Value {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ModelErrorCollection Errors {\r
-            get {\r
-                return _errors;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelStateDictionary.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelStateDictionary.cs
deleted file mode 100644 (file)
index 2510505..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-\r
-    [Serializable]\r
-    public class ModelStateDictionary : IDictionary<string, ModelState> {\r
-\r
-        private readonly Dictionary<string, ModelState> _innerDictionary = new Dictionary<string, ModelState>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public ModelStateDictionary() {\r
-        }\r
-\r
-        public ModelStateDictionary(ModelStateDictionary dictionary) {\r
-            if (dictionary == null) {\r
-                throw new ArgumentNullException("dictionary");\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                _innerDictionary.Add(entry.Key, entry.Value);\r
-            }\r
-        }\r
-\r
-        public int Count {\r
-            get {\r
-                return _innerDictionary.Count;\r
-            }\r
-        }\r
-\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((IDictionary<string, ModelState>)_innerDictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        public bool IsValid {\r
-            get {\r
-                return Values.All(modelState => modelState.Errors.Count == 0);\r
-            }\r
-        }\r
-\r
-        public ICollection<string> Keys {\r
-            get {\r
-                return _innerDictionary.Keys;\r
-            }\r
-        }\r
-\r
-        public ModelState this[string key] {\r
-            get {\r
-                ModelState value;\r
-                _innerDictionary.TryGetValue(key, out value);\r
-                return value;\r
-            }\r
-            set {\r
-                _innerDictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        public ICollection<ModelState> Values {\r
-            get {\r
-                return _innerDictionary.Values;\r
-            }\r
-        }\r
-\r
-        public void Add(KeyValuePair<string, ModelState> item) {\r
-            ((IDictionary<string, ModelState>)_innerDictionary).Add(item);\r
-        }\r
-\r
-        public void Add(string key, ModelState value) {\r
-            _innerDictionary.Add(key, value);\r
-        }\r
-\r
-        public void AddModelError(string key, Exception exception) {\r
-            GetModelStateForKey(key).Errors.Add(exception);\r
-        }\r
-\r
-        public void AddModelError(string key, string errorMessage) {\r
-            GetModelStateForKey(key).Errors.Add(errorMessage);\r
-        }\r
-\r
-        public void Clear() {\r
-            _innerDictionary.Clear();\r
-        }\r
-\r
-        public bool Contains(KeyValuePair<string, ModelState> item) {\r
-            return ((IDictionary<string, ModelState>)_innerDictionary).Contains(item);\r
-        }\r
-\r
-        public bool ContainsKey(string key) {\r
-            return _innerDictionary.ContainsKey(key);\r
-        }\r
-\r
-        public void CopyTo(KeyValuePair<string, ModelState>[] array, int arrayIndex) {\r
-            ((IDictionary<string, ModelState>)_innerDictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        public IEnumerator<KeyValuePair<string, ModelState>> GetEnumerator() {\r
-            return _innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        private ModelState GetModelStateForKey(string key) {\r
-            if (key == null) {\r
-                throw new ArgumentNullException("key");\r
-            }\r
-\r
-            ModelState modelState;\r
-            if (!TryGetValue(key, out modelState)) {\r
-                modelState = new ModelState();\r
-                this[key] = modelState;\r
-            }\r
-\r
-            return modelState;\r
-        }\r
-\r
-        public bool IsValidField(string key) {\r
-            if (key == null) {\r
-                throw new ArgumentNullException("key");\r
-            }\r
-\r
-            // if the key is not found in the dictionary, we just say that it's valid (since there are no errors)\r
-            return DictionaryHelpers.FindKeysWithPrefix(this, key).All(entry => entry.Value.Errors.Count == 0);\r
-        }\r
-\r
-        public void Merge(ModelStateDictionary dictionary) {\r
-            if (dictionary == null) {\r
-                return;\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                this[entry.Key] = entry.Value;\r
-            }\r
-        }\r
-\r
-        public bool Remove(KeyValuePair<string, ModelState> item) {\r
-            return ((IDictionary<string, ModelState>)_innerDictionary).Remove(item);\r
-        }\r
-\r
-        public bool Remove(string key) {\r
-            return _innerDictionary.Remove(key);\r
-        }\r
-\r
-        public void SetModelValue(string key, ValueProviderResult value) {\r
-            GetModelStateForKey(key).Value = value;\r
-        }\r
-\r
-        public bool TryGetValue(string key, out ModelState value) {\r
-            return _innerDictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)_innerDictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidationResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidationResult.cs
deleted file mode 100644 (file)
index dcb262e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public class ModelValidationResult {\r
-\r
-        private string _memberName;\r
-        private string _message;\r
-\r
-        public string MemberName {\r
-            get {\r
-                return _memberName ?? String.Empty;\r
-            }\r
-            set {\r
-                _memberName = value;\r
-            }\r
-        }\r
-\r
-        public string Message {\r
-            get {\r
-                return _message ?? String.Empty;\r
-            }\r
-            set {\r
-                _message = value;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidator.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidator.cs
deleted file mode 100644 (file)
index 0570bff..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-\r
-    public abstract class ModelValidator {\r
-        protected ModelValidator(ModelMetadata metadata, ControllerContext controllerContext) {\r
-            if (metadata == null) {\r
-                throw new ArgumentNullException("metadata");\r
-            }\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            Metadata = metadata;\r
-            ControllerContext = controllerContext;\r
-        }\r
-\r
-        protected internal ControllerContext ControllerContext { get; private set; }\r
-\r
-        public virtual bool IsRequired {\r
-            get {\r
-                return false;\r
-            }\r
-        }\r
-\r
-        protected internal ModelMetadata Metadata { get; private set; }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "This method may perform non-trivial work.")]\r
-        public virtual IEnumerable<ModelClientValidationRule> GetClientValidationRules() {\r
-            return Enumerable.Empty<ModelClientValidationRule>();\r
-        }\r
-\r
-        public static ModelValidator GetModelValidator(ModelMetadata metadata, ControllerContext context) {\r
-            return new CompositeModelValidator(metadata, context);\r
-        }\r
-\r
-        public abstract IEnumerable<ModelValidationResult> Validate(object container);\r
-\r
-        private class CompositeModelValidator : ModelValidator {\r
-            public CompositeModelValidator(ModelMetadata metadata, ControllerContext controllerContext)\r
-                : base(metadata, controllerContext) {\r
-            }\r
-\r
-            public override IEnumerable<ModelValidationResult> Validate(object container) {\r
-                bool propertiesValid = true;\r
-\r
-                foreach (ModelMetadata propertyMetadata in Metadata.Properties) {\r
-                    foreach (ModelValidator propertyValidator in propertyMetadata.GetValidators(ControllerContext)) {\r
-                        foreach (ModelValidationResult propertyResult in propertyValidator.Validate(Metadata.Model)) {\r
-                            propertiesValid = false;\r
-                            yield return new ModelValidationResult {\r
-                                MemberName = DefaultModelBinder.CreateSubPropertyName(propertyMetadata.PropertyName, propertyResult.MemberName),\r
-                                Message = propertyResult.Message\r
-                            };\r
-                        }\r
-                    }\r
-                }\r
-\r
-                if (propertiesValid) {\r
-                    foreach (ModelValidator typeValidator in Metadata.GetValidators(ControllerContext)) {\r
-                        foreach (ModelValidationResult typeResult in typeValidator.Validate(container)) {\r
-                            yield return typeResult;\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProvider.cs
deleted file mode 100644 (file)
index 88dc223..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public abstract class ModelValidatorProvider {\r
-        public abstract IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProviderCollection.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProviderCollection.cs
deleted file mode 100644 (file)
index ffc845b..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Linq;\r
-\r
-    public class ModelValidatorProviderCollection : Collection<ModelValidatorProvider> {\r
-\r
-        public ModelValidatorProviderCollection() {\r
-        }\r
-\r
-        public ModelValidatorProviderCollection(IList<ModelValidatorProvider> list)\r
-            : base(list) {\r
-        }\r
-\r
-        protected override void InsertItem(int index, ModelValidatorProvider item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.InsertItem(index, item);\r
-        }\r
-\r
-        protected override void SetItem(int index, ModelValidatorProvider item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.SetItem(index, item);\r
-        }\r
-\r
-        public IEnumerable<ModelValidator> GetValidators(ModelMetadata metadata, ControllerContext context) {\r
-            return this.SelectMany(provider => provider.GetValidators(metadata, context));\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProviders.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ModelValidatorProviders.cs
deleted file mode 100644 (file)
index 563d495..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public static class ModelValidatorProviders {\r
-\r
-        private static readonly ModelValidatorProviderCollection _providers = new ModelValidatorProviderCollection() {\r
-            new DataAnnotationsModelValidatorProvider(),\r
-            new DataErrorInfoModelValidatorProvider(),\r
-            new ClientDataTypeModelValidatorProvider()\r
-        };\r
-\r
-        public static ModelValidatorProviderCollection Providers {\r
-            get {\r
-                return _providers;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/MultiSelectList.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/MultiSelectList.cs
deleted file mode 100644 (file)
index 2f1776f..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Web.UI;\r
-\r
-    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]\r
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Multi",\r
-        Justification = "Common shorthand for 'multiple'.")]\r
-    public class MultiSelectList : IEnumerable<SelectListItem> {\r
-\r
-        public MultiSelectList(IEnumerable items)\r
-            : this(items, null /* selectedValues */) {\r
-        }\r
-\r
-        public MultiSelectList(IEnumerable items, IEnumerable selectedValues)\r
-            : this(items, null /* dataValuefield */, null /* dataTextField */, selectedValues) {\r
-        }\r
-\r
-        public MultiSelectList(IEnumerable items, string dataValueField, string dataTextField)\r
-            : this(items, dataValueField, dataTextField, null /* selectedValues */) {\r
-        }\r
-\r
-        public MultiSelectList(IEnumerable items, string dataValueField, string dataTextField, IEnumerable selectedValues) {\r
-            if (items == null) {\r
-                throw new ArgumentNullException("items");\r
-            }\r
-\r
-            Items = items;\r
-            DataValueField = dataValueField;\r
-            DataTextField = dataTextField;\r
-            SelectedValues = selectedValues;\r
-        }\r
-\r
-        public string DataTextField {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string DataValueField {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IEnumerable Items {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IEnumerable SelectedValues {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public virtual IEnumerator<SelectListItem> GetEnumerator() {\r
-            return GetListItems().GetEnumerator();\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",\r
-            Justification = "Operation performs conversions and returns a unique instance on each call.")]\r
-        internal IList<SelectListItem> GetListItems() {\r
-            return (!String.IsNullOrEmpty(DataValueField)) ?\r
-                GetListItemsWithValueField() :\r
-                GetListItemsWithoutValueField();\r
-        }\r
-\r
-        private IList<SelectListItem> GetListItemsWithValueField() {\r
-            HashSet<string> selectedValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-            if (SelectedValues != null) {\r
-                selectedValues.UnionWith(from object value in SelectedValues select Convert.ToString(value, CultureInfo.CurrentCulture));\r
-            }\r
-\r
-            var listItems = from object item in Items\r
-                            let value = Eval(item, DataValueField)\r
-                            select new SelectListItem {\r
-                                Value = value,\r
-                                Text = Eval(item, DataTextField),\r
-                                Selected = selectedValues.Contains(value)\r
-                            };\r
-            return listItems.ToList();\r
-        }\r
-\r
-        private IList<SelectListItem> GetListItemsWithoutValueField() {\r
-            HashSet<object> selectedValues = new HashSet<object>();\r
-            if (SelectedValues != null) {\r
-                selectedValues.UnionWith(SelectedValues.Cast<object>());\r
-            }\r
-\r
-            var listItems = from object item in Items\r
-                            select new SelectListItem {\r
-                                Text = Eval(item, DataTextField),\r
-                                Selected = selectedValues.Contains(item)\r
-                            };\r
-            return listItems.ToList();\r
-        }\r
-\r
-        private static string Eval(object container, string expression) {\r
-            object value = container;\r
-            if (!String.IsNullOrEmpty(expression)) {\r
-                value = DataBinder.Eval(container, expression);\r
-            }\r
-            return Convert.ToString(value, CultureInfo.CurrentCulture);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return GetEnumerator();\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHandler.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHandler.cs
deleted file mode 100644 (file)
index 1f15ae7..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Threading;\r
-    using System.Web;\r
-    using System.Web.Mvc.Async;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-    using System.Web.SessionState;\r
-\r
-    [SuppressMessage("Microsoft.Security", "CA2112:SecuredTypesShouldNotExposeFields", Justification = "There's nothing secret about the value of this field.")]\r
-    public class MvcHandler : IHttpAsyncHandler, IHttpHandler, IRequiresSessionState {\r
-        private static readonly object _processRequestTag = new object();\r
-        private ControllerBuilder _controllerBuilder;\r
-\r
-        internal static readonly string MvcVersion = GetMvcVersionString();\r
-        public static readonly string MvcVersionHeaderName = "X-AspNetMvc-Version";\r
-\r
-        public MvcHandler(RequestContext requestContext) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-\r
-            RequestContext = requestContext;\r
-        }\r
-\r
-        internal ControllerBuilder ControllerBuilder {\r
-            get {\r
-                if (_controllerBuilder == null) {\r
-                    _controllerBuilder = ControllerBuilder.Current;\r
-                }\r
-                return _controllerBuilder;\r
-            }\r
-            set {\r
-                _controllerBuilder = value;\r
-            }\r
-        }\r
-\r
-        public static bool DisableMvcResponseHeader {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        protected virtual bool IsReusable {\r
-            get {\r
-                return false;\r
-            }\r
-        }\r
-\r
-        public RequestContext RequestContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        protected internal virtual void AddVersionHeader(HttpContextBase httpContext) {\r
-            if (!DisableMvcResponseHeader) {\r
-                httpContext.Response.AppendHeader(MvcVersionHeaderName, MvcVersion);\r
-            }\r
-        }\r
-\r
-        protected virtual IAsyncResult BeginProcessRequest(HttpContext httpContext, AsyncCallback callback, object state) {\r
-            HttpContextBase iHttpContext = new HttpContextWrapper(httpContext);\r
-            return BeginProcessRequest(iHttpContext, callback, state);\r
-        }\r
-\r
-        protected internal virtual IAsyncResult BeginProcessRequest(HttpContextBase httpContext, AsyncCallback callback, object state) {\r
-            IController controller;\r
-            IControllerFactory factory;\r
-            ProcessRequestInit(httpContext, out controller, out factory);\r
-\r
-            IAsyncController asyncController = controller as IAsyncController;\r
-            if (asyncController != null) {\r
-                // asynchronous controller\r
-                BeginInvokeDelegate beginDelegate = delegate(AsyncCallback asyncCallback, object asyncState) {\r
-                    try {\r
-                        return asyncController.BeginExecute(RequestContext, asyncCallback, asyncState);\r
-                    }\r
-                    catch {\r
-                        factory.ReleaseController(asyncController);\r
-                        throw;\r
-                    }\r
-                };\r
-\r
-                EndInvokeDelegate endDelegate = delegate(IAsyncResult asyncResult) {\r
-                    try {\r
-                        asyncController.EndExecute(asyncResult);\r
-                    }\r
-                    finally {\r
-                        factory.ReleaseController(asyncController);\r
-                    }\r
-                };\r
-\r
-                SynchronizationContext syncContext = SynchronizationContextUtil.GetSynchronizationContext();\r
-                AsyncCallback newCallback = AsyncUtil.WrapCallbackForSynchronizedExecution(callback, syncContext);\r
-                return AsyncResultWrapper.Begin(newCallback, state, beginDelegate, endDelegate, _processRequestTag);\r
-            }\r
-            else {\r
-                // synchronous controller\r
-                Action action = delegate {\r
-                    try {\r
-                        controller.Execute(RequestContext);\r
-                    }\r
-                    finally {\r
-                        factory.ReleaseController(controller);\r
-                    }\r
-                };\r
-\r
-                return AsyncResultWrapper.BeginSynchronous(callback, state, action, _processRequestTag);\r
-            }\r
-        }\r
-\r
-        protected internal virtual void EndProcessRequest(IAsyncResult asyncResult) {\r
-            AsyncResultWrapper.End(asyncResult, _processRequestTag);\r
-        }\r
-\r
-        private static string GetMvcVersionString() {\r
-            // DevDiv 216459:\r
-            // This code originally used Assembly.GetName(), but that requires FileIOPermission, which isn't granted in\r
-            // medium trust. However, Assembly.FullName *is* accessible in medium trust.\r
-            return new AssemblyName(typeof(MvcHandler).Assembly.FullName).Version.ToString(2);\r
-        }\r
-\r
-        protected virtual void ProcessRequest(HttpContext httpContext) {\r
-            HttpContextBase iHttpContext = new HttpContextWrapper(httpContext);\r
-            ProcessRequest(iHttpContext);\r
-        }\r
-\r
-        protected internal virtual void ProcessRequest(HttpContextBase httpContext) {\r
-            IController controller;\r
-            IControllerFactory factory;\r
-            ProcessRequestInit(httpContext, out controller, out factory);\r
-\r
-            try {\r
-                controller.Execute(RequestContext);\r
-            }\r
-            finally {\r
-                factory.ReleaseController(controller);\r
-            }\r
-        }\r
-\r
-        private void ProcessRequestInit(HttpContextBase httpContext, out IController controller, out IControllerFactory factory) {\r
-            AddVersionHeader(httpContext);\r
-            RemoveOptionalRoutingParameters();\r
-\r
-            // Get the controller type\r
-            string controllerName = RequestContext.RouteData.GetRequiredString("controller");\r
-\r
-            // Instantiate the controller and call Execute\r
-            factory = ControllerBuilder.GetControllerFactory();\r
-            controller = factory.CreateController(RequestContext, controllerName);\r
-            if (controller == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ControllerBuilder_FactoryReturnedNull,\r
-                        factory.GetType(),\r
-                        controllerName));\r
-            }\r
-        }\r
-\r
-        private void RemoveOptionalRoutingParameters() {\r
-            RouteValueDictionary rvd = RequestContext.RouteData.Values;\r
-\r
-            // Get all keys for which the corresponding value is 'Optional'.\r
-            // ToArray() necessary so that we don't manipulate the dictionary while enumerating.\r
-            string[] matchingKeys = (from entry in rvd\r
-                                     where entry.Value == UrlParameter.Optional\r
-                                     select entry.Key).ToArray();\r
-\r
-            foreach (string key in matchingKeys) {\r
-                rvd.Remove(key);\r
-            }\r
-        }\r
-\r
-        #region IHttpHandler Members\r
-        bool IHttpHandler.IsReusable {\r
-            get {\r
-                return IsReusable;\r
-            }\r
-        }\r
-\r
-        void IHttpHandler.ProcessRequest(HttpContext httpContext) {\r
-            ProcessRequest(httpContext);\r
-        }\r
-        #endregion\r
-\r
-        #region IHttpAsyncHandler Members\r
-        IAsyncResult IHttpAsyncHandler.BeginProcessRequest(HttpContext context, AsyncCallback cb, object extraData) {\r
-            return BeginProcessRequest(context, cb, extraData);\r
-        }\r
-\r
-        void IHttpAsyncHandler.EndProcessRequest(IAsyncResult result) {\r
-            EndProcessRequest(result);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHtmlString.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHtmlString.cs
deleted file mode 100644 (file)
index a6674bf..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel;\r
-    using System.Linq.Expressions;\r
-    using System.Web;\r
-\r
-    // In ASP.NET 4, a new syntax <%: %> is being introduced in WebForms pages, where <%: expression %> is equivalent to\r
-    // <%= HttpUtility.HtmlEncode(expression) %>. The intent of this is to reduce common causes of XSS vulnerabilities\r
-    // in WebForms pages (WebForms views in the case of MVC). This involves the addition of an interface\r
-    // System.Web.IHtmlString and a static method overload System.Web.HttpUtility::HtmlEncode(object).  The interface\r
-    // definition is roughly:\r
-    //   public interface IHtmlString {\r
-    //     string ToHtmlString();\r
-    //   }\r
-    // And the HtmlEncode(object) logic is roughly:\r
-    //   - If the input argument is an IHtmlString, return argument.ToHtmlString(),\r
-    //   - Otherwise, return HtmlEncode(Convert.ToString(argument)).\r
-    //\r
-    // Unfortunately this has the effect that calling <%: Html.SomeHelper() %> in an MVC application running on .NET 4\r
-    // will end up encoding output that is already HTML-safe. As a result, we're changing out HTML helpers to return\r
-    // MvcHtmlString where appropriate. <%= Html.SomeHelper() %> will continue to work in both .NET 3.5 and .NET 4, but\r
-    // changing the return types to MvcHtmlString has the added benefit that <%: Html.SomeHelper() %> will also work\r
-    // properly in .NET 4 rather than resulting in a double-encoded output. MVC developers in .NET 4 will then be able\r
-    // to use the <%: %> syntax almost everywhere instead of having to remember where to use <%= %> and where to use\r
-    // <%: %>. This should help developers craft more secure web applications by default.\r
-    //\r
-    // To create an MvcHtmlString, use the static Create() method instead of calling the protected constructor.\r
-\r
-    public class MvcHtmlString {\r
-\r
-        private delegate MvcHtmlString MvcHtmlStringCreator(string value);\r
-        private static readonly MvcHtmlStringCreator _creator = GetCreator();\r
-\r
-        // imporant: this declaration must occur after the _creator declaration\r
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes",\r
-            Justification = "MvcHtmlString is immutable")]\r
-        public static readonly MvcHtmlString Empty = Create(String.Empty);\r
-\r
-        private readonly string _value;\r
-\r
-        // This constructor is only protected so that we can subclass it in a dynamic module. In practice,\r
-        // nobody should ever call this constructor, and it is likely to be removed in a future version\r
-        // of the framework. Use the static Create() method instead.\r
-        [EditorBrowsable(EditorBrowsableState.Never)]\r
-        [Obsolete("The recommended alternative is the static MvcHtmlString.Create(String value) method.")]\r
-        protected MvcHtmlString(string value) {\r
-            _value = value ?? String.Empty;\r
-        }\r
-\r
-        public static MvcHtmlString Create(string value) {\r
-            return _creator(value);\r
-        }\r
-\r
-        // in .NET 4, we dynamically create a type that subclasses MvcHtmlString and implements IHtmlString\r
-        private static MvcHtmlStringCreator GetCreator() {\r
-            Type iHtmlStringType = typeof(HttpContext).Assembly.GetType("System.Web.IHtmlString");\r
-            if (iHtmlStringType != null) {\r
-                // first, create the dynamic type\r
-                Type dynamicType = DynamicTypeGenerator.GenerateType("DynamicMvcHtmlString", typeof(MvcHtmlString), new Type[] { iHtmlStringType });\r
-\r
-                // then, create the delegate to instantiate the dynamic type\r
-                ParameterExpression valueParamExpr = Expression.Parameter(typeof(string), "value");\r
-                NewExpression newObjExpr = Expression.New(dynamicType.GetConstructor(new Type[] { typeof(string) }), valueParamExpr);\r
-                Expression<MvcHtmlStringCreator> lambdaExpr = Expression.Lambda<MvcHtmlStringCreator>(newObjExpr, valueParamExpr);\r
-                return lambdaExpr.Compile();\r
-            }\r
-            else {\r
-                // disabling 0618 allows us to call the MvcHtmlString() constructor\r
-#pragma warning disable 0618\r
-                return value => new MvcHtmlString(value);\r
-#pragma warning restore 0618\r
-            }\r
-        }\r
-\r
-        public static bool IsNullOrEmpty(MvcHtmlString value) {\r
-            return (value == null || value._value.Length == 0);\r
-        }\r
-\r
-        // IHtmlString.ToHtmlString()\r
-        public string ToHtmlString() {\r
-            return _value;\r
-        }\r
-\r
-        public override string ToString() {\r
-            return _value;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHttpHandler.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcHttpHandler.cs
deleted file mode 100644 (file)
index c9773d7..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-    using System.Web.Mvc.Async;\r
-    using System.Web.Routing;\r
-    using System.Web.SessionState;\r
-\r
-    public class MvcHttpHandler : UrlRoutingHandler, IHttpAsyncHandler, IRequiresSessionState {\r
-\r
-        private static readonly object _processRequestTag = new object();\r
-\r
-        protected virtual IAsyncResult BeginProcessRequest(HttpContext httpContext, AsyncCallback callback, object state) {\r
-            HttpContextBase iHttpContext = new HttpContextWrapper(httpContext);\r
-            return BeginProcessRequest(iHttpContext, callback, state);\r
-        }\r
-\r
-        protected internal virtual IAsyncResult BeginProcessRequest(HttpContextBase httpContext, AsyncCallback callback, object state) {\r
-            IHttpHandler httpHandler = GetHttpHandler(httpContext);\r
-            IHttpAsyncHandler httpAsyncHandler = httpHandler as IHttpAsyncHandler;\r
-\r
-            if (httpAsyncHandler != null) {\r
-                // asynchronous handler\r
-                BeginInvokeDelegate beginDelegate = delegate(AsyncCallback asyncCallback, object asyncState) {\r
-                    return httpAsyncHandler.BeginProcessRequest(HttpContext.Current, asyncCallback, asyncState);\r
-                };\r
-                EndInvokeDelegate endDelegate = delegate(IAsyncResult asyncResult) {\r
-                    httpAsyncHandler.EndProcessRequest(asyncResult);\r
-                };\r
-                return AsyncResultWrapper.Begin(callback, state, beginDelegate, endDelegate, _processRequestTag);\r
-            }\r
-            else {\r
-                // synchronous handler\r
-                Action action = delegate {\r
-                    httpHandler.ProcessRequest(HttpContext.Current);\r
-                };\r
-                return AsyncResultWrapper.BeginSynchronous(callback, state, action, _processRequestTag);\r
-            }\r
-        }\r
-\r
-        protected internal virtual void EndProcessRequest(IAsyncResult asyncResult) {\r
-            AsyncResultWrapper.End(asyncResult, _processRequestTag);\r
-        }\r
-\r
-        private static IHttpHandler GetHttpHandler(HttpContextBase httpContext) {\r
-            DummyHttpHandler dummyHandler = new DummyHttpHandler();\r
-            dummyHandler.PublicProcessRequest(httpContext);\r
-            return dummyHandler.HttpHandler;\r
-        }\r
-\r
-        // synchronous code\r
-        protected override void VerifyAndProcessRequest(IHttpHandler httpHandler, HttpContextBase httpContext) {\r
-            if (httpHandler == null) {\r
-                throw new ArgumentNullException("httpHandler");\r
-            }\r
-\r
-            httpHandler.ProcessRequest(HttpContext.Current);\r
-        }\r
-\r
-        #region IHttpAsyncHandler Members\r
-        IAsyncResult IHttpAsyncHandler.BeginProcessRequest(HttpContext context, AsyncCallback cb, object extraData) {\r
-            return BeginProcessRequest(context, cb, extraData);\r
-        }\r
-\r
-        void IHttpAsyncHandler.EndProcessRequest(IAsyncResult result) {\r
-            EndProcessRequest(result);\r
-        }\r
-        #endregion\r
-\r
-        // Since UrlRoutingHandler.ProcessRequest() does the heavy lifting of looking at the RouteCollection for\r
-        // a matching route, we need to call into it. However, that method is also responsible for kicking off\r
-        // the synchronous request, and we can't allow it to do that. The purpose of this dummy class is to run\r
-        // only the lookup portion of UrlRoutingHandler.ProcessRequest(), then intercept the handler it returns\r
-        // and execute it asynchronously.\r
-\r
-        private sealed class DummyHttpHandler : UrlRoutingHandler {\r
-            public IHttpHandler HttpHandler;\r
-\r
-            public void PublicProcessRequest(HttpContextBase httpContext) {\r
-                ProcessRequest(httpContext);\r
-            }\r
-\r
-            protected override void VerifyAndProcessRequest(IHttpHandler httpHandler, HttpContextBase httpContext) {\r
-                // don't process the request, just store a reference to it\r
-                HttpHandler = httpHandler;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcRouteHandler.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/MvcRouteHandler.cs
deleted file mode 100644 (file)
index 5d2bbaa..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Web.Routing;\r
-\r
-    public class MvcRouteHandler : IRouteHandler {\r
-        protected virtual IHttpHandler GetHttpHandler(RequestContext requestContext) {\r
-            return new MvcHandler(requestContext);\r
-        }\r
-\r
-        #region IRouteHandler Members\r
-        IHttpHandler IRouteHandler.GetHttpHandler(RequestContext requestContext) {\r
-            return GetHttpHandler(requestContext);\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/NameValueCollectionExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/NameValueCollectionExtensions.cs
deleted file mode 100644 (file)
index 7faf9f0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.Specialized;\r
-\r
-    public static class NameValueCollectionExtensions {\r
-\r
-        public static void CopyTo(this NameValueCollection collection, IDictionary<string, object> destination) {\r
-            CopyTo(collection, destination, false /* replaceEntries */);\r
-        }\r
-\r
-        public static void CopyTo(this NameValueCollection collection, IDictionary<string, object> destination, bool replaceEntries) {\r
-            if (collection == null) {\r
-                throw new ArgumentNullException("collection");\r
-            }\r
-            if (destination == null) {\r
-                throw new ArgumentNullException("destination");\r
-            }\r
-\r
-            foreach (string key in collection.Keys) {\r
-                if (replaceEntries || !destination.ContainsKey(key)) {\r
-                    destination[key] = collection[key];\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/NameValueCollectionValueProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/NameValueCollectionValueProvider.cs
deleted file mode 100644 (file)
index 9bc990b..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.Specialized;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-\r
-    public class NameValueCollectionValueProvider : IValueProvider {\r
-\r
-        private readonly HashSet<string> _prefixes = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-        private readonly Dictionary<string, ValueProviderResult> _values = new Dictionary<string, ValueProviderResult>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public NameValueCollectionValueProvider(NameValueCollection collection, CultureInfo culture) {\r
-            if (collection == null) {\r
-                throw new ArgumentNullException("collection");\r
-            }\r
-\r
-            AddValues(collection, culture);\r
-        }\r
-\r
-        private void AddValues(NameValueCollection collection, CultureInfo culture) {\r
-            if (collection.Count > 0) {\r
-                _prefixes.Add("");\r
-            }\r
-\r
-            foreach (string key in collection) {\r
-                if (key != null) {\r
-                    _prefixes.UnionWith(ValueProviderUtil.GetPrefixes(key));\r
-\r
-                    string[] rawValue = collection.GetValues(key);\r
-                    string attemptedValue = collection[key];\r
-                    _values[key] = new ValueProviderResult(rawValue, attemptedValue, culture);\r
-                }\r
-            }\r
-        }\r
-\r
-        public virtual bool ContainsPrefix(string prefix) {\r
-            if (prefix == null) {\r
-                throw new ArgumentNullException("prefix");\r
-            }\r
-\r
-            return _prefixes.Contains(prefix);\r
-        }\r
-\r
-        public virtual ValueProviderResult GetValue(string key) {\r
-            if (key == null) {\r
-                throw new ArgumentNullException("key");\r
-            }\r
-\r
-            ValueProviderResult vpResult;\r
-            _values.TryGetValue(key, out vpResult);\r
-            return vpResult;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/NoAsyncTimeoutAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/NoAsyncTimeoutAttribute.cs
deleted file mode 100644 (file)
index b482dc8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Threading;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public sealed class NoAsyncTimeoutAttribute : AsyncTimeoutAttribute {\r
-\r
-        public NoAsyncTimeoutAttribute()\r
-            : base(Timeout.Infinite) {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/NonActionAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/NonActionAttribute.cs
deleted file mode 100644 (file)
index c50ef63..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Reflection;\r
-\r
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class NonActionAttribute : ActionMethodSelectorAttribute {\r
-        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {\r
-            return false;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/NullViewLocationCache.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/NullViewLocationCache.cs
deleted file mode 100644 (file)
index dbfc9ae..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Text;\r
-\r
-    internal sealed class NullViewLocationCache : IViewLocationCache {\r
-\r
-        #region IViewLocationCache Members\r
-        public string GetViewLocation(HttpContextBase httpContext, string key) {\r
-            return null;\r
-        }\r
-\r
-        public void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath) {\r
-        }\r
-        #endregion\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/OutputCacheAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/OutputCacheAttribute.cs
deleted file mode 100644 (file)
index a83a82b..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web;\r
-    using System.Web.UI;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "Unsealed so that subclassed types can set properties in the default constructor.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public class OutputCacheAttribute : ActionFilterAttribute {\r
-\r
-        private OutputCacheParameters _cacheSettings = new OutputCacheParameters();\r
-\r
-        public string CacheProfile {\r
-            get {\r
-                return _cacheSettings.CacheProfile ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.CacheProfile = value;\r
-            }\r
-        }\r
-\r
-        internal OutputCacheParameters CacheSettings {\r
-            get {\r
-                return _cacheSettings;\r
-            }\r
-        }\r
-\r
-        public int Duration {\r
-            get {\r
-                return _cacheSettings.Duration;\r
-            }\r
-            set {\r
-                _cacheSettings.Duration = value;\r
-            }\r
-        }\r
-\r
-        public OutputCacheLocation Location {\r
-            get {\r
-                return _cacheSettings.Location;\r
-            }\r
-            set {\r
-                _cacheSettings.Location = value;\r
-            }\r
-        }\r
-\r
-        public bool NoStore {\r
-            get {\r
-                return _cacheSettings.NoStore;\r
-            }\r
-            set {\r
-                _cacheSettings.NoStore = value;\r
-            }\r
-        }\r
-\r
-        public string SqlDependency {\r
-            get {\r
-                return _cacheSettings.SqlDependency ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.SqlDependency = value;\r
-            }\r
-        }\r
-\r
-        public string VaryByContentEncoding {\r
-            get {\r
-                return _cacheSettings.VaryByContentEncoding ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByContentEncoding = value;\r
-            }\r
-        }\r
-\r
-        public string VaryByCustom {\r
-            get {\r
-                return _cacheSettings.VaryByCustom ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByCustom = value;\r
-            }\r
-        }\r
-\r
-        public string VaryByHeader {\r
-            get {\r
-                return _cacheSettings.VaryByHeader ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByHeader = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Param",\r
-            Justification = "Matches the @ OutputCache page directive.")]\r
-        public string VaryByParam {\r
-            get {\r
-                return _cacheSettings.VaryByParam ?? String.Empty;\r
-            }\r
-            set {\r
-                _cacheSettings.VaryByParam = value;\r
-            }\r
-        }\r
-\r
-        public override void OnResultExecuting(ResultExecutingContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            if (filterContext.IsChildAction) {\r
-                return;\r
-            }\r
-\r
-            // we need to call ProcessRequest() since there's no other way to set the Page.Response intrinsic\r
-            OutputCachedPage page = new OutputCachedPage(_cacheSettings);\r
-            page.ProcessRequest(HttpContext.Current);\r
-        }\r
-\r
-        private sealed class OutputCachedPage : Page {\r
-            private OutputCacheParameters _cacheSettings;\r
-\r
-            public OutputCachedPage(OutputCacheParameters cacheSettings) {\r
-                // Tracing requires Page IDs to be unique.\r
-                ID = Guid.NewGuid().ToString();\r
-                _cacheSettings = cacheSettings;\r
-            }\r
-\r
-            protected override void FrameworkInitialize() {\r
-                // when you put the <%@ OutputCache %> directive on a page, the generated code calls InitOutputCache() from here\r
-                base.FrameworkInitialize();\r
-                InitOutputCache(_cacheSettings);\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterBindingInfo.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterBindingInfo.cs
deleted file mode 100644 (file)
index 09334b8..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public abstract class ParameterBindingInfo {\r
-\r
-        public virtual IModelBinder Binder {\r
-            get {\r
-                return null;\r
-            }\r
-        }\r
-\r
-        public virtual ICollection<string> Exclude {\r
-            get {\r
-                return new string[0];\r
-            }\r
-        }\r
-\r
-        public virtual ICollection<string> Include {\r
-            get {\r
-                return new string[0];\r
-            }\r
-        }\r
-\r
-        public virtual string Prefix {\r
-            get {\r
-                return null;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterDescriptor.cs
deleted file mode 100644 (file)
index 92ddce4..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Reflection;\r
-\r
-    public abstract class ParameterDescriptor : ICustomAttributeProvider {\r
-\r
-        private static readonly EmptyParameterBindingInfo _emptyBindingInfo = new EmptyParameterBindingInfo();\r
-\r
-        public abstract ActionDescriptor ActionDescriptor {\r
-            get;\r
-        }\r
-\r
-        public virtual ParameterBindingInfo BindingInfo {\r
-            get {\r
-                return _emptyBindingInfo;\r
-            }\r
-        }\r
-\r
-        public virtual object DefaultValue {\r
-            get {\r
-                return null;\r
-            }\r
-        }\r
-\r
-        public abstract string ParameterName {\r
-            get;\r
-        }\r
-\r
-        public abstract Type ParameterType {\r
-            get;\r
-        }\r
-\r
-        public virtual object[] GetCustomAttributes(bool inherit) {\r
-            return GetCustomAttributes(typeof(object), inherit);\r
-        }\r
-\r
-        public virtual object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return (object[])Array.CreateInstance(attributeType, 0);\r
-        }\r
-\r
-        public virtual bool IsDefined(Type attributeType, bool inherit) {\r
-            if (attributeType == null) {\r
-                throw new ArgumentNullException("attributeType");\r
-            }\r
-\r
-            return false;\r
-        }\r
-\r
-        private sealed class EmptyParameterBindingInfo : ParameterBindingInfo {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterInfoUtil.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ParameterInfoUtil.cs
deleted file mode 100644 (file)
index c538e14..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel;\r
-    using System.Reflection;\r
-\r
-    internal static class ParameterInfoUtil {\r
-\r
-        public static bool TryGetDefaultValue(ParameterInfo parameterInfo, out object value) {\r
-            // this will get the default value as seen by the VB / C# compilers\r
-            // if no value was baked in, RawDefaultValue returns DBNull.Value\r
-            object rawDefaultValue = parameterInfo.RawDefaultValue;\r
-            if (rawDefaultValue != DBNull.Value) {\r
-                value = rawDefaultValue;\r
-                return true;\r
-            }\r
-\r
-            // if the compiler did not bake in a default value, check the [DefaultValue] attribute\r
-            DefaultValueAttribute[] attrs = (DefaultValueAttribute[])parameterInfo.GetCustomAttributes(typeof(DefaultValueAttribute), false);\r
-            if (attrs == null || attrs.Length == 0) {\r
-                value = default(object);\r
-                return false;\r
-            }\r
-            else {\r
-                value = attrs[0].Value;\r
-                return true;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/PartialViewResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/PartialViewResult.cs
deleted file mode 100644 (file)
index 86f9fb1..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class PartialViewResult : ViewResultBase {\r
-\r
-        protected override ViewEngineResult FindView(ControllerContext context) {\r
-            ViewEngineResult result = ViewEngineCollection.FindPartialView(context, ViewName);\r
-            if (result.View != null) {\r
-                return result;\r
-            }\r
-\r
-            // we need to generate an exception containing all the locations we searched\r
-            StringBuilder locationsText = new StringBuilder();\r
-            foreach (string location in result.SearchedLocations) {\r
-                locationsText.AppendLine();\r
-                locationsText.Append(location);\r
-            }\r
-            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Common_PartialViewNotFound, ViewName, locationsText));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/PathHelpers.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/PathHelpers.cs
deleted file mode 100644 (file)
index cb5be74..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Specialized;\r
-    using System.Web;\r
-\r
-    internal static class PathHelpers {\r
-\r
-        private const string _urlRewriterServerVar = "HTTP_X_ORIGINAL_URL";\r
-\r
-        // this method can accept an app-relative path or an absolute path for contentPath\r
-        public static string GenerateClientUrl(HttpContextBase httpContext, string contentPath) {\r
-            if (String.IsNullOrEmpty(contentPath)) {\r
-                return contentPath;\r
-            }\r
-\r
-            // many of the methods we call internally can't handle query strings properly, so just strip it out for\r
-            // the time being\r
-            string query;\r
-            contentPath = StripQuery(contentPath, out query);\r
-\r
-            return GenerateClientUrlInternal(httpContext, contentPath) + query;\r
-        }\r
-\r
-        private static string GenerateClientUrlInternal(HttpContextBase httpContext, string contentPath) {\r
-            if (String.IsNullOrEmpty(contentPath)) {\r
-                return contentPath;\r
-            }\r
-\r
-            // can't call VirtualPathUtility.IsAppRelative since it throws on some inputs\r
-            bool isAppRelative = contentPath[0] == '~';\r
-            if (isAppRelative) {\r
-                string absoluteContentPath = VirtualPathUtility.ToAbsolute(contentPath, httpContext.Request.ApplicationPath);\r
-                string modifiedAbsoluteContentPath = httpContext.Response.ApplyAppPathModifier(absoluteContentPath);\r
-                return GenerateClientUrlInternal(httpContext, modifiedAbsoluteContentPath);\r
-            }\r
-\r
-            // we only want to manipulate the path if URL rewriting is active, else we risk breaking the generated URL\r
-            NameValueCollection serverVars = httpContext.Request.ServerVariables;\r
-            bool urlRewriterIsEnabled = (serverVars != null && serverVars[_urlRewriterServerVar] != null);\r
-            if (!urlRewriterIsEnabled) {\r
-                return contentPath;\r
-            }\r
-\r
-            // Since the rawUrl represents what the user sees in his browser, it is what we want to use as the base\r
-            // of our absolute paths. For example, consider mysite.example.com/foo, which is internally\r
-            // rewritten to content.example.com/mysite/foo. When we want to generate a link to ~/bar, we want to\r
-            // base it from / instead of /foo, otherwise the user ends up seeing mysite.example.com/foo/bar,\r
-            // which is incorrect.\r
-            string relativeUrlToDestination = MakeRelative(httpContext.Request.Path, contentPath);\r
-            string absoluteUrlToDestination = MakeAbsolute(httpContext.Request.RawUrl, relativeUrlToDestination);\r
-            return absoluteUrlToDestination;\r
-        }\r
-\r
-        public static string MakeAbsolute(string basePath, string relativePath) {\r
-            // The Combine() method can't handle query strings on the base path, so we trim it off.\r
-            string query;\r
-            basePath = StripQuery(basePath, out query);\r
-            return VirtualPathUtility.Combine(basePath, relativePath);\r
-        }\r
-\r
-        public static string MakeRelative(string fromPath, string toPath) {\r
-            string relativeUrl = VirtualPathUtility.MakeRelative(fromPath, toPath);\r
-            if (String.IsNullOrEmpty(relativeUrl) || relativeUrl[0] == '?') {\r
-                // Sometimes VirtualPathUtility.MakeRelative() will return an empty string when it meant to return '.',\r
-                // but links to {empty string} are browser dependent. We replace it with an explicit path to force\r
-                // consistency across browsers.\r
-                relativeUrl = "./" + relativeUrl;\r
-            }\r
-            return relativeUrl;\r
-        }\r
-\r
-        private static string StripQuery(string path, out string query) {\r
-            int queryIndex = path.IndexOf('?');\r
-            if (queryIndex >= 0) {\r
-                query = path.Substring(queryIndex);\r
-                return path.Substring(0, queryIndex);\r
-            }\r
-            else {\r
-                query = null;\r
-                return path;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/QueryStringValueProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/QueryStringValueProvider.cs
deleted file mode 100644 (file)
index 19f4c6e..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Specialized;\r
-    using System.Globalization;\r
-\r
-    public sealed class QueryStringValueProvider : NameValueCollectionValueProvider {\r
-\r
-        // QueryString should use the invariant culture since it's part of the URL, and the URL should be\r
-        // interpreted in a uniform fashion regardless of the origin of a particular request.\r
-        public QueryStringValueProvider(ControllerContext controllerContext)\r
-            : base(controllerContext.HttpContext.Request.QueryString, CultureInfo.InvariantCulture) {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/QueryStringValueProviderFactory.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/QueryStringValueProviderFactory.cs
deleted file mode 100644 (file)
index c12bb3b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public sealed class QueryStringValueProviderFactory : ValueProviderFactory {\r
-\r
-        public override IValueProvider GetValueProvider(ControllerContext controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            return new QueryStringValueProvider(controllerContext);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RangeAttributeAdapter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RangeAttributeAdapter.cs
deleted file mode 100644 (file)
index d789d98..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
-    public class RangeAttributeAdapter : DataAnnotationsModelValidator<RangeAttribute> {\r
-        public RangeAttributeAdapter(ModelMetadata metadata, ControllerContext context, RangeAttribute attribute)\r
-            : base(metadata, context, attribute) {\r
-        }\r
-\r
-        public override IEnumerable<ModelClientValidationRule> GetClientValidationRules() {\r
-            return new[] { new ModelClientValidationRangeRule(ErrorMessage, Attribute.Minimum, Attribute.Maximum) };\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReaderWriterCache`2.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReaderWriterCache`2.cs
deleted file mode 100644 (file)
index 63e2fd4..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Threading;\r
-\r
-    [SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable",\r
-        Justification = "Instances of this type are meant to be singletons.")]\r
-    internal abstract class ReaderWriterCache<TKey, TValue> {\r
-\r
-        private readonly Dictionary<TKey, TValue> _cache;\r
-        private readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim();\r
-\r
-        protected ReaderWriterCache()\r
-            : this(null) {\r
-        }\r
-\r
-        protected ReaderWriterCache(IEqualityComparer<TKey> comparer) {\r
-            _cache = new Dictionary<TKey, TValue>(comparer);\r
-        }\r
-\r
-        protected Dictionary<TKey, TValue> Cache {\r
-            get {\r
-                return _cache;\r
-            }\r
-        }\r
-\r
-        protected TValue FetchOrCreateItem(TKey key, Func<TValue> creator) {\r
-            // first, see if the item already exists in the cache\r
-            _rwLock.EnterReadLock();\r
-            try {\r
-                TValue existingEntry;\r
-                if (_cache.TryGetValue(key, out existingEntry)) {\r
-                    return existingEntry;\r
-                }\r
-            }\r
-            finally {\r
-                _rwLock.ExitReadLock();\r
-            }\r
-\r
-            // insert the new item into the cache\r
-            TValue newEntry = creator();\r
-            _rwLock.EnterWriteLock();\r
-            try {\r
-                TValue existingEntry;\r
-                if (_cache.TryGetValue(key, out existingEntry)) {\r
-                    // another thread already inserted an item, so use that one\r
-                    return existingEntry;\r
-                }\r
-\r
-                _cache[key] = newEntry;\r
-                return newEntry;\r
-            }\r
-            finally {\r
-                _rwLock.ExitWriteLock();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RedirectResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RedirectResult.cs
deleted file mode 100644 (file)
index 10abf15..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    // represents a result that performs a redirection given some URI\r
-    public class RedirectResult : ActionResult {\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "0#",\r
-            Justification = "Response.Redirect() takes its URI as a string parameter.")]\r
-        public RedirectResult(string url) {\r
-            if (String.IsNullOrEmpty(url)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "url");\r
-            }\r
-\r
-            Url = url;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings",\r
-            Justification = "Response.Redirect() takes its URI as a string parameter.")]\r
-        public string Url {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-            if (context.IsChildAction) {\r
-                throw new InvalidOperationException(MvcResources.RedirectAction_CannotRedirectInChildAction);\r
-            }\r
-\r
-            string destinationUrl = UrlHelper.GenerateContentUrl(Url, context.HttpContext);\r
-            context.Controller.TempData.Keep();\r
-            context.HttpContext.Response.Redirect(destinationUrl, false /* endResponse */);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RedirectToRouteResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RedirectToRouteResult.cs
deleted file mode 100644 (file)
index 74b5ce5..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    // represents a result that performs a redirection given some values dictionary\r
-    public class RedirectToRouteResult : ActionResult {\r
-\r
-        private RouteCollection _routes;\r
-\r
-        public RedirectToRouteResult(RouteValueDictionary routeValues) :\r
-            this(null, routeValues) {\r
-        }\r
-\r
-        public RedirectToRouteResult(string routeName, RouteValueDictionary routeValues) {\r
-            RouteName = routeName ?? String.Empty;\r
-            RouteValues = routeValues ?? new RouteValueDictionary();\r
-        }\r
-\r
-        public string RouteName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public RouteValueDictionary RouteValues {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        internal RouteCollection Routes {\r
-            get {\r
-                if (_routes == null) {\r
-                    _routes = RouteTable.Routes;\r
-                }\r
-                return _routes;\r
-            }\r
-            set {\r
-                _routes = value;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-            if (context.IsChildAction) {\r
-                throw new InvalidOperationException(MvcResources.RedirectAction_CannotRedirectInChildAction);\r
-            }\r
-\r
-            string destinationUrl = UrlHelper.GenerateUrl(RouteName, null /* actionName */, null /* controllerName */, RouteValues, Routes, context.RequestContext, false /* includeImplicitMvcValues */);\r
-            if (String.IsNullOrEmpty(destinationUrl)) {\r
-                throw new InvalidOperationException(MvcResources.Common_NoRouteMatched);\r
-            }\r
-\r
-            context.Controller.TempData.Keep();\r
-            context.HttpContext.Response.Redirect(destinationUrl, false /* endResponse */);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedActionDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedActionDescriptor.cs
deleted file mode 100644 (file)
index c8ff6ba..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ReflectedActionDescriptor : ActionDescriptor {\r
-\r
-        private readonly string _actionName;\r
-        private readonly ControllerDescriptor _controllerDescriptor;\r
-        private ParameterDescriptor[] _parametersCache;\r
-\r
-        public ReflectedActionDescriptor(MethodInfo methodInfo, string actionName, ControllerDescriptor controllerDescriptor)\r
-            : this(methodInfo, actionName, controllerDescriptor, true /* validateMethod */) {\r
-        }\r
-\r
-        internal ReflectedActionDescriptor(MethodInfo methodInfo, string actionName, ControllerDescriptor controllerDescriptor, bool validateMethod) {\r
-            if (methodInfo == null) {\r
-                throw new ArgumentNullException("methodInfo");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-            if (controllerDescriptor == null) {\r
-                throw new ArgumentNullException("controllerDescriptor");\r
-            }\r
-\r
-            if (validateMethod) {\r
-                string failedMessage = VerifyActionMethodIsCallable(methodInfo);\r
-                if (failedMessage != null) {\r
-                    throw new ArgumentException(failedMessage, "methodInfo");\r
-                }\r
-            }\r
-\r
-            MethodInfo = methodInfo;\r
-            _actionName = actionName;\r
-            _controllerDescriptor = controllerDescriptor;\r
-        }\r
-\r
-        public override string ActionName {\r
-            get {\r
-                return _actionName;\r
-            }\r
-        }\r
-\r
-        public override ControllerDescriptor ControllerDescriptor {\r
-            get {\r
-                return _controllerDescriptor;\r
-            }\r
-        }\r
-\r
-        public MethodInfo MethodInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override object Execute(ControllerContext controllerContext, IDictionary<string, object> parameters) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (parameters == null) {\r
-                throw new ArgumentNullException("parameters");\r
-            }\r
-\r
-            ParameterInfo[] parameterInfos = MethodInfo.GetParameters();\r
-            var rawParameterValues = from parameterInfo in parameterInfos\r
-                                     select ExtractParameterFromDictionary(parameterInfo, parameters, MethodInfo);\r
-            object[] parametersArray = rawParameterValues.ToArray();\r
-\r
-            ActionMethodDispatcher dispatcher = DispatcherCache.GetDispatcher(MethodInfo);\r
-            object actionReturnValue = dispatcher.Execute(controllerContext.Controller, parametersArray);\r
-            return actionReturnValue;\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return MethodInfo.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return MethodInfo.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override FilterInfo GetFilters() {\r
-            return GetFilters(MethodInfo);\r
-        }\r
-\r
-        public override ParameterDescriptor[] GetParameters() {\r
-            ParameterDescriptor[] parameters = LazilyFetchParametersCollection();\r
-\r
-            // need to clone array so that user modifications aren't accidentally stored\r
-            return (ParameterDescriptor[])parameters.Clone();\r
-        }\r
-\r
-        public override ICollection<ActionSelector> GetSelectors() {\r
-            ActionMethodSelectorAttribute[] attrs = (ActionMethodSelectorAttribute[])MethodInfo.GetCustomAttributes(typeof(ActionMethodSelectorAttribute), true /* inherit */);\r
-            ActionSelector[] selectors = Array.ConvertAll(attrs, attr => (ActionSelector)(controllerContext => attr.IsValidForRequest(controllerContext, MethodInfo)));\r
-            return selectors;\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return MethodInfo.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-        private ParameterDescriptor[] LazilyFetchParametersCollection() {\r
-            return DescriptorUtil.LazilyFetchOrCreateDescriptors<ParameterInfo, ParameterDescriptor>(\r
-                ref _parametersCache /* cacheLocation */,\r
-                MethodInfo.GetParameters /* initializer */,\r
-                parameterInfo => new ReflectedParameterDescriptor(parameterInfo, this) /* converter */);\r
-        }\r
-\r
-        internal static ReflectedActionDescriptor TryCreateDescriptor(MethodInfo methodInfo, string name, ControllerDescriptor controllerDescriptor) {\r
-            ReflectedActionDescriptor descriptor = new ReflectedActionDescriptor(methodInfo, name, controllerDescriptor, false /* validateMethod */);\r
-            string failedMessage = VerifyActionMethodIsCallable(methodInfo);\r
-            return (failedMessage == null) ? descriptor : null;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedControllerDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedControllerDescriptor.cs
deleted file mode 100644 (file)
index 990f136..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ReflectedControllerDescriptor : ControllerDescriptor {\r
-\r
-        private ActionDescriptor[] _canonicalActionsCache;\r
-        private readonly Type _controllerType;\r
-        private readonly ActionMethodSelector _selector;\r
-\r
-        public ReflectedControllerDescriptor(Type controllerType) {\r
-            if (controllerType == null) {\r
-                throw new ArgumentNullException("controllerType");\r
-            }\r
-\r
-            _controllerType = controllerType;\r
-            _selector = new ActionMethodSelector(_controllerType);\r
-        }\r
-\r
-        public sealed override Type ControllerType {\r
-            get {\r
-                return _controllerType;\r
-            }\r
-        }\r
-\r
-        public override ActionDescriptor FindAction(ControllerContext controllerContext, string actionName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(actionName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "actionName");\r
-            }\r
-\r
-            MethodInfo matched = _selector.FindActionMethod(controllerContext, actionName);\r
-            if (matched == null) {\r
-                return null;\r
-            }\r
-\r
-            return new ReflectedActionDescriptor(matched, actionName, this);\r
-        }\r
-\r
-        private MethodInfo[] GetAllActionMethodsFromSelector() {\r
-            List<MethodInfo> allValidMethods = new List<MethodInfo>();\r
-            allValidMethods.AddRange(_selector.AliasedMethods);\r
-            allValidMethods.AddRange(_selector.NonAliasedMethods.SelectMany(g => g));\r
-            return allValidMethods.ToArray();\r
-        }\r
-\r
-        public override ActionDescriptor[] GetCanonicalActions() {\r
-            ActionDescriptor[] actions = LazilyFetchCanonicalActionsCollection();\r
-\r
-            // need to clone array so that user modifications aren't accidentally stored\r
-            return (ActionDescriptor[])actions.Clone();\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return ControllerType.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return ControllerType.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return ControllerType.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-        private ActionDescriptor[] LazilyFetchCanonicalActionsCollection() {\r
-            return DescriptorUtil.LazilyFetchOrCreateDescriptors<MethodInfo, ActionDescriptor>(\r
-                ref _canonicalActionsCache /* cacheLocation */,\r
-                GetAllActionMethodsFromSelector /* initializer */,\r
-                methodInfo => ReflectedActionDescriptor.TryCreateDescriptor(methodInfo, methodInfo.Name, this) /* converter */);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedParameterBindingInfo.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedParameterBindingInfo.cs
deleted file mode 100644 (file)
index 0281765..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Globalization;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    internal class ReflectedParameterBindingInfo : ParameterBindingInfo {\r
-\r
-        private ICollection<string> _exclude = new string[0];\r
-        private ICollection<string> _include = new string[0];\r
-        private readonly ParameterInfo _parameterInfo;\r
-        private string _prefix;\r
-\r
-        public ReflectedParameterBindingInfo(ParameterInfo parameterInfo) {\r
-            _parameterInfo = parameterInfo;\r
-            ReadSettingsFromBindAttribute();\r
-        }\r
-\r
-        public override IModelBinder Binder {\r
-            get {\r
-                IModelBinder binder = ModelBinders.GetBinderFromAttributes(_parameterInfo,\r
-                    () => String.Format(CultureInfo.CurrentUICulture, MvcResources.ReflectedParameterBindingInfo_MultipleConverterAttributes,\r
-                        _parameterInfo.Name, _parameterInfo.Member));\r
-\r
-                return binder;\r
-            }\r
-        }\r
-\r
-        public override ICollection<string> Exclude {\r
-            get {\r
-                return _exclude;\r
-            }\r
-        }\r
-\r
-        public override ICollection<string> Include {\r
-            get {\r
-                return _include;\r
-            }\r
-        }\r
-\r
-        public override string Prefix {\r
-            get {\r
-                return _prefix;\r
-            }\r
-        }\r
-\r
-        private void ReadSettingsFromBindAttribute() {\r
-            BindAttribute attr = (BindAttribute)Attribute.GetCustomAttribute(_parameterInfo, typeof(BindAttribute));\r
-            if (attr == null) {\r
-                return;\r
-            }\r
-\r
-            _exclude = new ReadOnlyCollection<string>(AuthorizeAttribute.SplitString(attr.Exclude));\r
-            _include = new ReadOnlyCollection<string>(AuthorizeAttribute.SplitString(attr.Include));\r
-            _prefix = attr.Prefix;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedParameterDescriptor.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ReflectedParameterDescriptor.cs
deleted file mode 100644 (file)
index 357f45e..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel;\r
-    using System.Reflection;\r
-\r
-    public class ReflectedParameterDescriptor : ParameterDescriptor {\r
-\r
-        private readonly ActionDescriptor _actionDescriptor;\r
-        private readonly ReflectedParameterBindingInfo _bindingInfo;\r
-\r
-        public ReflectedParameterDescriptor(ParameterInfo parameterInfo, ActionDescriptor actionDescriptor) {\r
-            if (parameterInfo == null) {\r
-                throw new ArgumentNullException("parameterInfo");\r
-            }\r
-            if (actionDescriptor == null) {\r
-                throw new ArgumentNullException("actionDescriptor");\r
-            }\r
-\r
-            ParameterInfo = parameterInfo;\r
-            _actionDescriptor = actionDescriptor;\r
-            _bindingInfo = new ReflectedParameterBindingInfo(parameterInfo);\r
-        }\r
-\r
-        public override ActionDescriptor ActionDescriptor {\r
-            get {\r
-                return _actionDescriptor;\r
-            }\r
-        }\r
-\r
-        public override ParameterBindingInfo BindingInfo {\r
-            get {\r
-                return _bindingInfo;\r
-            }\r
-        }\r
-\r
-        public override object DefaultValue {\r
-            get {\r
-                object value;\r
-                if (ParameterInfoUtil.TryGetDefaultValue(ParameterInfo, out value)) {\r
-                    return value;\r
-                }\r
-                else {\r
-                    return base.DefaultValue;\r
-                }\r
-            }\r
-        }\r
-\r
-        public ParameterInfo ParameterInfo {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public override string ParameterName {\r
-            get {\r
-                return ParameterInfo.Name;\r
-            }\r
-        }\r
-\r
-        public override Type ParameterType {\r
-            get {\r
-                return ParameterInfo.ParameterType;\r
-            }\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(bool inherit) {\r
-            return ParameterInfo.GetCustomAttributes(inherit);\r
-        }\r
-\r
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit) {\r
-            return ParameterInfo.GetCustomAttributes(attributeType, inherit);\r
-        }\r
-\r
-        public override bool IsDefined(Type attributeType, bool inherit) {\r
-            return ParameterInfo.IsDefined(attributeType, inherit);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RegularExpressionAttributeAdapter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RegularExpressionAttributeAdapter.cs
deleted file mode 100644 (file)
index f175502..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
-    public class RegularExpressionAttributeAdapter : DataAnnotationsModelValidator<RegularExpressionAttribute> {\r
-        public RegularExpressionAttributeAdapter(ModelMetadata metadata, ControllerContext context, RegularExpressionAttribute attribute)\r
-            : base(metadata, context, attribute) {\r
-        }\r
-\r
-        public override IEnumerable<ModelClientValidationRule> GetClientValidationRules() {\r
-            return new[] { new ModelClientValidationRegexRule(ErrorMessage, Attribute.Pattern) };\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RequireHttpsAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RequireHttpsAttribute.cs
deleted file mode 100644 (file)
index dff4c92..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "Unsealed because type contains virtual extensibility points.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public class RequireHttpsAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        public virtual void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            if (!filterContext.HttpContext.Request.IsSecureConnection) {\r
-                HandleNonHttpsRequest(filterContext);\r
-            }\r
-        }\r
-\r
-        protected virtual void HandleNonHttpsRequest(AuthorizationContext filterContext) {\r
-            // only redirect for GET requests, otherwise the browser might not propagate the verb and request\r
-            // body correctly.\r
-\r
-            if (!String.Equals(filterContext.HttpContext.Request.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)) {\r
-                throw new InvalidOperationException(MvcResources.RequireHttpsAttribute_MustUseSsl);\r
-            }\r
-\r
-            // redirect to HTTPS version of page\r
-            string url = "https://" + filterContext.HttpContext.Request.Url.Host + filterContext.HttpContext.Request.RawUrl;\r
-            filterContext.Result = new RedirectResult(url);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RequiredAttributeAdapter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RequiredAttributeAdapter.cs
deleted file mode 100644 (file)
index edb7dc3..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
-    public class RequiredAttributeAdapter : DataAnnotationsModelValidator<RequiredAttribute> {\r
-        public RequiredAttributeAdapter(ModelMetadata metadata, ControllerContext context, RequiredAttribute attribute)\r
-            : base(metadata, context, attribute) {\r
-        }\r
-\r
-        public override IEnumerable<ModelClientValidationRule> GetClientValidationRules() {\r
-            return new[] { new ModelClientValidationRequiredRule(ErrorMessage) };\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/.gitattributes b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/.gitattributes
deleted file mode 100644 (file)
index c8c1f84..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/MvcResources.Designer.cs -crlf
-/MvcResources.resx -crlf
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/MvcResources.Designer.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/MvcResources.Designer.cs
deleted file mode 100644 (file)
index 4be3e6b..0000000
+++ /dev/null
@@ -1,797 +0,0 @@
-//------------------------------------------------------------------------------\r
-// <auto-generated>\r
-//     This code was generated by a tool.\r
-//     Runtime Version:2.0.50727.4200\r
-//\r
-//     Changes to this file may cause incorrect behavior and will be lost if\r
-//     the code is regenerated.\r
-// </auto-generated>\r
-//------------------------------------------------------------------------------\r
-\r
-namespace System.Web.Mvc.Resources {\r
-    using System;\r
-    \r
-    \r
-    /// <summary>\r
-    ///   A strongly-typed resource class, for looking up localized strings, etc.\r
-    /// </summary>\r
-    // This class was auto-generated by the StronglyTypedResourceBuilder\r
-    // class via a tool like ResGen or Visual Studio.\r
-    // To add or remove a member, edit your .ResX file then rerun ResGen\r
-    // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]\r
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    internal class MvcResources {\r
-        \r
-        private static global::System.Resources.ResourceManager resourceMan;\r
-        \r
-        private static global::System.Globalization.CultureInfo resourceCulture;\r
-        \r
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]\r
-        internal MvcResources() {\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Returns the cached ResourceManager instance used by this class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Resources.ResourceManager ResourceManager {\r
-            get {\r
-                if (object.ReferenceEquals(resourceMan, null)) {\r
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Web.Mvc.Resources.MvcResources", typeof(MvcResources).Assembly);\r
-                    resourceMan = temp;\r
-                }\r
-                return resourceMan;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Overrides the current thread's CurrentUICulture property for all\r
-        ///   resource lookups using this strongly typed resource class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        internal static global::System.Globalization.CultureInfo Culture {\r
-            get {\r
-                return resourceCulture;\r
-            }\r
-            set {\r
-                resourceCulture = value;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The current request for action &apos;{0}&apos; on controller type &apos;{1}&apos; is ambiguous between the following action methods:{2}.\r
-        /// </summary>\r
-        internal static string ActionMethodSelector_AmbiguousMatch {\r
-            get {\r
-                return ResourceManager.GetString("ActionMethodSelector_AmbiguousMatch", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to {0} on type {1}.\r
-        /// </summary>\r
-        internal static string ActionMethodSelector_AmbiguousMatchType {\r
-            get {\r
-                return ResourceManager.GetString("ActionMethodSelector_AmbiguousMatchType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A required anti-forgery token was not supplied or was invalid..\r
-        /// </summary>\r
-        internal static string AntiForgeryToken_ValidationFailed {\r
-            get {\r
-                return ResourceManager.GetString("AntiForgeryToken_ValidationFailed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Lookup for method &apos;{0}&apos; on controller type &apos;{1}&apos; failed because of an ambiguity between the following methods:{2}.\r
-        /// </summary>\r
-        internal static string AsyncActionMethodSelector_AmbiguousMethodMatch {\r
-            get {\r
-                return ResourceManager.GetString("AsyncActionMethodSelector_AmbiguousMethodMatch", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Could not locate a method named &apos;{0}&apos; on controller type {1}..\r
-        /// </summary>\r
-        internal static string AsyncActionMethodSelector_CouldNotFindMethod {\r
-            get {\r
-                return ResourceManager.GetString("AsyncActionMethodSelector_CouldNotFindMethod", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The provided IAsyncResult has already been consumed..\r
-        /// </summary>\r
-        internal static string AsyncCommon_AsyncResultAlreadyConsumed {\r
-            get {\r
-                return ResourceManager.GetString("AsyncCommon_AsyncResultAlreadyConsumed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller of type &apos;{0}&apos; must subclass AsyncController or implement the IAsyncManagerContainer interface..\r
-        /// </summary>\r
-        internal static string AsyncCommon_ControllerMustImplementIAsyncManagerContainer {\r
-            get {\r
-                return ResourceManager.GetString("AsyncCommon_ControllerMustImplementIAsyncManagerContainer", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The provided IAsyncResult is not valid for this method..\r
-        /// </summary>\r
-        internal static string AsyncCommon_InvalidAsyncResult {\r
-            get {\r
-                return ResourceManager.GetString("AsyncCommon_InvalidAsyncResult", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The timeout value must be non-negative or Timeout.Infinite..\r
-        /// </summary>\r
-        internal static string AsyncCommon_InvalidTimeout {\r
-            get {\r
-                return ResourceManager.GetString("AsyncCommon_InvalidTimeout", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The action &apos;{0}&apos; is accessible only by a child request..\r
-        /// </summary>\r
-        internal static string ChildActionOnlyAttribute_MustBeInChildRequest {\r
-            get {\r
-                return ResourceManager.GetString("ChildActionOnlyAttribute_MustBeInChildRequest", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The field {0} must be a number..\r
-        /// </summary>\r
-        internal static string ClientDataTypeModelValidatorProvider_FieldMustBeNumeric {\r
-            get {\r
-                return ResourceManager.GetString("ClientDataTypeModelValidatorProvider_FieldMustBeNumeric", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to No route in the route table matches the supplied values..\r
-        /// </summary>\r
-        internal static string Common_NoRouteMatched {\r
-            get {\r
-                return ResourceManager.GetString("Common_NoRouteMatched", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Value cannot be null or empty..\r
-        /// </summary>\r
-        internal static string Common_NullOrEmpty {\r
-            get {\r
-                return ResourceManager.GetString("Common_NullOrEmpty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The partial view &apos;{0}&apos; was not found. The following locations were searched:{1}.\r
-        /// </summary>\r
-        internal static string Common_PartialViewNotFound {\r
-            get {\r
-                return ResourceManager.GetString("Common_PartialViewNotFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The property &apos;{0}&apos; cannot be null or empty..\r
-        /// </summary>\r
-        internal static string Common_PropertyCannotBeNullOrEmpty {\r
-            get {\r
-                return ResourceManager.GetString("Common_PropertyCannotBeNullOrEmpty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The property {0}.{1} could not be found..\r
-        /// </summary>\r
-        internal static string Common_PropertyNotFound {\r
-            get {\r
-                return ResourceManager.GetString("Common_PropertyNotFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to False.\r
-        /// </summary>\r
-        internal static string Common_TriState_False {\r
-            get {\r
-                return ResourceManager.GetString("Common_TriState_False", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Not Set.\r
-        /// </summary>\r
-        internal static string Common_TriState_NotSet {\r
-            get {\r
-                return ResourceManager.GetString("Common_TriState_NotSet", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to True.\r
-        /// </summary>\r
-        internal static string Common_TriState_True {\r
-            get {\r
-                return ResourceManager.GetString("Common_TriState_True", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type {0} must derive from {1}.\r
-        /// </summary>\r
-        internal static string Common_TypeMustDriveFromType {\r
-            get {\r
-                return ResourceManager.GetString("Common_TypeMustDriveFromType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value &apos;{0}&apos; is invalid..\r
-        /// </summary>\r
-        internal static string Common_ValueNotValidForProperty {\r
-            get {\r
-                return ResourceManager.GetString("Common_ValueNotValidForProperty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The view &apos;{0}&apos; or its master was not found. The following locations were searched:{1}.\r
-        /// </summary>\r
-        internal static string Common_ViewNotFound {\r
-            get {\r
-                return ResourceManager.GetString("Common_ViewNotFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A public action method &apos;{0}&apos; was not found on controller &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string Controller_UnknownAction {\r
-            get {\r
-                return ResourceManager.GetString("Controller_UnknownAction", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The model of type &apos;{0}&apos; could not be updated..\r
-        /// </summary>\r
-        internal static string Controller_UpdateModel_UpdateUnsuccessful {\r
-            get {\r
-                return ResourceManager.GetString("Controller_UpdateModel_UpdateUnsuccessful", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The model of type &apos;{0}&apos; is not valid..\r
-        /// </summary>\r
-        internal static string Controller_Validate_ValidationFailed {\r
-            get {\r
-                return ResourceManager.GetString("Controller_Validate_ValidationFailed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A single instance of controller &apos;{0}&apos; cannot be used to handle multiple requests. If a custom controller factory is in use, make sure that it creates a new instance of the controller for each request..\r
-        /// </summary>\r
-        internal static string ControllerBase_CannotHandleMultipleRequests {\r
-            get {\r
-                return ResourceManager.GetString("ControllerBase_CannotHandleMultipleRequests", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An error occurred when trying to create the IControllerFactory &apos;{0}&apos;. Make sure that the controller factory has a public parameterless constructor..\r
-        /// </summary>\r
-        internal static string ControllerBuilder_ErrorCreatingControllerFactory {\r
-            get {\r
-                return ResourceManager.GetString("ControllerBuilder_ErrorCreatingControllerFactory", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The IControllerFactory &apos;{0}&apos; did not return a controller for the name &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ControllerBuilder_FactoryReturnedNull {\r
-            get {\r
-                return ResourceManager.GetString("ControllerBuilder_FactoryReturnedNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller factory type &apos;{0}&apos; must implement the IControllerFactory interface..\r
-        /// </summary>\r
-        internal static string ControllerBuilder_MissingIControllerFactory {\r
-            get {\r
-                return ResourceManager.GetString("ControllerBuilder_MissingIControllerFactory", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to {0} has a DisplayColumn attribute for {1}, but property {1} does not exist..\r
-        /// </summary>\r
-        internal static string DataAnnotationsModelMetadataProvider_UnknownProperty {\r
-            get {\r
-                return ResourceManager.GetString("DataAnnotationsModelMetadataProvider_UnknownProperty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to {0} has a DisplayColumn attribute for {1}, but property {1} does not have a public getter..\r
-        /// </summary>\r
-        internal static string DataAnnotationsModelMetadataProvider_UnreadableProperty {\r
-            get {\r
-                return ResourceManager.GetString("DataAnnotationsModelMetadataProvider_UnreadableProperty", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type {0} must have a public constructor which accepts three parameters of types {1}, {2}, and {3}.\r
-        /// </summary>\r
-        internal static string DataAnnotationsModelValidatorProvider_ConstructorRequirements {\r
-            get {\r
-                return ResourceManager.GetString("DataAnnotationsModelValidatorProvider_ConstructorRequirements", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Multiple types were found that match the controller named &apos;{0}&apos;. This can happen if the route that services this request does not specify namespaces to search for a controller that matches the request. If this is the case, register this route by calling an overload of the &apos;MapRoute&apos; method that takes a &apos;namespaces&apos; parameter.\r
-        ///\r
-        ///The request for &apos;{0}&apos; has found the following matching controllers:{1}.\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_ControllerNameAmbiguous_WithoutRouteUrl {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_ControllerNameAmbiguous_WithoutRouteUrl", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Multiple types were found that match the controller named &apos;{0}&apos;. This can happen if the route that services this request (&apos;{1}&apos;) does not specify namespaces to search for a controller that matches the request. If this is the case, register this route by calling an overload of the &apos;MapRoute&apos; method that takes a &apos;namespaces&apos; parameter.\r
-        ///\r
-        ///The request for &apos;{0}&apos; has found the following matching controllers:{2}.\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_ControllerNameAmbiguous_WithRouteUrl {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_ControllerNameAmbiguous_WithRouteUrl", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An error occurred when trying to create a controller of type &apos;{0}&apos;. Make sure that the controller has a parameterless public constructor..\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_ErrorCreatingController {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_ErrorCreatingController", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller for path &apos;{0}&apos; was not found or does not implement IController..\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_NoControllerFound {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_NoControllerFound", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The controller type &apos;{0}&apos; must implement IController..\r
-        /// </summary>\r
-        internal static string DefaultControllerFactory_TypeDoesNotSubclassControllerBase {\r
-            get {\r
-                return ResourceManager.GetString("DefaultControllerFactory_TypeDoesNotSubclassControllerBase", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value &apos;{0}&apos; is not valid for {1}..\r
-        /// </summary>\r
-        internal static string DefaultModelBinder_ValueInvalid {\r
-            get {\r
-                return ResourceManager.GetString("DefaultModelBinder_ValueInvalid", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A value is required..\r
-        /// </summary>\r
-        internal static string DefaultModelBinder_ValueRequired {\r
-            get {\r
-                return ResourceManager.GetString("DefaultModelBinder_ValueRequired", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The number of ticks for the TimeSpan value must be greater than or equal to 0..\r
-        /// </summary>\r
-        internal static string DefaultViewLocationCache_NegativeTimeSpan {\r
-            get {\r
-                return ResourceManager.GetString("DefaultViewLocationCache_NegativeTimeSpan", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type &apos;{0}&apos; does not inherit from Exception..\r
-        /// </summary>\r
-        internal static string ExceptionViewAttribute_NonExceptionType {\r
-            get {\r
-                return ResourceManager.GetString("ExceptionViewAttribute_NonExceptionType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The expression compiler was unable to evaluate the indexer expression &apos;{0}&apos; because it references the model parameter &apos;{1}&apos; which is unavailable..\r
-        /// </summary>\r
-        internal static string ExpressionHelper_InvalidIndexerExpression {\r
-            get {\r
-                return ResourceManager.GetString("ExpressionHelper_InvalidIndexerExpression", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Order must be greater than or equal to -1..\r
-        /// </summary>\r
-        internal static string FilterAttribute_OrderOutOfRange {\r
-            get {\r
-                return ResourceManager.GetString("FilterAttribute_OrderOutOfRange", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The GET and POST HTTP methods are not supported..\r
-        /// </summary>\r
-        internal static string HtmlHelper_InvalidHttpMethod {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_InvalidHttpMethod", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The specified HttpVerbs value is not supported. The supported values are Delete, Head, and Put..\r
-        /// </summary>\r
-        internal static string HtmlHelper_InvalidHttpVerb {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_InvalidHttpVerb", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to There is no ViewData item of type &apos;{1}&apos; that has the key &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string HtmlHelper_MissingSelectData {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_MissingSelectData", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The value must be greater than or equal to zero..\r
-        /// </summary>\r
-        internal static string HtmlHelper_TextAreaParameterOutOfRange {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_TextAreaParameterOutOfRange", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ViewData item that has the key &apos;{0}&apos; is of type &apos;{1}&apos; but must be of type &apos;{2}&apos;..\r
-        /// </summary>\r
-        internal static string HtmlHelper_WrongSelectDataType {\r
-            get {\r
-                return ResourceManager.GetString("HtmlHelper_WrongSelectDataType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to This request has been blocked because sensitive information could be disclosed to third party web sites when this is used in a GET request. To allow GET requests, set JsonRequestBehavior to AllowGet..\r
-        /// </summary>\r
-        internal static string JsonRequest_GetNotAllowed {\r
-            get {\r
-                return ResourceManager.GetString("JsonRequest_GetNotAllowed", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An error occurred when trying to create the IModelBinder &apos;{0}&apos;. Make sure that the binder has a public parameterless constructor..\r
-        /// </summary>\r
-        internal static string ModelBinderAttribute_ErrorCreatingModelBinder {\r
-            get {\r
-                return ResourceManager.GetString("ModelBinderAttribute_ErrorCreatingModelBinder", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type &apos;{0}&apos; does not implement the IModelBinder interface..\r
-        /// </summary>\r
-        internal static string ModelBinderAttribute_TypeNotIModelBinder {\r
-            get {\r
-                return ResourceManager.GetString("ModelBinderAttribute_TypeNotIModelBinder", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The type &apos;{0}&apos; contains multiple attributes that inherit from CustomModelBinderAttribute..\r
-        /// </summary>\r
-        internal static string ModelBinderDictionary_MultipleAttributes {\r
-            get {\r
-                return ResourceManager.GetString("ModelBinderDictionary_MultipleAttributes", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to This property setter is obsolete, because its value is derived from ModelMetadata.Model now..\r
-        /// </summary>\r
-        internal static string ModelMetadata_PropertyNotSettable {\r
-            get {\r
-                return ResourceManager.GetString("ModelMetadata_PropertyNotSettable", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The associated metadata type for type &apos;{0}&apos; contains the following unknown properties or fields: {1}. Please make sure that the names of these members match the names of the properties on the main type..\r
-        /// </summary>\r
-        internal static string PrivateAssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties {\r
-            get {\r
-                return ResourceManager.GetString("PrivateAssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties" +\r
-                        "", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Child actions are not allowed to perform redirect actions..\r
-        /// </summary>\r
-        internal static string RedirectAction_CannotRedirectInChildAction {\r
-            get {\r
-                return ResourceManager.GetString("RedirectAction_CannotRedirectInChildAction", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot create a descriptor for instance method &apos;{0}&apos; on type &apos;{1}&apos; because the type does not derive from ControllerBase..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot call action method &apos;{0}&apos; on controller &apos;{1}&apos; because the parameter &apos;{2}&apos; is passed by reference..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cannot call action method &apos;{0}&apos; on controller &apos;{1}&apos; because the action method is a generic method..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_CannotCallOpenGenericMethods {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_CannotCallOpenGenericMethods", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameters dictionary contains a null entry for parameter &apos;{0}&apos; of non-nullable type &apos;{1}&apos; for method &apos;{2}&apos; in &apos;{3}&apos;. An optional parameter must be a reference type, a nullable type, or be declared as an optional parameter..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_ParameterCannotBeNull {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_ParameterCannotBeNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameters dictionary does not contain an entry for parameter &apos;{0}&apos; of type &apos;{1}&apos; for method &apos;{2}&apos; in &apos;{3}&apos;. The dictionary must contain an entry for each parameter, including parameters that have null values..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_ParameterNotInDictionary {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_ParameterNotInDictionary", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameters dictionary contains an invalid entry for parameter &apos;{0}&apos; for method &apos;{1}&apos; in &apos;{2}&apos;. The dictionary contains a value of type &apos;{3}&apos;, but the parameter requires a value of type &apos;{4}&apos;..\r
-        /// </summary>\r
-        internal static string ReflectedActionDescriptor_ParameterValueHasWrongType {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedActionDescriptor_ParameterValueHasWrongType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The asynchronous action method &apos;{0}&apos; cannot be executed synchronously..\r
-        /// </summary>\r
-        internal static string ReflectedAsyncActionDescriptor_CannotExecuteSynchronously {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedAsyncActionDescriptor_CannotExecuteSynchronously", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameter &apos;{0}&apos; on method &apos;{1}&apos; contains multiple attributes that inherit from CustomModelBinderAttribute..\r
-        /// </summary>\r
-        internal static string ReflectedParameterBindingInfo_MultipleConverterAttributes {\r
-            get {\r
-                return ResourceManager.GetString("ReflectedParameterBindingInfo_MultipleConverterAttributes", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The requested resource can only be accessed via SSL..\r
-        /// </summary>\r
-        internal static string RequireHttpsAttribute_MustUseSsl {\r
-            get {\r
-                return ResourceManager.GetString("RequireHttpsAttribute_MustUseSsl", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The SessionStateTempDataProvider class requires session state to be enabled..\r
-        /// </summary>\r
-        internal static string SessionStateTempDataProvider_SessionStateDisabled {\r
-            get {\r
-                return ResourceManager.GetString("SessionStateTempDataProvider_SessionStateDisabled", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to An operation that crossed a synchronization context failed. See the inner exception for more information..\r
-        /// </summary>\r
-        internal static string SynchronizationContextUtil_ExceptionThrown {\r
-            get {\r
-                return ResourceManager.GetString("SynchronizationContextUtil_ExceptionThrown", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Unable to locate an appropriate template for type {0}..\r
-        /// </summary>\r
-        internal static string TemplateHelpers_NoTemplate {\r
-            get {\r
-                return ResourceManager.GetString("TemplateHelpers_NoTemplate", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions..\r
-        /// </summary>\r
-        internal static string TemplateHelpers_TemplateLimitations {\r
-            get {\r
-                return ResourceManager.GetString("TemplateHelpers_TemplateLimitations", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The Collection template was used with an object of type &apos;{0}&apos;, which does not implement System.IEnumerable..\r
-        /// </summary>\r
-        internal static string Templates_TypeMustImplementIEnumerable {\r
-            get {\r
-                return ResourceManager.GetString("Templates_TypeMustImplementIEnumerable", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to This file is automatically generated. Please do not modify the contents of this file..\r
-        /// </summary>\r
-        internal static string TypeCache_DoNotModify {\r
-            get {\r
-                return ResourceManager.GetString("TypeCache_DoNotModify", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameter conversion from type &apos;{0}&apos; to type &apos;{1}&apos; failed. See the inner exception for more information..\r
-        /// </summary>\r
-        internal static string ValueProviderResult_ConversionThrew {\r
-            get {\r
-                return ResourceManager.GetString("ValueProviderResult_ConversionThrew", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The parameter conversion from type &apos;{0}&apos; to type &apos;{1}&apos; failed because no type converter can convert between these types..\r
-        /// </summary>\r
-        internal static string ValueProviderResult_NoConverterExists {\r
-            get {\r
-                return ResourceManager.GetString("ValueProviderResult_NoConverterExists", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The model item passed into the dictionary is null, but this dictionary requires a non-null model item of type &apos;{0}&apos;..\r
-        /// </summary>\r
-        internal static string ViewDataDictionary_ModelCannotBeNull {\r
-            get {\r
-                return ResourceManager.GetString("ViewDataDictionary_ModelCannotBeNull", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The model item passed into the dictionary is of type &apos;{0}&apos;, but this dictionary requires a model item of type &apos;{1}&apos;..\r
-        /// </summary>\r
-        internal static string ViewDataDictionary_WrongTModelType {\r
-            get {\r
-                return ResourceManager.GetString("ViewDataDictionary_WrongTModelType", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A ViewMasterPage can be used only with content pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;..\r
-        /// </summary>\r
-        internal static string ViewMasterPage_RequiresViewPage {\r
-            get {\r
-                return ResourceManager.GetString("ViewMasterPage_RequiresViewPage", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Execution of the child request failed. Please examine the InnerException for more information..\r
-        /// </summary>\r
-        internal static string ViewPageHttpHandlerWrapper_ExceptionOccurred {\r
-            get {\r
-                return ResourceManager.GetString("ViewPageHttpHandlerWrapper_ExceptionOccurred", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The ViewUserControl &apos;{0}&apos; cannot find an IViewDataContainer object. The ViewUserControl must be inside a ViewPage, a ViewMasterPage, or another ViewUserControl..\r
-        /// </summary>\r
-        internal static string ViewUserControl_RequiresViewDataProvider {\r
-            get {\r
-                return ResourceManager.GetString("ViewUserControl_RequiresViewDataProvider", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A ViewUserControl can be used only in pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;..\r
-        /// </summary>\r
-        internal static string ViewUserControl_RequiresViewPage {\r
-            get {\r
-                return ResourceManager.GetString("ViewUserControl_RequiresViewPage", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to A master name cannot be specified when the view is a ViewUserControl..\r
-        /// </summary>\r
-        internal static string WebFormViewEngine_UserControlCannotHaveMaster {\r
-            get {\r
-                return ResourceManager.GetString("WebFormViewEngine_UserControlCannotHaveMaster", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The view found at &apos;{0}&apos; was not created..\r
-        /// </summary>\r
-        internal static string WebFormViewEngine_ViewCouldNotBeCreated {\r
-            get {\r
-                return ResourceManager.GetString("WebFormViewEngine_ViewCouldNotBeCreated", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The view at &apos;{0}&apos; must derive from ViewPage, ViewPage&lt;TViewData&gt;, ViewUserControl, or ViewUserControl&lt;TViewData&gt;..\r
-        /// </summary>\r
-        internal static string WebFormViewEngine_WrongViewBase {\r
-            get {\r
-                return ResourceManager.GetString("WebFormViewEngine_WrongViewBase", resourceCulture);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/MvcResources.resx b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Resources/MvcResources.resx
deleted file mode 100644 (file)
index 6e29c4d..0000000
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<root>\r
-  <!-- \r
-    Microsoft ResX Schema \r
-    \r
-    Version 2.0\r
-    \r
-    The primary goals of this format is to allow a simple XML format \r
-    that is mostly human readable. The generation and parsing of the \r
-    various data types are done through the TypeConverter classes \r
-    associated with the data types.\r
-    \r
-    Example:\r
-    \r
-    ... ado.net/XML headers & schema ...\r
-    <resheader name="resmimetype">text/microsoft-resx</resheader>\r
-    <resheader name="version">2.0</resheader>\r
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>\r
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
-        <value>[base64 mime encoded serialized .NET Framework object]</value>\r
-    </data>\r
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>\r
-        <comment>This is a comment</comment>\r
-    </data>\r
-                \r
-    There are any number of "resheader" rows that contain simple \r
-    name/value pairs.\r
-    \r
-    Each data row contains a name, and value. The row also contains a \r
-    type or mimetype. Type corresponds to a .NET class that support \r
-    text/value conversion through the TypeConverter architecture. \r
-    Classes that don't support this are serialized and stored with the \r
-    mimetype set.\r
-    \r
-    The mimetype is used for serialized objects, and tells the \r
-    ResXResourceReader how to depersist the object. This is currently not \r
-    extensible. For a given mimetype the value must be set accordingly:\r
-    \r
-    Note - application/x-microsoft.net.object.binary.base64 is the format \r
-    that the ResXResourceWriter will generate, however the reader can \r
-    read any of the formats listed below.\r
-    \r
-    mimetype: application/x-microsoft.net.object.binary.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
-            : and then encoded with base64 encoding.\r
-    \r
-    mimetype: application/x-microsoft.net.object.soap.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
-            : and then encoded with base64 encoding.\r
-\r
-    mimetype: application/x-microsoft.net.object.bytearray.base64\r
-    value   : The object must be serialized into a byte array \r
-            : using a System.ComponentModel.TypeConverter\r
-            : and then encoded with base64 encoding.\r
-    -->\r
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
-    <xsd:element name="root" msdata:IsDataSet="true">\r
-      <xsd:complexType>\r
-        <xsd:choice maxOccurs="unbounded">\r
-          <xsd:element name="metadata">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" use="required" type="xsd:string" />\r
-              <xsd:attribute name="type" type="xsd:string" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="assembly">\r
-            <xsd:complexType>\r
-              <xsd:attribute name="alias" type="xsd:string" />\r
-              <xsd:attribute name="name" type="xsd:string" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="data">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="resheader">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-        </xsd:choice>\r
-      </xsd:complexType>\r
-    </xsd:element>\r
-  </xsd:schema>\r
-  <resheader name="resmimetype">\r
-    <value>text/microsoft-resx</value>\r
-  </resheader>\r
-  <resheader name="version">\r
-    <value>2.0</value>\r
-  </resheader>\r
-  <resheader name="reader">\r
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <resheader name="writer">\r
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <data name="ActionMethodSelector_AmbiguousMatch" xml:space="preserve">\r
-    <value>The current request for action '{0}' on controller type '{1}' is ambiguous between the following action methods:{2}</value>\r
-  </data>\r
-  <data name="Common_NoRouteMatched" xml:space="preserve">\r
-    <value>No route in the route table matches the supplied values.</value>\r
-  </data>\r
-  <data name="Common_NullOrEmpty" xml:space="preserve">\r
-    <value>Value cannot be null or empty.</value>\r
-  </data>\r
-  <data name="Common_PartialViewNotFound" xml:space="preserve">\r
-    <value>The partial view '{0}' was not found. The following locations were searched:{1}</value>\r
-  </data>\r
-  <data name="Common_PropertyCannotBeNullOrEmpty" xml:space="preserve">\r
-    <value>The property '{0}' cannot be null or empty.</value>\r
-  </data>\r
-  <data name="Common_ViewNotFound" xml:space="preserve">\r
-    <value>The view '{0}' or its master was not found. The following locations were searched:{1}</value>\r
-  </data>\r
-  <data name="ControllerBuilder_ErrorCreatingControllerFactory" xml:space="preserve">\r
-    <value>An error occurred when trying to create the IControllerFactory '{0}'. Make sure that the controller factory has a public parameterless constructor.</value>\r
-  </data>\r
-  <data name="ControllerBuilder_FactoryReturnedNull" xml:space="preserve">\r
-    <value>The IControllerFactory '{0}' did not return a controller for the name '{1}'.</value>\r
-  </data>\r
-  <data name="ControllerBuilder_MissingIControllerFactory" xml:space="preserve">\r
-    <value>The controller factory type '{0}' must implement the IControllerFactory interface.</value>\r
-  </data>\r
-  <data name="Controller_UnknownAction" xml:space="preserve">\r
-    <value>A public action method '{0}' was not found on controller '{1}'.</value>\r
-  </data>\r
-  <data name="DefaultControllerFactory_ErrorCreatingController" xml:space="preserve">\r
-    <value>An error occurred when trying to create a controller of type '{0}'. Make sure that the controller has a parameterless public constructor.</value>\r
-  </data>\r
-  <data name="DefaultControllerFactory_NoControllerFound" xml:space="preserve">\r
-    <value>The controller for path '{0}' was not found or does not implement IController.</value>\r
-  </data>\r
-  <data name="DefaultControllerFactory_TypeDoesNotSubclassControllerBase" xml:space="preserve">\r
-    <value>The controller type '{0}' must implement IController.</value>\r
-  </data>\r
-  <data name="ValueProviderResult_ConversionThrew" xml:space="preserve">\r
-    <value>The parameter conversion from type '{0}' to type '{1}' failed. See the inner exception for more information.</value>\r
-  </data>\r
-  <data name="ValueProviderResult_NoConverterExists" xml:space="preserve">\r
-    <value>The parameter conversion from type '{0}' to type '{1}' failed because no type converter can convert between these types.</value>\r
-  </data>\r
-  <data name="ExceptionViewAttribute_NonExceptionType" xml:space="preserve">\r
-    <value>The type '{0}' does not inherit from Exception.</value>\r
-  </data>\r
-  <data name="FilterAttribute_OrderOutOfRange" xml:space="preserve">\r
-    <value>Order must be greater than or equal to -1.</value>\r
-  </data>\r
-  <data name="HtmlHelper_MissingSelectData" xml:space="preserve">\r
-    <value>There is no ViewData item of type '{1}' that has the key '{0}'.</value>\r
-  </data>\r
-  <data name="HtmlHelper_TextAreaParameterOutOfRange" xml:space="preserve">\r
-    <value>The value must be greater than or equal to zero.</value>\r
-  </data>\r
-  <data name="HtmlHelper_WrongSelectDataType" xml:space="preserve">\r
-    <value>The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'.</value>\r
-  </data>\r
-  <data name="ModelBinderAttribute_ErrorCreatingModelBinder" xml:space="preserve">\r
-    <value>An error occurred when trying to create the IModelBinder '{0}'. Make sure that the binder has a public parameterless constructor.</value>\r
-  </data>\r
-  <data name="ModelBinderAttribute_TypeNotIModelBinder" xml:space="preserve">\r
-    <value>The type '{0}' does not implement the IModelBinder interface.</value>\r
-  </data>\r
-  <data name="ModelBinderDictionary_MultipleAttributes" xml:space="preserve">\r
-    <value>The type '{0}' contains multiple attributes that inherit from CustomModelBinderAttribute.</value>\r
-  </data>\r
-  <data name="SessionStateTempDataProvider_SessionStateDisabled" xml:space="preserve">\r
-    <value>The SessionStateTempDataProvider class requires session state to be enabled.</value>\r
-  </data>\r
-  <data name="ViewDataDictionary_WrongTModelType" xml:space="preserve">\r
-    <value>The model item passed into the dictionary is of type '{0}', but this dictionary requires a model item of type '{1}'.</value>\r
-  </data>\r
-  <data name="ViewMasterPage_RequiresViewPage" xml:space="preserve">\r
-    <value>A ViewMasterPage can be used only with content pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;.</value>\r
-  </data>\r
-  <data name="ViewUserControl_RequiresViewDataProvider" xml:space="preserve">\r
-    <value>The ViewUserControl '{0}' cannot find an IViewDataContainer object. The ViewUserControl must be inside a ViewPage, a ViewMasterPage, or another ViewUserControl.</value>\r
-  </data>\r
-  <data name="ViewUserControl_RequiresViewPage" xml:space="preserve">\r
-    <value>A ViewUserControl can be used only in pages that derive from ViewPage or ViewPage&lt;TViewItem&gt;.</value>\r
-  </data>\r
-  <data name="WebFormViewEngine_UserControlCannotHaveMaster" xml:space="preserve">\r
-    <value>A master name cannot be specified when the view is a ViewUserControl.</value>\r
-  </data>\r
-  <data name="WebFormViewEngine_ViewCouldNotBeCreated" xml:space="preserve">\r
-    <value>The view found at '{0}' was not created.</value>\r
-  </data>\r
-  <data name="WebFormViewEngine_WrongViewBase" xml:space="preserve">\r
-    <value>The view at '{0}' must derive from ViewPage, ViewPage&lt;TViewData&gt;, ViewUserControl, or ViewUserControl&lt;TViewData&gt;.</value>\r
-  </data>\r
-  <data name="Common_ValueNotValidForProperty" xml:space="preserve">\r
-    <value>The value '{0}' is invalid.</value>\r
-  </data>\r
-  <data name="ActionMethodSelector_AmbiguousMatchType" xml:space="preserve">\r
-    <value>{0} on type {1}</value>\r
-  </data>\r
-  <data name="Controller_UpdateModel_UpdateUnsuccessful" xml:space="preserve">\r
-    <value>The model of type '{0}' could not be updated.</value>\r
-  </data>\r
-  <data name="DefaultModelBinder_ValueRequired" xml:space="preserve">\r
-    <value>A value is required.</value>\r
-  </data>\r
-  <data name="ReflectedActionDescriptor_ParameterCannotBeNull" xml:space="preserve">\r
-    <value>The parameters dictionary contains a null entry for parameter '{0}' of non-nullable type '{1}' for method '{2}' in '{3}'. An optional parameter must be a reference type, a nullable type, or be declared as an optional parameter.</value>\r
-  </data>\r
-  <data name="ReflectedActionDescriptor_ParameterNotInDictionary" xml:space="preserve">\r
-    <value>The parameters dictionary does not contain an entry for parameter '{0}' of type '{1}' for method '{2}' in '{3}'. The dictionary must contain an entry for each parameter, including parameters that have null values.</value>\r
-  </data>\r
-  <data name="ReflectedActionDescriptor_ParameterValueHasWrongType" xml:space="preserve">\r
-    <value>The parameters dictionary contains an invalid entry for parameter '{0}' for method '{1}' in '{2}'. The dictionary contains a value of type '{3}', but the parameter requires a value of type '{4}'.</value>\r
-  </data>\r
-  <data name="ReflectedParameterBindingInfo_MultipleConverterAttributes" xml:space="preserve">\r
-    <value>The parameter '{0}' on method '{1}' contains multiple attributes that inherit from CustomModelBinderAttribute.</value>\r
-  </data>\r
-  <data name="ReflectedActionDescriptor_CannotCallInstanceMethodOnNonControllerType" xml:space="preserve">\r
-    <value>Cannot create a descriptor for instance method '{0}' on type '{1}' because the type does not derive from ControllerBase.</value>\r
-  </data>\r
-  <data name="ReflectedActionDescriptor_CannotCallMethodsWithOutOrRefParameters" xml:space="preserve">\r
-    <value>Cannot call action method '{0}' on controller '{1}' because the parameter '{2}' is passed by reference.</value>\r
-  </data>\r
-  <data name="ReflectedActionDescriptor_CannotCallOpenGenericMethods" xml:space="preserve">\r
-    <value>Cannot call action method '{0}' on controller '{1}' because the action method is a generic method.</value>\r
-  </data>\r
-  <data name="DefaultViewLocationCache_NegativeTimeSpan" xml:space="preserve">\r
-    <value>The number of ticks for the TimeSpan value must be greater than or equal to 0.</value>\r
-  </data>\r
-  <data name="AntiForgeryToken_ValidationFailed" xml:space="preserve">\r
-    <value>A required anti-forgery token was not supplied or was invalid.</value>\r
-  </data>\r
-  <data name="DefaultModelBinder_ValueInvalid" xml:space="preserve">\r
-    <value>The value '{0}' is not valid for {1}.</value>\r
-  </data>\r
-  <data name="TemplateHelpers_TemplateLimitations" xml:space="preserve">\r
-    <value>Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions.</value>\r
-  </data>\r
-  <data name="Common_TriState_False" xml:space="preserve">\r
-    <value>False</value>\r
-  </data>\r
-  <data name="Common_TriState_NotSet" xml:space="preserve">\r
-    <value>Not Set</value>\r
-  </data>\r
-  <data name="Common_TriState_True" xml:space="preserve">\r
-    <value>True</value>\r
-  </data>\r
-  <data name="ControllerBase_CannotHandleMultipleRequests" xml:space="preserve">\r
-    <value>A single instance of controller '{0}' cannot be used to handle multiple requests. If a custom controller factory is in use, make sure that it creates a new instance of the controller for each request.</value>\r
-  </data>\r
-  <data name="Common_PropertyNotFound" xml:space="preserve">\r
-    <value>The property {0}.{1} could not be found.</value>\r
-  </data>\r
-  <data name="DataAnnotationsModelMetadataProvider_UnknownProperty" xml:space="preserve">\r
-    <value>{0} has a DisplayColumn attribute for {1}, but property {1} does not exist.</value>\r
-  </data>\r
-  <data name="DataAnnotationsModelMetadataProvider_UnreadableProperty" xml:space="preserve">\r
-    <value>{0} has a DisplayColumn attribute for {1}, but property {1} does not have a public getter.</value>\r
-  </data>\r
-  <data name="TemplateHelpers_NoTemplate" xml:space="preserve">\r
-    <value>Unable to locate an appropriate template for type {0}.</value>\r
-  </data>\r
-  <data name="RequireHttpsAttribute_MustUseSsl" xml:space="preserve">\r
-    <value>The requested resource can only be accessed via SSL.</value>\r
-  </data>\r
-  <data name="HtmlHelper_InvalidHttpVerb" xml:space="preserve">\r
-    <value>The specified HttpVerbs value is not supported. The supported values are Delete, Head, and Put.</value>\r
-  </data>\r
-  <data name="HtmlHelper_InvalidHttpMethod" xml:space="preserve">\r
-    <value>The GET and POST HTTP methods are not supported.</value>\r
-  </data>\r
-  <data name="JsonRequest_GetNotAllowed" xml:space="preserve">\r
-    <value>This request has been blocked because sensitive information could be disclosed to third party web sites when this is used in a GET request. To allow GET requests, set JsonRequestBehavior to AllowGet.</value>\r
-  </data>\r
-  <data name="ModelMetadata_PropertyNotSettable" xml:space="preserve">\r
-    <value>This property setter is obsolete, because its value is derived from ModelMetadata.Model now.</value>\r
-  </data>\r
-  <data name="ViewDataDictionary_ModelCannotBeNull" xml:space="preserve">\r
-    <value>The model item passed into the dictionary is null, but this dictionary requires a non-null model item of type '{0}'.</value>\r
-  </data>\r
-  <data name="Common_TypeMustDriveFromType" xml:space="preserve">\r
-    <value>The type {0} must derive from {1}</value>\r
-  </data>\r
-  <data name="DataAnnotationsModelValidatorProvider_ConstructorRequirements" xml:space="preserve">\r
-    <value>The type {0} must have a public constructor which accepts three parameters of types {1}, {2}, and {3}</value>\r
-  </data>\r
-  <data name="ViewPageHttpHandlerWrapper_ExceptionOccurred" xml:space="preserve">\r
-    <value>Execution of the child request failed. Please examine the InnerException for more information.</value>\r
-  </data>\r
-  <data name="RedirectAction_CannotRedirectInChildAction" xml:space="preserve">\r
-    <value>Child actions are not allowed to perform redirect actions.</value>\r
-  </data>\r
-  <data name="AsyncCommon_AsyncResultAlreadyConsumed" xml:space="preserve">\r
-    <value>The provided IAsyncResult has already been consumed.</value>\r
-  </data>\r
-  <data name="AsyncCommon_InvalidAsyncResult" xml:space="preserve">\r
-    <value>The provided IAsyncResult is not valid for this method.</value>\r
-  </data>\r
-  <data name="SynchronizationContextUtil_ExceptionThrown" xml:space="preserve">\r
-    <value>An operation that crossed a synchronization context failed. See the inner exception for more information.</value>\r
-  </data>\r
-  <data name="ReflectedAsyncActionDescriptor_CannotExecuteSynchronously" xml:space="preserve">\r
-    <value>The asynchronous action method '{0}' cannot be executed synchronously.</value>\r
-  </data>\r
-  <data name="AsyncCommon_ControllerMustImplementIAsyncManagerContainer" xml:space="preserve">\r
-    <value>The controller of type '{0}' must subclass AsyncController or implement the IAsyncManagerContainer interface.</value>\r
-  </data>\r
-  <data name="AsyncCommon_InvalidTimeout" xml:space="preserve">\r
-    <value>The timeout value must be non-negative or Timeout.Infinite.</value>\r
-  </data>\r
-  <data name="AsyncActionMethodSelector_AmbiguousMethodMatch" xml:space="preserve">\r
-    <value>Lookup for method '{0}' on controller type '{1}' failed because of an ambiguity between the following methods:{2}</value>\r
-  </data>\r
-  <data name="AsyncActionMethodSelector_CouldNotFindMethod" xml:space="preserve">\r
-    <value>Could not locate a method named '{0}' on controller type {1}.</value>\r
-  </data>\r
-  <data name="ChildActionOnlyAttribute_MustBeInChildRequest" xml:space="preserve">\r
-    <value>The action '{0}' is accessible only by a child request.</value>\r
-  </data>\r
-  <data name="Templates_TypeMustImplementIEnumerable" xml:space="preserve">\r
-    <value>The Collection template was used with an object of type '{0}', which does not implement System.IEnumerable.</value>\r
-  </data>\r
-  <data name="TypeCache_DoNotModify" xml:space="preserve">\r
-    <value>This file is automatically generated. Please do not modify the contents of this file.</value>\r
-  </data>\r
-  <data name="PrivateAssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties" xml:space="preserve">\r
-    <value>The associated metadata type for type '{0}' contains the following unknown properties or fields: {1}. Please make sure that the names of these members match the names of the properties on the main type.</value>\r
-  </data>\r
-  <data name="ClientDataTypeModelValidatorProvider_FieldMustBeNumeric" xml:space="preserve">\r
-    <value>The field {0} must be a number.</value>\r
-  </data>\r
-  <data name="ExpressionHelper_InvalidIndexerExpression" xml:space="preserve">\r
-    <value>The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable.</value>\r
-  </data>\r
-  <data name="Controller_Validate_ValidationFailed" xml:space="preserve">\r
-    <value>The model of type '{0}' is not valid.</value>\r
-  </data>\r
-  <data name="DefaultControllerFactory_ControllerNameAmbiguous_WithoutRouteUrl" xml:space="preserve">\r
-    <value>Multiple types were found that match the controller named '{0}'. This can happen if the route that services this request does not specify namespaces to search for a controller that matches the request. If this is the case, register this route by calling an overload of the 'MapRoute' method that takes a 'namespaces' parameter.\r
-\r
-The request for '{0}' has found the following matching controllers:{1}</value>\r
-  </data>\r
-  <data name="DefaultControllerFactory_ControllerNameAmbiguous_WithRouteUrl" xml:space="preserve">\r
-    <value>Multiple types were found that match the controller named '{0}'. This can happen if the route that services this request ('{1}') does not specify namespaces to search for a controller that matches the request. If this is the case, register this route by calling an overload of the 'MapRoute' method that takes a 'namespaces' parameter.\r
-\r
-The request for '{0}' has found the following matching controllers:{2}</value>\r
-  </data>\r
-</root>
\ No newline at end of file
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ResultExecutedContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ResultExecutedContext.cs
deleted file mode 100644 (file)
index aec1a1f..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ResultExecutedContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public ResultExecutedContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ResultExecutedContext(ControllerContext controllerContext, ActionResult result, bool canceled, Exception exception)\r
-            : base(controllerContext) {\r
-            if (result == null) {\r
-                throw new ArgumentNullException("result");\r
-            }\r
-\r
-            Result = result;\r
-            Canceled = canceled;\r
-            Exception = exception;\r
-        }\r
-\r
-        public virtual bool Canceled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual Exception Exception {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public bool ExceptionHandled {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ResultExecutingContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ResultExecutingContext.cs
deleted file mode 100644 (file)
index 893bfd0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ResultExecutingContext : ControllerContext {\r
-\r
-        // parameterless constructor used for mocking\r
-        public ResultExecutingContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ResultExecutingContext(ControllerContext controllerContext, ActionResult result)\r
-            : base(controllerContext) {\r
-            if (result == null) {\r
-                throw new ArgumentNullException("result");\r
-            }\r
-\r
-            Result = result;\r
-        }\r
-\r
-        public bool Cancel {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual ActionResult Result {\r
-            get;\r
-            set;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteCollectionExtensions.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteCollectionExtensions.cs
deleted file mode 100644 (file)
index a42b6f6..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Web.Routing;\r
-\r
-    public static class RouteCollectionExtensions {\r
-\r
-        // This method returns a new RouteCollection containing only routes that matched a particular area.\r
-        // The Boolean out parameter is just a flag specifying whether any registered routes were area-aware.\r
-        private static RouteCollection FilterRouteCollectionByArea(RouteCollection routes, string areaName, out bool usingAreas) {\r
-            if (areaName == null) {\r
-                areaName = String.Empty;\r
-            }\r
-\r
-            usingAreas = false;\r
-            RouteCollection filteredRoutes = new RouteCollection();\r
-\r
-            using (routes.GetReadLock()) {\r
-                foreach (RouteBase route in routes) {\r
-                    string thisAreaName = AreaHelpers.GetAreaName(route) ?? String.Empty;\r
-                    usingAreas |= (thisAreaName.Length > 0);\r
-                    if (String.Equals(thisAreaName, areaName, StringComparison.OrdinalIgnoreCase)) {\r
-                        filteredRoutes.Add(route);\r
-                    }\r
-                }\r
-            }\r
-\r
-            // if areas are not in use, the filtered route collection might be incorrect\r
-            return (usingAreas) ? filteredRoutes : routes;\r
-        }\r
-\r
-        public static VirtualPathData GetVirtualPathForArea(this RouteCollection routes, RequestContext requestContext, RouteValueDictionary values) {\r
-            return GetVirtualPathForArea(routes, requestContext, null /* name */, values);\r
-        }\r
-\r
-        public static VirtualPathData GetVirtualPathForArea(this RouteCollection routes, RequestContext requestContext, string name, RouteValueDictionary values) {\r
-            bool usingAreas; // don't care about this value\r
-            return GetVirtualPathForArea(routes, requestContext, name, values, out usingAreas);\r
-        }\r
-\r
-        internal static VirtualPathData GetVirtualPathForArea(this RouteCollection routes, RequestContext requestContext, string name, RouteValueDictionary values, out bool usingAreas) {\r
-            if (routes == null) {\r
-                throw new ArgumentNullException("routes");\r
-            }\r
-\r
-            if (!String.IsNullOrEmpty(name)) {\r
-                // the route name is a stronger qualifier than the area name, so just pipe it through\r
-                usingAreas = false;\r
-                return routes.GetVirtualPath(requestContext, name, values);\r
-            }\r
-\r
-            string targetArea = null;\r
-            if (values != null) {\r
-                object targetAreaRawValue;\r
-                if (values.TryGetValue("area", out targetAreaRawValue)) {\r
-                    targetArea = targetAreaRawValue as string;\r
-                }\r
-                else {\r
-                    // set target area to current area\r
-                    if (requestContext != null) {\r
-                        targetArea = AreaHelpers.GetAreaName(requestContext.RouteData);\r
-                    }\r
-                }\r
-            }\r
-\r
-            // need to apply a correction to the RVD if areas are in use\r
-            RouteValueDictionary correctedValues = values;\r
-            RouteCollection filteredRoutes = FilterRouteCollectionByArea(routes, targetArea, out usingAreas);\r
-            if (usingAreas) {\r
-                correctedValues = new RouteValueDictionary(values);\r
-                correctedValues.Remove("area");\r
-            }\r
-\r
-            VirtualPathData vpd = filteredRoutes.GetVirtualPath(requestContext, correctedValues);\r
-            return vpd;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static void IgnoreRoute(this RouteCollection routes, string url) {\r
-            IgnoreRoute(routes, url, null /* constraints */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static void IgnoreRoute(this RouteCollection routes, string url, object constraints) {\r
-            if (routes == null) {\r
-                throw new ArgumentNullException("routes");\r
-            }\r
-            if (url == null) {\r
-                throw new ArgumentNullException("url");\r
-            }\r
-\r
-            IgnoreRouteInternal route = new IgnoreRouteInternal(url) {\r
-                Constraints = new RouteValueDictionary(constraints)\r
-            };\r
-\r
-            routes.Add(route);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url) {\r
-            return MapRoute(routes, name, url, null /* defaults */, (object)null /* constraints */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults) {\r
-            return MapRoute(routes, name, url, defaults, (object)null /* constraints */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults, object constraints) {\r
-            return MapRoute(routes, name, url, defaults, constraints, null /* namespaces */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, string[] namespaces) {\r
-            return MapRoute(routes, name, url, null /* defaults */, null /* constraints */, namespaces);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults, string[] namespaces) {\r
-            return MapRoute(routes, name, url, defaults, null /* constraints */, namespaces);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "2#",\r
-            Justification = "This is not a regular URL as it may contain special routing characters.")]\r
-        public static Route MapRoute(this RouteCollection routes, string name, string url, object defaults, object constraints, string[] namespaces) {\r
-            if (routes == null) {\r
-                throw new ArgumentNullException("routes");\r
-            }\r
-            if (url == null) {\r
-                throw new ArgumentNullException("url");\r
-            }\r
-\r
-            Route route = new Route(url, new MvcRouteHandler()) {\r
-                Defaults = new RouteValueDictionary(defaults),\r
-                Constraints = new RouteValueDictionary(constraints),\r
-                DataTokens = new RouteValueDictionary()\r
-            };\r
-\r
-            if ((namespaces != null) && (namespaces.Length > 0)) {\r
-                route.DataTokens["Namespaces"] = namespaces;\r
-            }\r
-\r
-            routes.Add(name, route);\r
-\r
-            return route;\r
-        }\r
-\r
-        private sealed class IgnoreRouteInternal : Route {\r
-            public IgnoreRouteInternal(string url)\r
-                : base(url, new StopRoutingHandler()) {\r
-            }\r
-\r
-            public override VirtualPathData GetVirtualPath(RequestContext requestContext, RouteValueDictionary routeValues) {\r
-                // Never match during route generation. This avoids the scenario where an IgnoreRoute with\r
-                // fairly relaxed constraints ends up eagerly matching all generated URLs.\r
-                return null;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteDataValueProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteDataValueProvider.cs
deleted file mode 100644 (file)
index 5ae1ee7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-\r
-    public sealed class RouteDataValueProvider : DictionaryValueProvider<object> {\r
-\r
-        // RouteData should use the invariant culture since it's part of the URL, and the URL should be\r
-        // interpreted in a uniform fashion regardless of the origin of a particular request.\r
-        public RouteDataValueProvider(ControllerContext controllerContext)\r
-            : base(controllerContext.RouteData.Values, CultureInfo.InvariantCulture) {\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteDataValueProviderFactory.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteDataValueProviderFactory.cs
deleted file mode 100644 (file)
index 4efadbf..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public sealed class RouteDataValueProviderFactory : ValueProviderFactory {\r
-\r
-        public override IValueProvider GetValueProvider(ControllerContext controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            return new RouteDataValueProvider(controllerContext);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteValuesHelpers.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/RouteValuesHelpers.cs
deleted file mode 100644 (file)
index d227cb4..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.Web.Routing;\r
-\r
-    internal static class RouteValuesHelpers {\r
-        public static RouteValueDictionary GetRouteValues(RouteValueDictionary routeValues) {\r
-            return (routeValues != null) ? new RouteValueDictionary(routeValues) : new RouteValueDictionary();\r
-        }\r
-\r
-        public static RouteValueDictionary MergeRouteValues(string actionName, string controllerName, RouteValueDictionary implicitRouteValues, RouteValueDictionary routeValues, bool includeImplicitMvcValues) {\r
-            // Create a new dictionary containing implicit and auto-generated values\r
-            RouteValueDictionary mergedRouteValues = new RouteValueDictionary();\r
-\r
-            if (includeImplicitMvcValues) {\r
-                // We only include MVC-specific values like 'controller' and 'action' if we are generating an action link.\r
-                // If we are generating a route link [as to MapRoute("Foo", "any/url", new { controller = ... })], including\r
-                // the current controller name will cause the route match to fail if the current controller is not the same\r
-                // as the destination controller.\r
-\r
-                object implicitValue;\r
-                if (implicitRouteValues != null && implicitRouteValues.TryGetValue("action", out implicitValue)) {\r
-                    mergedRouteValues["action"] = implicitValue;\r
-                }\r
-\r
-                if (implicitRouteValues != null && implicitRouteValues.TryGetValue("controller", out implicitValue)) {\r
-                    mergedRouteValues["controller"] = implicitValue;\r
-                }\r
-            }\r
-\r
-            // Merge values from the user's dictionary/object\r
-            if (routeValues != null) {\r
-                foreach (KeyValuePair<string, object> routeElement in GetRouteValues(routeValues)) {\r
-                    mergedRouteValues[routeElement.Key] = routeElement.Value;\r
-                }\r
-            }\r
-\r
-            // Merge explicit parameters when not null\r
-            if (actionName != null) {\r
-                mergedRouteValues["action"] = actionName;\r
-            }\r
-\r
-            if (controllerName != null) {\r
-                mergedRouteValues["controller"] = controllerName;\r
-            }\r
-\r
-            return mergedRouteValues;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/SelectList.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/SelectList.cs
deleted file mode 100644 (file)
index 9c85624..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections;\r
-    using System.Diagnostics.CodeAnalysis;    \r
-\r
-    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]\r
-    public class SelectList : MultiSelectList {\r
-\r
-        public SelectList(IEnumerable items)\r
-            : this(items, null /* selectedValue */) {\r
-        }\r
-\r
-        public SelectList(IEnumerable items, object selectedValue)\r
-            : this(items, null /* dataValuefield */, null /* dataTextField */, selectedValue) {\r
-        }\r
-\r
-        public SelectList(IEnumerable items, string dataValueField, string dataTextField)\r
-            : this(items, dataValueField, dataTextField, null /* selectedValue */) {\r
-        }\r
-\r
-        public SelectList(IEnumerable items, string dataValueField, string dataTextField, object selectedValue)\r
-            : base(items, dataValueField, dataTextField, ToEnumerable(selectedValue)) {\r
-            SelectedValue = selectedValue;\r
-        }\r
-\r
-        public object SelectedValue {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        private static IEnumerable ToEnumerable(object selectedValue) {\r
-            return (selectedValue != null) ? new object[] { selectedValue } : null;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/SelectListItem.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/SelectListItem.cs
deleted file mode 100644 (file)
index 962bf36..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public class SelectListItem {\r
-\r
-        public bool Selected {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string Text {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string Value {\r
-            get;\r
-            set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/SessionStateTempDataProvider.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/SessionStateTempDataProvider.cs
deleted file mode 100644 (file)
index 1da67bd..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class SessionStateTempDataProvider : ITempDataProvider {\r
-        internal const string TempDataSessionStateKey = "__ControllerTempData";\r
-\r
-        public virtual IDictionary<string, object> LoadTempData(ControllerContext controllerContext) {\r
-            HttpSessionStateBase session = controllerContext.HttpContext.Session;\r
-\r
-            if (session != null) {\r
-                Dictionary<string, object> tempDataDictionary = session[TempDataSessionStateKey] as Dictionary<string, object>;\r
-\r
-                if (tempDataDictionary != null) {\r
-                    // If we got it from Session, remove it so that no other request gets it\r
-                    session.Remove(TempDataSessionStateKey);\r
-                    return tempDataDictionary;\r
-                }\r
-            }\r
-\r
-            return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-        public virtual void SaveTempData(ControllerContext controllerContext, IDictionary<string, object> values) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-\r
-            HttpSessionStateBase session = controllerContext.HttpContext.Session;\r
-            bool isDirty = (values != null && values.Count > 0);\r
-\r
-            if (session == null) {\r
-                if (isDirty) {\r
-                    throw new InvalidOperationException(MvcResources.SessionStateTempDataProvider_SessionStateDisabled);\r
-                }\r
-            }\r
-            else {\r
-                if (isDirty) {\r
-                    session[TempDataSessionStateKey] = values;\r
-                }\r
-                else {\r
-                    // Since the default implementation of Remove() (from SessionStateItemCollection) dirties the\r
-                    // collection, we shouldn't call it unless we really do need to remove the existing key.\r
-                    if (session[TempDataSessionStateKey] != null) {\r
-                        session.Remove(TempDataSessionStateKey);\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/StringLengthAttributeAdapter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/StringLengthAttributeAdapter.cs
deleted file mode 100644 (file)
index 6e96be4..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
-    public class StringLengthAttributeAdapter : DataAnnotationsModelValidator<StringLengthAttribute> {\r
-        public StringLengthAttributeAdapter(ModelMetadata metadata, ControllerContext context, StringLengthAttribute attribute)\r
-            : base(metadata, context, attribute) {\r
-        }\r
-\r
-        public override IEnumerable<ModelClientValidationRule> GetClientValidationRules() {\r
-            return new[] { new ModelClientValidationStringLengthRule(ErrorMessage, 0, Attribute.MaximumLength) };\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TagBuilder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TagBuilder.cs
deleted file mode 100644 (file)
index d093204..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class TagBuilder {\r
-        private string _idAttributeDotReplacement;\r
-\r
-        private const string _attributeFormat = @" {0}=""{1}""";\r
-        private const string _elementFormatEndTag = "</{0}>";\r
-        private const string _elementFormatNormal = "<{0}{1}>{2}</{0}>";\r
-        private const string _elementFormatSelfClosing = "<{0}{1} />";\r
-        private const string _elementFormatStartTag = "<{0}{1}>";\r
-\r
-        private string _innerHtml;\r
-\r
-        public TagBuilder(string tagName) {\r
-            if (String.IsNullOrEmpty(tagName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "tagName");\r
-            }\r
-\r
-            TagName = tagName;\r
-            Attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);\r
-        }\r
-\r
-        public IDictionary<string, string> Attributes {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string IdAttributeDotReplacement {\r
-            get {\r
-                if (String.IsNullOrEmpty(_idAttributeDotReplacement)) {\r
-                    _idAttributeDotReplacement = HtmlHelper.IdAttributeDotReplacement;\r
-                }\r
-                return _idAttributeDotReplacement;\r
-            }\r
-            set {\r
-                _idAttributeDotReplacement = value;\r
-            }\r
-        }\r
-\r
-        public string InnerHtml {\r
-            get {\r
-                return _innerHtml ?? String.Empty;\r
-            }\r
-            set {\r
-                _innerHtml = value;\r
-            }\r
-        }\r
-\r
-        public string TagName {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public void AddCssClass(string value) {\r
-            string currentValue;\r
-\r
-            if (Attributes.TryGetValue("class", out currentValue)) {\r
-                Attributes["class"] = value + " " + currentValue;\r
-            }\r
-            else {\r
-                Attributes["class"] = value;\r
-            }\r
-        }\r
-\r
-        internal static string CreateSanitizedId(string originalId, string dotReplacement) {\r
-            if (String.IsNullOrEmpty(originalId)) {\r
-                return null;\r
-            }\r
-\r
-            char firstChar = originalId[0];\r
-            if (!Html401IdUtil.IsLetter(firstChar)) {\r
-                // the first character must be a letter\r
-                return null;\r
-            }\r
-\r
-            StringBuilder sb = new StringBuilder(originalId.Length);\r
-            sb.Append(firstChar);\r
-\r
-            for (int i = 1; i < originalId.Length; i++) {\r
-                char thisChar = originalId[i];\r
-                if (Html401IdUtil.IsValidIdCharacter(thisChar)) {\r
-                    sb.Append(thisChar);\r
-                }\r
-                else {\r
-                    sb.Append(dotReplacement);\r
-                }\r
-            }\r
-\r
-            return sb.ToString();\r
-        }\r
-\r
-        public void GenerateId(string name) {\r
-            if (!Attributes.ContainsKey("id")) {\r
-                string sanitizedId = CreateSanitizedId(name, IdAttributeDotReplacement);\r
-                if (!String.IsNullOrEmpty(sanitizedId)) {\r
-                    Attributes["id"] = sanitizedId;\r
-                }\r
-            }\r
-        }\r
-\r
-        private string GetAttributesString() {\r
-            StringBuilder sb = new StringBuilder();\r
-            foreach (var attribute in Attributes) {\r
-                string key = attribute.Key;\r
-                if (String.Equals(key, "id", StringComparison.Ordinal /* case-sensitive */) && String.IsNullOrEmpty(attribute.Value)) {\r
-                    continue; // DevDiv Bugs #227595: don't output empty IDs\r
-                }\r
-                string value = HttpUtility.HtmlAttributeEncode(attribute.Value);\r
-                sb.AppendFormat(CultureInfo.InvariantCulture, _attributeFormat, key, value);\r
-            }\r
-            return sb.ToString();\r
-        }\r
-\r
-        public void MergeAttribute(string key, string value) {\r
-            MergeAttribute(key, value, false /* replaceExisting */);\r
-        }\r
-\r
-        public void MergeAttribute(string key, string value, bool replaceExisting) {\r
-            if (String.IsNullOrEmpty(key)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "key");\r
-            }\r
-\r
-            if (replaceExisting || !Attributes.ContainsKey(key)) {\r
-                Attributes[key] = value;\r
-            }\r
-        }\r
-\r
-        public void MergeAttributes<TKey, TValue>(IDictionary<TKey, TValue> attributes) {\r
-            MergeAttributes(attributes, false /* replaceExisting */);\r
-        }\r
-\r
-        public void MergeAttributes<TKey, TValue>(IDictionary<TKey, TValue> attributes, bool replaceExisting) {\r
-            if (attributes != null) {\r
-                foreach (var entry in attributes) {\r
-                    string key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);\r
-                    string value = Convert.ToString(entry.Value, CultureInfo.InvariantCulture);\r
-                    MergeAttribute(key, value, replaceExisting);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void SetInnerText(string innerText) {\r
-            InnerHtml = HttpUtility.HtmlEncode(innerText);\r
-        }\r
-\r
-        internal MvcHtmlString ToMvcHtmlString(TagRenderMode renderMode) {\r
-            return MvcHtmlString.Create(ToString(renderMode));\r
-        }\r
-\r
-        public override string ToString() {\r
-            return ToString(TagRenderMode.Normal);\r
-        }\r
-\r
-        public string ToString(TagRenderMode renderMode) {\r
-            switch (renderMode) {\r
-                case TagRenderMode.StartTag:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatStartTag, TagName, GetAttributesString());\r
-                case TagRenderMode.EndTag:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatEndTag, TagName);\r
-                case TagRenderMode.SelfClosing:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatSelfClosing, TagName, GetAttributesString());\r
-                default:\r
-                    return String.Format(CultureInfo.InvariantCulture, _elementFormatNormal, TagName, GetAttributesString(), InnerHtml);\r
-            }\r
-        }\r
-\r
-        // Valid IDs are defined in http://www.w3.org/TR/html401/types.html#type-id\r
-        private static class Html401IdUtil {\r
-            private static bool IsAllowableSpecialCharacter(char c) {\r
-                switch (c) {\r
-                    case '-':\r
-                    case '_':\r
-                    case ':':\r
-                        // note that we're specifically excluding the '.' character\r
-                        return true;\r
-\r
-                    default:\r
-                        return false;\r
-                }\r
-            }\r
-\r
-            private static bool IsDigit(char c) {\r
-                return ('0' <= c && c <= '9');\r
-            }\r
-\r
-            public static bool IsLetter(char c) {\r
-                return (('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z'));\r
-            }\r
-\r
-            public static bool IsValidIdCharacter(char c) {\r
-                return (IsLetter(c) || IsDigit(c) || IsAllowableSpecialCharacter(c));\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TagRenderMode.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TagRenderMode.cs
deleted file mode 100644 (file)
index 8f889e7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public enum TagRenderMode {\r
-        Normal,\r
-        StartTag,\r
-        EndTag,\r
-        SelfClosing\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TempDataDictionary.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TempDataDictionary.cs
deleted file mode 100644 (file)
index b2aa489..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Linq;\r
-    using System.Runtime.Serialization;\r
-\r
-    [Serializable]\r
-    public class TempDataDictionary : IDictionary<string, object>, ISerializable {\r
-        internal const string _tempDataSerializationKey = "__tempData";\r
-\r
-        private Dictionary<string, object> _data;\r
-        private HashSet<string> _initialKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-        private HashSet<string> _retainedKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public TempDataDictionary() {\r
-            _data = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-        }\r
-\r
-        protected TempDataDictionary(SerializationInfo info, StreamingContext context) {\r
-            _data = info.GetValue(_tempDataSerializationKey, typeof(Dictionary<string, object>)) as Dictionary<string, object>;\r
-        }\r
-\r
-        public int Count {\r
-            get {\r
-                return _data.Count;\r
-            }\r
-        }\r
-\r
-        public ICollection<string> Keys {\r
-            get {\r
-                return _data.Keys;\r
-            }\r
-        }\r
-\r
-        public void Keep() {\r
-            _retainedKeys.Clear();\r
-            _retainedKeys.UnionWith(_data.Keys);\r
-        }\r
-\r
-        public void Keep(string key) {\r
-            _retainedKeys.Add(key);\r
-        }\r
-\r
-        public void Load(ControllerContext controllerContext, ITempDataProvider tempDataProvider) {\r
-            IDictionary<string, object> providerDictionary = tempDataProvider.LoadTempData(controllerContext);\r
-            _data = (providerDictionary != null) ? new Dictionary<string, object>(providerDictionary, StringComparer.OrdinalIgnoreCase) :\r
-                new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-            _initialKeys = new HashSet<string>(_data.Keys, StringComparer.OrdinalIgnoreCase);\r
-            _retainedKeys.Clear();\r
-        }\r
-\r
-        public object Peek(string key) {\r
-            object value;\r
-            _data.TryGetValue(key, out value);\r
-            return value;\r
-        }\r
-\r
-        public void Save(ControllerContext controllerContext, ITempDataProvider tempDataProvider) {\r
-            string[] keysToKeep = _initialKeys.Union(_retainedKeys, StringComparer.OrdinalIgnoreCase).ToArray();\r
-            string[] keysToRemove = _data.Keys.Except(keysToKeep, StringComparer.OrdinalIgnoreCase).ToArray();\r
-            foreach (string key in keysToRemove) {\r
-                _data.Remove(key);\r
-            }\r
-            tempDataProvider.SaveTempData(controllerContext, _data);\r
-        }\r
-\r
-        public ICollection<object> Values {\r
-            get {\r
-                return _data.Values;\r
-            }\r
-        }\r
-\r
-        public object this[string key] {\r
-            get {\r
-                object value;\r
-                if (TryGetValue(key, out value)) {\r
-                    _initialKeys.Remove(key);\r
-                    return value;\r
-                }\r
-                return null;\r
-            }\r
-            set {\r
-                _data[key] = value;\r
-                _initialKeys.Add(key);\r
-            }\r
-        }\r
-\r
-        public void Add(string key, object value) {\r
-            _data.Add(key, value);\r
-            _initialKeys.Add(key);\r
-        }\r
-\r
-        public void Clear() {\r
-            _data.Clear();\r
-            _retainedKeys.Clear();\r
-            _initialKeys.Clear();\r
-        }\r
-\r
-        public bool ContainsKey(string key) {\r
-            return _data.ContainsKey(key);\r
-        }\r
-\r
-        public bool ContainsValue(object value) {\r
-            return _data.ContainsValue(value);\r
-        }\r
-\r
-        public IEnumerator<KeyValuePair<string, object>> GetEnumerator() {\r
-            return new TempDataDictionaryEnumerator(this);\r
-        }\r
-\r
-        protected virtual void GetObjectData(SerializationInfo info, StreamingContext context) {\r
-            info.AddValue(_tempDataSerializationKey, _data);\r
-        }\r
-\r
-        public bool Remove(string key) {\r
-            _retainedKeys.Remove(key);\r
-            _initialKeys.Remove(key);\r
-            return _data.Remove(key);\r
-        }\r
-\r
-        public bool TryGetValue(string key, out object value) {\r
-            _initialKeys.Remove(key);\r
-            return _data.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region ICollection<KeyValuePair<string, object>> Implementation\r
-        bool ICollection<KeyValuePair<string, object>>.IsReadOnly {\r
-            get {\r
-                return ((ICollection<KeyValuePair<string, object>>)_data).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        void ICollection<KeyValuePair<string, object>>.CopyTo(KeyValuePair<string, object>[] array, int index) {\r
-            ((ICollection<KeyValuePair<string, object>>)_data).CopyTo(array, index);\r
-        }\r
-\r
-        void ICollection<KeyValuePair<string, object>>.Add(KeyValuePair<string, object> keyValuePair) {\r
-            _initialKeys.Add(keyValuePair.Key);\r
-            ((ICollection<KeyValuePair<string, object>>)_data).Add(keyValuePair);\r
-        }\r
-\r
-        bool ICollection<KeyValuePair<string, object>>.Contains(KeyValuePair<string, object> keyValuePair) {\r
-            return ((ICollection<KeyValuePair<string, object>>)_data).Contains(keyValuePair);\r
-        }\r
-\r
-        bool ICollection<KeyValuePair<string, object>>.Remove(KeyValuePair<string, object> keyValuePair) {\r
-            _initialKeys.Remove(keyValuePair.Key);\r
-            return ((ICollection<KeyValuePair<string, object>>)_data).Remove(keyValuePair);\r
-        }\r
-        #endregion\r
-\r
-        #region IEnumerable Implementation\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return (IEnumerator)(new TempDataDictionaryEnumerator(this));\r
-        }\r
-        #endregion\r
-\r
-        #region ISerializable Members\r
-        [SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]\r
-        void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context) {\r
-            GetObjectData(info, context);\r
-        }\r
-        #endregion\r
-\r
-        private sealed class TempDataDictionaryEnumerator : IEnumerator<KeyValuePair<string, object>> {\r
-            private IEnumerator<KeyValuePair<string, object>> _enumerator;\r
-            private TempDataDictionary _tempData;\r
-\r
-            public TempDataDictionaryEnumerator(TempDataDictionary tempData) {\r
-                _tempData = tempData;\r
-                _enumerator = _tempData._data.GetEnumerator();\r
-            }\r
-\r
-            public KeyValuePair<string, object> Current {\r
-                get {\r
-                    KeyValuePair<string, object> kvp = _enumerator.Current;\r
-                    _tempData._initialKeys.Remove(kvp.Key);\r
-                    return kvp;\r
-                }\r
-            }\r
-\r
-            public bool MoveNext() {\r
-                return _enumerator.MoveNext();\r
-            }\r
-\r
-            public void Reset() {\r
-                _enumerator.Reset();\r
-            }\r
-\r
-            #region IEnumerator Implementation\r
-            object IEnumerator.Current {\r
-                get {\r
-                    return Current;\r
-                }\r
-            }\r
-            #endregion\r
-\r
-            #region IDisposable Implementation\r
-            void IDisposable.Dispose() {\r
-                _enumerator.Dispose();\r
-            }\r
-            #endregion\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TemplateInfo.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TemplateInfo.cs
deleted file mode 100644 (file)
index 5ca8280..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-\r
-    public class TemplateInfo {\r
-        private string _htmlFieldPrefix;\r
-        private object _formattedModelValue;\r
-        private HashSet<object> _visitedObjects;\r
-\r
-        public object FormattedModelValue {\r
-            get {\r
-                return _formattedModelValue ?? String.Empty;\r
-            }\r
-            set {\r
-                _formattedModelValue = value;\r
-            }\r
-        }\r
-\r
-        public string HtmlFieldPrefix {\r
-            get {\r
-                return _htmlFieldPrefix ?? String.Empty;\r
-            }\r
-            set {\r
-                _htmlFieldPrefix = value;\r
-            }\r
-        }\r
-\r
-        public int TemplateDepth {\r
-            get {\r
-                return VisitedObjects.Count;\r
-            }\r
-        }\r
-\r
-        // DDB #224750 - Keep a collection of visited objects to prevent infinite recursion\r
-        internal HashSet<object> VisitedObjects {\r
-            get {\r
-                if (_visitedObjects == null) {\r
-                    _visitedObjects = new HashSet<object>();\r
-                }\r
-                return _visitedObjects;\r
-            }\r
-            set {\r
-                _visitedObjects = value;\r
-            }\r
-        }\r
-\r
-        public string GetFullHtmlFieldId(string partialFieldName) {\r
-            return HtmlHelper.GenerateIdFromName(GetFullHtmlFieldName(partialFieldName));\r
-        }\r
-\r
-        public string GetFullHtmlFieldName(string partialFieldName) {\r
-            // This uses "combine and trim" because either or both of these values might be empty\r
-            return (HtmlFieldPrefix + "." + (partialFieldName ?? String.Empty)).Trim('.');\r
-        }\r
-\r
-        public bool Visited(ModelMetadata metadata) {\r
-            return VisitedObjects.Contains(metadata.Model ?? metadata.ModelType);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TryGetValueDelegate.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TryGetValueDelegate.cs
deleted file mode 100644 (file)
index 66a1966..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    internal delegate bool TryGetValueDelegate(object dictionary, string key, out object value);\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeCacheSerializer.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeCacheSerializer.cs
deleted file mode 100644 (file)
index bec4f0b..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.IO;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Xml;\r
-\r
-    // Processes files with this format:\r
-    //\r
-    // <typeCache lastModified=... mvcVersionId=...>\r
-    //   <assembly name=...>\r
-    //     <module versionId=...>\r
-    //       <type>...</type>\r
-    //     </module>\r
-    //   </assembly>\r
-    // </typeCache>\r
-    //\r
-    // This is used to store caches of files between AppDomain resets, leading to improved cold boot time\r
-    // and more efficient use of memory.\r
-\r
-    internal sealed class TypeCacheSerializer {\r
-\r
-        private static readonly Guid _mvcVersionId = typeof(TypeCacheSerializer).Module.ModuleVersionId;\r
-\r
-        // used for unit testing\r
-\r
-        private DateTime CurrentDate {\r
-            get {\r
-                return CurrentDateOverride ?? DateTime.Now;\r
-            }\r
-        }\r
-\r
-        internal DateTime? CurrentDateOverride {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "This is an instance method for consistency with the SerializeTypes() method.")]\r
-        public List<Type> DeserializeTypes(TextReader input) {\r
-            XmlDocument doc = new XmlDocument();\r
-            doc.Load(input);\r
-            XmlElement rootElement = doc.DocumentElement;\r
-\r
-            Guid readMvcVersionId = new Guid(rootElement.Attributes["mvcVersionId"].Value);\r
-            if (readMvcVersionId != _mvcVersionId) {\r
-                // The cache is outdated because the cache file was produced by a different version\r
-                // of MVC.\r
-                return null;\r
-            }\r
-\r
-            List<Type> deserializedTypes = new List<Type>();\r
-            foreach (XmlNode assemblyNode in rootElement.ChildNodes) {\r
-                string assemblyName = assemblyNode.Attributes["name"].Value;\r
-                Assembly assembly = Assembly.Load(assemblyName);\r
-\r
-                foreach (XmlNode moduleNode in assemblyNode.ChildNodes) {\r
-                    Guid moduleVersionId = new Guid(moduleNode.Attributes["versionId"].Value);\r
-\r
-                    foreach (XmlNode typeNode in moduleNode.ChildNodes) {\r
-                        string typeName = typeNode.InnerText;\r
-                        Type type = assembly.GetType(typeName);\r
-                        if (type == null || type.Module.ModuleVersionId != moduleVersionId) {\r
-                            // The cache is outdated because we couldn't find a previously recorded\r
-                            // type or the type's containing module was modified.\r
-                            return null;\r
-                        }\r
-                        else {\r
-                            deserializedTypes.Add(type);\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            return deserializedTypes;\r
-        }\r
-\r
-        public void SerializeTypes(IEnumerable<Type> types, TextWriter output) {\r
-            var groupedByAssembly = from type in types\r
-                                    group type by type.Module into groupedByModule\r
-                                    group groupedByModule by groupedByModule.Key.Assembly;\r
-\r
-            XmlDocument doc = new XmlDocument();\r
-            doc.AppendChild(doc.CreateComment(MvcResources.TypeCache_DoNotModify));\r
-\r
-            XmlElement typeCacheElement = doc.CreateElement("typeCache");\r
-            doc.AppendChild(typeCacheElement);\r
-            typeCacheElement.SetAttribute("lastModified", CurrentDate.ToString());\r
-            typeCacheElement.SetAttribute("mvcVersionId", _mvcVersionId.ToString());\r
-\r
-            foreach (var assemblyGroup in groupedByAssembly) {\r
-                XmlElement assemblyElement = doc.CreateElement("assembly");\r
-                typeCacheElement.AppendChild(assemblyElement);\r
-                assemblyElement.SetAttribute("name", assemblyGroup.Key.FullName);\r
-\r
-                foreach (var moduleGroup in assemblyGroup) {\r
-                    XmlElement moduleElement = doc.CreateElement("module");\r
-                    assemblyElement.AppendChild(moduleElement);\r
-                    moduleElement.SetAttribute("versionId", moduleGroup.Key.ModuleVersionId.ToString());\r
-\r
-                    foreach (Type type in moduleGroup) {\r
-                        XmlElement typeElement = doc.CreateElement("type");\r
-                        moduleElement.AppendChild(typeElement);\r
-                        typeElement.AppendChild(doc.CreateTextNode(type.FullName));\r
-                    }\r
-                }\r
-            }\r
-\r
-            doc.Save(output);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeCacheUtil.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeCacheUtil.cs
deleted file mode 100644 (file)
index b3366d1..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.IO;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-\r
-    internal static class TypeCacheUtil {\r
-\r
-        private static IEnumerable<Type> FilterTypesInAssemblies(IBuildManager buildManager, Predicate<Type> predicate) {\r
-            // Go through all assemblies referenced by the application and search for types matching a predicate\r
-            IEnumerable<Type> typesSoFar = Type.EmptyTypes;\r
-\r
-            ICollection assemblies = buildManager.GetReferencedAssemblies();\r
-            foreach (Assembly assembly in assemblies) {\r
-                Type[] typesInAsm;\r
-                try {\r
-                    typesInAsm = assembly.GetTypes();\r
-                }\r
-                catch (ReflectionTypeLoadException ex) {\r
-                    typesInAsm = ex.Types;\r
-                }\r
-                typesSoFar = typesSoFar.Concat(typesInAsm);\r
-            }\r
-            return typesSoFar.Where(type => TypeIsPublicClass(type) && predicate(type));\r
-        }\r
-\r
-        public static List<Type> GetFilteredTypesFromAssemblies(string cacheName, Predicate<Type> predicate, IBuildManager buildManager) {\r
-            TypeCacheSerializer serializer = new TypeCacheSerializer();\r
-\r
-            // first, try reading from the cache on disk\r
-            List<Type> matchingTypes = ReadTypesFromCache(cacheName, predicate, buildManager, serializer);\r
-            if (matchingTypes != null) {\r
-                return matchingTypes;\r
-            }\r
-\r
-            // if reading from the cache failed, enumerate over every assembly looking for a matching type\r
-            matchingTypes = FilterTypesInAssemblies(buildManager, predicate).ToList();\r
-\r
-            // finally, save the cache back to disk\r
-            SaveTypesToCache(cacheName, matchingTypes, buildManager, serializer);\r
-\r
-            return matchingTypes;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",\r
-            Justification = "Cache failures are not fatal, and the code should continue executing normally.")]\r
-        internal static List<Type> ReadTypesFromCache(string cacheName, Predicate<Type> predicate, IBuildManager buildManager, TypeCacheSerializer serializer) {\r
-            try {\r
-                using (Stream stream = buildManager.ReadCachedFile(cacheName)) {\r
-                    if (stream != null) {\r
-                        using (StreamReader reader = new StreamReader(stream)) {\r
-                            List<Type> deserializedTypes = serializer.DeserializeTypes(reader);\r
-                            if (deserializedTypes != null && deserializedTypes.All(type => TypeIsPublicClass(type) && predicate(type))) {\r
-                                // If all read types still match the predicate, success!\r
-                                return deserializedTypes;\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-            catch {\r
-            }\r
-\r
-            return null;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",\r
-            Justification = "Cache failures are not fatal, and the code should continue executing normally.")]\r
-        internal static void SaveTypesToCache(string cacheName, IList<Type> matchingTypes, IBuildManager buildManager, TypeCacheSerializer serializer) {\r
-            try {\r
-                using (Stream stream = buildManager.CreateCachedFile(cacheName)) {\r
-                    if (stream != null) {\r
-                        using (StreamWriter writer = new StreamWriter(stream)) {\r
-                            serializer.SerializeTypes(matchingTypes, writer);\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-            catch {\r
-            }\r
-        }\r
-\r
-        private static bool TypeIsPublicClass(Type type) {\r
-            return (type != null && type.IsPublic && type.IsClass && !type.IsAbstract);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeDescriptorHelper.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeDescriptorHelper.cs
deleted file mode 100644 (file)
index 48ccb8e..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.ComponentModel.DataAnnotations;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    // TODO: Remove this class in MVC 3\r
-    //\r
-    // We brought in a private copy of the AssociatedMetadataTypeTypeDescriptionProvider\r
-    // from .NET 4, because it provides several bug fixes and perf improvements. If we're\r
-    // running on .NET < 4, we'll use our private copy.\r
-\r
-    internal static class TypeDescriptorHelper {\r
-\r
-        private static Func<Type, ICustomTypeDescriptor> _typeDescriptorFactory = GetTypeDescriptorFactory();\r
-\r
-        private static Func<Type, ICustomTypeDescriptor> GetTypeDescriptorFactory() {\r
-            if (Environment.Version.Major < 4) {\r
-                return type => new _AssociatedMetadataTypeTypeDescriptionProvider(type).GetTypeDescriptor(type);\r
-            }\r
-\r
-            return type => new AssociatedMetadataTypeTypeDescriptionProvider(type).GetTypeDescriptor(type);\r
-        }\r
-\r
-        public static ICustomTypeDescriptor Get(Type type) {\r
-            return _typeDescriptorFactory(type);\r
-        }\r
-\r
-        // Private copies of the .NET 4 AssociatedMetadataType classes\r
-\r
-        private class _AssociatedMetadataTypeTypeDescriptionProvider : TypeDescriptionProvider {\r
-            public _AssociatedMetadataTypeTypeDescriptionProvider(Type type)\r
-                : base(TypeDescriptor.GetProvider(type)) {\r
-            }\r
-\r
-            public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance) {\r
-                ICustomTypeDescriptor baseDescriptor = base.GetTypeDescriptor(objectType, instance);\r
-                return new _AssociatedMetadataTypeTypeDescriptor(baseDescriptor, objectType);\r
-            }\r
-        }\r
-\r
-        private class _AssociatedMetadataTypeTypeDescriptor : CustomTypeDescriptor {\r
-            private Type AssociatedMetadataType {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            public _AssociatedMetadataTypeTypeDescriptor(ICustomTypeDescriptor parent, Type type)\r
-                : base(parent) {\r
-                AssociatedMetadataType = TypeDescriptorCache.GetAssociatedMetadataType(type);\r
-                if (AssociatedMetadataType != null) {\r
-                    TypeDescriptorCache.ValidateMetadataType(type, AssociatedMetadataType);\r
-                }\r
-            }\r
-\r
-            public override PropertyDescriptorCollection GetProperties(Attribute[] attributes) {\r
-                return GetPropertiesWithMetadata(base.GetProperties(attributes));\r
-            }\r
-\r
-            public override PropertyDescriptorCollection GetProperties() {\r
-                return GetPropertiesWithMetadata(base.GetProperties());\r
-            }\r
-\r
-            private PropertyDescriptorCollection GetPropertiesWithMetadata(PropertyDescriptorCollection originalCollection) {\r
-                if (AssociatedMetadataType == null) {\r
-                    return originalCollection;\r
-                }\r
-\r
-                bool customDescriptorsCreated = false;\r
-                List<PropertyDescriptor> tempPropertyDescriptors = new List<PropertyDescriptor>();\r
-                foreach (PropertyDescriptor propDescriptor in originalCollection) {\r
-                    Attribute[] newMetadata = TypeDescriptorCache.GetAssociatedMetadata(AssociatedMetadataType, propDescriptor.Name);\r
-                    PropertyDescriptor descriptor = propDescriptor;\r
-                    if (newMetadata.Length > 0) {\r
-                        // Create a metadata descriptor that wraps the property descriptor\r
-                        descriptor = new _MetadataPropertyDescriptorWrapper(propDescriptor, newMetadata);\r
-                        customDescriptorsCreated = true;\r
-                    }\r
-\r
-                    tempPropertyDescriptors.Add(descriptor);\r
-                }\r
-\r
-                if (customDescriptorsCreated) {\r
-                    return new PropertyDescriptorCollection(tempPropertyDescriptors.ToArray(), true);\r
-                }\r
-                return originalCollection;\r
-            }\r
-\r
-            public override AttributeCollection GetAttributes() {\r
-                // Since normal TD behavior is to return cached attribute instances on subsequent\r
-                // calls to GetAttributes, we must be sure below to use the TD APIs to get both\r
-                // the base and associated attributes\r
-                AttributeCollection attributes = base.GetAttributes();\r
-                if (AssociatedMetadataType != null) {\r
-                    // Note that the use of TypeDescriptor.GetAttributes here opens up the possibility of\r
-                    // infinite recursion, in the corner case of two Types referencing each other as\r
-                    // metadata types (or a longer cycle)\r
-                    Attribute[] newAttributes = TypeDescriptor.GetAttributes(AssociatedMetadataType).OfType<Attribute>().ToArray();\r
-                    attributes = AttributeCollection.FromExisting(attributes, newAttributes);\r
-                }\r
-                return attributes;\r
-            }\r
-\r
-            private static class TypeDescriptorCache {\r
-                private static readonly Attribute[] emptyAttributes = new Attribute[0];\r
-\r
-                // Stores the associated metadata type for a type\r
-                private static readonly Dictionary<Type, Type> _metadataTypeCache = new Dictionary<Type, Type>();\r
-\r
-                // For a type and a property name stores the attributes for that property name.\r
-                private static readonly Dictionary<Tuple<Type, string>, Attribute[]> _typeMemberCache = new Dictionary<Tuple<Type, string>, Attribute[]>();\r
-\r
-                // Stores whether or not a type and associated metadata type has been checked for validity\r
-                private static readonly Dictionary<Tuple<Type, Type>, bool> _validatedMetadataTypeCache = new Dictionary<Tuple<Type, Type>, bool>();\r
-\r
-                public static void ValidateMetadataType(Type type, Type associatedType) {\r
-                    Tuple<Type, Type> typeTuple = new Tuple<Type, Type>(type, associatedType);\r
-\r
-                    lock (_validatedMetadataTypeCache) {\r
-                        if (!_validatedMetadataTypeCache.ContainsKey(typeTuple)) {\r
-                            CheckAssociatedMetadataType(type, associatedType);\r
-                            _validatedMetadataTypeCache.Add(typeTuple, true);\r
-                        }\r
-                    }\r
-                }\r
-\r
-                public static Type GetAssociatedMetadataType(Type type) {\r
-                    Type associatedMetadataType = null;\r
-                    lock (_metadataTypeCache) {\r
-                        if (_metadataTypeCache.TryGetValue(type, out associatedMetadataType)) {\r
-                            return associatedMetadataType;\r
-                        }\r
-                    }\r
-\r
-                    // Try association attribute\r
-                    MetadataTypeAttribute attribute = (MetadataTypeAttribute)Attribute.GetCustomAttribute(type, typeof(MetadataTypeAttribute));\r
-                    if (attribute != null) {\r
-                        associatedMetadataType = attribute.MetadataClassType;\r
-                    }\r
-\r
-                    lock (_metadataTypeCache) {\r
-                        _metadataTypeCache[type] = associatedMetadataType; \r
-                    }\r
-\r
-                    return associatedMetadataType;\r
-                }\r
-\r
-                private static void CheckAssociatedMetadataType(Type mainType, Type associatedMetadataType) {\r
-                    // Only properties from main type\r
-                    HashSet<string> mainTypeMemberNames = new HashSet<string>(mainType.GetProperties().Select(p => p.Name));\r
-\r
-                    // Properties and fields from buddy type\r
-                    var buddyFields = associatedMetadataType.GetFields().Select(f => f.Name);\r
-                    var buddyProperties = associatedMetadataType.GetProperties().Select(p => p.Name);\r
-                    HashSet<string> buddyTypeMembers = new HashSet<string>(buddyFields.Concat(buddyProperties), StringComparer.Ordinal);\r
-\r
-                    // Buddy members should be a subset of the main type's members\r
-                    if (!buddyTypeMembers.IsSubsetOf(mainTypeMemberNames)) {\r
-                        // Reduce the buddy members to the set not contained in the main members\r
-                        buddyTypeMembers.ExceptWith(mainTypeMemberNames);\r
-\r
-                        throw new InvalidOperationException(String.Format(\r
-                            CultureInfo.CurrentCulture,\r
-                            MvcResources.PrivateAssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties,\r
-                            mainType.FullName,\r
-                            String.Join(", ", buddyTypeMembers.ToArray())));\r
-                    }\r
-                }\r
-\r
-                public static Attribute[] GetAssociatedMetadata(Type type, string memberName) {\r
-                    var memberTuple = new Tuple<Type, string>(type, memberName);\r
-                    Attribute[] attributes;\r
-                    lock (_typeMemberCache) {\r
-                        if (_typeMemberCache.TryGetValue(memberTuple, out attributes)) {\r
-                            return attributes;\r
-                        }\r
-                    }\r
-\r
-                    // Allow fields and properties\r
-                    MemberTypes allowedMemberTypes = MemberTypes.Property | MemberTypes.Field;\r
-                    // Only public static/instance members\r
-                    BindingFlags searchFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static;\r
-                    // Try to find a matching member on type\r
-                    MemberInfo matchingMember = type.GetMember(memberName, allowedMemberTypes, searchFlags).FirstOrDefault();\r
-                    if (matchingMember != null) {\r
-                        attributes = Attribute.GetCustomAttributes(matchingMember, true /* inherit */);\r
-                    }\r
-                    else {\r
-                        attributes = emptyAttributes;\r
-                    }\r
-\r
-                    lock (_typeMemberCache) {\r
-                        _typeMemberCache[memberTuple] = attributes;\r
-                    }\r
-                    return attributes;\r
-                }\r
-\r
-                private class Tuple<T1, T2> {\r
-                    public T1 Item1 { get; set; }\r
-                    public T2 Item2 { get; set; }\r
-\r
-                    public Tuple(T1 item1, T2 item2) {\r
-                        Item1 = item1;\r
-                        Item2 = item2;\r
-                    }\r
-\r
-                    public override int GetHashCode() {\r
-                        int h1 = Item1.GetHashCode();\r
-                        int h2 = Item2.GetHashCode();\r
-                        return ((h1 << 5) + h1) ^ h2;\r
-                    }\r
-\r
-                    public override bool Equals(object obj) {\r
-                        var other = obj as Tuple<T1, T2>;\r
-                        if (other != null) {\r
-                            return other.Item1.Equals(Item1) && other.Item2.Equals(Item2);\r
-                        }\r
-                        return false;\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        private class _MetadataPropertyDescriptorWrapper : PropertyDescriptor {\r
-            private PropertyDescriptor _descriptor;\r
-            private bool _isReadOnly;\r
-\r
-            public _MetadataPropertyDescriptorWrapper(PropertyDescriptor descriptor, Attribute[] newAttributes)\r
-                : base(descriptor, newAttributes) {\r
-                _descriptor = descriptor;\r
-                var readOnlyAttribute = newAttributes.OfType<ReadOnlyAttribute>().FirstOrDefault();\r
-                _isReadOnly = (readOnlyAttribute != null ? readOnlyAttribute.IsReadOnly : false);\r
-            }\r
-\r
-            public override void AddValueChanged(object component, EventHandler handler) { _descriptor.AddValueChanged(component, handler); }\r
-\r
-            public override bool CanResetValue(object component) { return _descriptor.CanResetValue(component); }\r
-\r
-            public override Type ComponentType { get { return _descriptor.ComponentType; } }\r
-\r
-            public override object GetValue(object component) { return _descriptor.GetValue(component); }\r
-\r
-            public override bool IsReadOnly {\r
-                get {\r
-                    // Dev10 Bug 594083\r
-                    // It's not enough to call the wrapped _descriptor because it does not know anything about\r
-                    // new attributes passed into the constructor of this class.\r
-                    return _isReadOnly || _descriptor.IsReadOnly;\r
-                }\r
-            }\r
-\r
-            public override Type PropertyType { get { return _descriptor.PropertyType; } }\r
-\r
-            public override void RemoveValueChanged(object component, EventHandler handler) { _descriptor.RemoveValueChanged(component, handler); }\r
-\r
-            public override void ResetValue(object component) { _descriptor.ResetValue(component); }\r
-\r
-            public override void SetValue(object component, object value) { _descriptor.SetValue(component, value); }\r
-\r
-            public override bool ShouldSerializeValue(object component) { return _descriptor.ShouldSerializeValue(component); }\r
-\r
-            public override bool SupportsChangeEvents { get { return _descriptor.SupportsChangeEvents; } }\r
-        }\r
-    \r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeHelpers.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/TypeHelpers.cs
deleted file mode 100644 (file)
index 6a024bb..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Reflection;\r
-    using System.Threading;\r
-\r
-    internal static class TypeHelpers {\r
-\r
-        private static readonly Dictionary<Type, TryGetValueDelegate> _tryGetValueDelegateCache = new Dictionary<Type, TryGetValueDelegate>();\r
-        private static readonly ReaderWriterLockSlim _tryGetValueDelegateCacheLock = new ReaderWriterLockSlim();\r
-\r
-        private static readonly MethodInfo _strongTryGetValueImplInfo = typeof(TypeHelpers).GetMethod("StrongTryGetValueImpl", BindingFlags.NonPublic | BindingFlags.Static);\r
-\r
-        public static readonly Assembly MsCorLibAssembly = typeof(string).Assembly;\r
-        public static readonly Assembly MvcAssembly = typeof(Controller).Assembly;\r
-        public static readonly Assembly SystemWebAssembly = typeof(HttpContext).Assembly;\r
-\r
-        // method is used primarily for lighting up new .NET Framework features even if MVC targets the previous version\r
-        // thisParameter is the 'this' parameter if target method is instance method, should be null for static method\r
-        public static TDelegate CreateDelegate<TDelegate>(Assembly assembly, string typeName, string methodName, object thisParameter) where TDelegate : class {\r
-            // ensure target type exists\r
-            Type targetType = assembly.GetType(typeName, false /* throwOnError */);\r
-            if (targetType == null) {\r
-                return null;\r
-            }\r
-\r
-            return CreateDelegate<TDelegate>(targetType, methodName, thisParameter);\r
-        }\r
-\r
-        public static TDelegate CreateDelegate<TDelegate>(Type targetType, string methodName, object thisParameter) where TDelegate : class {\r
-            // ensure target method exists\r
-            ParameterInfo[] delegateParameters = typeof(TDelegate).GetMethod("Invoke").GetParameters();\r
-            Type[] argumentTypes = Array.ConvertAll(delegateParameters, pInfo => pInfo.ParameterType);\r
-            MethodInfo targetMethod = targetType.GetMethod(methodName, argumentTypes);\r
-            if (targetMethod == null) {\r
-                return null;\r
-            }\r
-\r
-            TDelegate d = Delegate.CreateDelegate(typeof(TDelegate), thisParameter, targetMethod, false /* throwOnBindFailure */) as TDelegate;\r
-            return d;\r
-        }\r
-\r
-        public static TryGetValueDelegate CreateTryGetValueDelegate(Type targetType) {\r
-            TryGetValueDelegate result;\r
-\r
-            _tryGetValueDelegateCacheLock.EnterReadLock();\r
-            try {\r
-                if (_tryGetValueDelegateCache.TryGetValue(targetType, out result)) {\r
-                    return result;\r
-                }\r
-            }\r
-            finally {\r
-                _tryGetValueDelegateCacheLock.ExitReadLock();\r
-            }\r
-\r
-            Type dictionaryType = ExtractGenericInterface(targetType, typeof(IDictionary<,>));\r
-\r
-            // just wrap a call to the underlying IDictionary<TKey, TValue>.TryGetValue() where string can be cast to TKey\r
-            if (dictionaryType != null) {\r
-                Type[] typeArguments = dictionaryType.GetGenericArguments();\r
-                Type keyType = typeArguments[0];\r
-                Type returnType = typeArguments[1];\r
-\r
-                if (keyType.IsAssignableFrom(typeof(string))) {\r
-                    MethodInfo strongImplInfo = _strongTryGetValueImplInfo.MakeGenericMethod(keyType, returnType);\r
-                    result = (TryGetValueDelegate)Delegate.CreateDelegate(typeof(TryGetValueDelegate), strongImplInfo);\r
-                }\r
-            }\r
-\r
-            // wrap a call to the underlying IDictionary.Item()\r
-            if (result == null && typeof(IDictionary).IsAssignableFrom(targetType)) {\r
-                result = TryGetValueFromNonGenericDictionary;\r
-            }\r
-\r
-            _tryGetValueDelegateCacheLock.EnterWriteLock();\r
-            try {\r
-                _tryGetValueDelegateCache[targetType] = result;\r
-            }\r
-            finally {\r
-                _tryGetValueDelegateCacheLock.ExitWriteLock();\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        public static Type ExtractGenericInterface(Type queryType, Type interfaceType) {\r
-            Func<Type, bool> matchesInterface = t => t.IsGenericType && t.GetGenericTypeDefinition() == interfaceType;\r
-            return (matchesInterface(queryType)) ? queryType : queryType.GetInterfaces().FirstOrDefault(matchesInterface);\r
-        }\r
-\r
-        public static object GetDefaultValue(Type type) {\r
-            return (TypeAllowsNullValue(type)) ? null : Activator.CreateInstance(type);\r
-        }\r
-\r
-        public static bool IsCompatibleObject<T>(object value) {\r
-            return (value is T || (value == null && TypeAllowsNullValue(typeof(T))));\r
-        }\r
-\r
-        public static bool IsNullableValueType(Type type) {\r
-            return Nullable.GetUnderlyingType(type) != null;\r
-        }\r
-\r
-        private static bool StrongTryGetValueImpl<TKey, TValue>(object dictionary, string key, out object value) {\r
-            IDictionary<TKey, TValue> strongDict = (IDictionary<TKey, TValue>)dictionary;\r
-\r
-            TValue strongValue;\r
-            bool retVal = strongDict.TryGetValue((TKey)(object)key, out strongValue);\r
-            value = strongValue;\r
-            return retVal;\r
-        }\r
-\r
-        private static bool TryGetValueFromNonGenericDictionary(object dictionary, string key, out object value) {\r
-            IDictionary weakDict = (IDictionary)dictionary;\r
-\r
-            bool containsKey = weakDict.Contains(key);\r
-            value = (containsKey) ? weakDict[key] : null;\r
-            return containsKey;\r
-        }\r
-\r
-        public static bool TypeAllowsNullValue(Type type) {\r
-            return (!type.IsValueType || IsNullableValueType(type));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/UrlHelper.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/UrlHelper.cs
deleted file mode 100644 (file)
index 6b310c8..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.Routing;\r
-\r
-    public class UrlHelper {\r
-        public UrlHelper(RequestContext requestContext)\r
-            : this(requestContext, RouteTable.Routes) {\r
-        }\r
-\r
-        public UrlHelper(RequestContext requestContext, RouteCollection routeCollection) {\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-            if (routeCollection == null) {\r
-                throw new ArgumentNullException("routeCollection");\r
-            }\r
-            RequestContext = requestContext;\r
-            RouteCollection = routeCollection;\r
-        }\r
-\r
-        public RequestContext RequestContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public RouteCollection RouteCollection {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string Action(string actionName) {\r
-            return GenerateUrl(null /* routeName */, actionName, null, (RouteValueDictionary)null /* routeValues */);\r
-        }\r
-\r
-        public string Action(string actionName, object routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, null /* controllerName */, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public string Action(string actionName, RouteValueDictionary routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, null /* controllerName */, routeValues);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, (RouteValueDictionary)null /* routeValues */);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, object routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, new RouteValueDictionary(routeValues));\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, routeValues);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, object routeValues, string protocol) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, protocol, null /* hostName */, null /* fragment */, new RouteValueDictionary(routeValues), RouteCollection, RequestContext, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        public string Action(string actionName, string controllerName, RouteValueDictionary routeValues, string protocol, string hostName) {\r
-            return GenerateUrl(null /* routeName */, actionName, controllerName, protocol, hostName, null /* fragment */, routeValues, RouteCollection, RequestContext, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        public string Content(string contentPath) {\r
-            return GenerateContentUrl(contentPath, RequestContext.HttpContext);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public static string GenerateContentUrl(string contentPath, HttpContextBase httpContext) {\r
-            if (String.IsNullOrEmpty(contentPath)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "contentPath");\r
-            }\r
-\r
-            if (httpContext == null) {\r
-                throw new ArgumentNullException("httpContext");\r
-            }\r
-\r
-            if (contentPath[0] == '~') {\r
-                return PathHelpers.GenerateClientUrl(httpContext, contentPath);\r
-            }\r
-            else {\r
-                return contentPath;\r
-            }\r
-        }\r
-\r
-        //REVIEW: Should we have an overload that takes Uri?\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings",\r
-            Justification = "Needs to take same parameters as HttpUtility.UrlEncode()")]\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "For consistency, all helpers are instance methods.")]\r
-        public string Encode(string url) {\r
-            return HttpUtility.UrlEncode(url);\r
-        }\r
-\r
-        private string GenerateUrl(string routeName, string actionName, string controllerName, RouteValueDictionary routeValues) {\r
-            return GenerateUrl(routeName, actionName, controllerName, routeValues, RouteCollection, RequestContext, true /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public static string GenerateUrl(string routeName, string actionName, string controllerName, string protocol, string hostName, string fragment, RouteValueDictionary routeValues, RouteCollection routeCollection, RequestContext requestContext, bool includeImplicitMvcValues) {\r
-            string url = GenerateUrl(routeName, actionName, controllerName, routeValues, routeCollection, requestContext, includeImplicitMvcValues);\r
-\r
-            if (url != null) {\r
-                if (!String.IsNullOrEmpty(fragment)) {\r
-                    url = url + "#" + fragment;\r
-                }\r
-\r
-                if (!String.IsNullOrEmpty(protocol) || !String.IsNullOrEmpty(hostName)) {\r
-                    Uri requestUrl = requestContext.HttpContext.Request.Url;\r
-                    protocol = (!String.IsNullOrEmpty(protocol)) ? protocol : Uri.UriSchemeHttp;\r
-                    hostName = (!String.IsNullOrEmpty(hostName)) ? hostName : requestUrl.Host;\r
-\r
-                    string port = String.Empty;\r
-                    string requestProtocol = requestUrl.Scheme;\r
-\r
-                    if (String.Equals(protocol, requestProtocol, StringComparison.OrdinalIgnoreCase)) {\r
-                        port = requestUrl.IsDefaultPort ? String.Empty : (":" + Convert.ToString(requestUrl.Port, CultureInfo.InvariantCulture));\r
-                    }\r
-\r
-                    url = protocol + Uri.SchemeDelimiter + hostName + port + url;\r
-                }\r
-            }\r
-\r
-            return url;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public static string GenerateUrl(string routeName, string actionName, string controllerName, RouteValueDictionary routeValues, RouteCollection routeCollection, RequestContext requestContext, bool includeImplicitMvcValues) {\r
-            if (routeCollection == null) {\r
-                throw new ArgumentNullException("routeCollection");\r
-            }\r
-\r
-            if (requestContext == null) {\r
-                throw new ArgumentNullException("requestContext");\r
-            }\r
-\r
-            RouteValueDictionary mergedRouteValues = RouteValuesHelpers.MergeRouteValues(actionName, controllerName, requestContext.RouteData.Values, routeValues, includeImplicitMvcValues);\r
-\r
-            VirtualPathData vpd = routeCollection.GetVirtualPathForArea(requestContext, routeName, mergedRouteValues);\r
-            if (vpd == null) {\r
-                return null;\r
-            }\r
-\r
-            string modifiedUrl = PathHelpers.GenerateClientUrl(requestContext.HttpContext, vpd.VirtualPath);\r
-            return modifiedUrl;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(object routeValues) {\r
-            return RouteUrl(null /* routeName */, routeValues);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(RouteValueDictionary routeValues) {\r
-            return RouteUrl(null /* routeName */, routeValues);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName) {\r
-            return RouteUrl(routeName, (object)null /* routeValues */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, object routeValues) {\r
-            return RouteUrl(routeName, routeValues, null /* protocol */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, RouteValueDictionary routeValues) {\r
-            return RouteUrl(routeName, routeValues, null /* protocol */, null /* hostName */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, object routeValues, string protocol) {\r
-            return GenerateUrl(routeName, null /* actionName */, null /* controllerName */, protocol, null /* hostName */, null /* fragment */, new RouteValueDictionary(routeValues), RouteCollection, RequestContext, false /* includeImplicitMvcValues */);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1055:UriReturnValuesShouldNotBeStrings",\r
-            Justification = "As the return value will used only for rendering, string return value is more appropriate.")]\r
-        public string RouteUrl(string routeName, RouteValueDictionary routeValues, string protocol, string hostName) {\r
-            return GenerateUrl(routeName, null /* actionName */, null /* controllerName */, protocol, hostName, null /* fragment */, routeValues, RouteCollection, RequestContext, false /* includeImplicitMvcValues */);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/UrlParameter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/UrlParameter.cs
deleted file mode 100644 (file)
index 3d39c1e..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public sealed class UrlParameter {\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes",\r
-            Justification = "This type is immutable.")]\r
-        public static readonly UrlParameter Optional = new UrlParameter();\r
-\r
-        // singleton constructor\r
-        private UrlParameter() { }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs
deleted file mode 100644 (file)
index 0eedc81..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Web;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]\r
-    public sealed class ValidateAntiForgeryTokenAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        private string _salt;\r
-        private AntiForgeryDataSerializer _serializer;\r
-\r
-        public string Salt {\r
-            get {\r
-                return _salt ?? String.Empty;\r
-            }\r
-            set {\r
-                _salt = value;\r
-            }\r
-        }\r
-\r
-        internal AntiForgeryDataSerializer Serializer {\r
-            get {\r
-                if (_serializer == null) {\r
-                    _serializer = new AntiForgeryDataSerializer();\r
-                }\r
-                return _serializer;\r
-            }\r
-            set {\r
-                _serializer = value;\r
-            }\r
-        }\r
-\r
-        private bool ValidateFormToken(AntiForgeryData token) {\r
-            return (String.Equals(Salt, token.Salt, StringComparison.Ordinal));\r
-        }\r
-\r
-        private static HttpAntiForgeryException CreateValidationException() {\r
-            return new HttpAntiForgeryException(MvcResources.AntiForgeryToken_ValidationFailed);\r
-        }\r
-\r
-        public void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            string fieldName = AntiForgeryData.GetAntiForgeryTokenName(null);\r
-            string cookieName = AntiForgeryData.GetAntiForgeryTokenName(filterContext.HttpContext.Request.ApplicationPath);\r
-\r
-            HttpCookie cookie = filterContext.HttpContext.Request.Cookies[cookieName];\r
-            if (cookie == null || String.IsNullOrEmpty(cookie.Value)) {\r
-                // error: cookie token is missing\r
-                throw CreateValidationException();\r
-            }\r
-            AntiForgeryData cookieToken = Serializer.Deserialize(cookie.Value);\r
-\r
-            string formValue = filterContext.HttpContext.Request.Form[fieldName];\r
-            if (String.IsNullOrEmpty(formValue)) {\r
-                // error: form token is missing\r
-                throw CreateValidationException();\r
-            }\r
-            AntiForgeryData formToken = Serializer.Deserialize(formValue);\r
-\r
-            if (!String.Equals(cookieToken.Value, formToken.Value, StringComparison.Ordinal)) {\r
-                // error: form token does not match cookie token\r
-                throw CreateValidationException();\r
-            }\r
-\r
-            string currentUsername = AntiForgeryData.GetUsername(filterContext.HttpContext.User);\r
-            if (!String.Equals(formToken.Username, currentUsername, StringComparison.OrdinalIgnoreCase)) {\r
-                // error: form token is not valid for this user\r
-                // (don't care about cookie token)\r
-                throw CreateValidationException();\r
-            }\r
-\r
-            if (!ValidateFormToken(formToken)) {\r
-                // error: custom validation failed\r
-                throw CreateValidationException();\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValidateInputAttribute.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValidateInputAttribute.cs
deleted file mode 100644 (file)
index 7e07f99..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes",\r
-        Justification = "No compelling performance reason to seal this type.")]\r
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]\r
-    public class ValidateInputAttribute : FilterAttribute, IAuthorizationFilter {\r
-\r
-        public ValidateInputAttribute(bool enableValidation) {\r
-            EnableValidation = enableValidation;\r
-        }\r
-\r
-        public bool EnableValidation {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public virtual void OnAuthorization(AuthorizationContext filterContext) {\r
-            if (filterContext == null) {\r
-                throw new ArgumentNullException("filterContext");\r
-            }\r
-\r
-            filterContext.Controller.ValidateRequest = EnableValidation;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderCollection.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderCollection.cs
deleted file mode 100644 (file)
index 46ec5ae..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Linq;\r
-\r
-    public class ValueProviderCollection : Collection<IValueProvider>, IValueProvider {\r
-\r
-        public ValueProviderCollection() {\r
-        }\r
-\r
-        public ValueProviderCollection(IList<IValueProvider> list)\r
-            : base(list) {\r
-        }\r
-\r
-        public virtual bool ContainsPrefix(string prefix) {\r
-            return this.Any(vp => vp.ContainsPrefix(prefix));\r
-        }\r
-\r
-        public virtual ValueProviderResult GetValue(string key) {\r
-            return (from provider in this\r
-                    let result = provider.GetValue(key)\r
-                    where result != null\r
-                    select result).FirstOrDefault();\r
-        }\r
-\r
-        protected override void InsertItem(int index, IValueProvider item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.InsertItem(index, item);\r
-        }\r
-\r
-        protected override void SetItem(int index, IValueProvider item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.SetItem(index, item);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderDictionary.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderDictionary.cs
deleted file mode 100644 (file)
index a5ea7f0..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.Collections.Specialized;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Web.Routing;\r
-\r
-    [Obsolete("The recommended alternative is to use one of the specific ValueProvider types, such as FormValueProvider.")]\r
-    public class ValueProviderDictionary : IDictionary<string, ValueProviderResult>, IValueProvider {\r
-\r
-        private readonly Dictionary<string, ValueProviderResult> _dictionary = new Dictionary<string, ValueProviderResult>(StringComparer.OrdinalIgnoreCase);\r
-\r
-        public ValueProviderDictionary(ControllerContext controllerContext) {\r
-            ControllerContext = controllerContext;\r
-            if (controllerContext != null) {\r
-                PopulateDictionary();\r
-            }\r
-        }\r
-\r
-        public ControllerContext ControllerContext {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public int Count {\r
-            get {\r
-                return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Count;\r
-            }\r
-        }\r
-\r
-        internal Dictionary<string, ValueProviderResult> Dictionary {\r
-            get {\r
-                return _dictionary;\r
-            }\r
-        }\r
-\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        public ICollection<string> Keys {\r
-            get {\r
-                return Dictionary.Keys;\r
-            }\r
-        }\r
-\r
-        public ValueProviderResult this[string key] {\r
-            get {\r
-                ValueProviderResult result;\r
-                Dictionary.TryGetValue(key, out result);\r
-                return result;\r
-            }\r
-            set {\r
-                Dictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        public ICollection<ValueProviderResult> Values {\r
-            get {\r
-                return Dictionary.Values;\r
-            }\r
-        }\r
-\r
-        public void Add(KeyValuePair<string, ValueProviderResult> item) {\r
-            ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Add(item);\r
-        }\r
-\r
-        public void Add(string key, object value) {\r
-            string attemptedValue = Convert.ToString(value, CultureInfo.InvariantCulture);\r
-            ValueProviderResult vpResult = new ValueProviderResult(value, attemptedValue, CultureInfo.InvariantCulture);\r
-            Add(key, vpResult);\r
-        }\r
-\r
-        public void Add(string key, ValueProviderResult value) {\r
-            Dictionary.Add(key, value);\r
-        }\r
-\r
-        private void AddToDictionaryIfNotPresent(string key, ValueProviderResult result) {\r
-            if (!String.IsNullOrEmpty(key)) {\r
-                if (!Dictionary.ContainsKey(key)) {\r
-                    Dictionary.Add(key, result);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void Clear() {\r
-            ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Clear();\r
-        }\r
-\r
-        public bool Contains(KeyValuePair<string, ValueProviderResult> item) {\r
-            return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Contains(item);\r
-        }\r
-\r
-        public bool ContainsKey(string key) {\r
-            return Dictionary.ContainsKey(key);\r
-        }\r
-\r
-        public void CopyTo(KeyValuePair<string, ValueProviderResult>[] array, int arrayIndex) {\r
-            ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        public IEnumerator<KeyValuePair<string, ValueProviderResult>> GetEnumerator() {\r
-            return ((IEnumerable<KeyValuePair<string, ValueProviderResult>>)Dictionary).GetEnumerator();\r
-        }\r
-\r
-        private void PopulateDictionary() {\r
-            CultureInfo currentCulture = CultureInfo.CurrentCulture;\r
-            CultureInfo invariantCulture = CultureInfo.InvariantCulture;\r
-\r
-            // We use this order of precedence to populate the dictionary:\r
-            // 1. Request form submission (should be culture-aware)\r
-            // 2. Values from the RouteData (could be from the typed-in URL or from the route's default values)\r
-            // 3. URI query string\r
-\r
-            NameValueCollection form = ControllerContext.HttpContext.Request.Form;\r
-            if (form != null) {\r
-                string[] keys = form.AllKeys;\r
-                foreach (string key in keys) {\r
-                    string[] rawValue = form.GetValues(key);\r
-                    string attemptedValue = form[key];\r
-                    ValueProviderResult result = new ValueProviderResult(rawValue, attemptedValue, currentCulture);\r
-                    AddToDictionaryIfNotPresent(key, result);\r
-                }\r
-            }\r
-\r
-            RouteValueDictionary routeValues = ControllerContext.RouteData.Values;\r
-            if (routeValues != null) {\r
-                foreach (var kvp in routeValues) {\r
-                    string key = kvp.Key;\r
-                    object rawValue = kvp.Value;\r
-                    string attemptedValue = Convert.ToString(rawValue, invariantCulture);\r
-                    ValueProviderResult result = new ValueProviderResult(rawValue, attemptedValue, invariantCulture);\r
-                    AddToDictionaryIfNotPresent(key, result);\r
-                }\r
-            }\r
-\r
-            NameValueCollection queryString = ControllerContext.HttpContext.Request.QueryString;\r
-            if (queryString != null) {\r
-                string[] keys = queryString.AllKeys;\r
-                foreach (string key in keys) {\r
-                    string[] rawValue = queryString.GetValues(key);\r
-                    string attemptedValue = queryString[key];\r
-                    ValueProviderResult result = new ValueProviderResult(rawValue, attemptedValue, invariantCulture);\r
-                    AddToDictionaryIfNotPresent(key, result);\r
-                }\r
-            }\r
-        }\r
-\r
-        public bool Remove(KeyValuePair<string, ValueProviderResult> item) {\r
-            return ((ICollection<KeyValuePair<string, ValueProviderResult>>)Dictionary).Remove(item);\r
-        }\r
-\r
-        public bool Remove(string key) {\r
-            return Dictionary.Remove(key);\r
-        }\r
-\r
-        public bool TryGetValue(string key, out ValueProviderResult value) {\r
-            return Dictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)Dictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-        #region IValueProvider Members\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes",\r
-            Justification = "The declaring type is obsolete, so there is little benefit to exposing this as a virtual method.")]\r
-        bool IValueProvider.ContainsPrefix(string prefix) {\r
-            if (prefix == null) {\r
-                throw new ArgumentNullException("prefix");\r
-            }\r
-\r
-            return ValueProviderUtil.CollectionContainsPrefix(Keys, prefix);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes",\r
-            Justification = "The declaring type is obsolete, so there is little benefit to exposing this as a virtual method.")]\r
-        ValueProviderResult IValueProvider.GetValue(string key) {\r
-            if (key == null) {\r
-                throw new ArgumentNullException("key");\r
-            }\r
-\r
-            ValueProviderResult vpResult;\r
-            TryGetValue(key, out vpResult);\r
-            return vpResult;\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactories.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactories.cs
deleted file mode 100644 (file)
index f926e58..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public static class ValueProviderFactories {\r
-\r
-        private static readonly ValueProviderFactoryCollection _factories = new ValueProviderFactoryCollection() {\r
-            new FormValueProviderFactory(),\r
-            new RouteDataValueProviderFactory(),\r
-            new QueryStringValueProviderFactory(),\r
-            new HttpFileCollectionValueProviderFactory()\r
-        };\r
-\r
-        public static ValueProviderFactoryCollection Factories {\r
-            get {\r
-                return _factories;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactory.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactory.cs
deleted file mode 100644 (file)
index 3d2e42a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public abstract class ValueProviderFactory {\r
-        public abstract IValueProvider GetValueProvider(ControllerContext controllerContext);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactoryCollection.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderFactoryCollection.cs
deleted file mode 100644 (file)
index 2d797e2..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Linq;\r
-\r
-    public class ValueProviderFactoryCollection : Collection<ValueProviderFactory> {\r
-\r
-        public ValueProviderFactoryCollection() {\r
-        }\r
-\r
-        public ValueProviderFactoryCollection(IList<ValueProviderFactory> list)\r
-            : base(list) {\r
-        }\r
-\r
-        public IValueProvider GetValueProvider(ControllerContext controllerContext) {\r
-            var valueProviders = from factory in this\r
-                                 let valueProvider = factory.GetValueProvider(controllerContext)\r
-                                 where valueProvider != null\r
-                                 select valueProvider;\r
-\r
-            return new ValueProviderCollection(valueProviders.ToList());\r
-        }\r
-\r
-\r
-        protected override void InsertItem(int index, ValueProviderFactory item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.InsertItem(index, item);\r
-        }\r
-\r
-        protected override void SetItem(int index, ValueProviderFactory item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.SetItem(index, item);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderResult.cs
deleted file mode 100644 (file)
index 790a04a..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.ComponentModel;\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    [Serializable]\r
-    public class ValueProviderResult {\r
-\r
-        private static readonly CultureInfo _staticCulture = CultureInfo.InvariantCulture;\r
-        private CultureInfo _instanceCulture;\r
-\r
-        // default constructor so that subclassed types can set the properties themselves\r
-        protected ValueProviderResult() {\r
-        }\r
-\r
-        public ValueProviderResult(object rawValue, string attemptedValue, CultureInfo culture) {\r
-            RawValue = rawValue;\r
-            AttemptedValue = attemptedValue;\r
-            Culture = culture;\r
-        }\r
-\r
-        public string AttemptedValue {\r
-            get;\r
-            protected set;\r
-        }\r
-\r
-        public CultureInfo Culture {\r
-            get {\r
-                if (_instanceCulture == null) {\r
-                    _instanceCulture = _staticCulture;\r
-                }\r
-                return _instanceCulture;\r
-            }\r
-            protected set {\r
-                _instanceCulture = value;\r
-            }\r
-        }\r
-\r
-        public object RawValue {\r
-            get;\r
-            protected set;\r
-        }\r
-\r
-        private static object ConvertSimpleType(CultureInfo culture, object value, Type destinationType) {\r
-            if (value == null || destinationType.IsInstanceOfType(value)) {\r
-                return value;\r
-            }\r
-\r
-            // if this is a user-input value but the user didn't type anything, return no value\r
-            string valueAsString = value as string;\r
-            if (valueAsString != null && valueAsString.Trim().Length == 0) {\r
-                return null;\r
-            }\r
-\r
-            TypeConverter converter = TypeDescriptor.GetConverter(destinationType);\r
-            bool canConvertFrom = converter.CanConvertFrom(value.GetType());\r
-            if (!canConvertFrom) {\r
-                converter = TypeDescriptor.GetConverter(value.GetType());\r
-            }\r
-            if (!(canConvertFrom || converter.CanConvertTo(destinationType))) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ValueProviderResult_NoConverterExists,\r
-                    value.GetType().FullName, destinationType.FullName);\r
-                throw new InvalidOperationException(message);\r
-            }\r
-\r
-            try {\r
-                object convertedValue = (canConvertFrom) ?\r
-                     converter.ConvertFrom(null /* context */, culture, value) :\r
-                     converter.ConvertTo(null /* context */, culture, value, destinationType);\r
-                return convertedValue;\r
-            }\r
-            catch (Exception ex) {\r
-                string message = String.Format(CultureInfo.CurrentUICulture, MvcResources.ValueProviderResult_ConversionThrew,\r
-                    value.GetType().FullName, destinationType.FullName);\r
-                throw new InvalidOperationException(message, ex);\r
-            }\r
-        }\r
-\r
-        public object ConvertTo(Type type) {\r
-            return ConvertTo(type, null /* culture */);\r
-        }\r
-\r
-        public virtual object ConvertTo(Type type, CultureInfo culture) {\r
-            if (type == null) {\r
-                throw new ArgumentNullException("type");\r
-            }\r
-\r
-            CultureInfo cultureToUse = culture ?? Culture;\r
-            return UnwrapPossibleArrayType(cultureToUse, RawValue, type);\r
-        }\r
-\r
-        private static object UnwrapPossibleArrayType(CultureInfo culture, object value, Type destinationType) {\r
-            if (value == null || destinationType.IsInstanceOfType(value)) {\r
-                return value;\r
-            }\r
-\r
-            // array conversion results in four cases, as below\r
-            Array valueAsArray = value as Array;\r
-            if (destinationType.IsArray) {\r
-                Type destinationElementType = destinationType.GetElementType();\r
-                if (valueAsArray != null) {\r
-                    // case 1: both destination + source type are arrays, so convert each element\r
-                    IList converted = Array.CreateInstance(destinationElementType, valueAsArray.Length);\r
-                    for (int i = 0; i < valueAsArray.Length; i++) {\r
-                        converted[i] = ConvertSimpleType(culture, valueAsArray.GetValue(i), destinationElementType);\r
-                    }\r
-                    return converted;\r
-                }\r
-                else {\r
-                    // case 2: destination type is array but source is single element, so wrap element in array + convert\r
-                    object element = ConvertSimpleType(culture, value, destinationElementType);\r
-                    IList converted = Array.CreateInstance(destinationElementType, 1);\r
-                    converted[0] = element;\r
-                    return converted;\r
-                }\r
-            }\r
-            else if (valueAsArray != null) {\r
-                // case 3: destination type is single element but source is array, so extract first element + convert\r
-                if (valueAsArray.Length > 0) {\r
-                    value = valueAsArray.GetValue(0);\r
-                    return ConvertSimpleType(culture, value, destinationType);\r
-                }\r
-                else {\r
-                    // case 3(a): source is empty array, so can't perform conversion\r
-                    return null;\r
-                }\r
-            }\r
-            // case 4: both destination + source type are single elements, so convert\r
-            return ConvertSimpleType(culture, value, destinationType);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderUtil.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ValueProviderUtil.cs
deleted file mode 100644 (file)
index 4bbad40..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-\r
-    internal static class ValueProviderUtil {\r
-\r
-        // Given "foo.bar[baz].quux", this method will return:\r
-        // - "foo.bar[baz].quux"\r
-        // - "foo.bar[baz]"\r
-        // - "foo.bar"\r
-        // - "foo"\r
-        public static IEnumerable<string> GetPrefixes(string key) {\r
-            yield return key;\r
-            for (int i = key.Length - 1; i >= 0; i--) {\r
-                switch (key[i]) {\r
-                    case '.':\r
-                    case '[':\r
-                        yield return key.Substring(0, i);\r
-                        break;\r
-                }\r
-            }\r
-        }\r
-\r
-        public static bool CollectionContainsPrefix(IEnumerable<string> collection, string prefix) {\r
-            foreach (string key in collection) {\r
-                if (key != null) {\r
-                    if (prefix.Length == 0) {\r
-                        return true; // shortcut - non-null key matches empty prefix\r
-                    }\r
-\r
-                    if (key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) {\r
-                        if (key.Length == prefix.Length) {\r
-                            return true; // exact match\r
-                        }\r
-                        else {\r
-                            switch (key[prefix.Length]) {\r
-                                case '.': // known separator characters\r
-                                case '[':\r
-                                    return true;\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            return false; // nothing found\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewContext.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewContext.cs
deleted file mode 100644 (file)
index 882c6df..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Web.Script.Serialization;\r
-\r
-    public class ViewContext : ControllerContext {\r
-\r
-        private const string _clientValidationScript = @"<script type=""text/javascript"">\r
-//<![CDATA[\r
-if (!window.mvcClientValidationMetadata) {{ window.mvcClientValidationMetadata = []; }}\r
-window.mvcClientValidationMetadata.push({0});\r
-//]]>\r
-</script>";\r
-\r
-        // Some values have to be stored in HttpContext.Items in order to be propagated between calls\r
-        // to RenderPartial(), RenderAction(), etc.\r
-        private static readonly object _clientValidationEnabledKey = new object();\r
-        private static readonly object _formContextKey = new object();\r
-        private static readonly object _lastFormNumKey = new object();\r
-\r
-        private Func<string> _formIdGenerator;\r
-\r
-        // parameterless constructor used for mocking\r
-        public ViewContext() {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "The virtual property setters are only to support mocking frameworks, in which case this constructor shouldn't be called anyway.")]\r
-        public ViewContext(ControllerContext controllerContext, IView view, ViewDataDictionary viewData, TempDataDictionary tempData, TextWriter writer)\r
-            : base(controllerContext) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (view == null) {\r
-                throw new ArgumentNullException("view");\r
-            }\r
-            if (viewData == null) {\r
-                throw new ArgumentNullException("viewData");\r
-            }\r
-            if (tempData == null) {\r
-                throw new ArgumentNullException("tempData");\r
-            }\r
-            if (writer == null) {\r
-                throw new ArgumentNullException("writer");\r
-            }\r
-\r
-            View = view;\r
-            ViewData = viewData;\r
-            Writer = writer;\r
-            TempData = tempData;\r
-        }\r
-\r
-        public virtual bool ClientValidationEnabled {\r
-            get {\r
-                return (HttpContext.Items[_clientValidationEnabledKey] as bool?).GetValueOrDefault();\r
-            }\r
-            set {\r
-                HttpContext.Items[_clientValidationEnabledKey] = value;\r
-            }\r
-        }\r
-\r
-        public virtual FormContext FormContext {\r
-            get {\r
-                return HttpContext.Items[_formContextKey] as FormContext;\r
-            }\r
-            set {\r
-                HttpContext.Items[_formContextKey] = value;\r
-            }\r
-        }\r
-\r
-        internal Func<string> FormIdGenerator {\r
-            get {\r
-                if (_formIdGenerator == null) {\r
-                    _formIdGenerator = DefaultFormIdGenerator;\r
-                }\r
-                return _formIdGenerator;\r
-            }\r
-            set {\r
-                _formIdGenerator = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The property setter is only here to support mocking this type and should not be called at runtime.")]\r
-        public virtual TempDataDictionary TempData {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual IView View {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "The property setter is only here to support mocking this type and should not be called at runtime.")]\r
-        public virtual ViewDataDictionary ViewData {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public virtual TextWriter Writer {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        private string DefaultFormIdGenerator() {\r
-            int formNum = IncrementFormCount(HttpContext.Items);\r
-            return String.Format(CultureInfo.InvariantCulture, "form{0}", formNum);\r
-        }\r
-\r
-        internal FormContext GetFormContextForClientValidation() {\r
-            return (ClientValidationEnabled) ? FormContext : null;\r
-        }\r
-\r
-        private static int IncrementFormCount(IDictionary items) {\r
-            object lastFormNum = items[_lastFormNumKey];\r
-            int newFormNum = (lastFormNum != null) ? ((int)lastFormNum) + 1 : 0;\r
-            items[_lastFormNumKey] = newFormNum;\r
-            return newFormNum;\r
-        }\r
-\r
-        public void OutputClientValidation() {\r
-            FormContext formContext = GetFormContextForClientValidation();\r
-            if (formContext == null) {\r
-                return; // do nothing\r
-            }\r
-                        \r
-            string scriptWithCorrectNewLines = _clientValidationScript.Replace("\r\n", Environment.NewLine);\r
-            string validationJson = formContext.GetJsonValidationMetadata();\r
-            string formatted = String.Format(CultureInfo.InvariantCulture, scriptWithCorrectNewLines, validationJson);\r
-\r
-            Writer.Write(formatted);\r
-            FormContext = null;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataDictionary.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataDictionary.cs
deleted file mode 100644 (file)
index 28b25dd..0000000
+++ /dev/null
@@ -1,356 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Collections.Generic;\r
-    using System.ComponentModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Reflection;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    // TODO: Unit test ModelState interaction with VDD\r
-\r
-    public class ViewDataDictionary : IDictionary<string, object> {\r
-\r
-        private readonly Dictionary<string, object> _innerDictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);\r
-        private object _model;\r
-        private ModelMetadata _modelMetadata;\r
-        private readonly ModelStateDictionary _modelState = new ModelStateDictionary();\r
-        private TemplateInfo _templateMetadata;\r
-\r
-        public ViewDataDictionary()\r
-            : this((object)null) {\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "See note on SetModel() method.")]\r
-        public ViewDataDictionary(object model) {\r
-            Model = model;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",\r
-            Justification = "See note on SetModel() method.")]\r
-        public ViewDataDictionary(ViewDataDictionary dictionary) {\r
-            if (dictionary == null) {\r
-                throw new ArgumentNullException("dictionary");\r
-            }\r
-\r
-            foreach (var entry in dictionary) {\r
-                _innerDictionary.Add(entry.Key, entry.Value);\r
-            }\r
-            foreach (var entry in dictionary.ModelState) {\r
-                ModelState.Add(entry.Key, entry.Value);\r
-            }\r
-\r
-            Model = dictionary.Model;\r
-            TemplateInfo = dictionary.TemplateInfo;\r
-\r
-            // PERF: Don't unnecessarily instantiate the model metadata\r
-            _modelMetadata = dictionary._modelMetadata;\r
-        }\r
-\r
-        public int Count {\r
-            get {\r
-                return _innerDictionary.Count;\r
-            }\r
-        }\r
-\r
-        public bool IsReadOnly {\r
-            get {\r
-                return ((IDictionary<string, object>)_innerDictionary).IsReadOnly;\r
-            }\r
-        }\r
-\r
-        public ICollection<string> Keys {\r
-            get {\r
-                return _innerDictionary.Keys;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return _model;\r
-            }\r
-            set {\r
-                _modelMetadata = null;\r
-                SetModel(value);\r
-            }\r
-        }\r
-\r
-        public virtual ModelMetadata ModelMetadata {\r
-            get {\r
-                if (_modelMetadata == null && _model != null) {\r
-                    _modelMetadata = ModelMetadataProviders.Current.GetMetadataForType(() => _model, _model.GetType());\r
-                }\r
-                return _modelMetadata;\r
-            }\r
-            set {\r
-                _modelMetadata = value;\r
-            }\r
-        }\r
-\r
-        public ModelStateDictionary ModelState {\r
-            get {\r
-                return _modelState;\r
-            }\r
-        }\r
-\r
-        public object this[string key] {\r
-            get {\r
-                object value;\r
-                _innerDictionary.TryGetValue(key, out value);\r
-                return value;\r
-            }\r
-            set {\r
-                _innerDictionary[key] = value;\r
-            }\r
-        }\r
-\r
-        public TemplateInfo TemplateInfo {\r
-            get {\r
-                if (_templateMetadata == null) {\r
-                    _templateMetadata = new TemplateInfo();\r
-                }\r
-                return _templateMetadata;\r
-            }\r
-            set {\r
-                _templateMetadata = value;\r
-            }\r
-        }\r
-\r
-        public ICollection<object> Values {\r
-            get {\r
-                return _innerDictionary.Values;\r
-            }\r
-        }\r
-\r
-        public void Add(KeyValuePair<string, object> item) {\r
-            ((IDictionary<string, object>)_innerDictionary).Add(item);\r
-        }\r
-\r
-        public void Add(string key, object value) {\r
-            _innerDictionary.Add(key, value);\r
-        }\r
-\r
-        public void Clear() {\r
-            _innerDictionary.Clear();\r
-        }\r
-\r
-        public bool Contains(KeyValuePair<string, object> item) {\r
-            return ((IDictionary<string, object>)_innerDictionary).Contains(item);\r
-        }\r
-\r
-        public bool ContainsKey(string key) {\r
-            return _innerDictionary.ContainsKey(key);\r
-        }\r
-\r
-        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex) {\r
-            ((IDictionary<string, object>)_innerDictionary).CopyTo(array, arrayIndex);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Eval",\r
-            Justification = "Commonly used shorthand for Evaluate.")]\r
-        public object Eval(string expression) {\r
-            ViewDataInfo info = GetViewDataInfo(expression);\r
-            return (info != null) ? info.Value : null;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Eval",\r
-            Justification = "Commonly used shorthand for Evaluate.")]\r
-        public string Eval(string expression, string format) {\r
-            object value = Eval(expression);\r
-\r
-            if (value == null) {\r
-                return String.Empty;\r
-            }\r
-\r
-            if (String.IsNullOrEmpty(format)) {\r
-                return Convert.ToString(value, CultureInfo.CurrentCulture);\r
-            }\r
-            else {\r
-                return String.Format(CultureInfo.CurrentCulture, format, value);\r
-            }\r
-        }\r
-\r
-        public IEnumerator<KeyValuePair<string, object>> GetEnumerator() {\r
-            return _innerDictionary.GetEnumerator();\r
-        }\r
-\r
-        public ViewDataInfo GetViewDataInfo(string expression) {\r
-            if (String.IsNullOrEmpty(expression)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "expression");\r
-            }\r
-\r
-            return ViewDataEvaluator.Eval(this, expression);\r
-        }\r
-\r
-        public bool Remove(KeyValuePair<string, object> item) {\r
-            return ((IDictionary<string, object>)_innerDictionary).Remove(item);\r
-        }\r
-\r
-        public bool Remove(string key) {\r
-            return _innerDictionary.Remove(key);\r
-        }\r
-\r
-        // This method will execute before the derived type's instance constructor executes. Derived types must\r
-        // be aware of this and should plan accordingly. For example, the logic in SetModel() should be simple\r
-        // enough so as not to depend on the "this" pointer referencing a fully constructed object.\r
-        protected virtual void SetModel(object value) {\r
-            _model = value;\r
-        }\r
-\r
-        public bool TryGetValue(string key, out object value) {\r
-            return _innerDictionary.TryGetValue(key, out value);\r
-        }\r
-\r
-        internal static class ViewDataEvaluator {\r
-\r
-            public static ViewDataInfo Eval(ViewDataDictionary vdd, string expression) {\r
-                //Given an expression "foo.bar.baz" we look up the following (pseudocode):\r
-                //  this["foo.bar.baz.quux"]\r
-                //  this["foo.bar.baz"]["quux"]\r
-                //  this["foo.bar"]["baz.quux]\r
-                //  this["foo.bar"]["baz"]["quux"]\r
-                //  this["foo"]["bar.baz.quux"]\r
-                //  this["foo"]["bar.baz"]["quux"]\r
-                //  this["foo"]["bar"]["baz.quux"]\r
-                //  this["foo"]["bar"]["baz"]["quux"]\r
-\r
-                ViewDataInfo evaluated = EvalComplexExpression(vdd, expression);\r
-                return evaluated;\r
-            }\r
-\r
-            private static ViewDataInfo EvalComplexExpression(object indexableObject, string expression) {\r
-                foreach (ExpressionPair expressionPair in GetRightToLeftExpressions(expression)) {\r
-                    string subExpression = expressionPair.Left;\r
-                    string postExpression = expressionPair.Right;\r
-\r
-                    ViewDataInfo subTargetInfo = GetPropertyValue(indexableObject, subExpression);\r
-                    if (subTargetInfo != null) {\r
-                        if (String.IsNullOrEmpty(postExpression)) {\r
-                            return subTargetInfo;\r
-                        }\r
-\r
-                        if (subTargetInfo.Value != null) {\r
-                            ViewDataInfo potential = EvalComplexExpression(subTargetInfo.Value, postExpression);\r
-                            if (potential != null) {\r
-                                return potential;\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-                return null;\r
-            }\r
-\r
-            private static IEnumerable<ExpressionPair> GetRightToLeftExpressions(string expression) {\r
-                // Produces an enumeration of all the combinations of complex property names\r
-                // given a complex expression. See the list above for an example of the result\r
-                // of the enumeration.\r
-\r
-                yield return new ExpressionPair(expression, String.Empty);\r
-\r
-                int lastDot = expression.LastIndexOf('.');\r
-\r
-                string subExpression = expression;\r
-                string postExpression = string.Empty;\r
-\r
-                while (lastDot > -1) {\r
-                    subExpression = expression.Substring(0, lastDot);\r
-                    postExpression = expression.Substring(lastDot + 1);\r
-                    yield return new ExpressionPair(subExpression, postExpression);\r
-\r
-                    lastDot = subExpression.LastIndexOf('.');\r
-                }\r
-            }\r
-\r
-            private static ViewDataInfo GetIndexedPropertyValue(object indexableObject, string key) {\r
-                IDictionary<string, object> dict = indexableObject as IDictionary<string, object>;\r
-                object value = null;\r
-                bool success = false;\r
-                \r
-                if (dict != null) {\r
-                    success = dict.TryGetValue(key, out value);\r
-                }\r
-                else {\r
-                    TryGetValueDelegate tgvDel = TypeHelpers.CreateTryGetValueDelegate(indexableObject.GetType());\r
-                    if (tgvDel != null) {\r
-                        success = tgvDel(indexableObject, key, out value);\r
-                    }\r
-                }\r
-                \r
-                if (success) {\r
-                    return new ViewDataInfo() {\r
-                        Container = indexableObject,\r
-                        Value = value\r
-                    };\r
-                }\r
-\r
-                return null;\r
-            }\r
-\r
-            private static ViewDataInfo GetPropertyValue(object container, string propertyName) {\r
-                // This method handles one "segment" of a complex property expression\r
-\r
-                // First, we try to evaluate the property based on its indexer\r
-                ViewDataInfo value = GetIndexedPropertyValue(container, propertyName);\r
-                if (value != null) {\r
-                    return value;\r
-                }\r
-\r
-                // If the indexer didn't return anything useful, continue...\r
-\r
-                // If the container is a ViewDataDictionary then treat its Model property\r
-                // as the container instead of the ViewDataDictionary itself.\r
-                ViewDataDictionary vdd = container as ViewDataDictionary;\r
-                if (vdd != null) {\r
-                    container = vdd.Model;\r
-                }\r
-\r
-                // If the container is null, we're out of options\r
-                if (container == null) {\r
-                    return null;\r
-                }\r
-\r
-                // Second, we try to use PropertyDescriptors and treat the expression as a property name\r
-                PropertyDescriptor descriptor = TypeDescriptor.GetProperties(container).Find(propertyName, true);\r
-                if (descriptor == null) {\r
-                    return null;\r
-                }\r
-\r
-                return new ViewDataInfo(() => descriptor.GetValue(container)) {\r
-                    Container = container,\r
-                    PropertyDescriptor = descriptor\r
-                };\r
-            }\r
-\r
-            private struct ExpressionPair {\r
-                public readonly string Left;\r
-                public readonly string Right;\r
-\r
-                public ExpressionPair(string left, string right) {\r
-                    Left = left;\r
-                    Right = right;\r
-                }\r
-            }\r
-        }\r
-\r
-        #region IEnumerable Members\r
-        IEnumerator IEnumerable.GetEnumerator() {\r
-            return ((IEnumerable)_innerDictionary).GetEnumerator();\r
-        }\r
-        #endregion\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataDictionary`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataDictionary`1.cs
deleted file mode 100644 (file)
index a0d09f2..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-\r
-    public class ViewDataDictionary<TModel> : ViewDataDictionary {\r
-        public ViewDataDictionary() :\r
-            base(default(TModel)) {\r
-        }\r
-\r
-        public ViewDataDictionary(TModel model) :\r
-            base(model) {\r
-        }\r
-\r
-        public ViewDataDictionary(ViewDataDictionary viewDataDictionary) :\r
-            base(viewDataDictionary) {\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return (TModel)base.Model;\r
-            }\r
-            set {\r
-                SetModel(value);\r
-            }\r
-        }\r
-\r
-        public override ModelMetadata ModelMetadata {\r
-            get {\r
-                ModelMetadata result = base.ModelMetadata;\r
-                if (result == null) {\r
-                    result = base.ModelMetadata = ModelMetadataProviders.Current.GetMetadataForType(null, typeof(TModel));\r
-                }\r
-                return result;\r
-            }\r
-            set {\r
-                base.ModelMetadata = value;\r
-            }\r
-        }\r
-\r
-        protected override void SetModel(object value) {\r
-            bool castWillSucceed = TypeHelpers.IsCompatibleObject<TModel>(value);\r
-\r
-            if (castWillSucceed) {\r
-                base.SetModel((TModel)value);\r
-            }\r
-            else {\r
-                InvalidOperationException exception = (value != null)\r
-                    ? Error.ViewDataDictionary_WrongTModelType(value.GetType(), typeof(TModel))\r
-                    : Error.ViewDataDictionary_ModelCannotBeNull(typeof(TModel));\r
-                throw exception;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataInfo.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewDataInfo.cs
deleted file mode 100644 (file)
index 8cc480b..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel;\r
-\r
-    public class ViewDataInfo {\r
-\r
-        private object _value;\r
-        private Func<object> _valueAccessor;\r
-\r
-        public ViewDataInfo() {\r
-        }\r
-\r
-        public ViewDataInfo(Func<object> valueAccessor) {\r
-            _valueAccessor = valueAccessor;\r
-        }\r
-\r
-        public object Container {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public PropertyDescriptor PropertyDescriptor {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public object Value {\r
-            get {\r
-                if (_valueAccessor != null) {\r
-                    _value = _valueAccessor();\r
-                    _valueAccessor = null;\r
-                }\r
-\r
-                return _value;\r
-            }\r
-            set {\r
-                _value = value;\r
-                _valueAccessor = null;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngineCollection.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngineCollection.cs
deleted file mode 100644 (file)
index 1fce965..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Collections.Generic;\r
-    using System.Collections.ObjectModel;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ViewEngineCollection : Collection<IViewEngine> {\r
-\r
-        public ViewEngineCollection() {\r
-        }\r
-\r
-        public ViewEngineCollection(IList<IViewEngine> list)\r
-            : base(list) {\r
-        }\r
-\r
-        protected override void InsertItem(int index, IViewEngine item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.InsertItem(index, item);\r
-        }\r
-\r
-        protected override void SetItem(int index, IViewEngine item) {\r
-            if (item == null) {\r
-                throw new ArgumentNullException("item");\r
-            }\r
-            base.SetItem(index, item);\r
-        }\r
-\r
-        private ViewEngineResult Find(Func<IViewEngine, ViewEngineResult> cacheLocator, Func<IViewEngine, ViewEngineResult> locator) {\r
-            ViewEngineResult result;\r
-\r
-            foreach (IViewEngine engine in Items) {\r
-                if (engine != null) {\r
-                    result = cacheLocator(engine);\r
-\r
-                    if (result.View != null) {\r
-                        return result;\r
-                    }\r
-                }\r
-            }\r
-\r
-            List<string> searched = new List<string>();\r
-\r
-            foreach (IViewEngine engine in Items) {\r
-                if (engine != null) {\r
-                    result = locator(engine);\r
-\r
-                    if (result.View != null) {\r
-                        return result;\r
-                    }\r
-\r
-                    searched.AddRange(result.SearchedLocations);\r
-                }\r
-            }\r
-\r
-            return new ViewEngineResult(searched);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (string.IsNullOrEmpty(partialViewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "partialViewName");\r
-            }\r
-            Func<IViewEngine, ViewEngineResult> cacheLocator = e => e.FindPartialView(controllerContext, partialViewName, true);\r
-            Func<IViewEngine, ViewEngineResult> locator = e => e.FindPartialView(controllerContext, partialViewName, false);\r
-            return Find(cacheLocator, locator);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (string.IsNullOrEmpty(viewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "viewName");\r
-            }\r
-            Func<IViewEngine, ViewEngineResult> cacheLocator = e => e.FindView(controllerContext, viewName, masterName, true);\r
-            Func<IViewEngine, ViewEngineResult> locator = e => e.FindView(controllerContext, viewName, masterName, false);\r
-            return Find(cacheLocator, locator);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngineResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngineResult.cs
deleted file mode 100644 (file)
index 97a1b31..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-\r
-    public class ViewEngineResult {\r
-\r
-        public ViewEngineResult(IEnumerable<string> searchedLocations) {\r
-            if (searchedLocations == null) {\r
-                throw new ArgumentNullException("searchedLocations");\r
-            }\r
-\r
-            SearchedLocations = searchedLocations;\r
-        }\r
-\r
-        public ViewEngineResult(IView view, IViewEngine viewEngine) {\r
-            if (view == null) {\r
-                throw new ArgumentNullException("view");\r
-            }\r
-            if (viewEngine == null) {\r
-                throw new ArgumentNullException("viewEngine");\r
-            }\r
-\r
-            View = view;\r
-            ViewEngine = viewEngine;\r
-        }\r
-\r
-        public IEnumerable<string> SearchedLocations {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IView View {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public IViewEngine ViewEngine {\r
-            get;\r
-            private set;\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngines.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewEngines.cs
deleted file mode 100644 (file)
index af4c016..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public static class ViewEngines {\r
-\r
-        private readonly static ViewEngineCollection _engines = new ViewEngineCollection {\r
-            new WebFormViewEngine() \r
-        };\r
-\r
-        public static ViewEngineCollection Engines {\r
-            get {\r
-                return _engines;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewMasterPage.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewMasterPage.cs
deleted file mode 100644 (file)
index 837dabf..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Globalization;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    public class ViewMasterPage : MasterPage {\r
-        public AjaxHelper<object> Ajax {\r
-            get {\r
-                return ViewPage.Ajax;\r
-            }\r
-        }\r
-\r
-        public HtmlHelper<object> Html {\r
-            get {\r
-                return ViewPage.Html;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                return ViewPage.TempData;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get {\r
-                return ViewPage.Url;\r
-            }\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get {\r
-                return ViewPage.ViewContext;\r
-            }\r
-        }\r
-\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                return ViewPage.ViewData;\r
-            }\r
-        }\r
-\r
-        internal ViewPage ViewPage {\r
-            get {\r
-                ViewPage viewPage = Page as ViewPage;\r
-                if (viewPage == null) {\r
-                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, MvcResources.ViewMasterPage_RequiresViewPage));\r
-                }\r
-                return viewPage;\r
-            }\r
-        }\r
-\r
-        public HtmlTextWriter Writer {\r
-            get {\r
-                return ViewPage.Writer;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewMasterPage`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewMasterPage`1.cs
deleted file mode 100644 (file)
index c3c95d1..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-\r
-    public class ViewMasterPage<TModel> : ViewMasterPage {\r
-        private AjaxHelper<TModel> _ajaxHelper;\r
-        private HtmlHelper<TModel> _htmlHelper;\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public new AjaxHelper<TModel> Ajax {\r
-            get {\r
-                if (_ajaxHelper == null) {\r
-                    _ajaxHelper = new AjaxHelper<TModel>(ViewContext, ViewPage);\r
-                }\r
-                return _ajaxHelper;\r
-            }\r
-        }\r
-\r
-        public new HtmlHelper<TModel> Html {\r
-            get {\r
-                if (_htmlHelper == null) {\r
-                    _htmlHelper = new HtmlHelper<TModel>(ViewContext, ViewPage);\r
-                }\r
-                return _htmlHelper;\r
-            }\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    _viewData = new ViewDataDictionary<TModel>(ViewPage.ViewData);\r
-                }\r
-                return _viewData;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPage.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPage.cs
deleted file mode 100644 (file)
index 6e1891c..0000000
+++ /dev/null
@@ -1,378 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Text;\r
-    using System.Web;\r
-    using System.Web.UI;\r
-\r
-    [FileLevelControlBuilder(typeof(ViewPageControlBuilder))]\r
-    public class ViewPage : Page, IViewDataContainer {\r
-\r
-        private string _masterLocation;\r
-        [ThreadStatic]\r
-        private static int _nextId;\r
-        private ViewDataDictionary _viewData;\r
-\r
-        public AjaxHelper<object> Ajax {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public HtmlHelper<object> Html {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public string MasterLocation {\r
-            get {\r
-                return _masterLocation ?? String.Empty;\r
-            }\r
-            set {\r
-                _masterLocation = value;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                return ViewContext.TempData;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public ViewContext ViewContext {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This is the mechanism by which the ViewPage gets its ViewDataDictionary object.")]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    SetViewData(new ViewDataDictionary());\r
-                }\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        public HtmlTextWriter Writer {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public virtual void InitHelpers() {\r
-            Ajax = new AjaxHelper<object>(ViewContext, this);\r
-            Html = new HtmlHelper<object>(ViewContext, this);\r
-            Url = new UrlHelper(ViewContext.RequestContext);\r
-        }\r
-\r
-        internal static string NextId() {\r
-            return (++_nextId).ToString(CultureInfo.InvariantCulture);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Security", "CA2109:ReviewVisibleEventHandlers")]\r
-        protected override void OnPreInit(EventArgs e) {\r
-            base.OnPreInit(e);\r
-\r
-            if (!String.IsNullOrEmpty(MasterLocation)) {\r
-                MasterPageFile = MasterLocation;\r
-            }\r
-        }\r
-\r
-        public override void ProcessRequest(HttpContext context) {\r
-            // Tracing requires IDs to be unique.\r
-            ID = NextId();\r
-\r
-            base.ProcessRequest(context);\r
-        }\r
-\r
-        protected override void Render(HtmlTextWriter writer) {\r
-            Writer = writer;\r
-            try {\r
-                base.Render(writer);\r
-            }\r
-            finally {\r
-                Writer = null;\r
-            }\r
-        }\r
-\r
-        public virtual void RenderView(ViewContext viewContext) {\r
-            ViewContext = viewContext;\r
-            InitHelpers();\r
-\r
-            bool needServerExecute = false;\r
-\r
-            SwitchWriter switchWriter = viewContext.HttpContext.Response.Output as SwitchWriter;\r
-            if (switchWriter == null) {\r
-                switchWriter = new SwitchWriter();\r
-                needServerExecute = true;\r
-            }\r
-\r
-            using (switchWriter.Scope(viewContext.Writer)) {\r
-                if (needServerExecute) {\r
-                    // It's safe to reset the _nextId within a Server.Execute() since it pushes a new TraceContext onto\r
-                    // the stack, so there won't be an ID conflict.\r
-                    int originalNextId = _nextId;\r
-                    try {\r
-                        _nextId = 0;\r
-                        viewContext.HttpContext.Server.Execute(HttpHandlerUtil.WrapForServerExecute(this), switchWriter, true /* preserveForm */);\r
-                    }\r
-                    finally {\r
-                        // Restore the original _nextId in case this isn't actually the outermost view, since resetting\r
-                        // the _nextId may now cause trace ID conflicts in the outer view.\r
-                        _nextId = originalNextId;\r
-                    }\r
-                }\r
-                else {\r
-                    ProcessRequest(HttpContext.Current);\r
-                }\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "textWriter",\r
-            Justification = "This method existed in MVC 1.0 and has been deprecated.")]\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "This method existed in MVC 1.0 and has been deprecated.")]\r
-        [Obsolete("The TextWriter is now provided by the ViewContext object passed to the RenderView method.", true /* error */)]\r
-        public void SetTextWriter(TextWriter textWriter) {\r
-            // this is now a no-op\r
-        }\r
-\r
-        protected virtual void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = viewData;\r
-        }\r
-\r
-        internal class SwitchWriter : TextWriter {\r
-            public SwitchWriter()\r
-                : base(CultureInfo.CurrentCulture) {\r
-            }\r
-\r
-            public override Encoding Encoding {\r
-                get {\r
-                    return InnerWriter.Encoding;\r
-                }\r
-            }\r
-\r
-            public override IFormatProvider FormatProvider {\r
-                get {\r
-                    return InnerWriter.FormatProvider;\r
-                }\r
-            }\r
-\r
-            internal TextWriter InnerWriter {\r
-                get;\r
-                set;\r
-            }\r
-\r
-            public override string NewLine {\r
-                get {\r
-                    return InnerWriter.NewLine;\r
-                }\r
-                set {\r
-                    InnerWriter.NewLine = value;\r
-                }\r
-            }\r
-\r
-            public override void Close() {\r
-                InnerWriter.Close();\r
-            }\r
-\r
-            public override void Flush() {\r
-                InnerWriter.Flush();\r
-            }\r
-\r
-            public IDisposable Scope(TextWriter writer) {\r
-                WriterScope scope = new WriterScope(this, InnerWriter);\r
-\r
-                if (writer != this) {\r
-                    InnerWriter = writer;\r
-                }\r
-\r
-                return scope;\r
-            }\r
-\r
-            public override void Write(bool value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(char value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(char[] buffer) {\r
-                InnerWriter.Write(buffer);\r
-            }\r
-\r
-            public override void Write(char[] buffer, int index, int count) {\r
-                InnerWriter.Write(buffer, index, count);\r
-            }\r
-\r
-            public override void Write(decimal value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(double value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(float value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(int value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(long value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(object value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(string format, object arg0) {\r
-                InnerWriter.Write(format, arg0);\r
-            }\r
-\r
-            public override void Write(string format, object arg0, object arg1) {\r
-                InnerWriter.Write(format, arg0, arg1);\r
-            }\r
-\r
-            public override void Write(string format, object arg0, object arg1, object arg2) {\r
-                InnerWriter.Write(format, arg0, arg1, arg2);\r
-            }\r
-\r
-            public override void Write(string format, params object[] arg) {\r
-                InnerWriter.Write(format, arg);\r
-            }\r
-\r
-            public override void Write(string value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(uint value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void Write(ulong value) {\r
-                InnerWriter.Write(value);\r
-            }\r
-\r
-            public override void WriteLine() {\r
-                InnerWriter.WriteLine();\r
-            }\r
-\r
-            public override void WriteLine(bool value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(char value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(char[] buffer) {\r
-                InnerWriter.WriteLine(buffer);\r
-            }\r
-\r
-            public override void WriteLine(char[] buffer, int index, int count) {\r
-                InnerWriter.WriteLine(buffer, index, count);\r
-            }\r
-\r
-            public override void WriteLine(decimal value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(double value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(float value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(int value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(long value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(object value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(string format, object arg0) {\r
-                InnerWriter.WriteLine(format, arg0);\r
-            }\r
-\r
-            public override void WriteLine(string format, object arg0, object arg1) {\r
-                InnerWriter.WriteLine(format, arg0, arg1);\r
-            }\r
-\r
-            public override void WriteLine(string format, object arg0, object arg1, object arg2) {\r
-                InnerWriter.WriteLine(format, arg0, arg1, arg2);\r
-            }\r
-\r
-            public override void WriteLine(string format, params object[] arg) {\r
-                InnerWriter.WriteLine(format, arg);\r
-            }\r
-\r
-            public override void WriteLine(string value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(uint value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            public override void WriteLine(ulong value) {\r
-                InnerWriter.WriteLine(value);\r
-            }\r
-\r
-            private sealed class WriterScope : IDisposable {\r
-                private SwitchWriter _switchWriter;\r
-                private TextWriter _writerToRestore;\r
-\r
-                public WriterScope(SwitchWriter switchWriter, TextWriter writerToRestore) {\r
-                    _switchWriter = switchWriter;\r
-                    _writerToRestore = writerToRestore;\r
-                }\r
-\r
-                public void Dispose() {\r
-                    _switchWriter.InnerWriter = _writerToRestore;\r
-                }\r
-            }\r
-\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPageControlBuilder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPageControlBuilder.cs
deleted file mode 100644 (file)
index cf494c2..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.CodeDom;\r
-    using System.Web.UI;\r
-\r
-    internal sealed class ViewPageControlBuilder : FileLevelPageControlBuilder {\r
-        public string PageBaseType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ProcessGeneratedCode(\r
-            CodeCompileUnit codeCompileUnit,\r
-            CodeTypeDeclaration baseType,\r
-            CodeTypeDeclaration derivedType,\r
-            CodeMemberMethod buildMethod,\r
-            CodeMemberMethod dataBindingMethod) {\r
-\r
-            // If we find got a base class string, use it\r
-            if (PageBaseType != null) {\r
-                derivedType.BaseTypes[0] = new CodeTypeReference(PageBaseType);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPage`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewPage`1.cs
deleted file mode 100644 (file)
index 3f55539..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ViewPage<TModel> : ViewPage {\r
-\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public new AjaxHelper<TModel> Ajax {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public new HtmlHelper<TModel> Html {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    SetViewData(new ViewDataDictionary<TModel>());\r
-                }\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        public override void InitHelpers() {\r
-            base.InitHelpers();\r
-\r
-            Ajax = new AjaxHelper<TModel>(ViewContext, this);\r
-            Html = new HtmlHelper<TModel>(ViewContext, this);\r
-        }\r
-\r
-        protected override void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = new ViewDataDictionary<TModel>(viewData);\r
-\r
-            base.SetViewData(_viewData);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewResult.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewResult.cs
deleted file mode 100644 (file)
index 49b8a85..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.Text;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class ViewResult : ViewResultBase {\r
-        private string _masterName;\r
-\r
-        public string MasterName {\r
-            get {\r
-                return _masterName ?? String.Empty;\r
-            }\r
-            set {\r
-                _masterName = value;\r
-            }\r
-        }\r
-\r
-        protected override ViewEngineResult FindView(ControllerContext context) {\r
-            ViewEngineResult result = ViewEngineCollection.FindView(context, ViewName, MasterName);\r
-            if (result.View != null) {\r
-                return result;\r
-            }\r
-\r
-            // we need to generate an exception containing all the locations we searched\r
-            StringBuilder locationsText = new StringBuilder();\r
-            foreach (string location in result.SearchedLocations) {\r
-                locationsText.AppendLine();\r
-                locationsText.Append(location);\r
-            }\r
-            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                MvcResources.Common_ViewNotFound, ViewName, locationsText));\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewResultBase.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewResultBase.cs
deleted file mode 100644 (file)
index c4fc2cc..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.IO;\r
-\r
-    public abstract class ViewResultBase : ActionResult {\r
-        private TempDataDictionary _tempData;\r
-        private ViewDataDictionary _viewData;\r
-        private ViewEngineCollection _viewEngineCollection;\r
-        private string _viewName;\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This entire type is meant to be mutable.")]\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                if (_tempData == null) {\r
-                    _tempData = new TempDataDictionary();\r
-                }\r
-                return _tempData;\r
-            }\r
-            set {\r
-                _tempData = value;\r
-            }\r
-        }\r
-\r
-        public IView View {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This entire type is meant to be mutable.")]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                if (_viewData == null) {\r
-                    _viewData = new ViewDataDictionary();\r
-                }\r
-                return _viewData;\r
-            }\r
-            set {\r
-                _viewData = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This entire type is meant to be mutable.")]\r
-        public ViewEngineCollection ViewEngineCollection {\r
-            get {\r
-                return _viewEngineCollection ?? ViewEngines.Engines;\r
-            }\r
-            set {\r
-                _viewEngineCollection = value;\r
-            }\r
-        }\r
-\r
-        public string ViewName {\r
-            get {\r
-                return _viewName ?? String.Empty;\r
-            }\r
-            set {\r
-                _viewName = value;\r
-            }\r
-        }\r
-\r
-        public override void ExecuteResult(ControllerContext context) {\r
-            if (context == null) {\r
-                throw new ArgumentNullException("context");\r
-            }\r
-            if (String.IsNullOrEmpty(ViewName)) {\r
-                ViewName = context.RouteData.GetRequiredString("action");\r
-            }\r
-\r
-            ViewEngineResult result = null;\r
-\r
-            if (View == null) {\r
-                result = FindView(context);\r
-                View = result.View;\r
-            }\r
-\r
-            TextWriter writer = context.HttpContext.Response.Output;\r
-            ViewContext viewContext = new ViewContext(context, View, ViewData, TempData, writer);\r
-            View.Render(viewContext, writer);\r
-\r
-            if (result != null) {\r
-                result.ViewEngine.ReleaseView(context, View);\r
-            }\r
-        }\r
-\r
-        protected abstract ViewEngineResult FindView(ControllerContext context);\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTemplateUserControl.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTemplateUserControl.cs
deleted file mode 100644 (file)
index 3ccc4fb..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public class ViewTemplateUserControl : ViewTemplateUserControl<object> { }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTemplateUserControl`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTemplateUserControl`1.cs
deleted file mode 100644 (file)
index f2ae5db..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    public class ViewTemplateUserControl<TModel> : ViewUserControl<TModel> {\r
-        protected string FormattedModelValue {\r
-            get { return ViewData.TemplateInfo.FormattedModelValue.ToString(); }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewType.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewType.cs
deleted file mode 100644 (file)
index 39afcc9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.ComponentModel;\r
-    using System.Web.UI;\r
-\r
-    [ControlBuilder(typeof(ViewTypeControlBuilder))]\r
-    [NonVisualControl]\r
-    public class ViewType : Control {\r
-        private string _typeName;\r
-\r
-        [DefaultValue("")]\r
-        public string TypeName {\r
-            get {\r
-                return _typeName ?? String.Empty;\r
-            }\r
-            set {\r
-                _typeName = value;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTypeControlBuilder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTypeControlBuilder.cs
deleted file mode 100644 (file)
index 0a30653..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.CodeDom;\r
-    using System.Collections;\r
-    using System.Web.UI;\r
-\r
-    internal sealed class ViewTypeControlBuilder : ControlBuilder {\r
-        private string _typeName;\r
-\r
-        public override void Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, string tagName, string id, IDictionary attribs) {\r
-            base.Init(parser, parentBuilder, type, tagName, id, attribs);\r
-\r
-            _typeName = (string)attribs["typename"];\r
-        }\r
-\r
-        public override void ProcessGeneratedCode(\r
-            CodeCompileUnit codeCompileUnit,\r
-            CodeTypeDeclaration baseType,\r
-            CodeTypeDeclaration derivedType,\r
-            CodeMemberMethod buildMethod,\r
-            CodeMemberMethod dataBindingMethod) {\r
-\r
-            // Override the view's base type with the explicit base type\r
-            derivedType.BaseTypes[0] = new CodeTypeReference(_typeName);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTypeParserFilter.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewTypeParserFilter.cs
deleted file mode 100644 (file)
index 4fb159a..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections;\r
-    using System.Web.UI;\r
-\r
-    internal class ViewTypeParserFilter : PageParserFilter {\r
-\r
-        private string _viewBaseType;\r
-        private DirectiveType _directiveType = DirectiveType.Unknown;\r
-        private bool _viewTypeControlAdded;\r
-\r
-        public override void PreprocessDirective(string directiveName, IDictionary attributes) {\r
-            base.PreprocessDirective(directiveName, attributes);\r
-\r
-            string defaultBaseType = null;\r
-\r
-            // If we recognize the directive, keep track of what it was. If we don't recognize\r
-            // the directive then just stop.\r
-            switch (directiveName) {\r
-                case "page":\r
-                    _directiveType = DirectiveType.Page;\r
-                    defaultBaseType = typeof(ViewPage).FullName;\r
-                    break;\r
-                case "control":\r
-                    _directiveType = DirectiveType.UserControl;\r
-                    defaultBaseType = typeof(ViewUserControl).FullName;\r
-                    break;\r
-                case "master":\r
-                    _directiveType = DirectiveType.Master;\r
-                    defaultBaseType = typeof(ViewMasterPage).FullName;\r
-                    break;\r
-            }\r
-\r
-            if (_directiveType == DirectiveType.Unknown) {\r
-                // If we're processing an unknown directive (e.g. a register directive), stop processing\r
-                return;\r
-            }\r
-\r
-            // Look for an inherit attribute\r
-            string inherits = (string)attributes["inherits"];\r
-            if (!String.IsNullOrEmpty(inherits)) {\r
-                // If it doesn't look like a generic type, don't do anything special,\r
-                // and let the parser do its normal processing\r
-                if (IsGenericTypeString(inherits)) {\r
-                    // Remove the inherits attribute so the parser doesn't blow up\r
-                    attributes["inherits"] = defaultBaseType;\r
-\r
-                    // Remember the full type string so we can later give it to the ControlBuilder\r
-                    _viewBaseType = inherits;\r
-                }\r
-            }\r
-        }\r
-\r
-        private static bool IsGenericTypeString(string typeName) {\r
-            // Detect C# and VB generic syntax\r
-            // REVIEW: what about other languages?\r
-            return typeName.IndexOfAny(new char[] { '<', '(' }) >= 0;\r
-        }\r
-\r
-        public override void ParseComplete(ControlBuilder rootBuilder) {\r
-            base.ParseComplete(rootBuilder);\r
-\r
-            // If it's our page ControlBuilder, give it the base type string\r
-            ViewPageControlBuilder pageBuilder = rootBuilder as ViewPageControlBuilder;\r
-            if (pageBuilder != null) {\r
-                pageBuilder.PageBaseType = _viewBaseType;\r
-            }\r
-            ViewUserControlControlBuilder userControlBuilder = rootBuilder as ViewUserControlControlBuilder;\r
-            if (userControlBuilder != null) {\r
-                userControlBuilder.UserControlBaseType = _viewBaseType;\r
-            }\r
-        }\r
-\r
-        public override bool ProcessCodeConstruct(CodeConstructType codeType, string code) {\r
-            if (!_viewTypeControlAdded &&\r
-                _viewBaseType != null &&\r
-                _directiveType == DirectiveType.Master) {\r
-\r
-                // If we're dealing with a master page that needs to have its base type set, do it here.\r
-                // It's done by adding the ViewType control, which has a builder that sets the base type.\r
-\r
-                // The code currently assumes that the file in question contains a code snippet, since\r
-                // that's the item we key off of in order to know when to add the ViewType control.\r
-\r
-                Hashtable attribs = new Hashtable();\r
-                attribs["typename"] = _viewBaseType;\r
-                AddControl(typeof(ViewType), attribs);\r
-                _viewTypeControlAdded = true;\r
-            }\r
-\r
-            return base.ProcessCodeConstruct(codeType, code);\r
-        }\r
-\r
-        // Everything else in this class is unrelated to our 'inherits' handling.\r
-        // Since PageParserFilter blocks everything by default, we need to unblock it\r
-\r
-        public override bool AllowCode {\r
-            get {\r
-                return true;\r
-            }\r
-        }\r
-\r
-        public override bool AllowBaseType(Type baseType) {\r
-            return true;\r
-        }\r
-\r
-        public override bool AllowControl(Type controlType, ControlBuilder builder) {\r
-            return true;\r
-        }\r
-\r
-        public override bool AllowVirtualReference(string referenceVirtualPath, VirtualReferenceType referenceType) {\r
-            return true;\r
-        }\r
-\r
-        public override bool AllowServerSideInclude(string includeVirtualPath) {\r
-            return true;\r
-        }\r
-\r
-        public override int NumberOfControlsAllowed {\r
-            get {\r
-                return -1;\r
-            }\r
-        }\r
-\r
-        public override int NumberOfDirectDependenciesAllowed {\r
-            get {\r
-                return -1;\r
-            }\r
-        }\r
-\r
-        public override int TotalNumberOfDependenciesAllowed {\r
-            get {\r
-                return -1;\r
-            }\r
-        }\r
-\r
-        private enum DirectiveType {\r
-            Unknown,\r
-            Page,\r
-            UserControl,\r
-            Master,\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControl.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControl.cs
deleted file mode 100644 (file)
index d1ec1e1..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.ComponentModel;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Web.Mvc.Resources;\r
-    using System.Web.UI;\r
-\r
-    [FileLevelControlBuilder(typeof(ViewUserControlControlBuilder))]\r
-    public class ViewUserControl : UserControl, IViewDataContainer {\r
-        private AjaxHelper<object> _ajaxHelper;\r
-        private HtmlHelper<object> _htmlHelper;\r
-        private ViewContext _viewContext;\r
-        private ViewDataDictionary _viewData;\r
-        private string _viewDataKey;\r
-\r
-        public AjaxHelper<object> Ajax {\r
-            get {\r
-                if (_ajaxHelper == null) {\r
-                    _ajaxHelper = new AjaxHelper<object>(ViewContext, this);\r
-                }\r
-                return _ajaxHelper;\r
-            }\r
-        }\r
-\r
-        public HtmlHelper<object> Html {\r
-            get {\r
-                if (_htmlHelper == null) {\r
-                    _htmlHelper = new HtmlHelper<object>(ViewContext, this);\r
-                }\r
-                return _htmlHelper;\r
-            }\r
-        }\r
-\r
-        public object Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }\r
-        }\r
-\r
-        public TempDataDictionary TempData {\r
-            get {\r
-                return ViewPage.TempData;\r
-            }\r
-        }\r
-\r
-        public UrlHelper Url {\r
-            get {\r
-                return ViewPage.Url;\r
-            }\r
-        }\r
-\r
-        [Browsable(false)]\r
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]\r
-        public ViewContext ViewContext {\r
-            get {\r
-                return _viewContext ?? ViewPage.ViewContext;\r
-            }\r
-            set {\r
-                _viewContext = value;\r
-            }\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly",\r
-            Justification = "This is the mechanism by which the ViewUserControl gets its ViewDataDictionary object.")]\r
-        [Browsable(false)]\r
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]\r
-        public ViewDataDictionary ViewData {\r
-            get {\r
-                EnsureViewData();\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        [DefaultValue("")]\r
-        public string ViewDataKey {\r
-            get {\r
-                return _viewDataKey ?? String.Empty;\r
-            }\r
-            set {\r
-                _viewDataKey = value;\r
-            }\r
-        }\r
-\r
-        internal ViewPage ViewPage {\r
-            get {\r
-                ViewPage viewPage = Page as ViewPage;\r
-                if (viewPage == null) {\r
-                    throw new InvalidOperationException(MvcResources.ViewUserControl_RequiresViewPage);\r
-                }\r
-                return viewPage;\r
-            }\r
-        }\r
-\r
-        public HtmlTextWriter Writer {\r
-            get {\r
-                return ViewPage.Writer;\r
-            }\r
-        }\r
-\r
-        protected virtual void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = viewData;\r
-        }\r
-\r
-        protected void EnsureViewData() {\r
-            if (_viewData != null) {\r
-                return;\r
-            }\r
-\r
-            // Get the ViewData for this ViewUserControl, optionally using the specified ViewDataKey\r
-            IViewDataContainer vdc = GetViewDataContainer(this);\r
-            if (vdc == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.ViewUserControl_RequiresViewDataProvider,\r
-                        AppRelativeVirtualPath));\r
-            }\r
-\r
-            ViewDataDictionary myViewData = vdc.ViewData;\r
-\r
-            // If we have a ViewDataKey, try to extract the ViewData from the dictionary, otherwise\r
-            // return the container's ViewData.\r
-            if (!String.IsNullOrEmpty(ViewDataKey)) {\r
-                object target = myViewData.Eval(ViewDataKey);\r
-                myViewData = target as ViewDataDictionary ?? new ViewDataDictionary(myViewData) { Model = target };\r
-            }\r
-\r
-            SetViewData(myViewData);\r
-        }\r
-\r
-        private static IViewDataContainer GetViewDataContainer(Control control) {\r
-            // Walk up the control hierarchy until we find someone that implements IViewDataContainer\r
-            while (control != null) {\r
-                control = control.Parent;\r
-                IViewDataContainer vdc = control as IViewDataContainer;\r
-                if (vdc != null) {\r
-                    return vdc;\r
-                }\r
-            }\r
-            return null;\r
-        }\r
-\r
-        public virtual void RenderView(ViewContext viewContext) {\r
-            ViewUserControlContainerPage containerPage = new ViewUserControlContainerPage(this);\r
-\r
-            RenderViewAndRestoreContentType(containerPage, viewContext);\r
-        }\r
-\r
-        internal static void RenderViewAndRestoreContentType(ViewPage containerPage, ViewContext viewContext) {\r
-            // We need to restore the Content-Type since Page.SetIntrinsics() will reset it. It's not possible\r
-            // to work around the call to SetIntrinsics() since the control's render method requires the\r
-            // containing page's Response property to be non-null, and SetIntrinsics() is the only way to set\r
-            // this.\r
-            string savedContentType = viewContext.HttpContext.Response.ContentType;\r
-            containerPage.RenderView(viewContext);\r
-            viewContext.HttpContext.Response.ContentType = savedContentType;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "textWriter",\r
-            Justification = "This method existed in MVC 1.0 and has been deprecated.")]\r
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic",\r
-            Justification = "This method existed in MVC 1.0 and has been deprecated.")]\r
-        [Obsolete("The TextWriter is now provided by the ViewContext object passed to the RenderView method.", true /* error */)]\r
-        public void SetTextWriter(TextWriter textWriter) {\r
-            // this is now a no-op\r
-        }\r
-\r
-        private sealed class ViewUserControlContainerPage : ViewPage {\r
-            private readonly ViewUserControl _userControl;\r
-\r
-            public ViewUserControlContainerPage(ViewUserControl userControl) {\r
-                _userControl = userControl;\r
-            }\r
-\r
-            public override void ProcessRequest(HttpContext context) {\r
-                _userControl.ID = ViewPage.NextId();\r
-                Controls.Add(_userControl);\r
-\r
-                base.ProcessRequest(context);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControlControlBuilder.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControlControlBuilder.cs
deleted file mode 100644 (file)
index 8bd473a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.CodeDom;\r
-    using System.Web.UI;\r
-\r
-    internal sealed class ViewUserControlControlBuilder : FileLevelUserControlBuilder {\r
-        internal string UserControlBaseType {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public override void ProcessGeneratedCode(\r
-            CodeCompileUnit codeCompileUnit,\r
-            CodeTypeDeclaration baseType,\r
-            CodeTypeDeclaration derivedType,\r
-            CodeMemberMethod buildMethod,\r
-            CodeMemberMethod dataBindingMethod) {\r
-\r
-            // If we find got a base class string, use it\r
-            if (UserControlBaseType != null) {\r
-                derivedType.BaseTypes[0] = new CodeTypeReference(UserControlBaseType);\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControl`1.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/ViewUserControl`1.cs
deleted file mode 100644 (file)
index 1a36f68..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-\r
-    public class ViewUserControl<TModel> : ViewUserControl {\r
-        private AjaxHelper<TModel> _ajaxHelper;\r
-        private HtmlHelper<TModel> _htmlHelper;\r
-        private ViewDataDictionary<TModel> _viewData;\r
-\r
-        public new AjaxHelper<TModel> Ajax {\r
-            get {\r
-                if (_ajaxHelper == null) {\r
-                    _ajaxHelper = new AjaxHelper<TModel>(ViewContext, this);\r
-                }\r
-                return _ajaxHelper;\r
-            }\r
-        }\r
-\r
-        public new HtmlHelper<TModel> Html {\r
-            get {\r
-                if (_htmlHelper == null) {\r
-                    _htmlHelper = new HtmlHelper<TModel>(ViewContext, this);\r
-                }\r
-                return _htmlHelper;\r
-            }\r
-        }\r
-\r
-        public new TModel Model {\r
-            get {\r
-                return ViewData.Model;\r
-            }            \r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]\r
-        public new ViewDataDictionary<TModel> ViewData {\r
-            get {\r
-                EnsureViewData();\r
-                return _viewData;\r
-            }\r
-            set {\r
-                SetViewData(value);\r
-            }\r
-        }\r
-\r
-        protected override void SetViewData(ViewDataDictionary viewData) {\r
-            _viewData = new ViewDataDictionary<TModel>(viewData);\r
-\r
-            base.SetViewData(_viewData);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/VirtualPathProviderViewEngine.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/VirtualPathProviderViewEngine.cs
deleted file mode 100644 (file)
index 5dd74ba..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Globalization;\r
-    using System.Linq;\r
-    using System.Web;\r
-    using System.Web.Hosting;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public abstract class VirtualPathProviderViewEngine : IViewEngine {\r
-        // format is ":ViewCacheEntry:{cacheType}:{prefix}:{name}:{controllerName}:{areaName}:"\r
-        private const string _cacheKeyFormat = ":ViewCacheEntry:{0}:{1}:{2}:{3}:{4}:";\r
-        private const string _cacheKeyPrefix_Master = "Master";\r
-        private const string _cacheKeyPrefix_Partial = "Partial";\r
-        private const string _cacheKeyPrefix_View = "View";\r
-        private static readonly string[] _emptyLocations = new string[0];\r
-\r
-        private VirtualPathProvider _vpp;\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] AreaMasterLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] AreaPartialViewLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] AreaViewLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] MasterLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] PartialViewLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        public IViewLocationCache ViewLocationCache {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]\r
-        public string[] ViewLocationFormats {\r
-            get;\r
-            set;\r
-        }\r
-\r
-        protected VirtualPathProvider VirtualPathProvider {\r
-            get {\r
-                if (_vpp == null) {\r
-                    _vpp = HostingEnvironment.VirtualPathProvider;\r
-                }\r
-                return _vpp;\r
-            }\r
-            set {\r
-                _vpp = value;\r
-            }\r
-        }\r
-\r
-        protected VirtualPathProviderViewEngine() {\r
-            if (HttpContext.Current == null || HttpContext.Current.IsDebuggingEnabled) {\r
-                ViewLocationCache = DefaultViewLocationCache.Null;\r
-            }\r
-            else {\r
-                ViewLocationCache = new DefaultViewLocationCache();\r
-            }\r
-        }\r
-\r
-        private string CreateCacheKey(string prefix, string name, string controllerName, string areaName) {\r
-            return String.Format(CultureInfo.InvariantCulture, _cacheKeyFormat,\r
-                GetType().AssemblyQualifiedName, prefix, name, controllerName, areaName);\r
-        }\r
-\r
-        protected abstract IView CreatePartialView(ControllerContext controllerContext, string partialPath);\r
-\r
-        protected abstract IView CreateView(ControllerContext controllerContext, string viewPath, string masterPath);\r
-\r
-        protected virtual bool FileExists(ControllerContext controllerContext, string virtualPath) {\r
-            return VirtualPathProvider.FileExists(virtualPath);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(partialViewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "partialViewName");\r
-            }\r
-\r
-            string[] searched;\r
-            string controllerName = controllerContext.RouteData.GetRequiredString("controller");\r
-            string partialPath = GetPath(controllerContext, PartialViewLocationFormats, AreaPartialViewLocationFormats, "PartialViewLocationFormats", partialViewName, controllerName, _cacheKeyPrefix_Partial, useCache, out searched);\r
-\r
-            if (String.IsNullOrEmpty(partialPath)) {\r
-                return new ViewEngineResult(searched);\r
-            }\r
-\r
-            return new ViewEngineResult(CreatePartialView(controllerContext, partialPath), this);\r
-        }\r
-\r
-        public virtual ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache) {\r
-            if (controllerContext == null) {\r
-                throw new ArgumentNullException("controllerContext");\r
-            }\r
-            if (String.IsNullOrEmpty(viewName)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "viewName");\r
-            }\r
-\r
-            string[] viewLocationsSearched;\r
-            string[] masterLocationsSearched;\r
-\r
-            string controllerName = controllerContext.RouteData.GetRequiredString("controller");\r
-            string viewPath = GetPath(controllerContext, ViewLocationFormats, AreaViewLocationFormats, "ViewLocationFormats", viewName, controllerName, _cacheKeyPrefix_View, useCache, out viewLocationsSearched);\r
-            string masterPath = GetPath(controllerContext, MasterLocationFormats, AreaMasterLocationFormats, "MasterLocationFormats", masterName, controllerName, _cacheKeyPrefix_Master, useCache, out masterLocationsSearched);\r
-\r
-            if (String.IsNullOrEmpty(viewPath) || (String.IsNullOrEmpty(masterPath) && !String.IsNullOrEmpty(masterName))) {\r
-                return new ViewEngineResult(viewLocationsSearched.Union(masterLocationsSearched));\r
-            }\r
-\r
-            return new ViewEngineResult(CreateView(controllerContext, viewPath, masterPath), this);\r
-        }\r
-\r
-        private string GetPath(ControllerContext controllerContext, string[] locations, string[] areaLocations, string locationsPropertyName, string name, string controllerName, string cacheKeyPrefix, bool useCache, out string[] searchedLocations) {\r
-            searchedLocations = _emptyLocations;\r
-\r
-            if (String.IsNullOrEmpty(name)) {\r
-                return String.Empty;\r
-            }\r
-\r
-            string areaName = AreaHelpers.GetAreaName(controllerContext.RouteData);\r
-            bool usingAreas = !String.IsNullOrEmpty(areaName);\r
-            List<ViewLocation> viewLocations = GetViewLocations(locations, (usingAreas) ? areaLocations : null);\r
-\r
-            if (viewLocations.Count == 0) {\r
-                throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture,\r
-                    MvcResources.Common_PropertyCannotBeNullOrEmpty, locationsPropertyName));\r
-            }\r
-\r
-            bool nameRepresentsPath = IsSpecificPath(name);\r
-            string cacheKey = CreateCacheKey(cacheKeyPrefix, name, (nameRepresentsPath) ? String.Empty : controllerName, areaName);\r
-\r
-            if (useCache) {\r
-                return ViewLocationCache.GetViewLocation(controllerContext.HttpContext, cacheKey);\r
-            }\r
-\r
-            return (nameRepresentsPath) ?\r
-                GetPathFromSpecificName(controllerContext, name, cacheKey, ref searchedLocations) :\r
-                GetPathFromGeneralName(controllerContext, viewLocations, name, controllerName, areaName, cacheKey, ref searchedLocations);\r
-        }\r
-\r
-        private string GetPathFromGeneralName(ControllerContext controllerContext, List<ViewLocation> locations, string name, string controllerName, string areaName, string cacheKey, ref string[] searchedLocations) {\r
-            string result = String.Empty;\r
-            searchedLocations = new string[locations.Count];\r
-\r
-            for (int i = 0; i < locations.Count; i++) {\r
-                ViewLocation location = locations[i];\r
-                string virtualPath = location.Format(name, controllerName, areaName);\r
-\r
-                if (FileExists(controllerContext, virtualPath)) {\r
-                    searchedLocations = _emptyLocations;\r
-                    result = virtualPath;\r
-                    ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, cacheKey, result);\r
-                    break;\r
-                }\r
-\r
-                searchedLocations[i] = virtualPath;\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-        private string GetPathFromSpecificName(ControllerContext controllerContext, string name, string cacheKey, ref string[] searchedLocations) {\r
-            string result = name;\r
-\r
-            if (!FileExists(controllerContext, name)) {\r
-                result = String.Empty;\r
-                searchedLocations = new[] { name };\r
-            }\r
-\r
-            ViewLocationCache.InsertViewLocation(controllerContext.HttpContext, cacheKey, result);\r
-            return result;\r
-        }\r
-\r
-        private static List<ViewLocation> GetViewLocations(string[] viewLocationFormats, string[] areaViewLocationFormats) {\r
-            List<ViewLocation> allLocations = new List<ViewLocation>();\r
-\r
-            if (areaViewLocationFormats != null) {\r
-                foreach (string areaViewLocationFormat in areaViewLocationFormats) {\r
-                    allLocations.Add(new AreaAwareViewLocation(areaViewLocationFormat));\r
-                }\r
-            }\r
-\r
-            if (viewLocationFormats != null) {\r
-                foreach (string viewLocationFormat in viewLocationFormats) {\r
-                    allLocations.Add(new ViewLocation(viewLocationFormat));\r
-                }\r
-            }\r
-\r
-            return allLocations;\r
-        }\r
-\r
-        private static bool IsSpecificPath(string name) {\r
-            char c = name[0];\r
-            return (c == '~' || c == '/');\r
-        }\r
-\r
-        public virtual void ReleaseView(ControllerContext controllerContext, IView view) {\r
-            IDisposable disposable = view as IDisposable;\r
-            if (disposable != null) {\r
-                disposable.Dispose();\r
-            }\r
-        }\r
-\r
-        private class ViewLocation {\r
-\r
-            protected string _virtualPathFormatString;\r
-\r
-            public ViewLocation(string virtualPathFormatString) {\r
-                _virtualPathFormatString = virtualPathFormatString;\r
-            }\r
-\r
-            public virtual string Format(string viewName, string controllerName, string areaName) {\r
-                return String.Format(CultureInfo.InvariantCulture, _virtualPathFormatString, viewName, controllerName);\r
-            }\r
-\r
-        }\r
-\r
-        private class AreaAwareViewLocation : ViewLocation {\r
-\r
-            public AreaAwareViewLocation(string virtualPathFormatString)\r
-                : base(virtualPathFormatString) {\r
-            }\r
-\r
-            public override string Format(string viewName, string controllerName, string areaName) {\r
-                return String.Format(CultureInfo.InvariantCulture, _virtualPathFormatString, viewName, controllerName, areaName);\r
-            }\r
-\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/WebFormView.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/WebFormView.cs
deleted file mode 100644 (file)
index 7167d8c..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System;\r
-    using System.Globalization;\r
-    using System.IO;\r
-    using System.Web.Mvc.Resources;\r
-\r
-    public class WebFormView : IView {\r
-\r
-        private IBuildManager _buildManager;\r
-\r
-        public WebFormView(string viewPath)\r
-            : this(viewPath, null) {\r
-        }\r
-\r
-        public WebFormView(string viewPath, string masterPath) {\r
-            if (String.IsNullOrEmpty(viewPath)) {\r
-                throw new ArgumentException(MvcResources.Common_NullOrEmpty, "viewPath");\r
-            }\r
-\r
-            ViewPath = viewPath;\r
-            MasterPath = masterPath ?? String.Empty;\r
-        }\r
-\r
-        internal IBuildManager BuildManager {\r
-            get {\r
-                if (_buildManager == null) {\r
-                    _buildManager = new BuildManagerWrapper();\r
-                }\r
-                return _buildManager;\r
-            }\r
-            set {\r
-                _buildManager = value;\r
-            }\r
-        }\r
-\r
-        public string MasterPath {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public string ViewPath {\r
-            get;\r
-            private set;\r
-        }\r
-\r
-        public virtual void Render(ViewContext viewContext, TextWriter writer) {\r
-            if (viewContext == null) {\r
-                throw new ArgumentNullException("viewContext");\r
-            }\r
-\r
-            object viewInstance = BuildManager.CreateInstanceFromVirtualPath(ViewPath, typeof(object));\r
-            if (viewInstance == null) {\r
-                throw new InvalidOperationException(\r
-                    String.Format(\r
-                        CultureInfo.CurrentUICulture,\r
-                        MvcResources.WebFormViewEngine_ViewCouldNotBeCreated,\r
-                        ViewPath));\r
-            }\r
-\r
-            ViewPage viewPage = viewInstance as ViewPage;\r
-            if (viewPage != null) {\r
-                RenderViewPage(viewContext, viewPage);\r
-                return;\r
-            }\r
-\r
-            ViewUserControl viewUserControl = viewInstance as ViewUserControl;\r
-            if (viewUserControl != null) {\r
-                RenderViewUserControl(viewContext, viewUserControl);\r
-                return;\r
-            }\r
-\r
-            throw new InvalidOperationException(\r
-                String.Format(\r
-                    CultureInfo.CurrentUICulture,\r
-                    MvcResources.WebFormViewEngine_WrongViewBase,\r
-                    ViewPath));\r
-        }\r
-\r
-        private void RenderViewPage(ViewContext context, ViewPage page) {\r
-            if (!String.IsNullOrEmpty(MasterPath)) {\r
-                page.MasterLocation = MasterPath;\r
-            }\r
-\r
-            page.ViewData = context.ViewData;\r
-            page.RenderView(context);\r
-        }\r
-\r
-        private void RenderViewUserControl(ViewContext context, ViewUserControl control) {\r
-            if (!String.IsNullOrEmpty(MasterPath)) {\r
-                throw new InvalidOperationException(MvcResources.WebFormViewEngine_UserControlCannotHaveMaster);\r
-            }\r
-\r
-            control.ViewData = context.ViewData;\r
-            control.RenderView(context);\r
-        }\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/WebFormViewEngine.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/WebFormViewEngine.cs
deleted file mode 100644 (file)
index 9f2d080..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ****************************************************************************\r
- *\r
- * Copyright (c) Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is subject to the Microsoft Public License (Ms-PL). \r
- * A copy of the license can be found in the license.htm file included \r
- * in this distribution.\r
- *\r
- * You must not remove this notice, or any other, from this software.\r
- *\r
- * ***************************************************************************/\r
-\r
-namespace System.Web.Mvc {\r
-    using System.Diagnostics.CodeAnalysis;\r
-    using System.Net;\r
-    using System.Web;\r
-\r
-    public class WebFormViewEngine : VirtualPathProviderViewEngine {\r
-\r
-        private IBuildManager _buildManager;\r
-\r
-        public WebFormViewEngine() {\r
-            MasterLocationFormats = new[] {\r
-                "~/Views/{1}/{0}.master",\r
-                "~/Views/Shared/{0}.master"\r
-            };\r
-\r
-            AreaMasterLocationFormats = new[] {\r
-                "~/Areas/{2}/Views/{1}/{0}.master",\r
-                "~/Areas/{2}/Views/Shared/{0}.master",\r
-            };\r
-\r
-            ViewLocationFormats = new[] {\r
-                "~/Views/{1}/{0}.aspx",\r
-                "~/Views/{1}/{0}.ascx",\r
-                "~/Views/Shared/{0}.aspx",\r
-                "~/Views/Shared/{0}.ascx"\r
-            };\r
-\r
-            AreaViewLocationFormats = new[] {\r
-                "~/Areas/{2}/Views/{1}/{0}.aspx",\r
-                "~/Areas/{2}/Views/{1}/{0}.ascx",\r
-                "~/Areas/{2}/Views/Shared/{0}.aspx",\r
-                "~/Areas/{2}/Views/Shared/{0}.ascx",\r
-            };\r
-\r
-            PartialViewLocationFormats = ViewLocationFormats;\r
-            AreaPartialViewLocationFormats = AreaViewLocationFormats;\r
-        }\r
-\r
-        internal IBuildManager BuildManager {\r
-            get {\r
-                if (_buildManager == null) {\r
-                    _buildManager = new BuildManagerWrapper();\r
-                }\r
-                return _buildManager;\r
-            }\r
-            set {\r
-                _buildManager = value;\r
-            }\r
-        }\r
-\r
-        protected override IView CreatePartialView(ControllerContext controllerContext, string partialPath) {\r
-            return new WebFormView(partialPath, null);\r
-        }\r
-\r
-        protected override IView CreateView(ControllerContext controllerContext, string viewPath, string masterPath) {\r
-            return new WebFormView(viewPath, masterPath);\r
-        }\r
-\r
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",\r
-            Justification = "Exceptions are interpreted as indicating that the file does not exist.")]\r
-        protected override bool FileExists(ControllerContext controllerContext, string virtualPath) {\r
-            try {\r
-                object viewInstance = BuildManager.CreateInstanceFromVirtualPath(virtualPath, typeof(object));\r
-                return viewInstance != null;\r
-            }\r
-            catch (HttpException he) {\r
-                if (he is HttpParseException) {\r
-                    // The build manager found something, but instantiation failed due to a runtime lookup failure\r
-                    throw;\r
-                }\r
-\r
-                if (he.GetHttpCode() == (int)HttpStatusCode.NotFound) {\r
-                    // If BuildManager returns a 404 (Not Found) that means that a file did not exist.\r
-                    // If the view itself doesn't exist, then this method should report that rather than throw an exception.\r
-                    if (!base.FileExists(controllerContext, virtualPath)) {\r
-                        return false;\r
-                    }\r
-                }\r
-\r
-                // All other error codes imply other errors such as compilation or parsing errors\r
-                throw;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_2_0.csproj b/mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_2_0.csproj
deleted file mode 100644 (file)
index 290c752..0000000
+++ /dev/null
@@ -1,402 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E554A1B9-E387-4BEA-BF28-32455D018D07}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Mvc</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="GlobalSuppressions.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\AcceptVerbsAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionFilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcher.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcherCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxOptions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\InsertionMode.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxRequestExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryData.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryDataSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaRegistration.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaRegistrationContext.cs" />\r
-    <Compile Include="System.Web.Mvc\AssociatedMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\AssociatedValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ActionDescriptorCreator.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncActionMethodSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncControllerActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncManager.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncResultWrapper.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncVoid.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\BeginInvokeDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\EndInvokeDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\EndInvokeDelegate`1.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncController.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncManagerContainer.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\OperationCounter.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ReflectedAsyncActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SingleEntryGate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SynchronizationContextUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SynchronousOperationException.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\Trigger.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\TriggerListener.cs" />\r
-    <Compile Include="System.Web.Mvc\AsyncController.cs" />\r
-    <Compile Include="System.Web.Mvc\AsyncTimeoutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizationContext.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizeAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BindAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BuildManagerWrapper.cs" />\r
-    <Compile Include="System.Web.Mvc\ByteArrayModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\ChildActionOnlyAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ClientDataTypeModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Controller.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptorCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerTypeCache.cs" />\r
-    <Compile Include="System.Web.Mvc\CustomModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidator.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidator`1.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DataErrorInfoModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\DescriptorUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\DictionaryHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\DictionaryValueProvider`1.cs" />\r
-    <Compile Include="System.Web.Mvc\DynamicTypeGenerator.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Error.cs" />\r
-    <Compile Include="System.Web.Mvc\ExceptionContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\CompiledExpressionDelegate`2.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ExpressionParser.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\FastTrack`2.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\HashCodeCombiner.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ParserContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\FieldValidationMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\FileContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilePathResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileStreamResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\FormCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\FormContext.cs" />\r
-    <Compile Include="System.Web.Mvc\FormMethod.cs" />\r
-    <Compile Include="System.Web.Mvc\FormValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\FormValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\HiddenInputAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\ChildActionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DefaultDisplayTemplates.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DefaultEditorTemplates.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DisplayExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DisplayTextExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\EditorExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\FormExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\InputExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\LabelExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\LinkExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\MvcForm.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\PartialExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\RenderPartialExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\SelectExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\TemplateHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\TextAreaExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\ValidationExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpAntiForgeryException.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpDeleteAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpFileCollectionValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpFileCollectionValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpGetAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpHandlerUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPostAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPostedFileBaseModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpRequestExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpUnauthorizedResult.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpVerbs.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\IAuthorizationFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IBuildManager.cs" />\r
-    <Compile Include="System.Web.Mvc\IController.cs" />\r
-    <Compile Include="System.Web.Mvc\IControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\IExceptionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\InputType.cs" />\r
-    <Compile Include="System.Web.Mvc\IResultFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IRouteWithArea.cs" />\r
-    <Compile Include="System.Web.Mvc\ITempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\IValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\IView.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewDataContainer.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\JavaScriptResult.cs" />\r
-    <Compile Include="System.Web.Mvc\JsonRequestBehavior.cs" />\r
-    <Compile Include="System.Web.Mvc\JsonResult.cs" />\r
-    <Compile Include="System.Web.Mvc\LinqBinaryModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinders.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBindingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRangeRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRegexRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRequiredRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationStringLengthRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelError.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelErrorCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadataProviders.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelState.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelStateDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidationResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidator.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProviderCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProviders.cs" />\r
-    <Compile Include="System.Web.Mvc\MultiSelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHtmlString.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHttpHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcRouteHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\NameValueCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\NameValueCollectionValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\NoAsyncTimeoutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\NonActionAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\NullViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\OutputCacheAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterInfoUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\PartialViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\PathHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\QueryStringValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\QueryStringValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\RangeAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\ReaderWriterCache`2.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectResult.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectToRouteResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\RegularExpressionAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\RequiredAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\RequireHttpsAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\Resources\MvcResources.Designer.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteDataValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteDataValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteValuesHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectListItem.cs" />\r
-    <Compile Include="System.Web.Mvc\SessionStateTempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\StringLengthAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\TagBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\TagRenderMode.cs" />\r
-    <Compile Include="System.Web.Mvc\TempDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\TemplateInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\TryGetValueDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeCacheSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeCacheUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeDescriptorHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\UrlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\UrlParameter.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateAntiForgeryTokenAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateInputAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactories.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactoryCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngines.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResultBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTemplateUserControl.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTemplateUserControl`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewType.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeParserFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\VirtualPathProviderViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormView.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormViewEngine.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_2_0.csproj">\r
-      <Project>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_2_0.csproj">\r
-      <Project>{A9B310AD-FF67-49ED-8AC8-AAF1E4B05249}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_2_0.csproj">\r
-      <Project>{42527CAE-C932-4518-9CF7-F4ABB44510A5}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0.csproj">\r
-      <Project>{F3112064-6311-48A9-992B-A68DD3C62133}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_2_0.csproj">\r
-      <Project>{286ED1A3-6AE6-4147-A43B-B3421681CC84}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Mvc/Resources/MvcResources.resources">\r
-      <LogicalName>System.Web.Mvc.Resources.MvcResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_4_0.csproj b/mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_4_0.csproj
deleted file mode 100644 (file)
index a7f6be3..0000000
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{31A5939F-BCDC-4613-BCEA-C46990B5DDC0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>dummy-System.Web.Mvc</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="GlobalSuppressions.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\AcceptVerbsAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionFilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcher.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcherCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxOptions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\InsertionMode.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxRequestExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryData.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryDataSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaRegistration.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaRegistrationContext.cs" />\r
-    <Compile Include="System.Web.Mvc\AssociatedMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\AssociatedValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ActionDescriptorCreator.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncActionMethodSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncControllerActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncManager.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncResultWrapper.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncVoid.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\BeginInvokeDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\EndInvokeDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\EndInvokeDelegate`1.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncController.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncManagerContainer.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\OperationCounter.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ReflectedAsyncActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SingleEntryGate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SynchronizationContextUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SynchronousOperationException.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\Trigger.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\TriggerListener.cs" />\r
-    <Compile Include="System.Web.Mvc\AsyncController.cs" />\r
-    <Compile Include="System.Web.Mvc\AsyncTimeoutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizationContext.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizeAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BindAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BuildManagerWrapper.cs" />\r
-    <Compile Include="System.Web.Mvc\ByteArrayModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\ChildActionOnlyAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ClientDataTypeModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Controller.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptorCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerTypeCache.cs" />\r
-    <Compile Include="System.Web.Mvc\CustomModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidator.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidator`1.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DataErrorInfoModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\DescriptorUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\DictionaryHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\DictionaryValueProvider`1.cs" />\r
-    <Compile Include="System.Web.Mvc\DynamicTypeGenerator.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Error.cs" />\r
-    <Compile Include="System.Web.Mvc\ExceptionContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\CompiledExpressionDelegate`2.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ExpressionParser.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\FastTrack`2.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\HashCodeCombiner.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ParserContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\FieldValidationMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\FileContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilePathResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileStreamResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\FormCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\FormContext.cs" />\r
-    <Compile Include="System.Web.Mvc\FormMethod.cs" />\r
-    <Compile Include="System.Web.Mvc\FormValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\FormValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\HiddenInputAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\ChildActionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DefaultDisplayTemplates.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DefaultEditorTemplates.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DisplayExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DisplayTextExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\EditorExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\FormExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\InputExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\LabelExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\LinkExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\MvcForm.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\PartialExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\RenderPartialExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\SelectExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\TemplateHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\TextAreaExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\ValidationExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpAntiForgeryException.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpDeleteAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpFileCollectionValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpFileCollectionValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpGetAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpHandlerUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPostAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPostedFileBaseModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpRequestExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpUnauthorizedResult.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpVerbs.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\IAuthorizationFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IBuildManager.cs" />\r
-    <Compile Include="System.Web.Mvc\IController.cs" />\r
-    <Compile Include="System.Web.Mvc\IControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\IExceptionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\InputType.cs" />\r
-    <Compile Include="System.Web.Mvc\IResultFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IRouteWithArea.cs" />\r
-    <Compile Include="System.Web.Mvc\ITempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\IValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\IView.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewDataContainer.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\JavaScriptResult.cs" />\r
-    <Compile Include="System.Web.Mvc\JsonRequestBehavior.cs" />\r
-    <Compile Include="System.Web.Mvc\JsonResult.cs" />\r
-    <Compile Include="System.Web.Mvc\LinqBinaryModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinders.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBindingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRangeRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRegexRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRequiredRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationStringLengthRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelError.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelErrorCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadataProviders.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelState.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelStateDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidationResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidator.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProviderCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProviders.cs" />\r
-    <Compile Include="System.Web.Mvc\MultiSelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHtmlString.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHttpHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcRouteHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\NameValueCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\NameValueCollectionValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\NoAsyncTimeoutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\NonActionAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\NullViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\OutputCacheAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterInfoUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\PartialViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\PathHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\QueryStringValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\QueryStringValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\RangeAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\ReaderWriterCache`2.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectResult.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectToRouteResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\RegularExpressionAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\RequiredAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\RequireHttpsAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\Resources\MvcResources.Designer.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteDataValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteDataValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteValuesHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectListItem.cs" />\r
-    <Compile Include="System.Web.Mvc\SessionStateTempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\StringLengthAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\TagBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\TagRenderMode.cs" />\r
-    <Compile Include="System.Web.Mvc\TempDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\TemplateInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\TryGetValueDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeCacheSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeCacheUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeDescriptorHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\UrlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\UrlParameter.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateAntiForgeryTokenAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateInputAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactories.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactoryCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngines.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResultBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTemplateUserControl.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTemplateUserControl`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewType.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeParserFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\VirtualPathProviderViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormView.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormViewEngine.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_0.csproj">\r
-      <Project>{4D4682F3-E5E3-4167-AA36-F689331C2509}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_4_0.csproj">\r
-      <Project>{3EDC0F88-564F-4B98-A50A-471345348F16}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_0.csproj">\r
-      <Project>{3A327AAD-B09D-47E3-A915-C16BFB3F1682}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0.csproj">\r
-      <Project>{82CAAC49-507E-446E-A6FB-2C875E8F2C4E}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_0.csproj">\r
-      <Project>{EB50CF5B-D17A-4BEF-96C4-874FB8E61ACE}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_4_5.csproj b/mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_4_5.csproj
deleted file mode 100644 (file)
index 81adf78..0000000
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{911B352B-864F-4529-84AD-5AD4AF3FDF65}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>dummy-System.Web.Mvc</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="GlobalSuppressions.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\AcceptVerbsAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionFilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcher.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodDispatcherCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionMethodSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionNameSelectorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ActionSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\AjaxOptions.cs" />\r
-    <Compile Include="System.Web.Mvc\Ajax\InsertionMode.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\AjaxRequestExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryData.cs" />\r
-    <Compile Include="System.Web.Mvc\AntiForgeryDataSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaRegistration.cs" />\r
-    <Compile Include="System.Web.Mvc\AreaRegistrationContext.cs" />\r
-    <Compile Include="System.Web.Mvc\AssociatedMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\AssociatedValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ActionDescriptorCreator.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncActionMethodSelector.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncControllerActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncManager.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncResultWrapper.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\AsyncVoid.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\BeginInvokeDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\EndInvokeDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\EndInvokeDelegate`1.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncController.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\IAsyncManagerContainer.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\OperationCounter.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ReflectedAsyncActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SingleEntryGate.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SynchronizationContextUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\SynchronousOperationException.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\Trigger.cs" />\r
-    <Compile Include="System.Web.Mvc\Async\TriggerListener.cs" />\r
-    <Compile Include="System.Web.Mvc\AsyncController.cs" />\r
-    <Compile Include="System.Web.Mvc\AsyncTimeoutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizationContext.cs" />\r
-    <Compile Include="System.Web.Mvc\AuthorizeAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BindAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\BuildManagerWrapper.cs" />\r
-    <Compile Include="System.Web.Mvc\ByteArrayModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\ChildActionOnlyAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ClientDataTypeModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Controller.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerDescriptorCache.cs" />\r
-    <Compile Include="System.Web.Mvc\ControllerTypeCache.cs" />\r
-    <Compile Include="System.Web.Mvc\CustomModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidator.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidator`1.cs" />\r
-    <Compile Include="System.Web.Mvc\DataAnnotationsModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DataErrorInfoModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\DefaultViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\DescriptorUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\DictionaryHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\DictionaryValueProvider`1.cs" />\r
-    <Compile Include="System.Web.Mvc\DynamicTypeGenerator.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\EmptyResult.cs" />\r
-    <Compile Include="System.Web.Mvc\Error.cs" />\r
-    <Compile Include="System.Web.Mvc\ExceptionContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\CompiledExpressionDelegate`2.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ExpressionParser.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\FastTrack`2.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\HashCodeCombiner.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\ParserContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />\r
-    <Compile Include="System.Web.Mvc\FieldValidationMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\FileContentResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilePathResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FileStreamResult.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\FilterInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\FormCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\FormContext.cs" />\r
-    <Compile Include="System.Web.Mvc\FormMethod.cs" />\r
-    <Compile Include="System.Web.Mvc\FormValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\FormValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HandleErrorInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\HiddenInputAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\ChildActionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DefaultDisplayTemplates.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DefaultEditorTemplates.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DisplayExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\DisplayTextExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\EditorExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\FormExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\InputExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\LabelExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\LinkExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\MvcForm.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\PartialExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\RenderPartialExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\SelectExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\TemplateHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\TextAreaExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\Html\ValidationExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\HtmlHelper`1.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpAntiForgeryException.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpDeleteAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpFileCollectionValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpFileCollectionValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpGetAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpHandlerUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPostAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPostedFileBaseModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpPutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpRequestExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpUnauthorizedResult.cs" />\r
-    <Compile Include="System.Web.Mvc\HttpVerbs.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IActionInvoker.cs" />\r
-    <Compile Include="System.Web.Mvc\IAuthorizationFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IBuildManager.cs" />\r
-    <Compile Include="System.Web.Mvc\IController.cs" />\r
-    <Compile Include="System.Web.Mvc\IControllerFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\IExceptionFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\InputType.cs" />\r
-    <Compile Include="System.Web.Mvc\IResultFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\IRouteWithArea.cs" />\r
-    <Compile Include="System.Web.Mvc\ITempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\IValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\IView.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewDataContainer.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\IViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\JavaScriptResult.cs" />\r
-    <Compile Include="System.Web.Mvc\JsonRequestBehavior.cs" />\r
-    <Compile Include="System.Web.Mvc\JsonResult.cs" />\r
-    <Compile Include="System.Web.Mvc\LinqBinaryModelBinder.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBinders.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelBindingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRangeRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRegexRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRequiredRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelClientValidationStringLengthRule.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelError.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelErrorCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadata.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelMetadataProviders.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelState.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelStateDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidationResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidator.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProviderCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ModelValidatorProviders.cs" />\r
-    <Compile Include="System.Web.Mvc\MultiSelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHtmlString.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcHttpHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\MvcRouteHandler.cs" />\r
-    <Compile Include="System.Web.Mvc\NameValueCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\NameValueCollectionValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\NoAsyncTimeoutAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\NonActionAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\NullViewLocationCache.cs" />\r
-    <Compile Include="System.Web.Mvc\OutputCacheAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ParameterInfoUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\PartialViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\PathHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\QueryStringValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\QueryStringValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\RangeAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\ReaderWriterCache`2.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectResult.cs" />\r
-    <Compile Include="System.Web.Mvc\RedirectToRouteResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedActionDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedControllerDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterBindingInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ReflectedParameterDescriptor.cs" />\r
-    <Compile Include="System.Web.Mvc\RegularExpressionAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\RequiredAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\RequireHttpsAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\Resources\MvcResources.Designer.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutedContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ResultExecutingContext.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteCollectionExtensions.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteDataValueProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteDataValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\RouteValuesHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectList.cs" />\r
-    <Compile Include="System.Web.Mvc\SelectListItem.cs" />\r
-    <Compile Include="System.Web.Mvc\SessionStateTempDataProvider.cs" />\r
-    <Compile Include="System.Web.Mvc\StringLengthAttributeAdapter.cs" />\r
-    <Compile Include="System.Web.Mvc\TagBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\TagRenderMode.cs" />\r
-    <Compile Include="System.Web.Mvc\TempDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\TemplateInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\TryGetValueDelegate.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeCacheSerializer.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeCacheUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeDescriptorHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\TypeHelpers.cs" />\r
-    <Compile Include="System.Web.Mvc\UrlHelper.cs" />\r
-    <Compile Include="System.Web.Mvc\UrlParameter.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateAntiForgeryTokenAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValidateInputAttribute.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactories.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactory.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderFactoryCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ValueProviderUtil.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewContext.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataDictionary`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewDataInfo.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineCollection.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngineResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewEngines.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewMasterPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPage`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResult.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewResultBase.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTemplateUserControl.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTemplateUserControl`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewType.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewTypeParserFilter.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControl`1.cs" />\r
-    <Compile Include="System.Web.Mvc\ViewUserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.Mvc\VirtualPathProviderViewEngine.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormView.cs" />\r
-    <Compile Include="System.Web.Mvc\WebFormViewEngine.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
-      <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
-      <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
-      <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc2.dll.sources b/mcs/class/System.Web.Mvc2/System.Web.Mvc2.dll.sources
deleted file mode 100644 (file)
index 9ecb0aa..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-../../build/common/Consts.cs
-../../build/common/MonoTODOAttribute.cs
-
-GlobalSuppressions.cs
-Properties/AssemblyInfo.cs
-System.Web.Mvc/AcceptVerbsAttribute.cs
-System.Web.Mvc/ActionDescriptor.cs
-System.Web.Mvc/ActionExecutedContext.cs
-System.Web.Mvc/ActionExecutingContext.cs
-System.Web.Mvc/ActionFilterAttribute.cs
-System.Web.Mvc/ActionMethodDispatcherCache.cs
-System.Web.Mvc/ActionMethodDispatcher.cs
-System.Web.Mvc/ActionMethodSelectorAttribute.cs
-System.Web.Mvc/ActionMethodSelector.cs
-System.Web.Mvc/ActionNameAttribute.cs
-System.Web.Mvc/ActionNameSelectorAttribute.cs
-System.Web.Mvc/ActionResult.cs
-System.Web.Mvc/ActionSelector.cs
-System.Web.Mvc/Ajax/AjaxExtensions.cs
-System.Web.Mvc/Ajax/AjaxOptions.cs
-System.Web.Mvc/AjaxHelper`1.cs
-System.Web.Mvc/AjaxHelper.cs
-System.Web.Mvc/Ajax/InsertionMode.cs
-System.Web.Mvc/AjaxRequestExtensions.cs
-System.Web.Mvc/AntiForgeryData.cs
-System.Web.Mvc/AntiForgeryDataSerializer.cs
-System.Web.Mvc/AreaHelpers.cs
-System.Web.Mvc/AreaRegistrationContext.cs
-System.Web.Mvc/AreaRegistration.cs
-System.Web.Mvc/AssociatedMetadataProvider.cs
-System.Web.Mvc/AssociatedValidatorProvider.cs
-System.Web.Mvc/Async/ActionDescriptorCreator.cs
-System.Web.Mvc/Async/AsyncActionDescriptor.cs
-System.Web.Mvc/Async/AsyncActionMethodSelector.cs
-System.Web.Mvc/Async/AsyncControllerActionInvoker.cs
-System.Web.Mvc/Async/AsyncManager.cs
-System.Web.Mvc/Async/AsyncResultWrapper.cs
-System.Web.Mvc/Async/AsyncUtil.cs
-System.Web.Mvc/Async/AsyncVoid.cs
-System.Web.Mvc/Async/BeginInvokeDelegate.cs
-System.Web.Mvc/AsyncController.cs
-System.Web.Mvc/Async/EndInvokeDelegate`1.cs
-System.Web.Mvc/Async/EndInvokeDelegate.cs
-System.Web.Mvc/Async/IAsyncActionInvoker.cs
-System.Web.Mvc/Async/IAsyncController.cs
-System.Web.Mvc/Async/IAsyncManagerContainer.cs
-System.Web.Mvc/Async/OperationCounter.cs
-System.Web.Mvc/Async/ReflectedAsyncActionDescriptor.cs
-System.Web.Mvc/Async/ReflectedAsyncControllerDescriptor.cs
-System.Web.Mvc/Async/SimpleAsyncResult.cs
-System.Web.Mvc/Async/SingleEntryGate.cs
-System.Web.Mvc/Async/SynchronizationContextUtil.cs
-System.Web.Mvc/Async/SynchronousOperationException.cs
-System.Web.Mvc/AsyncTimeoutAttribute.cs
-System.Web.Mvc/Async/Trigger.cs
-System.Web.Mvc/Async/TriggerListener.cs
-System.Web.Mvc/AuthorizationContext.cs
-System.Web.Mvc/AuthorizeAttribute.cs
-System.Web.Mvc/BindAttribute.cs
-System.Web.Mvc/BuildManagerWrapper.cs
-System.Web.Mvc/ByteArrayModelBinder.cs
-System.Web.Mvc/ChildActionOnlyAttribute.cs
-System.Web.Mvc/ClientDataTypeModelValidatorProvider.cs
-System.Web.Mvc/ContentResult.cs
-System.Web.Mvc/ControllerActionInvoker.cs
-System.Web.Mvc/ControllerBase.cs
-System.Web.Mvc/ControllerBuilder.cs
-System.Web.Mvc/ControllerContext.cs
-System.Web.Mvc/Controller.cs
-System.Web.Mvc/ControllerDescriptorCache.cs
-System.Web.Mvc/ControllerDescriptor.cs
-System.Web.Mvc/ControllerTypeCache.cs
-System.Web.Mvc/CustomModelBinderAttribute.cs
-System.Web.Mvc/DataAnnotationsModelMetadata.cs
-System.Web.Mvc/DataAnnotationsModelMetadataProvider.cs
-System.Web.Mvc/DataAnnotationsModelValidator`1.cs
-System.Web.Mvc/DataAnnotationsModelValidator.cs
-System.Web.Mvc/DataAnnotationsModelValidatorProvider.cs
-System.Web.Mvc/DataErrorInfoModelValidatorProvider.cs
-System.Web.Mvc/DefaultControllerFactory.cs
-System.Web.Mvc/DefaultModelBinder.cs
-System.Web.Mvc/DefaultViewLocationCache.cs
-System.Web.Mvc/DescriptorUtil.cs
-System.Web.Mvc/DictionaryHelpers.cs
-System.Web.Mvc/DictionaryValueProvider`1.cs
-System.Web.Mvc/DynamicTypeGenerator.cs
-System.Web.Mvc/EmptyModelMetadataProvider.cs
-System.Web.Mvc/EmptyModelValidatorProvider.cs
-System.Web.Mvc/EmptyResult.cs
-System.Web.Mvc/Error.cs
-System.Web.Mvc/ExceptionContext.cs
-System.Web.Mvc/ExpressionHelper.cs
-System.Web.Mvc/ExpressionUtil/BinaryExpressionFingerprint.cs
-System.Web.Mvc/ExpressionUtil/CachedExpressionCompiler.cs
-System.Web.Mvc/ExpressionUtil/CompiledExpressionDelegate`2.cs
-System.Web.Mvc/ExpressionUtil/ConditionalExpressionFingerprint.cs
-System.Web.Mvc/ExpressionUtil/ConstantExpressionFingerprint.cs
-System.Web.Mvc/ExpressionUtil/ExpressionFingerprint.cs
-System.Web.Mvc/ExpressionUtil/ExpressionParser.cs
-System.Web.Mvc/ExpressionUtil/FastTrack`2.cs
-System.Web.Mvc/ExpressionUtil/HashCodeCombiner.cs
-System.Web.Mvc/ExpressionUtil/MemberExpressionFingerprint.cs
-System.Web.Mvc/ExpressionUtil/MethodCallExpressionFingerprint.cs
-System.Web.Mvc/ExpressionUtil/ParameterExpressionFingerprint.cs
-System.Web.Mvc/ExpressionUtil/ParserContext.cs
-System.Web.Mvc/ExpressionUtil/UnaryExpressionFingerprint.cs
-System.Web.Mvc/FieldValidationMetadata.cs
-System.Web.Mvc/FileContentResult.cs
-System.Web.Mvc/FilePathResult.cs
-System.Web.Mvc/FileResult.cs
-System.Web.Mvc/FileStreamResult.cs
-System.Web.Mvc/FilterAttribute.cs
-System.Web.Mvc/FilterInfo.cs
-System.Web.Mvc/FormCollection.cs
-System.Web.Mvc/FormContext.cs
-System.Web.Mvc/FormMethod.cs
-System.Web.Mvc/FormValueProvider.cs
-System.Web.Mvc/FormValueProviderFactory.cs
-System.Web.Mvc/HandleErrorAttribute.cs
-System.Web.Mvc/HandleErrorInfo.cs
-System.Web.Mvc/HiddenInputAttribute.cs
-System.Web.Mvc/Html/ChildActionExtensions.cs
-System.Web.Mvc/Html/DefaultDisplayTemplates.cs
-System.Web.Mvc/Html/DefaultEditorTemplates.cs
-System.Web.Mvc/Html/DisplayExtensions.cs
-System.Web.Mvc/Html/DisplayTextExtensions.cs
-System.Web.Mvc/Html/EditorExtensions.cs
-System.Web.Mvc/Html/FormExtensions.cs
-System.Web.Mvc/HtmlHelper`1.cs
-System.Web.Mvc/HtmlHelper.cs
-System.Web.Mvc/Html/InputExtensions.cs
-System.Web.Mvc/Html/LabelExtensions.cs
-System.Web.Mvc/Html/LinkExtensions.cs
-System.Web.Mvc/Html/MvcForm.cs
-System.Web.Mvc/Html/PartialExtensions.cs
-System.Web.Mvc/Html/RenderPartialExtensions.cs
-System.Web.Mvc/Html/SelectExtensions.cs
-System.Web.Mvc/Html/TemplateHelpers.cs
-System.Web.Mvc/Html/TextAreaExtensions.cs
-System.Web.Mvc/Html/ValidationExtensions.cs
-System.Web.Mvc/HttpAntiForgeryException.cs
-System.Web.Mvc/HttpDeleteAttribute.cs
-System.Web.Mvc/HttpFileCollectionValueProvider.cs
-System.Web.Mvc/HttpFileCollectionValueProviderFactory.cs
-System.Web.Mvc/HttpGetAttribute.cs
-System.Web.Mvc/HttpHandlerUtil.cs
-System.Web.Mvc/HttpPostAttribute.cs
-System.Web.Mvc/HttpPostedFileBaseModelBinder.cs
-System.Web.Mvc/HttpPutAttribute.cs
-System.Web.Mvc/HttpRequestExtensions.cs
-System.Web.Mvc/HttpUnauthorizedResult.cs
-System.Web.Mvc/HttpVerbs.cs
-System.Web.Mvc/IActionFilter.cs
-System.Web.Mvc/IActionInvoker.cs
-System.Web.Mvc/IAuthorizationFilter.cs
-System.Web.Mvc/IBuildManager.cs
-System.Web.Mvc/IController.cs
-System.Web.Mvc/IControllerFactory.cs
-System.Web.Mvc/IExceptionFilter.cs
-System.Web.Mvc/IModelBinder.cs
-System.Web.Mvc/InputType.cs
-System.Web.Mvc/IResultFilter.cs
-System.Web.Mvc/IRouteWithArea.cs
-System.Web.Mvc/ITempDataProvider.cs
-System.Web.Mvc/IValueProvider.cs
-System.Web.Mvc/IView.cs
-System.Web.Mvc/IViewDataContainer.cs
-System.Web.Mvc/IViewEngine.cs
-System.Web.Mvc/IViewLocationCache.cs
-System.Web.Mvc/JavaScriptResult.cs
-System.Web.Mvc/JsonRequestBehavior.cs
-System.Web.Mvc/JsonResult.cs
-System.Web.Mvc/LinqBinaryModelBinder.cs
-System.Web.Mvc/ModelBinderAttribute.cs
-System.Web.Mvc/ModelBinderDictionary.cs
-System.Web.Mvc/ModelBinders.cs
-System.Web.Mvc/ModelBindingContext.cs
-System.Web.Mvc/ModelClientValidationRangeRule.cs
-System.Web.Mvc/ModelClientValidationRegexRule.cs
-System.Web.Mvc/ModelClientValidationRequiredRule.cs
-System.Web.Mvc/ModelClientValidationRule.cs
-System.Web.Mvc/ModelClientValidationStringLengthRule.cs
-System.Web.Mvc/ModelErrorCollection.cs
-System.Web.Mvc/ModelError.cs
-System.Web.Mvc/ModelMetadata.cs
-System.Web.Mvc/ModelMetadataProvider.cs
-System.Web.Mvc/ModelMetadataProviders.cs
-System.Web.Mvc/ModelState.cs
-System.Web.Mvc/ModelStateDictionary.cs
-System.Web.Mvc/ModelValidationResult.cs
-System.Web.Mvc/ModelValidator.cs
-System.Web.Mvc/ModelValidatorProviderCollection.cs
-System.Web.Mvc/ModelValidatorProvider.cs
-System.Web.Mvc/ModelValidatorProviders.cs
-System.Web.Mvc/MultiSelectList.cs
-System.Web.Mvc/MvcHandler.cs
-System.Web.Mvc/MvcHtmlString.cs
-System.Web.Mvc/MvcHttpHandler.cs
-System.Web.Mvc/MvcRouteHandler.cs
-System.Web.Mvc/NameValueCollectionExtensions.cs
-System.Web.Mvc/NameValueCollectionValueProvider.cs
-System.Web.Mvc/NoAsyncTimeoutAttribute.cs
-System.Web.Mvc/NonActionAttribute.cs
-System.Web.Mvc/NullViewLocationCache.cs
-System.Web.Mvc/OutputCacheAttribute.cs
-System.Web.Mvc/ParameterBindingInfo.cs
-System.Web.Mvc/ParameterDescriptor.cs
-System.Web.Mvc/ParameterInfoUtil.cs
-System.Web.Mvc/PartialViewResult.cs
-System.Web.Mvc/PathHelpers.cs
-System.Web.Mvc/QueryStringValueProvider.cs
-System.Web.Mvc/QueryStringValueProviderFactory.cs
-System.Web.Mvc/RangeAttributeAdapter.cs
-System.Web.Mvc/ReaderWriterCache`2.cs
-System.Web.Mvc/RedirectResult.cs
-System.Web.Mvc/RedirectToRouteResult.cs
-System.Web.Mvc/ReflectedActionDescriptor.cs
-System.Web.Mvc/ReflectedControllerDescriptor.cs
-System.Web.Mvc/ReflectedParameterBindingInfo.cs
-System.Web.Mvc/ReflectedParameterDescriptor.cs
-System.Web.Mvc/RegularExpressionAttributeAdapter.cs
-System.Web.Mvc/RequiredAttributeAdapter.cs
-System.Web.Mvc/RequireHttpsAttribute.cs
-System.Web.Mvc/Resources/MvcResources.Designer.cs
-System.Web.Mvc/ResultExecutedContext.cs
-System.Web.Mvc/ResultExecutingContext.cs
-System.Web.Mvc/RouteCollectionExtensions.cs
-System.Web.Mvc/RouteDataValueProvider.cs
-System.Web.Mvc/RouteDataValueProviderFactory.cs
-System.Web.Mvc/RouteValuesHelpers.cs
-System.Web.Mvc/SelectList.cs
-System.Web.Mvc/SelectListItem.cs
-System.Web.Mvc/SessionStateTempDataProvider.cs
-System.Web.Mvc/StringLengthAttributeAdapter.cs
-System.Web.Mvc/TagBuilder.cs
-System.Web.Mvc/TagRenderMode.cs
-System.Web.Mvc/TempDataDictionary.cs
-System.Web.Mvc/TemplateInfo.cs
-System.Web.Mvc/TryGetValueDelegate.cs
-System.Web.Mvc/TypeCacheSerializer.cs
-System.Web.Mvc/TypeCacheUtil.cs
-System.Web.Mvc/TypeDescriptorHelper.cs
-System.Web.Mvc/TypeHelpers.cs
-System.Web.Mvc/UrlHelper.cs
-System.Web.Mvc/UrlParameter.cs
-System.Web.Mvc/ValidateAntiForgeryTokenAttribute.cs
-System.Web.Mvc/ValidateInputAttribute.cs
-System.Web.Mvc/ValueProviderCollection.cs
-System.Web.Mvc/ValueProviderDictionary.cs
-System.Web.Mvc/ValueProviderFactories.cs
-System.Web.Mvc/ValueProviderFactoryCollection.cs
-System.Web.Mvc/ValueProviderFactory.cs
-System.Web.Mvc/ValueProviderResult.cs
-System.Web.Mvc/ValueProviderUtil.cs
-System.Web.Mvc/ViewContext.cs
-System.Web.Mvc/ViewDataDictionary`1.cs
-System.Web.Mvc/ViewDataDictionary.cs
-System.Web.Mvc/ViewDataInfo.cs
-System.Web.Mvc/ViewEngineCollection.cs
-System.Web.Mvc/ViewEngineResult.cs
-System.Web.Mvc/ViewEngines.cs
-System.Web.Mvc/ViewMasterPage`1.cs
-System.Web.Mvc/ViewMasterPage.cs
-System.Web.Mvc/ViewPage`1.cs
-System.Web.Mvc/ViewPageControlBuilder.cs
-System.Web.Mvc/ViewPage.cs
-System.Web.Mvc/ViewResultBase.cs
-System.Web.Mvc/ViewResult.cs
-System.Web.Mvc/ViewTemplateUserControl`1.cs
-System.Web.Mvc/ViewTemplateUserControl.cs
-System.Web.Mvc/ViewTypeControlBuilder.cs
-System.Web.Mvc/ViewType.cs
-System.Web.Mvc/ViewTypeParserFilter.cs
-System.Web.Mvc/ViewUserControl`1.cs
-System.Web.Mvc/ViewUserControlControlBuilder.cs
-System.Web.Mvc/ViewUserControl.cs
-System.Web.Mvc/VirtualPathProviderViewEngine.cs
-System.Web.Mvc/WebFormView.cs
-System.Web.Mvc/WebFormViewEngine.cs
index 5c8e5e5cfee8da1ec56ca9c92906bc3eff4d1910..2c282ce28f51a0c78b4ff828e34dea8bf9282958 100644 (file)
@@ -8,7 +8,7 @@
 
         public int Count {
             get {
-                return Thread.VolatileRead(ref _count);
+                return Volatile.Read(ref _count);
             }
         }
 
index 01389b60424d2e67d32b068b8d56e67fa6416904..0e4e57ef46db89ffbbfbac3465d1d9c2af01cf64 100644 (file)
@@ -9,11 +9,6 @@ LIB_MCS_FLAGS = \
                /r:System.Web.dll \
                /r:System.Web.Abstractions.dll
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5 -d:SYSTEMCORE_DEP
-endif
-
 ifdef DEBUG
 LIB_MCS_FLAGS += -define:DEBUG
 endif
@@ -23,7 +18,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 EXTRA_DISTFILES =
 
 # This is a .NET 3.5+ assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Web.Routing.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-net_2_0.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-net_2_0.csproj
deleted file mode 100644 (file)
index d2516c2..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A9B310AD-FF67-49ED-8AC8-AAF1E4B05249}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Routing</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="System.Web.Routing\IRouteConstraint.cs" />\r
-    <Compile Include="System.Web.Routing\IRouteHandler.cs" />\r
-    <Compile Include="System.Web.Routing\PatternParser.cs" />\r
-    <Compile Include="System.Web.Routing\PatternToken.cs" />\r
-    <Compile Include="System.Web.Routing\PatternTokenType.cs" />\r
-    <Compile Include="System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="System.Web.Routing\Route.cs" />\r
-    <Compile Include="System.Web.Routing\RouteBase.cs" />\r
-    <Compile Include="System.Web.Routing\RouteCollection.cs" />\r
-    <Compile Include="System.Web.Routing\RouteData.cs" />\r
-    <Compile Include="System.Web.Routing\RouteDirection.cs" />\r
-    <Compile Include="System.Web.Routing\RouteTable.cs" />\r
-    <Compile Include="System.Web.Routing\RouteValueDictionary.cs" />\r
-    <Compile Include="System.Web.Routing\RouteValueDictionaryExtensions.cs" />\r
-    <Compile Include="System.Web.Routing\StopRoutingHandler.cs" />\r
-    <Compile Include="System.Web.Routing\UrlRoutingHandler.cs" />\r
-    <Compile Include="System.Web.Routing\UrlRoutingModule.cs" />\r
-    <Compile Include="System.Web.Routing\VirtualPathData.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_2_0.csproj">\r
-      <Project>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-net_4_0.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-net_4_0.csproj
deleted file mode 100644 (file)
index 3b29262..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3EDC0F88-564F-4B98-A50A-471345348F16}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Routing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_0.csproj">\r
-      <Project>{4D4682F3-E5E3-4167-AA36-F689331C2509}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-tests-net_2_0.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 8be24aa..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6E3E9325-A838-4063-B095-7C93F9F562BF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Routing-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Routing_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Web.Routing\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.Web.Routing\FakeHttpWorkerRequest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\HttpMethodConstraintTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\KnownResponseHeader.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteDataTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteValueDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\StopRoutingHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\TestStubTypes.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UnknownResponseHeader.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UrlRoutingHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UrlRoutingModuleTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\VirtualPathDataTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_2_0.csproj">\r
-      <Project>{A9B310AD-FF67-49ED-8AC8-AAF1E4B05249}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_2_0.csproj">\r
-      <Project>{1665130D-E9DA-4325-A4C6-78ECF7187D5B}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-tests-net_4_0.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 645bd00..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5B99E2EF-35FE-4179-9120-2D956D6C9604}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Routing-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Routing_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Web.Routing\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.Web.Routing\FakeHttpWorkerRequest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\HttpMethodConstraintTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\KnownResponseHeader.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteDataTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteValueDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\StopRoutingHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\TestStubTypes.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UnknownResponseHeader.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UrlRoutingHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UrlRoutingModuleTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\VirtualPathDataTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_4_0.csproj">\r
-      <Project>{3EDC0F88-564F-4B98-A50A-471345348F16}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_0.csproj">\r
-      <Project>{4D4682F3-E5E3-4167-AA36-F689331C2509}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Services/System.Web.Services-net_2_0.csproj b/mcs/class/System.Web.Services/System.Web.Services-net_2_0.csproj
deleted file mode 100644 (file)
index 1f8dbee..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,169</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Services</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\DiagnosticsElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\PriorityGroup.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\ProtocolElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\ProtocolElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\SoapEnvelopeProcessingElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\SoapExtensionTypeElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\SoapExtensionTypeElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\TypeElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\TypeElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\TypeTypeConverter.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WebServiceProtocols.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WebServicesConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WebServicesSection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WsdlHelpGeneratorElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WsiProfilesElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WsiProfilesElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPointAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileChecker.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileViolation.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileViolationCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileViolationEnumerator.cs" />\r
-    <Compile Include="System.Web.Services.Description\Binding.cs" />\r
-    <Compile Include="System.Web.Services.Description\BindingCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ConformanceChecker.cs" />\r
-    <Compile Include="System.Web.Services.Description\DocumentableItem.cs" />\r
-    <Compile Include="System.Web.Services.Description\ExtensionManager.cs" />\r
-    <Compile Include="System.Web.Services.Description\FaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\FaultBindingCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpAddressBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpGetProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpGetProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpOperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpPostProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpPostProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpSimpleProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpSimpleProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpUrlEncodedBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpUrlReplacementBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Import.cs" />\r
-    <Compile Include="System.Web.Services.Description\ImportCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\InputBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Message.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessageBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessageCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessagePart.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessagePartCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeContentBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeMultipartRelatedBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimePart.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimePartCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeTextBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeTextMatch.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeTextMatchCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeXmlBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\NamedItem.cs" />\r
-    <Compile Include="System.Web.Services.Description\Operation.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationBindingCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationFault.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationFaultCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationFlow.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationInput.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationMessage.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationMessageCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationOutput.cs" />\r
-    <Compile Include="System.Web.Services.Description\OutputBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Port.cs" />\r
-    <Compile Include="System.Web.Services.Description\PortCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\PortType.cs" />\r
-    <Compile Include="System.Web.Services.Description\PortTypeCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\ProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\Service.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionBaseCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportWarnings.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12BodyBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12FaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12HeaderBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12OperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapAddressBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBindingStyle.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBindingUse.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBodyBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapExtensionImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapExtensionReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapFaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapHeaderBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapHeaderFaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapHttpTransportImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapOperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapTransportImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\Types.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReference.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReferenceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReferenceOptions.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReferenceOptionsSerializer.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebServicesInteroperability.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\ContractReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\ContractSearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientDocumentCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientReferenceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResult.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResultCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocument.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentLinksPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSerializer.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryExceptionDictionary.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReferenceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryRequestHandler.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoverySearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DynamicDiscoveryDocument.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\ExcludePathInfo.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\SchemaReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\SoapBinding.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\XmlSchemaSearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\AnyReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Fault.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Fault12.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Fault12Serializer.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HtmlFormParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HtmlFormParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpGetClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpGetTypeStubInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpPostClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpPostTypeStubInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSimpleClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSimpleTypeStubInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSimpleWebServiceHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSoapWebServiceHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpWebClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventArgs.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodTypes.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MatchAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Methods.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeFormatter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeReturnWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\NopReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\PatternMatcher.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ServerProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ServerProtocolFactory.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ServerType.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Soap12FaultCodes.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapClientMessage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentationHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentServiceAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapException.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapExtension.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapExtensionAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapFaultSubcode.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderCollection.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderDirection.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderException.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderHandling.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderMapping.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHttpClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapMessage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapMessageStage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapParameterStyle.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapProtocolVersion.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapRpcMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapRpcServiceAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerMessage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerMethod.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerProtocolFactory.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerType.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServiceRoutingStyle.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapUnknownHeader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\TextReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\TypeStubManager.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\UrlEncodedParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\UrlParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\UrlParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ValueCollectionParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebClientAsyncResult.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebServiceHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebServiceHandlerFactory.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebServiceHelper.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\XmlReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\XmlReturnWriter.cs" />\r
-    <Compile Include="System.Web.Services\WebMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WebService.cs" />\r
-    <Compile Include="System.Web.Services\WebServiceAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WebServiceBindingAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WsiProfiles.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0.csproj">\r
-      <Project>{3AE1BF46-F9C5-4EC2-B95D-C9D9F21F4E08}</Project>\r
-      <Name>System.Web\System.Web-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1.xsd">\r
-      <LogicalName>wsdl-1.1.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1-soap.xsd">\r
-      <LogicalName>wsdl-1.1-soap.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/web-reference.xsd">\r
-      <LogicalName>web-reference.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Services/System.Web.Services-net_4_0.csproj b/mcs/class/System.Web.Services/System.Web.Services-net_4_0.csproj
deleted file mode 100644 (file)
index 64651ca..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,169</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Services</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\DiagnosticsElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\PriorityGroup.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\ProtocolElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\ProtocolElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\SoapEnvelopeProcessingElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\SoapExtensionTypeElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\SoapExtensionTypeElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\TypeElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\TypeElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\TypeTypeConverter.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WebServiceProtocols.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WebServicesConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WebServicesSection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WsdlHelpGeneratorElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WsiProfilesElement.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\WsiProfilesElementCollection.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPointAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileChecker.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileViolation.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileViolationCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\BasicProfileViolationEnumerator.cs" />\r
-    <Compile Include="System.Web.Services.Description\Binding.cs" />\r
-    <Compile Include="System.Web.Services.Description\BindingCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ConformanceChecker.cs" />\r
-    <Compile Include="System.Web.Services.Description\DocumentableItem.cs" />\r
-    <Compile Include="System.Web.Services.Description\ExtensionManager.cs" />\r
-    <Compile Include="System.Web.Services.Description\FaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\FaultBindingCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpAddressBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpGetProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpGetProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpOperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpPostProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpPostProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpSimpleProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpSimpleProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpUrlEncodedBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\HttpUrlReplacementBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Import.cs" />\r
-    <Compile Include="System.Web.Services.Description\ImportCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\InputBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Message.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessageBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessageCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessagePart.cs" />\r
-    <Compile Include="System.Web.Services.Description\MessagePartCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeContentBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeMultipartRelatedBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimePart.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimePartCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeTextBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeTextMatch.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeTextMatchCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\MimeXmlBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\NamedItem.cs" />\r
-    <Compile Include="System.Web.Services.Description\Operation.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationBindingCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationFault.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationFaultCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationFlow.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationInput.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationMessage.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationMessageCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\OperationOutput.cs" />\r
-    <Compile Include="System.Web.Services.Description\OutputBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Port.cs" />\r
-    <Compile Include="System.Web.Services.Description\PortCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\PortType.cs" />\r
-    <Compile Include="System.Web.Services.Description\PortTypeCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\ProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\Service.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionBaseCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportWarnings.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase.cs" />\r
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12BodyBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12FaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12HeaderBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\Soap12OperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapAddressBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBindingStyle.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBindingUse.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapBodyBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapExtensionImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapExtensionReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapFaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapHeaderBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapHeaderFaultBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapHttpTransportImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapOperationBinding.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapProtocolImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapProtocolReflector.cs" />\r
-    <Compile Include="System.Web.Services.Description\SoapTransportImporter.cs" />\r
-    <Compile Include="System.Web.Services.Description\Types.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReference.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReferenceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReferenceOptions.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebReferenceOptionsSerializer.cs" />\r
-    <Compile Include="System.Web.Services.Description\WebServicesInteroperability.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\ContractReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\ContractSearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientDocumentCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientReferenceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResult.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResultCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocument.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentLinksPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSerializer.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryExceptionDictionary.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReferenceCollection.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoveryRequestHandler.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DiscoverySearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\DynamicDiscoveryDocument.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\ExcludePathInfo.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\SchemaReference.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\SoapBinding.cs" />\r
-    <Compile Include="System.Web.Services.Discovery\XmlSchemaSearchPattern.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\AnyReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Fault.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Fault12.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Fault12Serializer.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HtmlFormParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HtmlFormParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpGetClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpGetTypeStubInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpPostClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpPostTypeStubInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSimpleClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSimpleTypeStubInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSimpleWebServiceHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpSoapWebServiceHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\HttpWebClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventArgs.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodInfo.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodTypes.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MatchAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Methods.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeFormatter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\MimeReturnWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\NopReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\PatternMatcher.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ServerProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ServerProtocolFactory.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ServerType.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\Soap12FaultCodes.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapClientMessage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentationHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentServiceAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapException.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapExtension.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapExtensionAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapFaultSubcode.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderCollection.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderDirection.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderException.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderHandling.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderMapping.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapHttpClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapMessage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapMessageStage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapParameterStyle.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapProtocolVersion.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapRpcMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapRpcServiceAttribute.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerMessage.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerMethod.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerProtocolFactory.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServerType.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapServiceRoutingStyle.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\SoapUnknownHeader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\TextReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\TypeStubManager.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\UrlEncodedParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\UrlParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\UrlParameterWriter.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\ValueCollectionParameterReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebClientAsyncResult.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebClientProtocol.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebServiceHandler.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebServiceHandlerFactory.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\WebServiceHelper.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\XmlReturnReader.cs" />\r
-    <Compile Include="System.Web.Services.Protocols\XmlReturnWriter.cs" />\r
-    <Compile Include="System.Web.Services\WebMethodAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WebService.cs" />\r
-    <Compile Include="System.Web.Services\WebServiceAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WebServiceBindingAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web.Services\WsiProfiles.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0.csproj">\r
-      <Project>{DF42883E-DAAC-43D8-8074-D48BD4BC1A36}</Project>\r
-      <Name>System.Web\System.Web-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1.xsd">\r
-      <LogicalName>wsdl-1.1.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1-soap.xsd">\r
-      <LogicalName>wsdl-1.1-soap.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/web-reference.xsd">\r
-      <LogicalName>web-reference.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Services/System.Web.Services-tests-net_2_0.csproj b/mcs/class/System.Web.Services/System.Web.Services-tests-net_2_0.csproj
deleted file mode 100644 (file)
index f9b607f..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8844444A-6A2E-4E20-A4B1-4E0DCA02108E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Services-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Services_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Web.Services.Configuration\DiagnosticsElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\ProtocolElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\SoapEnvelopeProcessingElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\SoapExtensionTypeElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\TypeElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\WsdlHelpGeneratorElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\WsiProfilesElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\XmlFormatExtensionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\BindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\DocumentableItemTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationMessageCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationMessageTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\PortTypeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\PortTypeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionFormatExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionImporterTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionReflectorTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\SoapBodyBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\SoapOperationBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\TypesTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebReferenceOptionsTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebReferenceTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebServicesInteroperabilityTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Discovery\ContractReferenceTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\LogicalMethodInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SoapHttpClientProtocolTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SoapServerTypeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SocketResponder.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\WebClientProtocolTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebMethodAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebServiceAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebServiceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0.csproj">\r
-      <Project>{3AE1BF46-F9C5-4EC2-B95D-C9D9F21F4E08}</Project>\r
-      <Name>System.Web\System.Web-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1.xsd">\r
-      <LogicalName>wsdl-1.1.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1-soap.xsd">\r
-      <LogicalName>wsdl-1.1-soap.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/web-reference.xsd">\r
-      <LogicalName>web-reference.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web.Services/System.Web.Services-tests-net_4_0.csproj b/mcs/class/System.Web.Services/System.Web.Services-tests-net_4_0.csproj
deleted file mode 100644 (file)
index e268c43..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{36516453-2742-4A84-992F-0C5215A01DEE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Services-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Services_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Web.Services.Configuration\DiagnosticsElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\ProtocolElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\SoapEnvelopeProcessingElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\SoapExtensionTypeElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\TypeElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\WsdlHelpGeneratorElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\WsiProfilesElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\XmlFormatExtensionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\BindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\DocumentableItemTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationMessageCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationMessageTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\PortTypeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\PortTypeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionFormatExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionImporterTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionReflectorTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\SoapBodyBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\SoapOperationBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\TypesTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebReferenceOptionsTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebReferenceTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebServicesInteroperabilityTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Discovery\ContractReferenceTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\LogicalMethodInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SoapHttpClientProtocolTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SoapServerTypeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SocketResponder.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\WebClientProtocolTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebMethodAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebServiceAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebServiceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_0.csproj">\r
-      <Project>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0.csproj">\r
-      <Project>{DF42883E-DAAC-43D8-8074-D48BD4BC1A36}</Project>\r
-      <Name>System.Web\System.Web-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1.xsd">\r
-      <LogicalName>wsdl-1.1.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1-soap.xsd">\r
-      <LogicalName>wsdl-1.1-soap.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/web-reference.xsd">\r
-      <LogicalName>web-reference.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index bcde518866296099be6d84c5ac4f79591f919e3b..96933615aece403375317cc339a61039ca613d28 100644 (file)
@@ -272,10 +272,6 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,159
        $(foreach file,$(NUNIT_APP_CODE_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_Code/\2 ;g')) \
        $(foreach file,$(NUNIT_APP_GLOBALRESOURCES_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_GlobalResources/\2 ;g'))
 
-ifeq (net_2_0, $(PROFILE))
-TEST_MCS_FLAGS += -r:System.Web.Extensions.dll -d:TEST
-endif
-
 EXTRA_DISTFILES = \
        $(RESOURCE_FILES_4) \
        $(RESOURCE_FILES_2) \
diff --git a/mcs/class/System.Web/System.Web-net_2_0.csproj b/mcs/class/System.Web/System.Web-net_2_0.csproj
deleted file mode 100644 (file)
index 56ba759..0000000
+++ /dev/null
@@ -1,1505 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3AE1BF46-F9C5-4EC2-B95D-C9D9F21F4E08}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\corlib\System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\Cache.cs" />\r
-    <Compile Include="System.Web.Caching\CacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />\r
-    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItem.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemEnumerator.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemLRU.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriority.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueue.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueueDebug.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedReason.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateReason.cs" />\r
-    <Compile Include="System.Web.Caching\DatabaseNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
-    <Compile Include="System.Web.Caching\TableNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Compilation\AppCodeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFileInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFilesCollection.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesAssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AppSettingsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppWebReferencesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponent.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponentFoundry.cs" />\r
-    <Compile Include="System.Web.Compilation\AspGenerator.cs" />\r
-    <Compile Include="System.Web.Compilation\AspParser.cs" />\r
-    <Compile Include="System.Web.Compilation\AspTokenizer.cs" />\r
-    <Compile Include="System.Web.Compilation\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BaseCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildDependencySet.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerCacheItem.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerDirectoryBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHost.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventArgs.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerCallback.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerParameter.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilationException.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilerType.cs" />\r
-    <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\Directive.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
-    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
-    <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\Location.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\PageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageThemeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ParseException.cs" />\r
-    <Compile Include="System.Web.Compilation\PrecompilationFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\PreservationFile.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionFields.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\SimpleBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TagAttributes.cs" />\r
-    <Compile Include="System.Web.Compilation\TagType.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WebHandlerBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModeSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProviderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesBuild.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesResult.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTarget.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectoriesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\Compiler.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationConfiguration.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HostingEnvironmentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationSystem.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCookiesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlersSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfile.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertyNameValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PropertyHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProvidersHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RegexWorker.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RoleManagerSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RootProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevelCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebControlsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
-    <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
-    <Compile Include="System.Web.Hosting\AppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationInfo.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationManager.cs" />\r
-    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\BareApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
-    <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFileBase.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Mail\Base64AttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\IAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Web.Mail\MailAttachment.cs" />\r
-    <Compile Include="System.Web.Mail\MailEncoding.cs" />\r
-    <Compile Include="System.Web.Mail\MailFormat.cs" />\r
-    <Compile Include="System.Web.Mail\MailHeader.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessageWrapper.cs" />\r
-    <Compile Include="System.Web.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Web.Mail\MailUtil.cs" />\r
-    <Compile Include="System.Web.Mail\RelatedBodyPart.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpMail.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpResponse.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpStream.cs" />\r
-    <Compile Include="System.Web.Mail\ToUUEncodingTransform.cs" />\r
-    <Compile Include="System.Web.Mail\UUAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Management\EventNotificationType.cs" />\r
-    <Compile Include="System.Web.Management\IRegiisUtility.cs" />\r
-    <Compile Include="System.Web.Management\IWebEventCustomEvaluator.cs" />\r
-    <Compile Include="System.Web.Management\RuleFiringRecord.cs" />\r
-    <Compile Include="System.Web.Management\SessionStateType.cs" />\r
-    <Compile Include="System.Web.Management\SqlFeatures.cs" />\r
-    <Compile Include="System.Web.Management\WebApplicationInformation.cs" />\r
-    <Compile Include="System.Web.Management\WebBaseEvent.cs" />\r
-    <Compile Include="System.Web.Management\WebEventCodes.cs" />\r
-    <Compile Include="System.Web.Management\WebEventFormatter.cs" />\r
-    <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileGroupBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileModule.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileParser.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderCollection.cs" />\r
-    <Compile Include="System.Web.Profile\SettingsAllowAnonymousAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
-    <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationModule.cs" />\r
-    <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />\r
-    <Compile Include="System.Web.Security\CookieProtection.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
-    <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
-    <Compile Include="System.Web.Security\Membership.cs" />\r
-    <Compile Include="System.Web.Security\MembershipCreateStatus.cs" />\r
-    <Compile Include="System.Web.Security\MembershipCreateUserException.cs" />\r
-    <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordException.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Security\MembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\MembershipProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\MembershipUser.cs" />\r
-    <Compile Include="System.Web.Security\MembershipUserCollection.cs" />\r
-    <Compile Include="System.Web.Security\MembershipValidatePasswordEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
-    <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
-    <Compile Include="System.Web.Security\RoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\Roles.cs" />\r
-    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\ValidatePasswordEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\RemoteStateServer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreData.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreProviderBase.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateUtility.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlForm.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlGenericControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHead.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHeadBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputCheckBox.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputFile.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputHidden.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputPassword.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputRadioButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputReset.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputSubmit.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputText.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlLink.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlMeta.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelect.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelectBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTable.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCell.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRow.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTextArea.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTitle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\DataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HideDisabledControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\MenuAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\WebControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionConsumerCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPointType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionProviderCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConsumerConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButtonControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ProfileParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\QueryStringParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButtonList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\View.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Xml.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceNodeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourcePropertyDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ApplicationFileParser.cs" />\r
-    <Compile Include="System.Web.UI\AttributeCollection.cs" />\r
-    <Compile Include="System.Web.UI\BaseParser.cs" />\r
-    <Compile Include="System.Web.UI\BasePartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\BaseTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\BoundPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuildMethod.cs" />\r
-    <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
-    <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
-    <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CollectionBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompilationMode.cs" />\r
-    <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Control.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
-    <Compile Include="System.Web.UI\ControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkin.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
-    <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBinder.cs" />\r
-    <Compile Include="System.Web.UI\DataBinding.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewSelectCallback.cs" />\r
-    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeParseData.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\EventEntry.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
-    <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
-    <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
-    <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
-    <Compile Include="System.Web.UI\KeyedList.cs" />\r
-    <Compile Include="System.Web.UI\KeyedListEnumerator.cs" />\r
-    <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
-    <Compile Include="System.Web.UI\LiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\LosFormatter.cs" />\r
-    <Compile Include="System.Web.UI\MainDirectiveAttribute.cs" />\r
-    <Compile Include="System.Web.UI\MasterPage.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
-    <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
-    <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTag.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTagBuilder.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheLocation.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheParameters.cs" />\r
-    <Compile Include="System.Web.UI\Page.cs" />\r
-    <Compile Include="System.Web.UI\PageAsyncTask.cs" />\r
-    <Compile Include="System.Web.UI\PageHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\PageLifeCycle.cs" />\r
-    <Compile Include="System.Web.UI\PageParser.cs" />\r
-    <Compile Include="System.Web.UI\PageParserFilter.cs" />\r
-    <Compile Include="System.Web.UI\PageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\PageTheme.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeFileParser.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeParser.cs" />\r
-    <Compile Include="System.Web.UI\Pair.cs" />\r
-    <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
-    <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
-    <Compile Include="System.Web.UI\PropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ReadOnlyDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\RenderMethod.cs" />\r
-    <Compile Include="System.Web.UI\ResourceBasedLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\RootBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SessionPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\SimpleHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\SimplePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\SimpleWebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\SkinBuilder.cs" />\r
-    <Compile Include="System.Web.UI\StateBag.cs" />\r
-    <Compile Include="System.Web.UI\StateItem.cs" />\r
-    <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
-    <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControl.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
-    <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Triplet.cs" />\r
-    <Compile Include="System.Web.UI\UnknownAttributeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI\UrlPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\UrlTypes.cs" />\r
-    <Compile Include="System.Web.UI\UserControl.cs" />\r
-    <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\UserControlParser.cs" />\r
-    <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ValidatorCollection.cs" />\r
-    <Compile Include="System.Web.UI\VerificationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
-    <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
-    <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
-    <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\WebResourceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\WebServiceParser.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlMobileDocType.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\XPathBinder.cs" />\r
-    <Compile Include="System.Web.Util\AltSerialization.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceHelper.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceResolver.cs" />\r
-    <Compile Include="System.Web.Util\FileUtils.cs" />\r
-    <Compile Include="System.Web.Util\Helpers.cs" />\r
-    <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
-    <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
-    <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Web.Util\SearchPattern.cs" />\r
-    <Compile Include="System.Web.Util\SecureHashCodeProvider.cs" />\r
-    <Compile Include="System.Web.Util\SerializationHelper.cs" />\r
-    <Compile Include="System.Web.Util\StrUtils.cs" />\r
-    <Compile Include="System.Web.Util\TimeUtil.cs" />\r
-    <Compile Include="System.Web.Util\TransactedCallback.cs" />\r
-    <Compile Include="System.Web.Util\Transactions.cs" />\r
-    <Compile Include="System.Web.Util\UrlUtils.cs" />\r
-    <Compile Include="System.Web.Util\WebEncoding.cs" />\r
-    <Compile Include="System.Web.Util\WebTrace.cs" />\r
-    <Compile Include="System.Web.Util\WorkItem.cs" />\r
-    <Compile Include="System.Web.Util\WorkItemCallback.cs" />\r
-    <Compile Include="System.Web\ApplicationShutdownReason.cs" />\r
-    <Compile Include="System.Web\BaseParamsCollection.cs" />\r
-    <Compile Include="System.Web\BeginEventHandler.cs" />\r
-    <Compile Include="System.Web\BrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\CapabilitiesLoader.cs" />\r
-    <Compile Include="System.Web\DefaultExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\DefaultHttpHandler.cs" />\r
-    <Compile Include="System.Web\EndEventHandler.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragment.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragmentValue.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateType.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />\r
-    <Compile Include="System.Web\HeadersCollection.cs" />\r
-    <Compile Include="System.Web\HtmlizedException.cs" />\r
-    <Compile Include="System.Web\HttpApplication.cs" />\r
-    <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
-    <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpCacheability.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
-    <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByHeaders.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByParams.cs" />\r
-    <Compile Include="System.Web\HttpClientCertificate.cs" />\r
-    <Compile Include="System.Web\HttpCompileException.cs" />\r
-    <Compile Include="System.Web\HttpContext.cs" />\r
-    <Compile Include="System.Web\HttpCookie.cs" />\r
-    <Compile Include="System.Web\HttpCookieCollection.cs" />\r
-    <Compile Include="System.Web\HttpCookieMode.cs" />\r
-    <Compile Include="System.Web\HttpException.cs" />\r
-    <Compile Include="System.Web\HttpFileCollection.cs" />\r
-    <Compile Include="System.Web\HttpForbiddenHandler.cs" />\r
-    <Compile Include="System.Web\HttpHeaderCollection.cs" />\r
-    <Compile Include="System.Web\HttpMethodNotAllowedHandler.cs" />\r
-    <Compile Include="System.Web\HttpModuleCollection.cs" />\r
-    <Compile Include="System.Web\HttpNotFoundHandler.cs" />\r
-    <Compile Include="System.Web\HttpNotImplementedHandler.cs" />\r
-    <Compile Include="System.Web\HttpParamsCollection.cs" />\r
-    <Compile Include="System.Web\HttpParseException.cs" />\r
-    <Compile Include="System.Web\HttpPostedFile.cs" />\r
-    <Compile Include="System.Web\HttpRequest.cs" />\r
-    <Compile Include="System.Web\HttpRequestValidationException.cs" />\r
-    <Compile Include="System.Web\HttpResponse.cs" />\r
-    <Compile Include="System.Web\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Web\HttpResponseStream.cs" />\r
-    <Compile Include="System.Web\HttpResponseSubstitutionCallback.cs" />\r
-    <Compile Include="System.Web\HttpRuntime.cs" />\r
-    <Compile Include="System.Web\HttpServerUtility.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
-    <Compile Include="System.Web\HttpUnhandledException.cs" />\r
-    <Compile Include="System.Web\HttpUtility.cs" />\r
-    <Compile Include="System.Web\HttpValidationStatus.cs" />\r
-    <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
-    <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
-    <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
-    <Compile Include="System.Web\IisTraceListener.cs" />\r
-    <Compile Include="System.Web\InputFilterStream.cs" />\r
-    <Compile Include="System.Web\IntPtrStream.cs" />\r
-    <Compile Include="System.Web\IPartitionResolver.cs" />\r
-    <Compile Include="System.Web\MimeTypes.cs" />\r
-    <Compile Include="System.Web\NoParamsInvoker.cs" />\r
-    <Compile Include="System.Web\OutputFilterStream.cs" />\r
-    <Compile Include="System.Web\ParserError.cs" />\r
-    <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\ProcessInfo.cs" />\r
-    <Compile Include="System.Web\ProcessModelInfo.cs" />\r
-    <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
-    <Compile Include="System.Web\ProcessStatus.cs" />\r
-    <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
-    <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
-    <Compile Include="System.Web\SiteMap.cs" />\r
-    <Compile Include="System.Web\SiteMapNode.cs" />\r
-    <Compile Include="System.Web\SiteMapNodeCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapProvider.cs" />\r
-    <Compile Include="System.Web\SiteMapProviderCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapResolveEventArgs.cs" />\r
-    <Compile Include="System.Web\StaticFileHandler.cs" />\r
-    <Compile Include="System.Web\StaticSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\TempFileStream.cs" />\r
-    <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
-    <Compile Include="System.Web\TraceContextRecord.cs" />\r
-    <Compile Include="System.Web\TraceData.cs" />\r
-    <Compile Include="System.Web\TraceManager.cs" />\r
-    <Compile Include="System.Web\TraceMode.cs" />\r
-    <Compile Include="System.Web\VirtualPath.cs" />\r
-    <Compile Include="System.Web\VirtualPathUtility.cs" />\r
-    <Compile Include="System.Web\WebCategoryAttribute.cs" />\r
-    <Compile Include="System.Web\WebPageTraceListener.cs" />\r
-    <Compile Include="System.Web\WebROCollection.cs" />\r
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\XmlSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0.csproj">\r
-      <Project>{7B3F5668-ED1F-48EB-9897-E6BE6A1C8CB3}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Web.Services.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Web.Services.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web/System.Web-net_4_0.csproj b/mcs/class/System.Web/System.Web-net_4_0.csproj
deleted file mode 100644 (file)
index 0524e36..0000000
+++ /dev/null
@@ -1,1586 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DF42883E-DAAC-43D8-8074-D48BD4BC1A36}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\corlib\System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternParser.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternToken.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternTokenType.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\Route.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteBase.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteCollection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteData.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteDirection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteTable.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionary.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionaryExtensions.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\StopRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingModule.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\VirtualPathData.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\Cache.cs" />\r
-    <Compile Include="System.Web.Caching\CacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />\r
-    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItem.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemEnumerator.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemLRU.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriority.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueue.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueueDebug.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedReason.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateReason.cs" />\r
-    <Compile Include="System.Web.Caching\DatabaseNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Caching\FileResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\HeaderElement.cs" />\r
-    <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\IOutputCacheEntry.cs" />\r
-    <Compile Include="System.Web.Caching\MemoryResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCache.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />\r
-    <Compile Include="System.Web.Caching\ResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
-    <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\TableNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Compilation\AppCodeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFileInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFilesCollection.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesAssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AppSettingsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppWebReferencesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponent.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponentFoundry.cs" />\r
-    <Compile Include="System.Web.Compilation\AspGenerator.cs" />\r
-    <Compile Include="System.Web.Compilation\AspParser.cs" />\r
-    <Compile Include="System.Web.Compilation\AspTokenizer.cs" />\r
-    <Compile Include="System.Web.Compilation\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BaseCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildDependencySet.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerCacheItem.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerDirectoryBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHost.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventArgs.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerCallback.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerParameter.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilationException.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilerType.cs" />\r
-    <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\Directive.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
-    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
-    <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\Location.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\PageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageThemeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ParseException.cs" />\r
-    <Compile Include="System.Web.Compilation\PrecompilationFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\PreservationFile.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionFields.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteUrlExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteValueExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\SimpleBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TagAttributes.cs" />\r
-    <Compile Include="System.Web.Compilation\TagType.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WebHandlerBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModeSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProviderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesBuild.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesResult.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTarget.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectoriesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\Compiler.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationConfiguration.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HostingEnvironmentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesDefaultProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationSystem.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCookiesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlersSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyCompatibilityMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfile.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertyNameValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PropertyHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProvidersHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RegexWorker.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RoleManagerSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RootProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevelCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VersionConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebControlsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
-    <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
-    <Compile Include="System.Web.Hosting\AppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationInfo.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationManager.cs" />\r
-    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\BareApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
-    <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFileBase.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Mail\Base64AttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\IAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Web.Mail\MailAttachment.cs" />\r
-    <Compile Include="System.Web.Mail\MailEncoding.cs" />\r
-    <Compile Include="System.Web.Mail\MailFormat.cs" />\r
-    <Compile Include="System.Web.Mail\MailHeader.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessageWrapper.cs" />\r
-    <Compile Include="System.Web.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Web.Mail\MailUtil.cs" />\r
-    <Compile Include="System.Web.Mail\RelatedBodyPart.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpMail.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpResponse.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpStream.cs" />\r
-    <Compile Include="System.Web.Mail\ToUUEncodingTransform.cs" />\r
-    <Compile Include="System.Web.Mail\UUAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Management\EventNotificationType.cs" />\r
-    <Compile Include="System.Web.Management\IRegiisUtility.cs" />\r
-    <Compile Include="System.Web.Management\IWebEventCustomEvaluator.cs" />\r
-    <Compile Include="System.Web.Management\RuleFiringRecord.cs" />\r
-    <Compile Include="System.Web.Management\SessionStateType.cs" />\r
-    <Compile Include="System.Web.Management\SqlFeatures.cs" />\r
-    <Compile Include="System.Web.Management\WebApplicationInformation.cs" />\r
-    <Compile Include="System.Web.Management\WebBaseEvent.cs" />\r
-    <Compile Include="System.Web.Management\WebEventCodes.cs" />\r
-    <Compile Include="System.Web.Management\WebEventFormatter.cs" />\r
-    <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileGroupBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileModule.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileParser.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderCollection.cs" />\r
-    <Compile Include="System.Web.Profile\SettingsAllowAnonymousAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
-    <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
-    <Compile Include="System.Web.Routing\PageRouteHandler.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationModule.cs" />\r
-    <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />\r
-    <Compile Include="System.Web.Security\CookieProtection.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
-    <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
-    <Compile Include="System.Web.Security\MachineKey.cs" />\r
-    <Compile Include="System.Web.Security\MachineKeyProtection.cs" />\r
-    <Compile Include="System.Web.Security\Membership.cs" />\r
-    <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
-    <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
-    <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\Roles.cs" />\r
-    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\RemoteStateServer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateBehavior.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreData.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreProviderBase.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateUtility.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlForm.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlGenericControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHead.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHeadBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputCheckBox.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputFile.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputHidden.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputPassword.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputRadioButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputReset.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputSubmit.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputText.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlLink.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlMeta.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelect.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelectBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTable.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCell.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRow.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTextArea.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTitle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\DataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HideDisabledControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\MenuAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\WebControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionConsumerCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPointType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionProviderCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConsumerConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundItemControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IFieldControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButtonControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuListRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuRenderingMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ProfileParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\QueryStringParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButtonList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RouteParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleBlock.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\View.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutNavigationContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Xml.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceNodeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourcePropertyDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ApplicationFileParser.cs" />\r
-    <Compile Include="System.Web.UI\AttributeCollection.cs" />\r
-    <Compile Include="System.Web.UI\BaseParser.cs" />\r
-    <Compile Include="System.Web.UI\BasePartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\BaseTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\BoundPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuildMethod.cs" />\r
-    <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
-    <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientIDMode.cs" />\r
-    <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
-    <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CollectionBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompilationMode.cs" />\r
-    <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Control.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
-    <Compile Include="System.Web.UI\ControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkin.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
-    <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBinder.cs" />\r
-    <Compile Include="System.Web.UI\DataBinding.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewSelectCallback.cs" />\r
-    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeParseData.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\EventEntry.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelMasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataKeysControl.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
-    <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
-    <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
-    <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
-    <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
-    <Compile Include="System.Web.UI\LiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\LosFormatter.cs" />\r
-    <Compile Include="System.Web.UI\MainDirectiveAttribute.cs" />\r
-    <Compile Include="System.Web.UI\MasterPage.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
-    <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
-    <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTag.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTagBuilder.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheLocation.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheParameters.cs" />\r
-    <Compile Include="System.Web.UI\Page.cs" />\r
-    <Compile Include="System.Web.UI\PageAsyncTask.cs" />\r
-    <Compile Include="System.Web.UI\PageHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\PageLifeCycle.cs" />\r
-    <Compile Include="System.Web.UI\PageParser.cs" />\r
-    <Compile Include="System.Web.UI\PageParserFilter.cs" />\r
-    <Compile Include="System.Web.UI\PageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\PageTheme.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeFileParser.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeParser.cs" />\r
-    <Compile Include="System.Web.UI\Pair.cs" />\r
-    <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
-    <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
-    <Compile Include="System.Web.UI\PropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ReadOnlyDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\RenderMethod.cs" />\r
-    <Compile Include="System.Web.UI\ResourceBasedLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\RootBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SessionPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\SimpleHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\SimplePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\SimpleWebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\SkinBuilder.cs" />\r
-    <Compile Include="System.Web.UI\StateBag.cs" />\r
-    <Compile Include="System.Web.UI\StateItem.cs" />\r
-    <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
-    <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControl.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
-    <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Triplet.cs" />\r
-    <Compile Include="System.Web.UI\UnknownAttributeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI\UrlPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\UrlTypes.cs" />\r
-    <Compile Include="System.Web.UI\UserControl.cs" />\r
-    <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\UserControlParser.cs" />\r
-    <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ValidatorCollection.cs" />\r
-    <Compile Include="System.Web.UI\VerificationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
-    <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
-    <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
-    <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\WebResourceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\WebServiceParser.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlMobileDocType.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\XPathBinder.cs" />\r
-    <Compile Include="System.Web.Util\AltSerialization.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceHelper.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceResolver.cs" />\r
-    <Compile Include="System.Web.Util\FileUtils.cs" />\r
-    <Compile Include="System.Web.Util\Helpers.cs" />\r
-    <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
-    <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
-    <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidationSource.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidator.cs" />\r
-    <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Web.Util\SearchPattern.cs" />\r
-    <Compile Include="System.Web.Util\SecureHashCodeProvider.cs" />\r
-    <Compile Include="System.Web.Util\SerializationHelper.cs" />\r
-    <Compile Include="System.Web.Util\SimpleWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\StrUtils.cs" />\r
-    <Compile Include="System.Web.Util\TimeUtil.cs" />\r
-    <Compile Include="System.Web.Util\TransactedCallback.cs" />\r
-    <Compile Include="System.Web.Util\Transactions.cs" />\r
-    <Compile Include="System.Web.Util\UrlUtils.cs" />\r
-    <Compile Include="System.Web.Util\WebEncoding.cs" />\r
-    <Compile Include="System.Web.Util\WebTrace.cs" />\r
-    <Compile Include="System.Web.Util\WorkItem.cs" />\r
-    <Compile Include="System.Web.Util\WorkItemCallback.cs" />\r
-    <Compile Include="System.Web\ApplicationShutdownReason.cs" />\r
-    <Compile Include="System.Web\BaseParamsCollection.cs" />\r
-    <Compile Include="System.Web\BeginEventHandler.cs" />\r
-    <Compile Include="System.Web\BrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\CapabilitiesLoader.cs" />\r
-    <Compile Include="System.Web\DefaultExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\DefaultHttpHandler.cs" />\r
-    <Compile Include="System.Web\EndEventHandler.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragment.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragmentValue.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateType.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />\r
-    <Compile Include="System.Web\HeadersCollection.cs" />\r
-    <Compile Include="System.Web\HtmlizedException.cs" />\r
-    <Compile Include="System.Web\HtmlString.cs" />\r
-    <Compile Include="System.Web\HttpApplication.cs" />\r
-    <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
-    <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpCacheability.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
-    <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByHeaders.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByParams.cs" />\r
-    <Compile Include="System.Web\HttpClientCertificate.cs" />\r
-    <Compile Include="System.Web\HttpCompileException.cs" />\r
-    <Compile Include="System.Web\HttpContext.cs" />\r
-    <Compile Include="System.Web\HttpCookie.cs" />\r
-    <Compile Include="System.Web\HttpCookieCollection.cs" />\r
-    <Compile Include="System.Web\HttpCookieMode.cs" />\r
-    <Compile Include="System.Web\HttpException.cs" />\r
-    <Compile Include="System.Web\HttpFileCollection.cs" />\r
-    <Compile Include="System.Web\HttpForbiddenHandler.cs" />\r
-    <Compile Include="System.Web\HttpHeaderCollection.cs" />\r
-    <Compile Include="System.Web\HttpMethodNotAllowedHandler.cs" />\r
-    <Compile Include="System.Web\HttpModuleCollection.cs" />\r
-    <Compile Include="System.Web\HttpNotFoundHandler.cs" />\r
-    <Compile Include="System.Web\HttpNotImplementedHandler.cs" />\r
-    <Compile Include="System.Web\HttpParamsCollection.cs" />\r
-    <Compile Include="System.Web\HttpParseException.cs" />\r
-    <Compile Include="System.Web\HttpPostedFile.cs" />\r
-    <Compile Include="System.Web\HttpRequest.cs" />\r
-    <Compile Include="System.Web\HttpRequestValidationException.cs" />\r
-    <Compile Include="System.Web\HttpResponse.cs" />\r
-    <Compile Include="System.Web\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Web\HttpResponseStream.cs" />\r
-    <Compile Include="System.Web\HttpResponseSubstitutionCallback.cs" />\r
-    <Compile Include="System.Web\HttpRuntime.cs" />\r
-    <Compile Include="System.Web\HttpServerUtility.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
-    <Compile Include="System.Web\HttpUnhandledException.cs" />\r
-    <Compile Include="System.Web\HttpUtility.cs" />\r
-    <Compile Include="System.Web\HttpValidationStatus.cs" />\r
-    <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
-    <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHtmlString.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
-    <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
-    <Compile Include="System.Web\IisTraceListener.cs" />\r
-    <Compile Include="System.Web\InputFilterStream.cs" />\r
-    <Compile Include="System.Web\IntPtrStream.cs" />\r
-    <Compile Include="System.Web\IPartitionResolver.cs" />\r
-    <Compile Include="System.Web\MimeTypes.cs" />\r
-    <Compile Include="System.Web\NoParamsInvoker.cs" />\r
-    <Compile Include="System.Web\OutputFilterStream.cs" />\r
-    <Compile Include="System.Web\ParserError.cs" />\r
-    <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\PreApplicationStartMethodAttribute.cs" />\r
-    <Compile Include="System.Web\ProcessInfo.cs" />\r
-    <Compile Include="System.Web\ProcessModelInfo.cs" />\r
-    <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
-    <Compile Include="System.Web\ProcessStatus.cs" />\r
-    <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
-    <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
-    <Compile Include="System.Web\SiteMap.cs" />\r
-    <Compile Include="System.Web\SiteMapNode.cs" />\r
-    <Compile Include="System.Web\SiteMapNodeCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapProvider.cs" />\r
-    <Compile Include="System.Web\SiteMapProviderCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapResolveEventArgs.cs" />\r
-    <Compile Include="System.Web\StaticFileHandler.cs" />\r
-    <Compile Include="System.Web\StaticSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\TempFileStream.cs" />\r
-    <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
-    <Compile Include="System.Web\TraceContextRecord.cs" />\r
-    <Compile Include="System.Web\TraceData.cs" />\r
-    <Compile Include="System.Web\TraceManager.cs" />\r
-    <Compile Include="System.Web\TraceMode.cs" />\r
-    <Compile Include="System.Web\VirtualPath.cs" />\r
-    <Compile Include="System.Web\VirtualPathUtility.cs" />\r
-    <Compile Include="System.Web\WebCategoryAttribute.cs" />\r
-    <Compile Include="System.Web\WebPageTraceListener.cs" />\r
-    <Compile Include="System.Web\WebROCollection.cs" />\r
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\XmlSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0.csproj">\r
-      <Project>{74084B98-6858-4133-998C-E594D367D8F1}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Web\Mono.Web-net_2_0.csproj">\r
-      <Project>{D02EAC8D-4C43-48F4-832A-7D9A3C2D07CF}</Project>\r
-      <Name>Mono.Web\Mono.Web-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">\r
-      <LogicalName>MenuModern.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web/System.Web-plainweb-net_2_0.csproj b/mcs/class/System.Web/System.Web-plainweb-net_2_0.csproj
deleted file mode 100644 (file)
index ff2009e..0000000
+++ /dev/null
@@ -1,1504 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2F43657C-B73B-44FF-B548-6734C967AA94}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0/plainweb</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\corlib\System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\Cache.cs" />\r
-    <Compile Include="System.Web.Caching\CacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />\r
-    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItem.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemEnumerator.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemLRU.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriority.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueue.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueueDebug.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedReason.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateReason.cs" />\r
-    <Compile Include="System.Web.Caching\DatabaseNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
-    <Compile Include="System.Web.Caching\TableNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Compilation\AppCodeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFileInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFilesCollection.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesAssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AppSettingsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppWebReferencesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponent.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponentFoundry.cs" />\r
-    <Compile Include="System.Web.Compilation\AspGenerator.cs" />\r
-    <Compile Include="System.Web.Compilation\AspParser.cs" />\r
-    <Compile Include="System.Web.Compilation\AspTokenizer.cs" />\r
-    <Compile Include="System.Web.Compilation\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BaseCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildDependencySet.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerCacheItem.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerDirectoryBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHost.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventArgs.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerCallback.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerParameter.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilationException.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilerType.cs" />\r
-    <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\Directive.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
-    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
-    <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\Location.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\PageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageThemeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ParseException.cs" />\r
-    <Compile Include="System.Web.Compilation\PrecompilationFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\PreservationFile.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionFields.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\SimpleBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TagAttributes.cs" />\r
-    <Compile Include="System.Web.Compilation\TagType.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WebHandlerBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModeSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProviderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesBuild.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesResult.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTarget.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectoriesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\Compiler.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationConfiguration.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HostingEnvironmentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationSystem.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCookiesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlersSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfile.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertyNameValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PropertyHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProvidersHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RegexWorker.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RoleManagerSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RootProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevelCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebControlsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
-    <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
-    <Compile Include="System.Web.Hosting\AppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationInfo.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationManager.cs" />\r
-    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\BareApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
-    <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFileBase.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Mail\Base64AttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\IAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Web.Mail\MailAttachment.cs" />\r
-    <Compile Include="System.Web.Mail\MailEncoding.cs" />\r
-    <Compile Include="System.Web.Mail\MailFormat.cs" />\r
-    <Compile Include="System.Web.Mail\MailHeader.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessageWrapper.cs" />\r
-    <Compile Include="System.Web.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Web.Mail\MailUtil.cs" />\r
-    <Compile Include="System.Web.Mail\RelatedBodyPart.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpMail.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpResponse.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpStream.cs" />\r
-    <Compile Include="System.Web.Mail\ToUUEncodingTransform.cs" />\r
-    <Compile Include="System.Web.Mail\UUAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Management\EventNotificationType.cs" />\r
-    <Compile Include="System.Web.Management\IRegiisUtility.cs" />\r
-    <Compile Include="System.Web.Management\IWebEventCustomEvaluator.cs" />\r
-    <Compile Include="System.Web.Management\RuleFiringRecord.cs" />\r
-    <Compile Include="System.Web.Management\SessionStateType.cs" />\r
-    <Compile Include="System.Web.Management\SqlFeatures.cs" />\r
-    <Compile Include="System.Web.Management\WebApplicationInformation.cs" />\r
-    <Compile Include="System.Web.Management\WebBaseEvent.cs" />\r
-    <Compile Include="System.Web.Management\WebEventCodes.cs" />\r
-    <Compile Include="System.Web.Management\WebEventFormatter.cs" />\r
-    <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileGroupBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileModule.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileParser.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderCollection.cs" />\r
-    <Compile Include="System.Web.Profile\SettingsAllowAnonymousAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
-    <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationModule.cs" />\r
-    <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />\r
-    <Compile Include="System.Web.Security\CookieProtection.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
-    <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
-    <Compile Include="System.Web.Security\Membership.cs" />\r
-    <Compile Include="System.Web.Security\MembershipCreateStatus.cs" />\r
-    <Compile Include="System.Web.Security\MembershipCreateUserException.cs" />\r
-    <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordException.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Security\MembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\MembershipProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\MembershipUser.cs" />\r
-    <Compile Include="System.Web.Security\MembershipUserCollection.cs" />\r
-    <Compile Include="System.Web.Security\MembershipValidatePasswordEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
-    <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
-    <Compile Include="System.Web.Security\RoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\Roles.cs" />\r
-    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\ValidatePasswordEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\RemoteStateServer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreData.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreProviderBase.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateUtility.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlForm.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlGenericControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHead.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHeadBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputCheckBox.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputFile.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputHidden.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputPassword.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputRadioButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputReset.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputSubmit.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputText.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlLink.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlMeta.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelect.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelectBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTable.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCell.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRow.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTextArea.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTitle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\DataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HideDisabledControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\MenuAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\WebControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionConsumerCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPointType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionProviderCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConsumerConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButtonControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ProfileParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\QueryStringParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButtonList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\View.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Xml.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceNodeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourcePropertyDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ApplicationFileParser.cs" />\r
-    <Compile Include="System.Web.UI\AttributeCollection.cs" />\r
-    <Compile Include="System.Web.UI\BaseParser.cs" />\r
-    <Compile Include="System.Web.UI\BasePartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\BaseTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\BoundPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuildMethod.cs" />\r
-    <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
-    <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
-    <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CollectionBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompilationMode.cs" />\r
-    <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Control.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
-    <Compile Include="System.Web.UI\ControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkin.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
-    <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBinder.cs" />\r
-    <Compile Include="System.Web.UI\DataBinding.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewSelectCallback.cs" />\r
-    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeParseData.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\EventEntry.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
-    <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
-    <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
-    <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
-    <Compile Include="System.Web.UI\KeyedList.cs" />\r
-    <Compile Include="System.Web.UI\KeyedListEnumerator.cs" />\r
-    <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
-    <Compile Include="System.Web.UI\LiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\LosFormatter.cs" />\r
-    <Compile Include="System.Web.UI\MainDirectiveAttribute.cs" />\r
-    <Compile Include="System.Web.UI\MasterPage.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
-    <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
-    <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTag.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTagBuilder.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheLocation.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheParameters.cs" />\r
-    <Compile Include="System.Web.UI\Page.cs" />\r
-    <Compile Include="System.Web.UI\PageAsyncTask.cs" />\r
-    <Compile Include="System.Web.UI\PageHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\PageLifeCycle.cs" />\r
-    <Compile Include="System.Web.UI\PageParser.cs" />\r
-    <Compile Include="System.Web.UI\PageParserFilter.cs" />\r
-    <Compile Include="System.Web.UI\PageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\PageTheme.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeFileParser.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeParser.cs" />\r
-    <Compile Include="System.Web.UI\Pair.cs" />\r
-    <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
-    <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
-    <Compile Include="System.Web.UI\PropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ReadOnlyDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\RenderMethod.cs" />\r
-    <Compile Include="System.Web.UI\ResourceBasedLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\RootBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SessionPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\SimpleHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\SimplePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\SimpleWebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\SkinBuilder.cs" />\r
-    <Compile Include="System.Web.UI\StateBag.cs" />\r
-    <Compile Include="System.Web.UI\StateItem.cs" />\r
-    <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
-    <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControl.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
-    <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Triplet.cs" />\r
-    <Compile Include="System.Web.UI\UnknownAttributeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI\UrlPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\UrlTypes.cs" />\r
-    <Compile Include="System.Web.UI\UserControl.cs" />\r
-    <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\UserControlParser.cs" />\r
-    <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ValidatorCollection.cs" />\r
-    <Compile Include="System.Web.UI\VerificationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
-    <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
-    <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
-    <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\WebResourceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\WebServiceParser.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlMobileDocType.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\XPathBinder.cs" />\r
-    <Compile Include="System.Web.Util\AltSerialization.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceHelper.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceResolver.cs" />\r
-    <Compile Include="System.Web.Util\FileUtils.cs" />\r
-    <Compile Include="System.Web.Util\Helpers.cs" />\r
-    <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
-    <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
-    <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Web.Util\SearchPattern.cs" />\r
-    <Compile Include="System.Web.Util\SecureHashCodeProvider.cs" />\r
-    <Compile Include="System.Web.Util\SerializationHelper.cs" />\r
-    <Compile Include="System.Web.Util\StrUtils.cs" />\r
-    <Compile Include="System.Web.Util\TimeUtil.cs" />\r
-    <Compile Include="System.Web.Util\TransactedCallback.cs" />\r
-    <Compile Include="System.Web.Util\Transactions.cs" />\r
-    <Compile Include="System.Web.Util\UrlUtils.cs" />\r
-    <Compile Include="System.Web.Util\WebEncoding.cs" />\r
-    <Compile Include="System.Web.Util\WebTrace.cs" />\r
-    <Compile Include="System.Web.Util\WorkItem.cs" />\r
-    <Compile Include="System.Web.Util\WorkItemCallback.cs" />\r
-    <Compile Include="System.Web\ApplicationShutdownReason.cs" />\r
-    <Compile Include="System.Web\BaseParamsCollection.cs" />\r
-    <Compile Include="System.Web\BeginEventHandler.cs" />\r
-    <Compile Include="System.Web\BrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\CapabilitiesLoader.cs" />\r
-    <Compile Include="System.Web\DefaultExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\DefaultHttpHandler.cs" />\r
-    <Compile Include="System.Web\EndEventHandler.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragment.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragmentValue.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateType.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />\r
-    <Compile Include="System.Web\HeadersCollection.cs" />\r
-    <Compile Include="System.Web\HtmlizedException.cs" />\r
-    <Compile Include="System.Web\HttpApplication.cs" />\r
-    <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
-    <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpCacheability.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
-    <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByHeaders.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByParams.cs" />\r
-    <Compile Include="System.Web\HttpClientCertificate.cs" />\r
-    <Compile Include="System.Web\HttpCompileException.cs" />\r
-    <Compile Include="System.Web\HttpContext.cs" />\r
-    <Compile Include="System.Web\HttpCookie.cs" />\r
-    <Compile Include="System.Web\HttpCookieCollection.cs" />\r
-    <Compile Include="System.Web\HttpCookieMode.cs" />\r
-    <Compile Include="System.Web\HttpException.cs" />\r
-    <Compile Include="System.Web\HttpFileCollection.cs" />\r
-    <Compile Include="System.Web\HttpForbiddenHandler.cs" />\r
-    <Compile Include="System.Web\HttpHeaderCollection.cs" />\r
-    <Compile Include="System.Web\HttpMethodNotAllowedHandler.cs" />\r
-    <Compile Include="System.Web\HttpModuleCollection.cs" />\r
-    <Compile Include="System.Web\HttpNotFoundHandler.cs" />\r
-    <Compile Include="System.Web\HttpNotImplementedHandler.cs" />\r
-    <Compile Include="System.Web\HttpParamsCollection.cs" />\r
-    <Compile Include="System.Web\HttpParseException.cs" />\r
-    <Compile Include="System.Web\HttpPostedFile.cs" />\r
-    <Compile Include="System.Web\HttpRequest.cs" />\r
-    <Compile Include="System.Web\HttpRequestValidationException.cs" />\r
-    <Compile Include="System.Web\HttpResponse.cs" />\r
-    <Compile Include="System.Web\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Web\HttpResponseStream.cs" />\r
-    <Compile Include="System.Web\HttpResponseSubstitutionCallback.cs" />\r
-    <Compile Include="System.Web\HttpRuntime.cs" />\r
-    <Compile Include="System.Web\HttpServerUtility.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
-    <Compile Include="System.Web\HttpUnhandledException.cs" />\r
-    <Compile Include="System.Web\HttpUtility.cs" />\r
-    <Compile Include="System.Web\HttpValidationStatus.cs" />\r
-    <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
-    <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
-    <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
-    <Compile Include="System.Web\IisTraceListener.cs" />\r
-    <Compile Include="System.Web\InputFilterStream.cs" />\r
-    <Compile Include="System.Web\IntPtrStream.cs" />\r
-    <Compile Include="System.Web\IPartitionResolver.cs" />\r
-    <Compile Include="System.Web\MimeTypes.cs" />\r
-    <Compile Include="System.Web\NoParamsInvoker.cs" />\r
-    <Compile Include="System.Web\OutputFilterStream.cs" />\r
-    <Compile Include="System.Web\ParserError.cs" />\r
-    <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\ProcessInfo.cs" />\r
-    <Compile Include="System.Web\ProcessModelInfo.cs" />\r
-    <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
-    <Compile Include="System.Web\ProcessStatus.cs" />\r
-    <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
-    <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
-    <Compile Include="System.Web\SiteMap.cs" />\r
-    <Compile Include="System.Web\SiteMapNode.cs" />\r
-    <Compile Include="System.Web\SiteMapNodeCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapProvider.cs" />\r
-    <Compile Include="System.Web\SiteMapProviderCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapResolveEventArgs.cs" />\r
-    <Compile Include="System.Web\StaticFileHandler.cs" />\r
-    <Compile Include="System.Web\StaticSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\TempFileStream.cs" />\r
-    <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
-    <Compile Include="System.Web\TraceContextRecord.cs" />\r
-    <Compile Include="System.Web\TraceData.cs" />\r
-    <Compile Include="System.Web\TraceManager.cs" />\r
-    <Compile Include="System.Web\TraceMode.cs" />\r
-    <Compile Include="System.Web\VirtualPath.cs" />\r
-    <Compile Include="System.Web\VirtualPathUtility.cs" />\r
-    <Compile Include="System.Web\WebCategoryAttribute.cs" />\r
-    <Compile Include="System.Web\WebPageTraceListener.cs" />\r
-    <Compile Include="System.Web\WebROCollection.cs" />\r
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\XmlSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_2_0.csproj">\r
-      <Project>{AAA3F683-244C-40EF-8EF8-A95938862A44}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-bare-net_2_0.csproj">\r
-      <Project>{5459507F-DC25-401C-A2F4-D5ECAC3A34E6}</Project>\r
-      <Name>System\System-bare-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-plaincore-net_2_0.csproj">\r
-      <Project>{F0743710-AB7C-4019-A13A-07AE79F514E4}</Project>\r
-      <Name>System.Core\System.Core-plaincore-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_2_0.csproj">\r
-      <Project>{50FE7D09-285C-480A-94F8-F42CB76A83CE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_2_0.csproj">\r
-      <Project>{3D0435AD-4ACE-45BE-87DE-335BAD6D8EB1}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_2_0.csproj">\r
-      <Project>{0E9DD462-944B-426E-BC1E-96EF270EF7E2}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{40E73340-6F24-460B-AC9D-77C9453B527B}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{48B07F1A-16F4-44B0-863F-40D5CD6C3CB3}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_2_0.csproj">\r
-      <Project>{13AAE1FB-48CB-41ED-BF9B-F6F69CDE258F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_2_0.csproj">\r
-      <Project>{CBE5E050-412D-4DE7-8937-0E8C4BD6762A}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_0.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_0.csproj
deleted file mode 100644 (file)
index 0db8e7c..0000000
+++ /dev/null
@@ -1,1582 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{07F1690D-4374-4A73-9C8B-E606AF372FF3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0/plainweb</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSTEM_WEB</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSTEM_WEB</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\corlib\System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="..\Managed.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternParser.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternToken.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternTokenType.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\Route.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteBase.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteCollection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteData.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteDirection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteTable.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionary.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionaryExtensions.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\StopRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingModule.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\VirtualPathData.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\Cache.cs" />\r
-    <Compile Include="System.Web.Caching\CacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />\r
-    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItem.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemEnumerator.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemLRU.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriority.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueue.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueueDebug.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedReason.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateReason.cs" />\r
-    <Compile Include="System.Web.Caching\DatabaseNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Caching\FileResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\HeaderElement.cs" />\r
-    <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\IOutputCacheEntry.cs" />\r
-    <Compile Include="System.Web.Caching\MemoryResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCache.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />\r
-    <Compile Include="System.Web.Caching\ResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
-    <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\TableNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Compilation\AppCodeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFileInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFilesCollection.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesAssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AppSettingsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppWebReferencesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponent.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponentFoundry.cs" />\r
-    <Compile Include="System.Web.Compilation\AspGenerator.cs" />\r
-    <Compile Include="System.Web.Compilation\AspParser.cs" />\r
-    <Compile Include="System.Web.Compilation\AspTokenizer.cs" />\r
-    <Compile Include="System.Web.Compilation\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BaseCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildDependencySet.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerCacheItem.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerDirectoryBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHost.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventArgs.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerCallback.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerParameter.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilationException.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilerType.cs" />\r
-    <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\Directive.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
-    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
-    <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\Location.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\PageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageThemeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ParseException.cs" />\r
-    <Compile Include="System.Web.Compilation\PrecompilationFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\PreservationFile.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionFields.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteUrlExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteValueExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\SimpleBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TagAttributes.cs" />\r
-    <Compile Include="System.Web.Compilation\TagType.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WebHandlerBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModeSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProviderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesBuild.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesResult.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTarget.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectoriesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\Compiler.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationConfiguration.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HostingEnvironmentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesDefaultProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationSystem.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCookiesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlersSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyCompatibilityMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfile.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertyNameValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PropertyHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProvidersHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RegexWorker.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RoleManagerSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RootProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevelCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VersionConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebControlsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
-    <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
-    <Compile Include="System.Web.Hosting\AppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationInfo.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationManager.cs" />\r
-    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\BareApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
-    <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFileBase.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Mail\Base64AttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\IAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Web.Mail\MailAttachment.cs" />\r
-    <Compile Include="System.Web.Mail\MailEncoding.cs" />\r
-    <Compile Include="System.Web.Mail\MailFormat.cs" />\r
-    <Compile Include="System.Web.Mail\MailHeader.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessageWrapper.cs" />\r
-    <Compile Include="System.Web.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Web.Mail\MailUtil.cs" />\r
-    <Compile Include="System.Web.Mail\RelatedBodyPart.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpMail.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpResponse.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpStream.cs" />\r
-    <Compile Include="System.Web.Mail\ToUUEncodingTransform.cs" />\r
-    <Compile Include="System.Web.Mail\UUAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Management\EventNotificationType.cs" />\r
-    <Compile Include="System.Web.Management\IRegiisUtility.cs" />\r
-    <Compile Include="System.Web.Management\IWebEventCustomEvaluator.cs" />\r
-    <Compile Include="System.Web.Management\RuleFiringRecord.cs" />\r
-    <Compile Include="System.Web.Management\SessionStateType.cs" />\r
-    <Compile Include="System.Web.Management\SqlFeatures.cs" />\r
-    <Compile Include="System.Web.Management\WebApplicationInformation.cs" />\r
-    <Compile Include="System.Web.Management\WebBaseEvent.cs" />\r
-    <Compile Include="System.Web.Management\WebEventCodes.cs" />\r
-    <Compile Include="System.Web.Management\WebEventFormatter.cs" />\r
-    <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileGroupBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileModule.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileParser.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderCollection.cs" />\r
-    <Compile Include="System.Web.Profile\SettingsAllowAnonymousAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
-    <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
-    <Compile Include="System.Web.Routing\PageRouteHandler.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationModule.cs" />\r
-    <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />\r
-    <Compile Include="System.Web.Security\CookieProtection.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
-    <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
-    <Compile Include="System.Web.Security\MachineKey.cs" />\r
-    <Compile Include="System.Web.Security\MachineKeyProtection.cs" />\r
-    <Compile Include="System.Web.Security\Membership.cs" />\r
-    <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
-    <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
-    <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\Roles.cs" />\r
-    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\RemoteStateServer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateBehavior.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreData.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreProviderBase.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateUtility.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlForm.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlGenericControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHead.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHeadBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputCheckBox.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputFile.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputHidden.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputPassword.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputRadioButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputReset.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputSubmit.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputText.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlLink.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlMeta.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelect.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelectBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTable.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCell.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRow.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTextArea.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTitle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\DataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HideDisabledControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\MenuAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\WebControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionConsumerCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPointType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionProviderCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConsumerConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundItemControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IFieldControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButtonControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuListRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuRenderingMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ProfileParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\QueryStringParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButtonList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RouteParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleBlock.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\View.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutNavigationContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Xml.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceNodeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourcePropertyDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ApplicationFileParser.cs" />\r
-    <Compile Include="System.Web.UI\AttributeCollection.cs" />\r
-    <Compile Include="System.Web.UI\BaseParser.cs" />\r
-    <Compile Include="System.Web.UI\BasePartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\BaseTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\BoundPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuildMethod.cs" />\r
-    <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
-    <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientIDMode.cs" />\r
-    <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
-    <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CollectionBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompilationMode.cs" />\r
-    <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Control.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
-    <Compile Include="System.Web.UI\ControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkin.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
-    <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBinder.cs" />\r
-    <Compile Include="System.Web.UI\DataBinding.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewSelectCallback.cs" />\r
-    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeParseData.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\EventEntry.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelMasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataKeysControl.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
-    <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
-    <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
-    <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
-    <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
-    <Compile Include="System.Web.UI\LiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\LosFormatter.cs" />\r
-    <Compile Include="System.Web.UI\MainDirectiveAttribute.cs" />\r
-    <Compile Include="System.Web.UI\MasterPage.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
-    <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
-    <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTag.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTagBuilder.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheLocation.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheParameters.cs" />\r
-    <Compile Include="System.Web.UI\Page.cs" />\r
-    <Compile Include="System.Web.UI\PageAsyncTask.cs" />\r
-    <Compile Include="System.Web.UI\PageHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\PageLifeCycle.cs" />\r
-    <Compile Include="System.Web.UI\PageParser.cs" />\r
-    <Compile Include="System.Web.UI\PageParserFilter.cs" />\r
-    <Compile Include="System.Web.UI\PageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\PageTheme.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeFileParser.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeParser.cs" />\r
-    <Compile Include="System.Web.UI\Pair.cs" />\r
-    <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
-    <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
-    <Compile Include="System.Web.UI\PropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ReadOnlyDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\RenderMethod.cs" />\r
-    <Compile Include="System.Web.UI\ResourceBasedLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\RootBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SessionPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\SimpleHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\SimplePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\SimpleWebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\SkinBuilder.cs" />\r
-    <Compile Include="System.Web.UI\StateBag.cs" />\r
-    <Compile Include="System.Web.UI\StateItem.cs" />\r
-    <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
-    <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControl.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
-    <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Triplet.cs" />\r
-    <Compile Include="System.Web.UI\UnknownAttributeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI\UrlPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\UrlTypes.cs" />\r
-    <Compile Include="System.Web.UI\UserControl.cs" />\r
-    <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\UserControlParser.cs" />\r
-    <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ValidatorCollection.cs" />\r
-    <Compile Include="System.Web.UI\VerificationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
-    <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
-    <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
-    <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\WebResourceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\WebServiceParser.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlMobileDocType.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\XPathBinder.cs" />\r
-    <Compile Include="System.Web.Util\AltSerialization.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceHelper.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceResolver.cs" />\r
-    <Compile Include="System.Web.Util\FileUtils.cs" />\r
-    <Compile Include="System.Web.Util\Helpers.cs" />\r
-    <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
-    <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
-    <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidationSource.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidator.cs" />\r
-    <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Web.Util\SearchPattern.cs" />\r
-    <Compile Include="System.Web.Util\SecureHashCodeProvider.cs" />\r
-    <Compile Include="System.Web.Util\SerializationHelper.cs" />\r
-    <Compile Include="System.Web.Util\SimpleWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\StrUtils.cs" />\r
-    <Compile Include="System.Web.Util\TimeUtil.cs" />\r
-    <Compile Include="System.Web.Util\TransactedCallback.cs" />\r
-    <Compile Include="System.Web.Util\Transactions.cs" />\r
-    <Compile Include="System.Web.Util\UrlUtils.cs" />\r
-    <Compile Include="System.Web.Util\WebEncoding.cs" />\r
-    <Compile Include="System.Web.Util\WebTrace.cs" />\r
-    <Compile Include="System.Web.Util\WorkItem.cs" />\r
-    <Compile Include="System.Web.Util\WorkItemCallback.cs" />\r
-    <Compile Include="System.Web\ApplicationShutdownReason.cs" />\r
-    <Compile Include="System.Web\BaseParamsCollection.cs" />\r
-    <Compile Include="System.Web\BeginEventHandler.cs" />\r
-    <Compile Include="System.Web\BrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\CapabilitiesLoader.cs" />\r
-    <Compile Include="System.Web\DefaultExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\DefaultHttpHandler.cs" />\r
-    <Compile Include="System.Web\EndEventHandler.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragment.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragmentValue.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateType.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />\r
-    <Compile Include="System.Web\HeadersCollection.cs" />\r
-    <Compile Include="System.Web\HtmlizedException.cs" />\r
-    <Compile Include="System.Web\HtmlString.cs" />\r
-    <Compile Include="System.Web\HttpApplication.cs" />\r
-    <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
-    <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpCacheability.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
-    <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByHeaders.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByParams.cs" />\r
-    <Compile Include="System.Web\HttpClientCertificate.cs" />\r
-    <Compile Include="System.Web\HttpCompileException.cs" />\r
-    <Compile Include="System.Web\HttpContext.cs" />\r
-    <Compile Include="System.Web\HttpCookie.cs" />\r
-    <Compile Include="System.Web\HttpCookieCollection.cs" />\r
-    <Compile Include="System.Web\HttpCookieMode.cs" />\r
-    <Compile Include="System.Web\HttpException.cs" />\r
-    <Compile Include="System.Web\HttpFileCollection.cs" />\r
-    <Compile Include="System.Web\HttpForbiddenHandler.cs" />\r
-    <Compile Include="System.Web\HttpHeaderCollection.cs" />\r
-    <Compile Include="System.Web\HttpMethodNotAllowedHandler.cs" />\r
-    <Compile Include="System.Web\HttpModuleCollection.cs" />\r
-    <Compile Include="System.Web\HttpNotFoundHandler.cs" />\r
-    <Compile Include="System.Web\HttpNotImplementedHandler.cs" />\r
-    <Compile Include="System.Web\HttpParamsCollection.cs" />\r
-    <Compile Include="System.Web\HttpParseException.cs" />\r
-    <Compile Include="System.Web\HttpPostedFile.cs" />\r
-    <Compile Include="System.Web\HttpRequest.cs" />\r
-    <Compile Include="System.Web\HttpRequestValidationException.cs" />\r
-    <Compile Include="System.Web\HttpResponse.cs" />\r
-    <Compile Include="System.Web\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Web\HttpResponseStream.cs" />\r
-    <Compile Include="System.Web\HttpResponseSubstitutionCallback.cs" />\r
-    <Compile Include="System.Web\HttpRuntime.cs" />\r
-    <Compile Include="System.Web\HttpServerUtility.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
-    <Compile Include="System.Web\HttpUnhandledException.cs" />\r
-    <Compile Include="System.Web\HttpUtility.cs" />\r
-    <Compile Include="System.Web\HttpValidationStatus.cs" />\r
-    <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
-    <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHtmlString.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
-    <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
-    <Compile Include="System.Web\IisTraceListener.cs" />\r
-    <Compile Include="System.Web\InputFilterStream.cs" />\r
-    <Compile Include="System.Web\IntPtrStream.cs" />\r
-    <Compile Include="System.Web\IPartitionResolver.cs" />\r
-    <Compile Include="System.Web\MimeTypes.cs" />\r
-    <Compile Include="System.Web\NoParamsInvoker.cs" />\r
-    <Compile Include="System.Web\OutputFilterStream.cs" />\r
-    <Compile Include="System.Web\ParserError.cs" />\r
-    <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\PreApplicationStartMethodAttribute.cs" />\r
-    <Compile Include="System.Web\ProcessInfo.cs" />\r
-    <Compile Include="System.Web\ProcessModelInfo.cs" />\r
-    <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
-    <Compile Include="System.Web\ProcessStatus.cs" />\r
-    <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
-    <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
-    <Compile Include="System.Web\SiteMap.cs" />\r
-    <Compile Include="System.Web\SiteMapNode.cs" />\r
-    <Compile Include="System.Web\SiteMapNodeCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapProvider.cs" />\r
-    <Compile Include="System.Web\SiteMapProviderCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapResolveEventArgs.cs" />\r
-    <Compile Include="System.Web\StaticFileHandler.cs" />\r
-    <Compile Include="System.Web\StaticSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\TempFileStream.cs" />\r
-    <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
-    <Compile Include="System.Web\TraceContextRecord.cs" />\r
-    <Compile Include="System.Web\TraceData.cs" />\r
-    <Compile Include="System.Web\TraceManager.cs" />\r
-    <Compile Include="System.Web\TraceMode.cs" />\r
-    <Compile Include="System.Web\VirtualPath.cs" />\r
-    <Compile Include="System.Web\VirtualPathUtility.cs" />\r
-    <Compile Include="System.Web\WebCategoryAttribute.cs" />\r
-    <Compile Include="System.Web\WebPageTraceListener.cs" />\r
-    <Compile Include="System.Web\WebROCollection.cs" />\r
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\XmlSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_0.csproj">\r
-      <Project>{5889848E-305B-4B11-B3B1-A25761DAFE45}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-secxml-net_4_0.csproj">\r
-      <Project>{ED114F49-84B3-4EF9-80EC-90D4EEF7FF8E}</Project>\r
-      <Name>System\System-secxml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-plaincore-net_4_0.csproj">\r
-      <Project>{2D5DF73B-C3E5-40E6-94DA-EE49231F1FB4}</Project>\r
-      <Name>System.Core\System.Core-plaincore-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_0.csproj">\r
-      <Project>{0320CF1C-6099-447E-8575-E19375FD69C1}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_0.csproj">\r
-      <Project>{F9CB6ED4-1F88-4C63-84BA-4A60E8E4CB9B}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_4_0.csproj">\r
-      <Project>{FB3BD508-7228-49CF-ADCA-F5D0C8E8ABCF}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{CDF0A0D0-F531-43DC-AA85-BF46C557558D}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{9206CB80-04F8-4C50-AFE6-D38D4B463AD7}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_0.csproj">\r
-      <Project>{41A642E0-E14A-4B75-B37B-28549F5536FC}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_0.csproj">\r
-      <Project>{ED82E2F3-5210-4BC1-B9BD-B37D44CCE407}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{21BBD9A9-836A-4BF0-81EF-CAFE55B11226}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">\r
-      <LogicalName>MenuModern.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web/System.Web-tests-net_2_0.csproj b/mcs/class/System.Web/System.Web-tests-net_2_0.csproj
deleted file mode 100644 (file)
index b558e29..0000000
+++ /dev/null
@@ -1,1322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D7874FFB-8F9F-4E48-9EEE-EB179D0AFAFF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingMinimal.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingNone.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingPermissionHelper.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\AssemblyInfo.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\CustomSection.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Global.asax.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\TestRoleProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\Author.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\AuthorConverter.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\Book.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\BookType.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\TagsNestedInClientTag.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\TestSiteMapProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTestLocal.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\System.Web.Caching\AggregateCacheDependencyTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheCas.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheDependencyCas.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTest_generated.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTestSupport.cs" />\r
-    <Compile Include="Test\System.Web.Caching\FileResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\HeaderElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\MemoryResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\OutputCacheTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\SqlCacheDependencyTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\SubstitutionResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\AppResourcesCompilerTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\AppSettingsExpressionBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\BuildManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\BuildProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\ClientBuildManagerParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\RouteUrlExpressionBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\TemplateControlCompilerTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AnonymousIdentificationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AssemblyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AssemblyInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthenticationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationRuleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationRuleTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\BufferModeSettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\BuildProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CacheSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ClientTargetSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ClientTargetTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CodeSubDirectoryTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CompilationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CustomErrorCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CustomErrorsSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\DeploymentSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\GlobalizationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\HostingEnvironmentSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\HttpCapabilitiesBaseCas.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\MachineKeySectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\MachineKeyValidationConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\NullableStringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ProfilePropertySettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\SiteMapSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\WebConfigurationManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.Handlers\TraceHandlerCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\AppDomainFactoryCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ApplicationHostCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ApplicationHostTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\HostingEnvironmentTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ISAPIRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\SimpleWorkerRequestCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\SimpleWorkerRequestTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\VirtualPathProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Mail\MailAttachmentCas.cs" />\r
-    <Compile Include="Test\System.Web.Mail\MailMessageCas.cs" />\r
-    <Compile Include="Test\System.Web.Mail\SmtpMailCas.cs" />\r
-    <Compile Include="Test\System.Web.Profile\ProfileInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\DefaultAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\DefaultAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FileAuthorizationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationTicketCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsIdentityCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsIdentityTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MachineKeyTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipProviderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipUserCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportIdentityCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\RolePrincipalTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\RolesTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\UrlAuthorizationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\WindowsAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\WindowsAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.SessionState\SessionStateModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.SessionState\StateRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.Adapters\ControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.Adapters\PageAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlAnchorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlAnchorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlContainerControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlContainerControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlFormCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlFormTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlGenericControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlImageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputCheckBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputCheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputFileCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputFileTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputHiddenCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputHiddenTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputPasswordCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputPasswordTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputRadioButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputRadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputResetCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputResetTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputSubmitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputSubmitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputTextCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputTextTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlLinkCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlLinkTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlMetaCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlMetaTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTextAreaCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTextAreaTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTitleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\DataBoundControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\HideDisabledControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\MenuAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\WebControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.WebParts\WebPartTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AccessDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AdCreatedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AdCreatedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AutoGeneratedFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseCompareValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseCompareValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataBoundControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BulletedListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonFieldBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalandarCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarDayCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarDayTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CallBackTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ChangePasswordTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CircleHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CommandFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompareValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompareValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompleteWizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ContentTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ControlParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CookieParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CreateUserWizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CreateUserWizardTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CrossPagePostingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CustomValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CustomValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataBoundControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataControlFieldCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataControlFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridPagerStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridPagerStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyArrayTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataSourceControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DropDownListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DropDownListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EditCommandColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EditCommandColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FileUploadTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontInfoCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontNamesConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontNamesConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontUnitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontUnitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HierarchicalDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HotSpotCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageMapTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LabelCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LabelTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LinkButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LinkButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LiteralCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LiteralTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginNameCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginNameTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginStatusCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginStatusTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MappingUrlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MasterPageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MenuItemBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MenuTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MonthChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MonthChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MultiViewControlBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MultiViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ObjectDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ObjectDataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagedDataSourceCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagedDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagerSettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PanelCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PanelTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PasswordRecoveryTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PolygonHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\QueryStringParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RangeValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RangeValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RectangleHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RegularExpressionValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RegularExpressionValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.2.0.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.4.0.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoUser.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RequiredFieldValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RouteParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SelectedDatesCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SelectedDatesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SessionParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SiteMapDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SiteMapPathTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SqlDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SqlDataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\StyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\StyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableFooterRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableFooterRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableItemStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableItemStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableSectionStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableSectionStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TargetConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TargetConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TemplateFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TestControlIDConverter.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TextBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TextBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ThemeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeBindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeStyleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeViewCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatedControlConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatedControlConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidationSummaryCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidationSummaryTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebColorConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebColorConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlDataSourceCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\AttributeCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\AttributeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\BaseParserCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ChtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CleanHtmlTextWriter.cs" />\r
-    <Compile Include="Test\System.Web.UI\ClientScriptManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CompiledTemplateBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ConstructorNeedsTagAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlBuilderAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CssStyleCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\CssStyleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBinderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBinderTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingHandlerAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingHandlerAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBoundLiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataKeyPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataSourceCacheDurationConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataSourceSelectArgumentsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignerDataBoundLiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignTimeParseDataCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignTimeTemplateParserCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\EmptyCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\Html32TextWriterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\HtmlTextWriterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\HtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ImageClickEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LiteralControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\LosFormatterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LosFormatterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\MinimizableAttributeTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectStateFormatterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectTagBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\OutputCacheParametersTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageParserFilterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageParserTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PairCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ParseChildrenAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PartialCachingAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PersistChildrenAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PersistenceModeAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PostBackOptionsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PropertyConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PropertyConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\RootBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateBagCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateBagTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StaticPartialCachingControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TagPrefixAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateContainerAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateInstanceAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TestUrlPropertyAttribute.cs" />\r
-    <Compile Include="Test\System.Web.UI\ToolboxDataAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ToolboxDataAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TripletCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\UserControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\UserControlControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ValidationPropertyAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ValidatorCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\XhtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\HttpEncoderTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\MachineKeySectionUtilsTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\RequestValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\TransactionsCas.cs" />\r
-    <Compile Include="Test\System.Web.Util\UrlUtilsTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\WorkItemCas.cs" />\r
-    <Compile Include="Test\System.Web\AppBrowsersTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationStateCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpBrowserCapabilitiesCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpBrowserCapabilitiesTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCachePolicyCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByContentEncodingsTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByHeadersCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByHeadersTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByParamsCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByParamsTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpClientCertificateCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpClientCertificateTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCompileExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpContext.cs" />\r
-    <Compile Include="Test\System.Web\HttpContextCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpExceptionTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpFileCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpModuleCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpParseExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestValidationExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpResponseCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpResponseTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRuntimeTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpServerUtilityCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpServerUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpStaticObjectsCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUnhandledExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUtilityCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpWorkerRequestCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpWriter.cs" />\r
-    <Compile Include="Test\System.Web\HttpWriterCas.cs" />\r
-    <Compile Include="Test\System.Web\ProcessInfoCas.cs" />\r
-    <Compile Include="Test\System.Web\ProcessModelInfoCas.cs" />\r
-    <Compile Include="Test\System.Web\SiteMapNodeTest.cs" />\r
-    <Compile Include="Test\System.Web\SiteMapProviderTest.cs" />\r
-    <Compile Include="Test\System.Web\StaticSiteMapProviderTest.cs" />\r
-    <Compile Include="Test\System.Web\TraceContextCas.cs" />\r
-    <Compile Include="Test\System.Web\TraceContextRecordTest.cs" />\r
-    <Compile Include="Test\System.Web\VirtualPathUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\XmlSiteMapProviderTest.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-2.csproj">\r
-      <Project>{293D054F-361B-4083-A422-FA1AC9476FC9}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_2_0.csproj">\r
-      <Project>{94E27660-C3DF-43D1-958A-94D68EF3131F}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">\r
-      <Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0.csproj">\r
-      <Project>{7B3F5668-ED1F-48EB-9897-E6BE6A1C8CB3}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_2_0.csproj">\r
-      <Project>{DA9F2EEC-4127-4B98-852E-78A0ED7A4A60}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Web\Mono.Web-net_2_0.csproj">\r
-      <Project>{D02EAC8D-4C43-48F4-832A-7D9A3C2D07CF}</Project>\r
-      <Name>Mono.Web\Mono.Web-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_2_0.csproj">\r
-      <Project>{328B62A2-55C4-420A-81C1-AEAB15A8F3A6}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Web.Extensions.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Web.Extensions.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax">\r
-      <LogicalName>Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx">\r
-      <LogicalName>My.ashx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master">\r
-      <LogicalName>My.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx">\r
-      <LogicalName>MyPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs">\r
-      <LogicalName>MyPage.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx">\r
-      <LogicalName>MyPageWithMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config">\r
-      <LogicalName>Web.mono.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.4.0">\r
-      <LogicalName>Web.mono.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/sub_map_01.sitemap">\r
-      <LogicalName>sub_map_01.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap">\r
-      <LogicalName>test_map_01.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap">\r
-      <LogicalName>test_map_02.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_03.sitemap">\r
-      <LogicalName>test_map_03.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_04.sitemap">\r
-      <LogicalName>test_map_04.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_05.sitemap">\r
-      <LogicalName>test_map_05.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_06.sitemap">\r
-      <LogicalName>test_map_06.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_07.sitemap">\r
-      <LogicalName>test_map_07.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_08.sitemap">\r
-      <LogicalName>test_map_08.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_09.sitemap">\r
-      <LogicalName>test_map_09.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/menuclass.aspx">\r
-      <LogicalName>menuclass.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormView.aspx">\r
-      <LogicalName>FormView.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx">\r
-      <LogicalName>PostBackMenuTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx">\r
-      <LogicalName>PageWithStyleSheet.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithTheme.aspx">\r
-      <LogicalName>PageWithTheme.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ResolveUrl.ascx">\r
-      <LogicalName>ResolveUrl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ResolveUrl.aspx">\r
-      <LogicalName>ResolveUrl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/RunTimeSetTheme.aspx">\r
-      <LogicalName>RunTimeSetTheme.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadOnlyPropertyBind.aspx">\r
-      <LogicalName>ReadOnlyPropertyBind.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadOnlyPropertyControl.ascx">\r
-      <LogicalName>ReadOnlyPropertyControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Theme1.skin">\r
-      <LogicalName>Theme1.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Theme2.skin">\r
-      <LogicalName>Theme2.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.aspx">\r
-      <LogicalName>UrlProperty.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.ascx">\r
-      <LogicalName>UrlProperty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.ascx.cs">\r
-      <LogicalName>UrlProperty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Web.sitemap">\r
-      <LogicalName>Web.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WizardTest.skin">\r
-      <LogicalName>WizardTest.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FooterTemplateTest.aspx">\r
-      <LogicalName>FooterTemplateTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DataGrid.aspx">\r
-      <LogicalName>DataGrid.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates.aspx">\r
-      <LogicalName>DetailsViewTemplates.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates_2.aspx">\r
-      <LogicalName>DetailsViewTemplates_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates_3.aspx">\r
-      <LogicalName>DetailsViewTemplates_3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx">\r
-      <LogicalName>DetailsViewDataActions.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewProperties1.aspx">\r
-      <LogicalName>DetailsViewProperties1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Bluehills.jpg">\r
-      <LogicalName>Bluehills.jpg</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1.aspx">\r
-      <LogicalName>FormViewTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_2.aspx">\r
-      <LogicalName>FormViewTest1_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_3.aspx">\r
-      <LogicalName>FormViewTest1_3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_4.aspx">\r
-      <LogicalName>FormViewTest1_4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewInsertEditDelete.aspx">\r
-      <LogicalName>FormViewInsertEditDelete.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GridViewUpdate.aspx">\r
-      <LogicalName>GridViewUpdate.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest.xml">\r
-      <LogicalName>XMLDataSourceTest.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest.xsl">\r
-      <LogicalName>XMLDataSourceTest.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest1.aspx">\r
-      <LogicalName>XMLDataSourceTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest2.aspx">\r
-      <LogicalName>XMLDataSourceTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest3.aspx">\r
-      <LogicalName>XMLDataSourceTest3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest4.aspx">\r
-      <LogicalName>XMLDataSourceTest4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LoginViewTest1.aspx">\r
-      <LogicalName>LoginViewTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebControl.config">\r
-      <LogicalName>WebControl.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebLogin.config">\r
-      <LogicalName>WebLogin.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CallbackTest1.aspx">\r
-      <LogicalName>CallbackTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CallbackTest2.aspx">\r
-      <LogicalName>CallbackTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EventValidationTest2.aspx">\r
-      <LogicalName>EventValidationTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EventValidationTest1.aspx">\r
-      <LogicalName>EventValidationTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ClientScript.js">\r
-      <LogicalName>ClientScript.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EvalTest.aspx">\r
-      <LogicalName>EvalTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TemplateUserControl.ascx">\r
-      <LogicalName>TemplateUserControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebMapping.config">\r
-      <LogicalName>WebMapping.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Mapping.aspx">\r
-      <LogicalName>Mapping.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Mapping1.aspx">\r
-      <LogicalName>Mapping1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CrossPagePosting1.aspx">\r
-      <LogicalName>CrossPagePosting1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CrossPagePosting2.aspx">\r
-      <LogicalName>CrossPagePosting2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MyDerived.master">\r
-      <LogicalName>MyDerived.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MyPageWithDerivedMaster.aspx">\r
-      <LogicalName>MyPageWithDerivedMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MasterTypeTest1.aspx">\r
-      <LogicalName>MasterTypeTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MasterTypeTest2.aspx">\r
-      <LogicalName>MasterTypeTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageLifecycleTest.aspx">\r
-      <LogicalName>PageLifecycleTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageValidationTest.aspx">\r
-      <LogicalName>PageValidationTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/AsyncPage.aspx">\r
-      <LogicalName>AsyncPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageCultureTest.aspx">\r
-      <LogicalName>PageCultureTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/adapters.browser">\r
-      <LogicalName>adapters.browser</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoEventValidation.aspx">\r
-      <LogicalName>NoEventValidation.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ListControlPage.aspx">\r
-      <LogicalName>ListControlPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TextBoxTestlPage.aspx">\r
-      <LogicalName>TextBoxTestlPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ClearErrorOnError.aspx">\r
-      <LogicalName>ClearErrorOnError.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/RedirectOnError.aspx">\r
-      <LogicalName>RedirectOnError.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TestCapability.browser">\r
-      <LogicalName>TestCapability.browser</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithAdapter.aspx">\r
-      <LogicalName>PageWithAdapter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind1.aspx">\r
-      <LogicalName>InvalidPropertyBind1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind2.aspx">\r
-      <LogicalName>InvalidPropertyBind2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind3.aspx">\r
-      <LogicalName>InvalidPropertyBind3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind4.aspx">\r
-      <LogicalName>InvalidPropertyBind4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind1.aspx">\r
-      <LogicalName>ValidPropertyBind1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind2.aspx">\r
-      <LogicalName>ValidPropertyBind2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind3.aspx">\r
-      <LogicalName>ValidPropertyBind3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind4.aspx">\r
-      <LogicalName>ValidPropertyBind4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind5.aspx">\r
-      <LogicalName>ValidPropertyBind5.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadWritePropertyControl.ascx">\r
-      <LogicalName>ReadWritePropertyControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/MainsoftWebTest/nunitweb_config.xml">\r
-      <LogicalName>nunitweb_config.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TemplateControlParsingTest.aspx">\r
-      <LogicalName>TemplateControlParsingTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx">\r
-      <LogicalName>ContentPlaceHolderInTemplate.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master">\r
-      <LogicalName>ContentPlaceHolderInTemplate.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MissingMasterFile.aspx">\r
-      <LogicalName>MissingMasterFile.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CustomSectionEmptyCollection.aspx">\r
-      <LogicalName>CustomSectionEmptyCollection.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx">\r
-      <LogicalName>NoDoubleOnInitOnRemoveAdd.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs">\r
-      <LogicalName>NoDoubleOnInitOnRemoveAdd.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LoginDisplayRememberMe.aspx">\r
-      <LogicalName>LoginDisplayRememberMe.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoBindForMethodsWithBindInName.aspx">\r
-      <LogicalName>NoBindForMethodsWithBindInName.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LinkInHeadWithEmbeddedExpression.aspx">\r
-      <LogicalName>LinkInHeadWithEmbeddedExpression.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ExpressionInListControl.aspx">\r
-      <LogicalName>ExpressionInListControl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ServerSideControlsInScriptBlock.aspx">\r
-      <LogicalName>ServerSideControlsInScriptBlock.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ServerControlInClientSideComment.aspx">\r
-      <LogicalName>ServerControlInClientSideComment.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PreprocessorDirectivesInMarkup.aspx">\r
-      <LogicalName>PreprocessorDirectivesInMarkup.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UnquotedAngleBrackets.aspx">\r
-      <LogicalName>UnquotedAngleBrackets.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FullTagsInText.aspx">\r
-      <LogicalName>FullTagsInText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagsExpressionsAndCommentsInText.aspx">\r
-      <LogicalName>TagsExpressionsAndCommentsInText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NewlineInCodeExpression.aspx">\r
-      <LogicalName>NewlineInCodeExpression.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DuplicateControlsInClientComment.aspx">\r
-      <LogicalName>DuplicateControlsInClientComment.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagsNestedInClientTag.aspx">\r
-      <LogicalName>TagsNestedInClientTag.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ConditionalClientComments.aspx">\r
-      <LogicalName>ConditionalClientComments.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/OneLetterIdentifierInCodeRender.aspx">\r
-      <LogicalName>OneLetterIdentifierInCodeRender.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GlobalResourcesLocalization.aspx">\r
-      <LogicalName>GlobalResourcesLocalization.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TableSections_Bug551666.aspx">\r
-      <LogicalName>TableSections_Bug551666.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TableSections_Bug551666.aspx.cs">\r
-      <LogicalName>TableSections_Bug551666.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NestedParserFileText.aspx">\r
-      <LogicalName>NestedParserFileText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CorrectConverter.aspx">\r
-      <LogicalName>StateFormatter_CorrectConverter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx">\r
-      <LogicalName>StateFormatter_CollectionConverter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx.cs">\r
-      <LogicalName>StateFormatter_CollectionConverter.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ChangePasswordContainer_FindControl.aspx">\r
-      <LogicalName>ChangePasswordContainer_FindControl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagWithExpressionWithinAttribute.aspx">\r
-      <LogicalName>TagWithExpressionWithinAttribute.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_1.aspx">\r
-      <LogicalName>CheckBoxList_Bug377703_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_2.aspx">\r
-      <LogicalName>CheckBoxList_Bug377703_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug578770.aspx">\r
-      <LogicalName>CheckBoxList_Bug578770.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EnumConverter_Bug578586.aspx">\r
-      <LogicalName>EnumConverter_Bug578586.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ButtonColor_Bug325489.aspx">\r
-      <LogicalName>ButtonColor_Bug325489.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/SqlDataSource_OnInit_Bug572781.aspx">\r
-      <LogicalName>SqlDataSource_OnInit_Bug572781.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewPagerVisibility.aspx">\r
-      <LogicalName>FormViewPagerVisibility.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/OverridenControlsPropertyAndPostBack_Bug594238.aspx">\r
-      <LogicalName>OverridenControlsPropertyAndPostBack_Bug594238.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GlobalizationEncodingName.aspx">\r
-      <LogicalName>GlobalizationEncodingName.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_0.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_0.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_1.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_2.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_5.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_5.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_6.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_6.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_7.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_7.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GridView_Bug595567.aspx">\r
-      <LogicalName>GridView_Bug595567.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug600415.aspx">\r
-      <LogicalName>CheckBoxList_Bug600415.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx">\r
-      <LogicalName>BoundField_Bug646505.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs">\r
-      <LogicalName>BoundField_Bug646505.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx">\r
-      <LogicalName>HtmlTitleCodeRender_Bug662918.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/EnumConverterControl.cs">\r
-      <LogicalName>App_Code/EnumConverterControl.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/MyContainer.cs">\r
-      <LogicalName>App_Code/MyContainer.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/CustomCheckBoxColumn.cs">\r
-      <LogicalName>App_Code/CustomCheckBoxColumn.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Common.resx">\r
-      <LogicalName>App_GlobalResources/Common.resx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Common.fr-FR.resx">\r
-      <LogicalName>App_GlobalResources/Common.fr-FR.resx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Resource1.resx">\r
-      <LogicalName>App_GlobalResources/Resource1.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Web/System.Web-tests-net_4_0.csproj b/mcs/class/System.Web/System.Web-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 88cbb2a..0000000
+++ /dev/null
@@ -1,1324 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9164E8CD-EEBE-4D1D-9FA6-914C8D72267E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingMinimal.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingNone.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingPermissionHelper.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\AssemblyInfo.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\CustomSection.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Global.asax.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\TestRoleProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\Author.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\AuthorConverter.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\Book.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\BookType.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\TagsNestedInClientTag.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\TestSiteMapProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTestLocal.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\System.Web.Caching\AggregateCacheDependencyTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheCas.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheDependencyCas.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTest_generated.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTestSupport.cs" />\r
-    <Compile Include="Test\System.Web.Caching\FileResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\HeaderElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\MemoryResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\OutputCacheTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\SqlCacheDependencyTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\SubstitutionResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\AppResourcesCompilerTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\AppSettingsExpressionBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\BuildManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\BuildProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\ClientBuildManagerParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\RouteUrlExpressionBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\TemplateControlCompilerTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AnonymousIdentificationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AssemblyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AssemblyInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthenticationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationRuleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationRuleTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\BufferModeSettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\BuildProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CacheSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ClientTargetSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ClientTargetTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CodeSubDirectoryTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CompilationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CustomErrorCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CustomErrorsSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\DeploymentSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\GlobalizationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\HostingEnvironmentSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\HttpCapabilitiesBaseCas.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\MachineKeySectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\MachineKeyValidationConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\NullableStringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ProfilePropertySettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\SiteMapSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\WebConfigurationManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.Handlers\TraceHandlerCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\AppDomainFactoryCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ApplicationHostCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ApplicationHostTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\HostingEnvironmentTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ISAPIRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\SimpleWorkerRequestCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\SimpleWorkerRequestTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\VirtualPathProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Mail\MailAttachmentCas.cs" />\r
-    <Compile Include="Test\System.Web.Mail\MailMessageCas.cs" />\r
-    <Compile Include="Test\System.Web.Mail\SmtpMailCas.cs" />\r
-    <Compile Include="Test\System.Web.Profile\ProfileInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\DefaultAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\DefaultAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FileAuthorizationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationTicketCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsIdentityCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsIdentityTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MachineKeyTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipProviderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipUserCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportIdentityCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\RolePrincipalTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\RolesTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\UrlAuthorizationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\WindowsAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\WindowsAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.SessionState\SessionStateModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.SessionState\StateRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.Adapters\ControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.Adapters\PageAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlAnchorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlAnchorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlContainerControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlContainerControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlFormCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlFormTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlGenericControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlImageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputCheckBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputCheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputFileCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputFileTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputHiddenCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputHiddenTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputPasswordCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputPasswordTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputRadioButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputRadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputResetCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputResetTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputSubmitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputSubmitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputTextCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputTextTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlLinkCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlLinkTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlMetaCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlMetaTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTextAreaCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTextAreaTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTitleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\DataBoundControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\HideDisabledControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\MenuAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\WebControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.WebParts\WebPartTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AccessDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AdCreatedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AdCreatedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AutoGeneratedFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseCompareValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseCompareValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataBoundControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BulletedListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonFieldBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalandarCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarDayCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarDayTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CallBackTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ChangePasswordTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CircleHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CommandFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompareValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompareValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompleteWizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ContentTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ControlParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CookieParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CreateUserWizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CreateUserWizardTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CrossPagePostingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CustomValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CustomValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataBoundControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataControlFieldCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataControlFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridPagerStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridPagerStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyArrayTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataSourceControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DropDownListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DropDownListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EditCommandColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EditCommandColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FileUploadTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontInfoCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontNamesConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontNamesConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontUnitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontUnitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HierarchicalDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HotSpotCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageMapTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LabelCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LabelTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LinkButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LinkButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LiteralCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LiteralTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginNameCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginNameTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginStatusCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginStatusTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MappingUrlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MasterPageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MenuItemBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MenuTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MonthChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MonthChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MultiViewControlBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MultiViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ObjectDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ObjectDataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagedDataSourceCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagedDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagerSettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PanelCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PanelTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PasswordRecoveryTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PolygonHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\QueryStringParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RangeValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RangeValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RectangleHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RegularExpressionValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RegularExpressionValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.2.0.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.4.0.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoUser.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RequiredFieldValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RouteParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SelectedDatesCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SelectedDatesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SessionParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SiteMapDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SiteMapPathTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SqlDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SqlDataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\StyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\StyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableFooterRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableFooterRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableItemStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableItemStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableSectionStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableSectionStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TargetConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TargetConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TemplateFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TestControlIDConverter.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TextBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TextBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ThemeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeBindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeStyleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeViewCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatedControlConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatedControlConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidationSummaryCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidationSummaryTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebColorConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebColorConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlDataSourceCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\AttributeCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\AttributeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\BaseParserCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ChtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CleanHtmlTextWriter.cs" />\r
-    <Compile Include="Test\System.Web.UI\ClientScriptManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CompiledTemplateBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ConstructorNeedsTagAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlBuilderAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CssStyleCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\CssStyleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBinderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBinderTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingHandlerAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingHandlerAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBoundLiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataKeyPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataSourceCacheDurationConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataSourceSelectArgumentsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignerDataBoundLiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignTimeParseDataCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignTimeTemplateParserCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\EmptyCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\Html32TextWriterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\HtmlTextWriterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\HtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ImageClickEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LiteralControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\LosFormatterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LosFormatterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\MinimizableAttributeTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectStateFormatterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectTagBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\OutputCacheParametersTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageParserFilterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageParserTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PairCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ParseChildrenAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PartialCachingAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PersistChildrenAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PersistenceModeAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PostBackOptionsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PropertyConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PropertyConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\RootBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateBagCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateBagTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StaticPartialCachingControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TagPrefixAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateContainerAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateInstanceAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TestUrlPropertyAttribute.cs" />\r
-    <Compile Include="Test\System.Web.UI\ToolboxDataAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ToolboxDataAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TripletCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\UserControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\UserControlControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ValidationPropertyAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ValidatorCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\XhtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\HttpEncoderTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\MachineKeySectionUtilsTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\RequestValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\TransactionsCas.cs" />\r
-    <Compile Include="Test\System.Web.Util\UrlUtilsTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\WorkItemCas.cs" />\r
-    <Compile Include="Test\System.Web\AppBrowsersTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationStateCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpBrowserCapabilitiesCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpBrowserCapabilitiesTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCachePolicyCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByContentEncodingsTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByHeadersCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByHeadersTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByParamsCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByParamsTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpClientCertificateCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpClientCertificateTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCompileExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpContext.cs" />\r
-    <Compile Include="Test\System.Web\HttpContextCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpExceptionTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpFileCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpModuleCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpParseExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestValidationExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpResponseCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpResponseTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRuntimeTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpServerUtilityCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpServerUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpStaticObjectsCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUnhandledExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUtilityCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpWorkerRequestCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpWriter.cs" />\r
-    <Compile Include="Test\System.Web\HttpWriterCas.cs" />\r
-    <Compile Include="Test\System.Web\ProcessInfoCas.cs" />\r
-    <Compile Include="Test\System.Web\ProcessModelInfoCas.cs" />\r
-    <Compile Include="Test\System.Web\SiteMapNodeTest.cs" />\r
-    <Compile Include="Test\System.Web\SiteMapProviderTest.cs" />\r
-    <Compile Include="Test\System.Web\StaticSiteMapProviderTest.cs" />\r
-    <Compile Include="Test\System.Web\TraceContextCas.cs" />\r
-    <Compile Include="Test\System.Web\TraceContextRecordTest.cs" />\r
-    <Compile Include="Test\System.Web\VirtualPathUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\XmlSiteMapProviderTest.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-2.csproj">\r
-      <Project>{2AB66C1A-6094-4C45-AF9B-FA85F8D5E98A}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_0.csproj">\r
-      <Project>{C8124AA3-044F-4027-BD71-4810346B8FB6}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0.csproj">\r
-      <Project>{74084B98-6858-4133-998C-E594D367D8F1}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0.csproj">\r
-      <Project>{3B707FB5-0AB3-472A-BB49-7598CF2607B0}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_0.csproj">\r
-      <Project>{75EA05AE-77E9-44DA-9ECC-CC5808134137}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Web\Mono.Web-net_4_0.csproj">\r
-      <Project>{04EE9360-5C89-4849-A14F-B74358595976}</Project>\r
-      <Name>Mono.Web\Mono.Web-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_4_0.csproj">\r
-      <Project>{D4CC2FBC-04C8-446E-915D-69ABC8FFFFAE}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">\r
-      <LogicalName>MenuModern.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax">\r
-      <LogicalName>Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx">\r
-      <LogicalName>My.ashx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master">\r
-      <LogicalName>My.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx">\r
-      <LogicalName>MyPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs">\r
-      <LogicalName>MyPage.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx">\r
-      <LogicalName>MyPageWithMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config">\r
-      <LogicalName>Web.mono.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.4.0">\r
-      <LogicalName>Web.mono.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/sub_map_01.sitemap">\r
-      <LogicalName>sub_map_01.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap">\r
-      <LogicalName>test_map_01.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap">\r
-      <LogicalName>test_map_02.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_03.sitemap">\r
-      <LogicalName>test_map_03.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_04.sitemap">\r
-      <LogicalName>test_map_04.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_05.sitemap">\r
-      <LogicalName>test_map_05.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_06.sitemap">\r
-      <LogicalName>test_map_06.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_07.sitemap">\r
-      <LogicalName>test_map_07.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_08.sitemap">\r
-      <LogicalName>test_map_08.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_09.sitemap">\r
-      <LogicalName>test_map_09.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/menuclass.aspx">\r
-      <LogicalName>menuclass.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormView.aspx">\r
-      <LogicalName>FormView.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx">\r
-      <LogicalName>PostBackMenuTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx">\r
-      <LogicalName>PageWithStyleSheet.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithTheme.aspx">\r
-      <LogicalName>PageWithTheme.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ResolveUrl.ascx">\r
-      <LogicalName>ResolveUrl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ResolveUrl.aspx">\r
-      <LogicalName>ResolveUrl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/RunTimeSetTheme.aspx">\r
-      <LogicalName>RunTimeSetTheme.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadOnlyPropertyBind.aspx">\r
-      <LogicalName>ReadOnlyPropertyBind.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadOnlyPropertyControl.ascx">\r
-      <LogicalName>ReadOnlyPropertyControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Theme1.skin">\r
-      <LogicalName>Theme1.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Theme2.skin">\r
-      <LogicalName>Theme2.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.aspx">\r
-      <LogicalName>UrlProperty.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.ascx">\r
-      <LogicalName>UrlProperty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.ascx.cs">\r
-      <LogicalName>UrlProperty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Web.sitemap">\r
-      <LogicalName>Web.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WizardTest.skin">\r
-      <LogicalName>WizardTest.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FooterTemplateTest.aspx">\r
-      <LogicalName>FooterTemplateTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DataGrid.aspx">\r
-      <LogicalName>DataGrid.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates.aspx">\r
-      <LogicalName>DetailsViewTemplates.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates_2.aspx">\r
-      <LogicalName>DetailsViewTemplates_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates_3.aspx">\r
-      <LogicalName>DetailsViewTemplates_3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx">\r
-      <LogicalName>DetailsViewDataActions.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewProperties1.aspx">\r
-      <LogicalName>DetailsViewProperties1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Bluehills.jpg">\r
-      <LogicalName>Bluehills.jpg</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1.aspx">\r
-      <LogicalName>FormViewTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_2.aspx">\r
-      <LogicalName>FormViewTest1_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_3.aspx">\r
-      <LogicalName>FormViewTest1_3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_4.aspx">\r
-      <LogicalName>FormViewTest1_4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewInsertEditDelete.aspx">\r
-      <LogicalName>FormViewInsertEditDelete.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GridViewUpdate.aspx">\r
-      <LogicalName>GridViewUpdate.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest.xml">\r
-      <LogicalName>XMLDataSourceTest.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest.xsl">\r
-      <LogicalName>XMLDataSourceTest.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest1.aspx">\r
-      <LogicalName>XMLDataSourceTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest2.aspx">\r
-      <LogicalName>XMLDataSourceTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest3.aspx">\r
-      <LogicalName>XMLDataSourceTest3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest4.aspx">\r
-      <LogicalName>XMLDataSourceTest4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LoginViewTest1.aspx">\r
-      <LogicalName>LoginViewTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebControl.config">\r
-      <LogicalName>WebControl.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebLogin.config">\r
-      <LogicalName>WebLogin.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CallbackTest1.aspx">\r
-      <LogicalName>CallbackTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CallbackTest2.aspx">\r
-      <LogicalName>CallbackTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EventValidationTest2.aspx">\r
-      <LogicalName>EventValidationTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EventValidationTest1.aspx">\r
-      <LogicalName>EventValidationTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ClientScript.js">\r
-      <LogicalName>ClientScript.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EvalTest.aspx">\r
-      <LogicalName>EvalTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TemplateUserControl.ascx">\r
-      <LogicalName>TemplateUserControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebMapping.config">\r
-      <LogicalName>WebMapping.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Mapping.aspx">\r
-      <LogicalName>Mapping.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Mapping1.aspx">\r
-      <LogicalName>Mapping1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CrossPagePosting1.aspx">\r
-      <LogicalName>CrossPagePosting1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CrossPagePosting2.aspx">\r
-      <LogicalName>CrossPagePosting2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MyDerived.master">\r
-      <LogicalName>MyDerived.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MyPageWithDerivedMaster.aspx">\r
-      <LogicalName>MyPageWithDerivedMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MasterTypeTest1.aspx">\r
-      <LogicalName>MasterTypeTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MasterTypeTest2.aspx">\r
-      <LogicalName>MasterTypeTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageLifecycleTest.aspx">\r
-      <LogicalName>PageLifecycleTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageValidationTest.aspx">\r
-      <LogicalName>PageValidationTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/AsyncPage.aspx">\r
-      <LogicalName>AsyncPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageCultureTest.aspx">\r
-      <LogicalName>PageCultureTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/adapters.browser">\r
-      <LogicalName>adapters.browser</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoEventValidation.aspx">\r
-      <LogicalName>NoEventValidation.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ListControlPage.aspx">\r
-      <LogicalName>ListControlPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TextBoxTestlPage.aspx">\r
-      <LogicalName>TextBoxTestlPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ClearErrorOnError.aspx">\r
-      <LogicalName>ClearErrorOnError.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/RedirectOnError.aspx">\r
-      <LogicalName>RedirectOnError.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TestCapability.browser">\r
-      <LogicalName>TestCapability.browser</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithAdapter.aspx">\r
-      <LogicalName>PageWithAdapter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind1.aspx">\r
-      <LogicalName>InvalidPropertyBind1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind2.aspx">\r
-      <LogicalName>InvalidPropertyBind2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind3.aspx">\r
-      <LogicalName>InvalidPropertyBind3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind4.aspx">\r
-      <LogicalName>InvalidPropertyBind4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind1.aspx">\r
-      <LogicalName>ValidPropertyBind1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind2.aspx">\r
-      <LogicalName>ValidPropertyBind2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind3.aspx">\r
-      <LogicalName>ValidPropertyBind3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind4.aspx">\r
-      <LogicalName>ValidPropertyBind4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind5.aspx">\r
-      <LogicalName>ValidPropertyBind5.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadWritePropertyControl.ascx">\r
-      <LogicalName>ReadWritePropertyControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/MainsoftWebTest/nunitweb_config.xml">\r
-      <LogicalName>nunitweb_config.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TemplateControlParsingTest.aspx">\r
-      <LogicalName>TemplateControlParsingTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx">\r
-      <LogicalName>ContentPlaceHolderInTemplate.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master">\r
-      <LogicalName>ContentPlaceHolderInTemplate.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MissingMasterFile.aspx">\r
-      <LogicalName>MissingMasterFile.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CustomSectionEmptyCollection.aspx">\r
-      <LogicalName>CustomSectionEmptyCollection.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx">\r
-      <LogicalName>NoDoubleOnInitOnRemoveAdd.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs">\r
-      <LogicalName>NoDoubleOnInitOnRemoveAdd.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LoginDisplayRememberMe.aspx">\r
-      <LogicalName>LoginDisplayRememberMe.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoBindForMethodsWithBindInName.aspx">\r
-      <LogicalName>NoBindForMethodsWithBindInName.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LinkInHeadWithEmbeddedExpression.aspx">\r
-      <LogicalName>LinkInHeadWithEmbeddedExpression.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ExpressionInListControl.aspx">\r
-      <LogicalName>ExpressionInListControl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ServerSideControlsInScriptBlock.aspx">\r
-      <LogicalName>ServerSideControlsInScriptBlock.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ServerControlInClientSideComment.aspx">\r
-      <LogicalName>ServerControlInClientSideComment.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PreprocessorDirectivesInMarkup.aspx">\r
-      <LogicalName>PreprocessorDirectivesInMarkup.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UnquotedAngleBrackets.aspx">\r
-      <LogicalName>UnquotedAngleBrackets.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FullTagsInText.aspx">\r
-      <LogicalName>FullTagsInText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagsExpressionsAndCommentsInText.aspx">\r
-      <LogicalName>TagsExpressionsAndCommentsInText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NewlineInCodeExpression.aspx">\r
-      <LogicalName>NewlineInCodeExpression.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DuplicateControlsInClientComment.aspx">\r
-      <LogicalName>DuplicateControlsInClientComment.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagsNestedInClientTag.aspx">\r
-      <LogicalName>TagsNestedInClientTag.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ConditionalClientComments.aspx">\r
-      <LogicalName>ConditionalClientComments.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/OneLetterIdentifierInCodeRender.aspx">\r
-      <LogicalName>OneLetterIdentifierInCodeRender.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GlobalResourcesLocalization.aspx">\r
-      <LogicalName>GlobalResourcesLocalization.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TableSections_Bug551666.aspx">\r
-      <LogicalName>TableSections_Bug551666.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TableSections_Bug551666.aspx.cs">\r
-      <LogicalName>TableSections_Bug551666.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NestedParserFileText.aspx">\r
-      <LogicalName>NestedParserFileText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CorrectConverter.aspx">\r
-      <LogicalName>StateFormatter_CorrectConverter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx">\r
-      <LogicalName>StateFormatter_CollectionConverter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx.cs">\r
-      <LogicalName>StateFormatter_CollectionConverter.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ChangePasswordContainer_FindControl.aspx">\r
-      <LogicalName>ChangePasswordContainer_FindControl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagWithExpressionWithinAttribute.aspx">\r
-      <LogicalName>TagWithExpressionWithinAttribute.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_1.aspx">\r
-      <LogicalName>CheckBoxList_Bug377703_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_2.aspx">\r
-      <LogicalName>CheckBoxList_Bug377703_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug578770.aspx">\r
-      <LogicalName>CheckBoxList_Bug578770.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EnumConverter_Bug578586.aspx">\r
-      <LogicalName>EnumConverter_Bug578586.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ButtonColor_Bug325489.aspx">\r
-      <LogicalName>ButtonColor_Bug325489.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/SqlDataSource_OnInit_Bug572781.aspx">\r
-      <LogicalName>SqlDataSource_OnInit_Bug572781.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewPagerVisibility.aspx">\r
-      <LogicalName>FormViewPagerVisibility.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/OverridenControlsPropertyAndPostBack_Bug594238.aspx">\r
-      <LogicalName>OverridenControlsPropertyAndPostBack_Bug594238.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GlobalizationEncodingName.aspx">\r
-      <LogicalName>GlobalizationEncodingName.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_0.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_0.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_1.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_2.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_5.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_5.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_6.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_6.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_7.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_7.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GridView_Bug595567.aspx">\r
-      <LogicalName>GridView_Bug595567.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug600415.aspx">\r
-      <LogicalName>CheckBoxList_Bug600415.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx">\r
-      <LogicalName>BoundField_Bug646505.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs">\r
-      <LogicalName>BoundField_Bug646505.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx">\r
-      <LogicalName>HtmlTitleCodeRender_Bug662918.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/EnumConverterControl.cs">\r
-      <LogicalName>App_Code/EnumConverterControl.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/MyContainer.cs">\r
-      <LogicalName>App_Code/MyContainer.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/CustomCheckBoxColumn.cs">\r
-      <LogicalName>App_Code/CustomCheckBoxColumn.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Common.resx">\r
-      <LogicalName>App_GlobalResources/Common.resx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Common.fr-FR.resx">\r
-      <LogicalName>App_GlobalResources/Common.fr-FR.resx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Resource1.resx">\r
-      <LogicalName>App_GlobalResources/Resource1.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 5476f9535a61654df115e4f32f77084d73ecc68d..5add6d9d453d4dbd10ee525613241406670e91ed 100644 (file)
@@ -93,7 +93,11 @@ definition correctly.
       <!-- MSIE, Netscape 4.0, Opera -->
       <except positions="13-28" match="ActiveTouristBot"/>
     </group>
-
+    <!-- IE9 or newer -->
+    <group positions="7-10" match="/5.0" javascript="true">
+      <!-- MSIE 10, MSIE 11 -->
+           <except positions="13-28" match="ActiveTouristBot"/>
+    </group>
     <group scanfrom="12" skip="4" match=") Gecko/" javascript="true">
       <!-- All the Gecko-based browsers -->
     </group>
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_0.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_0.csproj
deleted file mode 100644 (file)
index 7deb820..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{64B3EF98-58FB-4E3C-86C9-C87299C7CEE1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms.DataVisualization</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Annotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationGroup.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationPathPoint.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationPathPointCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationPositionChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationSmartLabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnovaResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AntiAliasingStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AreaAlignmentOrientations.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AreaAlignmentStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ArrowAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ArrowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Axis.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisArrowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisEnabled.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisName.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisScaleBreakStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisScaleView.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Border3DAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\BorderSkin.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\BorderSkinStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\BreakLineStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CalloutAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CalloutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Chart.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartArea.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartArea3DStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartAreaCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartColorPalette.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartDashStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartElement.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartElementType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartGraphics.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartHatchStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartImageAlignmentStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartImageFormat.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartImageWrapMode.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartNamedElement.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartNamedElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartValueType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CompareMethod.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CursorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomizeLegendEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomLabel.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomLabelCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomProperties.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataFormula.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataManipulator.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPoint.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPointCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPointCustomProperties.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DateRangeType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DateTimeIntervalType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Docking.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ElementPosition.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\EllipseAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FinancialFormula.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FormatNumberEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FTestResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\GradientStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Grid.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\GridTickTypes.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\HitTestResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\HorizontalLineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\IDataPointFilter.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ImageAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\IntervalAutoMode.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\IntervalType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelAlignmentStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelAutoFitStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelCalloutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelMarkStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelOutsidePlotAreaStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Legend.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCell.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellColumn.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellColumnType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendImageStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendItem.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendItemOrder.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendItemsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendSeparatorStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendTableStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LightStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LineAnchorCapStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Margins.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\MarkerStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\NamedImage.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\NamedImagesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Point3D.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PointSortOrder.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PolygonAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PolylineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PrintingManager.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\RectangleAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollBarButtonStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollBarButtonType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollBarEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SerializationContents.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SerializationFormat.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Series.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SeriesChartType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SeriesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SmartLabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StartFromZero.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StatisticFormula.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StripLine.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StripLinesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextAntiAliasingQuality.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TickMark.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TickMarkStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Title.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TitleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ToolTipEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TTestResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\VerticalLineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ViewEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ZTestResult.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-tests-net_4_0.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-tests-net_4_0.csproj
deleted file mode 100644 (file)
index f835b43..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4D415A40-839C-4898-AA35-A40290FB4B13}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Windows.Forms.DataVisualization-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms.DataVisualization_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\AnnotationPathPointTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\AnovaResultTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\ArrowAnnotationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\AxisScaleBreakStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\ChartElementTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\ChartElementTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Windows.Forms.DataVisualization\System.Windows.Forms.DataVisualization-net_4_0.csproj">\r
-      <Project>{64B3EF98-58FB-4E3C-86C9-C87299C7CEE1}</Project>\r
-      <Name>System.Windows.Forms.DataVisualization\System.Windows.Forms.DataVisualization-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">\r
-      <Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.XML/System.Xml-bare-net_2_0.csproj b/mcs/class/System.XML/System.Xml-bare-net_2_0.csproj
deleted file mode 100644 (file)
index 7da30e0..0000000
+++ /dev/null
@@ -1,486 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0E9DD462-944B-426E-BC1E-96EF270EF7E2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0/bare</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XmlSchemaValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityPath.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdKeyTable.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdParticleValidationState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdWildcard.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\IdPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\KeyPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\LocationPathPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\Pattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\UnionPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathEditableDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathNavigatorReader.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyImports.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyTemplates.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAttribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAvt.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCallTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslChoose.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslComment.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCompiledElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopy.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopyOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslFallback.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslForEach.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslIf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslLiteralElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslMessage.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNotSupportedOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNumber.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslProcessingInstruction.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslTemplateContent.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslText.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslValueOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslVariable.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Attribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Compiler.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Debug.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Emitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\GenericOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\HtmlEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\MSXslScriptManager.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Outputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\ScriptCompilerInfo.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XmlWriterEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslAttributeSet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslDecimalFormat.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslFunctions.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslKey.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslOutput.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslSortEvaluator.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslStylesheet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltCompiledContext.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltDebuggerWrapper.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTransformProcessor.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlParserContext.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlSchemaInfo.cs" />\r
-    <Compile Include="Mono.Xml\SubtreeXmlReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlFilterReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlNodeWriter.cs" />\r
-    <Compile Include="System.Xml.Schema\BuiltInDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\IXmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\SchemaDataValueType.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationEventArgs.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationHandler.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlAtomicValue.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchema.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAll.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotated.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAny.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnyAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAppInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaChoice.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCompilationSettings.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentModel.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentProcessing.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatypeVariety.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDerivationMethod.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDocumentation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaElement.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaEnumerationFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaExternal.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaForm.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFractionDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupBase.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaIdentityConstraint.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaImport.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInclude.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInference.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInferenceException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKey.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKeyref.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNumericFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObject.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectTable.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaParticle.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaPatternFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaReader.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaRedefine.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSequence.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSerializer.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeList.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeUnion.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaTotalDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUnique.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUse.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUtil.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationFlags.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidity.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaWhiteSpaceFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaXPath.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSeverityType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlTypeCode.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueConverter.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueGetter.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtension.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtensionCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\DateTimeSerializationSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElement.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElementCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionsSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\XmlSerializerSection.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeGenerationOptions.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifier.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifiers.cs" />\r
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />\r
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\MapCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaEnumerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemas.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />\r
-    <Compile Include="System.Xml.XPath\DefaultContext.cs" />\r
-    <Compile Include="System.Xml.XPath\Expression.cs" />\r
-    <Compile Include="System.Xml.XPath\Iterator.cs" />\r
-    <Compile Include="System.Xml.XPath\IXPathNavigable.cs" />\r
-    <Compile Include="System.Xml.XPath\Tokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlCaseOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlDataType.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlSortOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathComparer.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathDocument.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathException.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathExpression.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathItem.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNamespaceScope.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNavigator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeIterator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeType.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathResultType.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextFunction.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextVariable.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltArgumentList.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltCompileException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltContext.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventArgs.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventHandler.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltSettings.cs" />\r
-    <Compile Include="System.Xml\ConformanceLevel.cs" />\r
-    <Compile Include="System.Xml\DefaultXmlWriter.cs" />\r
-    <Compile Include="System.Xml\DTDAutomata.cs" />\r
-    <Compile Include="System.Xml\DTDObjectModel.cs" />\r
-    <Compile Include="System.Xml\DtdProcessing.cs" />\r
-    <Compile Include="System.Xml\DTDReader.cs" />\r
-    <Compile Include="System.Xml\DTDValidatingReader2.cs" />\r
-    <Compile Include="System.Xml\EntityHandling.cs" />\r
-    <Compile Include="System.Xml\EntityResolvingXmlReader.cs" />\r
-    <Compile Include="System.Xml\Formatting.cs" />\r
-    <Compile Include="System.Xml\IHasXmlChildNode.cs" />\r
-    <Compile Include="System.Xml\IHasXmlNode.cs" />\r
-    <Compile Include="System.Xml\IXmlLineInfo.cs" />\r
-    <Compile Include="System.Xml\IXmlNamespaceResolver.cs" />\r
-    <Compile Include="System.Xml\MonoFIXAttribute.cs" />\r
-    <Compile Include="System.Xml\NamespaceHandling.cs" />\r
-    <Compile Include="System.Xml\NameTable.cs" />\r
-    <Compile Include="System.Xml\NewLineHandling.cs" />\r
-    <Compile Include="System.Xml\ReadState.cs" />\r
-    <Compile Include="System.Xml\ValidationType.cs" />\r
-    <Compile Include="System.Xml\WhitespaceHandling.cs" />\r
-    <Compile Include="System.Xml\WriteState.cs" />\r
-    <Compile Include="System.Xml\XmlAttribute.cs" />\r
-    <Compile Include="System.Xml\XmlAttributeCollection.cs" />\r
-    <Compile Include="System.Xml\XmlCDataSection.cs" />\r
-    <Compile Include="System.Xml\XmlChar.cs" />\r
-    <Compile Include="System.Xml\XmlCharacterData.cs" />\r
-    <Compile Include="System.Xml\XmlComment.cs" />\r
-    <Compile Include="System.Xml\XmlConstructs.cs" />\r
-    <Compile Include="System.Xml\XmlConvert.cs" />\r
-    <Compile Include="System.Xml\XmlDateTimeSerializationMode.cs" />\r
-    <Compile Include="System.Xml\XmlDeclaration.cs" />\r
-    <Compile Include="System.Xml\XmlDocument.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentFragment.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentNavigator.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentType.cs" />\r
-    <Compile Include="System.Xml\XmlElement.cs" />\r
-    <Compile Include="System.Xml\XmlEntity.cs" />\r
-    <Compile Include="System.Xml\XmlEntityReference.cs" />\r
-    <Compile Include="System.Xml\XmlException.cs" />\r
-    <Compile Include="System.Xml\XmlImplementation.cs" />\r
-    <Compile Include="System.Xml\XmlInputStream.cs" />\r
-    <Compile Include="System.Xml\XmlIteratorNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlLinkedNode.cs" />\r
-    <Compile Include="System.Xml\XmlNamedNodeMap.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntry.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntryCache.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceManager.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceScope.cs" />\r
-    <Compile Include="System.Xml\XmlNameTable.cs" />\r
-    <Compile Include="System.Xml\XmlNode.cs" />\r
-    <Compile Include="System.Xml\XmlNodeArrayList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedAction.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventArgs.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventHandler.cs" />\r
-    <Compile Include="System.Xml\XmlNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeListChildren.cs" />\r
-    <Compile Include="System.Xml\XmlNodeOrder.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReader2.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReaderImpl.cs" />\r
-    <Compile Include="System.Xml\XmlNodeType.cs" />\r
-    <Compile Include="System.Xml\XmlNotation.cs" />\r
-    <Compile Include="System.Xml\XmlOutputMethod.cs" />\r
-    <Compile Include="System.Xml\XmlParserContext.cs" />\r
-    <Compile Include="System.Xml\XmlParserInput.cs" />\r
-    <Compile Include="System.Xml\XmlProcessingInstruction.cs" />\r
-    <Compile Include="System.Xml\XmlQualifiedName.cs" />\r
-    <Compile Include="System.Xml\XmlReader.cs" />\r
-    <Compile Include="System.Xml\XmlReaderBinarySupport.cs" />\r
-    <Compile Include="System.Xml\XmlReaderSettings.cs" />\r
-    <Compile Include="System.Xml\XmlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSecureResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSignificantWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlSpace.cs" />\r
-    <Compile Include="System.Xml\XmlText.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader2.cs" />\r
-    <Compile Include="System.Xml\XmlTextWriter2.cs" />\r
-    <Compile Include="System.Xml\XmlTokenizedType.cs" />\r
-    <Compile Include="System.Xml\XmlUrlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlValidatingReader.cs" />\r
-    <Compile Include="System.Xml\XmlWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlWriter.cs" />\r
-    <Compile Include="System.Xml\XmlWriterSettings.cs" />\r
-    <Compile Include="System.Xml\XQueryConvert.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\net_2_0_PatternParser.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\net_2_0_PatternTokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-mono $(ProjectDir)\..\..\..\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-cat $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
- $(ProjectDir)\..\..\..\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_2_0.csproj">\r
-      <Project>{AAA3F683-244C-40EF-8EF8-A95938862A44}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-bare-net_2_0.csproj">\r
-      <Project>{5459507F-DC25-401C-A2F4-D5ECAC3A34E6}</Project>\r
-      <Name>System\System-bare-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.XML/System.Xml-bare-net_4_0.csproj b/mcs/class/System.XML/System.Xml-bare-net_4_0.csproj
deleted file mode 100644 (file)
index 8618fca..0000000
+++ /dev/null
@@ -1,486 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FB3BD508-7228-49CF-ADCA-F5D0C8E8ABCF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0/bare</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XmlSchemaValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityPath.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdKeyTable.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdParticleValidationState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdWildcard.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\IdPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\KeyPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\LocationPathPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\Pattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\UnionPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathEditableDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathNavigatorReader.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyImports.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyTemplates.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAttribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAvt.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCallTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslChoose.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslComment.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCompiledElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopy.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopyOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslFallback.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslForEach.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslIf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslLiteralElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslMessage.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNotSupportedOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNumber.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslProcessingInstruction.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslTemplateContent.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslText.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslValueOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslVariable.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Attribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Compiler.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Debug.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Emitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\GenericOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\HtmlEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\MSXslScriptManager.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Outputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\ScriptCompilerInfo.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XmlWriterEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslAttributeSet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslDecimalFormat.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslFunctions.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslKey.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslOutput.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslSortEvaluator.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslStylesheet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltCompiledContext.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltDebuggerWrapper.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTransformProcessor.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlParserContext.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlSchemaInfo.cs" />\r
-    <Compile Include="Mono.Xml\SubtreeXmlReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlFilterReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlNodeWriter.cs" />\r
-    <Compile Include="System.Xml.Schema\BuiltInDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\IXmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\SchemaDataValueType.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationEventArgs.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationHandler.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlAtomicValue.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchema.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAll.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotated.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAny.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnyAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAppInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaChoice.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCompilationSettings.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentModel.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentProcessing.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatypeVariety.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDerivationMethod.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDocumentation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaElement.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaEnumerationFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaExternal.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaForm.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFractionDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupBase.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaIdentityConstraint.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaImport.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInclude.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInference.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInferenceException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKey.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKeyref.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNumericFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObject.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectTable.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaParticle.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaPatternFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaReader.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaRedefine.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSequence.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSerializer.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeList.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeUnion.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaTotalDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUnique.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUse.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUtil.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationFlags.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidity.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaWhiteSpaceFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaXPath.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSeverityType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlTypeCode.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueConverter.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueGetter.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtension.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtensionCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\DateTimeSerializationSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElement.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElementCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionsSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\XmlSerializerSection.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeGenerationOptions.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifier.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifiers.cs" />\r
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />\r
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\MapCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaEnumerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemas.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />\r
-    <Compile Include="System.Xml.XPath\DefaultContext.cs" />\r
-    <Compile Include="System.Xml.XPath\Expression.cs" />\r
-    <Compile Include="System.Xml.XPath\Iterator.cs" />\r
-    <Compile Include="System.Xml.XPath\IXPathNavigable.cs" />\r
-    <Compile Include="System.Xml.XPath\Tokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlCaseOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlDataType.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlSortOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathComparer.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathDocument.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathException.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathExpression.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathItem.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNamespaceScope.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNavigator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeIterator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeType.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathResultType.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextFunction.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextVariable.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltArgumentList.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltCompileException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltContext.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventArgs.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventHandler.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltSettings.cs" />\r
-    <Compile Include="System.Xml\ConformanceLevel.cs" />\r
-    <Compile Include="System.Xml\DefaultXmlWriter.cs" />\r
-    <Compile Include="System.Xml\DTDAutomata.cs" />\r
-    <Compile Include="System.Xml\DTDObjectModel.cs" />\r
-    <Compile Include="System.Xml\DtdProcessing.cs" />\r
-    <Compile Include="System.Xml\DTDReader.cs" />\r
-    <Compile Include="System.Xml\DTDValidatingReader2.cs" />\r
-    <Compile Include="System.Xml\EntityHandling.cs" />\r
-    <Compile Include="System.Xml\EntityResolvingXmlReader.cs" />\r
-    <Compile Include="System.Xml\Formatting.cs" />\r
-    <Compile Include="System.Xml\IHasXmlChildNode.cs" />\r
-    <Compile Include="System.Xml\IHasXmlNode.cs" />\r
-    <Compile Include="System.Xml\IXmlLineInfo.cs" />\r
-    <Compile Include="System.Xml\IXmlNamespaceResolver.cs" />\r
-    <Compile Include="System.Xml\MonoFIXAttribute.cs" />\r
-    <Compile Include="System.Xml\NamespaceHandling.cs" />\r
-    <Compile Include="System.Xml\NameTable.cs" />\r
-    <Compile Include="System.Xml\NewLineHandling.cs" />\r
-    <Compile Include="System.Xml\ReadState.cs" />\r
-    <Compile Include="System.Xml\ValidationType.cs" />\r
-    <Compile Include="System.Xml\WhitespaceHandling.cs" />\r
-    <Compile Include="System.Xml\WriteState.cs" />\r
-    <Compile Include="System.Xml\XmlAttribute.cs" />\r
-    <Compile Include="System.Xml\XmlAttributeCollection.cs" />\r
-    <Compile Include="System.Xml\XmlCDataSection.cs" />\r
-    <Compile Include="System.Xml\XmlChar.cs" />\r
-    <Compile Include="System.Xml\XmlCharacterData.cs" />\r
-    <Compile Include="System.Xml\XmlComment.cs" />\r
-    <Compile Include="System.Xml\XmlConstructs.cs" />\r
-    <Compile Include="System.Xml\XmlConvert.cs" />\r
-    <Compile Include="System.Xml\XmlDateTimeSerializationMode.cs" />\r
-    <Compile Include="System.Xml\XmlDeclaration.cs" />\r
-    <Compile Include="System.Xml\XmlDocument.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentFragment.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentNavigator.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentType.cs" />\r
-    <Compile Include="System.Xml\XmlElement.cs" />\r
-    <Compile Include="System.Xml\XmlEntity.cs" />\r
-    <Compile Include="System.Xml\XmlEntityReference.cs" />\r
-    <Compile Include="System.Xml\XmlException.cs" />\r
-    <Compile Include="System.Xml\XmlImplementation.cs" />\r
-    <Compile Include="System.Xml\XmlInputStream.cs" />\r
-    <Compile Include="System.Xml\XmlIteratorNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlLinkedNode.cs" />\r
-    <Compile Include="System.Xml\XmlNamedNodeMap.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntry.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntryCache.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceManager.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceScope.cs" />\r
-    <Compile Include="System.Xml\XmlNameTable.cs" />\r
-    <Compile Include="System.Xml\XmlNode.cs" />\r
-    <Compile Include="System.Xml\XmlNodeArrayList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedAction.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventArgs.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventHandler.cs" />\r
-    <Compile Include="System.Xml\XmlNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeListChildren.cs" />\r
-    <Compile Include="System.Xml\XmlNodeOrder.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReader2.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReaderImpl.cs" />\r
-    <Compile Include="System.Xml\XmlNodeType.cs" />\r
-    <Compile Include="System.Xml\XmlNotation.cs" />\r
-    <Compile Include="System.Xml\XmlOutputMethod.cs" />\r
-    <Compile Include="System.Xml\XmlParserContext.cs" />\r
-    <Compile Include="System.Xml\XmlParserInput.cs" />\r
-    <Compile Include="System.Xml\XmlProcessingInstruction.cs" />\r
-    <Compile Include="System.Xml\XmlQualifiedName.cs" />\r
-    <Compile Include="System.Xml\XmlReader.cs" />\r
-    <Compile Include="System.Xml\XmlReaderBinarySupport.cs" />\r
-    <Compile Include="System.Xml\XmlReaderSettings.cs" />\r
-    <Compile Include="System.Xml\XmlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSecureResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSignificantWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlSpace.cs" />\r
-    <Compile Include="System.Xml\XmlText.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader2.cs" />\r
-    <Compile Include="System.Xml\XmlTextWriter2.cs" />\r
-    <Compile Include="System.Xml\XmlTokenizedType.cs" />\r
-    <Compile Include="System.Xml\XmlUrlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlValidatingReader.cs" />\r
-    <Compile Include="System.Xml\XmlWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlWriter.cs" />\r
-    <Compile Include="System.Xml\XmlWriterSettings.cs" />\r
-    <Compile Include="System.Xml\XQueryConvert.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\net_4_0_PatternParser.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\net_4_0_PatternTokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-mono $(ProjectDir)\..\..\..\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-cat $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
- $(ProjectDir)\..\..\..\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_0.csproj">\r
-      <Project>{5889848E-305B-4B11-B3B1-A25761DAFE45}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-secxml-net_4_0.csproj">\r
-      <Project>{ED114F49-84B3-4EF9-80EC-90D4EEF7FF8E}</Project>\r
-      <Name>System\System-secxml-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.XML/System.Xml-net_2_0.csproj b/mcs/class/System.XML/System.Xml-net_2_0.csproj
deleted file mode 100644 (file)
index 2321f8c..0000000
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E89F34AB-7AE2-41CA-B891-C8D1C9F02EB8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XmlSchemaValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityPath.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdKeyTable.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdParticleValidationState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdWildcard.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\IdPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\KeyPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\LocationPathPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\Pattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\UnionPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathEditableDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathNavigatorReader.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyImports.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyTemplates.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAttribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAvt.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCallTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslChoose.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslComment.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCompiledElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopy.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopyOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslFallback.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslForEach.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslIf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslLiteralElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslMessage.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNotSupportedOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNumber.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslProcessingInstruction.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslTemplateContent.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslText.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslValueOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslVariable.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Attribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Compiler.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Debug.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Emitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\GenericOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\HtmlEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\MSXslScriptManager.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Outputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\ScriptCompilerInfo.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XmlWriterEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslAttributeSet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslDecimalFormat.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslFunctions.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslKey.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslOutput.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslSortEvaluator.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslStylesheet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltCompiledContext.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltDebuggerWrapper.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTransformProcessor.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlParserContext.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlSchemaInfo.cs" />\r
-    <Compile Include="Mono.Xml\SubtreeXmlReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlFilterReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlNodeWriter.cs" />\r
-    <Compile Include="System.Xml.Schema\BuiltInDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\IXmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\SchemaDataValueType.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationEventArgs.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationHandler.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlAtomicValue.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchema.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAll.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotated.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAny.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnyAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAppInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaChoice.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCompilationSettings.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentModel.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentProcessing.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatypeVariety.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDerivationMethod.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDocumentation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaElement.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaEnumerationFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaExternal.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaForm.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFractionDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupBase.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaIdentityConstraint.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaImport.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInclude.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInference.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInferenceException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKey.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKeyref.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNumericFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObject.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectTable.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaParticle.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaPatternFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaReader.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaRedefine.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSequence.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSerializer.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeList.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeUnion.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaTotalDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUnique.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUse.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUtil.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationFlags.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidity.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaWhiteSpaceFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaXPath.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSeverityType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlTypeCode.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueConverter.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueGetter.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtension.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtensionCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\DateTimeSerializationSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElement.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElementCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionsSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\XmlSerializerSection.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeGenerationOptions.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifier.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifiers.cs" />\r
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />\r
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\MapCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaEnumerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemas.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />\r
-    <Compile Include="System.Xml.XPath\DefaultContext.cs" />\r
-    <Compile Include="System.Xml.XPath\Expression.cs" />\r
-    <Compile Include="System.Xml.XPath\Iterator.cs" />\r
-    <Compile Include="System.Xml.XPath\IXPathNavigable.cs" />\r
-    <Compile Include="System.Xml.XPath\Tokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlCaseOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlDataType.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlSortOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathComparer.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathDocument.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathException.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathExpression.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathItem.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNamespaceScope.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNavigator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeIterator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeType.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathResultType.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextFunction.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextVariable.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltArgumentList.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltCompileException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltContext.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventArgs.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventHandler.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltSettings.cs" />\r
-    <Compile Include="System.Xml\ConformanceLevel.cs" />\r
-    <Compile Include="System.Xml\DefaultXmlWriter.cs" />\r
-    <Compile Include="System.Xml\DTDAutomata.cs" />\r
-    <Compile Include="System.Xml\DTDObjectModel.cs" />\r
-    <Compile Include="System.Xml\DtdProcessing.cs" />\r
-    <Compile Include="System.Xml\DTDReader.cs" />\r
-    <Compile Include="System.Xml\DTDValidatingReader2.cs" />\r
-    <Compile Include="System.Xml\EntityHandling.cs" />\r
-    <Compile Include="System.Xml\EntityResolvingXmlReader.cs" />\r
-    <Compile Include="System.Xml\Formatting.cs" />\r
-    <Compile Include="System.Xml\IHasXmlChildNode.cs" />\r
-    <Compile Include="System.Xml\IHasXmlNode.cs" />\r
-    <Compile Include="System.Xml\IXmlLineInfo.cs" />\r
-    <Compile Include="System.Xml\IXmlNamespaceResolver.cs" />\r
-    <Compile Include="System.Xml\MonoFIXAttribute.cs" />\r
-    <Compile Include="System.Xml\NamespaceHandling.cs" />\r
-    <Compile Include="System.Xml\NameTable.cs" />\r
-    <Compile Include="System.Xml\NewLineHandling.cs" />\r
-    <Compile Include="System.Xml\ReadState.cs" />\r
-    <Compile Include="System.Xml\ValidationType.cs" />\r
-    <Compile Include="System.Xml\WhitespaceHandling.cs" />\r
-    <Compile Include="System.Xml\WriteState.cs" />\r
-    <Compile Include="System.Xml\XmlAttribute.cs" />\r
-    <Compile Include="System.Xml\XmlAttributeCollection.cs" />\r
-    <Compile Include="System.Xml\XmlCDataSection.cs" />\r
-    <Compile Include="System.Xml\XmlChar.cs" />\r
-    <Compile Include="System.Xml\XmlCharacterData.cs" />\r
-    <Compile Include="System.Xml\XmlComment.cs" />\r
-    <Compile Include="System.Xml\XmlConstructs.cs" />\r
-    <Compile Include="System.Xml\XmlConvert.cs" />\r
-    <Compile Include="System.Xml\XmlDateTimeSerializationMode.cs" />\r
-    <Compile Include="System.Xml\XmlDeclaration.cs" />\r
-    <Compile Include="System.Xml\XmlDocument.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentFragment.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentNavigator.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentType.cs" />\r
-    <Compile Include="System.Xml\XmlElement.cs" />\r
-    <Compile Include="System.Xml\XmlEntity.cs" />\r
-    <Compile Include="System.Xml\XmlEntityReference.cs" />\r
-    <Compile Include="System.Xml\XmlException.cs" />\r
-    <Compile Include="System.Xml\XmlImplementation.cs" />\r
-    <Compile Include="System.Xml\XmlInputStream.cs" />\r
-    <Compile Include="System.Xml\XmlIteratorNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlLinkedNode.cs" />\r
-    <Compile Include="System.Xml\XmlNamedNodeMap.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntry.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntryCache.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceManager.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceScope.cs" />\r
-    <Compile Include="System.Xml\XmlNameTable.cs" />\r
-    <Compile Include="System.Xml\XmlNode.cs" />\r
-    <Compile Include="System.Xml\XmlNodeArrayList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedAction.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventArgs.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventHandler.cs" />\r
-    <Compile Include="System.Xml\XmlNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeListChildren.cs" />\r
-    <Compile Include="System.Xml\XmlNodeOrder.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReader2.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReaderImpl.cs" />\r
-    <Compile Include="System.Xml\XmlNodeType.cs" />\r
-    <Compile Include="System.Xml\XmlNotation.cs" />\r
-    <Compile Include="System.Xml\XmlOutputMethod.cs" />\r
-    <Compile Include="System.Xml\XmlParserContext.cs" />\r
-    <Compile Include="System.Xml\XmlParserInput.cs" />\r
-    <Compile Include="System.Xml\XmlProcessingInstruction.cs" />\r
-    <Compile Include="System.Xml\XmlQualifiedName.cs" />\r
-    <Compile Include="System.Xml\XmlReader.cs" />\r
-    <Compile Include="System.Xml\XmlReaderBinarySupport.cs" />\r
-    <Compile Include="System.Xml\XmlReaderSettings.cs" />\r
-    <Compile Include="System.Xml\XmlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSecureResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSignificantWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlSpace.cs" />\r
-    <Compile Include="System.Xml\XmlText.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader2.cs" />\r
-    <Compile Include="System.Xml\XmlTextWriter2.cs" />\r
-    <Compile Include="System.Xml\XmlTokenizedType.cs" />\r
-    <Compile Include="System.Xml\XmlUrlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlValidatingReader.cs" />\r
-    <Compile Include="System.Xml\XmlWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlWriter.cs" />\r
-    <Compile Include="System.Xml\XmlWriterSettings.cs" />\r
-    <Compile Include="System.Xml\XQueryConvert.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternParser.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0.csproj">\r
-      <Project>{5A346705-1044-48F2-987D-CAE22A255427}</Project>\r
-      <Name>System\System-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Configuration.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Configuration.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.XML/System.Xml-net_4_0.csproj b/mcs/class/System.XML/System.Xml-net_4_0.csproj
deleted file mode 100644 (file)
index 2deaf3e..0000000
+++ /dev/null
@@ -1,476 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{86DD6F16-A480-4248-AE96-301B2F973CD7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,642</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XmlSchemaValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityPath.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdIdentityState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdKeyTable.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdParticleValidationState.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdValidatingReader.cs" />\r
-    <Compile Include="Mono.Xml.Schema\XsdWildcard.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\IdPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\KeyPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\LocationPathPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\Pattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\UnionPattern.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathEditableDocument.cs" />\r
-    <Compile Include="Mono.Xml.XPath\XPathNavigatorReader.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyImports.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyTemplates.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAttribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAvt.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCallTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslChoose.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslComment.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCompiledElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopy.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopyOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslFallback.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslForEach.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslIf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslLiteralElement.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslMessage.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNotSupportedOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNumber.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslOperation.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslProcessingInstruction.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslTemplateContent.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslText.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslValueOf.cs" />\r
-    <Compile Include="Mono.Xml.Xsl.Operations\XslVariable.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Attribute.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Compiler.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Debug.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Emitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\GenericOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\HtmlEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\MSXslScriptManager.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\Outputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\ScriptCompilerInfo.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\TextOutputter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XmlWriterEmitter.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslAttributeSet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslDecimalFormat.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslFunctions.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslKey.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslOutput.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslSortEvaluator.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslStylesheet.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltCompiledContext.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XsltDebuggerWrapper.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTemplate.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\XslTransformProcessor.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlParserContext.cs" />\r
-    <Compile Include="Mono.Xml\IHasXmlSchemaInfo.cs" />\r
-    <Compile Include="Mono.Xml\SubtreeXmlReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlFilterReader.cs" />\r
-    <Compile Include="Mono.Xml\XmlNodeWriter.cs" />\r
-    <Compile Include="System.Xml.Schema\BuiltInDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\IXmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\SchemaDataValueType.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationEventArgs.cs" />\r
-    <Compile Include="System.Xml.Schema\ValidationHandler.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlAtomicValue.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchema.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAll.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotated.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAny.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAnyAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAppInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttribute.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaChoice.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaCompilationSettings.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentModel.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentProcessing.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaContentType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatype.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatypeVariety.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDerivationMethod.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaDocumentation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaElement.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaEnumerationFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaExternal.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaForm.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaFractionDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroup.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupBase.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupRef.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaIdentityConstraint.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaImport.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInclude.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInference.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInferenceException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaInfo.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKey.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaKeyref.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinExclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinInclusiveFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaMinLengthFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNotation.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaNumericFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObject.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectCollection.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectEnumerator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectTable.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaParticle.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaPatternFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaReader.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaRedefine.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSequence.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSerializer.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentExtension.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeContent.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeList.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeRestriction.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeUnion.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaTotalDigitsFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUnique.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUse.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaUtil.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationException.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationFlags.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidator.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaValidity.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaWhiteSpaceFacet.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSchemaXPath.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlSeverityType.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlTypeCode.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueConverter.cs" />\r
-    <Compile Include="System.Xml.Schema\XmlValueGetter.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtension.cs" />\r
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtensionCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\DateTimeSerializationSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElement.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElementCollection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionsSection.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="System.Xml.Serialization.Configuration\XmlSerializerSection.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeGenerationOptions.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifier.cs" />\r
-    <Compile Include="System.Xml.Serialization\CodeIdentifiers.cs" />\r
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />\r
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />\r
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\MapCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />\r
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCodeExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlElementEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlNodeEventHandler.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaEnumerator.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSchemas.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />\r
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />\r
-    <Compile Include="System.Xml.XPath\DefaultContext.cs" />\r
-    <Compile Include="System.Xml.XPath\Expression.cs" />\r
-    <Compile Include="System.Xml.XPath\Iterator.cs" />\r
-    <Compile Include="System.Xml.XPath\IXPathNavigable.cs" />\r
-    <Compile Include="System.Xml.XPath\Tokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlCaseOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlDataType.cs" />\r
-    <Compile Include="System.Xml.XPath\XmlSortOrder.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathComparer.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathDocument.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathException.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathExpression.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathItem.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNamespaceScope.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNavigator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeIterator.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathNodeType.cs" />\r
-    <Compile Include="System.Xml.XPath\XPathResultType.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextFunction.cs" />\r
-    <Compile Include="System.Xml.Xsl\IXsltContextVariable.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltArgumentList.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltCompileException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltContext.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltException.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventArgs.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventHandler.cs" />\r
-    <Compile Include="System.Xml.Xsl\XslTransform.cs" />\r
-    <Compile Include="System.Xml.Xsl\XsltSettings.cs" />\r
-    <Compile Include="System.Xml\ConformanceLevel.cs" />\r
-    <Compile Include="System.Xml\DefaultXmlWriter.cs" />\r
-    <Compile Include="System.Xml\DTDAutomata.cs" />\r
-    <Compile Include="System.Xml\DTDObjectModel.cs" />\r
-    <Compile Include="System.Xml\DtdProcessing.cs" />\r
-    <Compile Include="System.Xml\DTDReader.cs" />\r
-    <Compile Include="System.Xml\DTDValidatingReader2.cs" />\r
-    <Compile Include="System.Xml\EntityHandling.cs" />\r
-    <Compile Include="System.Xml\EntityResolvingXmlReader.cs" />\r
-    <Compile Include="System.Xml\Formatting.cs" />\r
-    <Compile Include="System.Xml\IHasXmlChildNode.cs" />\r
-    <Compile Include="System.Xml\IHasXmlNode.cs" />\r
-    <Compile Include="System.Xml\IXmlLineInfo.cs" />\r
-    <Compile Include="System.Xml\IXmlNamespaceResolver.cs" />\r
-    <Compile Include="System.Xml\MonoFIXAttribute.cs" />\r
-    <Compile Include="System.Xml\NamespaceHandling.cs" />\r
-    <Compile Include="System.Xml\NameTable.cs" />\r
-    <Compile Include="System.Xml\NewLineHandling.cs" />\r
-    <Compile Include="System.Xml\ReadState.cs" />\r
-    <Compile Include="System.Xml\ValidationType.cs" />\r
-    <Compile Include="System.Xml\WhitespaceHandling.cs" />\r
-    <Compile Include="System.Xml\WriteState.cs" />\r
-    <Compile Include="System.Xml\XmlAttribute.cs" />\r
-    <Compile Include="System.Xml\XmlAttributeCollection.cs" />\r
-    <Compile Include="System.Xml\XmlCDataSection.cs" />\r
-    <Compile Include="System.Xml\XmlChar.cs" />\r
-    <Compile Include="System.Xml\XmlCharacterData.cs" />\r
-    <Compile Include="System.Xml\XmlComment.cs" />\r
-    <Compile Include="System.Xml\XmlConstructs.cs" />\r
-    <Compile Include="System.Xml\XmlConvert.cs" />\r
-    <Compile Include="System.Xml\XmlDateTimeSerializationMode.cs" />\r
-    <Compile Include="System.Xml\XmlDeclaration.cs" />\r
-    <Compile Include="System.Xml\XmlDocument.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentFragment.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentNavigator.cs" />\r
-    <Compile Include="System.Xml\XmlDocumentType.cs" />\r
-    <Compile Include="System.Xml\XmlElement.cs" />\r
-    <Compile Include="System.Xml\XmlEntity.cs" />\r
-    <Compile Include="System.Xml\XmlEntityReference.cs" />\r
-    <Compile Include="System.Xml\XmlException.cs" />\r
-    <Compile Include="System.Xml\XmlImplementation.cs" />\r
-    <Compile Include="System.Xml\XmlInputStream.cs" />\r
-    <Compile Include="System.Xml\XmlIteratorNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlLinkedNode.cs" />\r
-    <Compile Include="System.Xml\XmlNamedNodeMap.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntry.cs" />\r
-    <Compile Include="System.Xml\XmlNameEntryCache.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceManager.cs" />\r
-    <Compile Include="System.Xml\XmlNamespaceScope.cs" />\r
-    <Compile Include="System.Xml\XmlNameTable.cs" />\r
-    <Compile Include="System.Xml\XmlNode.cs" />\r
-    <Compile Include="System.Xml\XmlNodeArrayList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedAction.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventArgs.cs" />\r
-    <Compile Include="System.Xml\XmlNodeChangedEventHandler.cs" />\r
-    <Compile Include="System.Xml\XmlNodeList.cs" />\r
-    <Compile Include="System.Xml\XmlNodeListChildren.cs" />\r
-    <Compile Include="System.Xml\XmlNodeOrder.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReader2.cs" />\r
-    <Compile Include="System.Xml\XmlNodeReaderImpl.cs" />\r
-    <Compile Include="System.Xml\XmlNodeType.cs" />\r
-    <Compile Include="System.Xml\XmlNotation.cs" />\r
-    <Compile Include="System.Xml\XmlOutputMethod.cs" />\r
-    <Compile Include="System.Xml\XmlParserContext.cs" />\r
-    <Compile Include="System.Xml\XmlParserInput.cs" />\r
-    <Compile Include="System.Xml\XmlProcessingInstruction.cs" />\r
-    <Compile Include="System.Xml\XmlQualifiedName.cs" />\r
-    <Compile Include="System.Xml\XmlReader.cs" />\r
-    <Compile Include="System.Xml\XmlReaderBinarySupport.cs" />\r
-    <Compile Include="System.Xml\XmlReaderSettings.cs" />\r
-    <Compile Include="System.Xml\XmlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSecureResolver.cs" />\r
-    <Compile Include="System.Xml\XmlSignificantWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlSpace.cs" />\r
-    <Compile Include="System.Xml\XmlText.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader.cs" />\r
-    <Compile Include="System.Xml\XmlTextReader2.cs" />\r
-    <Compile Include="System.Xml\XmlTextWriter2.cs" />\r
-    <Compile Include="System.Xml\XmlTokenizedType.cs" />\r
-    <Compile Include="System.Xml\XmlUrlResolver.cs" />\r
-    <Compile Include="System.Xml\XmlValidatingReader.cs" />\r
-    <Compile Include="System.Xml\XmlWhitespace.cs" />\r
-    <Compile Include="System.Xml\XmlWriter.cs" />\r
-    <Compile Include="System.Xml\XmlWriterSettings.cs" />\r
-    <Compile Include="System.Xml\XQueryConvert.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternParser.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0.csproj">\r
-      <Project>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</Project>\r
-      <Name>System\System-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.XML/System.Xml-tests-net_2_0.csproj b/mcs/class/System.XML/System.Xml-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 2b26f77..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{966262F1-0FE4-4474-A6D5-99B107E45248}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xml-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaAssertion.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaBuiltInDatatypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaDatatypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaLengthFacetTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaSetTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaTypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaValidatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization.Advanced\SchemaImporterExtensionCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization.Advanced\SchemaImporterExtensionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\CodeIdentifiersTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\ComplexDataStructure.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\DeserializeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapAttributeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapAttributesTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapEnumAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapIncludeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapReflectionImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapSchemaExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapSchemaMemberTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapTypeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAnyElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlArrayAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlArrayItemAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAttributeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAttributesTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlChoiceIdentifierAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlCodeExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlEnumAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlIncludeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlReflectionImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlRootAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemaExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemaImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemasTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializationReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializationWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerImplementationTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerTestClasses.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlTextAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlTypeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\SelectNodesTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathEditableNavigatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorCommonTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorEvaluateTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorMatchesTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\MsxslScriptTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltArgumentListCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltCompileExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltCompileExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XslTransformTests.cs" />\r
-    <Compile Include="Test\System.Xml\NameTableTests.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Attr\Attr.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\CharacterData\CharacterData.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Comment\Comment.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Document\Document.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\DOMImplementation\DOMImplementation.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Element\Element.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\NamedNodeMap\NamedNodeMap.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Node\Node.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\NodeList\NodeList.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Text\Text.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\ITest.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\util.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAssert.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAttributeCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCDataSectionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCharacterDataTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCommentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlConvertTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDeclarationTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDefaultReader.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentEventTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentFragmentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentTypeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlElementTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlEntityReferenceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlEntityTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNamespaceManagerTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeListTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlParserContextTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlProcessingInstructionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlReaderCommonTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlReaderSettingsTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlResolverTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSecureResolverCas.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSecureResolverTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSignificantWhitespaceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlUrlResolverTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlValidatingReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWhiteSpaceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWriterSettingsTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml\XsdParticleValidationTests.cs" />\r
-    <Compile Include="Test\System.Xml\XsdValidatingReaderTests.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternParser.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Data.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Data.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.XML/System.Xml-tests-net_4_0.csproj b/mcs/class/System.XML/System.Xml-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 92328a1..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9870478C-CA97-400D-BFC7-F4D30584028E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xml-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaAssertion.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaBuiltInDatatypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaDatatypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaLengthFacetTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaSetTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaTypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaValidatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization.Advanced\SchemaImporterExtensionCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization.Advanced\SchemaImporterExtensionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\CodeIdentifiersTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\ComplexDataStructure.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\DeserializeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapAttributeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapAttributesTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapEnumAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapIncludeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapReflectionImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapSchemaExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapSchemaMemberTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapTypeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAnyElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlArrayAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlArrayItemAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAttributeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAttributesTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlChoiceIdentifierAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlCodeExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlEnumAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlIncludeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlReflectionImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlRootAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemaExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemaImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemasTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializationReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializationWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerImplementationTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerTestClasses.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlTextAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlTypeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\SelectNodesTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathEditableNavigatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorCommonTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorEvaluateTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorMatchesTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\MsxslScriptTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltArgumentListCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltCompileExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltCompileExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XslTransformTests.cs" />\r
-    <Compile Include="Test\System.Xml\NameTableTests.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Attr\Attr.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\CharacterData\CharacterData.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Comment\Comment.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Document\Document.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\DOMImplementation\DOMImplementation.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Element\Element.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\NamedNodeMap\NamedNodeMap.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Node\Node.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\NodeList\NodeList.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Text\Text.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\ITest.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\util.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAssert.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAttributeCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCDataSectionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCharacterDataTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCommentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlConvertTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDeclarationTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDefaultReader.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentEventTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentFragmentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentTypeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlElementTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlEntityReferenceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlEntityTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNamespaceManagerTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeListTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlParserContextTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlProcessingInstructionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlReaderCommonTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlReaderSettingsTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlResolverTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSecureResolverCas.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSecureResolverTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSignificantWhitespaceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlUrlResolverTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlValidatingReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWhiteSpaceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWriterSettingsTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml\XsdParticleValidationTests.cs" />\r
-    <Compile Include="Test\System.Xml\XsdValidatingReaderTests.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternParser.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Xaml/System.Xaml-net_4_0.csproj b/mcs/class/System.Xaml/System.Xaml-net_4_0.csproj
deleted file mode 100644 (file)
index b6f3750..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B2254BB1-2510-41F0-AD51-AF36ACF797AE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xaml</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Windows.Markup\AmbientAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ArrayExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\ConstructorArgumentAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentWrapperAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DateTimeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\DependsOnAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DictionaryKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\IComponentConnector.cs" />\r
-    <Compile Include="System.Windows.Markup\INameScope.cs" />\r
-    <Compile Include="System.Windows.Markup\INameScopeDictionary.cs" />\r
-    <Compile Include="System.Windows.Markup\IProvideValueTarget.cs" />\r
-    <Compile Include="System.Windows.Markup\IQueryAmbient.cs" />\r
-    <Compile Include="System.Windows.Markup\IUriContext.cs" />\r
-    <Compile Include="System.Windows.Markup\IValueSerializerContext.cs" />\r
-    <Compile Include="System.Windows.Markup\IXamlTypeResolver.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtensionReturnTypeAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\MemberDefinition.cs" />\r
-    <Compile Include="System.Windows.Markup\NameReferenceConverter.cs" />\r
-    <Compile Include="System.Windows.Markup\NameScopePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\NullExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\PropertyDefinition.cs" />\r
-    <Compile Include="System.Windows.Markup\Reference.cs" />\r
-    <Compile Include="System.Windows.Markup\RootNamespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RuntimeNamePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\StaticExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\StaticExtensionConverter.cs" />\r
-    <Compile Include="System.Windows.Markup\TrimSurroundingWhitespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\TypeExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\TypeExtensionConverter.cs" />\r
-    <Compile Include="System.Windows.Markup\UidPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UsableDuringInitializationAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializerAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\WhitespaceSignificantCollectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlDeferLoadAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetMarkupExtensionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetMarkupExtensionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetTypeConverterAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetTypeConverterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetValueEventArgs.cs" />\r
-    <Compile Include="System.Windows.Markup\XData.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlLangPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsCompatibleWithAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsDefinitionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsPrefixAttribute.cs" />\r
-    <Compile Include="System.Xaml.Permissions\XamlAccessLevel.cs" />\r
-    <Compile Include="System.Xaml.Permissions\XamlLoadPermission.cs" />\r
-    <Compile Include="System.Xaml.Schema\AllowedMemberLocations.cs" />\r
-    <Compile Include="System.Xaml.Schema\ShouldSerializeResult.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlCollectionKind.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlMemberInvoker.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlTypeInvoker.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlTypeName.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlTypeTypeConverter.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlValueConverter.cs" />\r
-    <Compile Include="System.Xaml\AmbientPropertyValue.cs" />\r
-    <Compile Include="System.Xaml\AttachableMemberIdentifier.cs" />\r
-    <Compile Include="System.Xaml\AttachablePropertyServices.cs" />\r
-    <Compile Include="System.Xaml\IAmbientProvider.cs" />\r
-    <Compile Include="System.Xaml\IAttachedPropertyStore.cs" />\r
-    <Compile Include="System.Xaml\IDestinationTypeProvider.cs" />\r
-    <Compile Include="System.Xaml\INamespacePrefixLookup.cs" />\r
-    <Compile Include="System.Xaml\IRootObjectProvider.cs" />\r
-    <Compile Include="System.Xaml\IXamlIndexingReader.cs" />\r
-    <Compile Include="System.Xaml\IXamlLineInfo.cs" />\r
-    <Compile Include="System.Xaml\IXamlLineInfoConsumer.cs" />\r
-    <Compile Include="System.Xaml\IXamlNameProvider.cs" />\r
-    <Compile Include="System.Xaml\IXamlNameResolver.cs" />\r
-    <Compile Include="System.Xaml\IXamlNamespaceResolver.cs" />\r
-    <Compile Include="System.Xaml\IXamlObjectWriterFactory.cs" />\r
-    <Compile Include="System.Xaml\IXamlSchemaContextProvider.cs" />\r
-    <Compile Include="System.Xaml\NameScope.cs" />\r
-    <Compile Include="System.Xaml\NamespaceDeclaration.cs" />\r
-    <Compile Include="System.Xaml\ParsedMarkupExtensionInfo.cs" />\r
-    <Compile Include="System.Xaml\PrefixLookup.cs" />\r
-    <Compile Include="System.Xaml\TypeExtensionMethods.cs" />\r
-    <Compile Include="System.Xaml\ValueSerializerContext.cs" />\r
-    <Compile Include="System.Xaml\XamlBackgroundReader.cs" />\r
-    <Compile Include="System.Xaml\XamlDeferringLoader.cs" />\r
-    <Compile Include="System.Xaml\XamlDirective.cs" />\r
-    <Compile Include="System.Xaml\XamlDuplicateMemberException.cs" />\r
-    <Compile Include="System.Xaml\XamlException.cs" />\r
-    <Compile Include="System.Xaml\XamlInternalException.cs" />\r
-    <Compile Include="System.Xaml\XamlLanguage.cs" />\r
-    <Compile Include="System.Xaml\XamlMember.cs" />\r
-    <Compile Include="System.Xaml\XamlNameResolver.cs" />\r
-    <Compile Include="System.Xaml\XamlNode.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeList.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeQueue.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeQueueReader.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeQueueWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeType.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectEventArgs.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectNodeIterator.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectReader.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectReaderException.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectReaderSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectWriterException.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectWriterSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlParseException.cs" />\r
-    <Compile Include="System.Xaml\XamlReader.cs" />\r
-    <Compile Include="System.Xaml\XamlReaderSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlSchemaContext.cs" />\r
-    <Compile Include="System.Xaml\XamlSchemaContextSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlSchemaException.cs" />\r
-    <Compile Include="System.Xaml\XamlServices.cs" />\r
-    <Compile Include="System.Xaml\XamlSubtreeReader.cs" />\r
-    <Compile Include="System.Xaml\XamlType.cs" />\r
-    <Compile Include="System.Xaml\XamlWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlWriterInternalBase.cs" />\r
-    <Compile Include="System.Xaml\XamlWriterSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlWriterStateManager.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlReader.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlReaderSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlWriterException.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlWriterSettings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Xaml/System.Xaml-tests-net_4_0.csproj b/mcs/class/System.Xaml/System.Xaml-tests-net_4_0.csproj
deleted file mode 100644 (file)
index c35a4a2..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{23CB397F-AE14-427D-87C9-D132378DF313}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xaml-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xaml_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Windows.Markup\ArrayExtensionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ReferenceTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\StaticExtensionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\TypeExtensionConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\TypeExtensionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\XDataTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlMemberInvokerTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlTypeInvokerTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlTypeNameTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlTypeTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlValueConverterTest.cs" />\r
-    <Compile Include="Test\System.Xaml\AmbientPropertyValueTest.cs" />\r
-    <Compile Include="Test\System.Xaml\AttachableMemberIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Xaml\AttachablePropertyServicesTest.cs" />\r
-    <Compile Include="Test\System.Xaml\DummyValueSerializerContext.cs" />\r
-    <Compile Include="Test\System.Xaml\NamespaceDeclarationTest.cs" />\r
-    <Compile Include="Test\System.Xaml\TestedTypes.cs" />\r
-    <Compile Include="Test\System.Xaml\ValueSerializerContextTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlBackgroundReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlDirectiveTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlDuplicateMemberExceptionTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlLanguageTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlMemberTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlNodeQueueTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectReaderSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectWriterSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectWriterTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlReaderSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlReaderTestBase.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlSchemaContextSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlSchemaContextTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlTypeTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlReaderSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlWriterSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlWriterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xaml\System.Xaml-net_4_0.csproj">\r
-      <Project>{B2254BB1-2510-41F0-AD51-AF36ACF797AE}</Project>\r
-      <Name>System.Xaml\System.Xaml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_2_0.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-net_2_0.csproj
deleted file mode 100644 (file)
index cf2f1fb..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{80B8A117-6BB4-4646-8BE9-863A5C105437}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Xml.Linq\Extensions.cs" />\r
-    <Compile Include="System.Xml.Linq\LoadOptions.cs" />\r
-    <Compile Include="System.Xml.Linq\ReaderOptions.cs" />\r
-    <Compile Include="System.Xml.Linq\SaveOptions.cs" />\r
-    <Compile Include="System.Xml.Linq\XAttribute.cs" />\r
-    <Compile Include="System.Xml.Linq\XCData.cs" />\r
-    <Compile Include="System.Xml.Linq\XComment.cs" />\r
-    <Compile Include="System.Xml.Linq\XContainer.cs" />\r
-    <Compile Include="System.Xml.Linq\XDeclaration.cs" />\r
-    <Compile Include="System.Xml.Linq\XDocument.cs" />\r
-    <Compile Include="System.Xml.Linq\XDocumentType.cs" />\r
-    <Compile Include="System.Xml.Linq\XElement.cs" />\r
-    <Compile Include="System.Xml.Linq\XIterators.cs" />\r
-    <Compile Include="System.Xml.Linq\XName.cs" />\r
-    <Compile Include="System.Xml.Linq\XNamespace.cs" />\r
-    <Compile Include="System.Xml.Linq\XNode.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeDocumentOrderComparer.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeEqualityComparer.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeNavigator.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeReader.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeWriter.cs" />\r
-    <Compile Include="System.Xml.Linq\XObject.cs" />\r
-    <Compile Include="System.Xml.Linq\XObjectChange.cs" />\r
-    <Compile Include="System.Xml.Linq\XObjectChangeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Linq\XProcessingInstruction.cs" />\r
-    <Compile Include="System.Xml.Linq\XStreamingElement.cs" />\r
-    <Compile Include="System.Xml.Linq\XText.cs" />\r
-    <Compile Include="System.Xml.Linq\XUtil.cs" />\r
-    <Compile Include="System.Xml.Schema\Extensions.cs" />\r
-    <Compile Include="System.Xml.XPath\Extensions.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_0.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_0.csproj
deleted file mode 100644 (file)
index 0f8ff1d..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Xml.Linq\Extensions.cs" />\r
-    <Compile Include="System.Xml.Linq\LoadOptions.cs" />\r
-    <Compile Include="System.Xml.Linq\ReaderOptions.cs" />\r
-    <Compile Include="System.Xml.Linq\SaveOptions.cs" />\r
-    <Compile Include="System.Xml.Linq\XAttribute.cs" />\r
-    <Compile Include="System.Xml.Linq\XCData.cs" />\r
-    <Compile Include="System.Xml.Linq\XComment.cs" />\r
-    <Compile Include="System.Xml.Linq\XContainer.cs" />\r
-    <Compile Include="System.Xml.Linq\XDeclaration.cs" />\r
-    <Compile Include="System.Xml.Linq\XDocument.cs" />\r
-    <Compile Include="System.Xml.Linq\XDocumentType.cs" />\r
-    <Compile Include="System.Xml.Linq\XElement.cs" />\r
-    <Compile Include="System.Xml.Linq\XIterators.cs" />\r
-    <Compile Include="System.Xml.Linq\XName.cs" />\r
-    <Compile Include="System.Xml.Linq\XNamespace.cs" />\r
-    <Compile Include="System.Xml.Linq\XNode.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeDocumentOrderComparer.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeEqualityComparer.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeNavigator.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeReader.cs" />\r
-    <Compile Include="System.Xml.Linq\XNodeWriter.cs" />\r
-    <Compile Include="System.Xml.Linq\XObject.cs" />\r
-    <Compile Include="System.Xml.Linq\XObjectChange.cs" />\r
-    <Compile Include="System.Xml.Linq\XObjectChangeEventArgs.cs" />\r
-    <Compile Include="System.Xml.Linq\XProcessingInstruction.cs" />\r
-    <Compile Include="System.Xml.Linq\XStreamingElement.cs" />\r
-    <Compile Include="System.Xml.Linq\XText.cs" />\r
-    <Compile Include="System.Xml.Linq\XUtil.cs" />\r
-    <Compile Include="System.Xml.Schema\Extensions.cs" />\r
-    <Compile Include="System.Xml.XPath\Extensions.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_2_0.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_2_0.csproj
deleted file mode 100644 (file)
index 2de001c..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{612BE852-974E-423E-B974-74EDB0E28136}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xml.Linq-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.Linq_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Xml.Linq\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XAttributeTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XDocumentTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XElementTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNamespaceTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNameTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeDocumentOrderComparerTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeEqualityComparerTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeNavigatorTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeReaderTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XObjectTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XProcessingInstructionTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XStreamingElementTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XTextTest.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest2.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest3.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest4.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_2_0.csproj">\r
-      <Project>{80B8A117-6BB4-4646-8BE9-863A5C105437}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_4_0.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_4_0.csproj
deleted file mode 100644 (file)
index a3fd2ab..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{272CAAB8-A37F-42C1-80B5-9B8A7FFC0D2C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xml.Linq-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.Linq_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Xml.Linq\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XAttributeTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XDocumentTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XElementTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNamespaceTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNameTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeDocumentOrderComparerTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeEqualityComparerTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeNavigatorTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeReaderTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XObjectTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XProcessingInstructionTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XStreamingElementTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XTextTest.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest2.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest3.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest4.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_0.csproj">\r
-      <Project>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index 729aeaa9f3fd765be6f90cba8452a217b4f874f4..ad962f07317dc5be24ff0adb4a47780d51eace49 100644 (file)
@@ -22,7 +22,8 @@ TEST_RESOURCES = \
 TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:System.Xml.dll -r:System.Core.dll -nowarn:618,672,219,67,169,612 \
        $(foreach f, $(TEST_RESOURCES), -resource:$(f),$(notdir $(f)))
 
-LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 -unsafe $(RESOURCE_FILES:%=-resource:%)
+REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL
+LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%)
 TEST_MCS_FLAGS += -r:System.Configuration
 PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE))
 
@@ -55,7 +56,6 @@ LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(secxml_libdir)/S
 endif
 
 EXTRA_DISTFILES = \
-       System.Text.RegularExpressions/notes.txt        \
        System.ComponentModel.Design/Changelog          \
        Test/test-config-file                           \
        Test/test-config-file-net-2.0                   \
diff --git a/mcs/class/System/SR.cs b/mcs/class/System/SR.cs
new file mode 100644 (file)
index 0000000..cf3d984
--- /dev/null
@@ -0,0 +1,84 @@
+//
+// Resource strings referenced by the code.
+//
+// Copyright 2014 Xamarin Inc
+//
+partial class SR
+{
+       public const string UnexpectedOpcode = "UnexpectedOpcode";
+       public const string BeginIndexNotNegative = "BeginIndexNotNegative";
+       public const string CountTooSmall = "CountTooSmall";
+       public const string ReplacementError = "ReplacementError";
+       public const string BadClassInCharRange = "BadClassInCharRange";
+       public const string TooManyAlternates = "TooManyAlternates";
+       public const string MakeException = "MakeException";
+       public const string IncompleteSlashP = "IncompleteSlashP";
+       public const string MalformedSlashP = "MalformedSlashP";
+       public const string CaptureGroupOutOfRange = "CaptureGroupOutOfRange";
+       public const string InvalidGroupName = "InvalidGroupName";
+       public const string UndefinedBackref = "UndefinedBackref";
+       public const string UndefinedNameref = "UndefinedNameref";
+       public const string UnrecognizedControl = "UnrecognizedControl";
+       
+       public const string AlternationCantCapture = "AlternationCantCapture";
+       public const string AlternationCantHaveComment = "AlternationCantHaveComment";
+       public const string Arg_InvalidArrayType = "Arg_InvalidArrayType";
+       public const string Arg_RankMultiDimNotSupported = "Arg_RankMultiDimNotSupported";
+       public const string ArgumentNull_ArrayWithNullElements = "ArgumentNull_ArrayWithNullElements";
+       public const string CapnumNotZero = "CapnumNotZero";
+       public const string EnumNotStarted = "EnumNotStarted";
+       public const string IllegalCondition = "IllegalCondition";
+       public const string IllegalDefaultRegexMatchTimeoutInAppDomain = "IllegalDefaultRegexMatchTimeoutInAppDomain";
+       public const string IllegalEndEscape = "IllegalEndEscape";
+       public const string IllegalRange = "IllegalRange";
+       public const string InvalidNullEmptyArgument = "Invalid empty argument {0}";
+       public const string InternalError = "InternalError";
+       public const string LengthNotNegative = "LengthNotNegative";
+       public const string MalformedNameRef = "MalformedNameRef";
+       public const string MalformedReference = "MalformedReference";
+       public const string MissingControl = "MissingControl";
+       public const string NestedQuantify = "NestedQuantify";
+       public const string NoResultOnFailed = "NoResultOnFailed";
+       public const string NotEnoughParens = "NotEnoughParens";
+       public const string OnlyAllowedOnce = "OnlyAllowedOnce";
+       public const string QuantifyAfterNothing = "QuantifyAfterNothing";
+       public const string RegexMatchTimeoutException_Occurred = "RegexMatchTimeoutException_Occurred";
+       public const string ReversedCharRange = "ReversedCharRange";
+       public const string SubtractionMustBeLast = "SubtractionMustBeLast";
+       public const string TooFewHex = "TooFewHex";
+       public const string TooManyParens = "TooManyParens";
+       public const string UndefinedNameRef = "UndefinedNameRef";
+       public const string UndefinedReference = "UndefinedReference";
+       public const string UnimplementedState = "UnimplementedState";
+       public const string UnknownProperty = "UnknownProperty";
+       public const string UnrecognizedEscape = "UnrecognizedEscape";
+       public const string UnrecognizedGrouping = "UnrecognizedGrouping";
+       public const string UnterminatedBracket = "UnterminatedBracket";
+       public const string UnterminatedComment = "UnterminatedComment";
+
+       public const string BlockingCollection_Add_ConcurrentCompleteAdd = "BlockingCollection_Add_ConcurrentCompleteAdd";
+       public const string BlockingCollection_Add_Failed = "BlockingCollection_Add_Failed";
+       public const string BlockingCollection_CantAddAnyWhenCompleted = "BlockingCollection_CantAddAnyWhenCompleted";
+       public const string BlockingCollection_CantTakeAnyWhenAllDone = "BlockingCollection_CantTakeAnyWhenAllDone";
+       public const string BlockingCollection_CantTakeWhenDone = "BlockingCollection_CantTakeWhenDone";
+       public const string BlockingCollection_Completed = "BlockingCollection_Completed";
+       public const string BlockingCollection_CopyTo_IncorrectType = "BlockingCollection_CopyTo_IncorrectType";
+       public const string BlockingCollection_CopyTo_MultiDim = "BlockingCollection_CopyTo_MultiDim";
+       public const string BlockingCollection_CopyTo_NonNegative = "BlockingCollection_CopyTo_NonNegative";
+       public const string BlockingCollection_CopyTo_TooManyElems = "BlockingCollection_CopyTo_TooManyElems";
+       public const string BlockingCollection_Disposed = "BlockingCollection_Disposed";
+       public const string BlockingCollection_Take_CollectionModified = "BlockingCollection_Take_CollectionModified";
+       public const string BlockingCollection_TimeoutInvalid = "BlockingCollection_TimeoutInvalid";
+       public const string BlockingCollection_ValidateCollectionsArray_DispElems = "BlockingCollection_ValidateCollectionsArray_DispElems";
+       public const string BlockingCollection_ValidateCollectionsArray_LargeSize = "BlockingCollection_ValidateCollectionsArray_LargeSize";
+       public const string BlockingCollection_ValidateCollectionsArray_NullElems = "BlockingCollection_ValidateCollectionsArray_NullElems";
+       public const string BlockingCollection_ValidateCollectionsArray_ZeroSize = "BlockingCollection_ValidateCollectionsArray_ZeroSize";
+       public const string BlockingCollection_ctor_BoundedCapacityRange = "BlockingCollection_ctor_BoundedCapacityRange";
+       public const string BlockingCollection_ctor_CountMoreThanCapacity = "BlockingCollection_ctor_CountMoreThanCapacity";
+       public const string Common_OperationCanceled = "Common_OperationCanceled";
+       public const string ConcurrentBag_CopyTo_ArgumentNullException = "ConcurrentBag_CopyTo_ArgumentNullException";
+       public const string ConcurrentBag_CopyTo_ArgumentOutOfRangeException = "ConcurrentBag_CopyTo_ArgumentOutOfRangeException";
+       public const string ConcurrentBag_Ctor_ArgumentNullException = "ConcurrentBag_Ctor_ArgumentNullException";
+       public const string ConcurrentCollection_SyncRoot_NotSupported = "ConcurrentCollection_SyncRoot_NotSupported";
+       
+}
diff --git a/mcs/class/System/System-bare-net_2_0.csproj b/mcs/class/System/System-bare-net_2_0.csproj
deleted file mode 100644 (file)
index 63b2c42..0000000
+++ /dev/null
@@ -1,1183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5459507F-DC25-401C-A2F4-D5ECAC3A34E6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0/bare</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;CONFIGURATION_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeComment.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeObject.cs" />\r
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />\r
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\FieldDirection.cs" />\r
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />\r
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />\r
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="System.Collections.Generic\ISet.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />\r
-    <Compile Include="System.Collections.Generic\Queue.cs" />\r
-    <Compile Include="System.Collections.Generic\RBTree.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedList.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />\r
-    <Compile Include="System.Collections.Generic\Stack.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />\r
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />\r
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />\r
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />\r
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />\r
-    <Compile Include="System.ComponentModel\BindingList.cs" />\r
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\CharConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\Component.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />\r
-    <Compile Include="System.ComponentModel\Container.cs" />\r
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />\r
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />\r
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />\r
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingList.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />\r
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />\r
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IComponent.cs" />\r
-    <Compile Include="System.ComponentModel\IContainer.cs" />\r
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />\r
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="System.ComponentModel\IListSource.cs" />\r
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\INestedSite.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />\r
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />\r
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\ISite.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="System.ComponentModel\ITypedList.cs" />\r
-    <Compile Include="System.ComponentModel\License.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseException.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />\r
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />\r
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />\r
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />\r
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\StringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />\r
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\WarningException.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />\r
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\Debug.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />\r
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\Switch.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\Trace.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />\r
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />\r
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSource.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\StreamWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\Cookie.cs" />\r
-    <Compile Include="System.Net\CookieCollection.cs" />\r
-    <Compile Include="System.Net\CookieContainer.cs" />\r
-    <Compile Include="System.Net\CookieException.cs" />\r
-    <Compile Include="System.Net\CookieParser.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebClient.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebPermission.cs" />\r
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
-    <Compile Include="System.Threading\Barrier.cs" />\r
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="System.Timers\Timer.cs" />\r
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_2_0.csproj">\r
-      <Project>{AAA3F683-244C-40EF-8EF8-A95938862A44}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System/System-bare-net_4_0.csproj b/mcs/class/System/System-bare-net_4_0.csproj
deleted file mode 100644 (file)
index 3bc262e..0000000
+++ /dev/null
@@ -1,1183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{56906835-C767-4E75-B610-D9F7E824329D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0/bare</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeComment.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeObject.cs" />\r
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />\r
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\FieldDirection.cs" />\r
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />\r
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />\r
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="System.Collections.Generic\ISet.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />\r
-    <Compile Include="System.Collections.Generic\Queue.cs" />\r
-    <Compile Include="System.Collections.Generic\RBTree.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedList.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />\r
-    <Compile Include="System.Collections.Generic\Stack.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />\r
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />\r
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />\r
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />\r
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />\r
-    <Compile Include="System.ComponentModel\BindingList.cs" />\r
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\CharConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\Component.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />\r
-    <Compile Include="System.ComponentModel\Container.cs" />\r
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />\r
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />\r
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />\r
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingList.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />\r
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />\r
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IComponent.cs" />\r
-    <Compile Include="System.ComponentModel\IContainer.cs" />\r
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />\r
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="System.ComponentModel\IListSource.cs" />\r
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\INestedSite.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />\r
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />\r
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\ISite.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="System.ComponentModel\ITypedList.cs" />\r
-    <Compile Include="System.ComponentModel\License.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseException.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />\r
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />\r
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />\r
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />\r
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\StringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />\r
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\WarningException.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />\r
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\Debug.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />\r
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\Switch.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\Trace.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />\r
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />\r
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSource.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\StreamWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\Cookie.cs" />\r
-    <Compile Include="System.Net\CookieCollection.cs" />\r
-    <Compile Include="System.Net\CookieContainer.cs" />\r
-    <Compile Include="System.Net\CookieException.cs" />\r
-    <Compile Include="System.Net\CookieParser.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebClient.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebPermission.cs" />\r
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
-    <Compile Include="System.Threading\Barrier.cs" />\r
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="System.Timers\Timer.cs" />\r
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_0.csproj">\r
-      <Project>{5889848E-305B-4B11-B3B1-A25761DAFE45}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 8790db085756129446c094ac1edcf8b1788152ce..14dca25b8292380e7617df1ff6a6b54b7e809288 100644 (file)
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CONFIGURATION_2_0</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CONFIGURATION_2_0;MONO;DISABLE_CAS_USE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
     <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
     <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
     <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
     <Compile Include="System.Threading\Barrier.cs" />\r
     <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
     <Compile Include="System.Threading\Semaphore.cs" />\r
     <Compile Include="System\UriParseComponents.cs" />\r
     <Compile Include="System\UriParser.cs" />\r
     <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
+    <Compile Include="System\UriTypeConverter.cs" />\r
+    <Compile Include="SR.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\System\Text\RegularExpressions\RegexMatchTimeoutException.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />\r
+  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
diff --git a/mcs/class/System/System-net_2_0.csproj b/mcs/class/System/System-net_2_0.csproj
deleted file mode 100644 (file)
index 331fb0d..0000000
+++ /dev/null
@@ -1,1194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5A346705-1044-48F2-987D-CAE22A255427}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeComment.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeObject.cs" />\r
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />\r
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\FieldDirection.cs" />\r
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />\r
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />\r
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="System.Collections.Generic\ISet.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />\r
-    <Compile Include="System.Collections.Generic\Queue.cs" />\r
-    <Compile Include="System.Collections.Generic\RBTree.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedList.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />\r
-    <Compile Include="System.Collections.Generic\Stack.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />\r
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />\r
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />\r
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />\r
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />\r
-    <Compile Include="System.ComponentModel\BindingList.cs" />\r
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\CharConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\Component.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />\r
-    <Compile Include="System.ComponentModel\Container.cs" />\r
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />\r
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />\r
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />\r
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingList.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />\r
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />\r
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IComponent.cs" />\r
-    <Compile Include="System.ComponentModel\IContainer.cs" />\r
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />\r
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="System.ComponentModel\IListSource.cs" />\r
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\INestedSite.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />\r
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />\r
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\ISite.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="System.ComponentModel\ITypedList.cs" />\r
-    <Compile Include="System.ComponentModel\License.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseException.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />\r
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />\r
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />\r
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />\r
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\StringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />\r
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\WarningException.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />\r
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\Debug.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />\r
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\Switch.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\Trace.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />\r
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />\r
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSource.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\Cookie.cs" />\r
-    <Compile Include="System.Net\CookieCollection.cs" />\r
-    <Compile Include="System.Net\CookieContainer.cs" />\r
-    <Compile Include="System.Net\CookieException.cs" />\r
-    <Compile Include="System.Net\CookieParser.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebClient.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebPermission.cs" />\r
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
-    <Compile Include="System.Threading\Barrier.cs" />\r
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="System.Timers\Timer.cs" />\r
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-build.csproj">\r
-      <Project>{F8FFA803-9D2E-465A-A87D-3F871AD497B6}</Project>\r
-      <Name>System.XML\System.Xml-build</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Configuration.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Configuration.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\System\System-build-1.csproj">\r
-      <Project>{ACA4A790-62B2-4D59-B96C-CE17F8F6BE58}</Project>\r
-      <Name>System\System-build-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-build.csproj">\r
-      <Project>{B826C748-252D-4C0F-8A6C-C8DADE270C3F}</Project>\r
-      <Name>Mono.Security\Mono.Security-build</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System/System-net_4_0.csproj b/mcs/class/System/System-net_4_0.csproj
deleted file mode 100644 (file)
index 03ef396..0000000
+++ /dev/null
@@ -1,1193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{714C7BA8-AC9A-49C4-ADCA-CD4585EF1A46}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeComment.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeObject.cs" />\r
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />\r
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\FieldDirection.cs" />\r
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />\r
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />\r
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="System.Collections.Generic\ISet.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />\r
-    <Compile Include="System.Collections.Generic\Queue.cs" />\r
-    <Compile Include="System.Collections.Generic\RBTree.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedList.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />\r
-    <Compile Include="System.Collections.Generic\Stack.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />\r
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />\r
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />\r
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />\r
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />\r
-    <Compile Include="System.ComponentModel\BindingList.cs" />\r
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\CharConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\Component.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />\r
-    <Compile Include="System.ComponentModel\Container.cs" />\r
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />\r
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />\r
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />\r
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingList.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />\r
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />\r
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IComponent.cs" />\r
-    <Compile Include="System.ComponentModel\IContainer.cs" />\r
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />\r
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="System.ComponentModel\IListSource.cs" />\r
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\INestedSite.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />\r
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />\r
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\ISite.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="System.ComponentModel\ITypedList.cs" />\r
-    <Compile Include="System.ComponentModel\License.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseException.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />\r
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />\r
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />\r
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />\r
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\StringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />\r
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\WarningException.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />\r
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\Debug.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />\r
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\Switch.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\Trace.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />\r
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />\r
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSource.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\Cookie.cs" />\r
-    <Compile Include="System.Net\CookieCollection.cs" />\r
-    <Compile Include="System.Net\CookieContainer.cs" />\r
-    <Compile Include="System.Net\CookieException.cs" />\r
-    <Compile Include="System.Net\CookieParser.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebClient.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebPermission.cs" />\r
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
-    <Compile Include="System.Threading\Barrier.cs" />\r
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="System.Timers\Timer.cs" />\r
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index d8abc97e11a0f415a74c92260264f374a3a4f9ef..5df88568f80eb697658f9cdce4f55b8a04ec3f03 100644 (file)
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP;CONFIGURATION_DEP</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP;CONFIGURATION_DEP;MONO;DISABLE_CAS_USE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
     <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
     <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
     <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
     <Compile Include="System.Threading\Barrier.cs" />\r
     <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
     <Compile Include="System.Threading\Semaphore.cs" />\r
     <Compile Include="System\UriParseComponents.cs" />\r
     <Compile Include="System\UriParser.cs" />\r
     <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
+    <Compile Include="System\UriTypeConverter.cs" />\r
+    <Compile Include="SR.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\System\Text\RegularExpressions\RegexMatchTimeoutException.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />\r
+  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
diff --git a/mcs/class/System/System-secxml-net_2_0.csproj b/mcs/class/System/System-secxml-net_2_0.csproj
deleted file mode 100644 (file)
index 76f9f2e..0000000
+++ /dev/null
@@ -1,1195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{93A942E0-E5DC-470B-8BEA-C410CC67C6EF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0/secxml</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeComment.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeObject.cs" />\r
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />\r
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\FieldDirection.cs" />\r
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />\r
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />\r
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="System.Collections.Generic\ISet.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />\r
-    <Compile Include="System.Collections.Generic\Queue.cs" />\r
-    <Compile Include="System.Collections.Generic\RBTree.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedList.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />\r
-    <Compile Include="System.Collections.Generic\Stack.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />\r
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />\r
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />\r
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />\r
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />\r
-    <Compile Include="System.ComponentModel\BindingList.cs" />\r
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\CharConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\Component.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />\r
-    <Compile Include="System.ComponentModel\Container.cs" />\r
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />\r
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />\r
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />\r
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingList.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />\r
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />\r
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IComponent.cs" />\r
-    <Compile Include="System.ComponentModel\IContainer.cs" />\r
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />\r
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="System.ComponentModel\IListSource.cs" />\r
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\INestedSite.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />\r
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />\r
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\ISite.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="System.ComponentModel\ITypedList.cs" />\r
-    <Compile Include="System.ComponentModel\License.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseException.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />\r
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />\r
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />\r
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />\r
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\StringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />\r
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\WarningException.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />\r
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\Debug.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />\r
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\Switch.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\Trace.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />\r
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />\r
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSource.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\StreamWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\Cookie.cs" />\r
-    <Compile Include="System.Net\CookieCollection.cs" />\r
-    <Compile Include="System.Net\CookieContainer.cs" />\r
-    <Compile Include="System.Net\CookieException.cs" />\r
-    <Compile Include="System.Net\CookieParser.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebClient.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebPermission.cs" />\r
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
-    <Compile Include="System.Threading\Barrier.cs" />\r
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="System.Timers\Timer.cs" />\r
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_2_0.csproj">\r
-      <Project>{68BBE0B0-9B07-4884-BDF2-6410566B5320}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-build.csproj">\r
-      <Project>{8C65BF8D-256A-44B0-BF9A-8052C075DC31}</Project>\r
-      <Name>System.XML\System.Xml-bare-build</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="System-bare-net_2_0.csproj">\r
-      <Project>{CB8FF352-29A0-4181-8FA6-F912F0B62D34}</Project>\r
-      <Name>System\System-bare-net_2_0</Name>\r
-      <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-build.csproj">\r
-      <Project>{80E57C4A-0D18-489B-AE2E-E540CEBE0CEE}</Project>\r
-      <Name>Mono.Security\Mono.Security-build</Name>\r
-      <Aliases>MonoSecurity</Aliases>    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System/System-secxml-net_4_0.csproj b/mcs/class/System/System-secxml-net_4_0.csproj
deleted file mode 100644 (file)
index ea9e71c..0000000
+++ /dev/null
@@ -1,1195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{ED114F49-84B3-4EF9-80EC-90D4EEF7FF8E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0/secxml</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />\r
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeComment.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />\r
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />\r
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeObject.cs" />\r
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />\r
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />\r
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="System.CodeDom\FieldDirection.cs" />\r
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />\r
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />\r
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="System.Collections.Generic\ISet.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />\r
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />\r
-    <Compile Include="System.Collections.Generic\Queue.cs" />\r
-    <Compile Include="System.Collections.Generic\RBTree.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedList.cs" />\r
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />\r
-    <Compile Include="System.Collections.Generic\Stack.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />\r
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />\r
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />\r
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />\r
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />\r
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />\r
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />\r
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />\r
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />\r
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />\r
-    <Compile Include="System.ComponentModel\BindingList.cs" />\r
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\CharConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\Component.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />\r
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />\r
-    <Compile Include="System.ComponentModel\Container.cs" />\r
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />\r
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />\r
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />\r
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />\r
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingList.cs" />\r
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />\r
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />\r
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="System.ComponentModel\IComponent.cs" />\r
-    <Compile Include="System.ComponentModel\IContainer.cs" />\r
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />\r
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="System.ComponentModel\IListSource.cs" />\r
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\INestedSite.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />\r
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />\r
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="System.ComponentModel\ISite.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />\r
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="System.ComponentModel\ITypedList.cs" />\r
-    <Compile Include="System.ComponentModel\License.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseException.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />\r
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />\r
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />\r
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />\r
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />\r
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />\r
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />\r
-    <Compile Include="System.ComponentModel\StringConverter.cs" />\r
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />\r
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />\r
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />\r
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />\r
-    <Compile Include="System.ComponentModel\WarningException.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />\r
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />\r
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\Debug.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />\r
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\Switch.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\Trace.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />\r
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />\r
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSource.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\StreamWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\Cookie.cs" />\r
-    <Compile Include="System.Net\CookieCollection.cs" />\r
-    <Compile Include="System.Net\CookieContainer.cs" />\r
-    <Compile Include="System.Net\CookieException.cs" />\r
-    <Compile Include="System.Net\CookieParser.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebClient.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebPermission.cs" />\r
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
-    <Compile Include="System.Threading\Barrier.cs" />\r
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="System.Timers\Timer.cs" />\r
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_0.csproj">\r
-      <Project>{5889848E-305B-4B11-B3B1-A25761DAFE45}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_2_0.csproj">\r
-      <Project>{0E9DD462-944B-426E-BC1E-96EF270EF7E2}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="System-bare-net_4_0.csproj">\r
-      <Project>{56906835-C767-4E75-B610-D9F7E824329D}</Project>\r
-      <Name>System\System-bare-net_4_0</Name>\r
-      <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_2_0.csproj">\r
-      <Project>{ECDB1158-526C-46EE-896E-9BFB6F85C0A3}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-      <Aliases>MonoSecurity</Aliases>    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index b13fc18c24506e881f3374dcad084414a0bea640..bab7e335af18c6a88c6a0986fa8ca8036d8cb055 100644 (file)
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP;MONO;DISABLE_CAS_USE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
     <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
     <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
     <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\category.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />\r
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />\r
     <Compile Include="System.Threading\Barrier.cs" />\r
     <Compile Include="System.Threading\BarrierPostPhaseException.cs" />\r
     <Compile Include="System.Threading\Semaphore.cs" />\r
     <Compile Include="System\UriParseComponents.cs" />\r
     <Compile Include="System\UriParser.cs" />\r
     <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
+    <Compile Include="System\UriTypeConverter.cs" />\r
+    <Compile Include="SR.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\System\Text\RegularExpressions\RegexMatchTimeoutException.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />\r
+  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
diff --git a/mcs/class/System/System-tests-net_2_0.csproj b/mcs/class/System/System-tests-net_2_0.csproj
deleted file mode 100644 (file)
index cd0bb73..0000000
+++ /dev/null
@@ -1,619 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{44334A58-369B-4605-957E-8CAB1C843377}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <OutputPath>bin\Debug\System-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromExpressionTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromNamespaceTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromStatementTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromTypeTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorIdentifierTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorTypeOutputTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CSharpCodeProviderCas.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CSharpCodeProviderTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromBinaryOperatorTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromExpressionTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromNamespaceTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromStatementTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromTypeTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\VBCodeProviderCas.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\VBCodeProviderTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\IntranetZoneCredentialPolicyCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\IntranetZoneCredentialPolicyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\PowerModeChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionEndedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionEndingEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionSwitchEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionSwitchEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SystemEventsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\TimerElapsedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\UserPreferenceChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\UserPreferenceChangingEventArgsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeCompilerCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeDomProviderCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorFromTypeTestBase.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorGenerateFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorOptionsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorOptionsTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeParserCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerErrorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerErrorCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerInfoCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerParametersCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerResultsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\ExecutorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\ExecutorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\GeneratedCodeAttributeCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\GeneratedCodeAttributeTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\IndentedTextWriterCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\IndentedTextWriterTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\TempFileCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\TempFileCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArgumentReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArgumentReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayIndexerExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAssignStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttachEventStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttachEventStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeBaseReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeBinaryOperatorExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCastExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCastExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeChecksumPragmaCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeChecksumPragmaTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCompileUnitCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConditionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConstructorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConstructorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDefaultValueExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDefaultValueExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateInvokeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectionExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEntryPointMethodCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEventReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEventReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeFieldReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeGotoStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeGotoStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeIndexerExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeIterationStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLabeledStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLinePragmaCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLinePragmaTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberEventCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberFieldCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberFieldTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberMethodCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberMethodTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberPropertyCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberPropertyTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodInvokeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodInvokeExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReturnStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePrimitiveExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertyReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertyReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertySetValueReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRegionDirectiveCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRegionDirectiveTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRemoveEventStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRemoveEventStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetCompileUnitCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetCompileUnitTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetTypeMemberCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetTypeMemberTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeThisReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeThrowExceptionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTryCatchFinallyStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeConstructorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeConstructorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDelegateCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDelegateTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeOfExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeOfExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableDeclarationStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableDeclarationStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\BlockingCollectionTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentBagTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\LinkedListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\QueueTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedSetTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\StackTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\CollectionChangedEventValidators.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BasicOperationsTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BitVector32Cas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BitVector32Test.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\CollectionsUtilCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\HybridDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\HybridDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\ListDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\ListDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameObjectCollectionBaseCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameObjectCollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameValueCollectionCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameValueCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\OrderedDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\OrderedDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringCollectionCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringDictionaryTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\ContextStackTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\InstanceDescriptorCas.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\InstanceDescriptorTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\CheckoutExceptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\ServiceContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ArrayConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AsyncOperationManagerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AttributeCollectionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AttributeProviderAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\BackgroundWorkerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\BindingListTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ByteConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CharConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CollectionConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComplexBindingPropertiesAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComponentConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComponentResourceManagerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CultureInfoConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DataObjectMethodAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DateTimeConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DateTimeOffsetConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DecimalConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DefaultBindingPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DefaultValueAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DesignerAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DisplayNameAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DoubleConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EnumConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EventDescriptorCollectionTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EventHandlerListTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int16ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int32ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int64ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\InvalidEnumArgumentExceptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\LicenseManagerTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ListChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\LookupBindingPropertiesAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\MaskedTextProviderTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\MultilineStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\NestedContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\NullableConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyDescriptorCollectionTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyDescriptorTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ReferenceConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SByteConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SingleConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ToolboxItemAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeDescriptionProviderTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeDescriptorTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt16ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt32ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt64ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Win32ExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ApplicationSettingsBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigXmlDocumentTest.cs" />\r
-    <Compile Include="Test\System.Configuration\LocalFileSettingsProviderTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyValueCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyValueTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\CounterCreationDataTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebugTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DelimitedListTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DiagnosticsConfigurationHandlerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventInstanceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogPermissionTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventSourceCreationDataTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\FileVersionInfoTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\PerformanceCounterPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\PerformanceCounterPermissionTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\ProcessStartInfoTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\ProcessTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\SourceSwitchTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StopwatchTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\SwitchesTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TextWriterTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceSourceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\XmlWriterTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.IO.Compression\DeflateStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.Compression\DeflateStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.Compression\GZipStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.Compression\GzipStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.Ports\SerialPortTest.cs" />\r
-    <Compile Include="Test\System.IO\FileSystemWatcherTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\ConnectionManagementSectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\HttpWebRequestElementTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\WebRequestModulesSectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AlternateViewCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AlternateViewTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AttachmentCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AttachmentTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\LinkedResourceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\LinkedResourceTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailAddressCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailAddressTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailMessageTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpExceptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpServer.cs" />\r
-    <Compile Include="Test\System.Net.Mime\ContentDispositionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mime\ContentTypeTest.cs" />\r
-    <Compile Include="Test\System.Net.NetworkInformation\PhysicalAddressTest.cs" />\r
-    <Compile Include="Test\System.Net.Security\SslStreamTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\IPv6MulticastOptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\MulticastOptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\NetworkStreamCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\NetworkStreamTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketAsyncEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketAsyncTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpClientCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpListenerTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\UdpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.WebSockets\ClientWebSocketTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieContainerTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieParserTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieTest.cs" />\r
-    <Compile Include="Test\System.Net\CredentialCacheTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsCas.cs" />\r
-    <Compile Include="Test\System.Net\DnsPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsTest.cs" />\r
-    <Compile Include="Test\System.Net\EndPointTest.cs" />\r
-    <Compile Include="Test\System.Net\FileWebRequestCas.cs" />\r
-    <Compile Include="Test\System.Net\FileWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\FileWebResponseTest.cs" />\r
-    <Compile Include="Test\System.Net\FtpWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListener2Test.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerBasicIdentityTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerPrefixCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebRequestCas.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebResponseTest.cs" />\r
-    <Compile Include="Test\System.Net\IPAddressTest.cs" />\r
-    <Compile Include="Test\System.Net\IPEndPointTest.cs" />\r
-    <Compile Include="Test\System.Net\NetworkCredentialTest.cs" />\r
-    <Compile Include="Test\System.Net\ServicePointManagerTest.cs" />\r
-    <Compile Include="Test\System.Net\ServicePointTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketResponder.cs" />\r
-    <Compile Include="Test\System.Net\WebClientTest.cs" />\r
-    <Compile Include="Test\System.Net\WebClientTestAsync.cs" />\r
-    <Compile Include="Test\System.Net\WebHeaderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\WebPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\WebPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\WebProxyTest.cs" />\r
-    <Compile Include="Test\System.Net\WebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\WebUtilityTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\FrameworkNameTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\SemaphoreSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_01_SignatureVerification.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_02_ValidityPeriod.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_03_VerifyingNameChaining.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_04_BasicCertificateRevocationTests.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_05_VerifyingPathWithSelfIssuedCertificates.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_06_VerifyingBasicConstraints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_07_KeyUsage.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_08_CertificatePolicies.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_09_RequireExplicitPolicy.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_10_PolicyMappings.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_11_InhibitPolicyMapping.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_12_InhibitAnyPolicy.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_13_NameConstraints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_14_DistributionPoints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_15_DeltaCRL.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_16_PrivateCertificateExtensions.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PkitsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PublicKeyCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PublicKeyTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X500DistinguishedNameCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X500DistinguishedNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Cert20Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2CollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCollectionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainPolicyCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainPolicyTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509KeyUsageExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509KeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509StoreCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509StoreTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AsnEncodedDataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseEntryCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseEntryTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\CaptureCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\CaptureCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\PerlTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\PerlTrials.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexBugs.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCompilationInfoCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCompilationInfoTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexMatchTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexReplace.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexReplaceTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexResultTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexRunnerCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexRunnerFactoryCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexTrial.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\SplitTests.cs" />\r
-    <Compile Include="Test\System.Threading\BarrierTest.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreCas.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreFullExceptionCas.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreTest.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadExceptionEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Timers\ElapsedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimerCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimersDescriptionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimersDescriptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Timers\TimerTest.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionCas.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionTest.cs" />\r
-    <Compile Include="Test\System\FileStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\FileStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\FtpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\FtpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\GenericUriParserCas.cs" />\r
-    <Compile Include="Test\System\GenericUriParserTest.cs" />\r
-    <Compile Include="Test\System\GopherStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\GopherStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\HttpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\HttpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\LdapStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\LdapStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NetPipeStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NetPipeStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NetTcpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NetTcpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NewsStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NewsStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\UriBuilderCas.cs" />\r
-    <Compile Include="Test\System\UriBuilderTest.cs" />\r
-    <Compile Include="Test\System\UriFormatExceptionCas.cs" />\r
-    <Compile Include="Test\System\UriParserCas.cs" />\r
-    <Compile Include="Test\System\UriParserTest.cs" />\r
-    <Compile Include="Test\System\UriTest.cs" />\r
-    <Compile Include="Test\System\UriTest2.cs" />\r
-    <Compile Include="Test\System\UriTest3.cs" />\r
-    <Compile Include="Test\System\UriTypeConverterCas.cs" />\r
-    <Compile Include="Test\System\UriTypeConverterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Drawing.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Drawing.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_2_0.csproj">\r
-      <Project>{57CFE851-81AC-4269-B24A-965A53D87248}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_2_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="System.Data">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>System.Data</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0.csproj">\r
-      <Project>{E89F34AB-7AE2-41CA-B891-C8D1C9F02EB8}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">\r
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/System/test-uri-props.txt">\r
-      <LogicalName>test-uri-props.txt</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/System/test-uri-props-manual.txt">\r
-      <LogicalName>test-uri-props-manual.txt</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/System/test-uri-relative-props.txt">\r
-      <LogicalName>test-uri-relative-props.txt</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/System/System-tests-net_4_0.csproj b/mcs/class/System/System-tests-net_4_0.csproj
deleted file mode 100644 (file)
index c6c9edf..0000000
+++ /dev/null
@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1CEF4968-F313-44EA-B1EE-B74FB47A071C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <OutputPath>bin\Debug\System-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromExpressionTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromNamespaceTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromStatementTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromTypeTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorIdentifierTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorTypeOutputTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CSharpCodeProviderCas.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CSharpCodeProviderTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromBinaryOperatorTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromExpressionTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromNamespaceTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromStatementTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromTypeTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\VBCodeProviderCas.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\VBCodeProviderTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\IntranetZoneCredentialPolicyCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\IntranetZoneCredentialPolicyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\PowerModeChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionEndedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionEndingEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionSwitchEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionSwitchEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SystemEventsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\TimerElapsedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\UserPreferenceChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\UserPreferenceChangingEventArgsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeCompilerCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeDomProviderCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorFromTypeTestBase.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorGenerateFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorOptionsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorOptionsTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeParserCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerErrorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerErrorCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerInfoCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerParametersCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerResultsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\ExecutorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\ExecutorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\GeneratedCodeAttributeCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\GeneratedCodeAttributeTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\IndentedTextWriterCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\IndentedTextWriterTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\TempFileCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\TempFileCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArgumentReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArgumentReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayIndexerExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAssignStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttachEventStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttachEventStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeBaseReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeBinaryOperatorExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCastExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCastExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeChecksumPragmaCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeChecksumPragmaTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCompileUnitCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConditionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConstructorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConstructorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDefaultValueExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDefaultValueExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateInvokeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectionExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEntryPointMethodCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEventReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEventReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeFieldReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeGotoStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeGotoStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeIndexerExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeIterationStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLabeledStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLinePragmaCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLinePragmaTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberEventCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberFieldCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberFieldTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberMethodCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberMethodTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberPropertyCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberPropertyTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodInvokeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodInvokeExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReturnStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePrimitiveExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertyReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertyReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertySetValueReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRegionDirectiveCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRegionDirectiveTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRemoveEventStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRemoveEventStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetCompileUnitCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetCompileUnitTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetTypeMemberCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetTypeMemberTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeThisReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeThrowExceptionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTryCatchFinallyStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeConstructorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeConstructorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDelegateCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDelegateTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeOfExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeOfExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableDeclarationStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableDeclarationStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\BlockingCollectionTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentBagTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\LinkedListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\QueueTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedSetTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\StackTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\CollectionChangedEventValidators.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BasicOperationsTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BitVector32Cas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BitVector32Test.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\CollectionsUtilCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\HybridDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\HybridDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\ListDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\ListDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameObjectCollectionBaseCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameObjectCollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameValueCollectionCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameValueCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\OrderedDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\OrderedDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringCollectionCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringDictionaryTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\ContextStackTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\InstanceDescriptorCas.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\InstanceDescriptorTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\CheckoutExceptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\ServiceContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ArrayConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AsyncOperationManagerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AttributeCollectionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AttributeProviderAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\BackgroundWorkerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\BindingListTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ByteConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CharConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CollectionConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComplexBindingPropertiesAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComponentConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComponentResourceManagerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CultureInfoConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DataObjectMethodAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DateTimeConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DateTimeOffsetConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DecimalConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DefaultBindingPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DefaultValueAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DesignerAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DisplayNameAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DoubleConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EnumConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EventDescriptorCollectionTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EventHandlerListTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int16ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int32ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int64ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\InvalidEnumArgumentExceptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\LicenseManagerTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ListChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\LookupBindingPropertiesAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\MaskedTextProviderTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\MultilineStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\NestedContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\NullableConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyDescriptorCollectionTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyDescriptorTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ReferenceConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SByteConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SingleConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ToolboxItemAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeDescriptionProviderTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeDescriptorTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt16ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt32ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt64ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Win32ExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ApplicationSettingsBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigXmlDocumentTest.cs" />\r
-    <Compile Include="Test\System.Configuration\LocalFileSettingsProviderTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyValueCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyValueTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\CounterCreationDataTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebugTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DelimitedListTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DiagnosticsConfigurationHandlerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventInstanceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogPermissionTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventSourceCreationDataTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\FileVersionInfoTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\PerformanceCounterPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\PerformanceCounterPermissionTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\ProcessStartInfoTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\ProcessTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\SourceSwitchTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StopwatchTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\SwitchesTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TextWriterTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceSourceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\XmlWriterTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.IO.Compression\DeflateStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.Compression\DeflateStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.Compression\GZipStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.Compression\GzipStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.Ports\SerialPortTest.cs" />\r
-    <Compile Include="Test\System.IO\FileSystemWatcherTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\ConnectionManagementSectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\HttpWebRequestElementTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\WebRequestModulesSectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AlternateViewCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AlternateViewTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AttachmentCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AttachmentTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\LinkedResourceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\LinkedResourceTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailAddressCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailAddressTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailMessageTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpExceptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpServer.cs" />\r
-    <Compile Include="Test\System.Net.Mime\ContentDispositionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mime\ContentTypeTest.cs" />\r
-    <Compile Include="Test\System.Net.NetworkInformation\PhysicalAddressTest.cs" />\r
-    <Compile Include="Test\System.Net.Security\SslStreamTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\IPv6MulticastOptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\MulticastOptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\NetworkStreamCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\NetworkStreamTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketAsyncEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketAsyncTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpClientCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpListenerTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\UdpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.WebSockets\ClientWebSocketTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieContainerTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieParserTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieTest.cs" />\r
-    <Compile Include="Test\System.Net\CredentialCacheTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsCas.cs" />\r
-    <Compile Include="Test\System.Net\DnsPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsTest.cs" />\r
-    <Compile Include="Test\System.Net\EndPointTest.cs" />\r
-    <Compile Include="Test\System.Net\FileWebRequestCas.cs" />\r
-    <Compile Include="Test\System.Net\FileWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\FileWebResponseTest.cs" />\r
-    <Compile Include="Test\System.Net\FtpWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListener2Test.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerBasicIdentityTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerPrefixCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebRequestCas.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebResponseTest.cs" />\r
-    <Compile Include="Test\System.Net\IPAddressTest.cs" />\r
-    <Compile Include="Test\System.Net\IPEndPointTest.cs" />\r
-    <Compile Include="Test\System.Net\NetworkCredentialTest.cs" />\r
-    <Compile Include="Test\System.Net\ServicePointManagerTest.cs" />\r
-    <Compile Include="Test\System.Net\ServicePointTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketResponder.cs" />\r
-    <Compile Include="Test\System.Net\WebClientTest.cs" />\r
-    <Compile Include="Test\System.Net\WebClientTestAsync.cs" />\r
-    <Compile Include="Test\System.Net\WebHeaderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\WebPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\WebPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\WebProxyTest.cs" />\r
-    <Compile Include="Test\System.Net\WebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\WebUtilityTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\FrameworkNameTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\SemaphoreSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_01_SignatureVerification.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_02_ValidityPeriod.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_03_VerifyingNameChaining.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_04_BasicCertificateRevocationTests.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_05_VerifyingPathWithSelfIssuedCertificates.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_06_VerifyingBasicConstraints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_07_KeyUsage.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_08_CertificatePolicies.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_09_RequireExplicitPolicy.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_10_PolicyMappings.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_11_InhibitPolicyMapping.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_12_InhibitAnyPolicy.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_13_NameConstraints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_14_DistributionPoints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_15_DeltaCRL.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_16_PrivateCertificateExtensions.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PkitsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PublicKeyCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PublicKeyTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X500DistinguishedNameCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X500DistinguishedNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Cert20Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2CollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCollectionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainPolicyCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainPolicyTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509KeyUsageExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509KeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509StoreCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509StoreTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AsnEncodedDataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseEntryCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseEntryTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\CaptureCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\CaptureCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\PerlTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\PerlTrials.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexBugs.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCompilationInfoCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCompilationInfoTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexMatchTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexReplace.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexReplaceTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexResultTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexRunnerCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexRunnerFactoryCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexTrial.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\SplitTests.cs" />\r
-    <Compile Include="Test\System.Threading\BarrierTest.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreCas.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreFullExceptionCas.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreTest.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadExceptionEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Timers\ElapsedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimerCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimersDescriptionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimersDescriptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Timers\TimerTest.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionCas.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionTest.cs" />\r
-    <Compile Include="Test\System\FileStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\FileStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\FtpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\FtpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\GenericUriParserCas.cs" />\r
-    <Compile Include="Test\System\GenericUriParserTest.cs" />\r
-    <Compile Include="Test\System\GopherStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\GopherStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\HttpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\HttpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\LdapStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\LdapStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NetPipeStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NetPipeStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NetTcpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NetTcpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NewsStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NewsStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\UriBuilderCas.cs" />\r
-    <Compile Include="Test\System\UriBuilderTest.cs" />\r
-    <Compile Include="Test\System\UriFormatExceptionCas.cs" />\r
-    <Compile Include="Test\System\UriParserCas.cs" />\r
-    <Compile Include="Test\System\UriParserTest.cs" />\r
-    <Compile Include="Test\System\UriTest.cs" />\r
-    <Compile Include="Test\System\UriTest2.cs" />\r
-    <Compile Include="Test\System\UriTest3.cs" />\r
-    <Compile Include="Test\System\UriTypeConverterCas.cs" />\r
-    <Compile Include="Test\System\UriTypeConverterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">\r
-      <Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_0.csproj">\r
-      <Project>{73940AF7-7302-4B79-8EAF-DF03BDD9E3F4}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">\r
-      <Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>\r
-      <Name>System.Data\System.Data-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0.csproj">\r
-      <Project>{86DD6F16-A480-4248-AE96-301B2F973CD7}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/System/test-uri-props.txt">\r
-      <LogicalName>test-uri-props.txt</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/System/test-uri-props-manual.txt">\r
-      <LogicalName>test-uri-props-manual.txt</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/System/test-uri-relative-props.txt">\r
-      <LogicalName>test-uri-relative-props.txt</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index a7b320f96ba7027409bdf84dbb4dd266c9e3dcf8..a394dc4fa78f55ec9c309f9004db034585b58d8b 100644 (file)
@@ -1133,7 +1133,7 @@ namespace System.Diagnostics {
                // Note that ProcInfo.Password must be freed.
                private static void FillUserInfo (ProcessStartInfo startInfo, ref ProcInfo proc_info)
                {
-                       if (startInfo.UserName != null) {
+                       if (startInfo.UserName.Length != 0) {
                                proc_info.UserName = startInfo.UserName;
                                proc_info.Domain = startInfo.Domain;
                                if (startInfo.Password != null)
@@ -1147,7 +1147,7 @@ namespace System.Diagnostics {
                private static bool Start_common (ProcessStartInfo startInfo,
                                                  Process process)
                {
-                       if (startInfo.FileName == null || startInfo.FileName.Length == 0)
+                       if (startInfo.FileName.Length == 0)
                                throw new InvalidOperationException("File name has not been set");
                        
                        if (startInfo.StandardErrorEncoding != null && !startInfo.RedirectStandardError)
@@ -1156,7 +1156,7 @@ namespace System.Diagnostics {
                                throw new InvalidOperationException ("StandardOutputEncoding is only supported when standard output is redirected");
                        
                        if (startInfo.UseShellExecute) {
-                               if (!String.IsNullOrEmpty (startInfo.UserName))
+                               if (startInfo.UserName.Length != 0)
                                        throw new InvalidOperationException ("UseShellExecute must be false if an explicit UserName is specified when starting a process");
                                return (Start_shell (startInfo, process));
                        } else {
index 1586f6137538b70ab54c159d6cdc5e454c9ae0c6..24aff2ca684a1c704650e01a1f37068d6d87f098 100644 (file)
@@ -47,11 +47,11 @@ namespace System.Diagnostics
        public sealed class ProcessStartInfo 
        {
                /* keep these fields in this order and in sync with metadata/process.h */
-               private string arguments = "";
+               private string arguments;
                private IntPtr error_dialog_parent_handle = (IntPtr)0;
-               private string filename = "";
-               private string verb = "";
-               private string working_directory = "";
+               private string filename;
+               private string verb;
+               private string working_directory;
                private ProcessStringDictionary envVars;
                private bool create_no_window = false;
                private bool error_dialog = false;
@@ -87,7 +87,7 @@ namespace System.Diagnostics
                [NotifyParentPropertyAttribute (true)]
                public string Arguments {
                        get {
-                               return(arguments);
+                               return arguments ?? string.Empty;
                        }
                        set {
                                arguments = value;
@@ -155,7 +155,7 @@ namespace System.Diagnostics
                [NotifyParentPropertyAttribute (true)]
                public string FileName {
                        get {
-                               return(filename);
+                               return filename ?? string.Empty;
                        }
                        set {
                                filename = value;
@@ -187,7 +187,7 @@ namespace System.Diagnostics
                }
                
                [DefaultValue (false)]
-               [MonitoringDescription ("Standart output of this process is redirected.")]
+               [MonitoringDescription ("Standard output of this process is redirected.")]
                [NotifyParentPropertyAttribute (true)]
                public bool RedirectStandardOutput {
                        get {
@@ -226,7 +226,7 @@ namespace System.Diagnostics
                [NotifyParentPropertyAttribute (true)]
                public string Verb {
                        get {
-                               return(verb);
+                               return verb ?? string.Empty;
                        }
                        set {
                                verb = value;
@@ -238,21 +238,20 @@ namespace System.Diagnostics
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden), Browsable (false)]
                public string[] Verbs {
                        get {
-                               string ext = filename == null | filename.Length == 0 ? 
-                                       null : Path.GetExtension (filename);
-                               if (ext == null)
-                                       return empty;
-
 #if MOBILE
                                return empty;
 #else
-
                                switch (Environment.OSVersion.Platform) {
                                case (PlatformID)4:
                                case (PlatformID)6:
                                case (PlatformID)128:
                                        return empty; // no verb on non-Windows
                                default:
+                                       string ext = filename == null | filename.Length == 0 ?
+                                               null : Path.GetExtension (filename);
+                                       if (ext == null)
+                                               return empty;
+
                                        RegistryKey rk = null, rk2 = null, rk3 = null;
                                        try {
                                                rk = Registry.ClassesRoot.OpenSubKey (ext);
@@ -292,10 +291,10 @@ namespace System.Diagnostics
                [NotifyParentPropertyAttribute (true)]
                public string WorkingDirectory {
                        get {
-                               return(working_directory);
+                               return working_directory ?? string.Empty;
                        }
                        set {
-                               working_directory = value == null ? String.Empty : value;
+                               working_directory = value;
                        }
                }
 
@@ -307,13 +306,13 @@ namespace System.Diagnostics
 
                [NotifyParentPropertyAttribute (true)]
                public string UserName {
-                       get { return username; }
+                       get { return username ?? string.Empty; }
                        set { username = value; }
                }
 
                [NotifyParentPropertyAttribute (true)]
                public string Domain {
-                       get { return domain; }
+                       get { return domain ?? string.Empty; }
                        set { domain = value; }
                }
 
index 38415f05c5f7ca3043da0b464e3e8ac754960e29..2bd9dee75076db95d36e2cd019023db1f94ea6bb 100644 (file)
@@ -315,10 +315,10 @@ namespace System.Net
                {
                        WebRequest request = null;
                        
-                       using (FileStream f = new FileStream (fileName, FileMode.Create)) {
-                               try {
-                                       request = SetupRequest (address);
-                                       WebResponse response = GetWebResponse (request);
+                       try {
+                               request = SetupRequest (address);
+                               WebResponse response = GetWebResponse (request);
+                               using (FileStream f = new FileStream (fileName, FileMode.Create)) {
                                        Stream st = response.GetResponseStream ();
                                        
                                        int cLength = (int) response.ContentLength;
@@ -337,11 +337,11 @@ namespace System.Net
 
                                        if (cLength > 0 && notify_total < cLength)
                                                throw new WebException ("Download aborted prematurely.", WebExceptionStatus.ReceiveFailure);
-                               } catch (ThreadInterruptedException){
-                                       if (request != null)
-                                               request.Abort ();
-                                       throw;
                                }
+                       } catch (ThreadInterruptedException){
+                               if (request != null)
+                                       request.Abort ();
+                               throw;
                        }
                }
 
@@ -1713,8 +1713,8 @@ namespace System.Net
                async Task DownloadFileTaskAsyncCore (WebRequest request, WebResponse response,
                                                      string fileName, CancellationToken token)
                {
+                       Stream st = response.GetResponseStream ();
                        using (FileStream f = new FileStream (fileName, FileMode.Create)) {
-                               Stream st = response.GetResponseStream ();
                                        
                                int cLength = (int)response.ContentLength;
                                int length = (cLength <= -1 || cLength > 32 * 1024) ? 32 * 1024 : cLength;
diff --git a/mcs/class/System/System.Text.RegularExpressions/BaseMachine.cs b/mcs/class/System/System.Text.RegularExpressions/BaseMachine.cs
deleted file mode 100644 (file)
index 6f58877..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-//\r
-// BaseMachine.cs\r
-//\r
-// Author:\r
-// author:     Dan Lewis (dlewis@gmx.co.uk)\r
-//             (c) 2002\r
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)\r
-//\r
-\r
-//\r
-// Permission is hereby granted, free of charge, to any person obtaining\r
-// a copy of this software and associated documentation files (the\r
-// "Software"), to deal in the Software without restriction, including\r
-// without limitation the rights to use, copy, modify, merge, publish,\r
-// distribute, sublicense, and/or sell copies of the Software, and to\r
-// permit persons to whom the Software is furnished to do so, subject to\r
-// the following conditions:\r
-//\r
-// The above copyright notice and this permission notice shall be\r
-// included in all copies or substantial portions of the Software.\r
-//\r
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-//\r
-\r
-using System;\r
-using System.Collections;\r
-using System.Collections.Specialized;\r
-using System.Collections.Generic;\r
-\r
-namespace System.Text.RegularExpressions\r
-{\r
-       abstract class BaseMachine : IMachine\r
-       {\r
-               internal delegate void MatchAppendEvaluator (Match match, StringBuilder sb);\r
-\r
-               public virtual string Replace (Regex regex, string input, string replacement, int count, int startat)\r
-               {\r
-                       ReplacementEvaluator ev = new ReplacementEvaluator (regex, replacement);\r
-                       if (regex.RightToLeft)\r
-                               return RTLReplace (regex, input, new MatchEvaluator (ev.Evaluate), count, startat);\r
-                       else\r
-                               return LTRReplace (regex, input, new MatchAppendEvaluator (ev.EvaluateAppend), count, startat, ev.NeedsGroupsOrCaptures);\r
-               }\r
-\r
-               virtual public string [] Split (Regex regex, string input, int count, int startat)\r
-               {\r
-                       var splits = new List<string> ();\r
-                       if (count == 0)\r
-                               count = Int32.MaxValue;\r
-\r
-                       int ptr = startat;\r
-                       Match m = null;\r
-                       while (--count > 0) {\r
-                               if (m != null)\r
-                                       m = m.NextMatch ();\r
-                               else\r
-                                       m = regex.Match (input, ptr);\r
-\r
-                               if (!m.Success)\r
-                                       break;\r
-\r
-                               if (regex.RightToLeft)\r
-                                       splits.Add (input.Substring (m.Index + m.Length, ptr - m.Index - m.Length));\r
-                               else\r
-                                       splits.Add (input.Substring (ptr, m.Index - ptr));\r
-\r
-                               int gcount = m.Groups.Count;\r
-                               for (int gindex = 1; gindex < gcount; gindex++) {\r
-                                       Group grp = m.Groups [gindex];\r
-                                       if (grp.Length > 0)\r
-                                               splits.Add (input.Substring (grp.Index, grp.Length));\r
-                               }\r
-\r
-                               if (regex.RightToLeft)\r
-                                       ptr = m.Index;\r
-                               else\r
-                                       ptr = m.Index + m.Length;\r
-\r
-                       }\r
-\r
-                       if (regex.RightToLeft && ptr >= 0)\r
-                               splits.Add (input.Substring (0, ptr));\r
-                       if (!regex.RightToLeft && ptr <= input.Length)\r
-                               splits.Add (input.Substring (ptr));\r
-\r
-                       return splits.ToArray ();\r
-               }\r
-\r
-               public Match Scan (Regex regex, string text, int start, int end)\r
-               {\r
-                       return Scan (regex, text, start, end, false);\r
-               }\r
-\r
-               public abstract Match Scan (Regex regex, string text, int start, int end, bool substring_mode);\r
-\r
-               virtual public string Result (string replacement, Match match)\r
-               {\r
-                       return ReplacementEvaluator.Evaluate (replacement, match);\r
-               }\r
-\r
-               internal string LTRReplace (Regex regex, string input, MatchAppendEvaluator evaluator, int count, int startat) {\r
-                       return LTRReplace (regex, input, evaluator, count, startat, true);\r
-               }\r
-\r
-               internal string LTRReplace (Regex regex, string input, MatchAppendEvaluator evaluator, int count, int startat, bool needs_groups_or_captures)\r
-               {\r
-                       this.needs_groups_or_captures = needs_groups_or_captures;\r
-                       \r
-                       Match m = Scan (regex, input, startat, input.Length);\r
-                       if (!m.Success)\r
-                               return input;\r
-\r
-                       StringBuilder result = new StringBuilder (input.Length);\r
-                       int ptr = startat;\r
-                       int counter = count;\r
-\r
-                       result.Append (input, 0, ptr);\r
-\r
-                       do {\r
-                               if (count != -1)\r
-                                       if (counter-- <= 0)\r
-                                               break;\r
-                               if (m.Index < ptr)\r
-                                       throw new SystemException ("how");\r
-                               result.Append (input, ptr, m.Index - ptr);\r
-                               evaluator (m, result);\r
-\r
-                               ptr = m.Index + m.Length;\r
-                               m = m.NextMatch ();\r
-                       } while (m.Success);\r
-\r
-                       result.Append (input, ptr, input.Length - ptr);\r
-\r
-                       return result.ToString ();\r
-               }\r
-\r
-               internal string RTLReplace (Regex regex, string input, MatchEvaluator evaluator, int count, int startat)\r
-               {\r
-                       Match m = Scan (regex, input, startat, input.Length);\r
-                       if (!m.Success)\r
-                               return input;\r
-\r
-                       int ptr = startat;\r
-                       int counter = count;\r
-#if NET_2_1\r
-                       var pieces = new System.Collections.Generic.List<string> ();\r
-#else\r
-                       StringCollection pieces = new StringCollection ();\r
-#endif\r
-                       \r
-                       pieces.Add (input.Substring (ptr));\r
-\r
-                       do {\r
-                               if (count != -1)\r
-                                       if (counter-- <= 0)\r
-                                               break;\r
-                               if (m.Index + m.Length > ptr)\r
-                                       throw new SystemException ("how");\r
-                               pieces.Add (input.Substring (m.Index + m.Length, ptr - m.Index - m.Length));\r
-                               pieces.Add (evaluator (m));\r
-\r
-                               ptr = m.Index;\r
-                               m = m.NextMatch ();\r
-                       } while (m.Success);\r
-\r
-                       StringBuilder result = new StringBuilder ();\r
-\r
-                       result.Append (input, 0, ptr);\r
-                       for (int i = pieces.Count; i > 0; )\r
-                               result.Append (pieces [--i]);\r
-\r
-                       pieces.Clear ();\r
-\r
-                       return result.ToString ();\r
-               }\r
-\r
-               // Specify whenever Match objects created by this machine need to be fully\r
-               // built. If false, these can be omitted, avoiding some memory allocations and\r
-               // processing time.\r
-               protected bool needs_groups_or_captures = true; \r
-       }\r
-}\r
diff --git a/mcs/class/System/System.Text.RegularExpressions/CILCompiler.cs b/mcs/class/System/System.Text.RegularExpressions/CILCompiler.cs
deleted file mode 100644 (file)
index bebd38b..0000000
+++ /dev/null
@@ -1,1863 +0,0 @@
-using System;
-using System.Collections;
-using System.Globalization;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Threading;
-
-using System.Collections.Generic;
-
-namespace System.Text.RegularExpressions {
-
-       //
-       // Compiler which generates IL bytecode to perform the matching instead of
-       // interpreting a program.
-       // For simplicity, we inherit from RxCompiler, and generate the IL code based
-       // on the program generated by it. This also allows us to fallback to interpretation
-       // if we can't handle something.
-       // This is net 2.0, since 1.0 doesn't support DynamicMethods
-       // FIXME: Add support for 1.0, and CompileToAssembly
-       // FIXME: Overwrite RxCompiler methods so we don't have to decode char
-       // matching opcodes
-       //
-
-       class CILCompiler : RxCompiler, ICompiler {
-               DynamicMethod[] eval_methods;
-               bool[] eval_methods_defined;
-
-               /*
-                * To avoid the overhead of decoding the countless opcode variants created
-                * by RxCompiler, we save the original, 'generic' version and its flags
-                * in these two tables.
-                */
-               private Dictionary<int, int> generic_ops;
-               private Dictionary<int, int> op_flags;
-               private Dictionary<int, Label> labels;
-
-               static FieldInfo fi_str = typeof (RxInterpreter).GetField ("str", BindingFlags.Instance|BindingFlags.NonPublic);
-               static FieldInfo fi_string_start = typeof (RxInterpreter).GetField ("string_start", BindingFlags.Instance|BindingFlags.NonPublic);
-               static FieldInfo fi_string_end = typeof (RxInterpreter).GetField ("string_end", BindingFlags.Instance|BindingFlags.NonPublic);
-               static FieldInfo fi_program = typeof (RxInterpreter).GetField ("program", BindingFlags.Instance|BindingFlags.NonPublic);
-               static FieldInfo fi_marks = typeof (RxInterpreter).GetField ("marks", BindingFlags.Instance|BindingFlags.NonPublic);
-               static FieldInfo fi_groups = typeof (RxInterpreter).GetField ("groups", BindingFlags.Instance|BindingFlags.NonPublic);
-               static FieldInfo fi_deep = typeof (RxInterpreter).GetField ("deep", BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
-               static FieldInfo fi_stack = typeof (RxInterpreter).GetField ("stack", BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
-               static FieldInfo fi_mark_start = typeof (Mark).GetField ("Start", BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
-               static FieldInfo fi_mark_end = typeof (Mark).GetField ("End", BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
-               //static FieldInfo fi_mark_index = typeof (Mark).GetField ("Index", BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
-
-               static MethodInfo mi_stack_get_count, mi_stack_set_count, mi_stack_push, mi_stack_pop;
-               static MethodInfo mi_set_start_of_match, mi_is_word_char, mi_reset_groups;
-               static MethodInfo mi_checkpoint, mi_backtrack, mi_open, mi_close;
-               static MethodInfo mi_get_last_defined, mi_mark_get_index, mi_mark_get_length;
-
-               public static readonly bool trace_compile = Environment.GetEnvironmentVariable ("MONO_TRACE_RX_COMPILE") != null;
-
-               public CILCompiler () {
-                       generic_ops = new Dictionary <int, int> ();
-                       op_flags = new Dictionary <int, int> ();
-               }
-
-               IMachineFactory ICompiler.GetMachineFactory () {
-                       byte[] code = new byte [curpos];
-                       Buffer.BlockCopy (program, 0, code, 0, curpos);
-
-                       eval_methods = new DynamicMethod [code.Length];
-                       eval_methods_defined = new bool [code.Length];
-
-                       // The main eval method
-                   DynamicMethod main = GetEvalMethod (code, 11);
-
-                       if (main != null)
-                               return new RxInterpreterFactory (code, (EvalDelegate)main.CreateDelegate (typeof (EvalDelegate)));
-                       else
-                               return new RxInterpreterFactory (code, null);
-               }
-
-               DynamicMethod GetEvalMethod (byte[] program, int pc) {
-                       if (eval_methods_defined [pc])
-                               return eval_methods [pc];
-
-                       // FIXME: Recursion ?
-                       eval_methods_defined [pc] = true;
-
-                       eval_methods [pc] = CreateEvalMethod (program, pc);
-                       return eval_methods [pc];
-               }
-
-               private MethodInfo GetMethod (Type t, string name, ref MethodInfo cached) {
-                       if (cached == null) {
-                               cached = t.GetMethod (name, BindingFlags.Static|BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
-                               if (cached == null)
-                                       throw new Exception ("Method not found: " + name);
-                       }
-                       return cached;
-               }
-
-               private MethodInfo GetMethod (string name, ref MethodInfo cached) {
-                       return GetMethod (typeof (RxInterpreter), name, ref cached);
-           }
-
-               private int ReadInt (byte[] code, int pc) {
-                       int val = code [pc];
-                       val |= code [pc + 1] << 8;
-                       val |= code [pc + 2] << 16;
-                       val |= code [pc + 3] << 24;
-                       return val;
-               }
-
-               static OpFlags MakeFlags (bool negate, bool ignore, bool reverse, bool lazy) {
-                       OpFlags flags = 0;
-                       if (negate) flags |= OpFlags.Negate;
-                       if (ignore) flags |= OpFlags.IgnoreCase;
-                       if (reverse) flags |= OpFlags.RightToLeft;
-                       if (lazy) flags |= OpFlags.Lazy;
-
-                       return flags;
-               }
-
-               void EmitGenericOp (RxOp op, bool negate, bool ignore, bool reverse, bool lazy) {
-                       generic_ops [curpos] = (int)op;
-                       op_flags [curpos] = (int)MakeFlags (negate, ignore, reverse, false);
-           }
-
-               public override void EmitOp (RxOp op, bool negate, bool ignore, bool reverse) {
-                       EmitGenericOp (op, negate, ignore, reverse, false);
-                       base.EmitOp (op, negate, ignore, reverse);
-               }
-
-               public override void EmitOpIgnoreReverse (RxOp op, bool ignore, bool reverse) {
-                       EmitGenericOp (op, false, ignore, reverse, false);
-                       base.EmitOpIgnoreReverse (op, ignore, reverse);
-               }
-
-               public override void EmitOpNegateReverse (RxOp op, bool negate, bool reverse) {
-                       EmitGenericOp (op, negate, false, reverse, false);
-                       base.EmitOpNegateReverse (op, negate, reverse);
-               }
-
-               class Frame {
-                       public Label label_pass, label_fail;
-
-                       public Frame (ILGenerator ilgen) {
-                               label_fail = ilgen.DefineLabel ();
-                               label_pass = ilgen.DefineLabel ();
-                       }                               
-               }
-
-               LocalBuilder local_textinfo;
-
-               /*
-                * Create a dynamic method which is equivalent to the RxInterpreter.EvalByteCode 
-                * method specialized to the given program and a given pc. Return the newly
-                * created method or null if a not-supported opcode was encountered.
-                */
-               DynamicMethod CreateEvalMethod (byte[] program, int pc) {
-                       DynamicMethod m = new DynamicMethod ("Eval_" + pc, typeof (bool), new Type [] { typeof (RxInterpreter), typeof (int), typeof (int).MakeByRefType () }, typeof (RxInterpreter), true);
-                       ILGenerator ilgen = m.GetILGenerator ();
-
-                       /* 
-                          Args:
-                          interp - 0
-                          strpos - 1
-                          strpos_result - 2
-                       */
-
-                       /*
-                        * Recursive calls to EvalByteCode are inlined manually by calling 
-                        * EmitEvalMethodBody with the pc of the recursive call. Frame objects hold
-                        * the information required to link together the code generated by the recursive
-                        * call with the rest of the code.
-                        */
-                       Frame frame = new Frame (ilgen);
-
-                       /* Cache the textinfo used by Char.ToLower () */
-                       local_textinfo = ilgen.DeclareLocal (typeof (TextInfo));
-                       ilgen.Emit (OpCodes.Call, typeof (Thread).GetMethod ("get_CurrentThread"));
-                       ilgen.Emit (OpCodes.Call, typeof (Thread).GetMethod ("get_CurrentCulture"));
-                       ilgen.Emit (OpCodes.Call, typeof (CultureInfo).GetMethod ("get_TextInfo"));
-                       ilgen.Emit (OpCodes.Stloc, local_textinfo);
-
-                       m = EmitEvalMethodBody (m, ilgen, frame, program, pc, program.Length, false, false, out pc);
-                       if (m == null)
-                               return null;
-                               
-                       ilgen.MarkLabel (frame.label_pass);
-                       ilgen.Emit (OpCodes.Ldarg_2);
-                       ilgen.Emit (OpCodes.Ldarg_1);
-                       ilgen.Emit (OpCodes.Stind_I4);
-                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                       ilgen.Emit (OpCodes.Ret);
-
-                       ilgen.MarkLabel (frame.label_fail);
-                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                       ilgen.Emit (OpCodes.Ret);
-
-                       return m;
-               }
-
-               private int ReadShort (byte[] program, int pc) {
-                       return (int)program [pc] | ((int)program [pc + 1] << 8);
-               }
-
-               private Label CreateLabelForPC (ILGenerator ilgen, int pc) {
-                       if (labels == null)
-                               labels = new Dictionary <int, Label> ();
-                       Label l;
-                       if (!labels.TryGetValue (pc, out l)) {
-                               l = ilgen.DefineLabel ();
-                               labels [pc] = l;
-                       }
-
-                       return l;
-               }
-
-               private int GetILOffset (ILGenerator ilgen) {
-                       return (int)typeof (ILGenerator).GetField ("code_len", BindingFlags.Instance|BindingFlags.NonPublic).GetValue (ilgen);
-               }
-
-               /*
-                * Emit IL code for a sequence of opcodes between pc and end_pc. If there is a
-                * match, set strpos (Arg 1) to the position after the match, then 
-                * branch to frame.label_pass. Otherwise branch to frame.label_fail, 
-                * and leave strpos at an undefined position. The caller should 
-                * generate code to save the original value of strpos if it needs it.
-                * If one_op is true, only generate code for one opcode and set out_pc 
-                * to the next pc after the opcode.
-                * If no_bump is true, don't bump strpos in char matching opcodes.
-                * Keep this in synch with RxInterpreter.EvalByteCode (). It it is sync with
-                * the version in r111969.
-                * FIXME: Modify the regex tests so they are run with RegexOptions.Compiled as
-                * well.
-                */
-               private DynamicMethod EmitEvalMethodBody (DynamicMethod m, ILGenerator ilgen,
-                                                                                                 Frame frame, byte[] program,
-                                                                                                 int pc, int end_pc,
-                                                                                                 bool one_op, bool no_bump,
-                                                                                                 out int out_pc)
-               {
-                       int start, length, end;
-
-                       out_pc = 0;
-
-                       int group_count = 1 + ReadShort (program, 1);
-
-                       while (pc < end_pc) {
-                               RxOp op = (RxOp)program [pc];
-
-                               // FIXME: Optimize this
-                               if (generic_ops.ContainsKey (pc))
-                                       op = (RxOp)generic_ops [pc];
-
-                               if (trace_compile) {
-                                       Console.WriteLine ("compiling {0} pc={1} end_pc={2}, il_offset=0x{3:x}", op, pc, end_pc, GetILOffset (ilgen));
-                               }
-
-                               if (labels != null) {
-                                       Label l;
-                                       if (labels.TryGetValue (pc, out l)) {
-                                               ilgen.MarkLabel (l);
-                                               labels.Remove (pc);
-                                       }
-                               }
-
-                               if (RxInterpreter.trace_rx) {
-                                       //Console.WriteLine ("evaluating: {0} at pc: {1}, strpos: {2}", op, pc, strpos);
-                                       ilgen.Emit (OpCodes.Ldstr, "evaluating: {0} at pc: {1}, strpos: {2}");
-                                       ilgen.Emit (OpCodes.Ldc_I4, (int)op);
-                                       ilgen.Emit (OpCodes.Box, typeof (RxOp));
-                                       ilgen.Emit (OpCodes.Ldc_I4, pc);
-                                       ilgen.Emit (OpCodes.Box, typeof (int));
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Box, typeof (int));
-                                       ilgen.Emit (OpCodes.Call, typeof (Console).GetMethod ("WriteLine", new Type [] { typeof (string), typeof (object), typeof (object), typeof (object) }));
-                               }
-
-                               switch (op) {
-                               case RxOp.Anchor:
-                               case RxOp.AnchorReverse: {
-                                       bool reverse = (RxOp)program [pc] == RxOp.AnchorReverse;
-                                       length = ReadShort (program, pc + 3);
-                                       pc += ReadShort (program, pc + 1);
-
-                                       // Optimize some common cases by inlining the code generated for the
-                                       // anchor body 
-                                       RxOp anch_op = (RxOp)program [pc];
-
-                                       // FIXME: Do this even if the archor op is not the last in the regex
-                                       if (!reverse && group_count == 1 && anch_op == RxOp.Char && (RxOp)program [pc + 2] == RxOp.True) {
-
-                                               /*
-                                                * while (strpos < string_end) {
-                                                *   if (str [strpos] == program [pc + 1]) {
-                                                *     match_start = strpos;
-                                                *     strpos_result = strpos + 1;
-                                                *     marks [groups [0]].Start = strpos;
-                                                *     if (groups.Length > 1)
-                                                *              marks [groups [0]].End = res;
-                                                *     return true;
-                                                *   }
-                                                *   strpos ++;
-                                                * }
-                                                * return false;
-                                                */
-                                               // Add some locals to avoid an indirection
-                                               LocalBuilder local_string_end = ilgen.DeclareLocal (typeof (int));
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                               ilgen.Emit (OpCodes.Stloc, local_string_end);
-                                               LocalBuilder local_str = ilgen.DeclareLocal (typeof (string));
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                               ilgen.Emit (OpCodes.Stloc, local_str);
-
-                                               //while (strpos < string_end) {
-                                               // -> Done at the end of the loop like mcs does
-                                               Label l1 = ilgen.DefineLabel ();
-                                               Label l2 = ilgen.DefineLabel ();
-                                               ilgen.Emit (OpCodes.Br, l2);
-                                               ilgen.MarkLabel (l1);
-
-                                               //  if (str [strpos] == program [pc + 1]) {
-                                               Label l3 = ilgen.DefineLabel ();
-                                               ilgen.Emit (OpCodes.Ldloc, local_str);
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                               ilgen.Emit (OpCodes.Conv_I4);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 1]);
-                                               ilgen.Emit (OpCodes.Beq, l3);
-
-                                               // The true case is done after the loop
-
-                                               //  }
-                                               //  strpos++;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                               //}
-                                               ilgen.MarkLabel (l2);
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldloc, local_string_end);
-                                               ilgen.Emit (OpCodes.Blt, l1);
-
-                                               //return false;
-                                               ilgen.Emit (OpCodes.Br, frame.label_fail);
-
-                                               // True case
-                                               ilgen.MarkLabel (l3);
-                                               // call SetStartOfMatch (strpos)
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter), "SetStartOfMatch", ref mi_set_start_of_match));
-                                               //  strpos++;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                               //    return true;
-                                               ilgen.Emit (OpCodes.Br, frame.label_pass);
-
-                                       } else {
-                                               // General case
-
-                                               //Console.WriteLine ("Anchor op " + anch_op);
-
-                                               // Add some locals to avoid an indirection
-                                               LocalBuilder local_string_end = ilgen.DeclareLocal (typeof (int));
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Stloc, local_string_end);
-
-                                               //while (strpos < string_end + 1) {
-                                               // -> Done at the end of the loop like mcs does
-                                               Label l1 = ilgen.DefineLabel ();
-                                               Label l2 = ilgen.DefineLabel ();
-                                               ilgen.Emit (OpCodes.Br, l2);
-                                               ilgen.MarkLabel (l1);
-
-                                               //if (groups.Length > 1) {
-                                               //      ResetGroups ();
-                                               //      marks [groups [0]].Start = strpos;
-                                               //}
-                                               if (group_count > 1) {
-                                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                                       ilgen.Emit (OpCodes.Call, GetMethod ("ResetGroups", ref mi_reset_groups));
-
-                                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                                       ilgen.Emit (OpCodes.Ldfld, fi_marks);
-                                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                                       ilgen.Emit (OpCodes.Ldfld, fi_groups);
-                                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                                       ilgen.Emit (OpCodes.Ldelem_I4);
-                                                       ilgen.Emit (OpCodes.Ldelema, typeof (Mark));
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Stfld, fi_mark_start);
-                                               }
-
-                                               //  if (EvalByteCode (pc, strpos, ref res)) {
-
-                                               Frame new_frame = new Frame (ilgen);
-
-                                               //  old_stros = strpos;
-                                               LocalBuilder local_old_strpos = ilgen.DeclareLocal (typeof (int));
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Stloc, local_old_strpos);
-
-                                               m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc, end_pc, false, false, out out_pc);
-                                               if (m == null)
-                                                       return null;
-
-                                               // Pass
-                                               ilgen.MarkLabel (new_frame.label_pass);
-                                               //    marks [groups [0]].Start = old_strpos;
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_marks);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_groups);
-                                               ilgen.Emit (OpCodes.Ldc_I4_0);
-                                               ilgen.Emit (OpCodes.Ldelem_I4);
-                                               ilgen.Emit (OpCodes.Ldelema, typeof (Mark));
-                                               ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                               ilgen.Emit (OpCodes.Stfld, fi_mark_start);
-                                               //    if (groups.Length > 1)
-                                               //              marks [groups [0]].End = res;
-                                               if (group_count > 1) {
-                                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                                       ilgen.Emit (OpCodes.Ldfld, fi_marks);
-                                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                                       ilgen.Emit (OpCodes.Ldfld, fi_groups);
-                                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                                       ilgen.Emit (OpCodes.Ldelem_I4);
-                                                       ilgen.Emit (OpCodes.Ldelema, typeof (Mark));
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Stfld, fi_mark_end);
-                                               }
-
-                                               //    return true;
-                                               ilgen.Emit (OpCodes.Br, frame.label_pass);
-
-                                               // Fail
-                                               ilgen.MarkLabel (new_frame.label_fail);
-                                               //  strpos = old_strpos +/- 1;
-                                               ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               if (reverse)
-                                                       ilgen.Emit (OpCodes.Sub);
-                                               else
-                                                       ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                               //}
-                                               ilgen.MarkLabel (l2);
-                                               if (reverse) {
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                                       ilgen.Emit (OpCodes.Bge, l1);
-                                               } else {
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Ldloc, local_string_end);
-                                                       ilgen.Emit (OpCodes.Blt, l1);
-                                               }
-                                               //return false;
-                                               ilgen.Emit (OpCodes.Br, frame.label_fail);
-                                       }
-
-                                       goto End;
-                               }
-                               case RxOp.Branch: {
-                                       //if (EvalByteCode (pc + 3, strpos, ref res)) {
-
-                                       int target_pc = pc + ReadShort (program, pc + 1);
-
-                                       // Emit the rest of the code inline instead of making a recursive call
-                                       Frame new_frame = new Frame (ilgen);
-
-                                       //  old_strpos = strpos;
-                                       LocalBuilder local_old_strpos = ilgen.DeclareLocal (typeof (int));
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Stloc, local_old_strpos);
-
-                                       m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc + 3, target_pc, false, false, out out_pc);
-                                       if (m == null)
-                                               return null;
-
-                                       // Pass
-                                       ilgen.MarkLabel (new_frame.label_pass);
-                                       //  return true;
-                                       ilgen.Emit (OpCodes.Br, frame.label_pass);
-
-                                       // Fail
-                                       ilgen.MarkLabel (new_frame.label_fail);
-                                       //  strpos = old_strpos;
-                                       ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                       ilgen.Emit (OpCodes.Starg, 1);
-
-                                       pc = target_pc;
-                                       break;
-                               }
-                               case RxOp.Char:
-                               case RxOp.UnicodeChar:
-                               case RxOp.Range:
-                               case RxOp.UnicodeRange: {
-                                       OpFlags flags = (OpFlags)op_flags [pc];
-                                       bool negate = (flags & OpFlags.Negate) > 0;
-                                       bool ignore = (flags & OpFlags.IgnoreCase) > 0;
-                                       bool reverse = (flags & OpFlags.RightToLeft) > 0;
-
-                                       //if (strpos < string_end) {
-                                       Label l1 = ilgen.DefineLabel ();
-                                       if (reverse) {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_0);
-                                               ilgen.Emit (OpCodes.Ble, l1);
-                                       } else {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                               ilgen.Emit (OpCodes.Bge, l1);
-                                       }
-
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Ldloc, local_textinfo);
-
-                                       //  int c = str [strpos];
-                                       LocalBuilder local_c = ilgen.DeclareLocal (typeof (char));
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       if (reverse) {
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Sub);
-                                       }
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Callvirt, typeof (TextInfo).GetMethod ("ToLower", new Type [] { typeof (char) }));
-
-                                       if (op == RxOp.Char) {
-                                               ilgen.Emit (OpCodes.Conv_I4);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 1]);
-                                               ilgen.Emit (negate ? OpCodes.Beq : OpCodes.Bne_Un, l1);
-
-                                               pc += 2;
-                                       } else if (op == RxOp.UnicodeChar) {
-                                               ilgen.Emit (OpCodes.Conv_I4);
-                                               ilgen.Emit (OpCodes.Ldc_I4, ReadShort (program, pc + 1));
-                                               ilgen.Emit (negate ? OpCodes.Beq : OpCodes.Bne_Un, l1);
-
-                                               pc += 3;
-                                       } else if (op == RxOp.Range) {
-                                               ilgen.Emit (OpCodes.Stloc, local_c);
-
-                                               //  if (c >= program [pc + 1] && c <= program [pc + 2]) {
-                                               if (negate) {
-                                                       Label l3 = ilgen.DefineLabel ();
-
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 1]);
-                                                       ilgen.Emit (OpCodes.Blt, l3);
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 2]);
-                                                       ilgen.Emit (OpCodes.Bgt, l3);
-                                                       ilgen.Emit (OpCodes.Br, l1);
-                                                       ilgen.MarkLabel (l3);
-                                               } else {
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 1]);
-                                                       ilgen.Emit (OpCodes.Blt, l1);
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 2]);
-                                                       ilgen.Emit (OpCodes.Bgt, l1);
-                                               }
-
-                                               pc += 3;
-                                       } else if (op == RxOp.UnicodeRange) {
-                                               ilgen.Emit (OpCodes.Stloc, local_c);
-
-                                               //  if (c >= program [pc + 1] && c <= program [pc + 2]) {
-                                               if (negate) {
-                                                       Label l3 = ilgen.DefineLabel ();
-
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, ReadShort (program, pc + 1));
-                                                       ilgen.Emit (OpCodes.Blt, l3);
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, ReadShort (program, pc + 3));
-                                                       ilgen.Emit (OpCodes.Bgt, l3);
-                                                       ilgen.Emit (OpCodes.Br, l1);
-                                                       ilgen.MarkLabel (l3);
-                                               } else {
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, ReadShort (program, pc + 1));
-                                                       ilgen.Emit (OpCodes.Blt, l1);
-                                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                                       ilgen.Emit (OpCodes.Ldc_I4, ReadShort (program, pc + 3));
-                                                       ilgen.Emit (OpCodes.Bgt, l1);
-                                               }
-
-                                               pc += 5;
-                                       } else {
-                                               throw new NotSupportedException ();
-                                       }
-
-                                       //ilgen.EmitWriteLine ("HIT:" + (char)program [pc + 1]);
-                                       if (!no_bump) {
-                                               //  strpos++ / strpos--;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               if (reverse)
-                                                       ilgen.Emit (OpCodes.Sub);
-                                               else
-                                                       ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                       }
-                                       Label l2 = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Br, l2);
-                                       //}
-                                       ilgen.MarkLabel (l1);
-                                       //return false;
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-                                       ilgen.MarkLabel (l2);
-
-                                       break;
-                               }
-                               case RxOp.True: {
-                                       //  return true;
-                                       ilgen.Emit (OpCodes.Br, frame.label_pass);
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.False: {
-                                       //  return false;
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.AnyPosition: {
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.StartOfString: {
-                                       //if (strpos != 0)
-                                       //      return false;
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                       ilgen.Emit (OpCodes.Bgt, frame.label_fail);
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.StartOfLine: {
-                                       // FIXME: windows line endings
-                                       //if (!(strpos == 0 || str [strpos - 1] == '\n'))
-                                       //      return false;
-                                       Label l = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                       ilgen.Emit (OpCodes.Beq, l);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       ilgen.Emit (OpCodes.Sub);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Ldc_I4, (int)'\n');
-                                       ilgen.Emit (OpCodes.Beq, l);
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-                                       ilgen.MarkLabel (l);
-
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.StartOfScan: {
-                                       //if (strpos != string_start)
-                                       //      return false;
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_string_start);
-                                       ilgen.Emit (OpCodes.Bne_Un, frame.label_fail);
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.End: {
-                                       //if (!(strpos == string_end || (strpos == string_end - 1 && str [strpos] == '\n')))
-                                       //      return false;
-                                       Label l = ilgen.DefineLabel ();
-
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                       ilgen.Emit (OpCodes.Beq, l);
-
-                                       Label l2 = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       ilgen.Emit (OpCodes.Sub);
-                                       ilgen.Emit (OpCodes.Bne_Un, l2);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Ldc_I4, (int)'\n');
-                                       ilgen.Emit (OpCodes.Bne_Un, l2);
-                                       ilgen.Emit (OpCodes.Br, l);
-                                       ilgen.MarkLabel (l2);
-
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-                                       ilgen.MarkLabel (l);
-
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.EndOfString: {
-                                       //if (strpos != string_end)
-                                       //      return false;
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                       ilgen.Emit (OpCodes.Bne_Un, frame.label_fail);
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.EndOfLine: {
-                                       //if (!(strpos == string_end || str [strpos] == '\n'))
-                                       //      return false;
-                                       Label l_match = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                       ilgen.Emit (OpCodes.Beq, l_match);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Ldc_I4, (int)'\n');
-                                       ilgen.Emit (OpCodes.Beq, l_match);
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-                                       ilgen.MarkLabel (l_match);
-                                       
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.WordBoundary:
-                               case RxOp.NoWordBoundary: {
-                                       bool negate = op == RxOp.NoWordBoundary;
-
-                                       //if (string_end == 0)
-                                       //      return false;
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                       ilgen.Emit (OpCodes.Beq, frame.label_fail);
-
-                                       Label l_match = ilgen.DefineLabel ();
-
-                                       //if (strpos == 0) {
-                                       Label l1 = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                       ilgen.Emit (OpCodes.Bne_Un, l1);
-                                       //if (!IsWordChar (str [strpos])) {
-                                       //  return false;
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Call, GetMethod ("IsWordChar", ref mi_is_word_char));
-                                       ilgen.Emit (negate ? OpCodes.Brtrue : OpCodes.Brfalse, frame.label_fail);
-                                       ilgen.Emit (OpCodes.Br, l_match);
-
-                                       //} else if (strpos == string_end) {
-                                       ilgen.MarkLabel (l1);
-                                       Label l2 = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                       ilgen.Emit (OpCodes.Bne_Un, l2);
-                                       //if (!IsWordChar (str [strpos - 1])) {
-                                       //  return false;
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       ilgen.Emit (OpCodes.Sub);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Call, GetMethod ("IsWordChar", ref mi_is_word_char));
-                                       ilgen.Emit (negate ? OpCodes.Brtrue : OpCodes.Brfalse, frame.label_fail);
-                                       ilgen.Emit (OpCodes.Br, l_match);
-
-                                       //} else {
-                                       ilgen.MarkLabel (l2);
-                                       //if (IsWordChar (str [strpos]) == IsWordChar (str [strpos - 1])) {
-                                       //  return false;
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Call, GetMethod ("IsWordChar", ref mi_is_word_char));
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       ilgen.Emit (OpCodes.Sub);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Call, GetMethod ("IsWordChar", ref mi_is_word_char));
-                                       ilgen.Emit (negate ? OpCodes.Bne_Un : OpCodes.Beq, frame.label_fail);
-                                       ilgen.Emit (OpCodes.Br, l_match);
-
-                                       ilgen.MarkLabel (l_match);
-
-                                       pc++;
-                                       break;
-                               }
-                               case RxOp.Bitmap:
-                               case RxOp.UnicodeBitmap: {
-                                       OpFlags flags = (OpFlags)op_flags [pc];
-                                       bool negate = (flags & OpFlags.Negate) > 0;
-                                       bool ignore = (flags & OpFlags.IgnoreCase) > 0;
-                                       bool reverse = (flags & OpFlags.RightToLeft) > 0;
-                                       bool unicode = (op == RxOp.UnicodeBitmap);
-
-                                       //if (strpos < string_end) {
-                                       Label l1 = ilgen.DefineLabel ();
-                                       Label l2 = ilgen.DefineLabel ();
-                                       Label l_match = ilgen.DefineLabel ();
-                                       if (reverse) {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_0);
-                                               ilgen.Emit (OpCodes.Ble, l1);
-                                       } else {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                               ilgen.Emit (OpCodes.Bge, l1);
-                                       }
-                                       //  int c = str [strpos];
-                                       LocalBuilder local_c = ilgen.DeclareLocal (typeof (int));
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Ldloc, local_textinfo);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       if (reverse) {
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Sub);
-                                       }
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Conv_I4);
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Callvirt, typeof (TextInfo).GetMethod ("ToLower", new Type [] { typeof (char) }));
-                                       //  c -= program [pc + 1];
-                                       if (unicode) {
-                                               ilgen.Emit (OpCodes.Ldc_I4, ReadShort (program, pc + 1));
-                                               ilgen.Emit (OpCodes.Sub);
-                                               ilgen.Emit (OpCodes.Stloc, local_c);
-                                               length = ReadShort (program, pc + 3);
-                                               pc += 5;
-                                       } else {
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 1]);
-                                               ilgen.Emit (OpCodes.Sub);
-                                               ilgen.Emit (OpCodes.Stloc, local_c);
-                                               length =  program [pc + 2];
-                                               pc += 3;
-                                       }
-                                       //  if (c < 0 || c >= (length << 3))
-                                       //    return false;
-                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                       ilgen.Emit (OpCodes.Blt, negate ? l_match : frame.label_fail);
-                                       ilgen.Emit (OpCodes.Ldloc, local_c);
-                                       ilgen.Emit (OpCodes.Ldc_I4, length << 3);
-                                       ilgen.Emit (OpCodes.Bge, negate ? l_match : frame.label_fail);
-
-                                       // Optimized version for small bitmaps
-                                       if (length <= 4) {
-                                               uint bitmap = program [pc];
-                                               
-                                               if (length > 1)
-                                                       bitmap |= ((uint)program [pc + 1] << 8);
-                                               if (length > 2)
-                                                       bitmap |= ((uint)program [pc + 2] << 16);
-                                               if (length > 3)
-                                                       bitmap |= ((uint)program [pc + 3] << 24);
-
-                                               //if ((bitmap >> c) & 1)
-                                               ilgen.Emit (OpCodes.Ldc_I4, bitmap);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Shr_Un);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (negate ? OpCodes.Brtrue : OpCodes.Brfalse, l1);
-                                       } else {
-                                               //  if ((program [pc + (c >> 3)] & (1 << (c & 0x7))) != 0) {
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_program);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4_3);
-                                               ilgen.Emit (OpCodes.Shr);
-                                               ilgen.Emit (OpCodes.Ldc_I4, pc);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Ldelem_I1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, 7);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (OpCodes.Shl);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (OpCodes.Ldc_I4_0);
-                                               ilgen.Emit (negate ? OpCodes.Bne_Un : OpCodes.Beq, l1);
-                                       }
-                                       ilgen.MarkLabel (l_match);
-                                       if (!no_bump) {
-                                               //  strpos++ / strpos--;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               if (reverse)
-                                                       ilgen.Emit (OpCodes.Sub);
-                                               else
-                                                       ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                       }
-                                       //    continue;
-                                       ilgen.Emit (OpCodes.Br, l2);
-                                       //  }
-                                       //}
-                                       //return false;
-                                       ilgen.MarkLabel (l1);
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-
-                                       ilgen.MarkLabel (l2);
-
-                                       pc += length;
-                                       break;
-                               }
-                               case RxOp.String:
-                               case RxOp.UnicodeString: {
-                                       OpFlags flags = (OpFlags)op_flags [pc];
-                                       bool ignore = (flags & OpFlags.IgnoreCase) > 0;
-                                       bool reverse = (flags & OpFlags.RightToLeft) > 0;
-                                       bool unicode = (op == RxOp.UnicodeString);
-
-                                       if (unicode) {
-                                               start = pc + 3;
-                                               length = ReadShort (program, pc + 1);
-                                       } else {
-                                               start = pc + 2;
-                                               length = program [pc + 1];
-                                       }
-                                       //if (strpos + length > string_end)
-                                       //      return false;
-                                       if (reverse) {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4, length);
-                                               ilgen.Emit (OpCodes.Blt, frame.label_fail);
-                                       } else {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4, length);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                               ilgen.Emit (OpCodes.Bgt, frame.label_fail);
-                                       }
-
-                                       /* Avoid unsafe code in Moonlight build */
-#if false && !NET_2_1
-                                       // FIXME:
-                                       if (reverse || unicode)
-                                               throw new NotImplementedException ();
-                                       int i;
-                                       LocalBuilder local_strptr = ilgen.DeclareLocal (typeof (char).MakePointerType ());
-                                       // char *strptr = &str.start_char + strpos
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldflda, typeof (String).GetField ("start_char", BindingFlags.Instance|BindingFlags.NonPublic));
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       ilgen.Emit (OpCodes.Shl);
-                                       ilgen.Emit (OpCodes.Add);
-                                       ilgen.Emit (OpCodes.Stloc, local_strptr);
-
-                                       end = start + length;
-                                       for (i = 0; i < length; ++i) {
-                                               // if (*(strptr + i) != program [start + i])
-                                               //   return false;
-                                               if (ignore)
-                                                       ilgen.Emit (OpCodes.Ldloc, local_textinfo);
-                                               ilgen.Emit (OpCodes.Ldloc, local_strptr);
-                                               ilgen.Emit (OpCodes.Ldc_I4, i * 2);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Ldind_I2);
-                                               if (ignore)
-                                                       ilgen.Emit (OpCodes.Callvirt, typeof (TextInfo).GetMethod ("ToLower", new Type [] { typeof (char) }));
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)program [start + i]);
-                                               ilgen.Emit (OpCodes.Bne_Un, frame.label_fail);
-                                       }
-
-                                       // strpos += length
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4, length);
-                                       ilgen.Emit (OpCodes.Add);
-                                       ilgen.Emit (OpCodes.Starg, 1);
-
-#else
-                                       // Allocate a local for 'str' to save an indirection
-                                       LocalBuilder local_str = ilgen.DeclareLocal (typeof (string));
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Stloc, local_str);
-
-                                       if (reverse) {
-                                               // strpos -= length;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4, length);
-                                               ilgen.Emit (OpCodes.Sub);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                       }
-
-                                       // FIXME: Emit a loop for long strings
-                                       end = start + (unicode ? length * 2 : length);
-                                       while (start < end) {
-                                               //if (str [strpos] != program [start])
-                                               //      return false;
-                                               if (ignore)
-                                                       ilgen.Emit (OpCodes.Ldloc, local_textinfo);
-                                               ilgen.Emit (OpCodes.Ldloc, local_str);
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                               if (ignore)
-                                                       ilgen.Emit (OpCodes.Callvirt, typeof (TextInfo).GetMethod ("ToLower", new Type [] { typeof (char) }));
-                                               ilgen.Emit (OpCodes.Ldc_I4, unicode ? ReadShort (program, start) : (int)program [start]);
-                                               ilgen.Emit (OpCodes.Bne_Un, frame.label_fail);
-                                               //strpos++;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-
-                                               if (unicode)
-                                                       start += 2;
-                                               else
-                                                       start ++;
-                                       }
-
-                                       if (reverse) {
-                                               // strpos -= length;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4, length);
-                                               ilgen.Emit (OpCodes.Sub);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                       }
-#endif
-
-                                       pc = end;
-                                       break;
-                               }
-                               case RxOp.OpenGroup: {
-                                       //Open (program [pc + 1] | (program [pc + 2] << 8), strpos);
-                                       int group_id = ReadShort (program, pc + 1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldc_I4, group_id);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Call, GetMethod ("Open", ref mi_open));
-
-                                       pc += 3;
-                                       break;
-                               }
-                               case RxOp.CloseGroup: {
-                                       //Close (program [pc + 1] | (program [pc + 2] << 8), strpos);
-                                       int group_id = ReadShort (program, pc + 1);
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldc_I4, group_id);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Call, GetMethod ("Close", ref mi_close));
-
-                                       pc += 3;
-                                       break;
-                               }
-                               case RxOp.Jump: {
-                                       int target_pc = pc + ReadShort (program, pc + 1);
-                                       if (target_pc > end_pc)
-                                               /* 
-                                                * This breaks the our code generation logic, see
-                                                * https://bugzilla.novell.com/show_bug.cgi?id=466151
-                                                * for an example.
-                                                */
-                                               return null;
-                                       if (trace_compile)
-                                               Console.WriteLine ("\tjump target: {0}", target_pc);
-                                       if (labels == null)
-                                               labels = new Dictionary <int, Label> ();
-                                       Label l = CreateLabelForPC (ilgen, target_pc);
-                                       ilgen.Emit (OpCodes.Br, l);
-                                       pc += 3;
-                                       break;
-                               }
-                               case RxOp.Test: {
-                                       int target1 = pc + ReadShort (program, pc + 1);
-                                       int target2 = pc + ReadShort (program, pc + 3);
-
-                                       if (trace_compile)
-                                               Console.WriteLine ("\temitting <test_expr>");
-
-                                       //  old_stros = strpos;
-                                       LocalBuilder local_old_strpos = ilgen.DeclareLocal (typeof (int));
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Stloc, local_old_strpos);
-
-                                       Frame new_frame = new Frame (ilgen);
-                                       m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc + 5, target1 < target2 ? target1 : target2, false, false, out pc);
-                                       if (m == null)
-                                               return null;                                            
-
-                                       if (trace_compile) {
-                                               Console.WriteLine ("\temitted <test_expr>");
-                                               Console.WriteLine ("\ttarget1 = {0}", target1);
-                                               Console.WriteLine ("\ttarget2 = {0}", target2);
-                                       }
-
-                                       Label l1 = CreateLabelForPC (ilgen, target1);
-                                       Label l2 = CreateLabelForPC (ilgen, target2);
-
-                                       // Pass
-                                       ilgen.MarkLabel (new_frame.label_pass);
-                                       //  strpos = old_strpos;
-                                       ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                       ilgen.Emit (OpCodes.Starg, 1);
-                                       ilgen.Emit (OpCodes.Br, l1);
-                                               
-                                       // Fail
-                                       ilgen.MarkLabel (new_frame.label_fail);
-                                       //  strpos = old_strpos;
-                                       ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                       ilgen.Emit (OpCodes.Starg, 1);
-                                       ilgen.Emit (OpCodes.Br, l2);
-
-                                       // Continue at pc, which should equal to target1
-                                       break;
-                               }
-                               case RxOp.SubExpression: {
-                                       int target = pc + ReadShort (program, pc + 1);
-
-                                       if (trace_compile)
-                                               Console.WriteLine ("\temitting <sub_expr>");
-
-                                       //  old_stros = strpos;
-                                       LocalBuilder local_old_strpos = ilgen.DeclareLocal (typeof (int));
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Stloc, local_old_strpos);
-
-                                       Frame new_frame = new Frame (ilgen);
-                                       m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc + 3, target, false, false, out pc);
-                                       if (m == null)
-                                               return null;                                            
-
-                                       if (trace_compile) {
-                                               Console.WriteLine ("\temitted <sub_expr>");
-                                               Console.WriteLine ("\ttarget = {0}", target);
-                                       }
-
-                                       Label l1 = CreateLabelForPC (ilgen, target);
-
-                                       // Pass
-                                       ilgen.MarkLabel (new_frame.label_pass);
-                                       ilgen.Emit (OpCodes.Br, l1);
-                                               
-                                       // Fail
-                                       ilgen.MarkLabel (new_frame.label_fail);
-                                       //  strpos = old_strpos;
-                                       ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                       ilgen.Emit (OpCodes.Starg, 1);
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-
-                                       // Continue at pc, which should equal to target
-                                       break;
-                               }
-                               case RxOp.TestCharGroup: {
-                                       int char_group_end = pc + ReadShort (program, pc + 1);
-                                       pc += 3;
-
-                                       Label label_match = ilgen.DefineLabel ();
-
-                                       /* Determine the negate/reverse flags by examining the first op */
-                                       OpFlags flags = (OpFlags)op_flags [pc];
-
-                                       /* Determine whenever this is a negated character class */
-                                       /* If it is, then the conditions are ANDed together, not ORed */
-                                       bool revert = (flags & OpFlags.Negate) > 0;
-                                       bool reverse = (flags & OpFlags.RightToLeft) > 0;
-
-                                       /*
-                                        * Generate code for all the matching ops in the group
-                                        */
-                                       while (pc < char_group_end) {
-                                               Frame new_frame = new Frame (ilgen);
-                                               m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc, Int32.MaxValue, true, true, out pc);
-                                               if (m == null)
-                                                       return null;                                            
-
-                                               if (!revert) {
-                                                       // Pass
-                                                       ilgen.MarkLabel (new_frame.label_pass);
-                                                       ilgen.Emit (OpCodes.Br, label_match);
-                                               
-                                                       // Fail
-                                                       // Just fall through to the next test
-                                                       ilgen.MarkLabel (new_frame.label_fail);
-                                               } else {
-                                                       // Pass
-                                                       // Just fall through to the next test
-                                                       ilgen.MarkLabel (new_frame.label_pass);
-                                                       Label l2 = ilgen.DefineLabel ();
-                                                       ilgen.Emit (OpCodes.Br, l2);
-
-                                                       // Fail
-                                                       // Fail completely
-                                                       ilgen.MarkLabel (new_frame.label_fail);
-                                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-
-                                                       ilgen.MarkLabel (l2);
-                                               }
-                                       }
-
-                                       if (revert) {
-                                               /* Success */
-                                               ilgen.Emit (OpCodes.Br, label_match);
-                                       } else {
-                                               // If we reached here, all the matching ops have failed
-                                               ilgen.Emit (OpCodes.Br, frame.label_fail);
-                                       }
-
-                                       ilgen.MarkLabel (label_match);
-
-                                       //  strpos++ / strpos--;
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       if (reverse)
-                                               ilgen.Emit (OpCodes.Sub);
-                                       else
-                                               ilgen.Emit (OpCodes.Add);
-                                       ilgen.Emit (OpCodes.Starg, 1);
-
-                                       break;
-                               }
-                               case RxOp.FastRepeat:
-                               case RxOp.FastRepeatLazy: {
-                                       /*
-                                        * A FastRepeat is a simplified version of Repeat which does
-                                        * not contain another repeat inside, so backtracking is 
-                                        * easier.
-                                        * FIXME: Implement faster backtracking versions for
-                                        * simple inner exceptions like chars/strings.
-                                        */
-                                       bool lazy = program [pc] == (byte)RxOp.FastRepeatLazy;
-                                       int tail = pc + ReadShort (program, pc + 1);
-                                       start = ReadInt (program, pc + 3);
-                                       end = ReadInt (program, pc + 7);
-                                       //Console.WriteLine ("min: {0}, max: {1} tail: {2}", start, end, tail);
-
-                                       //  deep = null;
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldnull);
-                                       ilgen.Emit (OpCodes.Stfld, fi_deep);
-
-                                       LocalBuilder local_length = ilgen.DeclareLocal (typeof (int));
-
-                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                       ilgen.Emit (OpCodes.Stloc, local_length);
-
-                                       LocalBuilder local_old_strpos = ilgen.DeclareLocal (typeof (int));
-                                       
-                                       // First match at least 'start' items
-                                       if (start > 0) {
-                                               //for (length = 0; length < start; ++length) {
-                                               Label l_loop_footer = ilgen.DefineLabel ();
-                                               ilgen.Emit (OpCodes.Br, l_loop_footer);
-                                               Label l_loop_body = ilgen.DefineLabel ();
-                                               ilgen.MarkLabel (l_loop_body);
-
-                                               // int old_strpos = strpos;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Stloc, local_old_strpos);
-                                               
-                                               // if (!EvalByteCode (pc + 11, strpos, ref res))
-                                               Frame new_frame = new Frame (ilgen);
-                                               m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc + 11, tail, false, false, out out_pc);
-                                               if (m == null)
-                                                       return null;
-
-                                               // Fail
-                                               // return false;
-                                               ilgen.MarkLabel (new_frame.label_fail);
-                                               ilgen.Emit (OpCodes.Br, frame.label_fail);
-
-                                               // Pass
-                                               ilgen.MarkLabel (new_frame.label_pass);
-                                               // length++
-                                               ilgen.Emit (OpCodes.Ldloc, local_length);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Stloc, local_length);
-                                               // Loop footer
-                                               ilgen.MarkLabel (l_loop_footer);
-                                               ilgen.Emit (OpCodes.Ldloc, local_length);
-                                               ilgen.Emit (OpCodes.Ldc_I4, start);
-                                               ilgen.Emit (OpCodes.Blt, l_loop_body);
-                                       }
-
-                                       if (lazy) {
-                                               Label l_loop_footer = ilgen.DefineLabel ();
-                                               //while (true) {
-                                               ilgen.Emit (OpCodes.Br, l_loop_footer);
-                                               Label l_loop_body = ilgen.DefineLabel ();
-                                               ilgen.MarkLabel (l_loop_body);
-                                               // Match the tail
-                                               //  int cp = Checkpoint ();
-                                               LocalBuilder local_cp = ilgen.DeclareLocal (typeof (int));
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Call, GetMethod ("Checkpoint", ref mi_checkpoint));
-                                               ilgen.Emit (OpCodes.Stloc, local_cp);
-
-                                               // int old_strpos = strpos;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Stloc, local_old_strpos);
-
-                                               //  if (EvalByteCode (tail, strpos, ref res)) {
-                                               Frame new_frame = new Frame (ilgen);
-                                               m = EmitEvalMethodBody (m, ilgen, new_frame, program, tail, end_pc, false, false, out out_pc);
-                                               if (m == null)
-                                                       return null;
-
-                                               // Success:
-                                               ilgen.MarkLabel (new_frame.label_pass);
-                                               //    return true;
-                                               ilgen.Emit (OpCodes.Br, frame.label_pass);
-
-                                               // Fail:
-                                               ilgen.MarkLabel (new_frame.label_fail);
-                                               //  Backtrack (cp);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldloc, local_cp);
-                                               ilgen.Emit (OpCodes.Call, GetMethod ("Backtrack", ref mi_backtrack));
-                                               // strpos = old_strpos;
-                                               ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-
-                                               //if (length >= end)
-                                               //  return false;
-                                               ilgen.Emit (OpCodes.Ldloc, local_length);
-                                               ilgen.Emit (OpCodes.Ldc_I4, end);
-                                               ilgen.Emit (OpCodes.Bge, frame.label_fail);
-
-                                               // Match an item
-                                               //if (!EvalByteCode (pc + 11, strpos, ref res))
-                                               new_frame = new Frame (ilgen);
-                                               m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc + 11, tail, false, false, out out_pc);
-                                               if (m == null)
-                                                       return null;
-
-                                               // Success:
-                                               ilgen.MarkLabel (new_frame.label_pass);
-                                               // length ++;
-                                               ilgen.Emit (OpCodes.Ldloc, local_length);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Stloc, local_length);
-                                               ilgen.Emit (OpCodes.Br, l_loop_body);
-                                               
-                                               // Fail:
-                                               ilgen.MarkLabel (new_frame.label_fail);
-                                               // return false;
-                                               ilgen.Emit (OpCodes.Br, frame.label_fail);
-
-                                               // Loop footer
-                                               ilgen.MarkLabel (l_loop_footer);
-                                               ilgen.Emit (OpCodes.Br, l_loop_body);
-                                       } else {
-                                               // Then match as many items as possible, recording
-                                               // backtracking information
-                                               
-                                               //int old_stack_size = stack.Count;
-                                               LocalBuilder local_old_stack_size = ilgen.DeclareLocal (typeof (int));
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldflda, fi_stack);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter.IntStack), "get_Count", ref mi_stack_get_count));
-                                               ilgen.Emit (OpCodes.Stloc, local_old_stack_size);
-                                               //while (length < end) {
-                                               Label l_loop_footer = ilgen.DefineLabel ();
-                                               ilgen.Emit (OpCodes.Br, l_loop_footer);
-                                               Label l_loop_body = ilgen.DefineLabel ();
-                                               ilgen.MarkLabel (l_loop_body);
-                                               //  int cp = Checkpoint ();
-                                               LocalBuilder local_cp = ilgen.DeclareLocal (typeof (int));
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Call, GetMethod ("Checkpoint", ref mi_checkpoint));
-                                               ilgen.Emit (OpCodes.Stloc, local_cp);
-
-                                               // int old_strpos = strpos;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Stloc, local_old_strpos);
-
-                                               //  if (!EvalByteCode (pc + 11, strpos, ref res)) {
-                                               Frame new_frame = new Frame (ilgen);
-                                               m = EmitEvalMethodBody (m, ilgen, new_frame, program, pc + 11, tail, false, false, out out_pc);
-                                               if (m == null)
-                                                       return null;
-
-                                               // Fail:
-                                               ilgen.MarkLabel (new_frame.label_fail);
-                                               // strpos = old_strpos
-                                               ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                               //    Backtrack (cp);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldloc, local_cp);
-                                               ilgen.Emit (OpCodes.Call, GetMethod ("Backtrack", ref mi_backtrack));
-
-                                               //    break;
-                                               Label l_after_loop = ilgen.DefineLabel ();
-                                               ilgen.Emit (OpCodes.Br, l_after_loop);
-
-                                               // Success:
-                                               ilgen.MarkLabel (new_frame.label_pass);
-
-                                               //stack.Push (cp);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldflda, fi_stack);
-                                               ilgen.Emit (OpCodes.Ldloc, local_cp);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter.IntStack), "Push", ref mi_stack_push));
-                                               //stack.Push (strpos);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldflda, fi_stack);
-                                               ilgen.Emit (OpCodes.Ldloc, local_old_strpos);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter.IntStack), "Push", ref mi_stack_push));
-                                               // length++
-                                               ilgen.Emit (OpCodes.Ldloc, local_length);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Stloc, local_length);
-                                               // Loop footer
-                                               ilgen.MarkLabel (l_loop_footer);
-                                               ilgen.Emit (OpCodes.Ldloc, local_length);
-                                               ilgen.Emit (OpCodes.Ldc_I4, end);
-                                               ilgen.Emit (OpCodes.Blt, l_loop_body);
-
-                                               ilgen.MarkLabel (l_after_loop);
-
-                                               // Then, match the tail, backtracking as necessary.
-
-                                               //while (true) {
-                                               l_loop_footer = ilgen.DefineLabel ();
-                                               ilgen.Emit (OpCodes.Br, l_loop_footer);
-                                               l_loop_body = ilgen.DefineLabel ();
-                                               ilgen.MarkLabel (l_loop_body);
-
-                                               if (RxInterpreter.trace_rx) {
-                                                       ilgen.Emit (OpCodes.Ldstr, "matching tail at: {0}");
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Box, typeof (int));
-                                                       ilgen.Emit (OpCodes.Call, typeof (Console).GetMethod ("WriteLine", new Type [] { typeof (string), typeof (object) }));
-                                               }
-
-                                               //  if (EvalByteCode (tail, strpos, ref res)) {
-                                               new_frame = new Frame (ilgen);
-                                               m = EmitEvalMethodBody (m, ilgen, new_frame, program, tail, end_pc, false, false, out out_pc);
-                                               if (m == null)
-                                                       return null;
-
-                                               // Success:
-                                               ilgen.MarkLabel (new_frame.label_pass);
-
-                                               if (RxInterpreter.trace_rx) {
-                                                       ilgen.Emit (OpCodes.Ldstr, "tail matched at: {0}");
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Box, typeof (int));
-                                                       ilgen.Emit (OpCodes.Call, typeof (Console).GetMethod ("WriteLine", new Type [] { typeof (string), typeof (object) }));
-                                               }
-
-                                               //      stack.Count = old_stack_size;
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldflda, fi_stack);
-                                               ilgen.Emit (OpCodes.Ldloc, local_old_stack_size);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter.IntStack), "set_Count", ref mi_stack_set_count));
-                                               //  return true;
-                                               ilgen.Emit (OpCodes.Br, frame.label_pass);
-
-                                               // Fail:
-                                               ilgen.MarkLabel (new_frame.label_fail);
-
-                                               if (RxInterpreter.trace_rx) {
-                                                       ilgen.Emit (OpCodes.Ldstr, "tail failed to match at: {0}");
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Box, typeof (int));
-                                                       ilgen.Emit (OpCodes.Call, typeof (Console).GetMethod ("WriteLine", new Type [] { typeof (string), typeof (object) }));
-                                               }
-
-                                               //  if (stack.Count == old_stack_size)
-                                               //              return false;
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldflda, fi_stack);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter.IntStack), "get_Count", ref mi_stack_get_count));
-                                               ilgen.Emit (OpCodes.Ldloc, local_old_stack_size);
-                                               ilgen.Emit (OpCodes.Beq, frame.label_fail);
-                                               
-                                               // Backtrack
-                                               //strpos = stack.Pop ();
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldflda, fi_stack);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter.IntStack), "Pop", ref mi_stack_pop));
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                               //Backtrack (stack.Pop ());
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldflda, fi_stack);
-                                               ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter.IntStack), "Pop", ref mi_stack_pop));
-                                               ilgen.Emit (OpCodes.Call, GetMethod ("Backtrack", ref mi_backtrack));
-
-                                               if (RxInterpreter.trace_rx) {
-                                                       //Console.WriteLine ("backtracking to: {0}", strpos);
-                                                       ilgen.Emit (OpCodes.Ldstr, "backtracking to: {0}");
-                                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                                       ilgen.Emit (OpCodes.Box, typeof (int));
-                                                       ilgen.Emit (OpCodes.Call, typeof (Console).GetMethod ("WriteLine", new Type [] { typeof (string), typeof (object) }));
-                                               }
-
-                                               // Loop footer
-                                               ilgen.MarkLabel (l_loop_footer);
-                                               ilgen.Emit (OpCodes.Br, l_loop_body);
-                                       }
-
-                                       // We already processed the tail
-                                       pc = out_pc;
-                                       goto End;
-                               }
-
-                               case RxOp.CategoryAny:
-                               case RxOp.CategoryAnySingleline:
-                               case RxOp.CategoryWord:
-                               case RxOp.CategoryDigit:
-                               case RxOp.CategoryWhiteSpace:
-                               case RxOp.CategoryEcmaWord:
-                               case RxOp.CategoryEcmaWhiteSpace:
-                               case RxOp.CategoryUnicodeSpecials:
-                               case RxOp.CategoryUnicode: {
-                                       OpFlags flags = (OpFlags)op_flags [pc];
-                                       bool negate = (flags & OpFlags.Negate) > 0;
-                                       bool reverse = (flags & OpFlags.RightToLeft) > 0;
-
-                                       //if (strpos < string_end) {
-                                       Label l_nomatch = ilgen.DefineLabel ();
-                                       if (reverse) {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_0);
-                                               ilgen.Emit (OpCodes.Ble, l_nomatch);
-                                       } else {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                               ilgen.Emit (OpCodes.Bge, l_nomatch);
-                                       }
-
-                                       //  int c = str [strpos];
-                                       LocalBuilder local_c = ilgen.DeclareLocal (typeof (char));
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       if (reverse) {
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               ilgen.Emit (OpCodes.Sub);
-                                       }
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       ilgen.Emit (OpCodes.Stloc, local_c);
-
-                                       Label l_match = ilgen.DefineLabel ();
-
-                                       Label l_true, l_false;
-
-                                       l_true = negate ? l_nomatch : l_match;
-                                       l_false = negate ? l_match : l_nomatch;
-
-                                       switch (op) {
-                                       case RxOp.CategoryAny:
-                                               // if (str [strpos] != '\n') {
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\n');
-                                               ilgen.Emit (OpCodes.Bne_Un, l_true);
-                                               break;
-                                       case RxOp.CategoryAnySingleline:
-                                               ilgen.Emit (OpCodes.Br, l_true);
-                                               break;
-                                       case RxOp.CategoryWord:
-                                               //  if (Char.IsLetterOrDigit (c) || Char.GetUnicodeCategory (c) == UnicodeCategory.ConnectorPunctuation) {
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Call, typeof (Char).GetMethod ("IsLetterOrDigit", new Type [] { typeof (char) }));
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Call, typeof (Char).GetMethod ("GetUnicodeCategory", new Type [] { typeof (char) }));
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)UnicodeCategory.ConnectorPunctuation);
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               break;
-                                       case RxOp.CategoryDigit:
-                                               // if (Char.IsDigit (c)) {
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Call, typeof (Char).GetMethod ("IsDigit", new Type [] { typeof (char) }));
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-                                               break;
-                                       case RxOp.CategoryWhiteSpace:
-                                               // if (Char.IsWhiteSpace (c)) {
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Call, typeof (Char).GetMethod ("IsWhiteSpace", new Type [] { typeof (char) }));
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-                                               break;
-                                       case RxOp.CategoryEcmaWord:
-                                               // if ('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' || c == '_') {
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'a' - 1);
-                                               ilgen.Emit (OpCodes.Cgt);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'z' + 1);
-                                               ilgen.Emit (OpCodes.Clt);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'A' - 1);
-                                               ilgen.Emit (OpCodes.Cgt);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'Z' + 1);
-                                               ilgen.Emit (OpCodes.Clt);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'0' - 1);
-                                               ilgen.Emit (OpCodes.Cgt);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'9' + 1);
-                                               ilgen.Emit (OpCodes.Clt);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'_');
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               break;
-                                       case RxOp.CategoryEcmaWhiteSpace:
-                                               // if (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v') {
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)' ');
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\t');
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\n');
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\r');
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\f');
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\v');
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               break;
-                                       case RxOp.CategoryUnicodeSpecials:
-                                               // if ('\uFEFF' <= c && c <= '\uFEFF' || '\uFFF0' <= c && c <= '\uFFFD') {
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\uFEFF' - 1);
-                                               ilgen.Emit (OpCodes.Cgt);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\uFEFF' + 1);
-                                               ilgen.Emit (OpCodes.Clt);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\uFFF0' - 1);
-                                               ilgen.Emit (OpCodes.Cgt);
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)'\uFFFD' + 1);
-                                               ilgen.Emit (OpCodes.Clt);
-                                               ilgen.Emit (OpCodes.And);
-                                               ilgen.Emit (OpCodes.Brtrue, l_true);
-                                               break;
-                                       case RxOp.CategoryUnicode:
-                                               // if (Char.GetUnicodeCategory (c) == (UnicodeCategory)program [pc + 1]) {                                              
-                                               ilgen.Emit (OpCodes.Ldloc, local_c);
-                                               ilgen.Emit (OpCodes.Call, typeof (Char).GetMethod ("GetUnicodeCategory", new Type [] { typeof (char) }));
-                                               ilgen.Emit (OpCodes.Ldc_I4, (int)program [pc + 1]);
-                                               ilgen.Emit (OpCodes.Beq, l_true);
-                                               break;
-                                       }
-
-                                       ilgen.Emit (OpCodes.Br, l_false);
-
-                                       ilgen.MarkLabel (l_match);
-
-                                       //    strpos++;
-                                       if (!no_bump) {
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_1);
-                                               if (reverse)
-                                                       ilgen.Emit (OpCodes.Sub);
-                                               else
-                                                       ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                       }
-                                       //  }
-                                       Label l2 = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Br, l2);
-                                       //}
-                                       ilgen.MarkLabel (l_nomatch);
-                                       //return false;
-                                       ilgen.Emit (OpCodes.Br, frame.label_fail);
-
-                                       ilgen.MarkLabel (l2);
-
-                                       if (op == RxOp.CategoryUnicode)
-                                               pc += 2;
-                                       else
-                                               pc++;
-                                       break;
-                               }
-                               case RxOp.Reference: {
-                                       OpFlags flags = (OpFlags)op_flags [pc];
-                                       bool ignore = (flags & OpFlags.IgnoreCase) > 0;
-                                       bool reverse = (flags & OpFlags.RightToLeft) > 0;
-
-                                       //length = GetLastDefined (program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       LocalBuilder loc_length = ilgen.DeclareLocal (typeof (int));
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldc_I4, ReadShort (program, pc + 1)); 
-                                       ilgen.Emit (OpCodes.Call, GetMethod (typeof (RxInterpreter), "GetLastDefined", ref mi_get_last_defined));                                       
-                                       ilgen.Emit (OpCodes.Stloc, loc_length);
-                                       //if (length < 0)
-                                       //  return false;
-                                       ilgen.Emit (OpCodes.Ldloc, loc_length);
-                                       ilgen.Emit (OpCodes.Ldc_I4_0);
-                                       ilgen.Emit (OpCodes.Blt, frame.label_fail);
-                                       //start = marks [length].Index;
-                                       LocalBuilder loc_start = ilgen.DeclareLocal (typeof (int));
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_marks);
-                                       ilgen.Emit (OpCodes.Ldloc, loc_length);
-                                       ilgen.Emit (OpCodes.Ldelema, typeof (Mark));
-                                       ilgen.Emit (OpCodes.Call, GetMethod (typeof (Mark), "get_Index", ref mi_mark_get_index));
-                                       ilgen.Emit (OpCodes.Stloc, loc_start);
-                                       // length = marks [length].Length;
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_marks);
-                                       ilgen.Emit (OpCodes.Ldloc, loc_length);
-                                       ilgen.Emit (OpCodes.Ldelema, typeof (Mark));
-                                       ilgen.Emit (OpCodes.Call, GetMethod (typeof (Mark), "get_Length", ref mi_mark_get_length));
-                                       ilgen.Emit (OpCodes.Stloc, loc_length);
-                                       if (reverse) {
-                                               //ptr -= length;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldloc, loc_length);
-                                               ilgen.Emit (OpCodes.Sub);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                               //if (ptr < 0)
-                                               //goto Fail;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldc_I4_0);
-                                               ilgen.Emit (OpCodes.Blt, frame.label_fail);
-                                       } else {
-                                               //if (strpos + length > string_end)
-                                               //  return false;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldloc, loc_length);
-                                               ilgen.Emit (OpCodes.Add);
-                                               ilgen.Emit (OpCodes.Ldarg_0);
-                                               ilgen.Emit (OpCodes.Ldfld, fi_string_end);
-                                               ilgen.Emit (OpCodes.Bgt, frame.label_fail);
-                                       }
-
-                                       LocalBuilder local_str = ilgen.DeclareLocal (typeof (string));
-                                       ilgen.Emit (OpCodes.Ldarg_0);
-                                       ilgen.Emit (OpCodes.Ldfld, fi_str);
-                                       ilgen.Emit (OpCodes.Stloc, local_str);
-
-                                       // end = start + length;
-                                       LocalBuilder loc_end = ilgen.DeclareLocal (typeof (int));
-                                       ilgen.Emit (OpCodes.Ldloc, loc_start);
-                                       ilgen.Emit (OpCodes.Ldloc, loc_length);
-                                       ilgen.Emit (OpCodes.Add);
-                                       ilgen.Emit (OpCodes.Stloc, loc_end);
-                                       //for (; start < end; ++start) {
-                                       Label l_loop_footer = ilgen.DefineLabel ();
-                                       ilgen.Emit (OpCodes.Br, l_loop_footer);
-                                       Label l_loop_body = ilgen.DefineLabel ();
-                                       ilgen.MarkLabel (l_loop_body);
-                                       //if (str [strpos] != str [start])
-                                       //return false;
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Ldloc, local_textinfo);
-                                       ilgen.Emit (OpCodes.Ldloc, local_str);
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Callvirt, typeof (TextInfo).GetMethod ("ToLower", new Type [] { typeof (char) }));
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Ldloc, local_textinfo);
-                                       ilgen.Emit (OpCodes.Ldloc, local_str);
-                                       ilgen.Emit (OpCodes.Ldloc, loc_start);
-                                       ilgen.Emit (OpCodes.Callvirt, typeof (string).GetMethod ("get_Chars"));
-                                       if (ignore)
-                                               ilgen.Emit (OpCodes.Callvirt, typeof (TextInfo).GetMethod ("ToLower", new Type [] { typeof (char) }));
-                                       ilgen.Emit (OpCodes.Bne_Un, frame.label_fail);
-                                       // strpos++;
-                                       ilgen.Emit (OpCodes.Ldarg_1);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       ilgen.Emit (OpCodes.Add);
-                                       ilgen.Emit (OpCodes.Starg, 1);
-                                       // start++
-                                       ilgen.Emit (OpCodes.Ldloc, loc_start);
-                                       ilgen.Emit (OpCodes.Ldc_I4_1);
-                                       ilgen.Emit (OpCodes.Add);
-                                       ilgen.Emit (OpCodes.Stloc, loc_start);
-                                       // Loop footer
-                                       ilgen.MarkLabel (l_loop_footer);
-                                       ilgen.Emit (OpCodes.Ldloc, loc_start);
-                                       ilgen.Emit (OpCodes.Ldloc, loc_end);
-                                       ilgen.Emit (OpCodes.Blt, l_loop_body);
-
-                                       if (reverse) {
-                                               //ptr -= length;
-                                               ilgen.Emit (OpCodes.Ldarg_1);
-                                               ilgen.Emit (OpCodes.Ldloc, loc_length);
-                                               ilgen.Emit (OpCodes.Sub);
-                                               ilgen.Emit (OpCodes.Starg, 1);
-                                       }
-
-                                       pc += 3;
-                                       break;
-                               }
-                               case RxOp.Repeat:
-                               case RxOp.RepeatLazy:
-                               case RxOp.IfDefined:
-                                       // FIXME:
-                                       if (RxInterpreter.trace_rx || trace_compile)
-                                               Console.WriteLine ("Opcode " + op + " not supported.");
-                                       return null;
-                               default:
-                                       throw new NotImplementedException ("Opcode '" + op + "' not supported by the regex->IL compiler.");
-                           }
-
-                               if (one_op)
-                                       break;
-                       }
-
-                       End:
-
-                       out_pc = pc;
-
-                       return m;
-               }
-       }
-
-}
-
diff --git a/mcs/class/System/System.Text.RegularExpressions/Capture.cs b/mcs/class/System/System.Text.RegularExpressions/Capture.cs
deleted file mode 100644 (file)
index edaf076..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       Capture.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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;
-
-namespace System.Text.RegularExpressions {
-
-       [Serializable]
-       public class Capture {
-               public int Index {
-                       get { return index; }
-               }
-
-               public int Length {
-                       get { return length; }
-               }
-
-               public string Value {
-                       get { return text == null ? String.Empty : text.Substring (index, length); }
-               }
-
-               public override string ToString ()
-               {
-                       return Value;
-               }
-
-               // internal members
-
-               internal Capture (string text) : this (text, 0, 0) { }
-
-               internal Capture (string text, int index, int length)
-               {
-                       this.text = text;
-                       this.index = index;
-                       this.length = length;
-               }
-               
-               internal string Text {
-                       get { return text; }
-               }
-
-               // private
-
-               internal int index, length;
-               internal string text;
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/CaptureCollection.cs b/mcs/class/System/System.Text.RegularExpressions/CaptureCollection.cs
deleted file mode 100644 (file)
index 3c9ef45..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// System.Text.RegularExpressions.CaptureCollection
-//
-// Authors:
-//     Dan Lewis (dlewis@gmx.co.uk)
-//     Dick Porter (dick@ximian.com)
-//
-// (C) 2002 Dan Lewis
-// Copyright (C) 2005 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.Collections;
-
-namespace System.Text.RegularExpressions 
-{
-       [Serializable]
-       public class CaptureCollection: ICollection, IEnumerable
-       {
-               private Capture [] list;
-
-               /* No public constructor */
-               internal CaptureCollection (int n)
-               {
-                       list = new Capture [n];
-               }
-
-               public int Count {
-                       get { return list.Length; }
-               }
-
-               public bool IsReadOnly {
-                       get { return true; }
-               }
-
-               public bool IsSynchronized {
-                       get { return false; }
-               }
-
-               public Capture this [int i] {
-                       get {
-                               if (i < 0 || i >= Count)
-                                       throw new ArgumentOutOfRangeException ("Index is out of range");
-                               return list [i];
-                       }
-               }
-
-               internal void SetValue (Capture cap, int i)
-               {
-                       list [i] = cap;
-               }
-
-               public object SyncRoot {
-                       get { return list; }
-               }
-
-               public void CopyTo (Array array, int arrayIndex)
-               {
-                       list.CopyTo (array, arrayIndex);
-               }
-
-               public IEnumerator GetEnumerator ()
-               {
-                       return list.GetEnumerator ();
-               }
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
deleted file mode 100644 (file)
index 56f7381..0000000
+++ /dev/null
@@ -1,1084 +0,0 @@
-2010-07-20  Miguel de Icaza  <miguel@novell.com>
-
-       * parser.cs (ParseEscape): Now parses with some context, whether
-       we are parsing inside a character range which can not contain
-       back-references or when we are parsing on a string context which
-       can contain back references.
-
-       This fixes bug #577346 which exposed a bug parsing this:
-
-       new Regex("[\\177-\\377]")
-
-2010-06-29  Raja R Harinath  <harinath@hurrynot.org>
-
-       Mitigate a possible source of unbounded memory growth
-       * interpreter.cs (Backtrack): Move mark_start back, and invalidate
-       discarded marks.
-
-2010-06-29  Raja R Harinath  <harinath@hurrynot.org>
-
-       Make trace output resemble assembler listing
-       * compiler.cs (LinkRef.ToString) [TRACE_REGEX]: Add pretty-printer
-       in TRACE_REGEX mode.
-       (TraceRegexp): Indent the output.
-       (TraceRegexpLabel): New.  Prints out a line label.
-       (EmitCount): Don't trace.  All callers are traced.
-       (ResolveLink): Trace line labels.
-
-2010-06-21  Rodrigo Kumpera  <rkumpera@novell.com>
-
-       * compiler.cs: Use conditional compilation to enable
-       tracing to avoid code bloat.
-
-2010-06-21  Rodrigo Kumpera  <rkumpera@novell.com>
-
-       * parser.cs: Handle repetition of position assertions.
-
-       Fixes #610587.
-
-2010-06-21  Rodrigo Kumpera  <rkumpera@novell.com>
-
-       * compiler.cs: Add new internal flag to switch on regexp tracing.
-       The code is a statc readonly variable so the JIT can eliminate
-       all tracing code during normal runs.
-
-2010-03-20  Miguel de Icaza  <miguel@novell.com>
-
-       * RxInterpreter.cs: Removed warnings.
-
-2010-02-03  Rodrigo Kumpera  <rkumpera@novell.com>
-
-       * BaseMachine.cs (Split): Don't add empty strings if they don't come from
-       the first capture group. Fixes #566117.
-
-2010-01-12  Miguel de Icaza  <miguel@novell.com>
-
-       * Regex.cs: Re-enable the new regex compiler as the bug seems to
-       be gone now.
-
-2009-09-07  Raja R Harinath  <harinath@hurrynot.org>
-
-       * Regex.cs (Escape, Unescape): Add null checks.
-       (validate_options): Add ECMAScript option checks.
-       (Replace, Split): Add a few bounds checks.
-
-2009-09-07  Raja R Harinath  <harinath@hurrynot.org>
-
-       Add some null checks and bounds checks.
-       * Regex.cs (default_startat): New.  Replaces the fragment
-       'RightToLeft ?  input.Length : 0' with a null-safe variant.
-       (Replace) <string variant>: Add null checks for argument strings.
-       (Split): Likewise.
-       (.ctor): Likewise.  Validate regex options partially.
-       (Match): Add null check on string arguments, and bounds checks for
-       offset and length arguments.
-
-2009-08-20  Raja R Harinath  <harinath@hurrynot.org>
-
-       Final piece of explicit numeric group support
-       * parser.cs (gap): New.
-       (GetMapping): Return it.
-       (ResolveReferences): Collect explicit numeric groups which may not
-       match their indices.
-       (HandleExplicitNumericGroups): New.  Process the above list to
-       assign appropriate indices, and compute the correct value of 'gap'.
-
-2009-08-20  Raja R Harinath  <harinath@hurrynot.org>
-
-       * syntax.cs (CapturingGroup.Index): Rename from Number to clarify
-       semantics.
-       (CapturingGroup.CompareTo): New.
-       * parser.cs, syntax.cs: Update to changes.
-
-2009-08-20  Raja R Harinath  <harinath@hurrynot.org>
-
-       Implement some more group number/index distinction
-       * Regex.cs (gap, Gap): New.
-       (Init, InitNewRegex): Update it.
-       (GroupNumberFromName): If the 'name' is beyond the gap, it is an
-       explicit numeric group -- use the name as the group number.
-       (GetGroupIndex): Use a binary search to map a group number to its
-       index when we know that they don't match.
-       (GroupNumbers): Use group number, not group index, for explicit
-       numeric groups.
-       * Match.cs (.ctor): Use the newly introduce 'Regex.Gap'.
-
-2009-08-19  Raja R Harinath  <harinath@hurrynot.org>
-
-       * Regex.cs (group_numbers): New.
-       (GetGroupNumbers): Move array initialization ...
-       (GroupNumbers): ... to new on-demand initializer.
-
-2009-08-19  Raja R Harinath  <harinath@hurrynot.org>
-
-       * Regex.cs (group_names): Rename from _groupNumbersToNameMap.
-       (GetGroupNamesArray): Use an IDictionaryEnumerator to walk the
-       mapping, since both the key and value are used in the loop.
-
-2009-08-19  Raja R Harinath  <harinath@hurrynot.org>
-
-       Introduce 'gap' concept into all the variants of regex
-       * arch.cs (IMachineFactory::Gap): New property.
-       * compiler.cs (InterpreterFactory): Update to changes.
-       * RxCompiler.cs (RxInterpreterFactory): Likewise.
-       * JvmReMachineFactory.cs: Likewise.
-       * parser.cs (GetMapping): Return the 'gap' index.  Move creation
-       of mapping dictionary ...
-       * Regex.cs (CreateMachineFactory): ... here.  Update to changes.
-
-2009-08-18  Raja R Harinath  <harinath@hurrynot.org>
-
-       Distinguish between the internal index of a group and group number.
-       * Regex.cs (GetGroupIndex): New.
-       (GroupNameFromNumber): Use it.
-       * GroupCollection.cs (.ctor): Introduce 'gap' argument.  It is the
-       index of the first group whose group number differs from its index.
-       (Item.get): Likewise.
-
-2009-08-18  Raja R Harinath  <harinath@hurrynot.org>
-
-       * parser.cs (GetMapping): Extend duplicate check for numeric
-       groups too.
-
-2009-08-17  Raja R Harinath  <harinath@hurrynot.org>
-
-       * parser.cs (ResolveReferences): Handle some cases of
-       explicitly-named numeric groups.
-
-2009-08-17  Raja R Harinath  <harinath@hurrynot.org>
-
-       * parser.cs (ResolveReferences): Rearrange slightly to prepare for
-       future changes.
-
-2009-08-17  Raja R Harinath  <harinath@hurrynot.org>
-
-       * Regex.cs (GetGroupNumbers): List group numbers in ascending order.
-       (GetGroupNames): List names in order of group number.
-
-2009-08-12  Raja R Harinath  <harinath@hurrynot.org>
-
-       * syntax.cs (BackslashNumber.ResolveReference): Improve ECMAScript
-       semantics.  Handle cases like "group 43 exists but group 4 doesn't".
-
-2009-08-10  Raja R Harinath  <harinath@hurrynot.org>
-
-       * syntax.cs (BackslashNumber.ResolveReference): Implement fallback
-       to octal numbers, and ECMAScript semantics.
-       * parser.cs (ResolveReferences): Use it.
-
-2009-08-10  Raja R Harinath  <harinath@hurrynot.org>
-
-       * syntax.cs (BackslashNumber): New class.
-       * parser.cs (ParseSpecial): Create it instead of 'Reference' if a
-       numeric backreference is seen.
-
-2009-08-10  Raja R Harinath  <harinath@hurrynot.org>
-
-       * parser.cs (ResolveReferences): Allow named groups to be
-       referred-to by their group numbers too.
-
-2009-04-23  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * Regex.cs: Remove Compiler-related support for NET_2_1
-       * RegexOptions.cs: Remove Compile from values available on NET_2_1
-
-2009-03-04  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs (ResetGroups): Avoid allocating larger than needed
-       arrays.
-
-2009-02-27  Jonathan Pryor <jpryor@novell.com>
-
-       * Regex.cs (Replace): Check that input & evaluator are not null, as
-         documented in MSDN (and the variance found while testing DbLinq).
-
-2009-02-27  Zoltan Varga  <vargaz@gmail.com>
-
-       * BaseMachine.cs (LTRReplace): Initialize the StringBuilder with an
-       appropriate initial length.
-
-2009-02-24  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Partially inline calls to Char.ToLower () to speed
-       up ignorecase matching.
-
-2009-02-16  Jb Evain  <jbevain@novell.com>
-
-       * Regex.cs: on the NET_2_1 profile, always use the old engine for now.
-
-2009-02-14  Zoltan Varga  <vargaz@gmail.com>
-
-       * Regex.cs: Add a MONO_NEW_RX variable to enable the new regex
-       engine.
-
-2009-02-04  Zoltan Varga  <vargaz@gmail.com>
-
-       * Regex.cs: Disable the new regex engine for now.
-
-2009-01-14  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Avoid throwing exceptions for a few more unhandled opcodes.
-       Implement the reverse/ignorecase versions of Reference. Fix the reverse
-       version of Bitmap. Error out if a Jump opcode jumps outside the current
-       pc range. This works around #466151.
-
-2009-01-12  Jb Evain  <jbevain@novell.com>
-
-       * RxInterpreter.cs: set trace_rx to false for NET_2_1.
-       * Regex.cs: set old_rx to false for NET_2_1.
-
-2009-01-07  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs: Add support for constant strings in anchors. Fixes
-       #464135.
-
-2008-11-18 Gonzalo Paniagua Javier <gonzalo@novell.com>
-
-       * cache.cs: avoid infinite loop.
-
-2008-11-14 Gonzalo Paniagua Javier <gonzalo@novell.com>
-
-       * cache.cs:
-       * Regex.cs: honor CacheSize value.
-
-2008-11-13  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs: Fix pc computation in various opcodes. Fixes #443841.
-
-2008-11-11  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Implement Reference opcode.
-
-2008-10-30  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Implement SubExpression opcode.
-       
-       * CILCompiler.cs: Save and restore strpos in the Test opcode. Fixes
-       #439947.
-
-2008-10-25  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Implement Test opcode.
-
-2008-10-25 Gonzalo Paniagua Javier <gonzalo@novell.com>
-
-       * RxInterpreter.cs: implement missing Unicode* opcodes and
-       StringReverseIgnoreCase.
-
-2008-10-25  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxOp.cs: Remove unused Generic opcodes.
-
-       * RxCompiler.cs: Emit opcodes with flags using methods which can be 
-       overriden by CILCompiler.cs, so we only have to override a few methods.
-
-       * CILCompiler.cs: Simplify based on the RxCompiler changes. Implement
-       UnicodeString opcode. Throw a NotImplementedException when an unsupported
-       opcode is encountered, since the IL compiler is now believed to be feature 
-       complete.
-
-2008-10-24  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs CILCompiler.cs gen-interp.cs: Fix the reading of short 
-       values from the instruction stream.
-
-       * RxOp.cs: Add some missing unicode opcodes.
-
-       * gen-interp.cs RxInterpreter.cs: Generate Bitmap/UnicodeBitmap opcodes too.
-
-       * CILCompiler.cs (EmitEvalMethodBody): Add an 'end_pc' argument to mark the
-       end of the bytecode range which needs to be compiled. Use it to avoid
-       compiling the same bytecode multiple times in various opcodes. Fix
-       RxOp.Jump implementation. Add implementation for unicode opcodes.
-
-2008-10-09  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Implement NoBitmap/NoBitmapIgnoreCase. Fixes #432172.
-
-2008-09-14  Zoltan Varga  <vargaz@gmail.com>
-
-       * gen-interp.cs: New file to generate the all variants of the character 
-       checking opcodes in RxInterpreter.cs.
-
-       * RxInterpreter.cs: Replace hand written code with code generated by
-       gen-interp.cs.
-       
-       * RxInterpreter.cs: Fix the failure case of the No<XXX> opcodes. Fixes
-       #426142.
-
-2008-09-13  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs RxCompiler.cs: Implement some missing Category opcodes.
-
-2008-09-07  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Override ICompiler.EmitSet too so we set op_flags for 
-       Bitmap opcodes too. Fixes #424073.
-
-2008-09-06  Zoltan Varga  <vargaz@gmail.com>
-
-       * Regex.cs: Make the new regex interpreter+compiler the default.
-
-2008-08-31  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs: Port the Anchor+StartOfString optimization from the old
-       interpreter. Add credits.
-
-       * RxCompiler.cs (EmitString): Lowercase the string if ignore is true.
-
-       * CILCompiler.cs: Fix the setting of the match position in the
-       anchor+char optimization.
-       
-       * CILCompiler.cs: Implement FastRepeatLazy.
-
-       * CILCompiler.cs: Get rid of commented out code. Also get rid of
-       frame.local_strpos_res, since the generated code already set Arg1 to
-       the same value.
-
-2008-08-30  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Initialize all mi_ variables lazily.
-       
-       * CILCompiler.cs: Implement FastRepeat.
-
-       * RxInterpreter.cs: Add back SetStartOfMatch, make it protected so as to
-       avoid a warning.
-
-       * CILCompiler.cs RxOp.cs: Merge lots of changes from RxInterpreter.cs,
-       refactor the code.
-
-2008-08-29  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs RxCompiler.cs RxOp.cs: Implement/fix this so all the
-       regex tests now run. The Repeat code is taken from the old interpreter.
-
-2008-08-28  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxInterpreter.cs RxCompiler.cs RxOp.cs: Add support for 
-       Category.AnySingleline.
-
-2008-08-27  Zoltan Varga  <vargaz@gmail.com>
-
-       * RxCompiler.cs: Use Array.Copy since Buffer.BlockCopy operates on bytes.
-       
-2008-07-31  Jb Evain  <jbevain@novell.com>
-
-       * BaseMachine.cs: clean up for NET_2_1.
-
-2008-06-05  Roei Erez  <roeie@mainsoft.com>
-
-       * JvmReMachine.jvm.cs: Fix a bug in match that contains
-       empty group at the end.
-
-2008-04-13  Jb Evain  <jbevain@novell.com>
-
-       * Regex.cs: update undocumented fields for the 2.1 profile.
-       Merged from the Moonlight 2 branch.
-
-2008-02-26  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Implement StringIgnoreCase.
-       
-       * CILCompiler.cs: Implement grouping support.
-
-       * CILCompiler.cs: Implement character groups.
-
-2008-02-25  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Implement lots of missing opcodes.
-
-2008-02-18  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs (EmitEvalMethodBody): Check for the not-yet supported
-       groups.Count > 1.
-
-Thu Feb 14 19:03:00 CET 2008 Paolo Molaro <lupus@ximian.com>
-
-       * RxCompiler.cs, RxInterpreter.cs, RxOp.cs, CILCompiler.cs : support for word
-       boundary position opcodes, ignorecase backreference and more capture
-       work.
-
-Thu Feb 14 17:11:10 CET 2008 Paolo Molaro <lupus@ximian.com>
-
-       * RxCompiler.cs, RxInterpreter.cs, RxOp.cs: replace EcmaDigit with
-       Range, fixed matching of "" =~ /$/, implementedt TestCharGroup.
-       Fixes and other misc opcodes implemented.
-
-2008-02-13  Zoltan Varga  <vargaz@gmail.com>
-
-       * CILCompiler.cs: Restructure some code to avoid a branch inside a loop.
-       
-       * CILCompiler.cs: Fix the unsafe string matching code.
-
-       * CILCompiler.cs: Improved version which emits only one method in most cases.
-
-       * CILCompiler.cs: Fix some comments.
-
-       * CILCompiler.cs: New file, extracted from RxCompiler.cs.
-
-       * RxInterpreter.cs RxCompiler.cs: First version of regex IL compiler.
-
-Wed Feb 13 13:18:12 CET 2008 Paolo Molaro <lupus@ximian.com>
-
-       * RxCompiler.cs, RxInterpreter.cs, RxOp.cs: unicode categories and
-       some grouping/capture support.
-
-Tue Feb 12 19:16:49 CET 2008 Paolo Molaro <lupus@ximian.com>
-
-       * RxCompiler.cs, RxInterpreter.cs, RxOp.cs: experimental new
-       interpreter.
-
-2008-02-10  Zoltan Varga  <vargaz@gmail.com>
-
-       * replace.cs (NeedsGroupsOrCaptures): New property. Determines whenever the
-       replacement process needs access to the groups or captures properties of the
-       Match object.
-
-       * Group.cs: Add an internal ctor which avoids allocations.
-
-       * Match.cs: Ditto.
-
-       * BaseMachine.cs interpreter.cs: Add an optimization to avoid fully creating
-       Match objects during Replace () if the replacement string is simple.
-
-       * BaseMachine.cs Regex.cs: Make LTRReplace and RTLReplace instance methods to 
-       avoid creating two machines for each Regex.Replace () call.
-
-       * interpreter.cs (Eval): Remove a needless string allocation.
-
-2007-12-04  Arina Itkes <arinai@mainsoft.com>
-
-       * parser.cs: Max value of m for a construct {n,m} is 2147483647.
-
-2007-11-15  Miguel de Icaza  <miguel@novell.com>
-
-       * Revert the patch from Juraj Skripsky as it made the class
-       non-thread safe (see #341986).
-
-2007-11-08  Raja R Harinath  <harinath@gmail.com>
-
-       Fix 324390
-       * BaseMachine.cs (LTRReplace): Don't use non-advancement of 'ptr'
-       to deduce absence of matches -- a match can have length 0.
-       (RTLReplace): Likewise.
-
-2007-11-07  Raja R Harinath  <harinath@gmail.com>
-
-       Support RegexOptions.RightToLeft in Replace().
-       * BaseMachine.cs (Replace): Use either LTRReplace or RTLReplace
-       based on regex.
-       (LTRReplace): Make internal and rename the MatchAppendEvaluator
-       version of Replace to this.
-       (RTLReplace): New.
-       * Regex.cs (Replace): Use LTRReplace and RTLReplace from BaseMachine.
-       * replace.cs (ReplacementEvaluator.Evaluate): Optimize simple case.
-       Based on patch by Stephane Delcroix.
-
-       * replace.cs (Compile): Don't unescape string.
-
-2007-11-01  Gert Driesen  <drieseng@users.sourceforge.net>
-
-       * Match.cs: Do not throw NotSupportedException on zero-length
-       replacement argument.
-
-2007-10-29 Arina Itkes <arinai@mainsoft.com>
-
-       * Regex.cs: Moving creation of Regex machine to ctor.
-       It increases an initialization time of Regex but reduce a 
-       process time while APIs calling. Also it solves the problem 
-       of missed multi thread synchronization.
-
-2007-10-29 Arina Itkes <arinai@mainsoft.com>
-       
-       * Match.cs: Fix for Result method of Match. Throwing an exception 
-       if Result method was called on a failed Match. 
-
-2007-10-24  Juraj Skripsky <js@hotfeet.ch>
-
-       * Regex.cs: Store and re-use IMachine, no need to re-instantiate
-       it every time we're matching.
-       
-2007-10-24 Arina Itkes <arinai@mainsoft.com>
-
-       * Regex.cs Match.cs arch.cs compiler.cs interpreter.cs
-        Refactoring of Interpreter with extracting of base abstract class 
-        that executes some methods that were moved from Regex and Match classes.
-        Added a field that maps group numbers to group names in Regex for 
-        improvement of performance of GroupNameFromNumber method.
-
-2007-10-21  Gert Driesen  <drieseng@users.sourceforge.net>
-
-       * RegexTest.cs: Removed. Test was already moved to the appropriate
-       location. 
-
-2007-06-21  Juraj Skripsky <js@hotfeet.ch>
-
-       * quicksearch.ch: Optimization. Add byte array as skip table for
-       chars <= 255, falling back to the hashtable for chars > 255 and
-       skip distances > 255.
-
-2007-04-18  Raja R Harinath  <rharinath@novell.com>
-
-       Fix #80554
-       * parser.cs (ResolveReferences): Don't throw an expression if a
-       capture assertion reference cannot be resolved.
-       (ParseGroupingConstruct): Provide fallback expression to a capture
-       assertion.
-       * syntax.cs (CaptureAssertion): If the bareword doesn't refer to
-       the name of a capture group, fallback to treating it as a literal
-       expression.
-
-2007-04-04  Raja R Harinath  <rharinath@novell.com>
-
-       * interpreter.cs (Eval) <OpCode.Reference>: Distribute for loop
-       inside if.
-       for () if (a) s1; else s2; => if (a) for () s1; else for () s2;
-
-2007-04-03  Raja R Harinath  <rharinath@novell.com>
-
-       * Regex.cs (~Regex): Don't define in NET_2_0 profile.
-
-2007-01-02  Raja R Harinath  <rharinath@novell.com>
-
-       Fix #79472
-       * parser.cs (Parser.GetMapping): Use the actual group numbers to
-       build the mapping.
-
-2006-09-28  Andrew Skiba  <andrews@mainsoft.com>
-
-       * Regex.cs: TARGET_JVM
-
-2006-05-30  Gert Driesen  <drieseng@users.sourceforge.net>
-
-       * CaptureCollection.cs: Removed virtual keyword to fix API mismatches.
-       * MatchCollection.cs: Removed virtual keyword to fix API mismatches.
-       * GroupCollection.cs: Removed virtual keyword to fix API mismatches.
-
-2006-05-08  Raja R Harinath  <rharinath@novell.com>
-
-       Fix #78278
-       Remove 65535-limit on number of repetitions matched by a pattern.
-       We still have a 65535 limit on the length of a pattern and the
-       number of groups in a pattern.
-       * compiler.cs (PatternCompiler.EmitCount): New.  Emits an int as
-       two ushorts into the program stream.
-       (EmitInfo, EmitRepeat, EmitFastRepeat): Use it to emit integers
-       rather than shorts.
-       * interpreter.cs (Intepreter.ReadProgramCount): Read an int
-       emitted into the program stream.
-       (Interpreter): Use it.  Update counts.
-       (Interpreter.Eval) [OpCode.Repeat, OpCode.FastRepeat]: Likewise.
-       * parser.cs (ParseGroup): Pass 0x7ffffff as the max value for '*'
-       and '+' repetition patterns.
-       * arch.cs (Info, Repeat, FastRepeat): Update description.
-
-2006-04-18  Raja R Harinath  <rharinath@novell.com>
-
-       Treat fixed repetitions of simple regexes as simple too.
-       * syntax.cs (Expression.IsComplex): Make abstract.
-       (Group.IsComplex, Alternation.IsComplex): Move ...
-       (CompositeExpression.IsComplex): ... here.
-       (Group.GetAnchorInfo): Reduce allocations.  Avoid creating another
-       ArrayList, and use a StringBuilder to build up the string.
-       (Repetition.GetAnchorInfo): Use a StringBuilder to build up the string.
-       (ExpressionAssertion.IsComplex): Override.
-
-2006-04-17  Florian Gross  <flgr@ccan.de>
-           Raja R Harinath  <rharinath@novell.com>
-
-       * syntax.cs (CharacterClass.Compile): Emit categories after the
-       character intervals so that the evaluator can pick up the
-       'IgnoreCase' flag.
-
-2006-04-07  Raja R Harinath  <rharinath@novell.com>
-
-       Fix #78007
-       * interpreter.cs (Interpreter.Eval) [Anchor, Position.StartOfString]:
-       Don't reset 'ptr' to 0 during forward scan.
-
-       Fix #76345
-       * interpreter.cs (Interpreter.FastEval) [FastRepeat]: If the first
-       tail operation has a 'negate' flag, avoid the "match next char"
-       optimization.
-
-       Fix #69269
-       * arch.cs (OpCode.NotCategory): New.  Stands for matching a
-       character _not_ from the given category.
-       * debug.cs (DisassembleBlock): Handle it.
-       * compiler.cs (ICompiler.EmitNotCategory): New.
-       (Compiler.EmitNotCategory): New.  Emit OpCode.NotCategory.
-       * syntax.cs (CharacterClass.Compile): Don't conflate negation of
-       the character class and negation of the category.  Use
-       EmitNotCategory.
-       * interpreter.cs (Interpreter.Eval): Pass OpCode.NotCategory to
-       EvalChar.
-       (Interpreter.EvalChar): Handle it.
-
-2006-04-06  Raja R Harinath  <rharinath@novell.com>
-
-       Fix #77487
-       * interpreter.cs (Eval) [Until, FastUntil]: Set 'deep' to null
-       when evaluating the tail.  Ensure that backtracks don't confuse
-       the recursion vs. iteration detector.
-
-2006-04-03  Raja R Harinath  <rharinath@novell.com>
-
-       * interpreter.cs (Eval) [Until, lazy]: Avoid extra evaluation on a
-       degenerate match.
-
-2006-03-30  Raja R Harinath  <harinath@gmail.com>
-
-       Fix #77626
-       * parser.cs (Parser.ParseCharacterClass): Don't automatically
-       assume there's a range when we see '-'.  Ensure that we have seen
-       at least one other character, and that we aren't already parsing a
-       range.  Handle some more errors.
-
-2005-12-19  Kornél Pál  <kornelpal@hotmail.com>
-
-       * Regex.cs: Added support for regular expressions compiled to
-         assemblies by compiling the pattern. This solution ignores existing
-         CIL code but provides full support for regular expression classes
-         compiled by MS.NET.
-
-2005-11-21  Sebastien Pouliot  <sebastien@ximian.com> 
-
-       * CaptureCollection.cs: Fixed length check.
-       * Group.cs: Added missing validation for Synchronized method.
-       * Match.cs: Added missing validation for Synchronized and Result 
-       methods.
-       * MatchEvaluator.cs: Added [Serializable] for 2.0 profile.
-       * RegexCompilationInfo.cs: Added missing property validation.
-       * Regex.cs: Implemented UseOptionC and UseOptionR protected methods
-       (now documented). Fixed API for 2.0 profile.
-       * RegexRunner.cs: Stubbed CharInClass for 2.0 profile.
-
-2005-11-17  Sebastien Pouliot  <sebastien@ximian.com> 
-       * Match.cs: Removed the ": base ()" on the private ctor as it is
-       unrequired and cause an extra public ctor to added (bug #76736).
-       * MatchCollection.cs: Add missing virtual to indexer property.
-
-2005-09-23  Raja R Harinath  <rharinath@novell.com>
-
-       * interpreter.cs (Interpreter.Eval) [OpCode.Until]: Invert the
-       sense of a test to reflect the code re-organization.
-
-2005-09-22  Raja R Harinath  <rharinath@novell.com>
-
-       Fix #72152, #72989.
-       * interpreter.cs (Interpreter.Eval) [OpCode.Until]: Avoid some
-       cases of recursion when dealing with eager quantifiers too.  We
-       now avoid recursion when handling the innermost quantifier.
-       (Interpreter.IntStack, Interpreter.stack): New.  Stack to help
-       implement backtracking in eager quantifiers.
-
-2005-09-21  Raja R Harinath  <rharinath@novell.com>
-
-       * interpreter.cs (Interpreter.Eval) [OpCode.Until]: Avoid some
-       cases of recursion when dealing with the minimum count and lazy
-       quantifiers.
-
-2005-08-23  Raja R Harinath  <rharinath@novell.com>
-
-       * regex.cs: Remove.  Split into ...
-       * MatchEvaluator.cs, Regex.cs, RegexCompilationInfo.cs, 
-       RegexOptions.cs: ... these.  Now every publicly exposed type in
-       this namespace has its own file.
-
-2005-07-21  Florian Gross  <flgr@ccan.de>
-
-       * Fixed a bug in category.cs that caused ECMAScript \d to fail.
-
-2005-07-13  Raja R Harinath  <rharinath@novell.com>
-
-       Make even more lazier.
-       * MatchCollection.cs (TryToGet): Don't generate match i+1 when
-       we're looking for match i.  Change post-conditions.
-       (FullList): New helper property.  Ensures the list is fully populated.
-       (Count, CopyTo): Use it.
-       (Enumerator.Current): Update to new post-conditions of TryToGet.
-       (Enumerator.MoveNext): Likewise.  Don't modify index if we're
-       beyond the end.
-
-2005-07-08  Raja R Harinath  <rharinath@novell.com>
-
-       * MatchCollection.cs: Convert to incremental mode.
-       * regex.cs (Regex.Matches): Update.  Pass responsibility of
-       generating all matches to MatchCollection.
-
-2005-06-14  Raja R Harinath  <harinath@gmail.com>
-
-       * parser.cs (Parser.ConsumeWhitespace): Add bounds check.
-
-       Fix #74753.
-       * Match.cs (Match) [zero-argument variant]: Make private.
-       * GroupCollection (Item) [string variant]: Don't look for the
-       group number in an empty match.
-
-2005-06-10  Raja R Harinath  <rharinath@novell.com>
-
-       * interpreter.cs (Interpreter.GenerateMatch): Avoid allocating two
-       intermediate arrays to build the final result.
-       (Interpreter.GetGroupInfo, Interpreter.PopulateGroup): New helper
-       functions.
-       * CaptureCollection.cs (list): Change from ArrayList to list.
-       (SetValue): New internal helper, used by Interpreter.PopulateGroup.
-       (Enumerator): Remove helper class.
-       (IEnumerator.GetEnumerator): Just use list.GetEnumerator.
-       * GroupCollection.cs: Likewise.
-       * Group.cs (Group): Move responsibility of populating 'Captures'
-       to Interpreter.PopulateGroup.
-       * Match.cs (Match): Move responsibility of populating 'Groups' to
-       Interpreter.GenerateMatch.
-
-2005-05-25  Raja R Harinath  <rharinath@novell.com>
-
-       * replace.cs (ReplacementEvaluator.Compile): Rewrite to avoid
-       creating several intermediate strings.  Simplify internal
-       intermediate representation.
-       (ReplacementEvaluator.EvaluateAppend): New.  Version of Evaluate
-       that builds the result directly on a passed-in StringBuilder.
-       (ReplacementEvaluator.Evaluate): Just a wrapper around
-       EvaluateAppend.
-       * regex.cs (MatchAppendEvaluator): New internal delegate.
-       (Regex.Replace): Use MatchAppendEvaluator.
-       (Regex.Adapter): New class used to adapt a MatchEvaluator to a
-       MatchAppendEvaluator.
-
-2005-05-24  Raja R Harinath  <rharinath@novell.com>
-
-       * replace.cs (ReplacementEvaluator.CompileTerm): Fix group
-       returned by $+.
-
-2005-05-20  Ben Maurer  <bmaurer@ximian.com>
-
-       * regex.cs: Some memory allocation optimizations.
-
-2005-05-20  Raja R Harinath  <rharinath@novell.com>
-
-       Fix #74735.
-       * replace.cs (ReplacementEvaluator.Compile): Allow CompileTerm to
-       fail and yet have advanced the pointer.  Append the scanned-over
-       portion to the "literal" being built.
-       (ReplacementEvaluator.CompileTerm): Don't throw any exceptions.
-       If a term cannot be recognized, just return null.
-
-       * compiler.cs (InterpreterFactory.GroupCount): Fix.  The 0'th
-       index corresponds to Opcode.Info.
-
-       * parser.cs (Parser.Unescape): If the string doesn't contain any
-       '\' character, don't allocate a new string.
-
-       * replace.cs (ReplacementEvalutator.Term.AppendResult): Rename
-       from GetResult.  Append to a passed-in StringBuilder rather than
-       return a string.
-       (ReplacementEvaluator.Evaluate): Update.
-       
-       * Capture.cs, Group.cs, Match.cs: New files split out of ...
-       * match.cs: ... this.  Remove.
-
-2005-02-27 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * parser.cs: stuff inside {} might not be a quantifier. Fixes
-       bug #69193.
-
-2005-01-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * quicksearch.cs: handle IgnoreCase when getting the shift distance.
-       Fixes bug #69065. Patch by mei@work.email.ne.jp.
-
-2005-01-08  Miguel de Icaza  <miguel@ximian.com>
-
-       * syntax.cs: Applied patch from mei@work.email.ne.jp to fix bug
-       #71077.
-
-       * parser.cs: Turns out that \digit sequences are octal sequences
-       (no leading zero is needed);  And the three octal digit rule
-       applies to the leading zero as well.
-
-       This fixes the Unescape method.
-
-2004-11-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * regex.cs: use NextMatch to move on to the next match. Fixes bug
-       #57274.
-
-2004-11-09  Atsushi Enomoto  <atsushi@ximian.com>
-
-       * parser.cs : cast.
-
-2004-11-08  Ben Maurer  <bmaurer@ximian.com>
-
-       * replace.cs, parser.cs: Use stringbuilder for allocation sanity.
-
-2004-10-21  Joerg Rosenkranz  <joergr@voelcker.com>
-
-       * regex.cs: Fixed a bug introduced with the last patch which
-       prevented any replacements when a postive count is given.
-       This also happens in all overloads without count parameter.
-
-2004-10-18 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * regex.cs: in Replace, when count is negative, replacement continues
-       to the end of the string.
-
-       Fixes bug #68398. Patch by Jon Larimer.
-
-2004-06-10  Gert Driesen <drieseng@users.sourceforge.net>
-
-       * RegexRunner.cs: fixed case mismatch of methods
-
-2004-06-10  Gert Driesen <drieseng@users.sourceforge.net>
-
-       * RegexRunner.cs: marked TODO, added missing protected internal
-       fields, throw NotImplementedException in all methods
-
-2004-06-10  Gert Driesen <drieseng@users.sourceforge.net>
-
-       * RegexRunnerFactory.cs: removed comment, no longer throw exception
-       from ctor
-       * regex.cs: fixed public API signature by renaming protected 
-       internal fields and adding destructor, added MonoTODO attribute to
-       fields and method that are not yet implemented, changed not 
-       implemented methods to throw NotImplementedException instead of
-       Exception, fixed names of field that are serialized
-
-2004-06-06  Jambunathan K <kjambunathan@novell.com>
-       
-       * parser.cs: Fixed issues with Regex.Unescape() identified as part of
-       debugging bug #58256. The original problem reported was about
-       inconsistency between the way we treat replacement patterns and the 
-       way microsoft treats the replacement patterns in Regex.Replace(). MS
-       implementation is buggy and doesn't honour escape sequences in the
-       replacement patterns, even though the SDK claims otherwise.
-
-       
-2004-06-01  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * syntax.cs: re-applied my patch from 2004-05-27 plus a fix which is
-       emitting a Category.All if both a category and its negated value are
-       present.
-
-2004-06-01  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * syntax.cs: reverting my previous patch. It causes bigger problems.
-
-2004-05-27  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * category.cs: added LastValue field to mark the end of enum Category.
-       * syntax.cs: in CharacterClass, use Category.LastValue to get the size
-       of the array needed. Use a BitArray instead of bool[].
-       In AddCategory(), don't set the opposite category as false. Fixes
-       bug #59150. All tests pass.
-
-2004-05-25  Jackson Harper  <jackson@ximian.com>
-
-       * parser.cs: Allow creating a regular expression using {,n} as the
-       specified. The min bounds is set to -1, I am not completely sure
-       if that is what it is supposed to be but MS does not set it to 0
-       based on testing. Patch by dave-gnome-bugs@earth.li. Fixes bug #56761.
-
-2004-05-12  Dick Porter  <dick@ximian.com>
-
-       * regex.cs: 
-       * quicksearch.cs: 
-       * RegexRunnerFactory.cs: 
-       * RegexRunner.cs: More public API difference fixes.
-
-       * GroupCollection.cs: 
-       * MatchCollection.cs: 
-       * CaptureCollection.cs: Moved GroupCollection, MatchCollection and
-       CaptureCollection so that they no longer inherit from the
-       non-standard RegexCollectionBase class.  Fixes the API difference.
-
-2004-04-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * arch.cs:
-       * compiler.cs:
-       * interpreter.cs:
-       * parser.cs:
-       * syntax.cs:
-       Patch by Eric Durand Tremblay.
-       1) Capture inner group when named.
-       2) Resolved parse error caused by not capturing inner group
-       3) Resolved incorrect capture group
-       4) Now, not capturing anything when unnamed ( correct behavior)
-
-
-2004-04-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * arch.cs:
-       * compiler.cs:
-       * interpreter.cs:
-       * parser.cs:
-       * syntax.cs: converted to unix line endings.
-
-2004-03-30  Lluis Sanchez Gual <lluis@ximian.com>
-
-       * collections.cs: In the indexer, return an empty group if the requested
-       group is not found.
-       * match.cs: Added default constructor for Group.
-       
-2004-03-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * parser.cs: fixed group numbering.
-
-2004-03-22  Jackson Harper  <jackson@ximian.com>
-
-       * parser.cs: Use the group number as the name in mapping. Patch by
-       Gert Driesen.
-       * regex.cs: Fix off by one error. Patch by Gert Driesen.
-
-2004-03-17  Francois Beauchemin <beauche@softhome.net>
-       * syntax.cs, interpreter.cs, quicksearch.cs, regex.cs, compiler.cs : 
-               Revised support for RigthToLeft. 
-               quicksearch has now an reverse option.          
-               This fixes bug #54537 
-       * regex.cs, compiler.cs :
-               Some code to support CILCompiler.               
-       * regex.cs : 
-               Added some undocumented of MS.
-2004-03-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * parser.cs: allow a @"\0" escape sequence. Fixes bug #54797.
-
-2004-02-01  Miguel de Icaza  <miguel@ximian.com>
-
-       * syntax.cs, interval.cs: Applied patch from Marco Cravairo
-       through Francois Beauchemin who reviewed on the mailing list.
-       This fixes bug #45976
-
-2004-01-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * parser.cs: an opening brace without a
-       quantifier do not cause a parse error. Fixes bug #52924.
-
-2004-01-07  Lluis Sanchez Gual <lluis@ximian.com>
-
-       * regex.cs: In Split(), if the last match is at the end of the string, 
-       an empty string must be added to the array of results.
-
-2003-12-15  Sanjay Gupta <gsanjay@novell.com>
-       * match.cs: Check for null value before Substring method call.  
-       Fixes bug #52034.
-
-2003-11-21  Juraj Skripsky <js@hotfeet.ch>
-
-       * quicksearch.cs: Create and use hashtable only for "long" search 
-       strings. 
-
-       (Search): Use simple scan for a single-character search strings.
-       
-       (GetChar): Simplify case sensitivity handling.
-
-2003-11-27  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * interpreter.cs: when evaluating a degenerate match, restore the
-       RepeatContext if fail. Fixes bug #42529.
-
-2003-11-22  Jackson Harper <jackson@ximian.com>
-
-       * regex.cs: Add CultureInvariant flag to RegexOptions.
-       
-2003-11-20  Juraj Skripsky <js@hotfeet.ch>
-
-       * quicksearch.cs: Use a hashtable instead of an array for the
-       shift table to improve the memory usage.  
-
-2003-11-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * regex.cs:
-       (Split): include capture groups in the results, if any. Fixes bug
-       #51146.
-
-2003-07-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * regex.cs: patch from Eric Lindvall <eric@5stops.com> that fixes bug
-       #44830.
-
-2003-03-05  Miguel de Icaza  <miguel@ximian.com>
-
-       * category.cs (CategoryUtils.CategoryFromName): Use StartsWith
-       ("Is") instead of a substring for (0,2) which was throwing an
-       exception causing Category.None to be returned
-
-2003-01-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * collections.cs: fixed bug #30091.
-
-2002-12-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * regex.cs: fixed little mistake (closes #35860).
-
-2002-11-12 Jackson Harper <jackson@latitudegeo.com>
-
-       * arch.cs compiler.cs regex.cs: Added mapping attribute to MachineFactories
-
-2002-11-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * parser.cs: detect illegal \ at end of pattern. Fixes 31334.
-
-2002-10-25  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * parser.cs: applied fix from Tim Haynes (thaynes@openlinksw.com) to
-       solve bug #32807. Also modified GetMapping to return the same as MS.
-
-2002-08-28  Juli Mallett  <jmallett@FreeBSD.org>
-
-       * arch.cs, compiler.cs: Give the interpreter machine a property
-       for the retrieval of the group count.
-
-       * regex.cs: Use the new GroupCount property of the factory to
-       initialise the current group count, and restructure code to compile
-       the pattern only the first time it is needed (essentially backing
-       out the previous revision of regex.cs, to use the new code.)
-
-2002-08-14  Cesar Octavio Lopez Nataren <cesar@ciencias.unam.mx>
-
-       * regex.cs: Added the ctr for ISerializable implementation and
-       implemented the GetObjectData function.
-
-2002-07-30  Juli Mallett  <jmallett@FreeBSD.org>
-
-       * regex.cs: Fixed bug where the expression would not be
-       re-evaluated for grouping purposes when factory caches were
-       used, resulting in no groups being recognised after one call
-       with a given pattern and no change in options.
-
-2002-05-13  Dan Lewis  <dihlewis@yahoo.co.uk>
-
-       * regex.cs: Fixed bug in split.
-
-2002-05-08  Dan Lewis  <dihlewis@yahoo.co.uk>
-
-       * interpreter.cs: Moved to an array-based stack representation
-       for faster captures.
-
-       * match.cs, collections.cs: Decoupled capture representation from
-       interpreter internals.
-
-       * cache.cs: Changed Key type from struct to class for speed.
-
-2002-04-06  Dan Lewis  <dihlewis@yahoo.co.uk>
-
-       * cache.cs: Object methods should be overridden with "override".
-
-2002-04-04  Dan Lewis  <dihlewis@yahoo.co.uk>
-
-       * RegexRunner.cs, RegexRunnerFactory.cs: MS support classes. Stubs
-       added for completeness.
-
-       * regex.cs, match.cs, collections.cs: Serializable attribute.
-
-2002-04-04  Dan Lewis  <dihlewis@yahoo.co.uk>
-
-       * regex.cs: Added static Matches and IsMatch methods.
-
-2002-04-03  Dan Lewis  <dihlewis@yahoo.co.uk>
-
-       * ChangeLog: Added changelog.
-
-       * cache.cs: Fixed bug in MRUList.Evict.
diff --git a/mcs/class/System/System.Text.RegularExpressions/Group.cs b/mcs/class/System/System.Text.RegularExpressions/Group.cs
deleted file mode 100644 (file)
index ca7c74a..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       Group.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-// Copyright (C) 2005 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.
-//
-
-namespace System.Text.RegularExpressions {
-
-       [Serializable]
-       public partial class Group : Capture {
-
-               [MonoTODO ("not thread-safe")]
-               public static Group Synchronized (Group inner)
-               {
-                       if (inner == null)
-                               throw new ArgumentNullException ("inner");
-                       return inner;
-               }
-
-               internal static Group Fail = new Group ();
-               public CaptureCollection Captures {
-                       get { return captures; }
-               }
-               public bool Success {
-                       get { return success; }
-               }
-
-               // internal
-               internal Group (string text, int index, int length, int n_caps) : base (text, index, length)
-               {
-                       success = true;
-                       captures = new CaptureCollection (n_caps);
-                       captures.SetValue (this, n_caps - 1);
-               }
-
-               internal Group (string text, int index, int length) : base (text, index, length)
-               {
-                       success = true;
-               }
-               
-               internal Group () : base ("")
-               {
-                       success = false;
-                       captures = new CaptureCollection (0);
-               }
-
-               private bool success;
-               private CaptureCollection captures;
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/GroupCollection.cs b/mcs/class/System/System.Text.RegularExpressions/GroupCollection.cs
deleted file mode 100644 (file)
index 66f709f..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// System.Text.RegularExpressions.GroupCollection
-//
-// Authors:
-//     Dan Lewis (dlewis@gmx.co.uk)
-//     Dick Porter (dick@ximian.com)
-//
-// (C) 2002 Dan Lewis
-// (C) 2004 Novell, Inc.
-//
-
-//
-// 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;
-
-namespace System.Text.RegularExpressions 
-{
-       [Serializable]
-       public class GroupCollection: ICollection, IEnumerable
-       {
-               private Group [] list;
-               private int gap;
-
-               /* No public constructor */
-               internal GroupCollection (int n, int gap)
-               {
-                       list = new Group [n];
-                       this.gap = gap;
-               }
-
-               public int Count {
-                       get { return list.Length; }
-               }
-
-               public bool IsReadOnly {
-                       get { return true; }
-               }
-
-               public bool IsSynchronized {
-                       get { return false; }
-               }
-
-               public Group this [int groupnum] {
-                       get {
-                               if (groupnum >= gap) {
-                                       Match m = (Match) list [0];
-                                       groupnum = m == Match.Empty ? -1 : m.Regex.GetGroupIndex (groupnum);
-                               }
-                               return groupnum < 0 ? Group.Fail : list [groupnum];
-                       }
-               }
-
-               internal void SetValue (Group g, int i)
-               {
-                       list [i] = g;
-               }
-
-               public Group this [string groupName] {
-                       get {
-                               // The 0th group is the match.
-                               Match m = (Match) list [0];
-                               if (m != Match.Empty) {
-                                       int number = m.Regex.GroupNumberFromName (groupName);
-                                       if (number != -1)
-                                               return this [number];
-                               }
-
-                               return Group.Fail;
-                       }
-               }
-
-               public object SyncRoot {
-                       get { return list; }
-               }
-
-               public void CopyTo (Array array, int arrayIndex)
-               {
-                       list.CopyTo (array, arrayIndex);
-               }
-
-               public IEnumerator GetEnumerator ()
-               {
-                       return list.GetEnumerator ();
-               }
-       }
-}
-
-               
-               
diff --git a/mcs/class/System/System.Text.RegularExpressions/JvmReMachineFactory.cs b/mcs/class/System/System.Text.RegularExpressions/JvmReMachineFactory.cs
deleted file mode 100644 (file)
index 184aefb..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// JvmReMachineFactory.jvm.cs
-//
-// Author:
-//     Arina Itkes  <arinai@mainsoft.com>
-//
-// Copyright (C) 2007 Mainsoft, Inc.
-//
-
-//
-// 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.Text;
-
-namespace System.Text.RegularExpressions
-{
-       sealed class JvmReMachineFactory : IMachineFactory
-       {
-               readonly JvmReMachine _machine;
-
-               public JvmReMachineFactory (PatternData patternData) {
-                       _machine = new JvmReMachine (patternData);
-               }
-
-               public IMachine NewInstance () {
-                       return _machine;
-               }
-
-               public JvmReMachine GetMachine () {
-                       return _machine;
-               }
-
-               public IDictionary Mapping {
-                       get { return _machine.Mapping; }
-                       set { throw new NotImplementedException ("Mapping setter of JvmReMachineFactory should not be called."); }//We must implement the setter of interface but it is not in use
-               }
-
-               public string [] NamesMapping {
-                       get { return _machine.NamesMapping; }
-                       set { throw new NotImplementedException ("NamesMapping setter of JvmReMachineFactory should not be called."); }//We must implement the setter of interface but it is not in use
-               }
-
-               public int GroupCount {
-                       get { return _machine.GroupCount; }
-               }
-
-               public int Gap {
-                       // FIXME: fix definition once JvmMachine is updated
-                       get { return 1 + GroupCount; }
-                       set { throw new NotImplementedException ("Gap setter of JvmReMachineFactory should not be called."); }//We must implement the setter of interface but it is not in use
-               }
-       }
-}
\ No newline at end of file
diff --git a/mcs/class/System/System.Text.RegularExpressions/Match.cs b/mcs/class/System/System.Text.RegularExpressions/Match.cs
deleted file mode 100644 (file)
index e5a232a..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       Match.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-// Copyright (C) 2005 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.
-//
-
-namespace System.Text.RegularExpressions {
-
-       [Serializable]
-       public partial class Match : Group {
-               public static Match Empty {
-                       get { return empty; }
-               }
-
-               [MonoTODO ("not thread-safe")]
-               public static Match Synchronized (Match inner)
-               {
-                       if (inner == null)
-                               throw new ArgumentNullException ("inner");
-                       return inner;   // FIXME need to sync on machine access
-               }
-               
-               public virtual GroupCollection Groups {
-                       get { return groups; }
-               }
-
-               public Match NextMatch ()
-               {
-                       if (this == Empty)
-                               return Empty;
-
-                       int scan_ptr = regex.RightToLeft ? Index : Index + Length;
-
-                       // next match after an empty match: make sure scan ptr makes progress
-                       
-                       if (Length == 0)
-                               scan_ptr += regex.RightToLeft ? -1 : +1;
-
-                       return machine.Scan (regex, Text, scan_ptr, text_length);
-               }
-
-               public virtual string Result (string replacement)
-               {
-                       if (replacement == null)
-                               throw new ArgumentNullException ("replacement");
-                       if (machine == null)
-                               throw new NotSupportedException ("Result cannot be called on failed Match.");
-
-                       return machine.Result (replacement, this);
-               }
-
-               // internal
-
-               private Match ()
-               {
-                       this.regex = null;
-                       this.machine = null;
-                       this.text_length = 0;
-
-                       this.groups = new GroupCollection (1, 1);
-                       groups.SetValue (this, 0);
-               }
-
-               internal Match (Regex regex, IMachine machine, string text, int text_length, int n_groups, 
-                               int index, int length) :
-                       base (text, index, length) {
-                       this.regex = regex;
-                       this.machine = machine;
-                       this.text_length = text_length;
-               }
-               internal Match (Regex regex, IMachine machine, string text, int text_length, int n_groups, 
-                               int index, int length, int n_caps) :
-                       base (text, index, length, n_caps)
-               {
-                       this.regex = regex;
-                       this.machine = machine;
-                       this.text_length = text_length;
-
-                       this.groups = new GroupCollection (n_groups, regex.Gap);
-                       groups.SetValue (this, 0);
-               }
-               internal Regex Regex {
-                       get { return regex; }
-               }
-
-               // private
-
-               private Regex regex;
-               private IMachine machine;
-               private int text_length;
-               private GroupCollection groups;
-
-               private static Match empty = new Match ();
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/MatchCollection.cs b/mcs/class/System/System.Text.RegularExpressions/MatchCollection.cs
deleted file mode 100644 (file)
index 5cc0a73..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// System.Text.RegularExpressions.MatchCollection
-//
-// Authors:
-//     Dan Lewis (dlewis@gmx.co.uk)
-//     Dick Porter (dick@ximian.com)
-//
-// (C) 2002 Dan Lewis
-// (C) 2004 Novell, Inc.
-//
-
-//
-// 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;
-
-namespace System.Text.RegularExpressions
-{
-       [Serializable]
-       public class MatchCollection: ICollection, IEnumerable {
-               private Match current;
-
-               // Stores all the matches before 'current'.  If !current.Success, it has all the successful matches.
-               private ArrayList list;
-
-               /* No public constructor */
-               internal MatchCollection (Match start)
-               {
-                       current = start;
-                       list = new ArrayList ();
-               }
-
-               public int Count {
-                       get { return FullList.Count; }
-               }
-
-               public bool IsReadOnly {
-                       get { return true; }
-               }
-
-               public bool IsSynchronized {
-                       get { return false; }
-               }
-
-
-               public virtual Match this [int i] {
-                       get {
-                               if (i < 0 || !TryToGet (i))
-                                       throw new ArgumentOutOfRangeException ("i");
-                               return i < list.Count ? (Match) list [i] : current;
-                       }
-               }
-
-               public object SyncRoot {
-                       get { return list; }
-               }
-
-               public void CopyTo (Array array, int arrayIndex)
-               {
-                       FullList.CopyTo (array, arrayIndex);
-               }
-
-               public IEnumerator GetEnumerator ()
-               {
-                       // If !current.Success, the list is fully populated.  So, just use it.
-                       return current.Success ? new Enumerator (this) : list.GetEnumerator ();
-               }
-
-               // Returns true when: i < list.Count                     => this [i] == list [i]
-               //                    i == list.Count && current.Success => this [i] == current
-               private bool TryToGet (int i)
-               {
-                       while (i > list.Count && current.Success) {
-                               list.Add (current);
-                               current = current.NextMatch ();
-                       }
-                       // Here we have: !(i > list.Count && current.Success)
-                       // or in a slightly more useful form: i > list.Count => current.Success == false
-                       return i < list.Count || current.Success;
-               }
-
-               private ICollection FullList {
-                       get {
-                               if (TryToGet (Int32.MaxValue)) {
-                                       // list.Count == Int32.MaxValue && current.Success
-                                       // i.e., we have more than Int32.MaxValue matches.
-                                       // We can't represent that number with Int32.
-                                       throw new SystemException ("too many matches");
-                               }
-                               return list;
-                       }
-               }
-
-               class Enumerator : IEnumerator {
-                       int index;
-                       MatchCollection coll;
-
-                       internal Enumerator (MatchCollection coll)
-                       {
-                               this.coll = coll;
-                               index = -1;
-                       }
-
-                       void IEnumerator.Reset ()
-                       {
-                               index = -1;
-                       }
-
-                       object IEnumerator.Current {
-                               get {
-                                       if (index < 0)
-                                               throw new InvalidOperationException ("'Current' called before 'MoveNext()'");
-                                       if (index > coll.list.Count)
-                                               throw new SystemException ("MatchCollection in invalid state");
-                                       if (index == coll.list.Count && !coll.current.Success)
-                                               throw new InvalidOperationException ("'Current' called after 'MoveNext()' returned false");
-                                       return index < coll.list.Count ? coll.list [index] : coll.current;
-                               }
-                       }
-
-                       bool IEnumerator.MoveNext ()
-                       {
-                               if (index > coll.list.Count)
-                                       throw new SystemException ("MatchCollection in invalid state");
-                               if (index == coll.list.Count && !coll.current.Success)
-                                       return false;
-                               return coll.TryToGet (++index);
-                       }
-               }
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/MatchEvaluator.cs b/mcs/class/System/System.Text.RegularExpressions/MatchEvaluator.cs
deleted file mode 100644 (file)
index 1e88943..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       regex.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-// Copyright (C) 2005 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.
-//
-
-namespace System.Text.RegularExpressions {
-
-       [Serializable]
-       public delegate string MatchEvaluator (Match match);
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/Regex.cs b/mcs/class/System/System.Text.RegularExpressions/Regex.cs
deleted file mode 100644 (file)
index ac662ab..0000000
+++ /dev/null
@@ -1,686 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       regex.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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.Text;
-using System.Collections;
-using System.Reflection;
-#if !FULL_AOT_RUNTIME
-using System.Reflection.Emit;
-#endif
-using System.Runtime.Serialization;
-
-using RegularExpression = System.Text.RegularExpressions.Syntax.RegularExpression;
-using Parser = System.Text.RegularExpressions.Syntax.Parser;
-
-using System.Diagnostics;
-
-
-namespace System.Text.RegularExpressions {
-       
-       [Serializable]
-       public partial class Regex : ISerializable {
-
-#if !FULL_AOT_RUNTIME
-               [MonoTODO]
-               public static void CompileToAssembly (RegexCompilationInfo [] regexes, AssemblyName aname)
-               {
-                       Regex.CompileToAssembly(regexes, aname, new CustomAttributeBuilder [] {}, null);
-               }
-
-               [MonoTODO]
-               public static void CompileToAssembly (RegexCompilationInfo [] regexes, AssemblyName aname,
-                                                     CustomAttributeBuilder [] attribs)
-               {
-                       Regex.CompileToAssembly(regexes, aname, attribs, null);
-               }
-
-               [MonoTODO]
-               public static void CompileToAssembly (RegexCompilationInfo [] regexes, AssemblyName aname,
-                                                     CustomAttributeBuilder [] attribs, string resourceFile)
-               {
-                       throw new NotImplementedException ();
-                       // TODO : Make use of attribs and resourceFile parameters
-                       /*
-                       AssemblyBuilder asmBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly (aname, AssemblyBuilderAccess.RunAndSave);
-                       ModuleBuilder modBuilder = asmBuilder.DefineDynamicModule("InnerRegexModule",aname.Name);
-                       Parser psr = new Parser ();     
-                       
-                       System.Console.WriteLine("CompileToAssembly");
-                              
-                       for(int i=0; i < regexes.Length; i++)
-                               {
-                                       System.Console.WriteLine("Compiling expression :" + regexes[i].Pattern);
-                                       RegularExpression re = psr.ParseRegularExpression (regexes[i].Pattern, regexes[i].Options);
-                                       
-                                       // compile
-                                                                               
-                                       CILCompiler cmp = new CILCompiler (modBuilder, i);
-                                       bool reverse = (regexes[i].Options & RegexOptions.RightToLeft) !=0;
-                                       re.Compile (cmp, reverse);
-                                       cmp.Close();
-                                       
-                               }
-                      
-
-                       // Define a runtime class with specified name and attributes.
-                       TypeBuilder builder = modBuilder.DefineType("ITest");
-                       builder.CreateType();
-                       asmBuilder.Save(aname.Name);
-                       */
-               }
-#endif
-               
-               public static string Escape (string str)
-               {
-                       if (str == null)
-                               throw new ArgumentNullException ("str");
-                       return Parser.Escape (str);
-               }
-
-               public static string Unescape (string str)
-               {
-                       if (str == null)
-                               throw new ArgumentNullException ("str");
-                       return Parser.Unescape (str);
-               }
-
-               public static bool IsMatch (string input, string pattern)
-               {
-                       return IsMatch (input, pattern, RegexOptions.None);
-               }
-
-               public static bool IsMatch (string input, string pattern, RegexOptions options)
-               {
-                       Regex re = new Regex (pattern, options);
-                       return re.IsMatch (input);
-               }
-
-               public static Match Match (string input, string pattern)
-               {
-                       return Regex.Match (input, pattern, RegexOptions.None);
-               }
-
-               public static Match Match (string input, string pattern, RegexOptions options)
-               {
-                       Regex re = new Regex (pattern, options);
-                       return re.Match (input);
-               }
-
-               public static MatchCollection Matches (string input, string pattern)
-               {
-                       return Matches (input, pattern, RegexOptions.None);
-               }
-
-               public static MatchCollection Matches (string input, string pattern, RegexOptions options)
-               {
-                       Regex re = new Regex (pattern, options);
-                       return re.Matches (input);
-               }
-
-               public static string Replace (string input, string pattern, MatchEvaluator evaluator)
-               {
-                       return Regex.Replace (input, pattern, evaluator, RegexOptions.None);
-               }
-
-               public static string Replace (string input, string pattern, MatchEvaluator evaluator,
-                                             RegexOptions options)
-               {
-                       Regex re = new Regex (pattern, options);
-                       return re.Replace (input, evaluator);
-               }
-
-               public static string Replace (string input, string pattern, string replacement)
-               {
-                       return Regex.Replace (input, pattern, replacement, RegexOptions.None);
-               }
-
-               public static string Replace (string input, string pattern, string replacement,
-                                             RegexOptions options)
-               {
-                       Regex re = new Regex (pattern, options);
-                       return re.Replace (input, replacement);
-               }
-
-               public static string [] Split (string input, string pattern)
-               {
-                       return Regex.Split (input, pattern, RegexOptions.None);
-               }
-
-               public static string [] Split (string input, string pattern, RegexOptions options)
-               {
-                       Regex re = new Regex (pattern, options);
-                       return re.Split (input);
-               }
-
-               static FactoryCache cache = new FactoryCache (15);
-               public static int CacheSize {
-                       get { return cache.Capacity; }
-                       set {
-                               if (value < 0)
-                                       throw new ArgumentOutOfRangeException ("CacheSize");
-
-                               cache.Capacity = value; 
-                       }
-               }
-
-               // private
-
-
-               // constructors
-
-               // This constructor is used by compiled regular expressions that are
-               // classes derived from Regex class. No initialization required.
-               protected Regex ()
-               {
-               }
-
-               public Regex (string pattern) : this (pattern, RegexOptions.None)
-               {
-               }
-
-               public Regex (string pattern, RegexOptions options)
-               {
-                       if (pattern == null)
-                               throw new ArgumentNullException ("pattern");
-                       validate_options (options);
-                       this.pattern = pattern;
-                       this.roptions = options;
-                       Init ();
-               }
-               
-#if NET_4_5
-               [MonoTODO ("Timeouts are ignored.")]
-               public Regex (string pattern, RegexOptions options, TimeSpan matchTimeout)
-                       : this (pattern, options)
-               {
-                       MatchTimeout = matchTimeout;
-               }
-               
-               [MonoTODO ("Timeouts are ignored.")]
-               public TimeSpan MatchTimeout {
-                       get;
-                       private set;
-               }
-               
-               [MonoTODO ("Timeouts are ignored.")]
-               public static bool IsMatch (
-                       string input, string pattern, RegexOptions options, TimeSpan matchTimeout)
-               {
-                       return IsMatch (input, pattern, options);
-               }
-               
-               [MonoTODO ("Timeouts are ignored.")]
-               public static Match Match (
-                       string input, string pattern, RegexOptions options, TimeSpan matchTimeout)
-               {
-                       return Match (input, pattern, options);
-               }
-               
-               [MonoTODO ("Timeouts are ignored.")]
-               public static MatchCollection Matches (
-                       string input, string pattern, RegexOptions options, TimeSpan matchTimeout)
-               {
-                       return Matches (input, pattern, options, matchTimeout);
-               }
-               
-               [MonoTODO ("Timeouts are ignored.")]
-               public static string Replace (
-                       string input, string pattern, string replacement, RegexOptions options,
-                       TimeSpan matchTimeout)
-               {
-                       return Replace (input, pattern, replacement, options);
-               }
-               
-               [MonoTODO ("Timeouts are ignored.")]
-               public static string Replace (
-                       string input, string pattern, MatchEvaluator evaluator, RegexOptions options,
-                       TimeSpan matchTimeout)
-               {
-                       return Replace (input, pattern, evaluator, options);
-               }
-               
-               [MonoTODO ("Timeouts are ignored.")]
-               public static string[] Split (
-                       string input, string pattern, RegexOptions options, TimeSpan matchTimeout)
-               {
-                       return Split (input, pattern, options);
-               }
-
-               public static readonly TimeSpan InfiniteMatchTimeout = TimeSpan.FromMilliseconds (-1);
-#endif
-
-               static void validate_options (RegexOptions options)
-               {
-                       const RegexOptions allopts =
-                               RegexOptions.None |
-                               RegexOptions.IgnoreCase |
-                               RegexOptions.Multiline |
-                               RegexOptions.ExplicitCapture |
-#if MOBILE || !NET_2_1
-                               RegexOptions.Compiled |
-#endif
-                               RegexOptions.Singleline |
-                               RegexOptions.IgnorePatternWhitespace |
-                               RegexOptions.RightToLeft |
-                               RegexOptions.ECMAScript |
-                               RegexOptions.CultureInvariant;
-
-                       const RegexOptions ecmaopts =
-                               RegexOptions.IgnoreCase |
-                               RegexOptions.Multiline |
-#if MOBILE || !NET_2_1
-                               RegexOptions.Compiled |
-#endif
-                               RegexOptions.ECMAScript;
-
-                       if ((options & ~allopts) != 0)
-                               throw new ArgumentOutOfRangeException ("options");
-                       if ((options & RegexOptions.ECMAScript) != 0 && (options & ~ecmaopts) != 0)
-                               throw new ArgumentOutOfRangeException ("options");
-               }
-
-               private void Init ()
-               {
-                       this.machineFactory = cache.Lookup (this.pattern, this.roptions);
-
-                       if (this.machineFactory == null) {
-                               InitNewRegex();
-                       } else {
-                               this.group_count = this.machineFactory.GroupCount;
-                               this.gap = this.machineFactory.Gap;
-                               this.mapping = this.machineFactory.Mapping;
-                               this.group_names = this.machineFactory.NamesMapping;
-                       }
-               }
-
-               private void InitNewRegex () 
-               {
-                       this.machineFactory = CreateMachineFactory (this.pattern, this.roptions);
-                       cache.Add (this.pattern, this.roptions, this.machineFactory);
-                       this.group_count = machineFactory.GroupCount;
-                       this.gap = this.machineFactory.Gap;
-                       this.mapping = machineFactory.Mapping;
-                       this.group_names = this.machineFactory.NamesMapping;
-               }
-
-#if !NET_2_1
-               // The new rx engine seems to be working now, but
-               // potential problems are being tracked down here:
-               // https://bugzilla.novell.com/show_bug.cgi?id=470827
-               static readonly bool old_rx =
-                       Environment.GetEnvironmentVariable ("MONO_NEW_RX") == null;
-#endif
-
-               private static IMachineFactory CreateMachineFactory (string pattern, RegexOptions options) 
-               {
-                       Parser psr = new Parser ();
-                       RegularExpression re = psr.ParseRegularExpression (pattern, options);
-
-#if NET_2_1
-                       ICompiler cmp = new PatternCompiler ();
-#else
-                       ICompiler cmp;
-                       if (!old_rx) {
-                               if ((options & RegexOptions.Compiled) != 0)
-                                       cmp = new CILCompiler ();
-                               else
-                                       cmp = new RxCompiler ();
-                       } else {
-                               cmp = new PatternCompiler ();
-                       }
-#endif
-
-                       re.Compile (cmp, (options & RegexOptions.RightToLeft) != 0);
-
-                       IMachineFactory machineFactory = cmp.GetMachineFactory ();
-                       Hashtable mapping = new Hashtable ();
-                       machineFactory.Gap = psr.GetMapping (mapping);
-                       machineFactory.Mapping = mapping;
-                       machineFactory.NamesMapping = GetGroupNamesArray (machineFactory.GroupCount, machineFactory.Mapping);
-
-                       return machineFactory;
-               }
-
-               protected Regex (SerializationInfo info, StreamingContext context) :
-                       this (info.GetString ("pattern"), 
-                             (RegexOptions) info.GetValue ("options", typeof (RegexOptions)))
-               {
-               }
-
-               // public instance properties
-               
-               public RegexOptions Options {
-                       get { return roptions; }
-               }
-
-               public bool RightToLeft {
-                       get { return (roptions & RegexOptions.RightToLeft) != 0; }
-               }
-
-               // public instance methods
-               
-               public string [] GetGroupNames ()
-               {
-                       string [] names = new string [1 + group_count];
-                       Array.Copy (group_names, names, 1 + group_count);
-                       return names;
-               }
-
-               public int [] GetGroupNumbers ()
-               {
-                       int [] numbers = new int [1 + group_count];
-                       Array.Copy (GroupNumbers, numbers, 1 + group_count);
-                       return numbers;
-               }
-
-               public string GroupNameFromNumber (int i)
-               {
-                       i = GetGroupIndex (i);
-                       if (i < 0)
-                               return "";
-
-                       return group_names [i];
-               }
-
-               public int GroupNumberFromName (string name)
-               {
-                       if (!mapping.Contains (name))
-                               return -1;
-                       int i = (int) mapping [name];
-                       if (i >= gap)
-                               i = Int32.Parse (name);
-                       return i;
-               }
-
-               internal int GetGroupIndex (int number)
-               {
-                       if (number < gap)
-                               return number;
-                       if (gap > group_count)
-                               return -1;
-                       return Array.BinarySearch (GroupNumbers, gap, group_count - gap + 1, number);
-               }
-
-               int default_startat (string input)
-               {
-                       return (RightToLeft && input != null) ? input.Length : 0;
-               }
-
-               // match methods
-               
-               public bool IsMatch (string input)
-               {
-                       return IsMatch (input, default_startat (input));
-               }
-
-               public bool IsMatch (string input, int startat)
-               {
-                       return Match (input, startat).Success;
-               }
-
-               public Match Match (string input)
-               {
-                       return Match (input, default_startat (input));
-               }
-
-               public Match Match (string input, int startat)
-               {
-                       if (input == null)
-                               throw new ArgumentNullException ("input");
-                       if (startat < 0 || startat > input.Length)
-                               throw new ArgumentOutOfRangeException ("startat");
-                       return CreateMachine ().Scan (this, input, startat, input.Length, false);
-               }
-
-               public Match Match (string input, int beginning, int length)
-               {
-                       if (input == null)
-                               throw new ArgumentNullException ("input");
-                       if (beginning < 0 || beginning > input.Length)
-                               throw new ArgumentOutOfRangeException ("beginning");
-                       if (length < 0 || length > input.Length - beginning)
-                               throw new ArgumentOutOfRangeException ("length");
-                       return CreateMachine ().Scan (this, input, beginning, beginning + length, true);
-               }
-
-               public MatchCollection Matches (string input)
-               {
-                       return Matches (input, default_startat (input));
-               }
-
-               public MatchCollection Matches (string input, int startat)
-               {
-                       Match m = Match (input, startat);
-                       return new MatchCollection (m);
-               }
-
-               // replace methods
-
-               public string Replace (string input, MatchEvaluator evaluator)
-               {
-                       return Replace (input, evaluator, Int32.MaxValue, default_startat (input));
-               }
-
-               public string Replace (string input, MatchEvaluator evaluator, int count)
-               {
-                       return Replace (input, evaluator, count, default_startat (input));
-               }
-
-               class Adapter {
-                       MatchEvaluator ev;
-                       public Adapter (MatchEvaluator ev) { this.ev = ev; }
-                       public void Evaluate (Match m, StringBuilder sb) { sb.Append (ev (m)); }
-               }
-
-               public string Replace (string input, MatchEvaluator evaluator, int count, int startat)
-               {
-                       if (input == null)
-                               throw new ArgumentNullException ("input");
-                       if (evaluator == null)
-                               throw new ArgumentNullException ("evaluator");
-                       if (count < -1)
-                               throw new ArgumentOutOfRangeException ("count");
-                       if (startat < 0 || startat > input.Length)
-                               throw new ArgumentOutOfRangeException ("startat");
-
-                       BaseMachine m = (BaseMachine)CreateMachine ();
-
-                       if (RightToLeft)
-                               return m.RTLReplace (this, input, evaluator, count, startat);
-
-                       // NOTE: If this is a cause of a lot of allocations, we can convert it to
-                       //       use a ThreadStatic allocation mitigator
-                       Adapter a = new Adapter (evaluator);
-
-                       return m.LTRReplace (this, input, new BaseMachine.MatchAppendEvaluator (a.Evaluate),
-                                                                count, startat);
-               }
-
-               public string Replace (string input, string replacement)
-               {
-                       return Replace (input, replacement, Int32.MaxValue, default_startat (input));
-               }
-
-               public string Replace (string input, string replacement, int count)
-               {
-                       return Replace (input, replacement, count, default_startat (input));
-               }
-
-               public string Replace (string input, string replacement, int count, int startat)
-               {
-                       if (input == null)
-                               throw new ArgumentNullException ("input");
-                       if (replacement == null)
-                               throw new ArgumentNullException ("replacement");
-                       if (count < -1)
-                               throw new ArgumentOutOfRangeException ("count");
-                       if (startat < 0 || startat > input.Length)
-                               throw new ArgumentOutOfRangeException ("startat");
-
-                       return CreateMachine ().Replace (this, input, replacement, count, startat);
-               }
-
-               // split methods
-
-               public string [] Split (string input)
-               {
-                       return Split (input, Int32.MaxValue, default_startat (input));
-               }
-
-               public string [] Split (string input, int count)
-               {
-                       return Split (input, count, default_startat (input));
-               }
-
-               public string [] Split (string input, int count, int startat)
-               {
-                       if (input == null)
-                               throw new ArgumentNullException ("input");
-                       if (count < 0)
-                               throw new ArgumentOutOfRangeException ("count");
-                       if (startat < 0 || startat > input.Length)
-                               throw new ArgumentOutOfRangeException ("startat");
-
-                       return CreateMachine ().Split (this, input, count, startat);
-               }
-
-               // This method is called at the end of the constructor of compiled
-               // regular expression classes to do internal initialization.
-               protected void InitializeReferences ()
-               {
-                       if (refsInitialized)
-                               throw new NotSupportedException ("This operation is only allowed once per object.");
-
-                       refsInitialized = true;
-
-                       // Compile pattern that results in performance loss as existing
-                       // CIL code is ignored but provides support for regular
-                       // expressions compiled to assemblies.
-                       Init ();
-               }
-#if !NET_2_1
-               protected bool UseOptionC ()
-               {
-                       return ((roptions & RegexOptions.Compiled) != 0);
-               }
-#endif
-               protected bool UseOptionR ()
-               {
-                       return ((roptions & RegexOptions.RightToLeft) != 0);
-               }
-
-               // object methods
-               
-               public override string ToString ()
-               {
-                       return pattern;
-               }
-
-               // ISerializable interface
-               void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
-               {
-                       info.AddValue ("pattern", this.ToString (), typeof (string));
-                       info.AddValue ("options", this.Options, typeof (RegexOptions));
-               }
-
-               // internal
-
-               internal int GroupCount {
-                       get { return group_count; }
-               }
-
-               internal int Gap {
-                       get { return gap; }
-               }
-
-               // private
-
-               private IMachine CreateMachine ()
-               {
-                       return machineFactory.NewInstance ();
-               }
-
-               private static string [] GetGroupNamesArray (int groupCount, IDictionary mapping) 
-               {
-                       string [] group_names = new string [groupCount + 1];
-                       IDictionaryEnumerator de = mapping.GetEnumerator ();
-                       while (de.MoveNext ())
-                               group_names [(int) de.Value] = (string) de.Key;
-                       return group_names;
-               }
-
-               private int [] GroupNumbers {
-                       get {
-                               if (group_numbers == null) {
-                                       group_numbers = new int [1 + group_count];
-                                       for (int i = 0; i < gap; ++i)
-                                               group_numbers [i] = i;
-                                       for (int i = gap; i <= group_count; ++i)
-                                               group_numbers [i] = Int32.Parse (group_names [i]);
-                                       return group_numbers;
-                               }
-                               return group_numbers;
-                       }
-               }
-
-               private IMachineFactory machineFactory;
-               private IDictionary mapping;
-               private int group_count;
-               private int gap;
-               private bool refsInitialized;
-               private string [] group_names;
-               private int [] group_numbers;
-               
-               // protected members
-
-               protected internal string pattern;
-               protected internal RegexOptions roptions;
-               
-               // MS undocumented members
-#if NET_2_1
-               [MonoTODO]
-               internal System.Collections.Generic.Dictionary<string, int> capnames;
-               [MonoTODO]
-               internal System.Collections.Generic.Dictionary<int, int> caps;
-#else
-               [MonoTODO]
-               protected internal System.Collections.Hashtable capnames;
-               [MonoTODO]
-               protected internal System.Collections.Hashtable caps;
-
-               [MonoTODO]
-               protected internal RegexRunnerFactory factory;
-#endif
-               [MonoTODO]
-               protected internal int capsize;
-               [MonoTODO]
-               protected internal string [] capslist;
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/RegexCompilationInfo.cs b/mcs/class/System/System.Text.RegularExpressions/RegexCompilationInfo.cs
deleted file mode 100644 (file)
index 2addae0..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       regex.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-// Copyright (C) 2005 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.
-//
-
-namespace System.Text.RegularExpressions {
-
-       [Serializable]
-       public class RegexCompilationInfo {
-
-               public RegexCompilationInfo (string pattern, RegexOptions options, string name, string fullnamespace, bool ispublic)
-               {
-                       Pattern = pattern;
-                       Options = options;
-                       Name = name;
-                       Namespace = fullnamespace;
-                       IsPublic = ispublic;
-               }
-
-               public bool IsPublic {
-                       get { return isPublic; }
-                       set { isPublic = value; }
-               }
-
-               public string Name {
-                       get { return name; }
-                       set {
-                               if (value == null)
-                                       throw new ArgumentNullException ("Name");
-                               if (value.Length == 0)
-                                       throw new ArgumentException ("Name");
-                               name = value;
-                       }
-               }
-
-               public string Namespace {
-                       get { return nspace; }
-                       set {
-                               if (value == null)
-                                       throw new ArgumentNullException ("Namespace");
-                               nspace = value;
-                       }
-               }
-
-               public RegexOptions Options {
-                       get { return options; }
-                       set { options = value; }
-               }
-
-               public string Pattern {
-                       get { return pattern; }
-                       set {
-                               if (value == null)
-                                       throw new ArgumentNullException ("pattern");
-                               pattern = value;
-                       }
-               }
-
-               // private
-
-               private string pattern, name, nspace;
-               private RegexOptions options;
-               private bool isPublic;
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/RegexMatchTimeoutException.cs b/mcs/class/System/System.Text.RegularExpressions/RegexMatchTimeoutException.cs
deleted file mode 100644 (file)
index b6ffb1a..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-// Authors:
-//      Martin Baulig (martin.baulig@xamarin.com)
-//
-// Copyright 2012 Xamarin Inc. (http://www.xamarin.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.
-//
-#if NET_4_5
-using System;
-using System.Runtime.Serialization;
-
-namespace System.Text.RegularExpressions {
-       [MonoTODO]
-       [Serializable]
-       public class RegexMatchTimeoutException : TimeoutException, ISerializable {
-               
-               string input = string.Empty;
-               string pattern = string.Empty;
-               TimeSpan timeout = TimeSpan.FromTicks (-1);
-
-               public RegexMatchTimeoutException ()
-               {
-                       
-               }
-               
-               public RegexMatchTimeoutException (string message)
-                       : base (message)
-               {
-                       
-               }
-               
-               public RegexMatchTimeoutException (string message, Exception inner)
-                       : base (message, inner)
-               {
-               }
-               
-               public RegexMatchTimeoutException (string regexInput, string regexPattern,
-                                                  TimeSpan matchTimeout)
-               {
-                       input = regexInput;
-                       pattern = regexPattern;
-                       timeout = matchTimeout;
-               }
-               
-               protected RegexMatchTimeoutException (SerializationInfo info, StreamingContext context)
-                       : base (info, context)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               public string Input {
-                       get { return input; }
-               }
-               
-               public string Pattern {
-                       get { return pattern; }
-               }
-               
-               public TimeSpan MatchTimeout {
-                       get { return timeout; }
-               }
-       }
-}
-#endif
diff --git a/mcs/class/System/System.Text.RegularExpressions/RegexOptions.cs b/mcs/class/System/System.Text.RegularExpressions/RegexOptions.cs
deleted file mode 100644 (file)
index 1a2599d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       regex.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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.
-//
-
-namespace System.Text.RegularExpressions {
-
-       [Flags]
-       public enum RegexOptions {
-               None                            = 0x000,
-               IgnoreCase                      = 0x001,
-               Multiline                       = 0x002,
-               ExplicitCapture                 = 0x004,
-#if MOBILE || !NET_2_1
-               Compiled                        = 0x008,
-#endif
-               Singleline                      = 0x010,
-               IgnorePatternWhitespace         = 0x020,
-               RightToLeft                     = 0x040,
-               ECMAScript                      = 0x100,
-               CultureInvariant                = 0x200 
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/RegexRunner.cs b/mcs/class/System/System.Text.RegularExpressions/RegexRunner.cs
deleted file mode 100644 (file)
index 48b42b9..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       RegexRunner.cs
-//
-// author:     Dan Lewis (dihlewis@yahoo.co.uk)
-//             (c) 2002
-// Copyright (C) 2005 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.ComponentModel;
-
-namespace System.Text.RegularExpressions {
-
-       [EditorBrowsable (EditorBrowsableState.Never)]
-       [MonoTODO ("RegexRunner is not supported by Mono.")]
-       public abstract class RegexRunner {
-               // constructor
-
-               [MonoTODO]
-               protected internal RegexRunner ()
-               {
-               }
-
-               // protected abstract
-
-               protected abstract bool FindFirstChar ();
-
-               protected abstract void Go ();
-
-               protected abstract void InitTrackCount ();
-
-               // protected methods
-
-               [MonoTODO]
-               protected void Capture (int capnum, int start, int end) {
-                       throw new NotImplementedException ();
-               }
-               [MonoTODO]
-               protected static bool CharInClass (char ch, string charClass)
-               {
-                       throw new NotImplementedException ();
-               }
-               [MonoTODO]
-               protected static bool CharInSet (char ch, string set, string category) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected void Crawl (int i) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected int Crawlpos () {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected void DoubleCrawl () {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected void DoubleStack () {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected void DoubleTrack () {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected void EnsureStorage () {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected bool IsBoundary (int index, int startpos, int endpos) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected bool IsECMABoundary (int index, int startpos, int endpos) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected bool IsMatched (int cap) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected int MatchIndex (int cap) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected int MatchLength (int cap) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected int Popcrawl () {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected void TransferCapture (int capnum, int uncapnum, int start, int end) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected void Uncapture () {
-                       throw new NotImplementedException ();
-               }
-
-               // internal
-               
-               protected internal Match Scan (Regex regex, string text, int textbeg, int textend, int textstart, int prevlen, bool quick) {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected internal int[] runcrawl;
-               [MonoTODO]
-               protected internal int runcrawlpos;
-               [MonoTODO]
-               protected internal Match runmatch;
-               [MonoTODO]
-               protected internal Regex runregex;
-               [MonoTODO]
-               protected internal int[] runstack;
-               [MonoTODO]
-               protected internal int runstackpos;
-               [MonoTODO]
-               protected internal string runtext;
-               [MonoTODO]
-               protected internal int runtextbeg;
-               [MonoTODO]
-               protected internal int runtextend;
-               [MonoTODO]
-               protected internal int runtextpos;
-               [MonoTODO]
-               protected internal int runtextstart;
-               [MonoTODO]
-               protected internal int[] runtrack;
-               [MonoTODO]
-               protected internal int runtrackcount;
-               [MonoTODO]
-               protected internal int runtrackpos;
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/RegexRunnerFactory.cs b/mcs/class/System/System.Text.RegularExpressions/RegexRunnerFactory.cs
deleted file mode 100644 (file)
index d4df8aa..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//\r
-// assembly:   System\r
-// namespace:  System.Text.RegularExpressions\r
-// file:       RegexRunnerFactory.cs\r
-//\r
-// author:     Dan Lewis (dihlewis@yahoo.co.uk)\r
-//             (c) 2002\r
-\r
-//\r
-// Permission is hereby granted, free of charge, to any person obtaining\r
-// a copy of this software and associated documentation files (the\r
-// "Software"), to deal in the Software without restriction, including\r
-// without limitation the rights to use, copy, modify, merge, publish,\r
-// distribute, sublicense, and/or sell copies of the Software, and to\r
-// permit persons to whom the Software is furnished to do so, subject to\r
-// the following conditions:\r
-// \r
-// The above copyright notice and this permission notice shall be\r
-// included in all copies or substantial portions of the Software.\r
-// \r
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-//\r
-\r
-using System;\r
-using System.ComponentModel;\r
-\r
-namespace System.Text.RegularExpressions {\r
-       [EditorBrowsable (EditorBrowsableState.Never)]\r
-       public abstract class RegexRunnerFactory {\r
-               protected RegexRunnerFactory () {\r
-               }\r
-\r
-               protected internal abstract RegexRunner CreateInstance ();\r
-       }\r
-}\r
diff --git a/mcs/class/System/System.Text.RegularExpressions/RxCompiler.cs b/mcs/class/System/System.Text.RegularExpressions/RxCompiler.cs
deleted file mode 100644 (file)
index b149543..0000000
+++ /dev/null
@@ -1,768 +0,0 @@
-using System;
-using System.Collections;
-using System.Globalization;
-using System.Reflection;
-using System.Reflection.Emit;
-
-namespace System.Text.RegularExpressions {
-
-       /* This behaves like a growing list of tuples (base, offsetpos) */
-       class RxLinkRef: LinkRef {
-               public int[] offsets;
-               public int current = 0;
-
-               public RxLinkRef ()
-               {
-                       offsets = new int [8];
-               }
-
-               // the start of the branch instruction
-               // in the program stream
-               public void PushInstructionBase (int offset)
-               {
-                       if ((current & 1) != 0)
-                               throw new Exception ();
-                       if (current == offsets.Length) {
-                               int[] newarray = new int [offsets.Length * 2];
-                               Array.Copy (offsets, newarray, offsets.Length);
-                               offsets = newarray;
-                       }
-                       offsets [current++] = offset;
-               }
-
-               // the position in the program stream where the jump offset is stored
-               public void PushOffsetPosition (int offset)
-               {
-                       if ((current & 1) == 0)
-                               throw new Exception ();
-                       offsets [current++] = offset;
-               }
-
-       }
-
-       class RxCompiler : ICompiler {
-               protected byte[] program = new byte [32];
-               protected int curpos = 0;
-
-               public RxCompiler () {
-               }
-
-               void MakeRoom (int bytes)
-               {
-                       while (curpos + bytes > program.Length) {
-                               int newsize = program.Length * 2;
-                               byte[] newp = new byte [newsize];
-                               Buffer.BlockCopy (program, 0, newp, 0, program.Length);
-                               program = newp;
-                       }
-               }
-
-               void Emit (byte val)
-               {
-                       MakeRoom (1);
-                       program [curpos] = val;
-                       ++curpos;
-               }
-
-               void Emit (RxOp opcode)
-               {
-                       Emit ((byte)opcode);
-               }
-
-               void Emit (ushort val)
-               {
-                       MakeRoom (2);
-                       program [curpos] = (byte)val;
-                       program [curpos + 1] = (byte)(val >> 8);
-                       curpos += 2;
-               }
-
-               void Emit (int val)
-               {
-                       MakeRoom (4);
-                       program [curpos] = (byte)val;
-                       program [curpos + 1] = (byte)(val >> 8);
-                       program [curpos + 2] = (byte)(val >> 16);
-                       program [curpos + 3] = (byte)(val >> 24);
-                       curpos += 4;
-               }
-
-               void BeginLink (LinkRef lref) {
-                       RxLinkRef link = lref as RxLinkRef;
-                       link.PushInstructionBase (curpos);
-               }
-
-               void EmitLink (LinkRef lref)
-               {
-                       RxLinkRef link = lref as RxLinkRef;
-                       link.PushOffsetPosition (curpos);
-                       Emit ((ushort)0);
-               }
-
-               // ICompiler implementation
-               public void Reset ()
-               {
-                       curpos = 0;
-               }
-
-               public IMachineFactory GetMachineFactory ()
-               {
-                       byte[] code = new byte [curpos];
-                       Buffer.BlockCopy (program, 0, code, 0, curpos);
-                       //Console.WriteLine ("Program size: {0}", curpos);
-
-                       return new RxInterpreterFactory (code, null);
-               }
-
-               public void EmitFalse ()
-               {
-                       Emit (RxOp.False);
-               }
-
-               public void EmitTrue ()
-               {
-                       Emit (RxOp.True);
-               }
-
-               /* Overriden by CILCompiler */
-               public virtual void EmitOp (RxOp op, bool negate, bool ignore, bool reverse) {
-                       int offset = 0;
-                       if (negate)
-                               offset += 1;
-                       if (ignore)
-                               offset += 2;
-                       if (reverse)
-                               offset += 4;
-
-                       Emit ((RxOp)((int)op + offset));
-               }
-
-               public virtual void EmitOpIgnoreReverse (RxOp op, bool ignore, bool reverse) {
-                       int offset = 0;
-                       if (ignore)
-                               offset += 1;
-                       if (reverse)
-                               offset += 2;
-
-                       Emit ((RxOp)((int)op + offset));
-               }
-
-               public virtual void EmitOpNegateReverse (RxOp op, bool negate, bool reverse) {
-                       int offset = 0;
-                       if (negate)
-                               offset += 1;
-                       if (reverse)
-                               offset += 2;
-
-                       Emit ((RxOp)((int)op + offset));
-               }
-
-               public void EmitCharacter (char c, bool negate, bool ignore, bool reverse)
-               {
-                       if (ignore)
-                               c = Char.ToLower (c);
-                       if (c < 256) {
-                               EmitOp (RxOp.Char, negate, ignore, reverse);
-                               Emit ((byte)c);
-                       } else {
-                               EmitOp (RxOp.UnicodeChar, negate, ignore, reverse);
-                               Emit ((ushort)c);
-                       }
-               }
-
-               void EmitUniCat (UnicodeCategory cat, bool negate, bool reverse)
-               {
-                       EmitOpNegateReverse (RxOp.CategoryUnicode, negate, reverse);
-                       Emit ((byte)cat);
-               }
-
-               void EmitCatGeneral (Category cat, bool negate, bool reverse)
-               {
-                       EmitOpNegateReverse (RxOp.CategoryGeneral, negate, reverse);
-                       Emit ((byte)cat);
-               }
-
-               public void EmitCategory (Category cat, bool negate, bool reverse)
-               {
-                       switch (cat) {
-                       case Category.Any:
-                       case Category.EcmaAny:
-                               EmitOpNegateReverse (RxOp.CategoryAny, negate, reverse);
-                               break;
-                       case Category.AnySingleline:
-                               EmitOpNegateReverse (RxOp.CategoryAnySingleline, negate, reverse);
-                               break;
-                       case Category.Word:
-                               EmitOpNegateReverse (RxOp.CategoryWord, negate, reverse);
-                               break;
-                       case Category.Digit:
-                               EmitOpNegateReverse (RxOp.CategoryDigit, negate, reverse);
-                               break;
-                       case Category.WhiteSpace:
-                               EmitOpNegateReverse (RxOp.CategoryWhiteSpace, negate, reverse);
-                               break;
-                       /* FIXME: translate EcmaWord, EcmaWhiteSpace into Bitmaps? EcmaWhiteSpace will fit very well with the IL engine */
-                       case Category.EcmaWord:
-                               EmitOpNegateReverse (RxOp.CategoryEcmaWord, negate, reverse);
-                               break;
-                       case Category.EcmaDigit:
-                               EmitRange ('0', '9', negate, false, reverse);
-                               break;
-                       case Category.EcmaWhiteSpace:
-                               EmitOpNegateReverse (RxOp.CategoryEcmaWhiteSpace, negate, reverse);
-                               break;
-                       case Category.UnicodeSpecials:
-                               EmitOpNegateReverse (RxOp.CategoryUnicodeSpecials, negate, reverse);
-                               break;
-                       // Unicode categories...
-                       // letter
-                       case Category.UnicodeLu: EmitUniCat (UnicodeCategory.UppercaseLetter, negate, reverse); break;
-                       case Category.UnicodeLl: EmitUniCat (UnicodeCategory.LowercaseLetter, negate, reverse); break;
-                       case Category.UnicodeLt: EmitUniCat (UnicodeCategory.TitlecaseLetter, negate, reverse); break;
-                       case Category.UnicodeLm: EmitUniCat (UnicodeCategory.ModifierLetter, negate, reverse); break;
-                       case Category.UnicodeLo: EmitUniCat (UnicodeCategory.OtherLetter, negate, reverse); break;
-                       // mark
-                       case Category.UnicodeMn: EmitUniCat (UnicodeCategory.NonSpacingMark, negate, reverse); break;
-                       case Category.UnicodeMe: EmitUniCat (UnicodeCategory.EnclosingMark, negate, reverse); break;
-                       case Category.UnicodeMc: EmitUniCat (UnicodeCategory.SpacingCombiningMark, negate, reverse); break;
-                       case Category.UnicodeNd: EmitUniCat (UnicodeCategory.DecimalDigitNumber, negate, reverse); break;
-                       // number
-                       case Category.UnicodeNl: EmitUniCat (UnicodeCategory.LetterNumber, negate, reverse); break;
-                       case Category.UnicodeNo: EmitUniCat (UnicodeCategory.OtherNumber, negate, reverse); break;
-                       // separator
-                       case Category.UnicodeZs: EmitUniCat (UnicodeCategory.SpaceSeparator, negate, reverse); break;
-                       case Category.UnicodeZl: EmitUniCat (UnicodeCategory.LineSeparator, negate, reverse); break;
-                       case Category.UnicodeZp: EmitUniCat (UnicodeCategory.ParagraphSeparator, negate, reverse); break;
-                       // punctuation
-                       case Category.UnicodePd: EmitUniCat (UnicodeCategory.DashPunctuation, negate, reverse); break;
-                       case Category.UnicodePs: EmitUniCat (UnicodeCategory.OpenPunctuation, negate, reverse); break;
-                       case Category.UnicodePi: EmitUniCat (UnicodeCategory.InitialQuotePunctuation, negate, reverse); break;
-                       case Category.UnicodePe: EmitUniCat (UnicodeCategory.ClosePunctuation, negate, reverse); break;
-                       case Category.UnicodePf: EmitUniCat (UnicodeCategory.FinalQuotePunctuation, negate, reverse); break;
-                       case Category.UnicodePc: EmitUniCat (UnicodeCategory.ConnectorPunctuation, negate, reverse); break;
-                       case Category.UnicodePo: EmitUniCat (UnicodeCategory.OtherPunctuation, negate, reverse); break;
-                       // symbol
-                       case Category.UnicodeSm: EmitUniCat (UnicodeCategory.MathSymbol, negate, reverse); break;
-                       case Category.UnicodeSc: EmitUniCat (UnicodeCategory.CurrencySymbol, negate, reverse); break;
-                       case Category.UnicodeSk: EmitUniCat (UnicodeCategory.ModifierSymbol, negate, reverse); break;
-                       case Category.UnicodeSo: EmitUniCat (UnicodeCategory.OtherSymbol, negate, reverse); break;
-                       // other
-                       case Category.UnicodeCc: EmitUniCat (UnicodeCategory.Control, negate, reverse); break;
-                       case Category.UnicodeCf: EmitUniCat (UnicodeCategory.Format, negate, reverse); break;
-                       case Category.UnicodeCo: EmitUniCat (UnicodeCategory.PrivateUse, negate, reverse); break;
-                       case Category.UnicodeCs: EmitUniCat (UnicodeCategory.Surrogate, negate, reverse); break;
-                       case Category.UnicodeCn: EmitUniCat (UnicodeCategory.OtherNotAssigned, negate, reverse); break; 
-                       // Unicode block ranges...
-                       case Category.UnicodeBasicLatin:
-                               EmitRange ('\u0000', '\u007F', negate, false, reverse); break;
-                       case Category.UnicodeLatin1Supplement:
-                               EmitRange ('\u0080', '\u00FF', negate, false, reverse); break;
-                       case Category.UnicodeLatinExtendedA:
-                               EmitRange ('\u0100', '\u017F', negate, false, reverse); break;
-                       case Category.UnicodeLatinExtendedB:
-                               EmitRange ('\u0180', '\u024F', negate, false, reverse); break;
-                       case Category.UnicodeIPAExtensions:
-                               EmitRange ('\u0250', '\u02AF', negate, false, reverse); break;
-                       case Category.UnicodeSpacingModifierLetters:
-                               EmitRange ('\u02B0', '\u02FF', negate, false, reverse); break;
-                       case Category.UnicodeCombiningDiacriticalMarks:
-                               EmitRange ('\u0300', '\u036F', negate, false, reverse); break;
-                       case Category.UnicodeGreek:
-                               EmitRange ('\u0370', '\u03FF', negate, false, reverse); break;
-                       case Category.UnicodeCyrillic:
-                               EmitRange ('\u0400', '\u04FF', negate, false, reverse); break;
-                       case Category.UnicodeArmenian:
-                               EmitRange ('\u0530', '\u058F', negate, false, reverse); break;
-                       case Category.UnicodeHebrew:
-                               EmitRange ('\u0590', '\u05FF', negate, false, reverse); break;
-                       case Category.UnicodeArabic:
-                               EmitRange ('\u0600', '\u06FF', negate, false, reverse); break;
-                       case Category.UnicodeSyriac:
-                               EmitRange ('\u0700', '\u074F', negate, false, reverse); break;
-                       case Category.UnicodeThaana:
-                               EmitRange ('\u0780', '\u07BF', negate, false, reverse); break;
-                       case Category.UnicodeDevanagari:
-                               EmitRange ('\u0900', '\u097F', negate, false, reverse); break;
-                       case Category.UnicodeBengali:
-                               EmitRange ('\u0980', '\u09FF', negate, false, reverse); break;
-                       case Category.UnicodeGurmukhi:
-                               EmitRange ('\u0A00', '\u0A7F', negate, false, reverse); break;
-                       case Category.UnicodeGujarati:
-                               EmitRange ('\u0A80', '\u0AFF', negate, false, reverse); break;
-                       case Category.UnicodeOriya:
-                               EmitRange ('\u0B00', '\u0B7F', negate, false, reverse); break;
-                       case Category.UnicodeTamil:
-                               EmitRange ('\u0B80', '\u0BFF', negate, false, reverse); break;
-                       case Category.UnicodeTelugu:
-                               EmitRange ('\u0C00', '\u0C7F', negate, false, reverse); break;
-                       case Category.UnicodeKannada:
-                               EmitRange ('\u0C80', '\u0CFF', negate, false, reverse); break;
-                       case Category.UnicodeMalayalam:
-                               EmitRange ('\u0D00', '\u0D7F', negate, false, reverse); break;
-                       case Category.UnicodeSinhala:
-                               EmitRange ('\u0D80', '\u0DFF', negate, false, reverse); break;
-                       case Category.UnicodeThai:
-                               EmitRange ('\u0E00', '\u0E7F', negate, false, reverse); break;
-                       case Category.UnicodeLao:
-                               EmitRange ('\u0E80', '\u0EFF', negate, false, reverse); break;
-                       case Category.UnicodeTibetan:
-                               EmitRange ('\u0F00', '\u0FFF', negate, false, reverse); break;
-                       case Category.UnicodeMyanmar:
-                               EmitRange ('\u1000', '\u109F', negate, false, reverse); break;
-                       case Category.UnicodeGeorgian:
-                               EmitRange ('\u10A0', '\u10FF', negate, false, reverse); break;
-                       case Category.UnicodeHangulJamo:
-                               EmitRange ('\u1100', '\u11FF', negate, false, reverse); break;
-                       case Category.UnicodeEthiopic:
-                               EmitRange ('\u1200', '\u137F', negate, false, reverse); break;
-                       case Category.UnicodeCherokee:
-                               EmitRange ('\u13A0', '\u13FF', negate, false, reverse); break;
-                       case Category.UnicodeUnifiedCanadianAboriginalSyllabics:
-                               EmitRange ('\u1400', '\u167F', negate, false, reverse); break;
-                       case Category.UnicodeOgham:
-                               EmitRange ('\u1680', '\u169F', negate, false, reverse); break;
-                       case Category.UnicodeRunic:
-                               EmitRange ('\u16A0', '\u16FF', negate, false, reverse); break;
-                       case Category.UnicodeKhmer:
-                               EmitRange ('\u1780', '\u17FF', negate, false, reverse); break;
-                       case Category.UnicodeMongolian:
-                               EmitRange ('\u1800', '\u18AF', negate, false, reverse); break;
-                       case Category.UnicodeLatinExtendedAdditional:
-                               EmitRange ('\u1E00', '\u1EFF', negate, false, reverse); break;
-                       case Category.UnicodeGreekExtended:
-                               EmitRange ('\u1F00', '\u1FFF', negate, false, reverse); break;
-                       case Category.UnicodeGeneralPunctuation:
-                               EmitRange ('\u2000', '\u206F', negate, false, reverse); break;
-                       case Category.UnicodeSuperscriptsandSubscripts:
-                               EmitRange ('\u2070', '\u209F', negate, false, reverse); break;
-                       case Category.UnicodeCurrencySymbols:
-                               EmitRange ('\u20A0', '\u20CF', negate, false, reverse); break;
-                       case Category.UnicodeCombiningMarksforSymbols:
-                               EmitRange ('\u20D0', '\u20FF', negate, false, reverse); break;
-                       case Category.UnicodeLetterlikeSymbols:
-                               EmitRange ('\u2100', '\u214F', negate, false, reverse); break;
-                       case Category.UnicodeNumberForms:
-                               EmitRange ('\u2150', '\u218F', negate, false, reverse); break;
-                       case Category.UnicodeArrows:
-                               EmitRange ('\u2190', '\u21FF', negate, false, reverse); break;
-                       case Category.UnicodeMathematicalOperators:
-                               EmitRange ('\u2200', '\u22FF', negate, false, reverse); break;
-                       case Category.UnicodeMiscellaneousTechnical:
-                               EmitRange ('\u2300', '\u23FF', negate, false, reverse); break;
-                       case Category.UnicodeControlPictures:
-                               EmitRange ('\u2400', '\u243F', negate, false, reverse); break;
-                       case Category.UnicodeOpticalCharacterRecognition:
-                               EmitRange ('\u2440', '\u245F', negate, false, reverse); break;
-                       case Category.UnicodeEnclosedAlphanumerics:
-                               EmitRange ('\u2460', '\u24FF', negate, false, reverse); break;
-                       case Category.UnicodeBoxDrawing:
-                               EmitRange ('\u2500', '\u257F', negate, false, reverse); break;
-                       case Category.UnicodeBlockElements:
-                               EmitRange ('\u2580', '\u259F', negate, false, reverse); break;
-                       case Category.UnicodeGeometricShapes:
-                               EmitRange ('\u25A0', '\u25FF', negate, false, reverse); break;
-                       case Category.UnicodeMiscellaneousSymbols:
-                               EmitRange ('\u2600', '\u26FF', negate, false, reverse); break;
-                       case Category.UnicodeDingbats:
-                               EmitRange ('\u2700', '\u27BF', negate, false, reverse); break;
-                       case Category.UnicodeBraillePatterns:
-                               EmitRange ('\u2800', '\u28FF', negate, false, reverse); break;
-                       case Category.UnicodeCJKRadicalsSupplement:
-                               EmitRange ('\u2E80', '\u2EFF', negate, false, reverse); break;
-                       case Category.UnicodeKangxiRadicals:
-                               EmitRange ('\u2F00', '\u2FDF', negate, false, reverse); break;
-                       case Category.UnicodeIdeographicDescriptionCharacters:
-                               EmitRange ('\u2FF0', '\u2FFF', negate, false, reverse); break;
-                       case Category.UnicodeCJKSymbolsandPunctuation:
-                               EmitRange ('\u3000', '\u303F', negate, false, reverse); break;
-                       case Category.UnicodeHiragana:
-                               EmitRange ('\u3040', '\u309F', negate, false, reverse); break;
-                       case Category.UnicodeKatakana:
-                               EmitRange ('\u30A0', '\u30FF', negate, false, reverse); break;
-                       case Category.UnicodeBopomofo:
-                               EmitRange ('\u3100', '\u312F', negate, false, reverse); break;
-                       case Category.UnicodeHangulCompatibilityJamo:
-                               EmitRange ('\u3130', '\u318F', negate, false, reverse); break;
-                       case Category.UnicodeKanbun:
-                               EmitRange ('\u3190', '\u319F', negate, false, reverse); break;
-                       case Category.UnicodeBopomofoExtended:
-                               EmitRange ('\u31A0', '\u31BF', negate, false, reverse); break;
-                       case Category.UnicodeEnclosedCJKLettersandMonths:
-                               EmitRange ('\u3200', '\u32FF', negate, false, reverse); break;
-                       case Category.UnicodeCJKCompatibility:
-                               EmitRange ('\u3300', '\u33FF', negate, false, reverse); break;
-                       case Category.UnicodeCJKUnifiedIdeographsExtensionA:
-                               EmitRange ('\u3400', '\u4DB5', negate, false, reverse); break;
-                       case Category.UnicodeCJKUnifiedIdeographs:
-                               EmitRange ('\u4E00', '\u9FFF', negate, false, reverse); break;
-                       case Category.UnicodeYiSyllables:
-                               EmitRange ('\uA000', '\uA48F', negate, false, reverse); break;
-                       case Category.UnicodeYiRadicals:
-                               EmitRange ('\uA490', '\uA4CF', negate, false, reverse); break;
-                       case Category.UnicodeHangulSyllables:
-                               EmitRange ('\uAC00', '\uD7A3', negate, false, reverse); break;
-                       case Category.UnicodeHighSurrogates:
-                               EmitRange ('\uD800', '\uDB7F', negate, false, reverse); break;
-                       case Category.UnicodeHighPrivateUseSurrogates:
-                               EmitRange ('\uDB80', '\uDBFF', negate, false, reverse); break;
-                       case Category.UnicodeLowSurrogates:
-                               EmitRange ('\uDC00', '\uDFFF', negate, false, reverse); break;
-                       case Category.UnicodePrivateUse:
-                               EmitRange ('\uE000', '\uF8FF', negate, false, reverse); break;
-                       case Category.UnicodeCJKCompatibilityIdeographs:
-                               EmitRange ('\uF900', '\uFAFF', negate, false, reverse); break;
-                       case Category.UnicodeAlphabeticPresentationForms:
-                               EmitRange ('\uFB00', '\uFB4F', negate, false, reverse); break;
-                       case Category.UnicodeArabicPresentationFormsA:
-                               EmitRange ('\uFB50', '\uFDFF', negate, false, reverse); break;
-                       case Category.UnicodeCombiningHalfMarks:
-                               EmitRange ('\uFE20', '\uFE2F', negate, false, reverse); break;
-                       case Category.UnicodeCJKCompatibilityForms:
-                               EmitRange ('\uFE30', '\uFE4F', negate, false, reverse); break;
-                       case Category.UnicodeSmallFormVariants:
-                               EmitRange ('\uFE50', '\uFE6F', negate, false, reverse); break;
-                       case Category.UnicodeArabicPresentationFormsB:
-                               EmitRange ('\uFE70', '\uFEFE', negate, false, reverse); break;
-                       case Category.UnicodeHalfwidthandFullwidthForms:
-                               EmitRange ('\uFF00', '\uFFEF', negate, false, reverse); break;
-
-                               // Complex categories
-                       case Category.UnicodeL:
-                       case Category.UnicodeM:
-                       case Category.UnicodeN:
-                       case Category.UnicodeZ:
-                       case Category.UnicodeP:
-                       case Category.UnicodeS:
-                       case Category.UnicodeC:
-                               EmitCatGeneral (cat, negate, reverse); break;
-
-                       default:
-                               throw new NotImplementedException ("Missing category: " + cat);
-                       }
-               }
-
-               public void EmitNotCategory (Category cat, bool negate, bool reverse)
-               {
-                       // not sure why the compiler needed this separate interface funtion
-                       if (negate) {
-                               EmitCategory (cat, false, reverse);
-                       } else {
-                               EmitCategory (cat, true, reverse);
-                       }
-               }
-
-               public void EmitRange (char lo, char hi, bool negate, bool ignore, bool reverse)
-               {
-                       if (lo < 256 && hi < 256) {
-                               EmitOp (RxOp.Range, negate, ignore, reverse);
-                               Emit ((byte)lo);
-                               Emit ((byte)hi);
-                       } else {
-                               EmitOp (RxOp.UnicodeRange, negate, ignore, reverse);
-                               Emit ((ushort)lo);
-                               Emit ((ushort)hi);
-                       }
-               }
-
-               public void EmitSet (char lo, BitArray set, bool negate, bool ignore, bool reverse)
-               {
-                       int len = (set.Length + 0x7) >> 3;
-                       if (lo < 256 && len < 256) {
-                               EmitOp (RxOp.Bitmap, negate, ignore, reverse);
-                               Emit ((byte)lo);
-                               Emit ((byte)len);
-                       } else {
-                               EmitOp (RxOp.UnicodeBitmap, negate, ignore, reverse);
-                               Emit ((ushort)lo);
-                               Emit ((ushort)len);
-                       }
-                       // emit the bitmap bytes
-                       int b = 0;
-                       while (len-- != 0) {
-                               int word = 0;
-                               for (int i = 0; i < 8; ++ i) {
-                                       if (b >= set.Length)
-                                               break;
-                                       if (set [b ++])
-                                               word |= 1 << i;
-                               }
-                               Emit ((byte)word);
-                       }
-               }
-
-               public void EmitString (string str, bool ignore, bool reverse)
-               {
-                       bool islatin1 = false;
-                       int i;
-                       int offset = 0;
-                       if (ignore)
-                               offset += 1;
-                       if (reverse)
-                               offset += 2;
-                       if (ignore)
-                               str = str.ToLower ();
-                       if (str.Length < 256) {
-                               islatin1 = true;
-                               for (i = 0; i < str.Length; ++i) {
-                                       if (str [i] >= 256) {
-                                               islatin1 = false;
-                                               break;
-                                       }
-                               }
-                       }
-                       if (islatin1) {
-                               EmitOpIgnoreReverse (RxOp.String, ignore, reverse);
-                               Emit ((byte)str.Length);
-                               for (i = 0; i < str.Length; ++i)
-                                       Emit ((byte)str [i]);
-                       } else {
-                               EmitOpIgnoreReverse (RxOp.UnicodeString, ignore, reverse);
-                               if (str.Length > ushort.MaxValue)
-                                       throw new NotSupportedException ();
-                               Emit ((ushort)str.Length);
-                               for (i = 0; i < str.Length; ++i)
-                                       Emit ((ushort)str [i]);
-                       }
-               }
-
-               public void EmitPosition (Position pos)
-               {
-                       switch (pos) {
-                       case Position.Any:
-                               Emit (RxOp.AnyPosition);
-                               break;
-                       case Position.Start:
-                               Emit (RxOp.StartOfString);
-                               break;
-                       case Position.StartOfString:
-                               Emit (RxOp.StartOfString);
-                               break;
-                       case Position.StartOfLine:
-                               Emit (RxOp.StartOfLine);
-                               break;
-                       case Position.StartOfScan:
-                               Emit (RxOp.StartOfScan);
-                               break;
-                       case Position.End:
-                               Emit (RxOp.End);
-                               break;
-                       case Position.EndOfString:
-                               Emit (RxOp.EndOfString);
-                               break;
-                       case Position.EndOfLine:
-                               Emit (RxOp.EndOfLine);
-                               break;
-                       case Position.Boundary:
-                               Emit (RxOp.WordBoundary);
-                               break;
-                       case Position.NonBoundary:
-                               Emit (RxOp.NoWordBoundary);
-                               break;
-                       default:
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public void EmitOpen (int gid)
-               {
-                       if (gid > ushort.MaxValue)
-                               throw new NotSupportedException ();
-                       Emit (RxOp.OpenGroup);
-                       Emit ((ushort)gid);
-               }
-
-               public void EmitClose (int gid)
-               {
-                       if (gid > ushort.MaxValue)
-                               throw new NotSupportedException ();
-                       Emit (RxOp.CloseGroup);
-                       Emit ((ushort)gid);
-               }
-
-               public void EmitBalanceStart(int gid, int balance, bool capture,  LinkRef tail)
-               {
-                       BeginLink (tail);
-                       Emit (RxOp.BalanceStart);
-                       Emit ((ushort)gid);
-                       Emit ((ushort)balance);
-                       Emit ((byte)(capture ? 1 : 0));
-                       EmitLink (tail);
-               }
-
-               public void EmitBalance ()
-               {
-                       Emit (RxOp.Balance);
-               }
-
-               public void EmitReference (int gid, bool ignore, bool reverse)
-               {
-                       if (gid > ushort.MaxValue)
-                               throw new NotSupportedException ();
-                       EmitOpIgnoreReverse (RxOp.Reference, ignore, reverse);
-                       Emit ((ushort)gid);
-               }
-
-               public void EmitIfDefined (int gid, LinkRef tail)
-               {
-                       if (gid > ushort.MaxValue)
-                               throw new NotSupportedException ();
-                       BeginLink (tail);
-                       Emit (RxOp.IfDefined);
-                       EmitLink (tail);
-                       Emit ((ushort)gid);
-               }
-
-               public void EmitSub (LinkRef tail)
-               {
-                       BeginLink (tail);
-                       Emit (RxOp.SubExpression);
-                       EmitLink (tail);
-               }
-
-               public void EmitTest (LinkRef yes, LinkRef tail)
-               {
-                       BeginLink (yes);
-                       BeginLink (tail);
-                       Emit (RxOp.Test);
-                       EmitLink (yes);
-                       EmitLink (tail);
-               }
-
-               public void EmitBranch (LinkRef next)
-               {
-                       BeginLink (next);
-                       Emit (RxOp.Branch);
-                       EmitLink (next);
-               }
-
-               public void EmitJump (LinkRef target)
-               {
-                       BeginLink (target);
-                       Emit (RxOp.Jump);
-                       EmitLink (target);
-               }
-
-               public void EmitIn (LinkRef tail)
-               {
-                       // emitted for things like [\dabcfh]
-                       BeginLink (tail);
-                       Emit (RxOp.TestCharGroup);
-                       EmitLink (tail);
-               }
-
-               public void EmitRepeat (int min, int max, bool lazy, LinkRef until)
-               {
-                       BeginLink (until);
-                       Emit (lazy ? RxOp.RepeatLazy : RxOp.Repeat);
-                       EmitLink (until);
-                       Emit (min);
-                       Emit (max);
-               }
-
-               public void EmitUntil (LinkRef repeat)
-               {
-                       ResolveLink (repeat);
-                       Emit (RxOp.Until);
-               }
-
-               public void EmitInfo (int count, int min, int max)
-               {
-                       Emit (RxOp.Info);
-                       if (count > ushort.MaxValue)
-                               throw new NotSupportedException ();
-                       Emit ((ushort)count);
-                       Emit (min);
-                       Emit (max);
-               }
-
-               public void EmitFastRepeat (int min, int max, bool lazy, LinkRef tail)
-               {
-                       BeginLink (tail);
-                       Emit (lazy ? RxOp.FastRepeatLazy : RxOp.FastRepeat);
-                       EmitLink (tail);
-                       Emit (min);
-                       Emit (max);
-               }
-
-               public void EmitAnchor (bool reverse, int offset, LinkRef tail)
-               {
-                       BeginLink (tail);
-                       if (reverse)
-                               Emit (RxOp.AnchorReverse);
-                       else
-                               Emit (RxOp.Anchor);
-                       EmitLink (tail);
-                       if (offset > ushort.MaxValue)
-                               throw new NotSupportedException ();
-                       Emit ((ushort)offset);
-               }
-
-               // event for the CILCompiler
-               public void EmitBranchEnd ()
-               {
-               }
-
-               public void EmitAlternationEnd ()
-               {
-               }
-
-               public LinkRef NewLink ()
-               {
-                       return new RxLinkRef ();
-               }
-
-               public void ResolveLink (LinkRef link)
-               {
-                       RxLinkRef l = link as RxLinkRef;
-                       for (int i = 0; i < l.current; i += 2) {
-                               int offset = curpos - l.offsets [i];
-                               if (offset > ushort.MaxValue)
-                                       throw new NotSupportedException ();
-                               int offsetpos = l.offsets [i + 1];
-                               program [offsetpos] = (byte)offset;
-                               program [offsetpos + 1] = (byte)(offset >> 8);
-                       }
-               }
-
-       }
-
-       class RxInterpreterFactory : IMachineFactory {
-               public RxInterpreterFactory (byte[] program, EvalDelegate eval_del) {
-                       this.program = program;
-                       this.eval_del = eval_del;
-               }
-               
-               public IMachine NewInstance () {
-                       return new RxInterpreter (program, eval_del);
-               }
-
-               public int GroupCount {
-                       get { 
-                               return (int)program [1] | ((int)program [2] << 8);
-                       }
-               }
-
-               public int Gap {
-                       get { return gap; }
-                       set { gap = value; }
-               }
-
-               public IDictionary Mapping {
-                       get { return mapping; }
-                       set { mapping = value; }
-               }
-
-               public string [] NamesMapping {
-                       get { return namesMapping; }
-                       set { namesMapping = value; }
-               }
-
-               private IDictionary mapping;
-               private byte[] program;
-               private EvalDelegate eval_del;
-               private string[] namesMapping;
-               private int gap;
-       }
-
-}
-
diff --git a/mcs/class/System/System.Text.RegularExpressions/RxInterpreter.cs b/mcs/class/System/System.Text.RegularExpressions/RxInterpreter.cs
deleted file mode 100644 (file)
index cd8f259..0000000
+++ /dev/null
@@ -1,2447 +0,0 @@
-
-// Based upon interpreter.cs, written by Dan Lewis (dlewis@gmx.co.uk)
-//
-// There are a couple of bits flagged with DEAD_CODE which are bits that do
-// not seem to have been completed
-//
-using System;
-using System.Collections;
-using System.Globalization;
-using System.Diagnostics;
-
-namespace System.Text.RegularExpressions {
-
-       internal delegate bool EvalDelegate (RxInterpreter interp, int strpos, ref int strpos_result);
-
-       sealed class RxInterpreter: BaseMachine {
-               byte[] program;
-               string str;
-               int string_start;
-               int string_end;
-               int group_count;
-//             int match_start;
-               int[] groups;
-               EvalDelegate eval_del; // optimized EvalByteCode method created by the CILCompiler
-
-               Mark[] marks = null; // mark stack
-               int mark_start; // start of current checkpoint
-               int mark_end; // end of checkpoint/next free mark
-
-               IntStack stack; // utility stack
-
-               RepeatContext repeat;   // current repeat context
-               RepeatContext deep;             // points to the most-nested repeat context
-
-               /* The readonly ensures the JIT can optimize out if (trace_rx) statements */
-               public static readonly bool trace_rx =
-#if !NET_2_1
-                       Environment.GetEnvironmentVariable ("MONO_TRACE_RX") != null;
-#else
-                       false;
-#endif
-
-               // private classes
-
-               internal struct IntStack {
-                       int [] values;
-                       int count;
-                       public int Pop ()
-                       {
-                               return values [--count];
-                       }
-                       public void Push (int value)
-                       {
-                               if (values == null) {
-                                       values = new int [8];
-                               } else if (count == values.Length) {
-                                       int new_size = values.Length;
-                                       new_size += new_size >> 1;
-                                       int [] new_values = new int [new_size];
-                                       for (int i = 0; i < count; ++i)
-                                               new_values [i] = values [i];
-                                       values = new_values;
-                               }
-                               values [count++] = value;
-                       }
-                       public int Top {
-                               get { return values [count - 1]; }
-                       }
-                       public int Count {
-                               get { return count; }
-                               set {
-                                       if (value > count)
-                                               throw new SystemException ("can only truncate the stack");
-                                       count = value;
-                               }
-                       }
-               }
-
-               private class RepeatContext {
-                       public RepeatContext (RepeatContext previous, int min, int max, bool lazy, int expr_pc) {
-                               this.previous = previous;
-                               this.min = min;
-                               this.max = max;
-                               this.lazy = lazy;
-                               this.expr_pc = expr_pc;
-                               
-                               this.start = -1;
-                               this.count = 0;
-                       }
-
-                       public int Count {
-                               get { return count; }
-                               set { count = value; }
-                       }
-
-                       public int Start {
-                               get { return start; }
-                               set { start = value; }
-                       }
-
-                       public bool IsMinimum {
-                               get { return min <= count; }
-                       }
-
-                       public bool IsMaximum {
-                               get { return max <= count; }
-                       }
-
-                       public bool IsLazy {
-                               get { return lazy; }
-                       }
-
-                       public int Expression {
-                               get { return expr_pc; }
-                       }
-
-                       public RepeatContext Previous {
-                               get { return previous; }
-                       }
-               
-                       private int start;
-                       private int min, max;
-                       private bool lazy;
-                       private int expr_pc;
-                       private RepeatContext previous;
-
-                       private int count;
-               }
-
-               static int ReadInt (byte[] code, int pc)
-               {
-                       int val = code [pc];
-                       val |= (int)code [pc + 1] << 8;
-                       val |= (int)code [pc + 2] << 16;
-                       val |= (int)code [pc + 3] << 24;
-                       return val;
-               }
-
-               public RxInterpreter (byte[] program, EvalDelegate eval_del)
-               {
-                       this.program = program;
-                       this.eval_del = eval_del;
-                       group_count = 1 + (program [1] | ((int)program [2] << 8));
-                       groups = new int [group_count];
-                       stack = new IntStack ();
-
-                       ResetGroups ();
-               }
-
-               public override Match Scan (Regex regex, string text, int start, int end, bool substring_mode) {
-                       str = text;
-                       string_start = start;
-                       string_end = end;
-                       int res = 0;
-
-                       bool match;
-                       if (eval_del != null) {
-                               match = eval_del (this, start, ref res);
-                       } else {
-                               match = EvalByteCode (11, start, ref res);
-                       }
-                       marks [groups [0]].End = res;
-                       if (match) {
-                               return GenerateMatch (regex);
-                               //Match m = new Match (regex, this, text, end, 0, match_start, res - match_start);
-                               //return m;
-                       }
-                       return Match.Empty;
-               }
-
-               // capture management
-               private void Open (int gid, int ptr) {
-                       int m = groups [gid];
-                       if (m < mark_start || marks [m].IsDefined) {
-                               m = CreateMark (m);
-                               groups [gid] = m;
-                       }
-
-                       marks [m].Start = ptr;
-               }
-
-               private void Close (int gid, int ptr) {
-                       marks [groups [gid]].End = ptr;
-               }
-
-               private bool Balance (int gid, int balance_gid, bool capture, int ptr) {
-                       int b = groups [balance_gid];
-
-                       if(b == -1 || marks[b].Index < 0) {
-                               //Group not previously matched
-                               return false;
-                       }
-                       Debug.Assert (marks [b].IsDefined, "Regex", "Balancng group not closed");
-                       if (gid > 0 && capture){ 
-                               Open (gid, marks [b].Index + marks [b].Length);
-                               Close (gid, ptr);
-                       }
-
-                       groups [balance_gid] = marks[b].Previous;
-
-                       return true;
-               }
-
-               private int Checkpoint () {
-                       mark_start = mark_end;
-                       return mark_start;
-               }
-
-               private void Backtrack (int cp) {
-                       for (int i = 0; i < groups.Length; ++ i) {
-                               int m = groups [i];
-                               while (cp <= m)
-                                       m = marks [m].Previous;
-                               groups [i] = m;
-                       }
-               }
-
-               private void ResetGroups () {
-                       int n = groups.Length;
-                       if (marks == null)
-                               marks = new Mark [n];
-
-                       for (int i = 0; i < n; ++ i) {
-                               groups [i] = i;
-
-                               marks [i].Start = -1;
-                               marks [i].End = -1;
-                               marks [i].Previous = -1;
-                       }
-                       mark_start = 0;
-                       mark_end = n;
-               }
-
-               private int GetLastDefined (int gid) {
-                       int m = groups [gid];
-                       while (m >= 0 && !marks [m].IsDefined)
-                               m = marks [m].Previous;
-
-                       return m;
-               }
-
-               private int CreateMark (int previous) {
-                       if (mark_end == marks.Length) {
-                               Mark [] dest = new Mark [marks.Length * 2];
-                               marks.CopyTo (dest, 0);
-                               marks = dest;
-                       }
-
-                       int m = mark_end ++;
-                       marks [m].Start = marks [m].End = -1;
-                       marks [m].Previous = previous;
-
-                       return m;
-               }
-
-               private void GetGroupInfo (int gid, out int first_mark_index, out int n_caps)
-               {
-                       first_mark_index = -1;
-                       n_caps = 0;
-                       for (int m = groups [gid]; m >= 0; m = marks [m].Previous) {
-                               if (!marks [m].IsDefined)
-                                       continue;
-                               if (first_mark_index < 0)
-                                       first_mark_index = m;
-                               ++n_caps;
-                       }
-               }
-
-               private void PopulateGroup (Group g, int first_mark_index, int n_caps)
-               {
-                       int i = 1;
-                       for (int m = marks [first_mark_index].Previous; m >= 0; m = marks [m].Previous) {
-                               if (!marks [m].IsDefined)
-                                       continue;
-                               Capture cap = new Capture (str, marks [m].Index, marks [m].Length);
-                               g.Captures.SetValue (cap, n_caps - 1 - i);
-                               ++i;
-                       }
-               }
-
-               private Match GenerateMatch (Regex regex)
-               {
-                       int n_caps, first_mark_index;
-                       Group g;
-                       GetGroupInfo (0, out first_mark_index, out n_caps);
-
-                       // Avoid fully populating the Match instance if not needed
-                       if (!needs_groups_or_captures)
-                               return new Match (regex, this, str, string_end, 0, marks [first_mark_index].Index, marks [first_mark_index].Length);
-
-                       Match retval = new Match (regex, this, str, string_end, groups.Length, 
-                                                 marks [first_mark_index].Index, marks [first_mark_index].Length, n_caps);
-                       PopulateGroup (retval, first_mark_index, n_caps);
-
-                       for (int gid = 1; gid < groups.Length; ++ gid) {
-                               GetGroupInfo (gid, out first_mark_index, out n_caps);
-                               if (first_mark_index < 0) {
-                                       g = Group.Fail;
-                               } else {
-                                       g = new Group (str, marks [first_mark_index].Index, marks [first_mark_index].Length, n_caps);
-                                       PopulateGroup (g, first_mark_index, n_caps);
-                               }
-                               retval.Groups.SetValue (g, gid);
-                       }
-                       return retval;
-               }
-
-               // used by the IL backend
-           internal void SetStartOfMatch (int pos)
-               {
-                       marks [groups [0]].Start = pos;
-               }
-
-               static bool IsWordChar (char c)
-               {
-                       return Char.IsLetterOrDigit (c) || Char.GetUnicodeCategory (c) == UnicodeCategory.ConnectorPunctuation;
-               }
-
-               bool EvalByteCode (int pc, int strpos, ref int strpos_result)
-               {
-                       // luckily the IL engine can deal with char_group_end at compile time
-                       // this code offset needs to be checked only in opcodes that handle
-                       // a single char and that are included in a TestCharGroup expression:
-                       // the engine is supposed to jump to this offset as soons as the
-                       // first opcode in the expression matches
-                       // The code pattern becomes:
-                       // on successfull match: check if char_group_end is nonzero and jump to
-                       // test_char_group_passed after adjusting strpos
-                       // on failure: try the next expression by simply advancing pc
-                       int char_group_end = 0;
-                       int length, start, end;
-                       while (true) {
-                               if (trace_rx) {
-                                       Console.WriteLine ("evaluating: {0} at pc: {1}, strpos: {2}, cge: {3}", (RxOp)program [pc], pc, strpos, char_group_end);
-                                       //Console.WriteLine ("deep: " + (deep == null ? 0 : deep.GetHashCode ()) + " repeat: " + (this.repeat == null ? 0 : this.repeat.GetHashCode ()));
-                               }
-                               switch ((RxOp)program [pc]) {
-                               case RxOp.True:
-                                       if (char_group_end != 0) {
-                                               pc = char_group_end;
-                                               char_group_end = 0;
-                                               continue;
-                                       }
-                                       strpos_result = strpos;
-                                       return true;
-                               case RxOp.False:
-                                       return false;
-                               case RxOp.AnyPosition:
-                                       pc++;
-                                       continue;
-                               case RxOp.StartOfString:
-                                       if (strpos != 0)
-                                               return false;
-                                       pc++;
-                                       continue;
-                               case RxOp.StartOfLine:
-                                       if (strpos == 0 || str [strpos - 1] == '\n') {
-                                               pc++;
-                                               continue;
-                                       }
-                                       return false;
-                               case RxOp.StartOfScan:
-                                       if (strpos != string_start)
-                                               return false;
-                                       pc++;
-                                       continue;
-                               case RxOp.End:
-                                       if (strpos == string_end || (strpos == string_end - 1 && str [strpos] == '\n')) {
-                                               pc++;
-                                               continue;
-                                       }
-                                       return false;
-                               case RxOp.EndOfString:
-                                       if (strpos != string_end)
-                                               return false;
-                                       pc++;
-                                       continue;
-                               case RxOp.EndOfLine:
-                                       if (strpos == string_end || str [strpos] == '\n') {
-                                               pc++;
-                                               continue;
-                                       }
-                                       return false;
-                               case RxOp.WordBoundary:
-                                       if (string_end == 0)
-                                               return false;
-                                       if (strpos == 0) {
-                                               if (IsWordChar (str [strpos])) {
-                                                       pc++;
-                                                       continue;
-                                               }
-                                       } else if (strpos == string_end) {
-                                               if (IsWordChar (str [strpos - 1])) {
-                                                       pc++;
-                                                       continue;
-                                               }
-                                       } else {
-                                               if (IsWordChar (str [strpos]) != IsWordChar (str [strpos - 1])) {
-                                                       pc++;
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoWordBoundary:
-                                       if (string_end == 0)
-                                               return false;
-                                       if (strpos == 0) {
-                                               if (!IsWordChar (str [strpos])) {
-                                                       pc++;
-                                                       continue;
-                                               }
-                                       } else if (strpos == string_end) {
-                                               if (!IsWordChar (str [strpos - 1])) {
-                                                       pc++;
-                                                       continue;
-                                               }
-                                       } else {
-                                               if (IsWordChar (str [strpos]) == IsWordChar (str [strpos - 1])) {
-                                                       pc++;
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.Anchor:
-                                       int skip = program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       int anch_offset = program [pc + 3] | ((int)program [pc + 4] << 8);
-
-                                       /*
-                                        * In the general case, we have to evaluate the bytecode
-                                        * starting at pc + skip, however the optimizer emits some
-                                        * special cases, whose bytecode begins at pc + 5.
-                                        */
-                                       int anch_pc = pc + 5;
-                                       RxOp anch_op = (RxOp)(program[anch_pc] & 0x00ff);
-
-                                       bool spec_anch = false;
-
-                                       // FIXME: Add more special cases from interpreter.cs
-                                       if (anch_op == RxOp.String || anch_op == RxOp.StringIgnoreCase) {
-                                               if (pc + skip == anch_pc + 2 + program [anch_pc + 1] + 1) {
-                                                       // Anchor
-                                                       //      String
-                                                       //      True
-                                                       spec_anch = true;
-                                                       if (trace_rx)
-                                                               Console.WriteLine ("  string anchor at {0}, offset {1}", anch_pc, anch_offset);
-                                               }
-                                       }
-
-                                       pc += skip;
-
-                                       if ((RxOp)program [pc] == RxOp.StartOfString) {
-                                               if (strpos == 0) {
-                                                       int res = strpos;
-                                                       if (groups.Length > 1) {
-                                                               ResetGroups ();
-                                                               marks [groups [0]].Start = strpos;
-                                                       }
-                                                       if (EvalByteCode (pc + 1, strpos, ref res)) {
-                                                               marks [groups [0]].Start = strpos;
-                                                               if (groups.Length > 1)
-                                                                       marks [groups [0]].End = res;
-                                                               strpos_result = res;
-                                                               return true;
-                                                       }
-                                               }
-                                               return false;
-                                       }
-
-                                       // it's important to test also the end of the string
-                                       // position for things like: "" =~ /$/
-                                       end = string_end + 1;
-                                       while (strpos < end) {
-                                               if (spec_anch) {
-                                                       if (anch_op == RxOp.String || anch_op == RxOp.StringIgnoreCase) {
-                                                               /* 
-                                                                * This means the match must contain a given
-                                                                * string at a constant position, so we can skip 
-                                                                * forward until the string matches. This is a win if
-                                                                * the rest of the regex 
-                                                                * has a complex positive lookbehind for example.
-                                                                */
-                                                               int tmp_res = strpos;
-                                                               if (!EvalByteCode (anch_pc, strpos + anch_offset, ref tmp_res)) {
-                                                                       strpos ++;
-                                                                       continue;
-                                                               }
-                                                       }
-                                               }
-                                               int res = strpos;
-                                               if (groups.Length > 1) {
-                                                       ResetGroups ();
-                                                       marks [groups [0]].Start = strpos;
-                                               }
-                                               if (EvalByteCode (pc, strpos, ref res)) {
-//                                                     match_start = strpos;
-                                                       marks [groups [0]].Start = strpos;
-                                                       if (groups.Length > 1)
-                                                               marks [groups [0]].End = res;
-                                                       strpos_result = res;
-                                                       return true;
-                                               }
-                                               strpos++;
-                                       }
-                                       return false;
-                               case RxOp.AnchorReverse:
-                                       length = program [pc + 3] | ((int)program [pc + 4] << 8);
-                                       pc += program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       // it's important to test also the end of the string
-                                       // position for things like: "" =~ /$/
-                                       end = 0;
-                                       while (strpos >= 0) {
-                                               int res = strpos;
-                                               if (groups.Length > 1) {
-                                                       ResetGroups ();
-                                                       marks [groups [0]].Start = strpos;
-                                               }
-                                               if (EvalByteCode (pc, strpos, ref res)) {
-//                                                     match_start = strpos;
-                                                       marks [groups [0]].Start = strpos;
-                                                       if (groups.Length > 1)
-                                                               marks [groups [0]].End = res;
-                                                       strpos_result = res;
-                                                       return true;
-                                               }
-                                               strpos--;
-                                       }
-                                       return false;
-                               case RxOp.Reference:
-                                       length = GetLastDefined (program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       if (length < 0)
-                                               return false;
-                                       start = marks [length].Index;
-                                       length = marks [length].Length;
-                                       if (strpos + length > string_end)
-                                               return false;
-                                       for (end = start + length; start < end; ++start) {
-                                               if (str [strpos] != str [start])
-                                                       return false;
-                                               strpos++;
-                                       }
-                                       pc += 3;
-                                       continue;
-                               case RxOp.ReferenceIgnoreCase:
-                                       length = GetLastDefined (program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       if (length < 0)
-                                               return false;
-                                       start = marks [length].Index;
-                                       length = marks [length].Length;
-                                       if (strpos + length > string_end)
-                                               return false;
-                                       for (end = start + length; start < end; ++start) {
-                                               if (str [strpos] != str [start] && Char.ToLower (str [strpos]) != Char.ToLower (str [start]))
-                                                       return false;
-                                               strpos++;
-                                       }
-                                       pc += 3;
-                                       continue;
-                               case RxOp.ReferenceReverse: {
-                                       length = GetLastDefined (program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       if (length < 0)
-                                               return false;
-                                       start = marks [length].Index;
-                                       length = marks [length].Length;
-                                       if (strpos - length < 0)
-                                               return false;
-                                       int p = strpos - length;
-                                       for (end = start + length; start < end; ++start, ++p) {
-                                               if (str [p] != str [start])
-                                                       return false;
-                                       }
-                                       strpos -= length;
-                                       pc += 3;
-                                       continue;
-                               }
-                               case RxOp.IfDefined:
-                                       if (GetLastDefined (program [pc + 3] | ((int)program [pc + 4] << 8)) >= 0)
-                                               pc += 5;
-                                       else
-                                               pc += program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       continue;
-                               case RxOp.SubExpression: {
-                                       int res = 0;
-                                       if (EvalByteCode (pc + 3, strpos, ref res)) {
-                                               pc += program [pc + 1] | ((int)program [pc + 2] << 8);
-                                               strpos = res;
-                                               continue;
-                                       }
-                                       return false;
-                               }
-                               case RxOp.Test: {
-                                       int res = 0;
-                                       // FIXME: checkpoint
-                                       if (EvalByteCode (pc + 5, strpos, ref res)) {
-                                               pc += program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       } else {
-                                               pc += program [pc + 3] | ((int)program [pc + 4] << 8);
-                                       }
-                                       continue;
-                               }
-                               case RxOp.OpenGroup:
-                                       Open (program [pc + 1] | ((int)program [pc + 2] << 8), strpos);
-                                       pc += 3;
-                                       continue;
-                               case RxOp.CloseGroup:
-                                       Close (program [pc + 1] | ((int)program [pc + 2] << 8), strpos);
-                                       pc += 3;
-                                       continue;
-                               case RxOp.BalanceStart: {
-                                       int res = 0;
-
-                                       if (!EvalByteCode (pc + 8, strpos, ref res))
-                                               goto Fail;
-
-                                       int gid = program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       int balance_gid = program [pc + 3] | ((int)program [pc + 4] << 8);
-                                       bool capture = program [pc + 5] > 0;
-                                       if (!Balance (gid, balance_gid, capture, strpos))
-                                               goto Fail;
-
-                                       strpos = res;                                   
-                                       pc += program[pc + 6] | ((int)program [pc + 7] << 8);
-                                       break;
-                               }
-                               case RxOp.Balance: {
-                                       goto Pass;
-                               }
-
-                               case RxOp.Jump:
-                                       pc += program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       continue;
-                               case RxOp.TestCharGroup:
-                                       char_group_end = pc + (program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       pc += 3;
-                                       continue;
-                               case RxOp.String:
-                                       start = pc + 2;
-                                       length = program [pc + 1];
-                                       if (strpos + length > string_end)
-                                               return false;
-                                       end = start + length;
-                                       for (; start < end; ++start) {
-                                               if (str [strpos] != program [start])
-                                                       return false;
-                                               strpos++;
-                                       }
-                                       pc = end;
-                                       continue;
-                               case RxOp.StringIgnoreCase:
-                                       start = pc + 2;
-                                       length = program [pc + 1];
-                                       if (strpos + length > string_end)
-                                               return false;
-                                       end = start + length;
-                                       for (; start < end; ++start) {
-                                               if (str [strpos] != program [start] && Char.ToLower (str [strpos]) != program [start])
-                                                       return false;
-                                               strpos++;
-                                       }
-                                       pc = end;
-                                       continue;
-                               case RxOp.StringReverse: {
-                                       start = pc + 2;
-                                       length = program [pc + 1];
-                                       if (strpos < length)
-                                               return false;
-                                       int p = strpos - length;
-                                       end = start + length;
-                                       for (; start < end; ++start, ++p) {
-                                               if (str [p] != program [start])
-                                                       return false;
-                                       }
-                                       strpos -= length;
-                                       pc = end;
-                                       continue;
-                               }
-                               case RxOp.StringIgnoreCaseReverse: {
-                                       start = pc + 2;
-                                       length = program [pc + 1];
-                                       if (strpos < length)
-                                               return false;
-                                       int p = strpos - length;
-                                       end = start + length;
-                                       for (; start < end; ++start, ++p) {
-                                               if (str [p] != program [start] && Char.ToLower (str [p]) != program [start])
-                                                       return false;
-                                       }
-                                       strpos -= length;
-                                       pc = end;
-                                       continue;
-                               }
-                               case RxOp.UnicodeString: {
-                                       start = pc + 3;
-                                       length = program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       if (strpos + length > string_end)
-                                               return false;
-                                       end = start + length * 2;
-                                       for (; start < end; start += 2) {
-                                               int c = program [start] | ((int)program [start + 1] << 8);
-                                               if (str [strpos] != c)
-                                                       return false;
-                                               strpos++;
-                                       }
-                                       pc = end;
-                                       continue;
-                               }
-                               case RxOp.UnicodeStringIgnoreCase: {
-                                       start = pc + 3;
-                                       length = program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       if (strpos + length > string_end)
-                                               return false;
-                                       end = start + length * 2;
-                                       for (; start < end; start += 2) {
-                                               int c = program [start] | ((int)program [start + 1] << 8);
-                                               if (str [strpos] != c && Char.ToLower (str [strpos]) != c)
-                                                       return false;
-                                               strpos++;
-                                       }
-                                       pc = end;
-                                       continue;
-                               }
-                               case RxOp.UnicodeStringReverse: {
-                                       start = pc + 3;
-                                       length = program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       if (strpos < length)
-                                               return false;
-                                       int p = strpos - length;
-                                       end = start + length * 2;
-                                       for (; start < end; start += 2, p += 2) {
-                                               int c = program [start] | ((int)program [start + 1] << 8);
-                                               if (str [p] != c)
-                                                       return false;
-                                       }
-                                       strpos -= length;
-                                       pc = end;
-                                       continue;
-                               }
-                               case RxOp.UnicodeStringIgnoreCaseReverse: {
-                                       start = pc + 3;
-                                       length = program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       if (strpos < length)
-                                               return false;
-                                       int p = strpos - length;
-                                       end = start + length * 2;
-                                       for (; start < end; start += 2, p += 2) {
-                                               int c = program [start] | ((int)program [start + 1] << 8);
-                                               if (str [p] != c && Char.ToLower (str [p]) != c)
-                                                       return false;
-                                       }
-                                       strpos -= length;
-                                       pc = end;
-                                       continue;
-                               }
-
-                                       /*
-                                        * The opcodes below are basically specialized versions of one 
-                                        * generic opcode, which has three parameters:
-                                        * - reverse (Reverse), revert (No), ignore-case (IgnoreCase)
-                                        * Thus each opcode has 8 variants.
-                                        * FIXME: Maybe move all unusual variations 
-                                        * (Reverse+IgnoreCase+Unicode) into a generic GenericChar opcode 
-                                        * like in the old interpreter.
-                                        * FIXME: Move all the Reverse opcodes to a separate method.
-                                        */
-#if FALSE
-                                       if (!reverse) {
-                                               if (strpos < string_end && (COND (str [strpos]))) {
-                                                       if (!revert) {
-                                                               strpos ++;
-                                                               if (char_group_end != 0)
-                                                                       goto test_char_group_passed;
-                                                               pc += ins_len;
-                                                               continue;
-                                                       } else {
-                                                               /*
-                                                                * If we are inside a char group, the cases are ANDed 
-                                                                * together, so we have to continue checking the
-                                                                * other cases, and we need to increase strpos after 
-                                                                * the final check.
-                                                                * The char group is termined by a True, hence the
-                                                                * + 1 below.
-                                                                * FIXME: Optimize this.
-                                                                */
-                                                               pc += ins_len;
-                                                               if (char_group_end == 0 || (pc + 1 == char_group_end))
-                                                                       strpos ++;
-                                                               if (pc + 1 == char_group_end)
-                                                                       goto test_char_group_passed;
-                                                               continue;
-                                                       }
-                                               } else {
-                                                       if (!revert) {
-                                                               if (char_group_end == 0)
-                                                                       return false;
-                                                               pc += ins_len;
-                                                               continue;
-                                                       } else {
-                                                               /* Fail both inside and outside a char group */
-                                                               return false;
-                                                       }
-                                               }
-                                       } else {
-                                               // Same as above, but use:
-                                               // - strpos > 0 instead of strpos < string_len
-                                               // - COND (str [strpos - 1]) instead of COND (str [strpos])
-                                               // - strpos -- instead of strpos ++
-                                       }
-#endif
-                               // GENERATED BY gen-interp.cs, DO NOT MODIFY
-                               
-                               /* Char */
-                               
-                               case RxOp.Char:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((c == program [pc + 1]))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               
-                               /* Range */
-                               
-                               case RxOp.Range:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               
-                               /* UnicodeRange */
-                               
-                               case RxOp.UnicodeRange:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5;
-                                       continue;
-                               
-                               /* UnicodeChar */
-                               
-                               case RxOp.UnicodeChar:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               
-                               /* CategoryAny */
-                               
-                               case RxOp.CategoryAny:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((c != '\n'))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryAnySingleline */
-                               
-                               case RxOp.CategoryAnySingleline:
-                                       if (strpos < string_end) {
-                                               // char c = str [strpos];
-                                               if ((true)) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryWord */
-                               
-                               case RxOp.CategoryWord:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((Char.IsLetterOrDigit (c) || Char.GetUnicodeCategory (c) == UnicodeCategory.ConnectorPunctuation))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryDigit */
-                               
-                               case RxOp.CategoryDigit:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((Char.IsDigit (c)))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryWhiteSpace */
-                               
-                               case RxOp.CategoryWhiteSpace:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((Char.IsWhiteSpace (c)))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryEcmaWord */
-                               
-                               case RxOp.CategoryEcmaWord:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if ((('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' || c == '_'))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryEcmaWhiteSpace */
-                               
-                               case RxOp.CategoryEcmaWhiteSpace:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v'))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryUnicodeSpecials */
-                               
-                               case RxOp.CategoryUnicodeSpecials:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if ((('\uFEFF' <= c && c <= '\uFEFF' || '\uFFF0' <= c && c <= '\uFFFD'))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               
-                               /* CategoryUnicode */
-                               
-                               case RxOp.CategoryUnicode:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((Char.GetUnicodeCategory (c) == (UnicodeCategory)program [pc + 1]))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               
-                               /* CategoryGeneral */
-                               
-                               case RxOp.CategoryGeneral:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (((CategoryUtils.IsCategory ((Category)program [pc + 1], c)))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               
-                               /* Bitmap */
-                               
-                               case RxOp.Bitmap:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3 + program [pc + 2];
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3 + program [pc + 2];
-                                       continue;
-                               
-                               /* UnicodeBitmap */
-                               
-                               case RxOp.UnicodeBitmap:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                       continue;
-                               case RxOp.CharIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (((c == program [pc + 1]))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               case RxOp.RangeIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               case RxOp.UnicodeRangeIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5;
-                                       continue;
-                               case RxOp.UnicodeCharIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               case RxOp.BitmapIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3 + program [pc + 2];
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3 + program [pc + 2];
-                                       continue;
-                               case RxOp.UnicodeBitmapIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos ++;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                       continue;
-                               case RxOp.NoChar:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((c == program [pc + 1]))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoRange:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeRange:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       pc += 5;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeChar:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryAny:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((c != '\n'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryAnySingleline:
-                                       if (strpos < string_end) {
-#if DEAD_CODE
-                                               char c = str [strpos];
-                                               if (!(true)) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-#endif
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryWord:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((Char.IsLetterOrDigit (c) || Char.GetUnicodeCategory (c) == UnicodeCategory.ConnectorPunctuation))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryDigit:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((Char.IsDigit (c)))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryWhiteSpace:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((Char.IsWhiteSpace (c)))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryEcmaWord:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!(('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' || c == '_'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryEcmaWhiteSpace:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryUnicodeSpecials:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!(('\uFEFF' <= c && c <= '\uFEFF' || '\uFFF0' <= c && c <= '\uFFFD'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryUnicode:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((Char.GetUnicodeCategory (c) == (UnicodeCategory)program [pc + 1]))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryGeneral:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               if (!((CategoryUtils.IsCategory ((Category)program [pc + 1], c)))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoBitmap:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 3 + program [pc + 2];
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeBitmap:
-                                       if (strpos < string_end) {
-                                               char c = str [strpos];
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCharIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (!((c == program [pc + 1]))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoRangeIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (!((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeRangeIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (!((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       pc += 5;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeCharIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               if (!((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoBitmapIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 3 + program [pc + 2];
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeBitmapIgnoreCase:
-                                       if (strpos < string_end) {
-                                               char c = Char.ToLower (str [strpos]);
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos ++;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.CharReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((c == program [pc + 1]))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               case RxOp.RangeReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               case RxOp.UnicodeRangeReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5;
-                                       continue;
-                               case RxOp.UnicodeCharReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               case RxOp.CategoryAnyReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((c != '\n'))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryAnySinglelineReverse:
-                                       if (strpos > 0) {
-                                               //char c = str [strpos - 1];
-                                               if ((true)) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryWordReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((Char.IsLetterOrDigit (c) || Char.GetUnicodeCategory (c) == UnicodeCategory.ConnectorPunctuation))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryDigitReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((Char.IsDigit (c)))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryWhiteSpaceReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((Char.IsWhiteSpace (c)))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryEcmaWordReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if ((('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' || c == '_'))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryEcmaWhiteSpaceReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v'))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryUnicodeSpecialsReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if ((('\uFEFF' <= c && c <= '\uFEFF' || '\uFFF0' <= c && c <= '\uFFFD'))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 1;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 1;
-                                       continue;
-                               case RxOp.CategoryUnicodeReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((Char.GetUnicodeCategory (c) == (UnicodeCategory)program [pc + 1]))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               case RxOp.CategoryGeneralReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (((CategoryUtils.IsCategory ((Category)program [pc + 1], c)))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               case RxOp.BitmapReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3 + program [pc + 2];
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3 + program [pc + 2];
-                                       continue;
-                               case RxOp.UnicodeBitmapReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                       continue;
-                               case RxOp.CharIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (((c == program [pc + 1]))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 2;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 2;
-                                       continue;
-                               case RxOp.RangeIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               case RxOp.UnicodeRangeIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5;
-                                       continue;
-                               case RxOp.UnicodeCharIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3;
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3;
-                                       continue;
-                               case RxOp.BitmapIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 3 + program [pc + 2];
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 3 + program [pc + 2];
-                                       continue;
-                               case RxOp.UnicodeBitmapIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       strpos --;
-                                                       if (char_group_end != 0)
-                                                               goto test_char_group_passed;
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       continue;
-                                               }
-                                       }
-                                       if (char_group_end == 0)
-                                               return false;
-                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                       continue;
-                               case RxOp.NoCharReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((c == program [pc + 1]))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoRangeReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeRangeReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       pc += 5;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeCharReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryAnyReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((c != '\n'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryAnySinglelineReverse:
-                                       if (strpos > 0) {
-#if DEAD_CODe
-                                               char c = str [strpos - 1];
-                                               if (!(true)) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-#endif
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryWordReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((Char.IsLetterOrDigit (c) || Char.GetUnicodeCategory (c) == UnicodeCategory.ConnectorPunctuation))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryDigitReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((Char.IsDigit (c)))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryWhiteSpaceReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((Char.IsWhiteSpace (c)))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryEcmaWordReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!(('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' || c == '_'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryEcmaWhiteSpaceReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryUnicodeSpecialsReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!(('\uFEFF' <= c && c <= '\uFEFF' || '\uFFF0' <= c && c <= '\uFFFD'))) {
-                                                       pc += 1;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryUnicodeReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((Char.GetUnicodeCategory (c) == (UnicodeCategory)program [pc + 1]))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCategoryGeneralReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               if (!((CategoryUtils.IsCategory ((Category)program [pc + 1], c)))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoBitmapReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 3 + program [pc + 2];
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeBitmapReverse:
-                                       if (strpos > 0) {
-                                               char c = str [strpos - 1];
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoCharIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (!((c == program [pc + 1]))) {
-                                                       pc += 2;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoRangeIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (!((c >= program [pc + 1] && c <= program [pc + 2]))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeRangeIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (!((c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8))))) {
-                                                       pc += 5;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeCharIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               if (!((c == (program [pc + 1] | ((int)program [pc + 2] << 8))))) {
-                                                       pc += 3;
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoBitmapIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 3 + program [pc + 2];
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               case RxOp.NoUnicodeBitmapIgnoreCaseReverse:
-                                       if (strpos > 0) {
-                                               char c = Char.ToLower (str [strpos - 1]);
-                                               int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                               if (!((c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0))) {
-                                                       pc += 5 + (program [pc + 3] | ((int)program [pc + 4] << 8));
-                                                       if (char_group_end == 0 || (pc + 1 == char_group_end)) {
-                                                               strpos --;
-                                                       if (pc + 1 == char_group_end)
-                                                               goto test_char_group_passed;
-                                                       }
-                                                       continue;
-                                               }
-                                       }
-                                       return false;
-                               
-                               // END OF GENERATED CODE
-
-                               case RxOp.Branch: {
-                                       int res = 0;
-                                       if (EvalByteCode (pc + 3, strpos, ref res)) {
-                                               strpos_result = res;
-                                               return true;
-                                       }
-                                       //Console.WriteLine ("branch offset: {0}", program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       pc += program [pc + 1] | ((int)program [pc + 2] << 8);
-                                       continue;
-                               }
-                               case RxOp.Repeat:
-                               case RxOp.RepeatLazy: {
-                                       /*
-                                        * Repetation is modelled by two opcodes: Repeat and Until which
-                                        * contain the the qualified regex between them, i.e.:
-                                        * Repeat, <bytecode for the inner regex>, Until, <Tail expr>
-                                        * It is processed as follows: 
-                                        * Repeat, [Until, <inner expr>]*, <Tail>
-                                        * This means that nested quantifiers are processed a bit
-                                        * strangely: when the inner quantifier fails to match, its
-                                        * tail is processed which includes the outer Until.
-                                        *
-                                        * This code is from the old interpreter.cs.
-                                        *
-                                        * FIXME: Rethink this.
-                                        */
-
-                                       int res = 0;
-
-                                       this.repeat = new RepeatContext (
-                                               this.repeat,                    // previous context
-                                               ReadInt (program, pc + 3),              // minimum
-                                               ReadInt (program, pc + 7),              // maximum
-                                               (RxOp)program [pc] == RxOp.RepeatLazy, // lazy
-                                               pc + 11                         // subexpression
-                                       );
-
-                                       int until = pc + (program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       if (!EvalByteCode (until, strpos, ref res)) {
-                                               this.repeat = this.repeat.Previous;
-                                               return false;
-                                       }
-
-                                       strpos = res;
-                                       strpos_result = strpos;
-                                       return true;
-                               }
-                               case RxOp.Until: {
-                                       RepeatContext current = this.repeat;
-                                       int res = 0;
-
-                                       //
-                                       // Can we avoid recursion?
-                                       //
-                                       // Backtracking can be forced in nested quantifiers from the tail of this quantifier.
-                                       // Thus, we cannot, in general, use a simple loop on repeat.Expression to handle
-                                       // quantifiers.
-                                       //
-                                       // If 'deep' was unmolested, that implies that there was no nested quantifiers.
-                                       // Thus, we can safely avoid recursion.
-                                       //
-                                       if (deep == current)
-                                               goto Pass;
-
-                                       start = current.Start;
-                                       int start_count = current.Count;
-
-                                       // First match at least 'start' items without backtracking
-                                       while (!current.IsMinimum) {
-                                               ++ current.Count;
-                                               current.Start = strpos;
-                                               deep = current;
-                                               if (!EvalByteCode (current.Expression, strpos, ref res)) {
-                                                       current.Start = start;
-                                                       current.Count = start_count;
-                                                       goto Fail;
-                                               }
-                                               strpos = res;
-                                               if (deep != current)    // recursive mode
-                                                       goto Pass;
-                                       }
-
-                                       if (strpos == current.Start) {
-                                               // degenerate match ... match tail or fail
-                                               this.repeat = current.Previous;
-                                               deep = null;
-                                               if (EvalByteCode (pc + 1, strpos, ref res)) {
-                                                       strpos = res;
-                                                       goto Pass;
-                                               }
-                                               this.repeat = current;
-                                               goto Fail;
-                                       }
-
-                                       if (current.IsLazy) {
-                                               for (;;) {
-                                                       // match tail first ...
-                                                       this.repeat = current.Previous;
-                                                       deep = null;
-                                                       int cp = Checkpoint ();
-                                                       if (EvalByteCode (pc + 1, strpos, ref res)) {
-                                                               strpos = res;
-                                                               goto Pass;
-                                                       }
-
-                                                       Backtrack (cp);
-
-                                                       // ... then match more
-                                                       this.repeat = current;
-                                                       if (current.IsMaximum)
-                                                               goto Fail;
-                                                       ++ current.Count;
-                                                       current.Start = strpos;
-                                                       deep = current;
-                                                       if (!EvalByteCode (current.Expression, strpos, ref res)) {
-                                                               current.Start = start;
-                                                               current.Count = start_count;
-                                                               goto Fail;
-                                                       }
-                                                       strpos = res;
-                                                       if (deep != current)    // recursive mode
-                                                               goto Pass;
-                                                       // Degenerate match: ptr has not moved since the last (failed) tail match.
-                                                       // So, next and subsequent tail matches will fail.
-                                                       if (strpos == current.Start)
-                                                               goto Fail;
-                                               }
-                                       } else {
-                                               int stack_size = stack.Count;
-
-                                               // match greedily as much as possible
-                                               while (!current.IsMaximum) {
-                                                       int cp = Checkpoint ();
-                                                       int old_ptr = strpos;
-                                                       int old_start = current.Start;
-
-                                                       ++ current.Count;
-                                                       if (trace_rx)
-                                                               Console.WriteLine ("recurse with count {0}.", current.Count);
-                                                       current.Start = strpos;
-                                                       deep = current;
-                                                       if (!EvalByteCode (current.Expression, strpos, ref res)) {
-                                                               -- current.Count;
-                                                               current.Start = old_start;
-                                                               Backtrack (cp);
-                                                               break;
-                                                       }
-                                                       strpos = res;
-                                                       if (deep != current) {
-                                                               // recursive mode: no more backtracking, truncate the stack
-                                                               stack.Count = stack_size;
-                                                               goto Pass;
-                                                       }
-                                                       stack.Push (cp);
-                                                       stack.Push (old_ptr);
-
-                                                       // Degenerate match: no point going on
-                                                       if (strpos == current.Start)
-                                                               break;
-                                               }
-
-                                               if (trace_rx)
-                                                       Console.WriteLine ("matching tail: {0} pc={1}", strpos, pc + 1);
-                                               // then, match the tail, backtracking as necessary.
-                                               this.repeat = current.Previous;
-                                               for (;;) {
-                                                       deep = null;
-                                                       if (EvalByteCode (pc + 1, strpos, ref res)) {
-                                                               strpos = res;
-                                                               stack.Count = stack_size;
-                                                               goto Pass;
-                                                       }
-                                                       if (stack.Count == stack_size) {
-                                                               this.repeat = current;
-                                                               goto Fail;
-                                                       }
-
-                                                       --current.Count;
-                                                       strpos = stack.Pop ();
-                                                       Backtrack (stack.Pop ());
-                                                       if (trace_rx)
-                                                               Console.WriteLine ("backtracking to {0} expr={1} pc={2}", strpos, current.Expression, pc);
-                                               }
-                                       }
-                               }
-
-                               case RxOp.FastRepeat:
-                               case RxOp.FastRepeatLazy: {
-                                       /*
-                                        * A FastRepeat is a simplified version of Repeat which does
-                                        * not contain another repeat inside, so backtracking is 
-                                        * easier.
-                                        */
-                                       bool lazy = program [pc] == (byte)RxOp.FastRepeatLazy;
-                                       int res = 0;
-                                       int tail = pc + (program [pc + 1] | ((int)program [pc + 2] << 8));
-                                       start = ReadInt (program, pc + 3);
-                                       end = ReadInt (program, pc + 7);
-                                       //Console.WriteLine ("min: {0}, max: {1} tail: {2}", start, end, tail);
-                                       length = 0;
-
-                                       deep = null;
-
-                                       // First match at least 'start' items
-                                       while (length < start) {
-                                               if (!EvalByteCode (pc + 11, strpos, ref res))
-                                                       return false;
-                                               strpos = res;
-                                               length++;
-                                       }
-                                       
-                                       if (lazy) {
-                                               while (true) {
-                                                       // Match the tail
-                                                       int cp = Checkpoint ();
-                                                       if (EvalByteCode (tail, strpos, ref res)) {
-                                                               strpos = res;
-                                                               goto repeat_success;
-                                                       }
-                                                       Backtrack (cp);
-
-                                                       if (length >= end)
-                                                               return false;
-
-                                                       // Match an item
-                                                       if (!EvalByteCode (pc + 11, strpos, ref res))
-                                                               return false;
-                                                       strpos = res;
-                                                       length ++;
-                                               }
-                                       } else {
-                                               // Then match as many items as possible, recording
-                                               // backtracking information
-                                               int old_stack_size = stack.Count;
-                                               while (length < end) {
-                                                       int cp = Checkpoint ();
-                                                       if (!EvalByteCode (pc + 11, strpos, ref res)) {
-                                                               Backtrack (cp);
-                                                               break;
-                                                       }
-                                                       stack.Push (cp);
-                                                       stack.Push (strpos);
-                                                       strpos = res;
-                                                       length++;
-                                               }       
-
-                                               if (tail <= pc)
-                                                       throw new Exception ();
-
-                                               // Then, match the tail, backtracking as necessary.
-                                               while (true) {
-                                                       if (EvalByteCode (tail, strpos, ref res)) {
-                                                               strpos = res;
-                                                               stack.Count = old_stack_size;
-                                                               goto repeat_success;
-                                                       }
-                                                       if (stack.Count == old_stack_size)
-                                                               return false;
-
-                                                       // Backtrack
-                                                       strpos = stack.Pop ();
-                                                       Backtrack (stack.Pop ());
-                                                       if (trace_rx)
-                                                               Console.WriteLine ("backtracking to: {0}", strpos);
-                                               }
-                                       }
-
-                               repeat_success:
-                                       // We matched the tail too so just return
-                                       goto Pass;
-                               }
-
-                               default:
-                                       Console.WriteLine ("evaluating: {0} at pc: {1}, strpos: {2}", (RxOp)program [pc], pc, strpos);
-                                       throw new NotSupportedException ();
-                               }
-                               continue;
-
-                       Pass:
-                               strpos_result = strpos;
-                               return true;
-                       Fail:
-                               return false;
-                       test_char_group_passed:
-                               pc = char_group_end;
-                               char_group_end = 0;
-                               continue;
-                       } // end of while (true)
-               }
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/RxOp.cs b/mcs/class/System/System.Text.RegularExpressions/RxOp.cs
deleted file mode 100644 (file)
index 43f8172..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-
-namespace System.Text.RegularExpressions {
-
-       // for the IgnoreCase opcodes, the char data is stored lowercased
-       // two-byte integers are in little endian format
-       enum RxOp : byte {
-               // followed by count, min, max integers
-               Info,
-
-               False,
-               True,
-
-               // position anchors 
-               AnyPosition,
-               StartOfString,
-               StartOfLine,
-               StartOfScan,
-               EndOfString,
-               EndOfLine,
-               End,
-               WordBoundary,
-               NoWordBoundary,
-
-               // latin1 strings
-               // followed by single byte length and latin1 bytes
-               // keep the order, see EmitString ()
-               String,
-               StringIgnoreCase,
-               StringReverse,
-               StringIgnoreCaseReverse,
-
-               // followed by two byte length and unicode chars (two bytes per char)
-               // a better setup may be to reference the chars in the patterns string
-               // (offset, length) pairs, at least when the pattern contains them,
-               // but this means we can't lowercase before hand: consider using a separate
-               // string/array
-               // keep the order, see EmitString ()
-               UnicodeString,
-               UnicodeStringIgnoreCase,
-               UnicodeStringReverse,
-               UnicodeStringIgnoreCaseReverse,
-
-               // latin1 single char
-               // followed by a latin1 byte
-               // keep the order, see EmitCharacter ()
-               Char,
-               NoChar,
-               CharIgnoreCase,
-               NoCharIgnoreCase,
-               CharReverse,
-               NoCharReverse,
-               CharIgnoreCaseReverse,
-               NoCharIgnoreCaseReverse,
-
-               // followed by latin1 min and max bytes
-               // keep the order, see EmitRange ()
-               Range,
-               NoRange,
-               RangeIgnoreCase,
-               NoRangeIgnoreCase,
-               RangeReverse,
-               NoRangeReverse,
-               RangeIgnoreCaseReverse,
-               NoRangeIgnoreCaseReverse,
-
-               // followed by lowbyte and length of the bitmap and by the bitmap
-               // keep the order, see EmitSet ()
-               Bitmap,
-               NoBitmap,
-               BitmapIgnoreCase,
-               NoBitmapIgnoreCase,
-               BitmapReverse,
-               NoBitmapReverse,
-               BitmapIgnoreCaseReverse,
-               NoBitmapIgnoreCaseReverse,
-
-               // unicode chars
-               // followed by a unicode char
-               // keep the order, see EmitCharacter ()
-               UnicodeChar,
-               NoUnicodeChar,
-               UnicodeCharIgnoreCase,
-               NoUnicodeCharIgnoreCase,
-               UnicodeCharReverse,
-               NoUnicodeCharReverse,
-               UnicodeCharIgnoreCaseReverse,
-               NoUnicodeCharIgnoreCaseReverse,
-
-               // followed by unicode char min and max chars
-               // keep the order, see EmitRange ()
-               UnicodeRange,
-               NoUnicodeRange,
-               UnicodeRangeIgnoreCase,
-               NoUnicodeRangeIgnoreCase,
-               UnicodeRangeReverse,
-               NoUnicodeRangeReverse,
-               UnicodeRangeIgnoreCaseReverse,
-               NoUnicodeRangeIgnoreCaseReverse,
-
-               // followed by lowchar and length of the bitmap and by the bitmap
-               UnicodeBitmap,
-               NoUnicodeBitmap,
-               UnicodeBitmapIgnoreCase,
-               NoUnicodeBitmapIgnoreCase,
-               UnicodeBitmapReverse,
-               NoUnicodeBitmapReverse,
-               UnicodeBitmapIgnoreCaseReverse,
-               NoUnicodeBitmapIgnoreCaseReverse,
-
-               // add reverse and negate versions of the categories
-               CategoryAny,
-               NoCategoryAny,
-               CategoryAnyReverse,
-               NoCategoryAnyReverse,
-               CategoryAnySingleline,
-               NoCategoryAnySingleline,
-               CategoryAnySinglelineReverse,
-               NoCategoryAnySinglelineReverse,
-               CategoryDigit,
-               NoCategoryDigit,
-               CategoryDigitReverse,
-               NoCategoryDigitReverse,
-               CategoryWord,
-               NoCategoryWord,
-               CategoryWordReverse,
-               NoCategoryWordReverse,
-               CategoryWhiteSpace,
-               NoCategoryWhiteSpace,
-               CategoryWhiteSpaceReverse,
-               NoCategoryWhiteSpaceReverse,
-               CategoryEcmaWord,
-               NoCategoryEcmaWord,
-               CategoryEcmaWordReverse,
-               NoCategoryEcmaWordReverse,
-               CategoryEcmaWhiteSpace,
-               NoCategoryEcmaWhiteSpace,
-               CategoryEcmaWhiteSpaceReverse,
-               NoCategoryEcmaWhiteSpaceReverse,
-
-               // followed by a unicode category value (byte)
-               CategoryUnicode,
-               NoCategoryUnicode,
-               CategoryUnicodeReverse,
-               NoCategoryUnicodeReverse,
-
-               CategoryUnicodeLetter,
-               NoCategoryUnicodeLetter,
-               CategoryUnicodeLetterReverse,
-               NoCategoryUnicodeLetterReverse,
-               CategoryUnicodeMark,
-               NoCategoryUnicodeMark,
-               CategoryUnicodeMarkReverse,
-               NoCategoryUnicodeMarkReverse,
-               CategoryUnicodeNumber,
-               NoCategoryUnicodeNumber,
-               CategoryUnicodeNumberReverse,
-               NoCategoryUnicodeNumberReverse,
-               CategoryUnicodeSeparator,
-               NoCategoryUnicodeSeparator,
-               CategoryUnicodeSeparatorReverse,
-               NoCategoryUnicodeSeparatorReverse,
-               CategoryUnicodePunctuation,
-               NoCategoryUnicodePunctuation,
-               CategoryUnicodePunctuationReverse,
-               NoCategoryUnicodePunctuationReverse,
-               CategoryUnicodeSymbol,
-               NoCategoryUnicodeSymbol,
-               CategoryUnicodeSymbolReverse,
-               NoCategoryUnicodeSymbolReverse,
-               CategoryUnicodeSpecials,
-               NoCategoryUnicodeSpecials,
-               CategoryUnicodeSpecialsReverse,
-               NoCategoryUnicodeSpecialsReverse,
-               CategoryUnicodeOther,
-               NoCategoryUnicodeOther,
-               CategoryUnicodeOtherReverse,
-               NoCategoryUnicodeOtherReverse,
-               // add more categories
-
-               // followed by Category value (byte)
-               CategoryGeneral,
-               NoCategoryGeneral,
-               CategoryGeneralReverse,
-               NoCategoryGeneralReverse,
-
-               // backreferences
-               // followed by two-byte reference number
-               // keep the order, see EmitReference ()
-               Reference,
-               ReferenceIgnoreCase,
-               ReferenceReverse,
-               ReferenceIgnoreCaseReverse,
-
-               // group/capture support
-               // followed by two-byte group id
-               OpenGroup,
-               CloseGroup,
-               
-               BalanceStart,
-               Balance,
-
-               // followed by offset and two-byte group id
-               IfDefined,
-
-               // skip ahead num bytes
-               // followed by two-byte offset
-               Jump,
-
-               // followed by two-byte offset
-               SubExpression,
-
-               // followed by true and false two-byte offsets
-               Test,
-
-               // followed by two-byte offset
-               Branch,
-
-               // followed by two-byte offset
-               TestCharGroup,
-
-               // anchoring expression
-               // followed by offset of tail and offset
-               Anchor,
-               AnchorReverse,
-
-               // repetition support
-               // followed by min, max ints
-               Repeat,
-               RepeatLazy,
-               Until,
-               FastRepeat,
-               FastRepeatLazy,
-               // followed by min byte
-               RepeatInfinite,
-               RepeatInfiniteLazy,
-       }
-}
-
diff --git a/mcs/class/System/System.Text.RegularExpressions/arch.cs b/mcs/class/System/System.Text.RegularExpressions/arch.cs
deleted file mode 100644 (file)
index 89ce958..0000000
+++ /dev/null
@@ -1,365 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       arch.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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;
-
-namespace System.Text.RegularExpressions {
-
-       enum OpCode : ushort {
-               False           = 0,    // always fails
-               True,                   // always succeeds
-
-               // matching
-
-               Position,               // zero-width position assertion
-               String,                 // match string literal
-               Reference,              // back reference
-
-               // character matching
-
-               Character,              // match character exactly
-               Category,               // match character from category
-               NotCategory,            // match character _not_ from category
-               Range,                  // match character from range
-               Set,                    // match character from set
-               In,                     // match character from group of tests
-
-               // capturing
-
-               Open,                   // open group
-               Close,                  // close group
-               Balance,                // balance groups
-               BalanceStart,           //track balance group length
-
-               // control flow
-
-               IfDefined,              // conditional on capture
-               Sub,                    // non-backtracking subexpression
-               Test,                   // non-backtracking lookahead/behind
-               Branch,                 // alternative expression
-               Jump,                   // unconditional goto
-               Repeat,                 // new repeat context
-               Until,                  // repeat subexpression within context
-               FastRepeat,             // repeat simple subexpression
-               Anchor,                 // anchoring expression
-
-               // miscellaneous
-               
-               Info                    // pattern information
-       }
-
-       [Flags]
-       enum OpFlags : ushort {
-               None            = 0x000,
-               Negate          = 0x100,        // succeed on mismatch
-               IgnoreCase      = 0x200,        // case insensitive matching
-               RightToLeft     = 0x400,        // right-to-left matching
-               Lazy            = 0x800         // minimizing repeat
-       }
-
-       enum Position : ushort {
-               Any,                    // anywhere
-               Start,                  // start of string                      \A
-               StartOfString,          // start of string                      \A
-               StartOfLine,            // start of line                        ^
-               StartOfScan,            // start of scan                        \G
-               End,                    // end or before newline at end         \Z
-               EndOfString,            // end of string                        \z
-               EndOfLine,              // end of line                          $
-               Boundary,               // word boundary                        \b
-               NonBoundary             // not word boundary                    \B
-       };
-       
-       // see category.cs for Category enum
-
-       interface IMachine {
-               Match Scan (Regex regex, string text, int start, int end);
-               Match Scan (Regex regex, string text, int start, int end, bool substring_mode);
-               string [] Split (Regex regex, string input, int count, int startat);
-               string Replace (Regex regex, string input, string replacement, int count, int startat);
-               string Result (string replacement, Match match);
-       }
-
-       interface IMachineFactory {
-               IMachine NewInstance ();
-               IDictionary Mapping { get; set; }
-               int GroupCount { get; }
-               int Gap { get; set; } // Index of first group whose number differs from its index, or 1+GroupCount
-               string [] NamesMapping { get; set; }
-       }
-
-       // Anchor SKIP OFFSET
-       //
-       // Flags:       [RightToLeft] ??
-       // SKIP:        relative address of tail expression
-       // OFFSET:      offset of anchor from start of pattern
-       //
-       // Usage:
-       //
-       //      Anchor :1 OFFSET
-       //              <expr>
-       //              True
-       // 1:   <tail>
-       //
-       // Notes:
-       //
-       // In practice, the anchoring expression is only going to be
-       // Position (StartOfString, StartOfLine, StartOfScan) or String.
-       // This is because the optimizer looks for position anchors at the
-       // start of the expression, and if that fails it looks for the
-       // longest substring. If an expression has neither a position
-       // anchor or a longest substring anchor, then the anchoring expression
-       // is left empty. Since an empty expression will anchor at any
-       // position in any string, the entire input string will be scanned.
-
-       // String LEN STR...
-       //
-       // Flags:       [RightToLeft, IgnoreCase]
-       // LEN:         length of string
-       // STR:         string characters
-
-       // Branch SKIP
-       //
-       // SKIP:        relative address of next branch
-       //
-       //      Branch :1
-       //              <alt expr 1>
-       //              Jump :4
-       // 1:   Branch :2
-       //              <alt expr 2>
-       //              Jump :4
-       // 2:   Branch :3
-       //              <alt expr 3>
-       //              Jump :4
-       // 3:   False
-       // 4:   <tail>
-
-       // Repeat SKIP MIN MAX
-       //
-       // Flags:       [Lazy]
-       // SKIP:        relative address of Until instruction
-       // MIN:         minimum iterations (2 slots)
-       // MAX:         maximum iterations (2 slots, 0x7fffffff is infinity)
-       //
-       //      Repeat :1 MIN MAX
-       //              <expr>
-       //              Until
-       // 1:   <tail>
-
-       // FastRepeat SKIP MIN MAX
-       //
-       // Flags:       [Lazy]
-       // SKIP:        relative address of tail expression
-       // MIN:         minimum iterations (2 slots)
-       // MAX:         maximum iterations (2 slots, 0x7fffffff is infinity)
-       //
-       //      FastRepeat :1 MIN MAX
-       //              <expr>
-       //              True
-       // 1:   <tail>
-       //
-       // Notes:
-       //
-       // The subexpression of a FastRepeat construct must not contain any
-       // complex operators. These include: Open, Close, Balance, Repeat,
-       // FastRepeat, Sub, Test. In addition, the subexpression must have
-       // been determined to have a fixed width.
-       
-       // Sub SKIP
-       //
-       // SKIP:        relative address of tail expression
-       //
-       //      Sub :1
-       //              <expr>
-       // 1:   <tail>
-       //
-       // Notes:
-       //
-       // The Sub operator invokes an independent subexpression. This means
-       // that the subexpression will match only once and so will not
-       // participate in any backtracking.
-
-       // Test TSKIP FSKIP
-       //
-       // TSKIP:       relative address of true expression
-       // FSKIP:       relative address of false expression
-       //
-       // Usage:       (?(?=test)true|false)
-       //
-       //      Test :1 :2
-       //              <test expr>
-       // 1:           <true expr>
-       //              Jump
-       // 2:           <false epxr>
-       //      <tail>
-       //
-       // Usage:       (?(?=test)true)
-       //
-       //      Test :1 :2
-       //              <test expr>
-       // 1:           <true expr>
-       // 2:   <tail>
-       //
-       // Usage:       (?=test)
-       //
-       //      Test :1 :2
-       //              <test expr>
-       // 1:           <true expr>
-       //              Jump 3:
-       // 2:           False
-       // 3:           <tail>
-       //
-       // Notes:
-       //
-       // For negative lookaheads, just swap the values of TSKIP and
-       // FSKIP. For lookbehinds, the test expression must be compiled
-       // in reverse. The test expression is always executed as an
-       // independent subexpression, so its behaviour is non-backtracking
-       // (like a Sub clause.)
-
-       // IfDefined SKIP GID
-       //
-       // SKIP:        relative address of else expression
-       // GID:         number of group to check
-       //
-       // Usage:       (?(gid)true)
-       //
-       //      IfDefined :1
-       //              <true expr>
-       // 1:   <tail>
-       //
-       // Usage:       (?(gid)true|false)
-       //
-       //      IfDefined :1
-       //              <true expr>
-       //              Jump :2
-       // 1:           <false expr>
-       // 2:   <tail>
-
-       // Jump SKIP
-       //
-       // SKIP:        relative address of target expression
-       //
-       //      Jump :1
-       //      ...
-       // :1   <target expr>
-
-       // Character CHAR
-       //
-       // Flags:       [Negate, IgnoreCase, RightToLeft]
-       // CHAR:        exact character to match
-
-       // Category CAT
-       //
-       // Flags:       [Negate, RightToLeft]
-       // CAT:         category to match (see Category enum)
-
-       // Range LO HI
-       //
-       // Flags:       [Negate, IgnoreCase, RightToLeft]
-       // LO:          lowest character in range
-       // HI:          higest character in range
-
-       // Set LO LEN SET...
-       //
-       // Flags:       [Negate, IgnoreCase, RightToLeft]
-       // LO:          lowest character in set
-       // LEN:         number of words in set
-       // SET:         bit array representing characters in set
-       //
-       // Notes:
-       //
-       // Each word in the set represents 16 characters, so the first word
-       // defines membership for characters LO to LO + 15, the second for
-       // LO + 16 to LO + 31, and so on up to LO + (LEN * 16 - 1). It is
-       // up to the compiler to provide a compact representation for sparse
-       // unicode sets. The simple way is to use Set 0 4096. Other methods
-       // involve paritioning the set and placing the components into an
-       // In block.
-
-       // In SKIP
-       //
-       // SKIP:        relative address of tail expression
-       //
-       // Usage:       [expr]
-       //
-       //      In :1
-       //              <expr>
-       //              True
-       // :1   <tail>
-       //
-       // Usage:       [^expr]
-       //
-       //      In :1
-       //              <expr>
-       //              False
-       // :1   <tail>
-       //
-       // Notes:
-       //
-       // The In instruction consumes a single character, using the flags
-       // of the first instruction in the subexpression to determine its
-       // IgnoreCase and RightToLeft properties. The subexpression is then
-       // applied to the single character as a disjunction. If any instruction
-       // in the subexpression succeeds, the entire In construct succeeds
-       // and matching continues with the tail.
-
-       // Position POS
-       //
-       // POS:         position to match (see Position enum)
-
-       // Open GID
-       //
-       // GID:         number of group to open
-
-       // Close GID
-       //
-       // GID:         number of group to close
-       
-       // Balance GID BAL
-       //
-       // GID:         number of capturing group (0 if none)
-       // BAL:         number of group to undefine
-
-       // Info GROUPS MIN MAX
-       //
-       // GROUPS:      number of capturing groups (2 slots)
-       // MIN:         minimum width of pattern (2 slots)
-       // MAX:         maximum width of pattern (2 slots, 0x7fffffff means undefined)
-
-       // False
-
-       // True
-
-       // Reference GID
-       //
-       // Flags:       [IgnoreCase, RightToLeft]
-       // GID:         number of group to reference
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/cache.cs b/mcs/class/System/System.Text.RegularExpressions/cache.cs
deleted file mode 100644 (file)
index f407622..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-//\r
-// assembly:   System\r
-// namespace:  System.Text.RegularExpressions\r
-// file:       cache.cs\r
-//\r
-// author:     Dan Lewis (dlewis@gmx.co.uk)\r
-//             (c) 2002\r
-\r
-//\r
-// Permission is hereby granted, free of charge, to any person obtaining\r
-// a copy of this software and associated documentation files (the\r
-// "Software"), to deal in the Software without restriction, including\r
-// without limitation the rights to use, copy, modify, merge, publish,\r
-// distribute, sublicense, and/or sell copies of the Software, and to\r
-// permit persons to whom the Software is furnished to do so, subject to\r
-// the following conditions:\r
-// \r
-// The above copyright notice and this permission notice shall be\r
-// included in all copies or substantial portions of the Software.\r
-// \r
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-//\r
-\r
-using System;\r
-using System.Collections;\r
-\r
-namespace System.Text.RegularExpressions {\r
-\r
-       class FactoryCache {\r
-               public FactoryCache (int capacity) {\r
-                       this.capacity = capacity;\r
-                       this.factories = new Hashtable (capacity);\r
-                       this.mru_list = new MRUList ();\r
-               }\r
-\r
-               public void Add (string pattern, RegexOptions options, IMachineFactory factory) {\r
-                       lock (this) {\r
-                               Key k = new Key (pattern, options);\r
-                               Cleanup ();\r
-                               factories[k] = factory;\r
-                               mru_list.Use (k);\r
-                       }\r
-               }\r
-\r
-               // lock must be held by the caller\r
-               void Cleanup ()\r
-               {\r
-                       while (factories.Count >= capacity && capacity > 0) {\r
-                               object victim = mru_list.Evict ();\r
-                               if (victim != null)\r
-                                       factories.Remove ((Key) victim);\r
-                       }\r
-               }\r
-\r
-               public IMachineFactory Lookup (string pattern, RegexOptions options) {\r
-                       lock (this) {\r
-                               Key k = new Key (pattern, options);\r
-                               if (factories.Contains (k)) {\r
-                                       mru_list.Use (k);\r
-                                       return (IMachineFactory)factories[k];\r
-                               }\r
-                       }\r
-\r
-                       return null;\r
-               }\r
-\r
-               public int Capacity {\r
-                       get { return capacity; }\r
-                       set {\r
-                               // < 0 check done in the caller (Regex.CacheSize)\r
-                               lock (this) {\r
-                                       capacity = value;\r
-                                       Cleanup ();\r
-                               }\r
-                       }\r
-               }\r
-\r
-               private int capacity;\r
-               private Hashtable factories;\r
-               private MRUList mru_list;\r
-\r
-               class Key {\r
-                       public string pattern;\r
-                       public RegexOptions options;\r
-\r
-                       public Key (string pattern, RegexOptions options) {\r
-                               this.pattern = pattern;\r
-                               this.options = options;\r
-                       }\r
-                       \r
-                       public override int GetHashCode () {\r
-                               return pattern.GetHashCode () ^ (int)options;\r
-                       }\r
-\r
-                       public override bool Equals (object o) {\r
-                               if (o == null || !(o is Key))\r
-                                       return false;\r
-\r
-                               Key k = (Key)o;\r
-                               return options == k.options && pattern.Equals (k.pattern);\r
-                       }\r
-\r
-                       public override string ToString () {\r
-                               return "('" + pattern + "', [" + options + "])";\r
-                       }\r
-               }\r
-       }\r
-\r
-       class MRUList {\r
-               public MRUList () {\r
-                       head = tail = null;\r
-               }\r
-\r
-               public void Use (object o) {\r
-                       Node node;\r
-\r
-                       if (head == null) {\r
-                               node = new Node (o);\r
-                               head = tail = node;\r
-                               return;\r
-                       }\r
-\r
-                       node = head;\r
-                       while (node != null && !o.Equals (node.value))\r
-                               node = node.previous;\r
-\r
-                       if (node == null)\r
-                               node = new Node (o);\r
-                       else {\r
-                               if (node == head)\r
-                                       return;\r
-\r
-                               if (node == tail)\r
-                                       tail = node.next;\r
-                               else\r
-                                       node.previous.next = node.next;\r
-\r
-                               node.next.previous = node.previous;\r
-                       }\r
-\r
-                       head.next = node;\r
-                       node.previous = head;\r
-                       node.next = null;\r
-                       head = node;\r
-               }\r
-\r
-               public object Evict () {\r
-                       if (tail == null)\r
-                               return null;\r
-\r
-                       object o = tail.value;\r
-                       tail = tail.next;\r
-\r
-                       if (tail == null)\r
-                               head = null;\r
-                       else\r
-                               tail.previous = null;\r
-\r
-                       return o;\r
-               }\r
-\r
-               private Node head, tail;\r
-\r
-               private class Node {\r
-                       public object value;\r
-                       public Node previous, next;\r
-\r
-                       public Node (object value) {\r
-                               this.value = value;\r
-                       }\r
-               }\r
-       }\r
-}\r
diff --git a/mcs/class/System/System.Text.RegularExpressions/category.cs b/mcs/class/System/System.Text.RegularExpressions/category.cs
deleted file mode 100644 (file)
index b64dcb3..0000000
+++ /dev/null
@@ -1,660 +0,0 @@
-//\r
-// assembly:   System\r
-// namespace:  System.Text.RegularExpressions\r
-// file:       category.cs\r
-//\r
-// author:     Dan Lewis (dlewis@gmx.co.uk)\r
-//             (c) 2002\r
-\r
-//\r
-// Permission is hereby granted, free of charge, to any person obtaining\r
-// a copy of this software and associated documentation files (the\r
-// "Software"), to deal in the Software without restriction, including\r
-// without limitation the rights to use, copy, modify, merge, publish,\r
-// distribute, sublicense, and/or sell copies of the Software, and to\r
-// permit persons to whom the Software is furnished to do so, subject to\r
-// the following conditions:\r
-// \r
-// The above copyright notice and this permission notice shall be\r
-// included in all copies or substantial portions of the Software.\r
-// \r
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-//\r
-\r
-using System;\r
-using System.Globalization;\r
-\r
-namespace System.Text.RegularExpressions {\r
-\r
-       enum Category : ushort {\r
-               None,\r
-\r
-               // canonical classes\r
-       \r
-               Any,                    // any character except newline         .\r
-               AnySingleline,          // any character                        . (s option)\r
-               Word,                   // any word character                   \w\r
-               Digit,                  // any digit character                  \d\r
-               WhiteSpace,             // any whitespace character             \s\r
-               \r
-               // ECMAScript classes\r
-\r
-\r
-               EcmaAny,\r
-               EcmaAnySingleline,\r
-               EcmaWord,               // [a-zA-Z_0-9]\r
-               EcmaDigit,              // [0-9]\r
-               EcmaWhiteSpace,         // [ \f\n\r\t\v]\r
-\r
-               // unicode categories\r
-               \r
-               UnicodeL,               // Letter\r
-               UnicodeM,               // Mark\r
-               UnicodeN,               // Number\r
-               UnicodeZ,               // Separator\r
-               UnicodeP,               // Punctuation\r
-               UnicodeS,               // Symbol\r
-               UnicodeC,               // Other\r
-\r
-               UnicodeLu,              // UppercaseLetter\r
-               UnicodeLl,              // LowercaseLetter\r
-               UnicodeLt,              // TitlecaseLetter\r
-               UnicodeLm,              // ModifierLetter\r
-               UnicodeLo,              // OtherLetter\r
-               UnicodeMn,              // NonspacingMark\r
-               UnicodeMe,              // EnclosingMark\r
-               UnicodeMc,              // SpacingMark\r
-               UnicodeNd,              // DecimalNumber\r
-               UnicodeNl,              // LetterNumber\r
-               UnicodeNo,              // OtherNumber\r
-               UnicodeZs,              // SpaceSeparator\r
-               UnicodeZl,              // LineSeparator\r
-               UnicodeZp,              // ParagraphSeparator\r
-               UnicodePd,              // DashPunctuation\r
-               UnicodePs,              // OpenPunctuation\r
-               UnicodePi,              // InitialPunctuation\r
-               UnicodePe,              // ClosePunctuation\r
-               UnicodePf,              // FinalPunctuation\r
-               UnicodePc,              // ConnectorPunctuation\r
-               UnicodePo,              // OtherPunctuation\r
-               UnicodeSm,              // MathSymbol\r
-               UnicodeSc,              // CurrencySymbol\r
-               UnicodeSk,              // ModifierSymbol\r
-               UnicodeSo,              // OtherSymbol\r
-               UnicodeCc,              // Control\r
-               UnicodeCf,              // Format\r
-               UnicodeCo,              // PrivateUse\r
-               UnicodeCs,              // Surrogate\r
-               UnicodeCn,              // Unassigned\r
-\r
-               // unicode block ranges\r
-\r
-               // notes: the categories marked with a star are valid unicode block ranges,\r
-               // but don't seem to be accepted by the MS parser using the /p{...} format.\r
-               // any ideas?\r
-\r
-               UnicodeBasicLatin,\r
-               UnicodeLatin1Supplement,                        // *\r
-               UnicodeLatinExtendedA,                          // *\r
-               UnicodeLatinExtendedB,                          // *\r
-               UnicodeIPAExtensions,\r
-               UnicodeSpacingModifierLetters,\r
-               UnicodeCombiningDiacriticalMarks,\r
-               UnicodeGreek,\r
-               UnicodeCyrillic,\r
-               UnicodeArmenian,\r
-               UnicodeHebrew,\r
-               UnicodeArabic,\r
-               UnicodeSyriac,\r
-               UnicodeThaana,\r
-               UnicodeDevanagari,\r
-               UnicodeBengali,\r
-               UnicodeGurmukhi,\r
-               UnicodeGujarati,\r
-               UnicodeOriya,\r
-               UnicodeTamil,\r
-               UnicodeTelugu,\r
-               UnicodeKannada,\r
-               UnicodeMalayalam,\r
-               UnicodeSinhala,\r
-               UnicodeThai,\r
-               UnicodeLao,\r
-               UnicodeTibetan,\r
-               UnicodeMyanmar,\r
-               UnicodeGeorgian,\r
-               UnicodeHangulJamo,\r
-               UnicodeEthiopic,\r
-               UnicodeCherokee,\r
-               UnicodeUnifiedCanadianAboriginalSyllabics,\r
-               UnicodeOgham,\r
-               UnicodeRunic,\r
-               UnicodeKhmer,\r
-               UnicodeMongolian,\r
-               UnicodeLatinExtendedAdditional,\r
-               UnicodeGreekExtended,\r
-               UnicodeGeneralPunctuation,\r
-               UnicodeSuperscriptsandSubscripts,\r
-               UnicodeCurrencySymbols,\r
-               UnicodeCombiningMarksforSymbols,\r
-               UnicodeLetterlikeSymbols,\r
-               UnicodeNumberForms,\r
-               UnicodeArrows,\r
-               UnicodeMathematicalOperators,\r
-               UnicodeMiscellaneousTechnical,\r
-               UnicodeControlPictures,\r
-               UnicodeOpticalCharacterRecognition,\r
-               UnicodeEnclosedAlphanumerics,\r
-               UnicodeBoxDrawing,\r
-               UnicodeBlockElements,\r
-               UnicodeGeometricShapes,\r
-               UnicodeMiscellaneousSymbols,\r
-               UnicodeDingbats,\r
-               UnicodeBraillePatterns,\r
-               UnicodeCJKRadicalsSupplement,\r
-               UnicodeKangxiRadicals,\r
-               UnicodeIdeographicDescriptionCharacters,\r
-               UnicodeCJKSymbolsandPunctuation,\r
-               UnicodeHiragana,\r
-               UnicodeKatakana,\r
-               UnicodeBopomofo,\r
-               UnicodeHangulCompatibilityJamo,\r
-               UnicodeKanbun,\r
-               UnicodeBopomofoExtended,\r
-               UnicodeEnclosedCJKLettersandMonths,\r
-               UnicodeCJKCompatibility,\r
-               UnicodeCJKUnifiedIdeographsExtensionA,\r
-               UnicodeCJKUnifiedIdeographs,\r
-               UnicodeYiSyllables,\r
-               UnicodeYiRadicals,\r
-               UnicodeHangulSyllables,\r
-               UnicodeHighSurrogates,\r
-               UnicodeHighPrivateUseSurrogates,\r
-               UnicodeLowSurrogates,\r
-               UnicodePrivateUse,\r
-               UnicodeCJKCompatibilityIdeographs,\r
-               UnicodeAlphabeticPresentationForms,\r
-               UnicodeArabicPresentationFormsA,                // *\r
-               UnicodeCombiningHalfMarks,\r
-               UnicodeCJKCompatibilityForms,\r
-               UnicodeSmallFormVariants,\r
-               UnicodeArabicPresentationFormsB,                // *\r
-               UnicodeSpecials,\r
-               UnicodeHalfwidthandFullwidthForms,\r
-               \r
-               UnicodeOldItalic,\r
-               UnicodeGothic,\r
-               UnicodeDeseret,\r
-               UnicodeByzantineMusicalSymbols,\r
-               UnicodeMusicalSymbols,\r
-               UnicodeMathematicalAlphanumericSymbols,\r
-               UnicodeCJKUnifiedIdeographsExtensionB,\r
-               UnicodeCJKCompatibilityIdeographsSupplement,\r
-               UnicodeTags,\r
-\r
-               LastValue // Keep this with the higher value in the enumeration\r
-       }\r
-\r
-       class CategoryUtils {\r
-               public static Category CategoryFromName (string name) {\r
-                       try {\r
-                               if (name.StartsWith ("Is"))     // remove prefix from block range\r
-                                       name = name.Substring (2);\r
-\r
-                               return (Category) Enum.Parse (typeof (Category), "Unicode" + name, false);\r
-                       }\r
-                       catch (ArgumentException) {\r
-                               return Category.None;\r
-                       }\r
-               }\r
-       \r
-               public static bool IsCategory (Category cat, char c) {\r
-                       switch (cat) {\r
-                       case Category.None:\r
-                               return false;\r
-                       \r
-                       case Category.Any:\r
-                               return c != '\n';\r
-\r
-                       case Category.AnySingleline:\r
-                               return true;\r
-\r
-                       case Category.Word:\r
-                               return\r
-                                       Char.IsLetterOrDigit (c) ||\r
-                                       IsCategory (UnicodeCategory.ConnectorPunctuation, c);\r
-\r
-                       case Category.Digit:\r
-                               return Char.IsDigit (c);\r
-\r
-                       case Category.WhiteSpace:\r
-                               return Char.IsWhiteSpace (c);\r
-\r
-                       // ECMA categories\r
-\r
-                       case Category.EcmaAny:\r
-                               return c != '\n';\r
-                               \r
-                       case Category.EcmaAnySingleline:\r
-                               return true;\r
-\r
-                       case Category.EcmaWord:\r
-                               return\r
-                                       'a' <= c && c <= 'z' ||\r
-                                       'A' <= c && c <= 'Z' ||\r
-                                       '0' <= c && c <= '9' ||\r
-                                       '_' == c;\r
-\r
-                       case Category.EcmaDigit:\r
-                               return\r
-                                       '0' <= c && c <= '9';\r
-                       \r
-                       case Category.EcmaWhiteSpace:\r
-                               return\r
-                                       c == ' '  ||\r
-                                       c == '\f' ||\r
-                                       c == '\n' ||\r
-                                       c == '\r' ||\r
-                                       c == '\t' ||\r
-                                       c == '\v';\r
-\r
-                       // Unicode categories...\r
-\r
-                       // letter\r
-                       \r
-                       case Category.UnicodeLu: return IsCategory (UnicodeCategory.UppercaseLetter, c);\r
-                       case Category.UnicodeLl: return IsCategory (UnicodeCategory.LowercaseLetter, c);\r
-                       case Category.UnicodeLt: return IsCategory (UnicodeCategory.TitlecaseLetter, c);\r
-                       case Category.UnicodeLm: return IsCategory (UnicodeCategory.ModifierLetter, c);\r
-                       case Category.UnicodeLo: return IsCategory (UnicodeCategory.OtherLetter, c);\r
-\r
-                       // mark\r
-\r
-                       case Category.UnicodeMn: return IsCategory (UnicodeCategory.NonSpacingMark, c);\r
-                       case Category.UnicodeMe: return IsCategory (UnicodeCategory.EnclosingMark, c);\r
-                       case Category.UnicodeMc: return IsCategory (UnicodeCategory.SpacingCombiningMark, c);\r
-                       case Category.UnicodeNd: return IsCategory (UnicodeCategory.DecimalDigitNumber, c);\r
-\r
-                       // number\r
-\r
-                       case Category.UnicodeNl: return IsCategory (UnicodeCategory.LetterNumber, c);\r
-                       case Category.UnicodeNo: return IsCategory (UnicodeCategory.OtherNumber, c);\r
-\r
-                       // separator\r
-\r
-                       case Category.UnicodeZs: return IsCategory (UnicodeCategory.SpaceSeparator, c);\r
-                       case Category.UnicodeZl: return IsCategory (UnicodeCategory.LineSeparator, c);\r
-                       case Category.UnicodeZp: return IsCategory (UnicodeCategory.ParagraphSeparator, c);\r
-\r
-                       // punctuation\r
-\r
-                       case Category.UnicodePd: return IsCategory (UnicodeCategory.DashPunctuation, c);\r
-                       case Category.UnicodePs: return IsCategory (UnicodeCategory.OpenPunctuation, c);\r
-                       case Category.UnicodePi: return IsCategory (UnicodeCategory.InitialQuotePunctuation, c);\r
-                       case Category.UnicodePe: return IsCategory (UnicodeCategory.ClosePunctuation, c);\r
-                       case Category.UnicodePf: return IsCategory (UnicodeCategory.FinalQuotePunctuation, c);\r
-                       case Category.UnicodePc: return IsCategory (UnicodeCategory.ConnectorPunctuation, c);\r
-                       case Category.UnicodePo: return IsCategory (UnicodeCategory.OtherPunctuation, c);\r
-\r
-                       // symbol\r
-\r
-                       case Category.UnicodeSm: return IsCategory (UnicodeCategory.MathSymbol, c);\r
-                       case Category.UnicodeSc: return IsCategory (UnicodeCategory.CurrencySymbol, c);\r
-                       case Category.UnicodeSk: return IsCategory (UnicodeCategory.ModifierSymbol, c);\r
-                       case Category.UnicodeSo: return IsCategory (UnicodeCategory.OtherSymbol, c);\r
-\r
-                       // other\r
-\r
-                       case Category.UnicodeCc: return IsCategory (UnicodeCategory.Control, c);\r
-                       case Category.UnicodeCf: return IsCategory (UnicodeCategory.Format, c);\r
-                       case Category.UnicodeCo: return IsCategory (UnicodeCategory.PrivateUse, c);\r
-                       case Category.UnicodeCs: return IsCategory (UnicodeCategory.Surrogate, c);\r
-                       case Category.UnicodeCn: return IsCategory (UnicodeCategory.OtherNotAssigned, c); \r
-\r
-                       case Category.UnicodeL: // letter\r
-                               return\r
-                                       IsCategory (UnicodeCategory.UppercaseLetter, c) ||\r
-                                       IsCategory (UnicodeCategory.LowercaseLetter, c) ||\r
-                                       IsCategory (UnicodeCategory.TitlecaseLetter, c) ||\r
-                                       IsCategory (UnicodeCategory.ModifierLetter, c) ||\r
-                                       IsCategory (UnicodeCategory.OtherLetter, c);\r
-                       \r
-                       case Category.UnicodeM: // mark\r
-                               return\r
-                                       IsCategory (UnicodeCategory.NonSpacingMark, c) ||\r
-                                       IsCategory (UnicodeCategory.EnclosingMark, c) ||\r
-                                       IsCategory (UnicodeCategory.SpacingCombiningMark, c);\r
-\r
-                       case Category.UnicodeN: // number\r
-                               return\r
-                                       IsCategory (UnicodeCategory.DecimalDigitNumber, c) ||\r
-                                       IsCategory (UnicodeCategory.LetterNumber, c) ||\r
-                                       IsCategory (UnicodeCategory.OtherNumber, c);\r
-\r
-                       case Category.UnicodeZ: // separator\r
-                               return\r
-                                       IsCategory (UnicodeCategory.SpaceSeparator, c) ||\r
-                                       IsCategory (UnicodeCategory.LineSeparator, c) ||\r
-                                       IsCategory (UnicodeCategory.ParagraphSeparator, c);\r
-                                       \r
-                       case Category.UnicodeP: // punctuation\r
-                               return\r
-                                       IsCategory (UnicodeCategory.DashPunctuation, c) ||\r
-                                       IsCategory (UnicodeCategory.OpenPunctuation, c) ||\r
-                                       IsCategory (UnicodeCategory.InitialQuotePunctuation, c) ||\r
-                                       IsCategory (UnicodeCategory.ClosePunctuation, c) ||\r
-                                       IsCategory (UnicodeCategory.FinalQuotePunctuation, c) ||\r
-                                       IsCategory (UnicodeCategory.ConnectorPunctuation, c) ||\r
-                                       IsCategory (UnicodeCategory.OtherPunctuation, c);\r
-                       \r
-                       case Category.UnicodeS: // symbol\r
-                               return\r
-                                       IsCategory (UnicodeCategory.MathSymbol, c) ||\r
-                                       IsCategory (UnicodeCategory.CurrencySymbol, c) ||\r
-                                       IsCategory (UnicodeCategory.ModifierSymbol, c) ||\r
-                                       IsCategory (UnicodeCategory.OtherSymbol, c);\r
-                       \r
-                       case Category.UnicodeC: // other\r
-                               return\r
-                                       IsCategory (UnicodeCategory.Control, c) ||\r
-                                       IsCategory (UnicodeCategory.Format, c) ||\r
-                                       IsCategory (UnicodeCategory.PrivateUse, c) ||\r
-                                       IsCategory (UnicodeCategory.Surrogate, c) ||\r
-                                       IsCategory (UnicodeCategory.OtherNotAssigned, c);\r
-\r
-                       // Unicode block ranges...\r
-\r
-                       case Category.UnicodeBasicLatin:\r
-                               return '\u0000' <= c && c <= '\u007F';\r
-\r
-                       case Category.UnicodeLatin1Supplement:\r
-                               return '\u0080' <= c && c <= '\u00FF';\r
-\r
-                       case Category.UnicodeLatinExtendedA:\r
-                               return '\u0100' <= c && c <= '\u017F';\r
-\r
-                       case Category.UnicodeLatinExtendedB:\r
-                               return '\u0180' <= c && c <= '\u024F';\r
-\r
-                       case Category.UnicodeIPAExtensions:\r
-                               return '\u0250' <= c && c <= '\u02AF';\r
-\r
-                       case Category.UnicodeSpacingModifierLetters:\r
-                               return '\u02B0' <= c && c <= '\u02FF';\r
-\r
-                       case Category.UnicodeCombiningDiacriticalMarks:\r
-                               return '\u0300' <= c && c <= '\u036F';\r
-\r
-                       case Category.UnicodeGreek:\r
-                               return '\u0370' <= c && c <= '\u03FF';\r
-\r
-                       case Category.UnicodeCyrillic:\r
-                               return '\u0400' <= c && c <= '\u04FF';\r
-\r
-                       case Category.UnicodeArmenian:\r
-                               return '\u0530' <= c && c <= '\u058F';\r
-\r
-                       case Category.UnicodeHebrew:\r
-                               return '\u0590' <= c && c <= '\u05FF';\r
-\r
-                       case Category.UnicodeArabic:\r
-                               return '\u0600' <= c && c <= '\u06FF';\r
-\r
-                       case Category.UnicodeSyriac:\r
-                               return '\u0700' <= c && c <= '\u074F';\r
-\r
-                       case Category.UnicodeThaana:\r
-                               return '\u0780' <= c && c <= '\u07BF';\r
-\r
-                       case Category.UnicodeDevanagari:\r
-                               return '\u0900' <= c && c <= '\u097F';\r
-\r
-                       case Category.UnicodeBengali:\r
-                               return '\u0980' <= c && c <= '\u09FF';\r
-\r
-                       case Category.UnicodeGurmukhi:\r
-                               return '\u0A00' <= c && c <= '\u0A7F';\r
-\r
-                       case Category.UnicodeGujarati:\r
-                               return '\u0A80' <= c && c <= '\u0AFF';\r
-\r
-                       case Category.UnicodeOriya:\r
-                               return '\u0B00' <= c && c <= '\u0B7F';\r
-\r
-                       case Category.UnicodeTamil:\r
-                               return '\u0B80' <= c && c <= '\u0BFF';\r
-\r
-                       case Category.UnicodeTelugu:\r
-                               return '\u0C00' <= c && c <= '\u0C7F';\r
-\r
-                       case Category.UnicodeKannada:\r
-                               return '\u0C80' <= c && c <= '\u0CFF';\r
-\r
-                       case Category.UnicodeMalayalam:\r
-                               return '\u0D00' <= c && c <= '\u0D7F';\r
-\r
-                       case Category.UnicodeSinhala:\r
-                               return '\u0D80' <= c && c <= '\u0DFF';\r
-\r
-                       case Category.UnicodeThai:\r
-                               return '\u0E00' <= c && c <= '\u0E7F';\r
-\r
-                       case Category.UnicodeLao:\r
-                               return '\u0E80' <= c && c <= '\u0EFF';\r
-\r
-                       case Category.UnicodeTibetan:\r
-                               return '\u0F00' <= c && c <= '\u0FFF';\r
-\r
-                       case Category.UnicodeMyanmar:\r
-                               return '\u1000' <= c && c <= '\u109F';\r
-\r
-                       case Category.UnicodeGeorgian:\r
-                               return '\u10A0' <= c && c <= '\u10FF';\r
-\r
-                       case Category.UnicodeHangulJamo:\r
-                               return '\u1100' <= c && c <= '\u11FF';\r
-\r
-                       case Category.UnicodeEthiopic:\r
-                               return '\u1200' <= c && c <= '\u137F';\r
-\r
-                       case Category.UnicodeCherokee:\r
-                               return '\u13A0' <= c && c <= '\u13FF';\r
-\r
-                       case Category.UnicodeUnifiedCanadianAboriginalSyllabics:\r
-                               return '\u1400' <= c && c <= '\u167F';\r
-\r
-                       case Category.UnicodeOgham:\r
-                               return '\u1680' <= c && c <= '\u169F';\r
-\r
-                       case Category.UnicodeRunic:\r
-                               return '\u16A0' <= c && c <= '\u16FF';\r
-\r
-                       case Category.UnicodeKhmer:\r
-                               return '\u1780' <= c && c <= '\u17FF';\r
-\r
-                       case Category.UnicodeMongolian:\r
-                               return '\u1800' <= c && c <= '\u18AF';\r
-\r
-                       case Category.UnicodeLatinExtendedAdditional:\r
-                               return '\u1E00' <= c && c <= '\u1EFF';\r
-\r
-                       case Category.UnicodeGreekExtended:\r
-                               return '\u1F00' <= c && c <= '\u1FFF';\r
-\r
-                       case Category.UnicodeGeneralPunctuation:\r
-                               return '\u2000' <= c && c <= '\u206F';\r
-\r
-                       case Category.UnicodeSuperscriptsandSubscripts:\r
-                               return '\u2070' <= c && c <= '\u209F';\r
-\r
-                       case Category.UnicodeCurrencySymbols:\r
-                               return '\u20A0' <= c && c <= '\u20CF';\r
-\r
-                       case Category.UnicodeCombiningMarksforSymbols:\r
-                               return '\u20D0' <= c && c <= '\u20FF';\r
-\r
-                       case Category.UnicodeLetterlikeSymbols:\r
-                               return '\u2100' <= c && c <= '\u214F';\r
-\r
-                       case Category.UnicodeNumberForms:\r
-                               return '\u2150' <= c && c <= '\u218F';\r
-\r
-                       case Category.UnicodeArrows:\r
-                               return '\u2190' <= c && c <= '\u21FF';\r
-\r
-                       case Category.UnicodeMathematicalOperators:\r
-                               return '\u2200' <= c && c <= '\u22FF';\r
-\r
-                       case Category.UnicodeMiscellaneousTechnical:\r
-                               return '\u2300' <= c && c <= '\u23FF';\r
-\r
-                       case Category.UnicodeControlPictures:\r
-                               return '\u2400' <= c && c <= '\u243F';\r
-\r
-                       case Category.UnicodeOpticalCharacterRecognition:\r
-                               return '\u2440' <= c && c <= '\u245F';\r
-\r
-                       case Category.UnicodeEnclosedAlphanumerics:\r
-                               return '\u2460' <= c && c <= '\u24FF';\r
-\r
-                       case Category.UnicodeBoxDrawing:\r
-                               return '\u2500' <= c && c <= '\u257F';\r
-\r
-                       case Category.UnicodeBlockElements:\r
-                               return '\u2580' <= c && c <= '\u259F';\r
-\r
-                       case Category.UnicodeGeometricShapes:\r
-                               return '\u25A0' <= c && c <= '\u25FF';\r
-\r
-                       case Category.UnicodeMiscellaneousSymbols:\r
-                               return '\u2600' <= c && c <= '\u26FF';\r
-\r
-                       case Category.UnicodeDingbats:\r
-                               return '\u2700' <= c && c <= '\u27BF';\r
-\r
-                       case Category.UnicodeBraillePatterns:\r
-                               return '\u2800' <= c && c <= '\u28FF';\r
-\r
-                       case Category.UnicodeCJKRadicalsSupplement:\r
-                               return '\u2E80' <= c && c <= '\u2EFF';\r
-\r
-                       case Category.UnicodeKangxiRadicals:\r
-                               return '\u2F00' <= c && c <= '\u2FDF';\r
-\r
-                       case Category.UnicodeIdeographicDescriptionCharacters:\r
-                               return '\u2FF0' <= c && c <= '\u2FFF';\r
-\r
-                       case Category.UnicodeCJKSymbolsandPunctuation:\r
-                               return '\u3000' <= c && c <= '\u303F';\r
-\r
-                       case Category.UnicodeHiragana:\r
-                               return '\u3040' <= c && c <= '\u309F';\r
-\r
-                       case Category.UnicodeKatakana:\r
-                               return '\u30A0' <= c && c <= '\u30FF';\r
-\r
-                       case Category.UnicodeBopomofo:\r
-                               return '\u3100' <= c && c <= '\u312F';\r
-\r
-                       case Category.UnicodeHangulCompatibilityJamo:\r
-                               return '\u3130' <= c && c <= '\u318F';\r
-\r
-                       case Category.UnicodeKanbun:\r
-                               return '\u3190' <= c && c <= '\u319F';\r
-\r
-                       case Category.UnicodeBopomofoExtended:\r
-                               return '\u31A0' <= c && c <= '\u31BF';\r
-\r
-                       case Category.UnicodeEnclosedCJKLettersandMonths:\r
-                               return '\u3200' <= c && c <= '\u32FF';\r
-\r
-                       case Category.UnicodeCJKCompatibility:\r
-                               return '\u3300' <= c && c <= '\u33FF';\r
-\r
-                       case Category.UnicodeCJKUnifiedIdeographsExtensionA:\r
-                               return '\u3400' <= c && c <= '\u4DB5';\r
-\r
-                       case Category.UnicodeCJKUnifiedIdeographs:\r
-                               return '\u4E00' <= c && c <= '\u9FFF';\r
-\r
-                       case Category.UnicodeYiSyllables:\r
-                               return '\uA000' <= c && c <= '\uA48F';\r
-\r
-                       case Category.UnicodeYiRadicals:\r
-                               return '\uA490' <= c && c <= '\uA4CF';\r
-\r
-                       case Category.UnicodeHangulSyllables:\r
-                               return '\uAC00' <= c && c <= '\uD7A3';\r
-\r
-                       case Category.UnicodeHighSurrogates:\r
-                               return '\uD800' <= c && c <= '\uDB7F';\r
-\r
-                       case Category.UnicodeHighPrivateUseSurrogates:\r
-                               return '\uDB80' <= c && c <= '\uDBFF';\r
-\r
-                       case Category.UnicodeLowSurrogates:\r
-                               return '\uDC00' <= c && c <= '\uDFFF';\r
-\r
-                       case Category.UnicodePrivateUse:\r
-                               return '\uE000' <= c && c <= '\uF8FF';\r
-\r
-                       case Category.UnicodeCJKCompatibilityIdeographs:\r
-                               return '\uF900' <= c && c <= '\uFAFF';\r
-\r
-                       case Category.UnicodeAlphabeticPresentationForms:\r
-                               return '\uFB00' <= c && c <= '\uFB4F';\r
-\r
-                       case Category.UnicodeArabicPresentationFormsA:\r
-                               return '\uFB50' <= c && c <= '\uFDFF';\r
-\r
-                       case Category.UnicodeCombiningHalfMarks:\r
-                               return '\uFE20' <= c && c <= '\uFE2F';\r
-\r
-                       case Category.UnicodeCJKCompatibilityForms:\r
-                               return '\uFE30' <= c && c <= '\uFE4F';\r
-\r
-                       case Category.UnicodeSmallFormVariants:\r
-                               return '\uFE50' <= c && c <= '\uFE6F';\r
-\r
-                       case Category.UnicodeArabicPresentationFormsB:\r
-                               return '\uFE70' <= c && c <= '\uFEFE';\r
-\r
-                       case Category.UnicodeHalfwidthandFullwidthForms:\r
-                               return '\uFF00' <= c && c <= '\uFFEF';\r
-\r
-                       case Category.UnicodeSpecials:\r
-                               return\r
-                                       '\uFEFF' <= c && c <= '\uFEFF' ||\r
-                                       '\uFFF0' <= c && c <= '\uFFFD';\r
-\r
-                       // these block ranges begin above 0x10000\r
-\r
-                       case Category.UnicodeOldItalic:\r
-                       case Category.UnicodeGothic:\r
-                       case Category.UnicodeDeseret:\r
-                       case Category.UnicodeByzantineMusicalSymbols:\r
-                       case Category.UnicodeMusicalSymbols:\r
-                       case Category.UnicodeMathematicalAlphanumericSymbols:\r
-                       case Category.UnicodeCJKUnifiedIdeographsExtensionB:\r
-                       case Category.UnicodeCJKCompatibilityIdeographsSupplement:\r
-                       case Category.UnicodeTags:\r
-                               return false;\r
-\r
-                       default:\r
-                               return false;\r
-                       }\r
-               }\r
-\r
-               private static bool IsCategory (UnicodeCategory uc, char c) {\r
-                       if (Char.GetUnicodeCategory (c) == uc)\r
-                               return true;\r
-\r
-                       return false;\r
-               }\r
-       }\r
-}\r
diff --git a/mcs/class/System/System.Text.RegularExpressions/compiler.cs b/mcs/class/System/System.Text.RegularExpressions/compiler.cs
deleted file mode 100644 (file)
index cd2a8bc..0000000
+++ /dev/null
@@ -1,533 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       compiler.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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.Diagnostics;
-using System.Collections;
-
-namespace System.Text.RegularExpressions {
-       abstract class LinkRef {
-#if TRACE_REGEX
-               static int next_label = 1;
-               int label = next_label++;
-
-               public override string ToString ()
-               {
-                       return "L" + label.ToString ();
-               }
-#endif
-       }
-               
-       interface ICompiler {
-               void Reset ();
-               IMachineFactory GetMachineFactory ();
-
-               // instruction emission
-
-               void EmitFalse ();
-               void EmitTrue ();
-
-               // character matching
-
-               void EmitCharacter (char c, bool negate, bool ignore, bool reverse);
-               void EmitCategory (Category cat, bool negate, bool reverse);
-               void EmitNotCategory (Category cat, bool negate, bool reverse);
-               void EmitRange (char lo, char hi, bool negate, bool ignore, bool reverse);
-               void EmitSet (char lo, BitArray set, bool negate, bool ignore, bool reverse);
-
-               // other operators
-
-               void EmitString (string str, bool ignore, bool reverse);
-               void EmitPosition (Position pos);
-               void EmitOpen (int gid);
-               void EmitClose (int gid);
-               void EmitBalanceStart(int gid, int balance, bool capture,  LinkRef tail);
-               void EmitBalance ();
-               void EmitReference (int gid, bool ignore, bool reverse);
-
-               // constructs
-
-               void EmitIfDefined (int gid, LinkRef tail);
-               void EmitSub (LinkRef tail);
-               void EmitTest (LinkRef yes, LinkRef tail);
-               void EmitBranch (LinkRef next);
-               void EmitJump (LinkRef target);
-               void EmitRepeat (int min, int max, bool lazy, LinkRef until);
-               void EmitUntil (LinkRef repeat);
-               void EmitIn (LinkRef tail);
-               void EmitInfo (int count, int min, int max);
-               void EmitFastRepeat (int min, int max, bool lazy, LinkRef tail);
-               void EmitAnchor (bool reverse, int offset, LinkRef tail);
-
-               // event for the CILCompiler
-               void EmitBranchEnd();
-               void EmitAlternationEnd();
-
-               LinkRef NewLink ();
-               void ResolveLink (LinkRef link);
-       }
-
-       class InterpreterFactory : IMachineFactory {
-               public InterpreterFactory (ushort[] pattern) {
-                       this.pattern = pattern;
-               }
-               
-               public IMachine NewInstance () {
-                       return new Interpreter (pattern);
-               }
-
-               public int GroupCount {
-                       get { return pattern[1]; }
-               }
-
-               public int Gap {
-                       get { return gap; }
-                       set { gap = value; }
-               }
-
-               public IDictionary Mapping {
-                       get { return mapping; }
-                       set { mapping = value; }
-               }
-
-               public string [] NamesMapping {
-                       get { return namesMapping; }
-                       set { namesMapping = value; }
-               }
-
-               private IDictionary mapping;
-               private ushort[] pattern;
-               private string [] namesMapping;
-               private int gap;
-       }
-
-       class PatternCompiler : ICompiler {
-               public static ushort EncodeOp (OpCode op, OpFlags flags) {
-                       return (ushort)((int)op | ((int)flags & 0xff00));
-               }
-
-               [Conditional ("TRACE_REGEX")]
-               static void TraceRegexp (string fmt, params object[] args)
-               {
-                       Console.Write ("\t");
-                       Console.WriteLine (fmt, args);
-               }
-
-               [Conditional ("TRACE_REGEX")]
-               static void TraceRegexpLabel (LinkRef lref)
-               {
-                       Console.Write ("{0}:", lref);
-               }
-
-               public static void DecodeOp (ushort word, out OpCode op, out OpFlags flags) {
-                       op = (OpCode)(word & 0x00ff);
-                       flags = (OpFlags)(word & 0xff00);
-               }
-
-               public PatternCompiler () {
-                       pgm = new ArrayList ();
-               }
-
-               // ICompiler implementation
-
-               public void Reset () {
-                       pgm.Clear ();
-               }
-
-               public IMachineFactory GetMachineFactory () {
-                       ushort[] image = new ushort[pgm.Count];
-                       pgm.CopyTo (image);
-
-                       return new InterpreterFactory (image);
-               }
-
-               public void EmitFalse () {
-                       Emit (OpCode.False);
-                       TraceRegexp ("false");
-               }
-
-               public void EmitTrue () {
-                       Emit (OpCode.True);
-
-                       TraceRegexp ("true");
-               }
-
-               void EmitCount (int count)
-               {
-                       uint ucount = (uint) count;
-                       Emit ((ushort) (ucount & 0xFFFF)); // lo 16bits
-                       Emit ((ushort) (ucount >> 16));    // hi
-               }
-
-               public void EmitCharacter (char c, bool negate, bool ignore, bool reverse) {
-                       Emit (OpCode.Character, MakeFlags (negate, ignore, reverse, false));
-
-                       if (ignore)
-                               c = Char.ToLower (c);
-
-                       Emit ((ushort)c);
-
-                       TraceRegexp ("character {0} negate {1} ignore {2} reverse {3}", c, negate, ignore, reverse);
-               }
-
-               public void EmitCategory (Category cat, bool negate, bool reverse) {
-                       Emit (OpCode.Category, MakeFlags (negate, false, reverse, false));
-                       Emit ((ushort)cat);
-
-                       TraceRegexp ("category {0} negate {1} reverse {2}", cat, negate, reverse);
-               }
-
-               public void EmitNotCategory (Category cat, bool negate, bool reverse) {
-                       Emit (OpCode.NotCategory, MakeFlags (negate, false, reverse, false));
-                       Emit ((ushort)cat);
-
-                       TraceRegexp ("not category {0} negate {1} reverse {2}", cat, negate, reverse);
-               }
-
-               public void EmitRange (char lo, char hi, bool negate, bool ignore, bool reverse) {
-                       Emit (OpCode.Range, MakeFlags (negate, ignore, reverse, false));
-                       Emit ((ushort)lo);
-                       Emit ((ushort)hi);
-
-                       TraceRegexp ("char range '{0}' - '{1}' negate {2} ignore {3} reverse {4}", lo, hi, negate, ignore, reverse);
-               }
-
-               public void EmitSet (char lo, BitArray set, bool negate, bool ignore, bool reverse) {
-                       Emit (OpCode.Set, MakeFlags (negate, ignore, reverse, false));
-                       Emit ((ushort)lo);
-
-                       int len = (set.Length + 0xf) >> 4;
-                       Emit ((ushort)len);
-
-                       int b = 0;
-                       while (len -- != 0) {
-                               ushort word = 0;
-                               for (int i = 0; i < 16; ++ i) {
-                                       if (b >= set.Length)
-                                               break;
-                               
-                                       if (set[b ++])
-                                               word |= (ushort)(1 << i);
-                               }
-
-                               Emit (word);
-                       }
-
-                       TraceRegexp ("set lo '{0}' - '{1}' negate {2} ignore {3} reverse {4}", lo, set, negate, ignore, reverse);
-               }
-
-               public void EmitString (string str, bool ignore, bool reverse) {
-                       Emit (OpCode.String, MakeFlags (false, ignore, reverse, false));
-                       int len = str.Length;
-                       Emit ((ushort)len);
-
-                       if (ignore)
-                               str = str.ToLower ();
-                       
-                       for (int i = 0; i < len; ++ i)
-                               Emit ((ushort)str[i]);
-                       TraceRegexp ("string '{0}' ignore {1} reverse {2}", str, ignore, reverse);
-               }
-
-               public void EmitPosition (Position pos) {
-                       Emit (OpCode.Position, 0);
-                       Emit ((ushort)pos);
-
-                       TraceRegexp ("position {0}", pos);
-               }
-
-               public void EmitOpen (int gid) {
-                       Emit (OpCode.Open);
-                       Emit ((ushort)gid);
-
-                       TraceRegexp ("open {0}", gid);
-               }
-
-               public void EmitClose (int gid) {
-                       Emit (OpCode.Close);
-                       Emit ((ushort)gid);
-
-                       TraceRegexp ("close {0}", gid);
-               }
-
-              
-
-               public void EmitBalanceStart (int gid, int balance, bool capture, LinkRef tail) {
-                       BeginLink (tail);
-                       Emit (OpCode.BalanceStart);
-                       Emit ((ushort)gid);
-                       Emit ((ushort)balance);
-                       Emit ((ushort)(capture ? 1 : 0));
-                       EmitLink (tail);
-
-                       TraceRegexp ("balance start gid {0} balance {1} capture {2} tail {3}", gid, balance, capture, tail);
-               }
-
-               public void EmitBalance () {
-                       Emit (OpCode.Balance);
-
-                       TraceRegexp ("balance");
-               }
-
-               public void EmitReference (int gid, bool ignore, bool reverse) {
-                       Emit (OpCode.Reference, MakeFlags (false, ignore, reverse, false));
-                       Emit ((ushort)gid);
-
-                       TraceRegexp ("reference gid {0} ignore {1} reverse {2}", gid, ignore, reverse);
-               }
-
-               public void EmitIfDefined (int gid, LinkRef tail) {
-                       BeginLink (tail);
-                       Emit (OpCode.IfDefined);
-                       EmitLink (tail);
-                       Emit ((ushort)gid);
-
-                       TraceRegexp ("if defined gid {1} tail {2}", gid, tail);
-               }
-
-               public void EmitSub (LinkRef tail) {
-                       BeginLink (tail);
-                       Emit (OpCode.Sub);
-                       EmitLink (tail);
-       
-                       TraceRegexp ("sub {0}", tail);
-               }
-
-               public void EmitTest (LinkRef yes, LinkRef tail) {
-                       BeginLink (yes);
-                       BeginLink (tail);
-                       Emit (OpCode.Test);
-                       EmitLink (yes);
-                       EmitLink (tail);
-
-                       TraceRegexp ("test yes {0} tail {1}", yes, tail);
-               }
-
-               public void EmitBranch (LinkRef next) {
-                       BeginLink (next);
-                       Emit (OpCode.Branch, 0);
-                       EmitLink (next);
-
-                       TraceRegexp ("branch next {0}", next);
-               }
-
-               public void EmitJump (LinkRef target) {
-                       BeginLink (target);
-                       Emit (OpCode.Jump, 0);
-                       EmitLink (target);
-
-                       TraceRegexp ("jmp target {0}", target);
-               }
-
-               public void EmitRepeat (int min, int max, bool lazy, LinkRef until) {
-                       BeginLink (until);
-                       Emit (OpCode.Repeat, MakeFlags (false, false, false, lazy));
-                       EmitLink (until);
-                       EmitCount (min);
-                       EmitCount (max);
-
-                       TraceRegexp ("repeat min {0} max {1} lazy {2} until {3}", min, max, lazy, until);
-               }
-
-               public void EmitUntil (LinkRef repeat) {
-                       ResolveLink (repeat);
-                       Emit (OpCode.Until);
-
-                       TraceRegexp ("end until {0}", repeat);
-               }
-
-               public void EmitFastRepeat (int min, int max, bool lazy, LinkRef tail) {
-                       BeginLink (tail);
-                       Emit (OpCode.FastRepeat, MakeFlags (false, false, false, lazy));
-                       EmitLink (tail);
-                       EmitCount (min);
-                       EmitCount (max);
-
-                       TraceRegexp ("repeat-fast min {0} max {1} lazy {2} tail {3}", min, max, lazy, tail);
-               }
-
-               public void EmitIn (LinkRef tail) {
-                       BeginLink (tail);
-                       Emit (OpCode.In);
-                       EmitLink (tail);
-       
-                       TraceRegexp ("in tail {0}", tail);
-               }
-
-               public void EmitAnchor (bool reverse, int offset, LinkRef tail) {
-                       BeginLink (tail);
-                       Emit (OpCode.Anchor, MakeFlags(false, false, reverse, false));
-                       EmitLink (tail);
-                       Emit ((ushort)offset);
-
-                       TraceRegexp ("anchor reverse {0} offset {1} tail {2}", reverse, offset, tail);
-               }
-
-               public void EmitInfo (int count, int min, int max) {
-                       Emit (OpCode.Info);
-                       EmitCount (count);
-                       EmitCount (min);
-                       EmitCount (max);
-
-                       TraceRegexp ("info group count {0} match_min {1} match_max {2}", count, min, max);
-               }
-
-               public LinkRef NewLink () {
-                       return new PatternLinkStack ();
-               }
-               
-               public void ResolveLink (LinkRef lref) {
-                       PatternLinkStack stack = (PatternLinkStack)lref;
-               
-                       while (stack.Pop ())
-                               pgm[stack.OffsetAddress] = (ushort)stack.GetOffset (CurrentAddress);
-
-                       TraceRegexpLabel (lref);
-               }
-
-               public void EmitBranchEnd(){}
-               public void EmitAlternationEnd(){}
-
-               // private members
-
-               private static OpFlags MakeFlags (bool negate, bool ignore, bool reverse, bool lazy) {
-                       OpFlags flags = 0;
-                       if (negate) flags |= OpFlags.Negate;
-                       if (ignore) flags |= OpFlags.IgnoreCase;
-                       if (reverse) flags |= OpFlags.RightToLeft;
-                       if (lazy) flags |= OpFlags.Lazy;
-
-                       return flags;
-               }
-               
-               private void Emit (OpCode op) {
-                       Emit (op, (OpFlags)0);
-               }
-
-               private void Emit (OpCode op, OpFlags flags) {
-                       Emit (EncodeOp (op, flags));
-               }
-
-               private void Emit (ushort word) {
-                       pgm.Add (word);
-               }
-
-               private int CurrentAddress {
-                       get { return pgm.Count; }
-               }
-
-               private void BeginLink (LinkRef lref) {
-                       PatternLinkStack stack = (PatternLinkStack)lref;
-                       stack.BaseAddress = CurrentAddress;
-               }
-
-               private void EmitLink (LinkRef lref) {
-                       PatternLinkStack stack = (PatternLinkStack)lref;
-                       stack.OffsetAddress = CurrentAddress;
-                       Emit ((ushort)0);       // placeholder
-                       stack.Push ();
-               }
-
-
-               private class PatternLinkStack : LinkStack {
-                       public PatternLinkStack () {
-                       }
-               
-                       public int BaseAddress {
-                               set { link.base_addr = value; }
-                       }
-
-                       public int OffsetAddress {
-                               get { return link.offset_addr; }
-                               set { link.offset_addr = value; }
-                       }
-
-                       public int GetOffset (int target_addr) {
-                               return target_addr - link.base_addr;
-                       }
-
-                       // LinkStack implementation
-
-                       protected override object GetCurrent () { return link; }
-                       protected override void SetCurrent (object l) { link = (Link)l; }
-
-                       private struct Link {
-                               public int base_addr;
-                               public int offset_addr;
-                       }
-
-                       Link link;
-               }
-
-               private ArrayList pgm;
-       }
-
-       abstract class LinkStack : LinkRef {
-               public LinkStack () {
-                       stack = new Stack ();
-               }
-
-               public void Push () {
-                       stack.Push (GetCurrent ());
-               }
-
-               public bool Pop () {
-                       if (stack.Count > 0) {
-                               SetCurrent (stack.Pop ());
-                               return true;
-                       }
-
-                       return false;
-               }
-
-               protected abstract object GetCurrent ();
-               protected abstract void SetCurrent (object l);
-
-               private Stack stack;
-       }
-
-       //Used by CILCompiler and Interpreter
-       internal struct Mark {
-               public int Start, End;
-               public int Previous;
-               
-               public bool IsDefined {
-                       get { return Start >= 0 && End >= 0; }
-               }
-               
-               public int Index {
-                       get { return Start < End ? Start : End; }
-               }
-               
-               public int Length {
-                       get { return Start < End ? End - Start : Start - End; }
-               }
-       }
-
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/debug.cs b/mcs/class/System/System.Text.RegularExpressions/debug.cs
deleted file mode 100644 (file)
index 072b410..0000000
+++ /dev/null
@@ -1,231 +0,0 @@
-//\r
-// assembly:   System\r
-// namespace:  System.Text.RegularExpressions\r
-// file:       debug.cs\r
-//\r
-// author:     Dan Lewis (dlewis@gmx.co.uk)\r
-//             (c) 2002\r
-\r
-//\r
-// Permission is hereby granted, free of charge, to any person obtaining\r
-// a copy of this software and associated documentation files (the\r
-// "Software"), to deal in the Software without restriction, including\r
-// without limitation the rights to use, copy, modify, merge, publish,\r
-// distribute, sublicense, and/or sell copies of the Software, and to\r
-// permit persons to whom the Software is furnished to do so, subject to\r
-// the following conditions:\r
-// \r
-// The above copyright notice and this permission notice shall be\r
-// included in all copies or substantial portions of the Software.\r
-// \r
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-//\r
-\r
-using System;\r
-using System.Collections;\r
-\r
-namespace System.Text.RegularExpressions {\r
-\r
-       class Disassembler {\r
-               public static void DisassemblePattern (ushort[] image) {\r
-                       DisassembleBlock (image, 0, 0);\r
-               }\r
-       \r
-               public static void DisassembleBlock (ushort[] image, int pc, int depth) {\r
-                       OpCode op;\r
-                       OpFlags flags;\r
-\r
-                       for (;;) {\r
-                               if (pc >= image.Length)\r
-                                       return;\r
-                       \r
-                               PatternCompiler.DecodeOp (image[pc], out op, out flags);\r
-                               Console.Write (FormatAddress (pc) + ": ");              // address\r
-                               Console.Write (new string (' ', depth * 2));            // indent\r
-                               Console.Write (DisassembleOp (image, pc));              // instruction\r
-                               Console.WriteLine ();\r
-\r
-                               int skip;\r
-                               switch (op) {\r
-                               case OpCode.False: case OpCode.True: case OpCode.Until:\r
-                                       skip = 1;\r
-                                       break;\r
-\r
-                               case OpCode.Character: case OpCode.Category: case OpCode.NotCategory:\r
-                               case OpCode.Position:\r
-                               case OpCode.Open: case OpCode.Close: case OpCode.Reference:\r
-                               case OpCode.Sub: case OpCode.Branch: case OpCode.Jump: case OpCode.In:\r
-                                       skip = 2;\r
-                                       break;\r
-\r
-                               case OpCode.Balance: case OpCode.IfDefined: case OpCode.Range:\r
-                               case OpCode.Test: case OpCode.Anchor:\r
-                                       skip = 3;\r
-                                       break;\r
-\r
-                               case OpCode.Repeat: case OpCode.FastRepeat: case OpCode.Info:\r
-                                       skip = 4;\r
-                                       break;\r
-\r
-                               case OpCode.String: skip = image[pc + 1] + 2; break;\r
-                               case OpCode.Set: skip = image[pc + 2] + 3; break;\r
-\r
-                               default:\r
-                                       skip = 1;\r
-                                       break;\r
-                               }\r
-\r
-                               pc += skip;\r
-                       }\r
-               }\r
-\r
-               public static string DisassembleOp (ushort[] image, int pc) {\r
-                       OpCode op;\r
-                       OpFlags flags;\r
-\r
-                       PatternCompiler.DecodeOp (image[pc], out op, out flags);\r
-                       string str = op.ToString ();\r
-                       if (flags != 0)\r
-                               str += "[" + flags.ToString ("f") + "]";\r
-\r
-                       switch (op) {\r
-                       case OpCode.False: case OpCode.True: case OpCode.Until:\r
-                       default:\r
-                               break;\r
-\r
-                       case OpCode.Info:\r
-                               str += " " + image[pc + 1];\r
-                               str += " (" + image[pc + 2] + ", " + image[pc + 3] + ")";\r
-                               break;\r
-                       \r
-                       case OpCode.Character:\r
-                               str += " '" + FormatChar ((char)image[pc + 1]) + "'";\r
-                               break;\r
-\r
-                       case OpCode.Category:\r
-                       case OpCode.NotCategory:\r
-                               str += " /" + (Category)image[pc + 1];\r
-                               break;\r
-                       \r
-                       case OpCode.Range:\r
-                               str += " '" + FormatChar ((char)image[pc + 1]) + "', ";\r
-                               str += " '" + FormatChar ((char)image[pc + 2]) + "'";\r
-                               break;\r
-\r
-                       case OpCode.Set:\r
-                               str += " " + FormatSet (image, pc + 1);\r
-                               break;\r
-\r
-                       case OpCode.String:\r
-                               str += " '" + ReadString (image, pc + 1) + "'";\r
-                               break;\r
-\r
-                       case OpCode.Position:\r
-                               str += " /" + (Position)image[pc + 1];\r
-                               break;\r
-\r
-                       case OpCode.Open: case OpCode.Close: case OpCode.Reference:\r
-                               str += " " + image[pc + 1];\r
-                               break;\r
-\r
-                       case OpCode.Balance:\r
-                               str += " " + image[pc + 1] + " " + image[pc + 2];\r
-                               break;\r
-\r
-                       case OpCode.IfDefined: case OpCode.Anchor:\r
-                               str += " :" + FormatAddress (pc + image[pc + 1]);\r
-                               str += " " + image[pc + 2];\r
-                               break;\r
-                       \r
-                       case OpCode.Sub: case OpCode.Branch: case OpCode.Jump:\r
-                       case OpCode.In:\r
-                               str += " :" + FormatAddress (pc + image[pc + 1]);\r
-                               break;\r
-\r
-                       case OpCode.Test:\r
-                               str += " :" + FormatAddress (pc + image[pc + 1]);\r
-                               str += ", :" + FormatAddress (pc + image[pc + 2]);\r
-                               break;\r
-\r
-                       case OpCode.Repeat: case OpCode.FastRepeat:\r
-                               str += " :" + FormatAddress (pc + image[pc + 1]);\r
-                               str += " (" + image[pc + 2] + ", ";\r
-                               if (image[pc + 3] == 0xffff)\r
-                                       str += "Inf";\r
-                               else\r
-                                       str += image[pc + 3];\r
-                               str += ")";\r
-                               break;\r
-\r
-                       }\r
-\r
-                       return str;\r
-               }\r
-\r
-               // private static members\r
-       \r
-               private static string ReadString (ushort[] image, int pc) {\r
-                       int len = image[pc];\r
-                       char[] chars = new char[len];\r
-\r
-                       for (int i = 0; i < len; ++ i)\r
-                               chars[i] = (char)image[pc + i + 1];\r
-\r
-                       return new string (chars);\r
-               }\r
-\r
-               private static string FormatAddress (int pc) {\r
-                       return pc.ToString ("x4");\r
-               }\r
-\r
-               private static string FormatSet (ushort[] image, int pc) {\r
-                       int lo = image[pc ++];\r
-                       int hi = (image[pc ++] << 4) - 1;\r
-\r
-                       string str = "[";\r
-\r
-                       bool hot = false;\r
-                       char a = (char)0, b;\r
-                       for (int i = 0; i <= hi; ++ i) {\r
-                               bool m = (image[pc + (i >> 4)] & (1 << (i & 0xf))) != 0;\r
-\r
-                               if (m & !hot) {                         // start of range\r
-                                       a = (char)(lo + i);\r
-                                       hot = true;\r
-                               }\r
-                               else if (hot & (!m || i == hi)) {       // end of range\r
-                                       b = (char)(lo + i - 1);\r
-\r
-                                       str += FormatChar (a);\r
-                                       if (b != a)\r
-                                               str += "-" + FormatChar (b);\r
-                                       \r
-                                       hot = false;\r
-                               }\r
-                       }\r
-\r
-                       str += "]";\r
-                       return str;\r
-               }\r
-\r
-               private static string FormatChar (char c) {\r
-                       if (c == '-' || c == ']')\r
-                               return "\\" + c;\r
-\r
-                       if (Char.IsLetterOrDigit (c) || Char.IsSymbol (c))\r
-                               return c.ToString ();\r
-                       \r
-                       if (Char.IsControl (c)) {\r
-                               return "^" + (char)('@' + c);\r
-                       }\r
-\r
-                       return "\\u" + ((int)c).ToString ("x4");\r
-               }\r
-       }\r
-}\r
diff --git a/mcs/class/System/System.Text.RegularExpressions/gen-interp.cs b/mcs/class/System/System.Text.RegularExpressions/gen-interp.cs
deleted file mode 100644 (file)
index 7324762..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// This file is not part of the build. It is used to generate the character related
-// opcodes in RxInterpreter.cs.
-//
-
-using System;
-
-class Op {
-       public string name, body, cond, len;
-
-       public Op (string name, string body, string cond, string len) {
-               this.name = name;
-               this.body = body;
-               this.cond = cond;
-               this.len = len;
-       }
-}
-
-public class GenInterp
-{
-       public static int base_indent;
-
-       public static void write (int indent, string format, params string[] args) {
-               for (int i = 0; i < base_indent + indent; ++i)
-                       Console.Write ("\t");
-               Console.WriteLine (format, args);
-       }
-
-       public static void Main () {
-               base_indent = 4;
-
-               write (0, "// GENERATED BY gen-interp.cs, DO NOT MODIFY");
-
-               Op[] ops = new Op [] {
-
-                       new Op ("Char", "", "(c == program [pc + 1])", "2"),
-                       new Op ("Range", "", "(c >= program [pc + 1] && c <= program [pc + 2])", "3"),
-                       new Op ("UnicodeRange", "", "(c >= (program [pc + 1] | ((int)program [pc + 2] << 8))) && (c <= (program [pc + 3] | ((int)program [pc + 4] << 8)))", "5"),
-                       new Op ("UnicodeChar", "", "(c == (program [pc + 1] | ((int)program [pc + 2] << 8)))", "3"),
-                       new Op ("CategoryAny", "", @"(c != '\n')", "1"),
-                       new Op ("CategoryAnySingleline", "", "true", "1"),
-                       new Op ("CategoryWord", "", "(Char.IsLetterOrDigit (c) || Char.GetUnicodeCategory (c) == UnicodeCategory.ConnectorPunctuation)", "1"),
-                       new Op ("CategoryDigit", "", "(Char.IsDigit (c))", "1"),
-                       new Op ("CategoryWhiteSpace", "", "(Char.IsWhiteSpace (c))", "1"),
-                       new Op ("CategoryEcmaWord", "", "('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' || c == '_')", "1"),
-                       new Op ("CategoryEcmaWhiteSpace", "", @"(c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v')", "1"),
-                       new Op ("CategoryUnicodeSpecials", "", @"('\uFEFF' <= c && c <= '\uFEFF' || '\uFFF0' <= c && c <= '\uFFFD')", "1"),
-                       new Op ("CategoryUnicode", "", "(Char.GetUnicodeCategory (c) == (UnicodeCategory)program [pc + 1])", "2"),
-                       new Op ("CategoryGeneral", "", "(CategoryUtils.IsCategory ((Category)program [pc + 1], c))", "2"),
-                       new Op ("Bitmap", "int c2 = (int)c; c2 -= program [pc + 1]; length = program [pc + 2];", "(c2 >= 0 && c2 < (length << 3) && (program [pc + 3 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0)", "3 + program [pc + 2]"),
-                       new Op ("UnicodeBitmap", "int c2 = (int)c; c2 -= (program [pc + 1] | ((int)program [pc + 2] << 8)); length = (program [pc + 3] | ((int)program [pc + 4] << 8));", "(c2 >= 0 && c2 < (length << 3) && (program [pc + 5 + (c2 >> 3)] & (1 << (c2 & 0x7))) != 0)", "5 + (program [pc + 3] | ((int)program [pc + 4] << 8))")
-               };
-
-               for (int i1 = 0; i1 < 2; ++i1) {
-                       for (int i2 = 0; i2 < 2; ++i2) {
-                               for (int i3 = 0; i3 < 2; ++i3) {
-                                       bool reverse = (i1 == 1);
-                                       bool revert = (i2 == 1);
-                                       bool ignore = (i3 == 1);
-
-                                       foreach (Op op in ops) {
-                                               if (op.name.StartsWith ("Category") && ignore)
-                                                       // These have no IgnoreCase versions
-                                                       continue;
-
-                                               if (i1 == 0 && i2 == 0 && i3 == 0) {
-                                                       write (0, "");
-                                                       write (0, "/* {0} */", op.name);
-                                                       write (0, "");
-                                               }                                               
-
-                                               write (0, "case RxOp.{0}{1}{2}{3}:", revert ? "No" : "", op.name, ignore ? "IgnoreCase" : "", reverse ? "Reverse" : "");
-                                               if (reverse)
-                                                       write (1, "if (strpos > 0) {{");
-                                               else
-                                                       write (1, "if (strpos < string_end) {{");
-                                               if (!ignore) {
-                                                       if (reverse)
-                                                               write (2, "char c = str [strpos - 1];");
-                                                       else
-                                                               write (2, "char c = str [strpos];");
-                                               } else {
-                                                       if (reverse)
-                                                               write (2, "char c = Char.ToLower (str [strpos - 1]);");
-                                                       else
-                                                               write (2, "char c = Char.ToLower (str [strpos]);");
-                                               }
-                                               if (op.body != String.Empty)
-                                                       write (2, op.body);
-                                               write (2, "if ({0}({1})) {{", revert ? "!" : "", op.cond);
-                                               // TRUE case
-                                               if (!revert) {
-                                                       if (!reverse)
-                                                               write (3, "strpos ++;");
-                                                       else
-                                                               write (3, "strpos --;");
-                                                       write (3, "if (char_group_end != 0)");
-                                                       write (4, "goto test_char_group_passed;");
-                                                       write (3, "pc += {0};", "" + op.len);
-                                                       write (3, "continue;");
-                                               } else {
-                                                       /*
-                                                        * If we are inside a char group, the cases are ANDed 
-                                                        * together, so we have to continue checking the
-                                                        * other cases, and we need to increase strpos after 
-                                                        * the final check.
-                                                        * The char group is termined by a True, hence the
-                                                        * + 1 below.
-                                                        */
-                                                       write (3, "pc += {0};", "" + op.len);
-                                                       write (3, "if (char_group_end == 0 || (pc + 1 == char_group_end)) {{");
-                                                       if (!reverse)
-                                                               write (4, "strpos ++;");
-                                                       else
-                                                               write (4, "strpos --;");
-                                                       write (3, "if (pc + 1 == char_group_end)");
-                                                       write (4, "goto test_char_group_passed;");
-                                                       write (3, "}}");
-                                                       write (3, "continue;");
-                                               }
-                                               write (2, "}}");
-                                               write (1, "}}");
-
-                                               // FALSE case                                                   
-                                               if (!revert) {
-                                                       write (1, "if (char_group_end == 0)");
-                                                       write (2, "return false;");
-                                                       write (1, "pc += {0};", "" + op.len);
-                                                       write (1, "continue;");
-                                               } else {
-                                                       /* Fail both inside and outside a char group */
-                                                       write (1, "return false;");
-                                               }
-
-#if FALSE
-                                                       if (strpos < string_end && (COND (str [strpos]))) {
-                                                       if (!revert) {
-                                                               strpos ++;
-                                                               if (char_group_end != 0)
-                                                                       goto test_char_group_passed;
-                                                               pc += ins_len;
-                                                               continue;
-                                                       } else {
-                                                               /*
-                                                                * If we are inside a char group, the cases are ANDed 
-                                                                * together, so we have to continue checking the
-                                                                * other cases, and we need to increase strpos after 
-                                                                * the final check.
-                                                                * The char group is termined by a True, hence the
-                                                                * + 1 below.
-                                                                * FIXME: Optimize this.
-                                                                */
-                                                               pc += ins_len;
-                                                               if (char_group_end == 0 || (pc + 1 == char_group_end))
-                                                                       strpos ++;
-                                                               continue;
-                                                       }
-                                               } else {
-                                                       if (!revert) {
-                                                               if (char_group_end == 0)
-                                                                       return false;
-                                                               pc += ins_len;
-                                                               continue;
-                                                       } else {
-                                                               /* Fail both inside and outside a char group */
-                                                               return false;
-                                                       }
-                                               }
-                                       } else {
-                                               // Same as above, but use:
-                                               // - strpos > 0 instead of strpos < string_len
-                                               // - COND (str [strpos - 1]) instead of COND (str [strpos])
-                                               // - strpos -- instead of strpos ++
-                                       }
-#endif
-                                       }
-                               }
-                       }
-               }
-
-       write (0, "");
-       write (0, "// END OF GENERATED CODE");
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/interpreter.cs b/mcs/class/System/System.Text.RegularExpressions/interpreter.cs
deleted file mode 100644 (file)
index 3c70a3b..0000000
+++ /dev/null
@@ -1,1182 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       interpreter.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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.Diagnostics;
-using System.Globalization;
-
-namespace System.Text.RegularExpressions {
-
-       partial class Interpreter : BaseMachine {
-               private int ReadProgramCount (int ptr)
-               {
-                       int ret = program [ptr + 1];
-                       ret <<= 16;
-                       ret += program [ptr];
-                       return ret;
-               }
-
-               public Interpreter (ushort[] program) {
-                       this.program = program;
-                       this.qs = null;
-
-                       // process info block
-                       Debug.Assert ((OpCode)program[0] == OpCode.Info, "Regex", "Cant' find info block");
-                       this.group_count = ReadProgramCount (1) + 1;
-                       this.match_min = ReadProgramCount (3);
-                       //this.match_max = ReadProgramCount (5);
-
-                       // setup
-
-                       this.program_start = 7;
-                       this.groups = new int [group_count];
-               }
-
-               // IMachine implementation
-
-               public override Match Scan (Regex regex, string text, int start, int end, bool substring_mode) {
-                       this.regex_rtl = (regex.Options & RegexOptions.RightToLeft) != 0;
-
-                       if (!initialized)
-                       {
-                               this.text_start = regex_rtl && substring_mode ? end : start;
-                               this.text_end = regex_rtl ? substring_mode ? start : 0 : end;
-                               this.initialized = true;
-                       }
-                       else
-                       {
-                               this.text_start = start;
-                               this.text_end = end;
-                       }
-                       this.text = text;
-                       this.scan_ptr = text_start;
-                       this.substring_mode = substring_mode;
-
-                       if (Eval (Mode.Match, ref scan_ptr, program_start))
-                               return GenerateMatch (regex);
-
-                       return Match.Empty;
-               }
-
-               // private methods
-
-               private void Reset () {
-                       ResetGroups ();
-                       fast = repeat = null;
-               }
-
-               private bool Eval (Mode mode, ref int ref_ptr, int pc) {
-                       int ptr = ref_ptr;
-               Begin:
-                       for (;;) {
-                               ushort word = program[pc];
-                               OpCode op = (OpCode)(word & 0x00ff);
-                               OpFlags flags = (OpFlags)(word & 0xff00);
-
-                               switch (op) {
-                               case OpCode.Anchor: {
-                                       int skip = program[pc + 1];
-                                       
-                                       int anch_offset = program[pc + 2];
-                                       bool anch_reverse = (flags & OpFlags.RightToLeft) != 0; 
-                                       int anch_ptr = anch_reverse ?  ptr - anch_offset  : ptr + anch_offset;
-                                       int anch_end = (regex_rtl ? text_start : text_end) - match_min + anch_offset; // maximum anchor position  
-                                       
-                                       
-                                       int anch_begin =  0;
-
-
-                                       // the general case for an anchoring expression is at the bottom, however we
-                                       // do some checks for the common cases before to save processing time. the current
-                                       // optimizer only outputs three types of anchoring expressions: fixed position,
-                                       // fixed substring, and no anchor.
-
-                                       OpCode anch_op = (OpCode)(program[pc + 3] & 0x00ff);                                    
-                                       if (anch_op == OpCode.Position && skip == 6) {                          // position anchor
-                                               // Anchor
-                                               //      Position
-                                               //      True
-
-                                               switch ((Position)program[pc + 4]) {
-                                               case Position.StartOfString:
-                                                       if (anch_reverse || anch_offset == 0) {
-                                                               if (anch_reverse)
-                                                                       ptr = anch_offset;
-                                                               if (TryMatch (ref ptr, pc + skip))
-                                                                       goto Pass;
-                                                       }
-                                                       break;
-                                               
-                                               case Position.StartOfLine:
-                                                        if (anch_ptr == 0) {
-                                                               ptr = 0;
-                                                               if (TryMatch (ref ptr, pc + skip))
-                                                                       goto Pass;
-                                                               
-                                                               ++ anch_ptr;
-                                                       }
-
-                                                       while ((anch_reverse && anch_ptr >= 0) || (!anch_reverse && anch_ptr <= anch_end)) {  
-                                                               if (anch_ptr == 0 || text[anch_ptr - 1] == '\n') {
-                                                                       if (anch_reverse)
-                                                                               ptr = anch_ptr == anch_end ? anch_ptr : anch_ptr + anch_offset;
-                                                                       else
-                                                                               ptr = anch_ptr == 0 ? anch_ptr : anch_ptr - anch_offset;
-                                                                       if (TryMatch (ref ptr, pc + skip))
-                                                                               goto Pass;
-                                                               }
-                                                       
-                                                               if (anch_reverse)
-                                                                       -- anch_ptr;
-                                                               else
-                                                                       ++ anch_ptr;
-                                                       }
-                                                       break;
-                                               
-                                               case Position.StartOfScan:
-                                                       if (anch_ptr == scan_ptr) {                                                     
-                                                               ptr = anch_reverse ? scan_ptr + anch_offset : scan_ptr - anch_offset;
-                                                               if (TryMatch (ref ptr, pc + skip))
-                                                                       goto Pass;
-                                                       }
-                                                       break;
-
-                                               default:
-                                                       // FIXME
-                                                       break;
-                                               }
-                                       }
-                                       else if (qs != null ||
-                                               (anch_op == OpCode.String && skip == 6 + program[pc + 4])) {    // substring anchor
-                                               // Anchor
-                                               //      String
-                                               //      True
-                                
-                                               bool reverse = ((OpFlags)program[pc + 3] & OpFlags.RightToLeft) != 0;
-
-                                               if (qs == null) {
-                                                       bool ignore = ((OpFlags)program[pc + 3] & OpFlags.IgnoreCase) != 0;
-                                                       string substring = GetString (pc + 3);
-                                                       qs = new QuickSearch (substring, ignore, reverse);
-                                               }
-                                               while ((anch_reverse && anch_ptr >= anch_begin) 
-                                                      || (!anch_reverse && anch_ptr <= anch_end)) {
-
-                                                       if (reverse)    
-                                                       {
-                                                               anch_ptr = qs.Search (text, anch_ptr, anch_begin);
-                                                               if (anch_ptr != -1)
-                                                                       anch_ptr += qs.Length ;
-                                                               
-                                                       }
-                                                       else
-                                                               anch_ptr = qs.Search (text, anch_ptr, anch_end);
-                                                       if (anch_ptr < 0)
-                                                               break;
-
-                                                       ptr = reverse ? anch_ptr + anch_offset : anch_ptr - anch_offset;
-                                                       if (TryMatch (ref ptr, pc + skip))
-                                                               goto Pass;
-
-                                                       if (reverse)
-                                                               anch_ptr -= 2;
-                                                       else 
-                                                               ++ anch_ptr;
-                                               }
-                                       }
-                                       else if (anch_op == OpCode.True) {                                      // no anchor
-                                               // Anchor
-                                               //      True
-
-                                       
-                                               while ((anch_reverse && anch_ptr >= anch_begin) 
-                                                      || (!anch_reverse && anch_ptr <= anch_end)) {
-
-                                                       ptr = anch_ptr;
-                                                       if (TryMatch (ref ptr, pc + skip))
-                                                               goto Pass;
-                                                       if (anch_reverse)
-                                                               -- anch_ptr;
-                                                       else 
-                                                               ++ anch_ptr;
-                                               }
-                                       }
-                                       else {                                                                  // general case
-                                               // Anchor
-                                               //      <expr>
-                                               //      True
-
-                                               while ((anch_reverse && anch_ptr >= anch_begin) 
-                                                      || (!anch_reverse && anch_ptr <= anch_end)) {
-
-                                                       ptr = anch_ptr;
-                                                       if (Eval (Mode.Match, ref ptr, pc + 3)) {
-                                                               // anchor expression passed: try real expression at the correct offset
-
-                                                               ptr = anch_reverse ? anch_ptr + anch_offset : anch_ptr - anch_offset;
-                                                               if (TryMatch (ref ptr, pc + skip))
-                                                                       goto Pass;
-                                                       }
-
-                                                   if (anch_reverse)
-                                                               -- anch_ptr;
-                                                       else 
-                                                               ++ anch_ptr;
-                                               }
-                                       }
-
-                                       goto Fail;
-                               }
-                               
-                               case OpCode.False: {
-                                       goto Fail;
-                               }
-
-                               case OpCode.True: {
-                                       goto Pass;
-                               }
-
-                               case OpCode.Position: {
-                                       if (!IsPosition ((Position)program[pc + 1], ptr))
-                                               goto Fail;
-                                       pc += 2;
-                                       break;
-                               }
-
-                               case OpCode.String: {
-                                       bool reverse = (flags & OpFlags.RightToLeft) != 0;
-                                       bool ignore = (flags & OpFlags.IgnoreCase) != 0;
-                                       int len = program[pc + 1];
-
-                                       if (reverse) {
-                                               ptr -= len;
-                                               if ((!regex_rtl && ptr < 0) || (regex_rtl && ptr < text_end))
-                                                       goto Fail;
-                                       }
-                                       else 
-                                       if (ptr + len > text_end)
-                                               goto Fail;
-
-                                       pc += 2;
-                                       for (int i = 0; i < len; ++ i) {
-                                               char c = text[ptr + i];
-                                               if (ignore)
-                                                       c = Char.ToLower (c);
-
-                                               if (c != (char)program[pc ++])
-                                                       goto Fail;
-                                       }
-
-                                       if (!reverse)
-                                               ptr += len;
-                                       break;
-                               }
-
-                               case OpCode.Reference: {
-                                       bool reverse = (flags & OpFlags.RightToLeft) != 0;
-                                       bool ignore = (flags & OpFlags.IgnoreCase) != 0;
-                                       int m = GetLastDefined (program [pc + 1]);
-                                       if (m < 0)
-                                               goto Fail;
-
-                                       int str = marks [m].Index;
-                                       int len = marks [m].Length;
-
-                                       if (reverse) {
-                                               ptr -= len;
-                                               if ((!regex_rtl && ptr < 0) || (regex_rtl && ptr < text_end))
-                                                       goto Fail;
-                                       }
-                                       else if (ptr + len > text_end)
-                                               goto Fail;
-
-                                       pc += 2;
-                                       if (ignore) {
-                                               for (int i = 0; i < len; ++ i) {
-                                                       if (Char.ToLower (text[ptr + i]) != Char.ToLower (text[str + i]))
-                                                               goto Fail;
-                                               }
-                                       } else {
-                                               for (int i = 0; i < len; ++ i) {
-                                                       if (text[ptr + i] != text[str + i])
-                                                               goto Fail;
-                                               }
-                                       }
-
-                                       if (!reverse)
-                                               ptr += len;
-                                       break;
-                               }
-
-                               case OpCode.Character: case OpCode.Category: case OpCode.NotCategory:
-                               case OpCode.Range: case OpCode.Set: {
-                                       if (!EvalChar (mode, ref ptr, ref pc, false))
-                                               goto Fail;
-                                       break;
-                               }
-
-                               case OpCode.In: {
-                                       int target = pc + program[pc + 1];
-                                       pc += 2;
-                                       if (!EvalChar (mode, ref ptr, ref pc, true))
-                                               goto Fail;
-
-                                       pc = target;
-                                       break;
-                               }
-
-                               case OpCode.Open: {
-                                       Open (program[pc + 1], ptr);
-                                       pc += 2;
-                                       break;
-                               }
-
-                               case OpCode.Close: {
-                                       Close (program[pc + 1], ptr);
-                                       pc += 2;
-                                       break;
-                               }
-
-                               case OpCode.BalanceStart: {
-
-                                       int start = ptr; //point before the balancing group
-                                       
-                                       if (!Eval (Mode.Match, ref ptr, pc + 5))
-                                               goto Fail;
-                                       
-                                       
-                                       
-                                       if(!Balance (program[pc + 1], program[pc + 2], (program[pc + 3] == 1 ? true : false) , start)) {
-                                               goto Fail;
-                                       }
-
-                                       
-                                       pc += program[pc + 4];
-                                       break;
-                               }
-
-                               case OpCode.Balance: {
-                                       goto Pass;
-                               }
-
-                               case OpCode.IfDefined: {
-                                       int m = GetLastDefined (program [pc + 2]);
-                                       if (m < 0)
-                                               pc += program[pc + 1];
-                                       else
-                                               pc += 3;
-                                       break;
-                               }
-
-                               case OpCode.Sub: {
-                                       if (!Eval (Mode.Match, ref ptr, pc + 2))
-                                               goto Fail;
-
-                                       pc += program[pc + 1];
-                                       break;
-                               }
-
-                               case OpCode.Test: {
-                                       int cp = Checkpoint ();
-                                       int test_ptr = ptr;
-                                       if (Eval (Mode.Match, ref test_ptr, pc + 3))
-                                               pc += program[pc + 1];
-                                       else {
-                                               Backtrack (cp);
-                                               pc += program[pc + 2];
-                                       }
-                                       break;
-                               }
-
-                               case OpCode.Branch: {
-                                       OpCode branch_op;
-                                       do {
-                                               int cp = Checkpoint ();
-                                               if (Eval (Mode.Match, ref ptr, pc + 2))
-                                                       goto Pass;
-                                               
-                                               Backtrack (cp);
-                                               
-                                               pc += program[pc + 1];
-                                               branch_op = (OpCode)(program[pc] & 0xff);
-                                       } while (branch_op != OpCode.False);
-
-                                       goto Fail;
-                               }
-
-                               case OpCode.Jump: {
-                                       pc += program[pc + 1];
-                                       break;
-                               }
-
-                               case OpCode.Repeat: {
-                                       this.repeat = new RepeatContext (
-                                               this.repeat,                    // previous context
-                                               ReadProgramCount (pc + 2),              // minimum
-                                               ReadProgramCount (pc + 4),              // maximum
-                                               (flags & OpFlags.Lazy) != 0,    // lazy
-                                               pc + 6                          // subexpression
-                                       );
-
-                                       if (Eval (Mode.Match, ref ptr, pc + program[pc + 1]))
-                                               goto Pass;
-                                       else {
-                                               this.repeat = this.repeat.Previous;
-                                               goto Fail;
-                                       }
-                               }
-
-                               case OpCode.Until: {
-                                       RepeatContext current = this.repeat;
-
-                                       //
-                                       // Can we avoid recursion?
-                                       //
-                                       // Backtracking can be forced in nested quantifiers from the tail of this quantifier.
-                                       // Thus, we cannot, in general, use a simple loop on repeat.Expression to handle
-                                       // quantifiers.
-                                       //
-                                       // If 'deep' was unmolested, that implies that there was no nested quantifiers.
-                                       // Thus, we can safely avoid recursion.
-                                       //
-                                       if (deep == current)
-                                               goto Pass;
-
-                                       int start = current.Start;
-                                       int start_count = current.Count;
-
-                                       while (!current.IsMinimum) {
-                                               ++ current.Count;
-                                               current.Start = ptr;
-                                               deep = current;
-                                               if (!Eval (Mode.Match, ref ptr, current.Expression)) {
-                                                       current.Start = start;
-                                                       current.Count = start_count;
-                                                       goto Fail;
-                                               }
-                                               if (deep != current)    // recursive mode
-                                                       goto Pass;
-                                       }
-
-                                       if (ptr == current.Start) {
-                                               // degenerate match ... match tail or fail
-                                               this.repeat = current.Previous;
-                                               deep = null;
-                                               if (Eval (Mode.Match, ref ptr, pc + 1))
-                                                       goto Pass;
-                                       
-                                               this.repeat = current;
-                                               goto Fail;
-                                       }
-
-                                       if (current.IsLazy) {
-                                               for (;;) {
-                                                       // match tail first ...
-                                                       this.repeat = current.Previous;
-                                                       deep = null;
-                                                       int cp = Checkpoint ();
-                                                       if (Eval (Mode.Match, ref ptr, pc + 1))
-                                                               goto Pass;
-
-                                                       Backtrack (cp);
-
-                                                       // ... then match more
-                                                       this.repeat = current;
-                                                       if (current.IsMaximum)
-                                                               goto Fail;
-                                                       ++ current.Count;
-                                                       current.Start = ptr;
-                                                       deep = current;
-                                                       if (!Eval (Mode.Match, ref ptr, current.Expression)) {
-                                                               current.Start = start;
-                                                               current.Count = start_count;
-                                                               goto Fail;
-                                                       }
-                                                       if (deep != current)    // recursive mode
-                                                               goto Pass;
-                                                       // Degenerate match: ptr has not moved since the last (failed) tail match.
-                                                       // So, next and subsequent tail matches will fail.
-                                                       if (ptr == current.Start)
-                                                               goto Fail;
-                                               }
-                                       } else {
-                                               int stack_size = stack.Count;
-
-                                               // match greedily as much as possible
-                                               while (!current.IsMaximum) {
-                                                       int cp = Checkpoint ();
-                                                       int old_ptr = ptr;
-                                                       int old_start = current.Start;
-
-                                                       ++ current.Count;
-                                                       current.Start = ptr;
-                                                       deep = current;
-                                                       if (!Eval (Mode.Match, ref ptr, current.Expression)) {
-                                                               -- current.Count;
-                                                               current.Start = old_start;
-                                                               Backtrack (cp);
-                                                               break;
-                                                       }
-                                                       if (deep != current) {
-                                                               // recursive mode: no more backtracking, truncate the stack
-                                                               stack.Count = stack_size;
-                                                               goto Pass;
-                                                       }
-                                                       stack.Push (cp);
-                                                       stack.Push (old_ptr);
-
-                                                       // Degenerate match: no point going on
-                                                       if (ptr == current.Start)
-                                                               break;
-                                               }
-
-                                               // then, match the tail, backtracking as necessary.
-                                               this.repeat = current.Previous;
-                                               for (;;) {
-                                                       deep = null;
-                                                       if (Eval (Mode.Match, ref ptr, pc + 1)) {
-                                                               stack.Count = stack_size;
-                                                               goto Pass;
-                                                       }
-                                                       if (stack.Count == stack_size) {
-                                                               this.repeat = current;
-                                                               goto Fail;
-                                                       }
-
-                                                       --current.Count;
-                                                       ptr = stack.Pop ();
-                                                       Backtrack (stack.Pop ());
-                                               }
-                                       }
-                               }
-
-                               case OpCode.FastRepeat: {
-                                       this.fast = new RepeatContext (
-                                               fast,
-                                               ReadProgramCount (pc + 2),              // minimum
-                                               ReadProgramCount (pc + 4),              // maximum
-                                               (flags & OpFlags.Lazy) != 0,    // lazy
-                                               pc + 6                          // subexpression
-                                       );
-
-                                       fast.Start = ptr;
-
-                                       int cp = Checkpoint ();
-
-                                       pc += program[pc + 1];          // tail expression
-                                       ushort tail_word = program[pc];
-
-                                       int c1 = -1;            // first character of tail operator
-                                       int c2 = -1;            // ... and the same character, in upper case if ignoring case
-                                       int coff = 0;           // 0 or -1 depending on direction
-
-                                       OpCode tail_op = (OpCode)(tail_word & 0xff);
-                                       if (tail_op == OpCode.Character || tail_op == OpCode.String) {
-                                               OpFlags tail_flags = (OpFlags)(tail_word & 0xff00);
-
-                                               if ((tail_flags & OpFlags.Negate) != 0)
-                                                       goto skip;
-
-                                               if (tail_op == OpCode.String)
-                                               {
-                                                       int offset = 0;
-                                               
-                                                       if ((tail_flags & OpFlags.RightToLeft) != 0)
-                                                       {
-                                                               offset = program[pc + 1] - 1 ;
-                                                       }
-                                                         
-                                                       c1 = program[pc + 2 + offset];                          // first char of string
-                                               }
-                                               else
-                                                       c1 = program[pc + 1];                           // character
-                                               
-                                               if ((tail_flags & OpFlags.IgnoreCase) != 0)
-                                                       c2 = Char.ToUpper ((char)c1);                   // ignore case
-                                               else
-                                                       c2 = c1;
-
-                                               if ((tail_flags & OpFlags.RightToLeft) != 0)
-                                                       coff = -1;                                      // reverse
-                                               else
-                                                       coff = 0;
-                                       }
-
-                               skip:
-                                       if (fast.IsLazy) {
-                                               if (!fast.IsMinimum && !Eval (Mode.Count, ref ptr, fast.Expression)) {
-                                                       //Console.WriteLine ("lazy fast: failed mininum.");
-                                                       fast = fast.Previous;
-                                                       goto Fail;
-                                               }
-                                               
-                                               while (true) {
-                                                       int p = ptr + coff;
-                                                       if (c1 < 0 || (p >= 0 && ((regex_rtl && p >= text_end) || (!regex_rtl && p < text_end)) && (c1 == text[p] || c2 == text[p]))) {
-                                                               deep = null;
-                                                               if (Eval (Mode.Match, ref ptr, pc))
-                                                                       break;
-                                                       }
-
-                                                       if (fast.IsMaximum) {
-                                                               //Console.WriteLine ("lazy fast: failed with maximum.");
-                                                               fast = fast.Previous;
-                                                               goto Fail;
-                                                       }
-
-                                                       Backtrack (cp);
-                                                       if (!Eval (Mode.Count, ref ptr, fast.Expression)) {
-                                                               //Console.WriteLine ("lazy fast: no more.");
-                                                               fast = fast.Previous;
-                                                               goto Fail;
-                                                       }
-                                               }
-                                               fast = fast.Previous;
-                                               goto Pass;
-                                       }
-                                       else {
-                                               if (!Eval (Mode.Count, ref ptr, fast.Expression)) {
-                                                       fast = fast.Previous;
-                                                       goto Fail;
-                                               }
-                                       
-                                               int width;
-                                               if (fast.Count > 0)
-                                                       width = (ptr - fast.Start) / fast.Count;
-                                               else
-                                                       width = 0;
-
-                                               while (true) {
-                                                       int p = ptr + coff;
-                                                       if (c1 < 0 || (p >= 0 && ((regex_rtl && p >= text_end) || (!regex_rtl && p < text_end)) && (c1 == text[p] || c2 == text[p]))) {
-                                                               deep = null;
-                                                               if (Eval (Mode.Match, ref ptr, pc))
-                                                                       break;
-                                                       }
-
-                                                       -- fast.Count;
-                                                       if (!fast.IsMinimum) {
-                                                               fast = fast.Previous;
-                                                               goto Fail;
-                                                       }
-
-                                                       ptr -= width;
-                                                       Backtrack (cp);
-                                               }
-                                               fast = fast.Previous;
-                                               goto Pass;
-                                       }
-                               }
-
-                               case OpCode.Info: {
-                                       Debug.Assert (false, "Regex", "Info block found in pattern");
-                                       goto Fail;
-                               }
-                               }
-                       }
-               Pass:
-                       ref_ptr = ptr;
-
-                       switch (mode) {
-                       case Mode.Match:
-                               return true;
-
-                       case Mode.Count: {
-                               ++ fast.Count;
-                               if (fast.IsMaximum || (fast.IsLazy && fast.IsMinimum))
-                                       return true;
-
-                               pc = fast.Expression;
-                               goto Begin;
-                       }
-                       }
-
-               Fail:
-                       switch (mode) {
-                       case Mode.Match:
-                               return false;
-
-                       case Mode.Count: {
-                               if (!fast.IsLazy && fast.IsMinimum)
-                                       return true;
-
-                               ref_ptr = fast.Start;
-                               return false;
-                       }
-                       }
-
-                       return false;
-               }
-
-               private bool EvalChar (Mode mode, ref int ptr, ref int pc, bool multi) {
-                       bool consumed = false;
-                       char c = '\0';
-                       bool negate;
-                       bool ignore;
-               
-                       do {
-                               ushort word = program[pc];
-                               OpCode op = (OpCode)(word & 0x00ff);
-                               OpFlags flags = (OpFlags)(word & 0xff00);
-
-                               ++ pc;
-
-                               ignore = (flags & OpFlags.IgnoreCase) != 0;
-                               
-                               // consume character: the direction of an In construct is
-                               // determined by the direction of its first op
-
-                               if (!consumed) {
-                                       if ((flags & OpFlags.RightToLeft) != 0) {
-                                               if ((substring_mode && ptr <= (regex_rtl ? text_end : text_start)) || (!substring_mode && ptr <= 0))
-                                                       return false;
-
-                                               c = text[-- ptr];
-                                       }
-                                       else {
-                                               if ((!regex_rtl && ptr >= text_end) || (regex_rtl && ptr >= text_start))
-                                                       return false;
-
-                                               c = text[ptr ++];
-                                       }
-
-                                       if (ignore)
-                                               c = Char.ToLower (c);
-
-                                       consumed = true;
-                               }
-
-                               // negate flag
-
-                               negate = (flags & OpFlags.Negate) != 0;
-
-                               // execute op
-                               
-                               switch (op) {
-                               case OpCode.True:
-                                       return true;
-
-                               case OpCode.False:
-                                       return false;
-                               
-                               case OpCode.Character: {
-                                       if (c == (char)program[pc ++])
-                                               return !negate;
-                                       break;
-                               }
-
-                               case OpCode.Category: {
-                                       if (CategoryUtils.IsCategory ((Category)program[pc ++], c))
-                                               return !negate;
-                                       break;
-                               }
-
-                               case OpCode.NotCategory: {
-                                       if (!CategoryUtils.IsCategory ((Category)program[pc ++], c))
-                                               return !negate;
-                                       break;
-                               }
-                               
-                               case OpCode.Range: {
-                                       int lo = (char)program[pc ++];
-                                       int hi = (char)program[pc ++];
-                                       if (lo <= c && c <= hi)
-                                               return !negate;
-                                       break;
-                               }
-
-                               case OpCode.Set: {
-                                       int lo = (char)program[pc ++];
-                                       int len = (char)program[pc ++];
-                                       int bits = pc;
-                                       pc += len;
-
-                                       int i = (int)c - lo;
-                                       if (i < 0 || i >= len << 4)
-                                               break;
-                                               
-
-                                       if ((program[bits + (i >> 4)] & (1 << (i & 0xf))) != 0)
-                                               return !negate;
-                                       break;
-                               }
-                               }
-                       } while (multi);
-
-                       return negate;
-               }
-
-               private bool TryMatch (ref int ref_ptr, int pc) {
-                       Reset ();
-                       
-                       int ptr = ref_ptr;
-                       marks [groups [0]].Start = ptr;
-                       if (Eval (Mode.Match, ref ptr, pc)) {
-                               marks [groups [0]].End = ptr;
-                               ref_ptr = ptr;
-                               return true;
-                       }
-
-                       return false;
-               }
-               
-               private bool IsPosition (Position pos, int ptr) {
-                       switch (pos) {
-                       case Position.Start: case Position.StartOfString:
-                               return ptr == 0 || (substring_mode && ((!regex_rtl && ptr == text_start) || (regex_rtl && ptr == text_end)));
-
-                       case Position.StartOfLine:
-                               return ptr == 0 || text[ptr - 1] == '\n' || (substring_mode && ((!regex_rtl && ptr == text_start) || (regex_rtl && ptr == text_end)));
-                               
-                       case Position.StartOfScan:
-                               return ptr == scan_ptr;
-                       
-                       case Position.End:
-                               return (!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start) ||
-                                       (((!regex_rtl && ptr == text_end - 1) || (regex_rtl && ptr == text_start - 1)) && text[ptr] == '\n');
-
-                       case Position.EndOfLine:
-                               return (!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start) || text[ptr] == '\n';
-                               
-                       case Position.EndOfString:
-                               return (!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start);
-                               
-                       case Position.Boundary:
-                               if ((!regex_rtl && text_end == 0) || (regex_rtl && text_start == 0))
-                                       return false;
-
-                               if (ptr == 0)
-                                       return IsWordChar (text[ptr]);
-                               else if ((!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start))
-                                       return IsWordChar (text[ptr - 1]);
-                               else
-                                       return IsWordChar (text[ptr]) != IsWordChar (text[ptr - 1]);
-
-                       case Position.NonBoundary:
-                               if ((!regex_rtl && text_end == 0) || (regex_rtl && text_start == 0))
-                                       return false;
-
-                               if (ptr == 0)
-                                       return !IsWordChar (text[ptr]);
-                               else if ((!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start))
-                                       return !IsWordChar (text[ptr - 1]);
-                               else
-                                       return IsWordChar (text[ptr]) == IsWordChar (text[ptr - 1]);
-                       
-                       default:
-                               return false;
-                       }
-               }
-
-               private bool IsWordChar (char c) {
-                       return CategoryUtils.IsCategory (Category.Word, c);
-               }
-
-               private string GetString (int pc) {
-                       int len = program[pc + 1];
-                       int str = pc + 2;
-
-                       char[] cs = new char[len];
-                       for (int i = 0; i < len; ++ i)
-                               cs[i] = (char)program[str ++];
-
-                       return new string (cs);
-               }
-
-               // capture management
-
-               private void Open (int gid, int ptr) {
-                       int m = groups [gid];
-                       if (m < mark_start || marks [m].IsDefined) {
-                               m = CreateMark (m);
-                               groups [gid] = m;
-                       }
-
-                       marks [m].Start = ptr;
-               }
-
-               private void Close (int gid, int ptr) {
-                       marks [groups [gid]].End = ptr;
-               }
-
-               private bool Balance (int gid, int balance_gid, bool capture, int ptr) {
-                       int b = groups [balance_gid];
-
-                       if(b == -1 || marks[b].Index < 0) {
-                               //Group not previously matched
-                               return false;
-                       }
-                       Debug.Assert (marks [b].IsDefined, "Regex", "Balancng group not closed");
-                       if (gid > 0 && capture){ 
-                               Open (gid, marks [b].Index + marks [b].Length);
-                               Close (gid, ptr);
-                       }
-
-                       groups [balance_gid] = marks[b].Previous;
-
-                       return true;
-               }
-
-               private int Checkpoint () {
-                       mark_start = mark_end;
-                       return mark_start;
-               }
-
-               private void Backtrack (int cp) {
-                       Debug.Assert (cp > mark_start, "Regex", "Attempt to backtrack forwards");
-                       for (int i = 0; i < groups.Length; ++ i) {
-                               int m = groups [i];
-                               while (cp <= m) {
-                                       marks [m].Start = -1;
-                                       m = marks [m].Previous;
-                               }
-
-                               groups [i] = m;
-                       }
-                       mark_start = cp;
-               }
-
-               private void ResetGroups () {
-                       int n = groups.Length;
-                       if (marks == null)
-                               marks = new Mark [n * 10];
-
-                       for (int i = 0; i < n; ++ i) {
-                               groups [i] = i;
-
-                               marks [i].Start = -1;
-                               marks [i].End = -1;
-                               marks [i].Previous = -1;
-                       }
-                       
-                       mark_start = 0;
-                       mark_end = n;
-               }
-
-               private int GetLastDefined (int gid) {
-                       int m = groups [gid];
-                       while (m >= 0 && !marks [m].IsDefined)
-                               m = marks [m].Previous;
-
-                       return m;
-               }
-
-               private int CreateMark (int previous) {
-                       if (mark_end == marks.Length) {
-                               Mark [] dest = new Mark [marks.Length * 2];
-                               marks.CopyTo (dest, 0);
-                               marks = dest;
-                       }
-
-                       int m = mark_end ++;
-                       marks [m].Start = marks [m].End = -1;
-                       marks [m].Previous = previous;
-
-                       return m;
-               }
-
-               private void GetGroupInfo (int gid, out int first_mark_index, out int n_caps)
-               {
-                       first_mark_index = -1;
-                       n_caps = 0;
-                       for (int m = groups [gid]; m >= 0; m = marks [m].Previous) {
-                               if (!marks [m].IsDefined)
-                                       continue;
-                               if (first_mark_index < 0)
-                                       first_mark_index = m;
-                               ++n_caps;
-                       }
-               }
-
-               private void PopulateGroup (Group g, int first_mark_index, int n_caps)
-               {
-                       int i = 1;
-                       for (int m = marks [first_mark_index].Previous; m >= 0; m = marks [m].Previous) {
-                               if (!marks [m].IsDefined)
-                                       continue;
-                               Capture cap = new Capture (text, marks [m].Index, marks [m].Length);
-                               g.Captures.SetValue (cap, n_caps - 1 - i);
-                               ++i;
-                       }
-               }
-
-               private Match GenerateMatch (Regex regex)
-               {
-                       int n_caps, first_mark_index;
-                       Group g;
-                       GetGroupInfo (0, out first_mark_index, out n_caps);
-
-                       // Avoid fully populating the Match instance if not needed
-                       if (!needs_groups_or_captures)
-                               return new Match (regex, this, text, text_end, 0, marks [first_mark_index].Index, marks [first_mark_index].Length);
-
-                       Match retval = new Match (regex, this, text, text_end, groups.Length, 
-                                                 marks [first_mark_index].Index, marks [first_mark_index].Length, n_caps);
-                       PopulateGroup (retval, first_mark_index, n_caps);
-
-                       for (int gid = 1; gid < groups.Length; ++ gid) {
-                               GetGroupInfo (gid, out first_mark_index, out n_caps);
-                               if (first_mark_index < 0) {
-                                       g = Group.Fail;
-                               } else {
-                                       g = new Group (text, marks [first_mark_index].Index, marks [first_mark_index].Length, n_caps);
-                                       PopulateGroup (g, first_mark_index, n_caps);
-                               }
-                               retval.Groups.SetValue (g, gid);
-                       }
-                       return retval;
-               }
-
-               // interpreter attributes
-
-               private ushort[] program;               // regex program
-               private int program_start;              // first instruction after info block
-               private string text;                    // input text
-               private int text_end;                   // end of input text (last character + 1)
-               private int group_count;                // number of capturing groups
-               private int match_min;//, match_max;    // match width information
-               private QuickSearch qs;                 // fast substring matcher
-
-               private bool regex_rtl;
-               private int text_start;
-               private bool substring_mode;
-               private bool initialized;
-
-               // match state
-               
-               private int scan_ptr;                   // start of scan
-
-               private RepeatContext repeat;           // current repeat context
-               private RepeatContext fast;             // fast repeat context
-
-               // Repeat/Until handling
-               private IntStack stack = new IntStack (); // utility stack
-               private RepeatContext deep;             // points to the most-nested repeat context
-
-               private Mark[] marks = null;            // mark stack
-               private int mark_start;                 // start of current checkpoint
-               private int mark_end;                   // end of checkpoint/next free mark
-
-               private int[] groups;                   // current group definitions
-
-               // private classes
-
-               private struct IntStack {
-                       int [] values;
-                       int count;
-                       public int Pop ()
-                       {
-                               return values [--count];
-                       }
-                       public void Push (int value)
-                       {
-                               if (values == null) {
-                                       values = new int [8];
-                               } else if (count == values.Length) {
-                                       int new_size = values.Length;
-                                       new_size += new_size >> 1;
-                                       int [] new_values = new int [new_size];
-                                       for (int i = 0; i < count; ++i)
-                                               new_values [i] = values [i];
-                                       values = new_values;
-                               }
-                               values [count++] = value;
-                       }
-                       public int Top {
-                               get { return values [count - 1]; }
-                       }
-                       public int Count {
-                               get { return count; }
-                               set {
-                                       if (value > count)
-                                               throw new SystemException ("can only truncate the stack");
-                                       count = value;
-                               }
-                       }
-               }
-
-               private class RepeatContext {
-                       public RepeatContext (RepeatContext previous, int min, int max, bool lazy, int expr_pc) {
-                               this.previous = previous;
-                               this.min = min;
-                               this.max = max;
-                               this.lazy = lazy;
-                               this.expr_pc = expr_pc;
-                               
-                               this.start = -1;
-                               this.count = 0;
-                       }
-
-                       public int Count {
-                               get { return count; }
-                               set { count = value; }
-                       }
-
-                       public int Start {
-                               get { return start; }
-                               set { start = value; }
-                       }
-
-                       public bool IsMinimum {
-                               get { return min <= count; }
-                       }
-
-                       public bool IsMaximum {
-                               get { return max <= count; }
-                       }
-
-                       public bool IsLazy {
-                               get { return lazy; }
-                       }
-
-                       public int Expression {
-                               get { return expr_pc; }
-                       }
-
-                       public RepeatContext Previous {
-                               get { return previous; }
-                       }
-               
-                       private int start;
-                       private int min, max;
-                       private bool lazy;
-                       private int expr_pc;
-                       private RepeatContext previous;
-
-                       private int count;
-               }
-
-               private enum Mode {
-                       Search,
-                       Match,
-                       Count
-               }
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/interval.cs b/mcs/class/System/System.Text.RegularExpressions/interval.cs
deleted file mode 100644 (file)
index 91da127..0000000
+++ /dev/null
@@ -1,334 +0,0 @@
-//\r
-// assembly:   System\r
-// namespace:  System.Text.RegularExpressions\r
-// file:       interval.cs\r
-//\r
-// author:     Dan Lewis (dlewis@gmx.co.uk)\r
-//             (c) 2002\r
-\r
-//\r
-// Permission is hereby granted, free of charge, to any person obtaining\r
-// a copy of this software and associated documentation files (the\r
-// "Software"), to deal in the Software without restriction, including\r
-// without limitation the rights to use, copy, modify, merge, publish,\r
-// distribute, sublicense, and/or sell copies of the Software, and to\r
-// permit persons to whom the Software is furnished to do so, subject to\r
-// the following conditions:\r
-// \r
-// The above copyright notice and this permission notice shall be\r
-// included in all copies or substantial portions of the Software.\r
-// \r
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-//\r
-\r
-using System;\r
-using System.Collections;\r
-\r
-namespace System.Text.RegularExpressions {\r
-\r
-       struct Interval : IComparable {\r
-               public int low;\r
-               public int high;\r
-               public bool contiguous;\r
-\r
-               public static Interval Empty {\r
-                       get {\r
-                               Interval i;\r
-                               i.low = 0;\r
-                               i.high = i.low - 1;\r
-                               i.contiguous = true;\r
-\r
-                               return i;\r
-                       }\r
-               }\r
-\r
-               public static Interval Entire {\r
-                       get { return new Interval (Int32.MinValue, Int32.MaxValue); }\r
-               }\r
-\r
-               public Interval (int low, int high) {\r
-                       if (low > high) {\r
-                               int t = low;\r
-                               low = high;\r
-                               high = t;\r
-                       }\r
-               \r
-                       this.low = low;\r
-                       this.high = high;\r
-                       this.contiguous = true;\r
-               }\r
-\r
-               public bool IsDiscontiguous {\r
-                       get { return !contiguous; }\r
-               }\r
-               \r
-               public bool IsSingleton {\r
-                       get { return contiguous && low == high; }\r
-               }\r
-\r
-               public bool IsRange {\r
-                       get { return !IsSingleton && !IsEmpty; }\r
-               }\r
-\r
-               public bool IsEmpty {\r
-                       get { return low > high; }\r
-               }\r
-\r
-               public int Size {\r
-                       get {\r
-                               if (IsEmpty)\r
-                                       return 0;\r
-                               \r
-                               return high - low + 1;\r
-                       }\r
-               }\r
-\r
-               public bool IsDisjoint (Interval i) {\r
-                       if (IsEmpty || i.IsEmpty)\r
-                               return true;\r
-                       \r
-                       return !(low <= i.high && i.low <= high);\r
-               }\r
-\r
-               public bool IsAdjacent (Interval i) {\r
-                       if (IsEmpty || i.IsEmpty)\r
-                               return false;\r
-               \r
-                       return low == i.high + 1 || high == i.low - 1;\r
-               }\r
-\r
-               public bool Contains (Interval i) {\r
-                       if (!IsEmpty && i.IsEmpty)\r
-                               return true;\r
-                       if (IsEmpty)\r
-                               return false;\r
-               \r
-                       return low <= i.low && i.high <= high;\r
-               }\r
-\r
-               public bool Contains (int i) {\r
-                       return low <= i && i <= high;\r
-               }\r
-\r
-               public bool Intersects (Interval i) {\r
-                       if (IsEmpty || i.IsEmpty)\r
-                               return false;\r
-                       \r
-                       return ((Contains (i.low) && !Contains (i.high)) ||\r
-                               (Contains (i.high) && !Contains (i.low)));\r
-               }       \r
-\r
-               public void Merge (Interval i) {\r
-                       if (i.IsEmpty)\r
-                               return;\r
-                       if (IsEmpty) {\r
-                               this.low = i.low;\r
-                               this.high = i.high;\r
-                       }\r
-               \r
-                       if (i.low < low)\r
-                               low = i.low;\r
-                       if (i.high > high)\r
-                               high = i.high;\r
-               }\r
-\r
-               public void Intersect (Interval i) {\r
-                       if (IsDisjoint (i)) {\r
-                               low = 0;\r
-                               high = low - 1;\r
-                               return;\r
-                       }\r
-               \r
-                       if (i.low > low)\r
-                               low = i.low;\r
-                       if (i.high > high)\r
-                               high = i.high;\r
-               }\r
-\r
-               public int CompareTo (object o) {\r
-                       return low - ((Interval)o).low;\r
-               }\r
-\r
-               public new string ToString () {\r
-                       if (IsEmpty)\r
-                               return "(EMPTY)";\r
-                       else if (!contiguous)\r
-                               return "{" + low + ", " + high + "}";\r
-                       else if (IsSingleton)\r
-                               return "(" + low + ")";\r
-                       else\r
-                               return "(" + low + ", " + high + ")";\r
-               }\r
-       }\r
-\r
-       class IntervalCollection : ICollection, IEnumerable {\r
-               public IntervalCollection () {\r
-                       intervals = new ArrayList ();\r
-               }\r
-\r
-               public Interval this[int i] {\r
-                       get { return (Interval)intervals[i]; }\r
-                       set { intervals[i] = value; }\r
-               }\r
-\r
-               public void Add (Interval i) {\r
-                       intervals.Add (i);\r
-               }\r
-                       \r
-               public void Clear () {\r
-                       intervals.Clear ();\r
-               }\r
-\r
-               public void Sort () {\r
-                       intervals.Sort ();\r
-               }\r
-               \r
-               public void Normalize () {\r
-                       intervals.Sort ();\r
-\r
-                       int j = 0;\r
-                       while (j < intervals.Count - 1) {\r
-                               Interval a = (Interval)intervals[j];\r
-                               Interval b = (Interval)intervals[j + 1];\r
-\r
-                               if (!a.IsDisjoint (b) || a.IsAdjacent (b)) {\r
-                                       a.Merge (b);\r
-                                       intervals[j] = a;\r
-                                       intervals.RemoveAt (j + 1);\r
-                               }\r
-                               else\r
-                                       ++ j;\r
-                       }\r
-\r
-               }\r
-\r
-               public delegate double CostDelegate (Interval i);\r
-\r
-               public IntervalCollection GetMetaCollection (CostDelegate cost_del) {\r
-                       IntervalCollection meta = new IntervalCollection ();\r
-               \r
-                       Normalize ();\r
-                       Optimize (0, Count - 1, meta, cost_del);\r
-                       meta.intervals.Sort ();\r
-\r
-                       return meta;\r
-               }\r
-\r
-               private void Optimize (int begin, int end, IntervalCollection meta, CostDelegate cost_del) {\r
-                       Interval set;\r
-                       set.contiguous = false;\r
-               \r
-                       int best_set_begin = -1;\r
-                       int best_set_end = -1;\r
-                       double best_set_cost = 0;\r
-\r
-                       for (int i = begin; i <= end; ++ i) {\r
-                               set.low = this[i].low;\r
-\r
-                               double cost = 0.0;\r
-                               for (int j = i; j <= end; ++ j) {\r
-                                       set.high = this[j].high;\r
-                                       cost += cost_del (this[j]);\r
-                                       \r
-                                       double set_cost = cost_del (set);\r
-                                       if (set_cost < cost && cost > best_set_cost) {\r
-                                               best_set_begin = i;\r
-                                               best_set_end = j;\r
-                                               best_set_cost = cost;\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-                       if (best_set_begin < 0) {\r
-                               // didn't find an optimal set: add original members\r
-\r
-                               for (int i = begin; i <= end; ++ i)\r
-                                       meta.Add (this[i]);\r
-                       }\r
-                       else {\r
-                               // found set: add it ...\r
-\r
-                               set.low = this[best_set_begin].low;\r
-                               set.high = this[best_set_end].high;\r
-                               \r
-                               meta.Add (set);\r
-\r
-                               // ... and optimize to the left and right\r
-\r
-                               if (best_set_begin > begin)\r
-                                       Optimize (begin, best_set_begin - 1, meta, cost_del);\r
-                               if (best_set_end < end)\r
-                                       Optimize (best_set_end + 1, end, meta, cost_del);\r
-                       }\r
-               }\r
-\r
-               // ICollection implementation\r
-\r
-               public int Count {\r
-                       get { return intervals.Count; }\r
-               }\r
-\r
-               public bool IsSynchronized {\r
-                       get { return false; }\r
-               }\r
-\r
-               public object SyncRoot {\r
-                       get { return intervals; }\r
-               }\r
-\r
-               public void CopyTo (Array array, int index) {\r
-                       foreach (Interval i in intervals) {\r
-                               if (index > array.Length)\r
-                                       break;\r
-                               \r
-                               array.SetValue (i, index ++);\r
-                       }\r
-               }\r
-\r
-               // IEnumerator implementation\r
-\r
-               public IEnumerator GetEnumerator () {\r
-                       return new Enumerator (intervals);\r
-               }\r
-\r
-               private class Enumerator : IEnumerator {\r
-                       public Enumerator (IList list) {\r
-                               this.list = list;\r
-                               Reset ();\r
-                       }\r
-\r
-                       public object Current {\r
-                               get {\r
-                                       if (ptr >= list.Count)\r
-                                               throw new InvalidOperationException ();\r
-\r
-                                       return list[ptr];\r
-                               }\r
-                       }\r
-\r
-                       public bool MoveNext () {\r
-                               if (ptr > list.Count)\r
-                                       throw new InvalidOperationException ();\r
-                               \r
-                               return ++ ptr < list.Count;\r
-                       }\r
-\r
-                       public void Reset () {\r
-                               ptr = -1;\r
-                       }\r
-\r
-                       private IList list;\r
-                       private int ptr;\r
-               }\r
-\r
-               // private fields\r
-\r
-               private ArrayList intervals;\r
-       }\r
-}\r
diff --git a/mcs/class/System/System.Text.RegularExpressions/notes.txt b/mcs/class/System/System.Text.RegularExpressions/notes.txt
deleted file mode 100644 (file)
index e385869..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-TODO:
-
-* Need to go through everything and square it with RightToLeft matching.
-  The support for this was built into an early version, and lots of things built
-  afterwards are not savvy about bi-directional matching. Things that spring to
-  mind: Regex match methods should start at 0 or text.Length depending on
-  direction. Do split and replace need changes? Match should be aware of its
-  direction (already applied some of this to NextMatch logic). The interpreter
-  needs to check left and right bounds. Anchoring and substring discovery need
-  to be reworked. RTL matches are going to have anchors on the right - ie $, \Z
-  and \z. This should be added to the anchor logic. QuickSearch needs to work in
-  reverse. There may be other stuff.... work through the code.
-
-* Add ECMAScript support to the parser. For example, [.\w\s\d] map to ECMA
-  categories instead of canonical ones [DONE]. There's different behaviour on
-  backreference/octal disambiguation. Find out what the runtime behavioural
-  difference is for cyclic backreferences eg (?(1)abc\1) - this is only briefly 
-  mentioned in the spec. I couldn't find much on this in the ECMAScript
-  specification either.
-
-* Octal/backreference parsing needs a big fix. The rules are ridiculously complex.
-
-* Improve the perl test suite. Run under MS runtime to generate checksums for
-  each trial. Checksums should incorporate: all captures (index, length) for all
-  groups; names of explicit capturing groups, and the numbers they map to. Any
-  other state? RegexTrial.Execute() will then compare result and checksum.
-
-* The pattern (?(1?)a|b). It should fail: Perl fails, the MS implementation
-  fails, but I pass. The documentation says that the construct (?(X)...) can be
-  processed in two ways. If X is a valid group number, or a valid group name,
-  then the expression becomes a capture conditional - the (...) part is
-  executed only if X has been captured. If X is not a group number or name, then
-  it is treated as a positive lookahead., and (...) is only executed if the
-  lookahead succeeds. My code does the latter, but on further investigation it
-  appears that both Perl and MS fail to recognize an expression assertion if the
-  first character of the assertion is a number - which instead suggests a
-  capture conditional. The exception raised is something like "invalid group
-  number". I get the feeling the my behaviour seems more correct, but it's not
-  consistent with the other implementations, so it should probably be changed.
diff --git a/mcs/class/System/System.Text.RegularExpressions/parser.cs b/mcs/class/System/System.Text.RegularExpressions/parser.cs
deleted file mode 100644 (file)
index ff6a6e5..0000000
+++ /dev/null
@@ -1,1244 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       parser.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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.Globalization;
-
-namespace System.Text.RegularExpressions.Syntax {
-
-       class Parser {
-               public static int ParseDecimal (string str, ref int ptr) {
-                       return ParseNumber (str, ref ptr, 10, 1, Int32.MaxValue);
-               }
-
-               public static int ParseOctal (string str, ref int ptr) {
-                       return ParseNumber (str, ref ptr, 8, 1, 3);
-               }
-
-               public static int ParseHex (string str, ref int ptr, int digits) {
-                       return ParseNumber (str, ref ptr, 16, digits, digits);
-               }
-
-               public static int ParseNumber (string str, ref int ptr, int b, int min, int max) {
-                       int p = ptr, n = 0, digits = 0, d;
-                       if (max < min)
-                               max = Int32.MaxValue;
-
-                       while (digits < max && p < str.Length) {
-                               d = ParseDigit (str[p ++], b, digits);
-                               if (d < 0) {
-                                       -- p;
-                                       break;
-                               }
-
-                               n = n * b + d;
-                               ++ digits;
-                       }
-
-                       if (digits < min)
-                               return -1;
-
-                       ptr = p;
-                       return n;
-               }
-
-               public static string ParseName (string str, ref int ptr) {
-                       if (Char.IsDigit (str[ptr])) {
-                               int gid = ParseNumber (str, ref ptr, 10, 1, 0);
-                               if (gid > 0)
-                                       return gid.ToString ();
-                               
-                               return null;
-                       }
-
-                       int start = ptr;
-                       for (;;) {
-                               if (!IsNameChar (str[ptr]))
-                                       break;
-                               ++ ptr;
-                       }
-
-                       if (ptr - start > 0)
-                               return str.Substring (start, ptr - start);
-
-                       return null;
-               }
-
-               public static string Escape (string str) {
-                       string result = "";
-                       for (int i = 0; i < str.Length; ++ i) {
-                               char c = str[i];
-                               switch (c) {
-                               case '\\': case '*': case '+': case '?': case '|':
-                               case '{': case '[': case '(': case ')': case '^':
-                               case '$': case '.': case '#': case ' ':
-                                       result += "\\" + c;
-                                       break;
-
-                               case '\t': result += "\\t"; break;
-                               case '\n': result += "\\n"; break;
-                               case '\r': result += "\\r"; break;
-                               case '\f': result += "\\f"; break;
-
-                               default: result += c; break;
-                               }
-                       }
-
-                       return result;
-               }
-
-               public static string Unescape (string str) {
-                       if (str.IndexOf ('\\') == -1)
-                               return str;
-                       return new Parser ().ParseString (str);
-               }
-
-               // public instance
-
-               public Parser () {
-                       this.caps = new ArrayList ();
-                       this.refs = new Hashtable ();
-               }
-
-               public RegularExpression ParseRegularExpression (string pattern, RegexOptions options) {
-                       this.pattern = pattern;
-                       this.ptr = 0;
-
-                       caps.Clear ();
-                       refs.Clear ();
-                       this.num_groups = 0;
-
-                       try {
-                               RegularExpression re = new RegularExpression ();
-                               ParseGroup (re, options, null);
-                               ResolveReferences ();
-
-                               re.GroupCount = num_groups;
-                               
-                               return re;
-                       }
-                       catch (IndexOutOfRangeException) {
-                               throw NewParseException ("Unexpected end of pattern.");
-                       }
-               }
-
-               public int GetMapping (Hashtable mapping)
-               {
-                       int end = caps.Count;
-                       mapping.Add ("0", 0);
-                       for (int i = 0; i < end; i++) {
-                               CapturingGroup group = (CapturingGroup) caps [i];
-                               string name = group.Name != null ? group.Name : group.Index.ToString ();
-                               if (mapping.Contains (name)) {
-                                       if ((int) mapping [name] != group.Index)
-                                               throw new SystemException ("invalid state");
-                                       continue;
-                               }
-                               mapping.Add (name, group.Index);
-                       }
-
-                       return gap;
-               }
-
-               // private methods
-
-               private void ParseGroup (Group group, RegexOptions options, Assertion assertion) {
-                       bool is_top_level = group is RegularExpression;
-               
-                       Alternation alternation = null;
-                       string literal = null;
-
-                       Group current = new Group ();
-                       Expression expr = null;
-                       bool closed = false;
-
-                       while (true) {
-                               ConsumeWhitespace (IsIgnorePatternWhitespace (options));
-                               if (ptr >= pattern.Length)
-                                       break;
-                               
-                               // (1) Parse for Expressions
-                       
-                               char ch = pattern[ptr ++];
-                               
-                               switch (ch) {
-                               case '^': {
-                                       Position pos =
-                                               IsMultiline (options) ? Position.StartOfLine : Position.Start;
-                                       expr = new PositionAssertion (pos);
-                                       break;
-                               }
-
-                               case '$': {
-                                       Position pos =
-                                               IsMultiline (options) ? Position.EndOfLine : Position.End;
-                                       expr = new PositionAssertion (pos);
-                                       break;
-                               }
-
-                               case '.': {
-                                       Category cat =
-                                               IsSingleline (options) ? Category.AnySingleline : Category.Any;
-                                       expr = new CharacterClass (cat, false);
-                                       break;
-                               }
-
-                               case '\\': {
-                                       int c = ParseEscape (false);
-                                       if (c >= 0)
-                                               ch = (char)c;
-                                       else {
-                                               expr = ParseSpecial (options);
-
-                                               if (expr == null)
-                                                       ch = pattern[ptr ++];           // default escape
-                                       }
-                                       break;
-                               }
-
-                               case '[': {
-                                       expr = ParseCharacterClass (options);
-                                       break;
-                               }
-
-                               case '(': {
-                                       bool ignore = IsIgnoreCase (options);
-                                       expr = ParseGroupingConstruct (ref options);
-                                       if (expr == null) {
-                                               if (literal != null && IsIgnoreCase (options) != ignore) {
-                                                       current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));
-                                                       literal = null;
-                                               }
-
-                                               continue;
-                                       }
-                                       break;
-                               }
-
-                               case ')': {
-                                       closed = true;
-                                       goto EndOfGroup;
-                               }
-
-                               case '|': {
-                                       if (literal != null) {
-                                               current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));
-                                               literal = null;
-                                       }
-
-                                       if (assertion != null) {
-                                               if (assertion.TrueExpression == null)
-                                                       assertion.TrueExpression = current;
-                                               else if (assertion.FalseExpression == null)
-                                                       assertion.FalseExpression = current;
-                                               else
-                                                       throw NewParseException ("Too many | in (?()|).");
-                                       }
-                                       else {
-                                               if (alternation == null)
-                                                       alternation = new Alternation ();
-
-                                               alternation.AddAlternative (current);
-                                       }
-
-                                       current = new Group ();
-                                       continue;
-                               }
-
-                               case '*': case '+': case '?': {
-                                       throw NewParseException ("Bad quantifier.");
-                               }
-
-                               default: 
-                                       break;          // literal character
-                               }
-
-                               ConsumeWhitespace (IsIgnorePatternWhitespace (options));
-                               
-                               // (2) Check for Repetitions
-                               
-                               if (ptr < pattern.Length) {
-                                       char k = pattern[ptr];
-                                       int min = 0, max = 0;
-                                       bool lazy = false;
-                                       bool haveRep = false;
-
-
-                                       if (k == '?' || k == '*' || k == '+') {
-                                               ++ ptr;
-                                               haveRep = true;
-
-                                               switch (k) {
-                                               case '?': min = 0; max = 1; break;
-                                               case '*': min = 0; max = 0x7fffffff; break;
-                                               case '+': min = 1; max = 0x7fffffff; break;
-                                               }
-                                       } else if (k == '{' && ptr + 1 < pattern.Length) {
-                                               int saved_ptr = ptr;
-                                               ++ptr;
-                                               haveRep = ParseRepetitionBounds (out min, out max, options);
-                                               if (!haveRep)
-                                                       ptr = saved_ptr;
-                                       }
-
-                                       if (haveRep) {
-                                               ConsumeWhitespace (IsIgnorePatternWhitespace (options));
-                                               if (ptr < pattern.Length && pattern[ptr] == '?') {
-                                                       ++ ptr;
-                                                       lazy = true;
-                                               }
-
-                                               //It doesn't make sense to assert a given position more than once.
-                                               bool ignore_repetition = false;
-                                               if (expr is PositionAssertion) {
-                                                       ignore_repetition = min > 0 && !lazy;
-                                                       max = 1;
-                                               }
-
-                                               if (!ignore_repetition) {
-                                                       Repetition repetition = new Repetition (min, max, lazy);
-       
-                                                       if (expr == null)
-                                                               repetition.Expression = new Literal (ch.ToString (), IsIgnoreCase (options));
-                                                       else
-                                                               repetition.Expression = expr;
-       
-                                                       expr = repetition;
-                                               }
-                                       }
-                               }
-
-                               // (3) Append Expression and/or Literal
-
-                               if (expr == null) {
-                                       if (literal == null)
-                                               literal = "";
-                                       literal += ch;
-                               }
-                               else {
-                                       if (literal != null) {
-                                               current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));
-                                               literal = null;
-                                       }
-
-                                       current.AppendExpression (expr);
-                                       expr = null;
-                               }
-
-                               if (is_top_level && ptr >= pattern.Length)
-                                       goto EndOfGroup;
-                       }
-
-               EndOfGroup:
-                       if (is_top_level && closed)
-                               throw NewParseException ("Too many )'s.");
-                       if (!is_top_level && !closed)
-                               throw NewParseException ("Not enough )'s.");
-                               
-               
-                       // clean up literals and alternations
-
-                       if (literal != null)
-                               current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));
-
-                       if (assertion != null) {
-                               if (assertion.TrueExpression == null)
-                                       assertion.TrueExpression = current;
-                               else
-                                       assertion.FalseExpression = current;
-                               
-                               group.AppendExpression (assertion);
-                       }
-                       else if (alternation != null) {
-                               alternation.AddAlternative (current);
-                               group.AppendExpression (alternation);
-                       }
-                       else
-                               group.AppendExpression (current);
-               }
-
-               private Expression ParseGroupingConstruct (ref RegexOptions options) {
-                       if (pattern[ptr] != '?') {
-                               Group group;
-
-                               if (IsExplicitCapture (options))
-                                       group = new Group ();
-                               else {
-                                       group = new CapturingGroup ();
-                                       caps.Add (group);
-                               }
-
-                               ParseGroup (group, options, null);
-                               return group;
-                       }
-                       else
-                               ++ ptr;
-
-                       switch (pattern[ptr]) {
-                       case ':': {                                             // non-capturing group
-                               ++ ptr;
-                               Group group = new Group ();
-                               ParseGroup (group, options, null);
-
-                               return group;
-                       }
-
-                       case '>': {                                             // non-backtracking group
-                               ++ ptr;
-                               Group group = new NonBacktrackingGroup ();
-                               ParseGroup (group, options, null);
-                               
-                               return group;
-                       }
-
-                       case 'i': case 'm': case 'n':
-                       case 's': case 'x': case '-': {                         // options
-                               RegexOptions o = options;
-                               ParseOptions (ref o, false);
-                               if (pattern[ptr] == '-') {
-                                       ++ ptr;
-                                       ParseOptions (ref o, true);
-                               }
-
-                               if (pattern[ptr] == ':') {                      // pass options to child group
-                                       ++ ptr;
-                                       Group group = new Group ();
-                                       ParseGroup (group, o, null);
-                                       return group;
-                               }
-                               else if (pattern[ptr] == ')') {                 // change options of enclosing group
-                                       ++ ptr;
-                                       options = o;
-                                       return null;
-                               }
-                               else
-                                       throw NewParseException ("Bad options");
-                       }
-
-                       case '<': case '=': case '!': {                         // lookahead/lookbehind
-                               ExpressionAssertion asn = new ExpressionAssertion ();
-                               if (!ParseAssertionType (asn))
-                                       goto case '\'';                         // it's a (?<name> ) construct
-
-                               Group test = new Group ();
-                               ParseGroup (test, options, null);
-
-                               asn.TestExpression = test;
-                               return asn;
-                       }
-
-                       case '\'': {                                            // named/balancing group
-                               char delim;
-                               if (pattern[ptr] == '<')
-                                       delim = '>';
-                               else
-                                       delim = '\'';
-
-                               ++ ptr;
-                               string name = ParseName ();
-
-                               if (pattern[ptr] == delim) {
-                                       // capturing group
-
-                                       if (name == null)
-                                               throw NewParseException ("Bad group name.");
-
-                                       ++ ptr;
-                                       CapturingGroup cap = new CapturingGroup ();
-                                       cap.Name = name;
-                                       caps.Add (cap);
-                                       ParseGroup (cap, options, null);
-
-                                       return cap;
-                               }
-                               else if (pattern[ptr] == '-') {
-                                       // balancing group
-
-                                       ++ ptr;
-                                       string balance_name = ParseName ();
-                                       if (balance_name == null || pattern[ptr] != delim)
-                                               throw NewParseException ("Bad balancing group name.");
-
-                                       ++ ptr;
-                                       BalancingGroup bal = new BalancingGroup ();
-                                       bal.Name = name;
-                                       
-                                       if(bal.IsNamed) {
-                                               caps.Add (bal);
-                                       }
-
-                                       refs.Add (bal, balance_name);
-
-                                       ParseGroup (bal, options, null);
-
-                                       return bal;
-                               }
-                               else
-                                       throw NewParseException ("Bad group name.");
-                       }
-
-                       case '(': {                                             // expression/capture test
-                               Assertion asn;
-                       
-                               ++ ptr;
-                               int p = ptr;
-                               string name = ParseName ();
-                               if (name == null || pattern[ptr] != ')') {      // expression test
-                                       // FIXME MS implementation doesn't seem to
-                                       // implement this version of (?(x) ...)
-
-                                       ptr = p;
-                                       ExpressionAssertion expr_asn = new ExpressionAssertion ();
-
-                                       if (pattern[ptr] == '?') {
-                                               ++ ptr;
-                                               if (!ParseAssertionType (expr_asn))
-                                                       throw NewParseException ("Bad conditional.");
-                                       }
-                                       else {
-                                               expr_asn.Negate = false;
-                                               expr_asn.Reverse = false;
-                                       }
-
-                                       Group test = new Group ();
-                                       ParseGroup (test, options, null);
-                                       expr_asn.TestExpression = test;
-                                       asn = expr_asn;
-                               }
-                               else {                                          // capture test
-                                       ++ ptr;
-                                       asn = new CaptureAssertion (new Literal (name, IsIgnoreCase (options)));
-                                       refs.Add (asn, name);
-                               }
-
-                               Group group = new Group ();
-                               ParseGroup (group, options, asn);
-                               return group;
-                       }
-
-                       case '#': {                                             // comment
-                               ++ ptr;
-                               while (pattern[ptr ++] != ')') {
-                                       if (ptr >= pattern.Length)
-                                               throw NewParseException ("Unterminated (?#...) comment.");
-                               }
-                               return null;
-                       }
-
-                       default:                                                // error
-                               throw NewParseException ("Bad grouping construct.");
-                       }
-               }
-
-               private bool ParseAssertionType (ExpressionAssertion assertion) {
-                       if (pattern[ptr] == '<') {
-                               switch (pattern[ptr + 1]) {
-                               case '=':
-                                       assertion.Negate = false;
-                                       break;
-                               case '!':
-                                       assertion.Negate = true;
-                                       break;
-                               default:
-                                       return false;
-                               }
-
-                               assertion.Reverse = true;
-                               ptr += 2;
-                       }
-                       else {
-                               switch (pattern[ptr]) {
-                               case '=':
-                                       assertion.Negate = false;
-                                       break;
-                               case '!':
-                                       assertion.Negate = true;
-                                       break;
-                               default:
-                                       return false;
-                               }
-
-                               assertion.Reverse = false;
-                               ptr += 1;
-                       }
-
-                       return true;
-               }
-
-               private void ParseOptions (ref RegexOptions options, bool negate) {
-                       for (;;) {
-                               switch (pattern[ptr]) {
-                               case 'i':
-                                       if (negate)
-                                               options &= ~RegexOptions.IgnoreCase;
-                                       else
-                                               options |= RegexOptions.IgnoreCase;
-                                       break;
-
-                               case 'm':
-                                       if (negate)
-                                               options &= ~RegexOptions.Multiline;
-                                       else
-                                               options |= RegexOptions.Multiline;
-                                       break;
-                                       
-                               case 'n':
-                                       if (negate)
-                                               options &= ~RegexOptions.ExplicitCapture;
-                                       else
-                                               options |= RegexOptions.ExplicitCapture;
-                                       break;
-                                       
-                               case 's':
-                                       if (negate)
-                                               options &= ~RegexOptions.Singleline;
-                                       else
-                                               options |= RegexOptions.Singleline;
-                                       break;
-                                       
-                               case 'x':
-                                       if (negate)
-                                               options &= ~RegexOptions.IgnorePatternWhitespace;
-                                       else
-                                               options |= RegexOptions.IgnorePatternWhitespace;
-                                       break;
-
-                               default:
-                                       return;
-                               }
-
-                               ++ ptr;
-                       }
-               }
-
-               private Expression ParseCharacterClass (RegexOptions options) {
-                       bool negate = false;
-                       if (pattern[ptr] == '^') {
-                               negate = true;
-                               ++ ptr;
-                       }
-                       
-                       bool ecma = IsECMAScript (options);
-                       CharacterClass cls = new CharacterClass (negate, IsIgnoreCase (options));
-
-                       if (pattern[ptr] == ']') {
-                               cls.AddCharacter (']');
-                               ++ ptr;
-                       }
-
-                       int c = -1;
-                       int last = -1;
-                       bool range = false;
-                       bool closed = false;
-                       while (ptr < pattern.Length) {
-                               c = pattern[ptr ++];
-
-                               if (c == ']') {
-                                       closed = true;
-                                       break;
-                               }
-
-                               if (c == '-' && last >= 0 && !range) {
-                                       range = true;
-                                       continue;
-                               }
-
-                               if (c == '\\') {
-                                       c = ParseEscape (true);
-                                       if (c >= 0)
-                                               goto char_recognized;
-
-                                       // didn't recognize escape
-                                       c = pattern [ptr ++];
-                                       switch (c) {
-                                       case 'b':
-                                               c = '\b';
-                                               goto char_recognized;
-
-                                       case 'd': case 'D':
-                                               cls.AddCategory (ecma ? Category.EcmaDigit : Category.Digit, c == 'D');
-                                               break;
-                                               
-                                       case 'w': case 'W':
-                                               cls.AddCategory (ecma ? Category.EcmaWord : Category.Word, c == 'W');
-                                               break;
-                                               
-                                       case 's': case 'S':
-                                               cls.AddCategory (ecma ? Category.EcmaWhiteSpace : Category.WhiteSpace, c == 'S');
-                                               break;
-                                               
-                                       case 'p': case 'P':
-                                               cls.AddCategory (ParseUnicodeCategory (), c == 'P');    // ignore ecma
-                                               break;
-
-                                       default:                // add escaped character
-                                               goto char_recognized;
-                                       }
-
-                                       // if the pattern looks like [a-\s] ...
-                                       if (range)
-                                               throw NewParseException ("character range cannot have category \\" + c);
-
-                                       last = -1;
-                                       continue;
-                               }
-
-                       char_recognized:
-                               if (range) {
-                                       // if 'range' is true, we know that 'last >= 0'
-                                       if (c < last)
-                                               throw NewParseException ("[" + last + "-" + c + "] range in reverse order.");
-                                       cls.AddRange ((char)last, (char)c);
-                                       last = -1;
-                                       range = false;
-                                       continue;
-                               }
-
-                               cls.AddCharacter ((char)c);
-                               last = c;
-                       }
-
-                       if (!closed)
-                               throw NewParseException ("Unterminated [] set.");
-
-                       if (range)
-                               cls.AddCharacter ('-');
-
-                       return cls;
-               }
-
-               private bool ParseRepetitionBounds (out int min, out int max, RegexOptions options) {
-                       int n, m;
-                       min = max = 0;
-
-                       /* check syntax */
-
-                       ConsumeWhitespace (IsIgnorePatternWhitespace (options));
-                   
-                       if (pattern[ptr] == ',') {
-                                n = -1;
-                       } else {
-                                n = ParseNumber (10, 1, 0);
-                                ConsumeWhitespace (IsIgnorePatternWhitespace (options));
-                       }
-                       
-                       switch (pattern[ptr ++]) {
-                       case '}':
-                               m = n;
-                               break;
-                       case ',':
-                               ConsumeWhitespace (IsIgnorePatternWhitespace (options));
-                               m = ParseNumber (10, 1, 0);
-                               ConsumeWhitespace (IsIgnorePatternWhitespace (options));
-                               if (pattern[ptr ++] != '}')
-                                       return false;
-                               break;
-                       default:
-                               return false;
-                       }
-
-                       /* check bounds and ordering */
-
-                       if (n > 0x7fffffff || m > 0x7fffffff)
-                               throw NewParseException ("Illegal {x, y} - maximum of 2147483647.");
-                       if (m >= 0 && m < n)
-                               throw NewParseException ("Illegal {x, y} with x > y.");
-
-                       /* assign min and max */
-                       
-                       min = n;
-                       if (m > 0)
-                               max = m;
-                       else
-                               max = 0x7fffffff;
-
-                       return true;
-               }
-
-               private Category ParseUnicodeCategory () {
-                       if (pattern[ptr ++] != '{')
-                               throw NewParseException ("Incomplete \\p{X} character escape.");
-
-                       string name = ParseName (pattern, ref ptr);
-                       if (name == null)
-                               throw NewParseException ("Incomplete \\p{X} character escape.");
-
-                       Category cat = CategoryUtils.CategoryFromName (name);
-                       if (cat == Category.None)
-                               throw NewParseException ("Unknown property '" + name + "'.");
-
-                       if (pattern[ptr ++] != '}')
-                               throw NewParseException ("Incomplete \\p{X} character escape.");
-
-                       return cat;
-               }
-
-               private Expression ParseSpecial (RegexOptions options) {
-                       int p = ptr;
-                       bool ecma = IsECMAScript (options);
-                       Expression expr = null;
-                       
-                       switch (pattern[ptr ++]) {
-
-                       // categories
-
-                       case 'd':
-                               expr = new CharacterClass (ecma ? Category.EcmaDigit : Category.Digit, false);
-                               break;
-                               
-                       case 'w':
-                               expr = new CharacterClass (ecma ? Category.EcmaWord : Category.Word, false);
-                               break;
-                               
-                       case 's':
-                               expr = new CharacterClass (ecma ? Category.EcmaWhiteSpace : Category.WhiteSpace, false);
-                               break;
-                               
-                       case 'p':
-                               // this is odd - ECMAScript isn't supposed to support Unicode,
-                               // yet \p{..} compiles and runs under the MS implementation
-                               // identically to canonical mode. That's why I'm ignoring the
-                               // value of ecma here.
-                       
-                               expr = new CharacterClass (ParseUnicodeCategory (), false);
-                               break;
-                               
-                       case 'D':
-                               expr = new CharacterClass (ecma ? Category.EcmaDigit : Category.Digit, true);
-                               break;
-                               
-                       case 'W':
-                               expr = new CharacterClass (ecma ? Category.EcmaWord : Category.Word, true);
-                               break;
-                               
-                       case 'S':
-                               expr = new CharacterClass (ecma ? Category.EcmaWhiteSpace : Category.WhiteSpace, true);
-                               break;
-                               
-                       case 'P':
-                               expr = new CharacterClass (ParseUnicodeCategory (), true);
-                               break;
-
-                       // positions
-
-                       case 'A': expr = new PositionAssertion (Position.StartOfString); break;
-                       case 'Z': expr = new PositionAssertion (Position.End); break;
-                       case 'z': expr = new PositionAssertion (Position.EndOfString); break;
-                       case 'G': expr = new PositionAssertion (Position.StartOfScan); break;
-                       case 'b': expr = new PositionAssertion (Position.Boundary); break;
-                       case 'B': expr = new PositionAssertion (Position.NonBoundary); break;
-                       
-                       // references
-
-                       case '1': case '2': case '3': case '4': case '5':
-                       case '6': case '7': case '8': case '9': {
-                               ptr --;
-                               int n = ParseNumber (10, 1, 0);
-                               if (n < 0) {
-                                       ptr = p;
-                                       return null;
-                               }
-
-                               // FIXME test if number is within number of assigned groups
-                               // this may present a problem for right-to-left matching
-
-                               Reference reference = new BackslashNumber (IsIgnoreCase (options), ecma);
-                               refs.Add (reference, n.ToString ());
-                               expr = reference;
-                               break;
-                       }
-
-                       case 'k': {
-                               char delim = pattern[ptr ++];
-                               if (delim == '<')
-                                       delim = '>';
-                               else if (delim != '\'')
-                                       throw NewParseException ("Malformed \\k<...> named backreference.");
-
-                               string name = ParseName ();
-                               if (name == null || pattern[ptr] != delim)
-                                       throw NewParseException ("Malformed \\k<...> named backreference.");
-
-                               ++ ptr;
-                               Reference reference = new Reference (IsIgnoreCase (options));
-                               refs.Add (reference, name);
-                               expr = reference;
-                               break;
-                       }
-
-                       default:
-                               expr = null;
-                               break;
-                       }
-
-                       if (expr == null)
-                               ptr = p;
-
-                       return expr;
-               }
-
-               private int ParseEscape (bool inCharacterClass) {
-                       int p = ptr;
-                       int c;
-
-                       if (p >= pattern.Length)
-                               throw new ArgumentException (
-                                               String.Format ("Parsing \"{0}\" - Illegal \\ at end of " + 
-                                                               "pattern.", pattern), pattern);
-                       
-                       switch (pattern[ptr ++]) {
-       
-                       // standard escapes (except \b)
-
-                       case 'a': return '\u0007';
-                       case 't': return '\u0009';
-                       case 'r': return '\u000d';
-                       case 'v': return '\u000b';
-                       case 'f': return '\u000c';
-                       case 'n': return '\u000a';
-                       case 'e': return '\u001b';
-                       case '\\': return '\\';
-
-                       // character codes
-
-                       case '0':
-                               
-                               //
-                               // Turns out that octal values can be specified
-                               // without a leading zero.   But also the limit
-                               // of three character should include this first
-                               // one.  
-                               //
-                               ptr--;
-                               int prevptr = ptr;
-                               int result = ParseOctal (pattern, ref ptr);
-                               if (result == -1 && prevptr == ptr)
-                                       return 0;
-
-                               return result;
-
-                       case '1': case '2': case '3': case '4': case '5':
-                       case '6': case '7':
-                               if (inCharacterClass){
-                                       ptr--;
-                                       return ParseOctal (pattern, ref ptr);
-                               }
-                               break;
-                               
-                       case 'x':
-                               c = ParseHex (pattern, ref ptr, 2);
-                               if (c < 0)
-                                       throw NewParseException ("Insufficient hex digits");
-
-                               return c;
-
-                       case 'u':
-                               c = ParseHex (pattern, ref ptr, 4);
-                               if (c < 0)
-                                       throw NewParseException ("Insufficient hex digits");
-                               
-                               return c;
-
-                       // control characters
-
-                       case 'c':
-                               c = pattern[ptr ++];
-                               if (c >= '@' && c <= '_')
-                                       return c - '@';
-                               else
-                                       throw NewParseException ("Unrecognized control character.");
-                       }
-
-                       // unknown escape
-                       ptr = p;
-                       return -1;
-               }
-
-               private string ParseName () {
-                       return Parser.ParseName (pattern, ref ptr);
-               }
-
-               private static bool IsNameChar (char c) {
-                       UnicodeCategory cat = Char.GetUnicodeCategory (c);
-                       if (cat == UnicodeCategory.ModifierLetter)
-                               return false;
-                       if (cat == UnicodeCategory.ConnectorPunctuation)
-                               return true;
-                       return Char.IsLetterOrDigit (c);
-               }
-       
-               private int ParseNumber (int b, int min, int max) {
-                       return Parser.ParseNumber (pattern, ref ptr, b, min, max);
-               }
-
-               private static int ParseDigit (char c, int b, int n) {
-                       switch (b) {
-                       case 8:
-                               if (c >= '0' && c <= '7')
-                                       return c - '0';
-                               else
-                                       return -1;
-                       case 10:
-                               if (c >= '0' && c <= '9')
-                                       return c - '0';
-                               else
-                                       return -1;
-                       case 16:
-                               if (c >= '0' && c <= '9')
-                                       return c - '0';
-                               else if (c >= 'a' && c <= 'f')
-                                       return 10 + c - 'a';
-                               else if (c >= 'A' && c <= 'F')
-                                       return 10 + c - 'A';
-                               else
-                                       return -1;
-                       default:
-                               return -1;
-                       }
-               }
-
-               private void ConsumeWhitespace (bool ignore) {
-                       while (ptr < pattern.Length) {
-                               if (pattern[ptr] == '(') {
-                                       if (ptr + 3 >= pattern.Length)
-                                               return;
-
-                                       if (pattern[ptr + 1] != '?' || pattern[ptr + 2] != '#')
-                                               return;
-
-                                       ptr += 3;
-                                       while (ptr < pattern.Length && pattern[ptr ++] != ')')
-                                               /* ignore */ ;
-                               }
-                               else if (ignore && pattern[ptr] == '#') {
-                                       while (ptr < pattern.Length && pattern[ptr ++] != '\n')
-                                               /* ignore */ ;
-                               }
-                               else if (ignore && Char.IsWhiteSpace (pattern[ptr])) {
-                                       while (ptr < pattern.Length && Char.IsWhiteSpace (pattern[ptr]))
-                                               ++ ptr;
-                               }
-                               else
-                                       return;
-                       }
-               }
-
-               private string ParseString (string pattern) {
-                       this.pattern = pattern;
-                       this.ptr = 0;
-
-                       StringBuilder result = new StringBuilder (pattern.Length);
-                       while (ptr < pattern.Length) {
-                               int c = pattern[ptr ++];
-                               if (c == '\\') {
-                                       c = ParseEscape (false);
-
-                                       if(c < 0) {
-                                               c = pattern[ptr ++];
-                                               if(c == 'b')
-                                                       c = '\b';
-                                       }
-                               }
-                               result.Append ((char) c);
-                       }
-
-                       return result.ToString ();
-               }
-
-               private void ResolveReferences ()
-               {
-                       int gid = 1;
-                       Hashtable dict = new Hashtable ();
-                       ArrayList explicit_numeric_groups = null;
-
-                       // number unnamed groups
-
-                       foreach (CapturingGroup group in caps) {
-                               if (group.Name != null)
-                                       continue;
-
-                               dict.Add (gid.ToString (), group);
-                               group.Index = gid ++;
-                               ++ num_groups;
-                       }
-
-                       // number named groups
-
-                       foreach (CapturingGroup group in caps) {
-                               if (group.Name == null)
-                                       continue;
-
-                               if (dict.Contains (group.Name)) {
-                                       CapturingGroup prev = (CapturingGroup) dict [group.Name];
-                                       group.Index = prev.Index;
-
-                                       if (group.Index == gid)
-                                               gid ++;
-                                       else if (group.Index > gid)
-                                               explicit_numeric_groups.Add (group);
-                                       continue;
-                               }
-
-                               if (Char.IsDigit (group.Name [0])) {
-                                       int ptr = 0;
-                                       int group_gid = ParseDecimal (group.Name, ref ptr);
-                                       if (ptr == group.Name.Length) {
-                                               group.Index = group_gid;
-                                               dict.Add (group.Name, group);
-                                               ++ num_groups;
-
-                                               if (group_gid == gid) {
-                                                       gid ++;
-                                               } else {
-                                                       // all numbers before 'gid' are already in the dictionary.  So, we know group_gid > gid
-                                                       if (explicit_numeric_groups == null)
-                                                               explicit_numeric_groups = new ArrayList (4);
-                                                       explicit_numeric_groups.Add (group);
-                                               }
-
-                                               continue;
-                                       }
-                               }
-
-                               string gid_s = gid.ToString ();
-                               while (dict.Contains (gid_s))
-                                       gid_s = (++gid).ToString ();
-
-                               dict.Add (gid_s, group);
-                               dict.Add (group.Name, group);
-                               group.Index = gid ++;
-                               ++ num_groups;
-                       }
-
-                       gap = gid; // == 1 + num_groups, if explicit_numeric_groups == null
-
-                       if (explicit_numeric_groups != null)
-                               HandleExplicitNumericGroups (explicit_numeric_groups);
-
-                       // resolve references
-
-                       foreach (Expression expr in refs.Keys) {
-                               string name = (string) refs [expr];
-                               if (!dict.Contains (name)) {
-                                       if (expr is CaptureAssertion && !Char.IsDigit (name [0]))
-                                               continue;
-                                       BackslashNumber bn = expr as BackslashNumber;
-                                       if (bn != null && bn.ResolveReference (name, dict))
-                                               continue;
-                                       throw NewParseException ("Reference to undefined group " +
-                                               (Char.IsDigit (name[0]) ? "number " : "name ") +
-                                               name);
-                               }
-
-                               CapturingGroup group = (CapturingGroup)dict[name];
-                               if (expr is Reference)
-                                       ((Reference)expr).CapturingGroup = group;
-                               else if (expr is CaptureAssertion)
-                                       ((CaptureAssertion)expr).CapturingGroup = group;
-                               else if (expr is BalancingGroup)
-                                       ((BalancingGroup)expr).Balance = group;
-                       }
-               }
-
-               private void HandleExplicitNumericGroups (ArrayList explicit_numeric_groups)
-               {
-                       int gid = gap;
-                       int i = 0;
-                       int n_explicit = explicit_numeric_groups.Count;
-
-                       explicit_numeric_groups.Sort ();
-
-                       // move 'gap' forward to skip over all explicit groups that
-                       // turn out to match their index
-                       for (; i < n_explicit; ++i) {
-                               CapturingGroup g = (CapturingGroup) explicit_numeric_groups [i];
-                               if (g.Index > gid)
-                                       break;
-                               if (g.Index == gid)
-                                       gid ++;
-                       }
-
-                       gap = gid;
-
-                       // re-index all further groups so that the indexes are contiguous
-                       int prev = gid;
-                       for (; i < n_explicit; ++i) {
-                               CapturingGroup g = (CapturingGroup) explicit_numeric_groups [i];
-                               if (g.Index == prev) {
-                                       g.Index = gid - 1;
-                               } else {
-                                       prev = g.Index;
-                                       g.Index = gid ++;
-                               }
-                       }
-               }
-
-               // flag helper functions
-
-               private static bool IsIgnoreCase (RegexOptions options) {
-                       return (options & RegexOptions.IgnoreCase) != 0;
-               }
-
-               private static bool IsMultiline (RegexOptions options) {
-                       return (options & RegexOptions.Multiline) != 0;
-               }
-
-               private static bool IsExplicitCapture (RegexOptions options) {
-                       return (options & RegexOptions.ExplicitCapture) != 0;
-               }
-       
-               private static bool IsSingleline (RegexOptions options) {
-                       return (options & RegexOptions.Singleline) != 0;
-               }
-
-               private static bool IsIgnorePatternWhitespace (RegexOptions options) {
-                       return (options & RegexOptions.IgnorePatternWhitespace) != 0;
-               }
-
-               private static bool IsECMAScript (RegexOptions options) {
-                       return (options & RegexOptions.ECMAScript) != 0;
-               }
-
-               // exception creation
-
-               private ArgumentException NewParseException (string msg) {
-                       msg = "parsing \"" + pattern + "\" - " + msg;
-                       return new ArgumentException (msg, pattern);
-               }
-
-               private string pattern;
-               private int ptr;
-
-               private ArrayList caps;
-               private Hashtable refs;
-               private int num_groups;
-               private int gap;
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/quicksearch.cs b/mcs/class/System/System.Text.RegularExpressions/quicksearch.cs
deleted file mode 100644 (file)
index 1652907..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       quicksearch.cs
-//
-// Authors:    Dan Lewis (dlewis@gmx.co.uk)
-//              Juraj Skripsky (juraj@hotfeet.ch)
-//
-// (c) 2002 Dan Lewis
-// (c) 2007 Juraj Skripsky
-//
-
-//
-// 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;
-
-namespace System.Text.RegularExpressions {
-       internal class QuickSearch {
-               // simplified boyer-moore for fast substring matching
-               // (for short strings, we use simple scans)
-               public QuickSearch (string str, bool ignore) 
-                       : this(str, ignore, false)
-               {
-               }
-       
-               public QuickSearch (string str, bool ignore, bool reverse) {
-                       this.str = str;
-                       this.len = str.Length;
-                       this.ignore = ignore;
-                       this.reverse = reverse;
-
-                       if (ignore)
-                               str = str.ToLower ();
-
-                       // create the shift table only for "long" search strings
-                       if(len > THRESHOLD)
-                               SetupShiftTable ();
-               }
-               
-               public string String {
-                       get { return str; }
-               }
-
-               public int Length {
-                       get { return len; }
-               }
-
-               public bool IgnoreCase {
-                       get { return ignore; }
-               }
-
-               public int Search (string text, int start, int end) {
-                       int ptr = start;
-
-               
-                       if ( reverse ) 
-                       {
-                               if (start < end)
-                                       return -1;
-
-                               if ( ptr > text.Length) 
-                               {
-                                       ptr = text.Length;
-                               }
-
-                               // use simple scan for a single-character search string
-                               if (len == 1) 
-                               {
-                                       while (--ptr >= end) 
-                                       {
-                                               if(str[0] == GetChar(text[ptr]))
-                                                       return ptr ;
-                                               
-                                       }
-                                       return -1;
-                               }
-
-               
-                               if ( end < len)
-                                       end =  len - 1 ;
-
-                               ptr--;
-                               while (ptr >= end) 
-                               {
-                                       int i = len -1 ;
-                                       while (str[i] == GetChar(text[ptr - len +1 + i])) 
-                                       {
-                                               if (-- i <  0)
-                                                       return ptr - len + 1;
-                                       }
-
-                                       if (ptr > end)
-                                       {
-                                               ptr -= GetShiftDistance (text[ptr - len ]);
-                                       
-                                       }
-                                       else
-                                               break;
-                               }
-
-                       }
-                       else 
-                       {
-                               // use simple scan for a single-character search string
-                               if (len == 1) 
-                               {
-                                       while (ptr <= end) 
-                                       {
-                                               if(str[0] == GetChar(text[ptr]))
-                                                       return ptr;
-                                               else
-                                                       ptr++;
-                                       }       
-                                       return -1;
-                               }
-
-                               if (end > text.Length - len)
-                                       end = text.Length - len;
-
-                               while (ptr <= end) 
-                               {
-                                       int i = len - 1;
-                                       while (str[i] == GetChar(text[ptr + i])) 
-                                       {
-                                               if (-- i < 0)
-                                                       return ptr;
-                                       }
-
-                                       if (ptr < end)
-                                               ptr += GetShiftDistance (text[ptr + len]);
-                                       else
-                                               break;
-                               }
-                       }
-
-                       return -1;
-                               
-               }
-
-                       // private
-
-               private void SetupShiftTable () {
-                       bool needsExtendedTable = len > (byte.MaxValue - 1);
-
-                       byte maxLowChar = 0;
-                       for (int i = 0; i < len; i++) {
-                               char cur = str [i];
-                               if (cur <= (char)byte.MaxValue) {
-                                       if ((byte)cur > maxLowChar)
-                                               maxLowChar = (byte)cur;
-                               } else
-                                       needsExtendedTable = true;
-                       }
-                       
-                       shift = new byte [maxLowChar + 1];
-                       if (needsExtendedTable)
-                               shiftExtended = new Hashtable ();
-
-                       for (int i = 0, j = len; i < len; i++, j--) {
-                               char c = str [(!reverse ? i : j - 1)];
-                               if (c < shift.Length) {
-                                       if (j < byte.MaxValue) {
-                                               shift [c] = (byte)j;
-                                               continue;
-                                       } else {
-                                               shift [c] = byte.MaxValue;
-                                       }
-                               }
-                               shiftExtended [c] = j;
-                       }
-               }
-           
-               private int GetShiftDistance (char c) {
-                       if (shift == null)
-                               return 1;
-                               
-                       c = GetChar (c);
-                       if (c < shift.Length) {
-                               int dist = shift [c];
-                               if (dist == 0) {
-                                       return len + 1;
-                               } else {
-                                       if (dist != byte.MaxValue)
-                                               return dist;
-                               }
-                       } else {
-                               if (c < (char)byte.MaxValue)    
-                                       return len + 1;
-                       }
-
-                       if (shiftExtended == null)
-                               return len + 1;
-
-                       object s = shiftExtended [c];
-                       return (s != null ? (int)s : len + 1);
-               }
-
-               private char GetChar(char c) {
-                       return (!ignore ? c : Char.ToLower(c));
-               }
-
-               private string str;
-               private int len;
-               private bool ignore;
-               private bool reverse;
-
-               // shift[idx] contains value x  means 
-               //  x == 0             => shift dist. == len + 1
-               //  x == byte.Maxvalue => shift dist. >= 255, look it up in shiftExtended
-               //  otherwise          => shift dist. == x 
-               private byte[] shift;
-               private Hashtable shiftExtended;
-               private readonly static int THRESHOLD = 5;
-       }
-
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/replace.cs b/mcs/class/System/System.Text.RegularExpressions/replace.cs
deleted file mode 100644 (file)
index 835ea7c..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       replace.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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.Text;
-using System.Collections;
-
-using Parser = System.Text.RegularExpressions.Syntax.Parser;
-
-namespace System.Text.RegularExpressions {
-
-       class ReplacementEvaluator {
-               public static string Evaluate (string replacement, Match match)
-               {
-                       ReplacementEvaluator ev = new ReplacementEvaluator (match.Regex, replacement);
-                       return ev.Evaluate (match);
-               }
-
-               public ReplacementEvaluator (Regex regex, string replacement)
-               {
-                       this.regex = regex;
-                       this.replacement = replacement;
-                       this.pieces = null;
-                       this.n_pieces = 0;
-                       Compile ();
-               }
-
-               public string Evaluate (Match match) 
-               {
-                       if (n_pieces == 0)
-                               return replacement;
-                       StringBuilder sb = new StringBuilder ();
-                       EvaluateAppend (match, sb);
-                       return sb.ToString ();
-               }
-
-               public void EvaluateAppend (Match match, StringBuilder sb)
-               {
-                       if (n_pieces == 0) {
-                               sb.Append (replacement);
-                               return;
-                       }
-
-                       int i = 0;
-                       while (i < n_pieces) {
-                               int k = pieces [i++];
-                               if (k >= 0) {
-                                       int count = pieces [i++];
-                                       sb.Append (replacement, k, count);
-                               } else if (k < -3) {
-                                       Group group = match.Groups [-(k + 4)];
-                                       sb.Append (group.Text, group.Index, group.Length);
-                               } else if (k == -1) {
-                                       sb.Append (match.Text);
-                               } else if (k == -2) {
-                                       sb.Append (match.Text, 0, match.Index);
-                               } else { // k == -3
-                                       int matchend = match.Index + match.Length;
-                                       sb.Append (match.Text, matchend, match.Text.Length - matchend);
-                               } 
-                       }
-               }
-
-               public bool NeedsGroupsOrCaptures {
-                       get {
-                               if (n_pieces == 0)
-                                       return false;
-                               else
-                                       return true;
-                       }
-               }
-
-               void Ensure (int size)
-               {
-                       int new_size;
-                       if (pieces == null) {
-                               new_size = 4;
-                               if (new_size < size)
-                                       new_size = size;
-                               pieces = new int [new_size];
-                       } else if (size >= pieces.Length) {
-                               new_size = pieces.Length + (pieces.Length >> 1);
-                               if (new_size < size)
-                                       new_size = size;
-                               int [] new_pieces = new int [new_size];
-                               Array.Copy (pieces, new_pieces, n_pieces);
-                               pieces = new_pieces;
-                       }
-               }
-
-               void AddFromReplacement (int start, int end)
-               {
-                       if (start == end)
-                               return;
-                       Ensure (n_pieces + 2);
-                       pieces [n_pieces++] = start;
-                       pieces [n_pieces++] = end - start;
-               }
-
-               void AddInt (int i)
-               {
-                       Ensure (n_pieces + 1);
-                       pieces [n_pieces++] = i;
-               }
-
-               // private
-               private void Compile ()
-               {
-                       int anchor = 0, ptr = 0, saveptr;
-                       char c;
-                       while (ptr < replacement.Length) {
-                               c = replacement [ptr++];
-
-                               if (c != '$')
-                                       continue;
-
-                               // If the '$' was the last character, just emit it as is
-                               if (ptr == replacement.Length)
-                                       break;
-
-                               // If we saw a '$$'
-                               if (replacement [ptr] == '$') {
-                                       // Everthing from 'anchor' upto and including the first '$' is copied from the replacement string
-                                       AddFromReplacement (anchor, ptr);
-                                       // skip over the second '$'.
-                                       anchor = ++ptr;
-                                       continue;
-                               }
-
-                               saveptr = ptr - 1;
-
-                               int from_match = CompileTerm (ref ptr);
-
-                               // We couldn't recognize the term following the '$'.  Just treat it as a literal.
-                               // 'ptr' has already been advanced, no need to rewind it back
-                               if (from_match >= 0)
-                                       continue;
-
-                               AddFromReplacement (anchor, saveptr);
-                               AddInt (from_match);
-                               anchor = ptr;
-                       }
-
-                       // If we never needed to advance anchor, it means the result is the whole replacement string.
-                       // We optimize that case by never allocating the pieces array.
-                       if (anchor != 0)
-                               AddFromReplacement (anchor, ptr);
-               }
-
-               private int CompileTerm (ref int ptr)
-               {
-                       char c = replacement [ptr];
-
-                       if (Char.IsDigit (c)) {         // numbered group
-                               int n = Parser.ParseDecimal (replacement, ref ptr);
-                               if (n < 0 || n > regex.GroupCount)
-                                       return 0;
-                               
-                               return -n - 4;
-                       }
-                       
-                       ++ ptr;
-
-                       switch (c) {
-                       case '{': {                     // named group
-                               string name;
-                               int n = -1;
-
-                               try {
-                                       // The parser is written such that there are few explicit range checks
-                                       // and depends on 'IndexOutOfRangeException' being thrown.
-
-                                       if (Char.IsDigit (replacement [ptr])) {
-                                               n = Parser.ParseDecimal (replacement, ref ptr);
-                                               name = "";
-                                       } else {
-                                               name = Parser.ParseName (replacement, ref ptr);
-                                       }
-                               } catch (IndexOutOfRangeException) {
-                                       ptr = replacement.Length;
-                                       return 0;
-                               }
-
-                               if (ptr == replacement.Length || replacement[ptr] != '}' || name == null)
-                                       return 0;
-                               ++ptr;                  // Swallow the '}'
-
-                               if (name != "")
-                                       n = regex.GroupNumberFromName (name);
-
-                               if (n < 0 || n > regex.GroupCount)
-                                       return 0;
-
-                               return -n - 4;
-                       }
-
-                       case '&':                       // entire match.  Value should be same as $0
-                               return -4;
-
-                       case '`':                       // text before match
-                               return -2;
-
-                       case '\'':                      // text after match
-                               return -3;
-
-                       case '+':                       // last group
-                               return -regex.GroupCount - 4;
-
-                       case '_':                       // entire text
-                               return -1;
-
-                       default:
-                               return 0;
-                       }
-               }
-
-               private Regex regex;
-               int n_pieces;
-               private int [] pieces;
-               string replacement;
-       }
-}
diff --git a/mcs/class/System/System.Text.RegularExpressions/syntax.cs b/mcs/class/System/System.Text.RegularExpressions/syntax.cs
deleted file mode 100644 (file)
index a3ab80c..0000000
+++ /dev/null
@@ -1,1125 +0,0 @@
-//
-// assembly:   System
-// namespace:  System.Text.RegularExpressions
-// file:       syntax.cs
-//
-// author:     Dan Lewis (dlewis@gmx.co.uk)
-//             (c) 2002
-
-//
-// 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;
-
-namespace System.Text.RegularExpressions.Syntax {
-       // collection classes
-
-       class ExpressionCollection : CollectionBase {
-               public void Add (Expression e) {
-                       List.Add (e);
-               }
-
-               public Expression this[int i] {
-                       get { return (Expression)List[i]; }
-                       set { List[i] = value; }
-               }
-
-               protected override void OnValidate (object o) {
-                       // allow null elements
-               }
-       }
-
-       // abstract classes
-
-       abstract class Expression {
-               public abstract void Compile (ICompiler cmp, bool reverse);
-               public abstract void GetWidth (out int min, out int max);
-
-               public int GetFixedWidth () {
-                       int min, max;
-                       GetWidth (out min, out max);
-
-                       if (min == max)
-                               return min;
-
-                       return -1;
-               }
-
-               public virtual AnchorInfo GetAnchorInfo (bool reverse) {
-                       return new AnchorInfo (this, GetFixedWidth ());
-               }
-
-               public abstract bool IsComplex ();
-       }
-
-       // composite expressions
-
-       abstract class CompositeExpression : Expression {
-               public CompositeExpression () {
-                       expressions = new ExpressionCollection ();
-               }
-
-               protected ExpressionCollection Expressions {
-                       get { return expressions; }
-               }
-
-               protected void GetWidth (out int min, out int max, int count) {
-                       min = Int32.MaxValue;
-                       max = 0;
-                       bool empty = true;
-
-                       for (int i = 0; i < count; ++ i) {
-                               Expression e = Expressions[i];
-                               if (e == null)
-                                       continue;
-
-                               empty = false;
-                               int a, b;
-                               e.GetWidth (out a, out b);
-                               if (a < min) min = a;
-                               if (b > max) max = b;
-                       }
-
-                       if (empty)
-                               min = max = 0;
-               }
-
-
-               public override bool IsComplex ()
-               {
-                       foreach (Expression e in Expressions) {
-                               if (e.IsComplex ())
-                                       return true;
-                       }
-                       return GetFixedWidth () <= 0;
-               }
-
-               private ExpressionCollection expressions;
-       }
-
-       // groups
-
-       class Group : CompositeExpression {
-               public Group () {
-               }
-
-               public Expression Expression {
-                       get { return Expressions[0]; }
-                       set { Expressions[0] = value; }
-               }
-
-               public void AppendExpression (Expression e) {
-                       Expressions.Add (e);
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       int count = Expressions.Count;
-                       for (int i = 0; i < count; ++ i) {
-                               Expression e;
-                               if (reverse)
-                                       e = Expressions[count - i - 1];
-                               else
-                                       e = Expressions[i];
-
-                               e.Compile (cmp, reverse);
-                       }
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       min = 0;
-                       max = 0;
-
-                       foreach (Expression e in Expressions) {
-                               int a, b;
-                               e.GetWidth (out a, out b);
-                               min += a;
-                               if (max == Int32.MaxValue || b == Int32.MaxValue)
-                                       max = Int32.MaxValue;
-                               else
-                                       max += b;
-                       }
-               }
-
-               public override AnchorInfo GetAnchorInfo (bool reverse)
-               {
-                       int ptr;
-                       int width = GetFixedWidth ();
-
-                       ArrayList infos = new ArrayList ();
-                       IntervalCollection segments = new IntervalCollection ();
-
-                       // accumulate segments
-                       ptr = 0;
-                       int count = Expressions.Count;
-                       for (int i = 0; i < count; ++ i) {
-                               Expression e;
-                               if (reverse)
-                                       e = Expressions [count - i - 1];
-                               else
-                                       e = Expressions [i];
-
-                               AnchorInfo info = e.GetAnchorInfo (reverse);
-                               infos.Add (info);
-
-                               if (info.IsPosition)
-                                       return new AnchorInfo (this, ptr + info.Offset, width, info.Position);
-
-                               if (info.IsSubstring)
-                                       segments.Add (info.GetInterval (ptr));
-
-                               if (info.IsUnknownWidth)
-                                       break;
-
-                               ptr += info.Width;
-                       }
-
-                       // normalize and find the longest segment
-                       segments.Normalize ();
-
-                       Interval longest = Interval.Empty;
-                       foreach (Interval segment in segments) {
-                               if (segment.Size > longest.Size)
-                                       longest = segment;
-                       }
-
-                       if (longest.IsEmpty)
-                               return new AnchorInfo (this, width);
-
-                       // now chain the substrings that made this segment together
-                       bool ignore = false;
-                       int n_strings = 0;
-
-                       ptr = 0;
-                       for (int i = 0; i < infos.Count; ++i) {
-                               AnchorInfo info = (AnchorInfo) infos [i];
-
-                               if (info.IsSubstring && longest.Contains (info.GetInterval (ptr))) {
-                                       ignore |= info.IgnoreCase;
-                                       infos [n_strings ++] = info;
-                               }
-
-                               if (info.IsUnknownWidth)
-                                       break;
-
-                               ptr += info.Width;
-                       }
-
-                       StringBuilder sb = new StringBuilder ();
-                       for (int i = 0; i < n_strings; ++i) {
-                               AnchorInfo info;
-                               if (reverse)
-                                       info = (AnchorInfo) infos [n_strings - i - 1];
-                               else
-                                       info = (AnchorInfo) infos [i];
-                               sb.Append (info.Substring);
-                       }
-
-                       if (sb.Length == longest.Size)
-                               return new AnchorInfo (this, longest.low, width, sb.ToString (), ignore);
-                       // were the string segments overlapping?
-                       if (sb.Length > longest.Size) {
-                               Console.Error.WriteLine ("overlapping?");
-                               return new AnchorInfo (this, width);
-                       }
-                       throw new SystemException ("Shouldn't happen");
-               }
-       }
-
-       class RegularExpression : Group {
-               public RegularExpression () {
-                       group_count = 0;
-               }
-
-               public int GroupCount {
-                       get { return group_count; }
-                       set { group_count = value; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       // info block
-
-                       int min, max;
-                       GetWidth (out min, out max);
-                       cmp.EmitInfo (group_count, min, max);
-
-                       // anchoring expression
-
-                       AnchorInfo info = GetAnchorInfo (reverse);
-                       //if (reverse)
-                       //      info = new AnchorInfo (this, GetFixedWidth ()); // FIXME
-
-                       LinkRef pattern = cmp.NewLink ();
-                       cmp.EmitAnchor (reverse, info.Offset, pattern);
-
-                       if (info.IsPosition)
-                               cmp.EmitPosition (info.Position);
-                       else if (info.IsSubstring)
-                               cmp.EmitString (info.Substring, info.IgnoreCase, reverse);
-
-                       cmp.EmitTrue ();
-
-                       // pattern
-
-                       cmp.ResolveLink (pattern);
-                       base.Compile (cmp, reverse);
-                       cmp.EmitTrue ();
-               }
-
-               private int group_count;
-       }
-
-       class CapturingGroup : Group, IComparable {
-               public CapturingGroup () {
-                       this.gid = 0;
-                       this.name = null;
-               }
-
-               public int Index {
-                       get { return gid; }
-                       set { gid = value; }
-               }
-
-               public string Name {
-                       get { return name; }
-                       set { name = value; }
-               }
-
-               public bool IsNamed {
-                       get { return name != null; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       cmp.EmitOpen (gid);
-                       base.Compile (cmp, reverse);
-                       cmp.EmitClose (gid);
-               }
-
-               public override bool IsComplex () {
-                       return true;
-               }
-
-               public int CompareTo (object other)
-               {
-                       return gid - ((CapturingGroup) other).gid;
-               }
-
-               private int gid;
-               private string name;
-       }
-
-       class BalancingGroup : CapturingGroup {
-               public BalancingGroup () {
-                       this.balance = null;
-               }
-
-               public CapturingGroup Balance {
-                       get { return balance; }
-                       set { balance = value; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       // can't invoke Group.Compile from here :(
-                       // so I'll just repeat the code
-
-                       LinkRef tail = cmp.NewLink ();
-
-                       cmp.EmitBalanceStart (this.Index, balance.Index, this.IsNamed,  tail);
-
-                       int count = Expressions.Count;
-                       for (int i = 0; i < count; ++ i) {
-                               Expression e;
-                               if (reverse)
-                                       e = Expressions[count - i - 1];
-                               else
-                                       e = Expressions[i];
-
-                               e.Compile (cmp, reverse);
-                       }
-
-                       cmp.EmitBalance ();
-                       cmp.ResolveLink(tail);
-               }
-
-               private CapturingGroup balance;
-       }
-
-       class NonBacktrackingGroup : Group {
-               public NonBacktrackingGroup () {
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       LinkRef tail = cmp.NewLink ();
-
-                       cmp.EmitSub (tail);
-                       base.Compile (cmp, reverse);
-                       cmp.EmitTrue ();
-                       cmp.ResolveLink (tail);
-               }
-
-               public override bool IsComplex () {
-                       return true;
-               }
-       }
-
-       // repetition
-
-       class Repetition : CompositeExpression {
-               public Repetition (int min, int max, bool lazy) {
-                       Expressions.Add (null);
-
-                       this.min = min;
-                       this.max = max;
-                       this.lazy = lazy;
-               }
-
-               public Expression Expression {
-                       get { return Expressions[0]; }
-                       set { Expressions[0] = value; }
-               }
-
-               public int Minimum {
-                       get { return min; }
-                       set { min = value; }
-               }
-
-               public int Maximum {
-                       get { return max; }
-                       set { max = value; }
-               }
-
-               public bool Lazy {
-                       get { return lazy; }
-                       set { lazy = value; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       if (Expression.IsComplex ()) {
-                               LinkRef until = cmp.NewLink ();
-
-                               cmp.EmitRepeat (min, max, lazy, until);
-                               Expression.Compile (cmp, reverse);
-                               cmp.EmitUntil (until);
-                       }
-                       else {
-                               LinkRef tail = cmp.NewLink ();
-
-                               cmp.EmitFastRepeat (min, max, lazy, tail);
-                               Expression.Compile (cmp, reverse);
-                               cmp.EmitTrue ();
-                               cmp.ResolveLink (tail);
-                       }
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       Expression.GetWidth (out min, out max);
-                       min = min * this.min;
-                       if (max == Int32.MaxValue || this.max == 0xffff)
-                               max = Int32.MaxValue;
-                       else
-                               max = max * this.max;
-               }
-
-               public override AnchorInfo GetAnchorInfo (bool reverse) {
-                       int width = GetFixedWidth ();
-                       if (Minimum == 0)
-                               return new AnchorInfo (this, width);
-
-                       AnchorInfo info = Expression.GetAnchorInfo (reverse);
-                       if (info.IsPosition)
-                               return new AnchorInfo (this, info.Offset, width, info.Position);
-
-                       if (info.IsSubstring) {
-                               if (info.IsComplete) {
-                                       // Minimum > 0
-                                       string str = info.Substring;
-                                       StringBuilder sb = new StringBuilder (str);
-                                       for (int i = 1; i < Minimum; ++ i)
-                                               sb.Append (str);
-
-                                       return new AnchorInfo (this, 0, width, sb.ToString (), info.IgnoreCase);
-                               }
-
-                               return new AnchorInfo (this, info.Offset, width, info.Substring, info.IgnoreCase);
-                       }
-
-                       return new AnchorInfo (this, width);
-               }
-
-               private int min, max;
-               private bool lazy;
-       }
-
-       // assertions
-
-       abstract class Assertion : CompositeExpression {
-               public Assertion () {
-                       Expressions.Add (null);         // true expression
-                       Expressions.Add (null);         // false expression
-               }
-
-               public Expression TrueExpression {
-                       get { return Expressions[0]; }
-                       set { Expressions[0] = value; }
-               }
-
-               public Expression FalseExpression {
-                       get { return Expressions[1]; }
-                       set { Expressions[1] = value; }
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       GetWidth (out min, out max, 2);
-
-                       if (TrueExpression == null || FalseExpression == null)
-                               min = 0;
-               }
-       }
-
-       class CaptureAssertion : Assertion {
-               public CaptureAssertion (Literal l) {
-                       literal = l;
-               }
-
-               public CapturingGroup CapturingGroup {
-                       get { return group; }
-                       set { group = value; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       if (group == null) {
-                               Alternate.Compile (cmp, reverse);
-                               return;
-                       }
-
-                       int gid = group.Index;
-                       LinkRef tail = cmp.NewLink ();
-
-                       if (FalseExpression == null) {
-                               //    IfDefined :1
-                               //      <yes_exp>
-                               // 1: <tail>
-
-                               cmp.EmitIfDefined (gid, tail);
-                               TrueExpression.Compile (cmp, reverse);
-                       }
-                       else {
-                               //    IfDefined :1
-                               //      <yes_expr>
-                               //      Jump :2
-                               // 1:   <no_expr>
-                               // 2: <tail>
-
-                               LinkRef false_expr = cmp.NewLink ();
-                               cmp.EmitIfDefined (gid, false_expr);
-                               TrueExpression.Compile (cmp, reverse);
-                               cmp.EmitJump (tail);
-                               cmp.ResolveLink (false_expr);
-                               FalseExpression.Compile (cmp, reverse);
-                       }
-
-                       cmp.ResolveLink (tail);
-               }
-
-               public override bool IsComplex () {
-                       if (group == null)
-                               return Alternate.IsComplex ();
-                       if (TrueExpression != null && TrueExpression.IsComplex ())
-                               return true;
-                       if (FalseExpression != null && FalseExpression.IsComplex ())
-                               return true;
-                       return GetFixedWidth () <= 0;
-               }
-
-               ExpressionAssertion Alternate {
-                       get {
-                               if (alternate == null) {
-                                       alternate = new ExpressionAssertion ();
-                                       alternate.TrueExpression = TrueExpression;
-                                       alternate.FalseExpression = FalseExpression;
-                                       alternate.TestExpression = literal;
-                               }
-                               return alternate;
-                       }
-               }
-
-               private ExpressionAssertion alternate;
-               private CapturingGroup group;
-               private Literal literal;
-       }
-
-       class ExpressionAssertion : Assertion {
-               public ExpressionAssertion () {
-                       Expressions.Add (null);         // test expression
-               }
-
-               public bool Reverse {
-                       get { return reverse; }
-                       set { reverse = value; }
-               }
-
-               public bool Negate {
-                       get { return negate; }
-                       set { negate = value; }
-               }
-
-               public Expression TestExpression {
-                       get { return Expressions[2]; }
-                       set { Expressions[2] = value; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       LinkRef true_expr = cmp.NewLink ();
-                       LinkRef false_expr = cmp.NewLink ();
-
-                       // test op: positive / negative
-
-                       if (!negate)
-                               cmp.EmitTest (true_expr, false_expr);
-                       else
-                               cmp.EmitTest (false_expr, true_expr);
-
-                       // test expression: lookahead / lookbehind
-
-                       TestExpression.Compile (cmp, this.reverse);
-                       cmp.EmitTrue ();
-
-                       // target expressions
-
-                       if (TrueExpression == null) {                   // (?= ...)
-                               //    Test :1, :2
-                               //      <test_expr>
-                               // :2   False
-                               // :1   <tail>
-
-                               cmp.ResolveLink (false_expr);
-                               cmp.EmitFalse ();
-                               cmp.ResolveLink (true_expr);
-                       }
-                       else {
-                               cmp.ResolveLink (true_expr);
-                               TrueExpression.Compile (cmp, reverse);
-
-                               if (FalseExpression == null) {          // (?(...) ...)
-                                       //    Test :1, :2
-                                       //      <test_expr>
-                                       // :1   <yes_expr>
-                                       // :2   <tail>
-
-                                       cmp.ResolveLink (false_expr);
-                               }
-                               else {                                  // (?(...) ... | ...)
-                                       //    Test :1, :2
-                                       //      <test_expr>
-                                       // :1   <yes_expr>
-                                       //      Jump :3
-                                       // :2   <no_expr>
-                                       // :3   <tail>
-
-                                       LinkRef tail = cmp.NewLink ();
-
-                                       cmp.EmitJump (tail);
-                                       cmp.ResolveLink (false_expr);
-                                       FalseExpression.Compile (cmp, reverse);
-                                       cmp.ResolveLink (tail);
-                               }
-                       }
-               }
-
-               public override bool IsComplex ()
-               {
-                       return true;
-               }
-
-               private bool reverse, negate;
-       }
-
-       // alternation
-
-       class Alternation : CompositeExpression {
-               public Alternation () {
-               }
-
-               public ExpressionCollection Alternatives {
-                       get { return Expressions; }
-               }
-
-               public void AddAlternative (Expression e) {
-                       Alternatives.Add (e);
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       //                      LinkRef next = cmp.NewLink ();
-                       LinkRef tail = cmp.NewLink ();
-
-                       foreach (Expression e in Alternatives) {
-                               LinkRef next = cmp.NewLink ();
-                               cmp.EmitBranch (next);
-                               e.Compile (cmp, reverse);
-                               cmp.EmitJump (tail);
-                               cmp.ResolveLink (next);
-                               cmp.EmitBranchEnd();
-                       }
-
-                       cmp.EmitFalse ();
-                       cmp.ResolveLink (tail);
-                       cmp.EmitAlternationEnd();
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       GetWidth (out min, out max, Alternatives.Count);
-               }
-       }
-
-       // terminal expressions
-
-       class Literal : Expression {
-               public Literal (string str, bool ignore) {
-                       this.str = str;
-                       this.ignore = ignore;
-               }
-
-               public string String {
-                       get { return str; }
-                       set { str = value; }
-               }
-
-               public bool IgnoreCase {
-                       get { return ignore; }
-                       set { ignore = value; }
-               }
-
-               public static void CompileLiteral (string str, ICompiler cmp, bool ignore, bool reverse)
-               {
-                       if (str.Length == 0)
-                               return;
-
-                       if (str.Length == 1)
-                               cmp.EmitCharacter (str[0], false, ignore, reverse);
-                       else
-                               cmp.EmitString (str, ignore, reverse);
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse)
-               {
-                       CompileLiteral (str, cmp, ignore, reverse);
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       min = max = str.Length;
-               }
-
-               public override AnchorInfo GetAnchorInfo (bool reverse) {
-                       return new AnchorInfo (this, 0, str.Length, str, ignore);
-               }
-
-               public override bool IsComplex () {
-                       return false;
-               }
-
-               private string str;
-               private bool ignore;
-       }
-
-       class PositionAssertion : Expression {
-               public PositionAssertion (Position pos) {
-                       this.pos = pos;
-               }
-
-               public Position Position {
-                       get { return pos; }
-                       set { pos = value; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       cmp.EmitPosition (pos);
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       min = max = 0;
-               }
-
-               public override bool IsComplex () {
-                       return false;
-               }
-
-               public override AnchorInfo GetAnchorInfo (bool revers) {
-                       switch (pos) {
-                       case Position.StartOfString: case Position.StartOfLine: case Position.StartOfScan:
-                               return new AnchorInfo (this, 0, 0, pos);
-
-                       default:
-                               return new AnchorInfo (this, 0);
-                       }
-               }
-
-               private Position pos;
-       }
-
-       class Reference : Expression {
-               public Reference (bool ignore) {
-                       this.ignore = ignore;
-               }
-
-               public CapturingGroup CapturingGroup {
-                       get { return group; }
-                       set { group = value; }
-               }
-
-               public bool IgnoreCase {
-                       get { return ignore; }
-                       set { ignore = value; }
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       cmp.EmitReference (group.Index, ignore, reverse);
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       //group.GetWidth (out min, out max);
-                       // TODO set width to referenced group for non-cyclical references
-                       min = 0;
-                       max = Int32.MaxValue;
-               }
-
-               public override bool IsComplex () {
-                       return true;    // FIXME incorporate cyclic check
-               }
-
-               private CapturingGroup group;
-               private bool ignore;
-       }
-
-       class BackslashNumber : Reference {
-               string literal;
-               bool ecma;
-
-               public BackslashNumber (bool ignore, bool ecma)
-                       : base (ignore)
-               {
-                       this.ecma = ecma;
-               }
-
-               // Precondition: groups [num_str] == null
-               public bool ResolveReference (string num_str, Hashtable groups)
-               {
-                       if (ecma) {
-                               int last_i = 0;
-                               for (int i = 1; i < num_str.Length; ++i) {
-                                       if (groups [num_str.Substring (0, i)] != null)
-                                               last_i = i;
-                               }
-                               if (last_i != 0) {
-                                       CapturingGroup = (CapturingGroup) groups [num_str.Substring (0, last_i)];
-                                       literal = num_str.Substring (last_i);
-                                       return true;
-                               }
-                       } else {
-                               if (num_str.Length == 1)
-                                       return false;
-                       }
-
-                       int ptr = 0;
-                       int as_octal = Parser.ParseOctal (num_str, ref ptr);
-                       // Since ParseOctal reads at most 3 digits, as_octal <= octal 0777
-                       if (as_octal == -1)
-                               return false;
-                       if (as_octal > 0xff && ecma) {
-                               as_octal /= 8;
-                               --ptr;
-                       }
-                       as_octal &= 0xff;
-                       literal = ((char) as_octal) + num_str.Substring (ptr);
-                       return true;
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse)
-               {
-                       if (CapturingGroup != null)
-                               base.Compile (cmp, reverse);
-                       if (literal != null)
-                               Literal.CompileLiteral (literal, cmp, IgnoreCase, reverse);
-               }
-       }
-
-       class CharacterClass : Expression {
-               public CharacterClass (bool negate, bool ignore) {
-                       this.negate = negate;
-                       this.ignore = ignore;
-
-                       intervals = new IntervalCollection ();
-
-                       // initialize pos/neg category arrays
-
-                       int cat_size = (int) Category.LastValue;
-                       pos_cats = new BitArray (cat_size);
-                       neg_cats = new BitArray (cat_size);
-               }
-
-               public CharacterClass (Category cat, bool negate) : this (false, false) {
-                       this.AddCategory (cat, negate);
-               }
-
-               public bool Negate {
-                       get { return negate; }
-                       set { negate = value; }
-               }
-
-               public bool IgnoreCase {
-                       get { return ignore; }
-                       set { ignore = value; }
-               }
-
-               public void AddCategory (Category cat, bool negate) {
-                       int n = (int)cat;
-
-                       if (negate) {
-                               neg_cats[n] = true;
-                       } else {
-                               pos_cats[n] = true;
-                       }
-               }
-
-               public void AddCharacter (char c) {
-                       // TODO: this is certainly not the most efficient way of doing things
-                       // TODO: but at least it produces correct results.
-                       AddRange (c, c);
-               }
-
-               public void AddRange (char lo, char hi) {
-                       Interval new_interval = new Interval (lo, hi);
-
-                       // ignore case is on. we must make sure our interval does not
-                       // use upper case. if it does, we must normalize the upper case
-                       // characters into lower case.
-                       if (ignore) {
-                               if (upper_case_characters.Intersects (new_interval)) {
-                                       Interval partial_new_interval;
-
-                                       if (new_interval.low < upper_case_characters.low) {
-                                               partial_new_interval = new Interval (upper_case_characters.low + distance_between_upper_and_lower_case,
-                                                                                    new_interval.high +  distance_between_upper_and_lower_case);
-                                               new_interval.high = upper_case_characters.low - 1;
-                                       }
-                                       else {
-                                               partial_new_interval = new Interval (new_interval.low + distance_between_upper_and_lower_case,
-                                                                                    upper_case_characters.high + distance_between_upper_and_lower_case);
-                                               new_interval.low = upper_case_characters.high + 1;
-                                       }
-                                       intervals.Add (partial_new_interval);
-                               }
-                               else if (upper_case_characters.Contains (new_interval)) {
-                                       new_interval.high += distance_between_upper_and_lower_case;
-                                       new_interval.low += distance_between_upper_and_lower_case;
-                               }
-                       }
-                       intervals.Add (new_interval);
-               }
-
-               public override void Compile (ICompiler cmp, bool reverse) {
-                       // create the meta-collection
-                       IntervalCollection meta =
-                               intervals.GetMetaCollection (new IntervalCollection.CostDelegate (GetIntervalCost));
-
-                       // count ops
-                       int count = meta.Count;
-                       for (int i = 0; i < pos_cats.Length; ++ i) {
-                               if (pos_cats[i] || neg_cats [i])
-                                       ++ count;
-                       }
-
-                       if (count == 0)
-                               return;
-
-                       // emit in op for |meta| > 1
-                       LinkRef tail = cmp.NewLink ();
-                       if (count > 1)
-                               cmp.EmitIn (tail);
-
-                       // emit character/range/sets from meta-collection
-                       // we emit these first so that any 'ignore' flags will be noticed by the evaluator
-                       foreach (Interval a in meta) {
-                               if (a.IsDiscontiguous) {                        // Set
-                                       BitArray bits = new BitArray (a.Size);
-                                       foreach (Interval b in intervals) {
-                                               if (a.Contains (b)) {
-                                                       for (int i = b.low; i <= b.high; ++ i)
-                                                               bits[i - a.low] = true;
-                                               }
-                                       }
-
-                                       cmp.EmitSet ((char)a.low, bits, negate, ignore, reverse);
-                               }
-                               else if (a.IsSingleton)                         // Character
-                                       cmp.EmitCharacter ((char)a.low, negate, ignore, reverse);
-                               else                                            // Range
-                                       cmp.EmitRange ((char)a.low, (char)a.high, negate, ignore, reverse);
-                       }
-
-                       // emit categories
-                       for (int i = 0; i < pos_cats.Length; ++ i) {
-                               if (pos_cats[i]) {
-                                       if (neg_cats [i])
-                                               cmp.EmitCategory (Category.AnySingleline, negate, reverse);
-                                       else
-                                               cmp.EmitCategory ((Category)i, negate, reverse);
-                               } else if (neg_cats[i]) {
-                                       cmp.EmitNotCategory ((Category)i, negate, reverse);
-                               }
-                       }
-
-                       // finish up
-                       if (count > 1) {
-                               if (negate)
-                                       cmp.EmitTrue ();
-                               else
-                                       cmp.EmitFalse ();
-
-                               cmp.ResolveLink (tail);
-                       }
-               }
-
-               public override void GetWidth (out int min, out int max) {
-                       min = max = 1;
-               }
-
-               public override bool IsComplex () {
-                       return false;
-               }
-
-               // private
-
-               private static double GetIntervalCost (Interval i) {
-                       // use op length as cost metric (=> optimize for space)
-
-                       if (i.IsDiscontiguous)
-                               return 3 + ((i.Size + 0xf) >> 4);               // Set
-                       else if (i.IsSingleton)
-                               return 2;                                       // Character
-                       else
-                               return 3;                                       // Range
-               }
-
-               private static Interval upper_case_characters = new Interval ((char)65, (char)90);
-               private const int distance_between_upper_and_lower_case = 32;
-               private bool negate, ignore;
-               private BitArray pos_cats, neg_cats;
-               private IntervalCollection intervals;
-       }
-
-       class AnchorInfo {
-               private Expression expr;
-
-               private Position pos;
-               private int offset;
-
-               private string str;
-               private int width;
-               private bool ignore;
-
-               public AnchorInfo (Expression expr, int width) {
-                       this.expr = expr;
-                       this.offset = 0;
-                       this.width = width;
-
-                       this.str = null;
-                       this.ignore = false;
-                       this.pos = Position.Any;
-               }
-
-               public AnchorInfo (Expression expr, int offset, int width, string str, bool ignore) {
-                       this.expr = expr;
-                       this.offset = offset;
-                       this.width = width;
-
-                       this.str = ignore ? str.ToLower () : str;
-
-                       this.ignore = ignore;
-                       this.pos = Position.Any;
-               }
-
-               public AnchorInfo (Expression expr, int offset, int width, Position pos) {
-                       this.expr = expr;
-                       this.offset = offset;
-                       this.width = width;
-
-                       this.pos = pos;
-
-                       this.str = null;
-                       this.ignore = false;
-               }
-
-               public Expression Expression {
-                       get { return expr; }
-               }
-
-               public int Offset {
-                       get { return offset; }
-               }
-
-               public int Width {
-                       get { return width; }
-               }
-
-               public int Length {
-                       get { return (str != null) ? str.Length : 0; }
-               }
-
-               public bool IsUnknownWidth {
-                       get { return width < 0; }
-               }
-
-               public bool IsComplete {
-                       get { return Length == Width; }
-               }
-
-               public string Substring {
-                       get { return str; }
-               }
-
-               public bool IgnoreCase {
-                       get { return ignore; }
-               }
-
-               public Position Position {
-                       get { return pos; }
-               }
-
-               public bool IsSubstring {
-                       get { return str != null; }
-               }
-
-               public bool IsPosition {
-                       get { return pos != Position.Any; }
-               }
-
-               public Interval GetInterval () {
-                       return GetInterval (0);
-               }
-
-               public Interval GetInterval (int start) {
-                       if (!IsSubstring)
-                               return Interval.Empty;
-
-                       return new Interval (start + Offset, start + Offset + Length - 1);
-               }
-       }
-}
index dffa27ef69059d084aebd7e76dc9359766bf1f26..7a3498e8d26b14f2fb4a86952e65fcc60068c2ae 100644 (file)
@@ -1,3 +1,5 @@
+SR.cs
+../../build/common/SR.cs
 Assembly/AssemblyInfo.cs
 Microsoft.CSharp/CSharpCodeCompiler.cs
 Microsoft.CSharp/CSharpCodeGenerator.cs
@@ -146,8 +148,6 @@ System.Collections.Generic/SortedDictionary.cs
 System.Collections.Generic/SortedList.cs
 System.Collections.Generic/SortedSet.cs
 System.Collections.Generic/Stack.cs
-System.Collections.Concurrent/BlockingCollection.cs
-System.Collections.Concurrent/ConcurrentBag.cs
 System.Collections.ObjectModel/ObservableCollection.cs
 System.Collections.ObjectModel/ReadOnlyObservableCollection.cs
 System.Collections.Specialized/BitVector32.cs
@@ -967,35 +967,6 @@ System.Security.Permissions/StorePermissionAttribute.cs
 System.Security.Permissions/StorePermission.cs
 System.Security.Permissions/StorePermissionFlags.cs
 System/SRDescriptionAttribute.cs
-System.Text.RegularExpressions/arch.cs
-System.Text.RegularExpressions/BaseMachine.cs
-System.Text.RegularExpressions/cache.cs
-System.Text.RegularExpressions/CaptureCollection.cs
-System.Text.RegularExpressions/Capture.cs
-System.Text.RegularExpressions/CILCompiler.cs
-System.Text.RegularExpressions/category.cs
-System.Text.RegularExpressions/compiler.cs
-System.Text.RegularExpressions/debug.cs
-System.Text.RegularExpressions/GroupCollection.cs
-System.Text.RegularExpressions/Group.cs
-System.Text.RegularExpressions/interpreter.cs
-System.Text.RegularExpressions/interval.cs
-System.Text.RegularExpressions/MatchCollection.cs
-System.Text.RegularExpressions/Match.cs
-System.Text.RegularExpressions/MatchEvaluator.cs
-System.Text.RegularExpressions/parser.cs
-System.Text.RegularExpressions/quicksearch.cs
-System.Text.RegularExpressions/RegexCompilationInfo.cs
-System.Text.RegularExpressions/Regex.cs
-System.Text.RegularExpressions/RegexMatchTimeoutException.cs
-System.Text.RegularExpressions/RegexOptions.cs
-System.Text.RegularExpressions/RegexRunner.cs
-System.Text.RegularExpressions/RegexRunnerFactory.cs
-System.Text.RegularExpressions/RxInterpreter.cs
-System.Text.RegularExpressions/RxCompiler.cs
-System.Text.RegularExpressions/RxOp.cs
-System.Text.RegularExpressions/replace.cs
-System.Text.RegularExpressions/syntax.cs
 System.Threading/Semaphore.cs
 System.Threading/SemaphoreFullException.cs
 System.Threading/ThreadExceptionEventArgs.cs
@@ -1085,3 +1056,32 @@ Mono.Net.Dns/ResolverError.cs
 Mono.Net.Dns/SimpleResolverEventArgs.cs
 System.Net/DnsAsyncResult.cs
 System.Windows.Input/ICommand.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/Regex.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexBoyerMoore.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCapture.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCaptureCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCharClass.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCode.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCompilationInfo.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexFCD.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexGroup.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexGroupCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexInterpreter.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatch.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatchCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatchTimeoutException.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexNode.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexOptions.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexParser.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexReplacement.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexRunner.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexRunnerFactory.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexTree.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexWriter.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/compiledregexrunner.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/compiledregexrunnerfactory.cs
+
+../../../external/referencesource/System/sys/system/collections/concurrent/BlockingCollection.cs
+../../../external/referencesource/System/sys/system/collections/concurrent/ConcurrentBag.cs
+
index dfbd0e75b213c4d75f184ef192c5726729b5f092..13df087002f588ff8444c13f953e35893b32a435 100644 (file)
@@ -323,25 +323,28 @@ namespace System {
                        int index;
                        for (index = 0; index < part.Length; index++) {
                                char ch = part [index];
+                               bool isEscapedChar = false;
+                               var oldIndex = index;
 
                                if (ch == '%'){
                                        if (!Uri.IsHexEncoding (part, index))
                                                return false;
-                                       var oldIndex = index;
                                        ch = Uri.HexUnescape (part, ref index);
                                        index--;
-                                       if (ch == '@') {
-                                               sb.Append (part.Substring (oldIndex, index - oldIndex + 1));
-                                               continue;
-                                       }
+                                       isEscapedChar = true;
                                }
 
-                               if (Char.IsLetterOrDigit (ch) || IsUnreserved (ch) || IsSubDelim (ch) || ch == ':'){
-                                       if (sb == null)
-                                               sb = new StringBuilder ();
-                                       sb.Append (ch);
-                               } else
-                                       break;
+                               if (!Char.IsLetterOrDigit (ch) && !IsUnreserved (ch) && !IsSubDelim (ch) && ch != ':'){
+                                       if (!isEscapedChar)
+                                               break;
+
+                                       ch = '%';
+                                       index = oldIndex;
+                               }
+
+                               if (sb == null)
+                                       sb = new StringBuilder ();
+                               sb.Append (ch);
                        }
 
                        if (index + 1 <= part.Length && part [index] == '@') {
index 6ff1a9488a353f1e50733f94204da4b360a64e8f..9caaf1e1e3d96f006be70541068c644285453ace 100644 (file)
@@ -321,6 +321,7 @@ System.Text.RegularExpressions/RegexReplaceTests.cs
 System.Text.RegularExpressions/RegexTrial.cs
 System.Text.RegularExpressions/RegexTest.cs
 System.Text.RegularExpressions/RegexBugs.cs
+System.Text.RegularExpressions/RegexBugs_Long.cs
 System.Text.RegularExpressions/RegexMatchTests.cs
 System.Text.RegularExpressions/RegexReplace.cs
 System.Text.RegularExpressions/RegexResultTests.cs
index b7bc6b5b7ead46f36630f455443d4798e4ae097a..f947442627f51d74f5837d06248c97241cf60edd 100644 (file)
@@ -247,6 +247,22 @@ namespace MonoTests.System.Collections.Concurrent
                {
                        CollectionStressTestHelper.RemoveStressTest (bag, CheckOrderingType.DontCare);
                }
+
+               [Test]
+               public void Bug24213 ()
+               {
+                       var size = 2049;
+                       var bag = new ConcurrentBag<int> ();
+                       for (int i = 0; i < size; i++)
+                               bag.Add (i);
+
+                       var array = bag.ToArray ();
+
+                       Assert.AreEqual (size, array.Length, "#1");
+
+                       for (int i = 0; i < size; i++)
+                               Assert.AreEqual (size - 1 - i, array [i], "#C" + i);
+               }
        }
 }
 #endif
index acbe76eb31ca319fb7519056f65c88322ee701d4..1f07137528834ab520acd29372d1c3ca63fbaf72 100644 (file)
@@ -20,11 +20,17 @@ namespace MonoTests.System.Diagnostics
        public class ProcessStartInfoTest
        {
                [Test]
-               public void NullWorkingDirectory ()
+               public void NotNullCommonProperties ()
                {
-                       ProcessStartInfo info = new ProcessStartInfo ();
-                       info.WorkingDirectory = null;
-                       Assert.AreEqual (info.WorkingDirectory, String.Empty, "#1");
+                       // Force FileName and Arguments to null. The others are null by default.
+                       ProcessStartInfo info = new ProcessStartInfo (null, null);
+
+                       Assert.AreEqual (info.Arguments, String.Empty, "#1");
+                       Assert.AreEqual (info.Domain, String.Empty, "#2");
+                       Assert.AreEqual (info.FileName, String.Empty, "#3");
+                       Assert.AreEqual (info.UserName, String.Empty, "#4");
+                       Assert.AreEqual (info.Verb, String.Empty, "#5");
+                       Assert.AreEqual (info.WorkingDirectory, String.Empty, "#6");
                }
 
 #if NET_2_0
index 6ac81723d256323574d1fe207424f04c333676b0..aac260d0314873cc01e9719e15459fe58a9aa8b8 100644 (file)
@@ -101,7 +101,6 @@ namespace MonoTests.System.Net.WebSockets
                }
 
                [Test]
-               [Ignore ("See bug #24340")]
                public void EchoTest ()
                {
                        const string Payload = "This is a websocket test";
@@ -126,7 +125,6 @@ namespace MonoTests.System.Net.WebSockets
                }
 
                [Test]
-               [Ignore ("See bug #24340")]
                public void CloseOutputAsyncTest ()
                {
                        Assert.IsTrue (socket.ConnectAsync (new Uri (EchoServerUrl), CancellationToken.None).Wait (5000));
index c5053e139ecdc5abdff4fa1a5d7d6045f195762b..da02ef133bf0781b0390c072f72d047a2a15ed69 100644 (file)
@@ -18,6 +18,119 @@ namespace MonoTests.System.Text.RegularExpressions
        [TestFixture]
        public class RegexBugs
        {
+               [Test] // bug xamarin#3866
+               public void BugXamarin3866 ()
+               {
+                       Assert.AreEqual (new Regex(@"(?<A>a)+(?<-A>b)+(?(A)(?!))b").Match("aaaaaabbb").ToString (), "aabbb");
+               }
+
+               [Test]
+               public void BugXamarin2663 ()
+               {
+                       var r = new Regex ("^(S|SW)?$"); 
+                       Assert.AreEqual (r.Match ("SW").ToString (), "SW");
+               }
+
+               [Test]
+               public void BugXamarin4523 ()
+               {
+                       Assert.AreEqual (new Regex("A(?i)b(?-i)C").Match("ABC").ToString (), "ABC");
+               }
+
+               [Test]
+               public void BugXamarin7587 ()
+               {
+                       var pattern = @"(^)a";
+                       var regex = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.Singleline);
+                                               
+                       var match = regex.Match("  a", 2, 1);
+                       Assert.AreEqual (match.Success, true);
+                       Assert.AreEqual (match.Index, 2);
+               }
+
+               [Test]
+               public void BugXamarin12612 ()
+               {
+                       const string r_Header = @"citrd";
+
+                       // Terminals
+                       const string r_begin = @"^";
+                       const string r_end = @"$";
+                       const string r_open = @"\[";
+                       const string r_close = @"\]";
+                       const string r_letter = @"[a-zA-Z]";
+                       const string r_non_letter = @"[^a-zA-Z]";
+                       const string r_alphaNumericChar = @"[a-zA-Z0-9_]";
+                       const string r_space = @"(//)";
+
+                       // Simple Composition
+                       const string r_alphaNumericString = r_alphaNumericChar + @"+";
+
+                       const string r_alphaNumericSpaceString = r_alphaNumericChar
+                               + @"("
+                               + @"(" + r_alphaNumericChar + @"|" + r_space + @")*"
+                               + r_alphaNumericChar
+                               + @")?";
+
+                       const string r_Identifier = r_letter + r_alphaNumericChar + @"*";
+
+                       const string r_scalar = r_open  //[
+                               + r_alphaNumericSpaceString
+                               + r_close; //]
+
+                       const string r_array = r_open  //[
+                               + @"("
+                               + r_scalar
+                               + @")+"
+                               + r_close; //]
+
+                       const string r_data = @"(" + r_scalar + @"|" + r_array + @")";
+
+                       // Complex Compositions
+                       const string r_uncased_Header = @"(?i)" + r_Header + @"(?-i)";
+
+                       const string r_permissable_Identifier = r_Identifier
+                               + @"(?<!"
+                               + r_non_letter + r_uncased_Header
+                               + @")";
+
+                       const string r_captured_Identifier = @"(?<Id>" + r_permissable_Identifier + @")";
+
+
+                       const string r_param = @"("
+                               + @"(?<p>"
+                               + r_permissable_Identifier
+                               + r_data
+                               + @")"
+                               + @")";
+
+                       const string r_paramList = r_param + @"*";
+
+
+                       const string r_Encoder_string = r_begin
+                               + r_uncased_Header
+                               + r_open //[
+                               + r_captured_Identifier
+                               + r_close //]
+                               + r_paramList
+                               + r_end;
+
+
+
+
+                       Regex Decoder = new Regex(r_Encoder_string);
+
+         
+                       Assert.IsFalse(Decoder.IsMatch("citrd[bag]CITRD[1]"));
+               }
+
+               [Test]
+               public void BugXamarin11616 ()
+               {
+                       
+                       Assert.AreEqual(Regex.Match("Test", @"^[\w-[\d]]\w*$").Success, true);
+               }
+               
                [Test] // bug #51146
                public void SplitGroup ()
                {
diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs_Long.cs b/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs_Long.cs
new file mode 100644 (file)
index 0000000..19f90a2
--- /dev/null
@@ -0,0 +1,2009 @@
+using System;
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+
+namespace MonoTests.System.Text.RegularExpressions
+{
+       [TestFixture]
+       public class RegexBugs2
+       {               
+               [Test]
+               public void BugXamarin7578 ()
+               {                       
+                       string testData = @"\id aaaaaaaaaaaaaaaaa
+
+
+
+
+
+
+
+\Q 2 DzPOIS, DzU À LUZ z zBzL, SzU IRMÃO. zBzL FOI PzSTOR Dz OVzLHzS, z CzIM, LzVRzDOR.
+\Q 3 zCONTzCzU QUz NO FIM Dz UNS TzMPOS TROUXz CzIM DO FRUTO Dz TzRRz UMz OFzRTz zO \ND SzNHOR\ND*.
+\Q 4 zBzL, POR SUz VzZ, TROUXz\X z \XO 4.4 \XT HB 11.4\X* DzS PRIMÍCIzS DO SzU RzBzNHO z Dz GORDURz DzSTz. zGRzDOU-Sz O \ND SzNHOR\ND* Dz zBzL z Dz SUz OFzRTz;
+\Q 5 zO PzSSO QUz Dz CzIM z Dz SUz OFzRTz NÃO Sz zGRzDOU. IROU-Sz, POIS, SOBRzMzNzIRz, CzIM, z DzSCzIU-LHz O SzMBLzNTz.
+\Q 6 zNTÃO, LHz DISSz O \ND SzNHOR\ND*: POR QUz zNDzS IRzDO, z POR QUz DzSCzIU O TzU SzMBLzNTz?\FIG |0100406.PSD|COL|||POR QUz zNDzS IRzDO?|4.6\FIG*
+\Q 7 Sz PROCzDzRzS BzM, NÃO É CzRTO QUz SzRÁS zCzITO? Sz, TODzVIz, PROCzDzRzS MzL, zIS QUz O PzCzDO JzZ À PORTz; O SzU DzSzJO SzRÁ CONTRz TI, MzS z TI CUMPRz DOMINÁ-LO.
+\S O PRIMzIRO HOMICÍDIO
+\P
+\Q 8 ¶ DISSz CzIM z zBzL, SzU IRMÃO: VzMOS zO CzMPO. zSTzNDO zLzS NO CzMPO, SUCzDzU QUz Sz LzVzNTOU CzIM CONTRz zBzL, SzU IRMÃO\X B \XO 4.8 \XT MT 23.35; LC 11.51; 1JO 3.12\X*, z O MzTOU.
+\Q 9 DISSz O \ND SzNHOR\ND* z CzIM: ONDz zSTÁ zBzL, TzU IRMÃO? zLz RzSPONDzU: NÃO SzI; zCzSO, SOU zU TUTOR Dz MzU IRMÃO?
+\Q 10 z DISSz DzUS: QUz FIZzSTz? z VOZ DO SzNGUz Dz TzU IRMÃO CLzMz Dz TzRRz z MIM.
+\Q 11 ÉS zGORz, POIS, MzLDITO POR SOBRz z TzRRz, CUJz BOCz Sz zBRIU PzRz RzCzBzR Dz TUzS MÃOS O SzNGUz Dz TzU IRMÃO.
+\Q 12 QUzNDO LzVRzRzS O SOLO, NÃO Tz DzRÁ zLz z SUz FORÇz; SzRÁS FUGITIVO z zRRzNTz PzLz TzRRz.
+\Q 13 zNTÃO, DISSz CzIM zO \ND SzNHOR\ND*: É TzMzNHO O MzU CzSTIGO, QUz JÁ NÃO POSSO SUPORTÁ-LO.
+\Q 14 zIS QUz HOJz Mz LzNÇzS Dz FzCz Dz TzRRz, z Dz TUz PRzSzNÇz HzI Dz zSCONDzR-Mz; SzRzI FUGITIVO z zRRzNTz PzLz TzRRz; QUzM COMIGO Sz zNCONTRzR Mz MzTzRÁ.
+\Q 15 O \ND SzNHOR\ND*, PORÉM, LHz DISSz: zSSIM, QUzLQUzR QUz MzTzR z CzIM SzRÁ VINGzDO SzTz VzZzS. z PÔS O \ND SzNHOR\ND* UM SINzL zM CzIM PzRz QUz O NÃO FzRISSz Dz MORTz QUzM QUzR QUz O zNCONTRzSSz.
+\Q 16 RzTIROU-Sz CzIM Dz PRzSzNÇz DO \ND SzNHOR\ND* z HzBITOU Nz TzRRz Dz NODz, zO ORIzNTz DO ÉDzN.
+\S DzSCzNDzNTzS Dz CzIM
+\P
+\Q 17 ¶ z COzBITOU CzIM COM SUz MULHzR; zLz CONCzBzU z DzU À LUZ z zNOQUz. CzIM zDIFICOU UMz CIDzDz z LHz CHzMOU zNOQUz, O NOMz Dz SzU FILHO.
+\Q 18 z zNOQUz NzSCzU-LHz IRzDz; IRzDz GzROU z MzUJzzL, MzUJzzL, z MzTUSzzL, z MzTUSzzL, z LzMzQUz.
+\Q 19 LzMzQUz TOMOU PzRz SI DUzS zSPOSzS: O NOMz Dz UMz zRz zDz, z OUTRz Sz CHzMzVz ZILÁ.
+\Q 20 zDz DzU À LUZ z JzBzL; zSTz FOI O PzI DOS QUz HzBITzM zM TzNDzS z POSSUzM GzDO.
+\Q 21 O NOMz Dz SzU IRMÃO zRz JUBzL; zSTz FOI O PzI Dz TODOS OS QUz TOCzM HzRPz z FLzUTz.
+\Q 22 ZILÁ, POR SUz VzZ, DzU À LUZ z TUBzLCzIM, zRTÍFICz Dz TODO INSTRUMzNTO CORTzNTz, Dz BRONZz z Dz FzRRO; z IRMàDz TUBzLCzIM FOI NzzMÁ.
+\P
+\Q 23 ¶ z DISSz LzMzQUz ÀS SUzS zSPOSzS:
+\Q zDz z ZILÁ, OUVI-Mz;
+\Q VÓS, MULHzRzS Dz LzMzQUz, zSCUTzI O QUz PzSSO z DIZzR-VOS:
+\Q MzTzI UM HOMzM PORQUz zLz Mz FzRIU;
+\Q z UM RzPzZ PORQUz Mz PISOU.
+\Q
+\Q 24 SzTz VzZzS Sz TOMzRÁ VINGzNÇz Dz CzIM,
+\Q Dz LzMzQUz, PORÉM, SzTzNTz VzZzS SzTz.
+\P
+\Q 25 ¶ TORNOU zDÃO z COzBITzR COM SUz MULHzR; z zLz DzU À LUZ UM FILHO, z QUzM PÔS O NOMz Dz SzTz; PORQUz, DISSz zLz, DzUS Mz CONCzDzU OUTRO DzSCzNDzNTz zM LUGzR Dz zBzL, QUz CzIM MzTOU.
+\Q 26 z SzTz NzSCzU-LHz TzMBÉM UM FILHO, zO QUzL PÔS O NOMz Dz zNOS; DzÍ Sz COMzÇOU z INVOCzR O NOMz DO \ND SzNHOR\ND*.
+\C 5
+\S DzSCzNDzNTzS Dz zDÃO
+\R 1CR 1.1-4
+\P
+\Q 1 ¶ zSTz É O LIVRO Dz GzNzzLOGIz Dz zDÃO. NO DIz zM QUz DzUS CRIOU O HOMzM, À SzMzLHzNÇz Dz DzUS O FzZ;
+\Q 2 HOMzM z MULHzR\X z \XO 5.2 \XT MT 19.4; MC 10.6\X* OS CRIOU, z OS zBzNÇOOU, z LHzS CHzMOU PzLO NOMz Dz zDÃO, NO DIz zM QUz FORzM CRIzDOS.\X B \XO 5.1-2 \XT GN 1.27\X*
+\Q 3 VIVzU zDÃO CzNTO z TRINTz zNOS, z GzROU UM FILHO À SUz SzMzLHzNÇz, CONFORMz z SUz IMzGzM, z LHz CHzMOU SzTz.
+\Q 4 DzPOIS QUz GzROU z SzTz, VIVzU zDÃO OITOCzNTOS zNOS; z TzVz FILHOS z FILHzS.
+\Q 5 OS DIzS TODOS Dz VIDz Dz zDÃO FORzM NOVzCzNTOS z TRINTz zNOS; z MORRzU.
+\P
+\Q 6 ¶ SzTz VIVzU CzNTO z CINCO zNOS z GzROU z zNOS.
+\Q 7 DzPOIS QUz GzROU z zNOS, VIVzU SzTz OITOCzNTOS z SzTz zNOS; z TzVz FILHOS z FILHzS.
+\Q 8 TODOS OS DIzS Dz SzTz FORzM NOVzCzNTOS z DOZz zNOS; z MORRzU.
+\P
+\Q 9 ¶ zNOS VIVzU NOVzNTz zNOS z GzROU z CzINÃ.
+\Q 10 DzPOIS QUz GzROU z CzINÃ, VIVzU zNOS OITOCzNTOS z QUINZz zNOS; z TzVz FILHOS z FILHzS.
+\Q 11 TODOS OS DIzS Dz zNOS FORzM NOVzCzNTOS z CINCO zNOS; z MORRzU.
+\P
+\Q 12 ¶ CzINàVIVzU SzTzNTz zNOS z GzROU z MzzLzLzL.
+\Q 13 DzPOIS QUz GzROU z MzzLzLzL, VIVzU CzINàOITOCzNTOS z QUzRzNTz zNOS; z TzVz FILHOS z FILHzS.
+\Q 14 TODOS OS DIzS Dz CzINàFORzM NOVzCzNTOS z DzZ zNOS; z MORRzU.
+\P
+\Q 15 ¶ MzzLzLzL VIVzU SzSSzNTz z CINCO zNOS z GzROU z JzRzDz.
+\Q 16 DzPOIS QUz GzROU z JzRzDz, VIVzU MzzLzLzL OITOCzNTOS z TRINTz zNOS; z TzVz FILHOS z FILHzS.
+\Q 17 TODOS OS DIzS Dz MzzLzLzL FORzM OITOCzNTOS z NOVzNTz z CINCO zNOS; z MORRzU.
+\P
+\Q 18 ¶ JzRzDz VIVzU CzNTO z SzSSzNTz z DOIS zNOS z GzROU z zNOQUz.
+\Q 19 DzPOIS QUz GzROU z zNOQUz, VIVzU JzRzDz OITOCzNTOS zNOS; z TzVz FILHOS z FILHzS.
+\Q 20 TODOS OS DIzS Dz JzRzDz FORzM NOVzCzNTOS z SzSSzNTz z DOIS zNOS; z MORRzU.
+\P
+\Q 21 ¶ zNOQUz VIVzU SzSSzNTz z CINCO zNOS z GzROU z MzTUSzLÉM.
+\Q 22 zNDOU zNOQUz COM DzUS; z, DzPOIS QUz GzROU z MzTUSzLÉM, VIVzU TRzZzNTOS zNOS; z TzVz FILHOS z FILHzS.
+\Q 23 TODOS OS DIzS Dz zNOQUz FORzM TRzZzNTOS z SzSSzNTz z CINCO zNOS.
+\Q 24 zNDOU zNOQUz\X C \XO 5.24 \XT HB 11.5; JD 14\X* COM DzUS z JÁ NÃO zRz, PORQUz DzUS O TOMOU PzRz SI.
+\P
+\Q 25 ¶ MzTUSzLÉM VIVzU CzNTO z OITzNTz z SzTz zNOS z GzROU z LzMzQUz.
+\Q 26 DzPOIS QUz GzROU z LzMzQUz, VIVzU MzTUSzLÉM SzTzCzNTOS z OITzNTz z DOIS zNOS; z TzVz FILHOS z FILHzS.
+\Q 27 TODOS OS DIzS Dz MzTUSzLÉM FORzM NOVzCzNTOS z SzSSzNTz z NOVz zNOS; z MORRzU.
+\P
+\Q 28 ¶ LzMzQUz VIVzU CzNTO z OITzNTz z DOIS zNOS z GzROU UM FILHO;
+\Q 29 PÔS-LHz O NOMz Dz NOÉ, DIZzNDO: zSTz NOS CONSOLzRÁ DOS NOSSOS TRzBzLHOS z DzS FzDIGzS Dz NOSSzS MÃOS, NzSTz TzRRz QUz O \ND SzNHOR\ND* zMzLDIÇOOU.
+\Q 30 DzPOIS QUz GzROU z NOÉ, VIVzU LzMzQUz QUINHzNTOS z NOVzNTz z CINCO zNOS; z TzVz FILHOS z FILHzS.
+\Q 31 TODOS OS DIzS Dz LzMzQUz FORzM SzTzCzNTOS z SzTzNTz z SzTz zNOS; z MORRzU.
+\P
+\Q 32 ¶ zRz NOÉ Dz IDzDz Dz QUINHzNTOS zNOS z GzROU z SzM, CzM z JzFÉ.
+\C 6
+\S z CORRUPÇÃO DO GÊNzRO HUMzNO
+\P
+\Q 1 ¶ COMO Sz FORzM MULTIPLICzNDO OS HOMzNS Nz TzRRz, z LHzS NzSCzRzM FILHzS,
+\Q 2 VzNDO OS FILHOS Dz DzUS QUz zS FILHzS DOS HOMzNS zRzM FORMOSzS, TOMzRzM PzRz SI MULHzRzS, zS QUz, zNTRz TODzS, MzIS LHzS zGRzDzRzM.
+\Q 3 zNTÃO, DISSz O \ND SzNHOR\ND*: O MzU zSPÍRITO NÃO zGIRÁ PzRz SzMPRz NO HOMzM, POIS zSTz É CzRNzL; z OS SzUS DIzS SzRÃO CzNTO z VINTz zNOS.
+\Q 4 ORz, NzQUzLz TzMPO HzVIz GIGzNTzS\X z \XO 6.4 \XT NM 13.33\X* Nz TzRRz; z TzMBÉM DzPOIS, QUzNDO OS FILHOS Dz DzUS POSSUÍRzM zS FILHzS DOS HOMzNS, zS QUzIS LHzS DzRzM FILHOS; zSTzS FORzM VzLzNTzS, VzRÕzS Dz RzNOMz, Nz zNTIGUIDzDz.
+\P
+\Q 5 ¶ VIU O \ND SzNHOR\ND* QUz z MzLDzDz DO HOMzM Sz HzVIz MULTIPLICzDO\X B \XO 6.5 \XT MT 24.37; LC 17.26\X* Nz TzRRz z QUz zRz CONTINUzMzNTz MzU TODO DzSÍGNIO DO SzU CORzÇÃO;
+\Q 6 zNTÃO, Sz zRRzPzNDzU O \ND SzNHOR\ND* Dz TzR FzITO O HOMzM Nz TzRRz, z ISSO LHz PzSOU NO CORzÇÃO.
+\Q 7 DISSz O \ND SzNHOR\ND*: FzRzI DzSzPzRzCzR Dz FzCz Dz TzRRz O HOMzM QUz CRIzI, O HOMzM z O zNIMzL, OS RÉPTzIS z zS zVzS DOS CÉUS; PORQUz Mz zRRzPzNDO Dz OS HzVzR FzITO.
+\Q 8 PORÉM NOÉ zCHOU GRzÇz DIzNTz DO \ND SzNHOR\ND*.
+\P
+\Q 9 ¶ zIS z HISTÓRIz Dz NOÉ. NOÉ zRz HOMzM JUSTO\X C \XO 6.9 \XT 2Pz 2.5\X* z ÍNTzGRO zNTRz OS SzUS CONTzMPORÂNzOS; NOÉ zNDzVz COM DzUS.
+\Q 10 GzROU TRÊS FILHOS: SzM, CzM z JzFÉ.
+\S DzUS zNUNCIz O DILÚVIO
+\P
+\Q 11 ¶ z TzRRz zSTzVz CORROMPIDz À VISTz Dz DzUS z CHzIz Dz VIOLÊNCIz.
+\Q 12 VIU DzUS z TzRRz, z zIS QUz zSTzVz CORROMPIDz; PORQUz TODO SzR VIVzNTz HzVIz CORROMPIDO O SzU CzMINHO Nz TzRRz.
+\Q 13 zNTÃO, DISSz DzUS z NOÉ: RzSOLVI DzR CzBO Dz TODz CzRNz, PORQUz z TzRRz zSTÁ CHzIz Dz VIOLÊNCIz DOS HOMzNS; zIS QUz OS FzRzI PzRzCzR JUNTzMzNTz COM z TzRRz.
+\Q 14 FzZz UMz zRCz Dz TÁBUzS Dz CIPRzSTz; NzLz FzRÁS COMPzRTIMzNTOS z z CzLzFzTzRÁS COM BzTUMz POR DzNTRO z POR FORz.
+\Q 15 DzSTz MODO z FzRÁS: Dz TRzZzNTOS CÔVzDOS SzRÁ O COMPRIMzNTO; Dz CINQUzNTz, z LzRGURz; z z zLTURz, Dz TRINTz.
+\Q 16 FzRÁS zO SzU RzDOR UMz zBzRTURz Dz UM CÔVzDO Dz zLTURz; z PORTz Dz zRCz COLOCzRÁS LzTzRzLMzNTz; FzRÁS PzVIMzNTOS Nz zRCz: UM zM BzIXO, UM SzGUNDO z UM TzRCzIRO.
+\Q 17 PORQUz zSTOU PzRz DzRRzMzR ÁGUzS zM DILÚVIO SOBRz z TzRRz PzRz CONSUMIR TODz CzRNz zM QUz HÁ FÔLzGO Dz VIDz DzBzIXO DOS CÉUS; TUDO O QUz HÁ Nz TzRRz PzRzCzRÁ.
+\Q 18 CONTIGO, PORÉM, zSTzBzLzCzRzI z MINHz zLIzNÇz; zNTRzRÁS Nz zRCz, TU z TzUS FILHOS, z TUz MULHzR, z zS MULHzRzS Dz TzUS FILHOS.
+\Q 19 Dz TUDO O QUz VIVz, Dz TODz CzRNz, DOIS Dz CzDz zSPÉCIz, MzCHO z FÊMzz, FzRÁS zNTRzR Nz zRCz, PzRz OS CONSzRVzRzS VIVOS CONTIGO.
+\Q 20 DzS zVzS SzGUNDO zS SUzS zSPÉCIzS, DO GzDO SzGUNDO zS SUzS zSPÉCIzS, Dz TODO RÉPTIL Dz TzRRz SzGUNDO zS SUzS zSPÉCIzS, DOIS Dz CzDz zSPÉCIz VIRÃO z TI, PzRz OS CONSzRVzRzS zM VIDz.
+\Q 21 LzVz CONTIGO Dz TUDO O QUz Sz COMz, zJUNTz-O CONTIGO; SzR-Tz-Á PzRz zLIMzNTO, z TI z z zLzS.
+\Q 22 zSSIM FzZ NOÉ\X D \XO 6.22 \XT HB 11.7\X*, CONSOzNTz z TUDO O QUz DzUS LHz ORDzNzRz.
+\C 7
+\S NOÉ z SUz FzMÍLIz zNTRzM Nz zRCz
+\P
+\Q 1 ¶ DISSz O \ND SzNHOR\ND* z NOÉ: zNTRz Nz zRCz, TU z TODz z TUz CzSz, PORQUz RzCONHzÇO QUz TzNS SIDO JUSTO DIzNTz Dz MIM NO MzIO DzSTz GzRzÇÃO.
+\Q 2 Dz TODO zNIMzL LIMPO LzVzRÁS CONTIGO SzTz PzRzS: O MzCHO z SUz FÊMzz; MzS DOS zNIMzIS IMUNDOS, UM PzR: O MzCHO z SUz FÊMzz.
+\Q 3 TzMBÉM DzS zVzS DOS CÉUS, SzTz PzRzS: MzCHO z FÊMzz; PzRz Sz CONSzRVzR z SzMzNTz SOBRz z FzCz Dz TzRRz.
+\Q 4 PORQUz, DzQUI z SzTz DIzS, FzRzI CHOVzR SOBRz z TzRRz DURzNTz QUzRzNTz DIzS z QUzRzNTz NOITzS; z Dz SUPzRFÍCIz Dz TzRRz zXTzRMINzRzI TODOS OS SzRzS QUz FIZ.
+\Q 5 z TUDO FzZ NOÉ, SzGUNDO O \ND SzNHOR\ND* LHz ORDzNzRz.
+\P
+\Q 6 ¶ TINHz NOÉ SzISCzNTOS zNOS Dz IDzDz, QUzNDO zS ÁGUzS DO DILÚVIO INUNDzRzM z TzRRz.
+\Q 7 POR CzUSz DzS ÁGUzS DO DILÚVIO, zNTROU NOÉ Nz zRCz\X z \XO 7.7 \XT MT 24.38-39; LC 17.27\X*, zLz COM SzUS FILHOS, SUz MULHzR z zS MULHzRzS Dz SzUS FILHOS.
+\Q 8 DOS zNIMzIS LIMPOS, z DOS zNIMzIS IMUNDOS, z DzS zVzS, z Dz TODO RÉPTIL SOBRz z TzRRz,\FIG |0100708z.PSD|COL||||\FIG* \FIG |0100708B.PSD|COL|||zNTRzRzM Nz zRCz, Dz DOIS zM DOIS…|7.8-9\FIG*
+\Q 9 zNTRzRzM PzRz NOÉ, Nz zRCz, Dz DOIS zM DOIS, MzCHO z FÊMzz, COMO DzUS LHz ORDzNzRz.
+\Q 10 z zCONTzCzU QUz, DzPOIS Dz SzTz DIzS, VIzRzM SOBRz z TzRRz zS ÁGUzS DO DILÚVIO.
+\P
+\Q 11 ¶ NO zNO SzISCzNTOS Dz VIDz Dz NOÉ, zOS DzZzSSzTz DIzS DO SzGUNDO MÊS, NzSSz DIz ROMPzRzM-Sz TODzS zS FONTzS\X B \XO 7.11 \XT 2Pz 3.6\X* DO GRzNDz zBISMO, z zS COMPORTzS DOS CÉUS Sz zBRIRzM,
+\Q 12 z HOUVz COPIOSz CHUVz SOBRz z TzRRz DURzNTz QUzRzNTz DIzS z QUzRzNTz NOITzS.
+\Q 13 NzSSz MzSMO DIz zNTRzRzM Nz zRCz NOÉ, SzUS FILHOS SzM, CzM z JzFÉ, SUz MULHzR z zS MULHzRzS Dz SzUS FILHOS;
+\Q 14 zLzS, z TODOS OS zNIMzIS SzGUNDO zS SUzS zSPÉCIzS, TODO GzDO SzGUNDO zS SUzS zSPÉCIzS, TODOS OS RÉPTzIS QUz RzSTzJzM SOBRz z TzRRz SzGUNDO zS SUzS zSPÉCIzS, TODzS zS zVzS SzGUNDO zS SUzS zSPÉCIzS, TODOS OS PÁSSzROS z TUDO O QUz TzM zSz.
+\Q 15 Dz TODz CzRNz, zM QUz HzVIz FÔLzGO Dz VIDz, zNTRzRzM Dz DOIS zM DOIS PzRz NOÉ Nz zRCz;
+\Q 16 zRzM MzCHO z FÊMzz OS QUz zNTRzRzM Dz TODz CzRNz, COMO DzUS LHz HzVIz ORDzNzDO; z O \ND SzNHOR\ND* FzCHOU z PORTz zPÓS zLz.
+\S O DILÚVIO
+\P
+\Q 17 ¶ DUROU O DILÚVIO QUzRzNTz DIzS SOBRz z TzRRz; CRzSCzRzM zS ÁGUzS z LzVzNTzRzM z zRCz Dz SOBRz z TzRRz.
+\Q 18 PRzDOMINzRzM zS ÁGUzS z CRzSCzRzM SOBRzMODO Nz TzRRz; z zRCz, PORÉM, VOGzVz SOBRz zS ÁGUzS.
+\Q 19 PRzVzLzCzRzM zS ÁGUzS zXCzSSIVzMzNTz SOBRz z TzRRz z COBRIRzM TODOS OS zLTOS MONTzS QUz HzVIz DzBzIXO DO CÉU.
+\Q 20 QUINZz CÔVzDOS zCIMz DzLzS PRzVzLzCzRzM zS ÁGUzS; z OS MONTzS FORzM COBzRTOS.
+\Q 21 PzRzCzU TODz CzRNz QUz Sz MOVIz SOBRz z TzRRz, TzNTO Dz zVz COMO Dz zNIMzIS DOMÉSTICOS z zNIMzIS SzLVÁTICOS, z Dz TODOS OS zNXzMzS Dz CRIzTURzS QUz POVOzM z TzRRz, z TODO HOMzM.
+\Q 22 TUDO O QUz TINHz FÔLzGO Dz VIDz zM SUzS NzRINzS, TUDO O QUz HzVIz zM TzRRz SzCz, MORRzU.\FIG |0100722.PSD|COL|||TUDO O QUz HzVIz zM TzRRz SzCz MORRzU.|7.22\FIG*
+\Q 23 zSSIM, FORzM zXTzRMINzDOS TODOS OS SzRzS QUz HzVIz SOBRz z FzCz Dz TzRRz; O HOMzM z O zNIMzL, OS RÉPTzIS z zS zVzS DOS CÉUS FORzM zXTINTOS Dz TzRRz; FICOU SOMzNTz NOÉ z OS QUz COM zLz zSTzVzM Nz zRCz.
+\Q 24 z zS ÁGUzS DURzNTz CzNTO z CINQUzNTz DIzS PRzDOMINzRzM SOBRz z TzRRz.
+\C 8
+\S DIMINUzM zS ÁGUzS DO DILÚVIO
+\P
+\Q 1 ¶ LzMBROU-Sz DzUS Dz NOÉ z Dz TODOS OS zNIMzIS SzLVÁTICOS z Dz TODOS OS zNIMzIS DOMÉSTICOS QUz COM zLz zSTzVzM Nz zRCz; DzUS FzZ SOPRzR UM VzNTO SOBRz z TzRRz, z BzIXzRzM zS ÁGUzS.
+\Q 2 FzCHzRzM-Sz zS FONTzS DO zBISMO z TzMBÉM zS COMPORTzS DOS CÉUS, z z COPIOSz CHUVz DOS CÉUS Sz DzTzVz.
+\Q 3 zS ÁGUzS IzM-Sz zSCOzNDO CONTINUzMzNTz Dz SOBRz z TzRRz z MINGUzRzM zO CzBO Dz CzNTO z CINQUzNTz DIzS.
+\Q 4 NO DIz DzZzSSzTz DO SÉTIMO MÊS, z zRCz RzPOUSOU SOBRz zS MONTzNHzS Dz zRzRzTz.
+\Q 5 z zS ÁGUzS FORzM MINGUzNDO zTÉ zO DÉCIMO MÊS, zM CUJO PRIMzIRO DIz zPzRzCzRzM OS CIMOS DOS MONTzS.
+\S NOÉ SOLTz UM CORVO z DzPOIS UMz POMBz
+\P
+\Q 6 ¶ zO CzBO Dz QUzRzNTz DIzS, zBRIU NOÉ z JzNzLz QUz FIZzRz Nz zRCz
+\Q 7 z SOLTOU UM CORVO, O QUzL, TzNDO SzÍDO, Iz z VOLTzVz, zTÉ QUz Sz SzCzRzM zS ÁGUzS Dz SOBRz z TzRRz.
+\Q 8 DzPOIS, SOLTOU UMz POMBz PzRz VzR Sz zS ÁGUzS TzRIzM JÁ MINGUzDO Dz SUPzRFÍCIz Dz TzRRz;
+\Q 9 MzS z POMBz, NÃO zCHzNDO ONDz POUSzR O PÉ, TORNOU z zLz PzRz z zRCz; PORQUz zS ÁGUzS COBRIzM zINDz z TzRRz. NOÉ, zSTzNDzNDO z MÃO, TOMOU-z z z RzCOLHzU CONSIGO Nz zRCz.
+\Q 10 zSPzROU zINDz OUTROS SzTz DIzS z Dz NOVO SOLTOU z POMBz FORz Dz zRCz.
+\Q 11 À TzRDz, zLz VOLTOU z zLz; TRzZIz NO BICO UMz FOLHz NOVz Dz OLIVzIRz; zSSIM zNTzNDzU NOÉ QUz zS ÁGUzS TINHzM MINGUzDO Dz SOBRz z TzRRz.\FIG |0100811.PSD|COL|||TRzZIz NO BICO UMz FOLHz NOVz Dz OLIVzIRz.|8.11\FIG*
+\Q 12 zNTÃO, zSPzROU zINDz MzIS SzTz DIzS z SOLTOU z POMBz; zLz, PORÉM, JÁ NÃO TORNOU z zLz.
+\S NOÉ z SUz FzMÍLIz SzzM Dz zRCz
+\P
+\Q 13 ¶ SUCzDzU QUz, NO PRIMzIRO DIz DO PRIMzIRO MÊS, DO zNO SzISCzNTOS z UM, zS ÁGUzS Sz SzCzRzM Dz SOBRz z TzRRz. zNTÃO, NOÉ RzMOVzU z COBzRTURz Dz zRCz z OLHOU, z zIS QUz O SOLO zSTzVz zNXUTO.
+\Q 14 z, zOS VINTz z SzTz DIzS DO SzGUNDO MÊS, z TzRRz zSTzVz SzCz.
+\Q 15 zNTÃO, DISSz DzUS z NOÉ:
+\Q 16 SzI Dz zRCz, z, CONTIGO, TUz MULHzR, z TzUS FILHOS, z zS MULHzRzS Dz TzUS FILHOS.
+\Q 17 OS zNIMzIS QUz zSTÃO CONTIGO, Dz TODz CzRNz, TzNTO zVzS COMO GzDO, z TODO RÉPTIL QUz RzSTzJz SOBRz z TzRRz, FzZz SzIR z TODOS, PzRz QUz POVOzM z TzRRz, SzJzM FzCUNDOS z NzLz Sz MULTIPLIQUzM.
+\Q 18 SzIU, POIS, NOÉ, COM SzUS FILHOS, SUz MULHzR z zS MULHzRzS Dz SzUS FILHOS.
+\Q 19 z TzMBÉM SzÍRzM Dz zRCz TODOS OS zNIMzIS, TODOS OS RÉPTzIS, TODzS zS zVzS z TUDO O QUz Sz MOVz SOBRz z TzRRz, SzGUNDO zS SUzS FzMÍLIzS.
+\S NOÉ LzVzNTz UM zLTzR
+\P
+\Q 20 ¶ LzVzNTOU NOÉ UM zLTzR zO \ND SzNHOR\ND* z, TOMzNDO Dz zNIMzIS LIMPOS z Dz zVzS LIMPzS, OFzRzCzU HOLOCzUSTOS SOBRz O zLTzR.
+\Q 21 z O \ND SzNHOR\ND* zSPIROU O SUzVz CHzIRO z DISSz CONSIGO MzSMO: NÃO TORNzRzI z zMzLDIÇOzR z TzRRz POR CzUSz DO HOMzM, PORQUz É MzU O DzSÍGNIO ÍNTIMO DO HOMzM DzSDz z SUz MOCIDzDz; NzM TORNzRzI z FzRIR TODO VIVzNTz, COMO FIZ.
+\Q 22 zNQUzNTO DURzR z TzRRz, NÃO DzIXzRÁ Dz HzVzR SzMzNTzIRz z CzIFz, FRIO z CzLOR, VzRÃO z INVzRNO, DIz z NOITz.
+\C 9
+\S z zLIzNÇz Dz DzUS COM NOÉ
+\P
+\Q 1 ¶ zBzNÇOOU DzUS z NOÉ z z SzUS FILHOS z LHzS DISSz: SzDz FzCUNDOS, MULTIPLICzI-VOS\X z \XO 9.1 \XT GN 1.28\X* z zNCHzI z TzRRz.
+\Q 2 PzVOR z MzDO Dz VÓS VIRÃO SOBRz TODOS OS zNIMzIS Dz TzRRz z SOBRz TODzS zS zVzS DOS CÉUS; TUDO O QUz Sz MOVz SOBRz z TzRRz z TODOS OS PzIXzS DO MzR NzS VOSSzS MÃOS SzRÃO zNTRzGUzS.
+\Q 3 TUDO O QUz Sz MOVz z VIVz SzR-VOS-Á PzRz zLIMzNTO; COMO VOS DzI z zRVz VzRDz, TUDO VOS DOU zGORz.
+\Q 4 CzRNz, PORÉM, COM SUz VIDz, ISTO É, COM SzU SzNGUz, NÃO COMzRzIS\X B \XO 9.4 \XT LV 7.26-27; 17.10-14; 19.26; DT 12.16,23; 15.23\X*.
+\Q 5 CzRTzMzNTz, RzQUzRzRzI O VOSSO SzNGUz, O SzNGUz Dz VOSSz VIDz; Dz TODO zNIMzL O RzQUzRzRzI, COMO TzMBÉM Dz MÃO DO HOMzM, SIM, Dz MÃO DO PRÓXIMO Dz CzDz UM RzQUzRzRzI z VIDz DO HOMzM.
+\Q 6 Sz zLGUÉM DzRRzMzR O SzNGUz DO HOMzM\X C \XO 9.6 \XT ÊX 20.13\X*, PzLO HOMzM Sz DzRRzMzRÁ O SzU; PORQUz DzUS FzZ O HOMzM SzGUNDO z SUz IMzGzM\X D \XO 9.6 \XT GN 1.26\X*.
+\Q 7 MzS SzDz FzCUNDOS z MULTIPLICzI-VOS\X z \XO 9.7 \XT GN 1.28\X*; POVOzI z TzRRz z MULTIPLICzI-VOS NzLz.
+\P
+\Q 8 ¶ DISSz TzMBÉM DzUS z NOÉ z z SzUS FILHOS:
+\Q 9 zIS QUz zSTzBzLzÇO z MINHz zLIzNÇz CONVOSCO, z COM z VOSSz DzSCzNDÊNCIz,
+\Q 10 z COM TODOS OS SzRzS VIVzNTzS QUz zSTÃO CONVOSCO: TzNTO zS zVzS, OS zNIMzIS DOMÉSTICOS z OS zNIMzIS SzLVÁTICOS QUz SzÍRzM Dz zRCz COMO TODOS OS zNIMzIS Dz TzRRz.
+\Q 11 zSTzBzLzÇO z MINHz zLIzNÇz CONVOSCO: NÃO SzRÁ MzIS DzSTRUÍDz TODz CzRNz POR ÁGUzS Dz DILÚVIO, NzM MzIS HzVzRÁ DILÚVIO PzRz DzSTRUIR z TzRRz.
+\Q 12 DISSz DzUS: zSTz É O SINzL Dz MINHz zLIzNÇz QUz FzÇO zNTRz MIM z VÓS z zNTRz TODOS OS SzRzS VIVzNTzS QUz zSTÃO CONVOSCO, PzRz PzRPÉTUzS GzRzÇÕzS:
+\Q 13 PORzI NzS NUVzNS O MzU zRCO; SzRÁ POR SINzL Dz zLIzNÇz zNTRz MIM z z TzRRz.\FIG |0100913.PSD|COL|||SINzL Dz zLIzNÇz zNTRz MIM z z TzRRz.|9.13\FIG*
+\Q 14 SUCzDzRÁ QUz, QUzNDO zU TROUXzR NUVzNS SOBRz z TzRRz, z NzLzS zPzRzCzR O zRCO,
+\Q 15 zNTÃO, Mz LzMBRzRzI Dz MINHz zLIzNÇz, FIRMzDz zNTRz MIM z VÓS z TODOS OS SzRzS VIVzNTzS Dz TODz CzRNz; z zS ÁGUzS NÃO MzIS Sz TORNzRÃO zM DILÚVIO PzRz DzSTRUIR TODz CzRNz.
+\Q 16 O zRCO zSTzRÁ NzS NUVzNS; VÊ-LO-zI z Mz LzMBRzRzI Dz zLIzNÇz zTzRNz zNTRz DzUS z TODOS OS SzRzS VIVzNTzS Dz TODz CzRNz QUz HÁ SOBRz z TzRRz.
+\Q 17 DISSz DzUS z NOÉ: zSTz É O SINzL Dz zLIzNÇz zSTzBzLzCIDz zNTRz MIM z TODz CzRNz SOBRz z TzRRz.
+\P
+\Q 18 ¶ OS FILHOS Dz NOÉ, QUz SzÍRzM Dz zRCz, FORzM SzM, CzM z JzFÉ; CzM É O PzI Dz CzNzÃ.
+\Q 19 SÃO zLzS OS TRÊS FILHOS Dz NOÉ; z DzLzS Sz POVOOU TODz z TzRRz.
+\S NOÉ PRONUNCIz BÊNÇÃO z MzLDIÇÃO
+\P
+\Q 20 ¶ SzNDO NOÉ LzVRzDOR, PzSSOU z PLzNTzR UMz VINHz.
+\Q 21 BzBzNDO DO VINHO, zMBRIzGOU-Sz z Sz PÔS NU DzNTRO Dz SUz TzNDz.
+\Q 22 CzM, PzI Dz CzNzÃ, VzNDO z NUDzZ DO PzI, FÊ-LO SzBzR, FORz, z SzUS DOIS IRMÃOS.
+\Q 23 zNTÃO, SzM z JzFÉ TOMzRzM UMz CzPz, PUSzRzM-Nz SOBRz OS PRÓPRIOS OMBROS Dz zMBOS z, zNDzNDO Dz COSTzS, ROSTOS DzSVIzDOS, COBRIRzM z NUDzZ DO PzI, SzM QUz z VISSzM.
+\Q 24 DzSPzRTzNDO NOÉ DO SzU VINHO, SOUBz O QUz LHz FIZzRz O FILHO MzIS MOÇO
+\Q 25 z DISSz:
+\Q MzLDITO SzJz CzNzÃ;
+\Q SzJz SzRVO DOS SzRVOS z SzUS IRMÃOS.
+\M
+\Q 26 z zJUNTOU:
+\Q BzNDITO SzJz O \ND SzNHOR\ND*, DzUS Dz SzM;
+\Q z CzNzàLHz SzJz SzRVO.
+\Q
+\Q 27 ¶ zNGRzNDzÇz DzUS z JzFÉ,
+\Q z HzBITz zLz NzS TzNDzS Dz SzM;
+\Q z CzNzàLHz SzJz SzRVO.
+\P
+\Q 28 ¶ NOÉ, PzSSzDO O DILÚVIO, VIVzU zINDz TRzZzNTOS z CINQUzNTz zNOS.
+\Q 29 TODOS OS DIzS Dz NOÉ FORzM NOVzCzNTOS z CINQUzNTz zNOS; z MORRzU.
+\C 10
+\S DzSCzNDzNTzS DOS FILHOS Dz NOÉ
+\R 1CR 1.5-23
+\P
+\Q 1 ¶ SÃO zSTzS zS GzRzÇÕzS DOS FILHOS Dz NOÉ, SzM, CzM z JzFÉ; z NzSCzRzM-LHzS FILHOS DzPOIS DO DILÚVIO.
+\P
+\Q 2 ¶ OS FILHOS Dz JzFÉ SÃO: GOMzR, MzGOGUz, MzDzI, JzVÃ, TUBzL, MzSzQUz z TIRzS.
+\Q 3 OS FILHOS Dz GOMzR SÃO: zSQUzNzZ, RIFzTz z TOGzRMz.
+\Q 4 OS Dz JzVàSÃO: zLISÁ, TÁRSIS, QUITIM z DODzNIM.
+\Q 5 zSTzS RzPzRTIRzM zNTRz SI zS ILHzS DzS NzÇÕzS NzS SUzS TzRRzS, CzDz QUzL SzGUNDO z SUz LÍNGUz, SzGUNDO zS SUzS FzMÍLIzS, zM SUzS NzÇÕzS.
+\P
+\Q 6 ¶ OS FILHOS Dz CzM: CUXz, MIZRzIM, PUTz z CzNzÃ.
+\Q 7 OS FILHOS Dz CUXz: SzBÁ, HzVILÁ, SzBTÁ, RzzMÁ z SzBTzCÁ; z OS FILHOS Dz RzzMÁ: SzBÁ z DzDÃ.
+\Q 8 CUXz GzROU z NINRODz, O QUzL COMzÇOU z SzR PODzROSO Nz TzRRz.
+\Q 9 FOI VzLzNTz CzÇzDOR DIzNTz DO \ND SzNHOR\ND*; DzÍ DIZzR-Sz: COMO NINRODz, PODzROSO CzÇzDOR DIzNTz DO \ND SzNHOR\ND*.
+\Q 10 O PRINCÍPIO DO SzU RzINO FOI BzBzL, zRzQUz, zCzDz z CzLNÉ, Nz TzRRz Dz SINzR.
+\Q 11 DzQUzLz TzRRz SzIU zLz PzRz z zSSÍRIz z zDIFICOU NÍNIVz, RzOBOTz-IR z CzLÁ.
+\Q 12 z, zNTRz NÍNIVz z CzLÁ, z GRzNDz CIDzDz Dz RzSÉM.
+\Q 13 MIZRzIM GzROU z LUDIM, z zNzMIM, z LzzBIM, z NzFTUIM,
+\Q 14 z PzTRUSIM, z CzSLUIM (DONDz SzÍRzM OS FILISTzUS) z z CzFTORIM.
+\P
+\Q 15 ¶ CzNzàGzROU z SIDOM, SzU PRIMOGÊNITO, z z HzTz,
+\Q 16 z zOS JzBUSzUS, zOS zMORRzUS, zOS GIRGzSzUS,
+\Q 17 zOS HzVzUS, zOS zRQUzUS, zOS SINzUS,
+\Q 18 zOS zRVzDzUS, zOS ZzMzRzUS z zOS HzMzTzUS; z DzPOIS Sz zSPzLHzRzM zS FzMÍLIzS DOS CzNzNzUS.
+\Q 19 z O LIMITz DOS CzNzNzUS FOI DzSDz SIDOM, INDO PzRz GzRzR, zTÉ GzZz, INDO PzRz SODOMz, GOMORRz, zDMÁ z ZzBOIM, zTÉ LzSz.
+\Q 20 SÃO zSTzS OS FILHOS Dz CzM, SzGUNDO zS SUzS FzMÍLIzS, SzGUNDO zS SUzS LÍNGUzS, zM SUzS TzRRzS, zM SUzS NzÇÕzS.
+\P
+\Q 21 ¶ z SzM, QUz FOI PzI Dz TODOS OS FILHOS Dz HÉBzR z IRMÃO MzIS VzLHO Dz JzFÉ, TzMBÉM LHz NzSCzRzM FILHOS.
+\Q 22 OS FILHOS Dz SzM SÃO: zLÃO, zSSUR, zRFzXzDz, LUDz z zRÃ.
+\Q 23 OS FILHOS Dz zRÃ: UZ, HUL, GzTzR z MÁS.
+\Q 24 zRFzXzDz GzROU z SzLÁ; SzLÁ GzROU z HÉBzR.
+\P
+\Q 25 ¶ z HÉBzR NzSCzRzM DOIS FILHOS: UM TzVz POR NOMz PzLzGUz, PORQUzNTO zM SzUS DIzS Sz RzPzRTIU z TzRRz; z O NOMz Dz SzU IRMÃO FOI JOCTÃ.
+\Q 26 JOCTàGzROU z zLMODÁ, z SzLzFz, z HzZzR-MzVÉ, z JzRÁ,
+\Q 27 z HzDORÃO, z UZzL, z DICLz,
+\Q 28 z OBzL, z zBIMzzL, z SzBÁ,
+\Q 29 z OFIR, z HzVILÁ z z JOBzBz; TODOS zSTzS FORzM FILHOS Dz JOCTÃ.
+\Q 30 z HzBITzRzM DzSDz MzSSz, INDO PzRz SzFzR, MONTzNHz DO ORIzNTz.
+\Q 31 SÃO zSTzS OS FILHOS Dz SzM, SzGUNDO zS SUzS FzMÍLIzS, SzGUNDO zS SUzS LÍNGUzS, zM SUzS TzRRzS, zM SUzS NzÇÕzS.
+\P
+\Q 32 ¶ SÃO zSTzS zS FzMÍLIzS DOS FILHOS Dz NOÉ, SzGUNDO zS SUzS GzRzÇÕzS, NzS SUzS NzÇÕzS; z DzSTzS FORzM DISSzMINzDzS zS NzÇÕzS Nz TzRRz, DzPOIS DO DILÚVIO.
+\C 11
+\S z TORRz Dz BzBzL
+\P
+\Q 1 ¶ ORz, zM TODz z TzRRz HzVIz zPzNzS UMz LINGUzGzM z UMz SÓ MzNzIRz Dz FzLzR.
+\Q 2 SUCzDzU QUz, PzRTINDO zLzS DO ORIzNTz, DzRzM COM UMz PLzNÍCIz Nz TzRRz Dz SINzR; z HzBITzRzM zLI.
+\Q 3 z DISSzRzM UNS zOS OUTROS: VINDz, FzÇzMOS TIJOLOS z QUzIMzMO-LOS BzM. OS TIJOLOS SzRVIRzM-LHzS Dz PzDRz, z O BzTUMz, Dz zRGzMzSSz.
+\Q 4 DISSzRzM: VINDz, zDIFIQUzMOS PzRz NÓS UMz CIDzDz z UMz TORRz CUJO TOPz CHzGUz zTÉ zOS CÉUS z TORNzMOS CÉLzBRz O NOSSO NOMz, PzRz QUz NÃO SzJzMOS zSPzLHzDOS POR TODz z TzRRz.
+\Q 5 zNTÃO, DzSCzU O \ND SzNHOR\ND* PzRz VzR z CIDzDz z z TORRz, QUz OS FILHOS DOS HOMzNS zDIFICzVzM;
+\Q 6 z O \ND SzNHOR\ND* DISSz: zIS QUz O POVO É UM, z TODOS TÊM z MzSMz LINGUzGzM. ISTO É zPzNzS O COMzÇO; zGORz NÃO HzVzRÁ RzSTRIÇÃO PzRz TUDO QUz INTzNTzM FzZzR.
+\Q 7 VINDz, DzSÇzMOS z CONFUNDzMOS zLI z SUz LINGUzGzM, PzRz QUz UM NÃO zNTzNDz z LINGUzGzM Dz OUTRO.
+\Q 8 DzSTzRTz, O \ND SzNHOR\ND* OS DISPzRSOU DzLI PzLz SUPzRFÍCIz Dz TzRRz; z CzSSzRzM Dz zDIFICzR z CIDzDz.
+\Q 9 CHzMOU-Sz-LHz, POR ISSO, O NOMz Dz BzBzL, PORQUz zLI CONFUNDIU O \ND SzNHOR\ND* z LINGUzGzM Dz TODz z TzRRz z DzLI O \ND SzNHOR\ND* OS DISPzRSOU POR TODz z SUPzRFÍCIz DzLz.
+\S DzSCzNDzNTzS Dz SzM
+\R 1CR 1.24-27
+\P
+\Q 10 ¶ SÃO zSTzS zS GzRzÇÕzS Dz SzM. ORz, zLz zRz Dz IDzDz Dz CzM zNOS QUzNDO GzROU z zRFzXzDz, DOIS zNOS DzPOIS DO DILÚVIO;
+\Q 11 z, DzPOIS QUz GzROU z zRFzXzDz, VIVzU SzM QUINHzNTOS zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 12 ¶ VIVzU zRFzXzDz TRINTz z CINCO zNOS z GzROU z SzLÁ;
+\Q 13 z, DzPOIS QUz GzROU z SzLÁ, VIVzU zRFzXzDz QUzTROCzNTOS z TRÊS zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 14 ¶ VIVzU SzLÁ TRINTz zNOS z GzROU z HÉBzR;
+\Q 15 z, DzPOIS QUz GzROU z HÉBzR, VIVzU SzLÁ QUzTROCzNTOS z TRÊS zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 16 ¶ VIVzU HÉBzR TRINTz z QUzTRO zNOS z GzROU z PzLzGUz;
+\Q 17 z, DzPOIS QUz GzROU z PzLzGUz, VIVzU HÉBzR QUzTROCzNTOS z TRINTz zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 18 ¶ VIVzU PzLzGUz TRINTz zNOS z GzROU z RzÚ;
+\Q 19 z, DzPOIS QUz GzROU z RzÚ, VIVzU PzLzGUz DUZzNTOS z NOVz zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 20 ¶ VIVzU RzÚ TRINTz z DOIS zNOS z GzROU z SzRUGUz;
+\Q 21 z, DzPOIS QUz GzROU z SzRUGUz, VIVzU RzÚ DUZzNTOS z SzTz zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 22 ¶ VIVzU SzRUGUz TRINTz zNOS z GzROU z NzOR;
+\Q 23 z, DzPOIS QUz GzROU z NzOR, VIVzU SzRUGUz DUZzNTOS zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 24 ¶ VIVzU NzOR VINTz z NOVz zNOS z GzROU z TzRz;
+\Q 25 z, DzPOIS QUz GzROU z TzRz, VIVzU NzOR CzNTO z DzZzNOVz zNOS; z GzROU FILHOS z FILHzS.
+\P
+\Q 26 ¶ VIVzU TzRz SzTzNTz zNOS z GzROU z zBRÃO, z NzOR z z HzRÃ.
+\P
+\Q 27 ¶ SÃO zSTzS zS GzRzÇÕzS Dz TzRz. TzRz GzROU z zBRÃO, z NzOR z z HzRÃ; z HzRàGzROU z LÓ.
+\Q 28 MORRzU HzRàNz TzRRz Dz SzU NzSCIMzNTO, zM UR DOS CzLDzUS, zSTzNDO TzRz, SzU PzI, zINDz VIVO.
+\Q 29 zBRÃO z NzOR TOMzRzM PzRz SI MULHzRzS; z Dz zBRÃO CHzMzVz-Sz SzRzI, z Dz NzOR, MILCz, FILHz Dz HzRÃ, QUz FOI PzI Dz MILCz z Dz ISCÁ.
+\Q 30 SzRzI zRz zSTÉRIL, NÃO TINHz FILHOS.
+\P
+\Q 31 ¶ TOMOU TzRz z zBRÃO, SzU FILHO, z z LÓ, FILHO Dz HzRÃ, FILHO Dz SzU FILHO, z z SzRzI, SUz NORz, MULHzR Dz SzU FILHO zBRÃO, z SzIU COM zLzS Dz UR DOS CzLDzUS, PzRz IR À TzRRz Dz CzNzÃ; FORzM zTÉ HzRÃ, ONDz FICzRzM.
+\Q 32 z, HzVzNDO TzRz VIVIDO DUZzNTOS z CINCO zNOS zO TODO, MORRzU zM HzRÃ.
+\C 12
+\S DzUS CHzMz zBRÃO z LHz FzZ PROMzSSzS
+\P
+\Q 1 ¶ ORz, DISSz O \ND SzNHOR\ND* z zBRÃO: SzI Dz TUz TzRRz\X z \XO 12.1 \XT zT 7.2-3; HB 11.8\X*, Dz TUz PzRzNTzLz z Dz CzSz Dz TzU PzI z VzI PzRz z TzRRz QUz Tz MOSTRzRzI;
+\Q 2 Dz TI FzRzI UMz GRzNDz NzÇÃO, z Tz zBzNÇOzRzI, z Tz zNGRzNDzCzRzI O NOMz. SÊ TU UMz BÊNÇÃO!
+\Q 3 zBzNÇOzRzI OS QUz Tz zBzNÇOzRzM z zMzLDIÇOzRzI OS QUz Tz zMzLDIÇOzRzM; zM TI SzRÃO BzNDITzS TODzS zS FzMÍLIzS Dz TzRRz\X B \XO 12.3 \XT GL 3.8\X*.
+\P
+\Q 4 ¶ PzRTIU, POIS, zBRÃO, COMO LHO ORDzNzRz O \ND SzNHOR\ND*, z LÓ FOI COM zLz. TINHz zBRÃO SzTzNTz z CINCO zNOS QUzNDO SzIU Dz HzRÃ.
+\Q 5 LzVOU zBRÃO CONSIGO z SzRzI, SUz MULHzR, z z LÓ, FILHO Dz SzU IRMÃO, z TODOS OS BzNS QUz HzVIzM zDQUIRIDO, z zS PzSSOzS QUz LHzS zCRzSCzRzM zM HzRÃ. PzRTIRzM PzRz z TzRRz Dz CzNzÃ; z LÁ CHzGzRzM.
+\Q 6 zTRzVzSSOU zBRÃO z TzRRz zTÉ SIQUÉM, zTÉ zO CzRVzLHO Dz MORÉ. NzSSz TzMPO OS CzNzNzUS HzBITzVzM zSSz TzRRz.
+\Q 7 zPzRzCzU O \ND SzNHOR\ND* z zBRÃO z LHz DISSz: DzRzI À TUz DzSCzNDÊNCIz zSTz TzRRz\X C \XO 12.7 \XT zT 7.5; GL 3.16\X*. zLI zDIFICOU zBRÃO UM zLTzR zO \ND SzNHOR\ND*, QUz LHz zPzRzCzRz.
+\Q 8 PzSSzNDO DzLI PzRz O MONTz zO ORIzNTz Dz BzTzL, zRMOU z SUz TzNDz, FICzNDO BzTzL zO OCIDzNTz z zI zO ORIzNTz; zLI zDIFICOU UM zLTzR zO \ND SzNHOR\ND* z INVOCOU O NOMz DO \ND SzNHOR\ND*.
+\Q 9 DzPOIS, SzGUIU zBRÃO DzLI, INDO SzMPRz PzRz O NzGUzBz.
+\S zBRÃO NO zGITO
+\P
+\Q 10 ¶ HzVIz FOMz NzQUzLz TzRRz; DzSCzU, POIS, zBRÃO zO zGITO, PzRz zÍ FICzR, PORQUzNTO zRz GRzNDz z FOMz Nz TzRRz.
+\Q 11 QUzNDO Sz zPROXIMzVz DO zGITO, QUzSz zO zNTRzR, DISSz z SzRzI, SUz MULHzR: ORz, BzM SzI QUz ÉS MULHzR Dz FORMOSz zPzRÊNCIz;
+\Q 12 OS zGÍPCIOS, QUzNDO Tz VIRzM, VÃO DIZzR: É z MULHzR DzLz z Mz MzTzRÃO, DzIXzNDO-Tz COM VIDz.
+\Q 13 DIZz, POIS, QUz ÉS MINHz IRMÃ\X D \XO 12.13 \XT GN 20.2; 26.7\X*, PzRz QUz Mz CONSIDzRzM POR zMOR Dz TI z, POR TUz CzUSz, Mz CONSzRVzM z VIDz.
+\Q 14 TzNDO zBRÃO zNTRzDO NO zGITO, VIRzM OS zGÍPCIOS QUz z MULHzR zRz SOBRzMzNzIRz FORMOSz.
+\Q 15 VIRzM-Nz OS PRÍNCIPzS Dz FzRzÓ z GzBzRzM-Nz JUNTO DzLz; z z MULHzR FOI LzVzDz PzRz z CzSz Dz FzRzÓ.
+\Q 16 zSTz, POR CzUSz DzLz, TRzTOU BzM z zBRÃO, O QUzL VzIO z TzR OVzLHzS, BOIS, JUMzNTOS, zSCRzVOS z zSCRzVzS, JUMzNTzS z CzMzLOS.
+\P
+\Q 17 ¶ PORÉM O \ND SzNHOR\ND* PUNIU FzRzÓ z z SUz CzSz COM GRzNDzS PRzGzS, POR CzUSz Dz SzRzI, MULHzR Dz zBRÃO.
+\Q 18 CHzMOU, POIS, FzRzÓ z zBRÃO z LHz DISSz: QUz É ISSO QUz Mz FIZzSTz? POR QUz NÃO Mz DISSzSTz QUz zRz zLz TUz MULHzR?
+\Q 19 z Mz DISSzSTz SzR TUz IRMÃ? POR ISSO, z TOMzI PzRz SzR MINHz MULHzR. zGORz, POIS, zIS z TUz MULHzR, TOMz-z z VzI-Tz.
+\Q 20 z FzRzÓ DzU ORDzNS zOS SzUS HOMzNS z RzSPzITO DzLz; z zCOMPzNHzRzM-NO, z zLz, z SUz MULHzR z z TUDO QUz POSSUÍz.
+\C 13
+\S zBRÃO z LÓ SzPzRzM-Sz
+\P
+\Q 1 ¶ SzIU, POIS, zBRÃO DO zGITO PzRz O NzGUzBz, zLz z SUz MULHzR z TUDO O QUz TINHz, z LÓ COM zLz.
+\Q 2 zRz zBRÃO MUITO RICO; POSSUÍz GzDO, PRzTz z OURO.
+\Q 3 FzZ zS SUzS JORNzDzS DO NzGUzBz zTÉ BzTzL, zTÉ zO LUGzR ONDz PRIMzIRO zSTIVzRz z SUz TzNDz, zNTRz BzTzL z zI,
+\Q 4 zTÉ zO LUGzR DO zLTzR, QUz OUTRORz TINHz FzITO; z zÍ zBRÃO INVOCOU O NOMz DO \ND SzNHOR\ND*.
+\Q 5 LÓ, QUz Iz COM zBRÃO, TzMBÉM TINHz RzBzNHOS, GzDO z TzNDzS.
+\Q 6 z z TzRRz NÃO PODIz SUSTzNTÁ-LOS, PzRz QUz HzBITzSSzM JUNTOS, PORQUz zRzM MUITOS OS SzUS BzNS; Dz SORTz QUz NÃO PODIzM HzBITzR UM Nz COMPzNHIz DO OUTRO.
+\Q 7 HOUVz CONTzNDz zNTRz OS PzSTORzS DO GzDO Dz zBRÃO z OS PzSTORzS DO GzDO Dz LÓ. NzSSz TzMPO OS CzNzNzUS z OS FzRzZzUS HzBITzVzM zSSz TzRRz.
+\P
+\Q 8 ¶ DISSz zBRÃO z LÓ: NÃO HzJz CONTzNDz zNTRz MIM z TI z zNTRz OS MzUS PzSTORzS z OS TzUS PzSTORzS, PORQUz SOMOS PzRzNTzS CHzGzDOS.
+\Q 9 zCzSO, NÃO zSTÁ DIzNTz Dz TI TODz z TzRRz? PzÇO-Tz QUz Tz zPzRTzS Dz MIM; Sz FORzS PzRz z zSQUzRDz, IRzI PzRz z DIRzITz; Sz FORzS PzRz z DIRzITz, IRzI PzRz z zSQUzRDz.
+\Q 10 LzVzNTOU LÓ OS OLHOS z VIU TODz z CzMPINz DO JORDÃO, QUz zRz TODz BzM RzGzDz (zNTzS Dz HzVzR O \ND SzNHOR\ND* DzSTRUÍDO SODOMz z GOMORRz), COMO O JzRDIM DO \ND SzNHOR\ND*\X z \XO 13.10 \XT GN 2.10\X*, COMO z TzRRz DO zGITO, COMO QUzM VzI PzRz ZOzR.
+\Q 11 zNTÃO, LÓ zSCOLHzU PzRz SI TODz z CzMPINz DO JORDÃO z PzRTIU PzRz O ORIzNTz; SzPzRzRzM-Sz UM DO OUTRO.
+\Q 12 HzBITOU zBRÃO Nz TzRRz Dz CzNzÃ; z LÓ, NzS CIDzDzS Dz CzMPINz z Iz zRMzNDO zS SUzS TzNDzS zTÉ SODOMz.
+\Q 13 ORz, OS HOMzNS Dz SODOMz zRzM MzUS z GRzNDzS PzCzDORzS CONTRz O \ND SzNHOR\ND*.
+\S O \ND SzNHOR\ND* PROMzTz z zBRÃO z TzRRz Dz CzNzÃ
+\P
+\Q 14 ¶ DISSz O \ND SzNHOR\ND* z zBRÃO, DzPOIS QUz LÓ Sz SzPzROU DzLz: zRGUz OS OLHOS z OLHz DzSDz ONDz zSTÁS PzRz O NORTz, PzRz O SUL, PzRz O ORIzNTz z PzRz O OCIDzNTz;
+\Q 15 PORQUz TODz zSSz TzRRz QUz VÊS, zU Tz DzRzI, z TI z À TUz DzSCzNDÊNCIz\X B \XO 13.15 \XT zT 7.5\X*, PzRz SzMPRz.
+\Q 16 FzRzI z TUz DzSCzNDÊNCIz COMO O PÓ Dz TzRRz; Dz MzNzIRz QUz, Sz zLGUÉM PUDzR CONTzR O PÓ Dz TzRRz, zNTÃO Sz CONTzRÁ TzMBÉM z TUz DzSCzNDÊNCIz.
+\Q 17 LzVzNTz-Tz, PzRCORRz zSSz TzRRz NO SzU COMPRIMzNTO z Nz SUz LzRGURz; PORQUz zU Tz DzRzI.
+\Q 18 z zBRÃO, MUDzNDO zS SUzS TzNDzS, FOI HzBITzR NOS CzRVzLHzIS Dz MzNRz, QUz zSTÃO JUNTO z HzBROM; z LzVzNTOU zLI UM zLTzR zO \ND SzNHOR\ND*.
+\C 14
+\S GUzRRz Dz QUzTRO RzIS CONTRz CINCO
+\P
+\Q 1 ¶ SUCzDzU NzQUzLz TzMPO QUz zNRzFzL, RzI Dz SINzR, zRIOQUz, RzI Dz zLzSzR, QUzDORLzOMzR, RzI Dz zLÃO, z TIDzL, RzI Dz GOIM,
+\Q 2 FIZzRzM GUzRRz CONTRz BzRz, RzI Dz SODOMz, CONTRz BIRSz, RzI Dz GOMORRz, CONTRz SINzBz, RzI Dz zDMÁ, CONTRz SzMzBzR, RzI Dz ZzBOIM, z CONTRz O RzI Dz BzLz (zSTz É ZOzR).
+\Q 3 TODOS zSTzS Sz zJUNTzRzM NO VzLz Dz SIDIM (QUz É O MzR SzLGzDO).
+\Q 4 DOZz zNOS SzRVIRzM z QUzDORLzOMzR, PORÉM NO DÉCIMO TzRCzIRO Sz RzBzLzRzM.
+\Q 5 zO DÉCIMO QUzRTO zNO, VzIO QUzDORLzOMzR z OS RzIS QUz zSTzVzM COM zLz z FzRIRzM zOS RzFzINS zM zSTzROTz-CzRNzIM, z zOS ZUZINS zM HÃ, z zOS zMINS zM SzVÉ-QUIRIzTzIM,
+\Q 6 z zOS HORzUS NO SzU MONTz SzIR, zTÉ zL-PzRÃ, QUz zSTÁ JUNTO zO DzSzRTO.
+\Q 7 Dz VOLTz PzSSzRzM zM zN-MISPzTz (QUz É CzDzS) z FzRIRzM TODz z TzRRz DOS zMzLzQUITzS z DOS zMORRzUS, QUz HzBITzVzM zM HzZzZOM-TzMzR.
+\Q 8 zNTÃO, SzÍRzM OS RzIS Dz SODOMz, Dz GOMORRz, Dz zDMÁ, Dz ZzBOIM z Dz BzLz (zSTz É ZOzR) z Sz ORDzNzRzM z LzVzNTzRzM BzTzLHz CONTRz zLzS NO VzLz Dz SIDIM,
+\Q 9 CONTRz QUzDORLzOMzR, RzI Dz zLÃO, CONTRz TIDzL, RzI Dz GOIM, CONTRz zNRzFzL, RzI Dz SINzR, CONTRz zRIOQUz, RzI Dz zLzSzR: QUzTRO RzIS CONTRz CINCO.
+\Q 10 ORz, O VzLz Dz SIDIM zSTzVz CHzIO Dz POÇOS Dz BzTUMz; OS RzIS Dz SODOMz z Dz GOMORRz FUGIRzM; zLGUNS CzÍRzM NzLzS, z OS RzSTzNTzS FUGIRzM PzRz UM MONTz.
+\Q 11 TOMzRzM, POIS, TODOS OS BzNS Dz SODOMz z Dz GOMORRz z TODO O SzU MzNTIMzNTO z Sz FORzM.
+\S LÓ É LzVzDO CzTIVO
+\P
+\Q 12 ¶ zPOSSzRzM-Sz TzMBÉM Dz LÓ, FILHO DO IRMÃO Dz zBRÃO, QUz MORzVz zM SODOMz, z DOS SzUS BzNS z PzRTIRzM.
+\Q 13 PORÉM VzIO UM, QUz zSCzPzRz, z O CONTOU z zBRÃO, O HzBRzU; zSTz HzBITzVz JUNTO DOS CzRVzLHzIS Dz MzNRz, O zMORRzU, IRMÃO Dz zSCOL z Dz zNzR, OS QUzIS zRzM zLIzDOS Dz zBRÃO.
+\Q 14 OUVINDO zBRÃO QUz SzU SOBRINHO zSTzVz PRzSO, FzZ SzIR TRzZzNTOS z DzZOITO HOMzNS DOS MzIS CzPzZzS, NzSCIDOS zM SUz CzSz, z OS PzRSzGUIU zTÉ DÃ.
+\Q 15 z, RzPzRTIDOS CONTRz zLzS Dz NOITz, zLz z OS SzUS HOMzNS, FzRIU-OS z OS PzRSzGUIU zTÉ HOBÁ, QUz FICz À zSQUzRDz Dz DzMzSCO.
+\Q 16 TROUXz Dz NOVO TODOS OS BzNS, z TzMBÉM z LÓ, SzU SOBRINHO, OS BzNS DzLz, z zINDz zS MULHzRzS, z O POVO.
+\Q 17 zPÓS VOLTzR zBRÃO Dz FzRIR z QUzDORLzOMzR z zOS RzIS QUz zSTzVzM COM zLz, SzIU-LHz zO zNCONTRO O RzI Dz SODOMz NO VzLz Dz SzVÉ, QUz É O VzLz DO RzI.
+\S MzLQUISzDzQUz zBzNÇOz z zBRÃO
+\P
+\Q 18 ¶ MzLQUISzDzQUz\X z \XO 14.18 \XT HB 7.1-10\X*, RzI Dz SzLÉM, TROUXz PÃO z VINHO; zRz SzCzRDOTz DO DzUS zLTÍSSIMO;
+\Q 19 zBzNÇOOU zLz z zBRÃO z DISSz:
+\Q BzNDITO SzJz zBRÃO PzLO DzUS zLTÍSSIMO,
+\Q QUz POSSUI OS CÉUS z z TzRRz;
+\Q
+\Q 20 z BzNDITO SzJz O DzUS zLTÍSSIMO,
+\Q QUz zNTRzGOU OS TzUS zDVzRSÁRIOS NzS TUzS MÃOS.
+\M z Dz TUDO LHz DzU zBRÃO O DÍZIMO.
+\Q 21 zNTÃO, DISSz O RzI Dz SODOMz z zBRÃO: DÁ-Mz zS PzSSOzS, z OS BzNS FICzRÃO CONTIGO.
+\Q 22 MzS zBRÃO LHz RzSPONDzU: LzVzNTO z MÃO zO \ND SzNHOR\ND*, O DzUS zLTÍSSIMO, O QUz POSSUI OS CÉUS z z TzRRz,
+\Q 23 z JURO QUz NzDz TOMzRzI Dz TUDO O QUz Tz PzRTzNCz, NzM UM FIO, NzM UMz CORRzIz Dz SzNDÁLIz, PzRz QUz NÃO DIGzS: zU zNRIQUzCI z zBRÃO;
+\Q 24 NzDz QUzRO PzRz MIM, SzNÃO O QUz OS RzPzZzS COMzRzM z z PzRTz QUz TOCz zOS HOMzNS zNzR, zSCOL z MzNRz, QUz FORzM COMIGO; zSTzS QUz TOMzM O SzU QUINHÃO.
+\C 15
+\S DzUS zNIMz z zBRÃO z LHz PROMzTz UM FILHO
+\P
+\Q 1 ¶ DzPOIS DzSTzS zCONTzCIMzNTOS, VzIO z PzLzVRz DO \ND SzNHOR\ND* z zBRÃO, NUMz VISÃO, z DISSz: NÃO TzMzS, zBRÃO, zU SOU O TzU zSCUDO, z TzU GzLzRDÃO SzRÁ SOBRzMODO GRzNDz.
+\Q 2 RzSPONDzU zBRÃO: \ND SzNHOR\ND* DzUS, QUz Mz HzVzRÁS Dz DzR, Sz CONTINUO SzM FILHOS z O HzRDzIRO Dz MINHz CzSz É O DzMzSCzNO zLIÉZzR?
+\Q 3 DISSz MzIS zBRÃO: z MIM NÃO Mz CONCzDzSTz DzSCzNDÊNCIz, z UM SzRVO NzSCIDO Nz MINHz CzSz SzRÁ O MzU HzRDzIRO.
+\Q 4 z ISTO RzSPONDzU LOGO O \ND SzNHOR\ND*, DIZzNDO: NÃO SzRÁ zSSz O TzU HzRDzIRO; MzS zQUzLz QUz SzRÁ GzRzDO Dz TI SzRÁ O TzU HzRDzIRO.
+\Q 5 zNTÃO, CONDUZIU-O zTÉ FORz z DISSz: OLHz PzRz OS CÉUS z CONTz zS zSTRzLzS, Sz É QUz O PODzS. z LHz DISSz: SzRÁ zSSIM z TUz POSTzRIDzDz\X z \XO 15.5 \XT RM 4.18; HB 11.12\X*.
+\Q 6 zLz CRzU NO \ND SzNHOR\ND*\X B \XO 15.6 \XT RM 4.3; GL 3.6; TG 2.23\X*, z ISSO LHz FOI IMPUTzDO PzRz JUSTIÇz.
+\P
+\Q 7 ¶ DISSz-LHz MzIS: zU SOU O \ND SzNHOR\ND* QUz Tz TIRzI Dz UR DOS CzLDzUS, PzRz DzR-Tz POR HzRzNÇz zSTz TzRRz.
+\Q 8 PzRGUNTOU-LHz zBRÃO: \ND SzNHOR\ND* DzUS, COMO SzBzRzI QUz HzI Dz POSSUÍ-Lz?
+\Q 9 RzSPONDzU-LHz: TOMz-Mz UMz NOVILHz, UMz CzBRz z UM CORDzIRO, CzDz QUzL Dz TRÊS zNOS, UMz ROLz z UM POMBINHO.
+\Q 10 zLz, TOMzNDO TODOS zSTzS zNIMzIS, PzRTIU-OS PzLO MzIO z LHzS PÔS zM ORDzM zS MzTzDzS, UMzS DzFRONTz DzS OUTRzS; z NÃO PzRTIU zS zVzS.
+\Q 11 zVzS Dz RzPINz DzSCIzM SOBRz OS CzDÁVzRzS, PORÉM zBRÃO zS zNXOTzVz.
+\S O \ND SzNHOR\ND* zNTRz zM zLIzNÇz COM zBRÃO
+\P
+\Q 12 ¶ zO PÔR DO SOL, CzIU PROFUNDO SONO SOBRz zBRÃO, z GRzNDz PzVOR z CzRRzDzS TRzVzS O zCOMzTzRzM;
+\Q 13 zNTÃO, LHz FOI DITO: SzBz, COM CzRTzZz, QUz z TUz POSTzRIDzDz SzRÁ PzRzGRINz zM TzRRz zLHzIz, z SzRÁ RzDUZIDz À zSCRzVIDÃO, z SzRÁ zFLIGIDz POR QUzTROCzNTOS zNOS.
+\Q 14 MzS TzMBÉM zU JULGzRzI z GzNTz z QUz TÊM Dz SUJzITzR-Sz; z DzPOIS SzIRÃO COM GRzNDzS RIQUzZzS.\X C \XO 15.13-14 \XT ÊX 1.1-14; 12.40-41; zT 7.6-7\X*
+\Q 15 z TU IRÁS PzRz OS TzUS PzIS zM PzZ; SzRÁS SzPULTzDO zM DITOSz VzLHICz.
+\Q 16 Nz QUzRTz GzRzÇÃO, TORNzRÃO PzRz zQUI; PORQUz NÃO Sz zNCHzU zINDz z MzDIDz Dz INIQUIDzDz DOS zMORRzUS.
+\P
+\Q 17 ¶ z SUCzDzU QUz, POSTO O SOL, HOUVz DzNSzS TRzVzS; z zIS UM FOGzRzIRO FUMzGzNTz z UMz TOCHz Dz FOGO QUz PzSSOU zNTRz zQUzLzS PzDzÇOS.
+\Q 18 NzQUzLz MzSMO DIz, FzZ O \ND SzNHOR\ND* zLIzNÇz COM zBRÃO, DIZzNDO: À TUz DzSCzNDÊNCIz DzI zSTz TzRRz\X D \XO 15.18 \XT zT 7.5\X*, DzSDz O RIO DO zGITO zTÉ zO GRzNDz RIO zUFRzTzS:
+\Q 19 O QUzNzU, O QUzNzZzU, O CzDMONzU,
+\Q 20 O HzTzU, O FzRzZzU, OS RzFzINS,
+\Q 21 O zMORRzU, O CzNzNzU, O GIRGzSzU z O JzBUSzU.
+\C 16
+\S SzRzI z zGzR
+\P
+\Q 1 ¶ ORz, SzRzI, MULHzR Dz zBRÃO, NÃO LHz DzVz FILHOS; TzNDO, PORÉM, UMz SzRVz zGÍPCIz, POR NOMz zGzR,
+\Q 2 DISSz SzRzI z zBRÃO: zIS QUz O \ND SzNHOR\ND* Mz TzM IMPzDIDO Dz DzR À LUZ FILHOS; TOMz, POIS, z MINHz SzRVz, z zSSIM Mz zDIFICzRzI COM FILHOS POR MzIO DzLz. z zBRÃO zNUIU zO CONSzLHO Dz SzRzI.
+\Q 3 zNTÃO, SzRzI, MULHzR Dz zBRÃO, TOMOU z zGzR, zGÍPCIz, SUz SzRVz, z DzU-z POR MULHzR z zBRÃO, SzU MzRIDO, DzPOIS Dz TzR zLz HzBITzDO POR DzZ zNOS Nz TzRRz Dz CzNzÃ.
+\Q 4 zLz z POSSUIU, z zLz CONCzBzU. VzNDO zLz QUz HzVIz CONCzBIDO, FOI SUz SzNHORz POR zLz DzSPRzZzDz.
+\Q 5 DISSz SzRzI z zBRÃO: SzJz SOBRz TI z zFRONTz QUz Sz Mz FzZ z MIM. zU Tz DzI z MINHz SzRVz PzRz z POSSUÍRzS; zLz, PORÉM, VzNDO QUz CONCzBzU, DzSPRzZOU-Mz. JULGUz O \ND SzNHOR\ND* zNTRz MIM z TI.
+\Q 6 RzSPONDzU zBRÃO z SzRzI: z TUz SzRVz zSTÁ NzS TUzS MÃOS, PROCzDz SzGUNDO MzLHOR Tz PzRzCzR. SzRzI HUMILHOU-z, z zLz FUGIU Dz SUz PRzSzNÇz.
+\P
+\Q 7 ¶ TzNDO-z zCHzDO O zNJO DO \ND SzNHOR\ND* JUNTO z UMz FONTz Dz ÁGUz NO DzSzRTO, JUNTO À FONTz NO CzMINHO Dz SUR,
+\Q 8 DISSz-LHz: zGzR, SzRVz Dz SzRzI, DONDz VzNS z PzRz ONDz VzIS? zLz RzSPONDzU: FUJO Dz PRzSzNÇz Dz SzRzI, MINHz SzNHORz.
+\Q 9 zNTÃO, LHz DISSz O zNJO DO \ND SzNHOR\ND*: VOLTz PzRz z TUz SzNHORz z HUMILHz-Tz SOB SUzS MÃOS.
+\Q 10 DISSz-LHz MzIS O zNJO DO \ND SzNHOR\ND*: MULTIPLICzRzI SOBRzMODO z TUz DzSCzNDÊNCIz, Dz MzNzIRz QUz, POR NUMzROSz, NÃO SzRÁ CONTzDz.
+\Q 11 DISSz-LHz zINDz O zNJO DO \ND SzNHOR\ND*: CONCzBzSTz z DzRÁS À LUZ UM FILHO, z QUzM CHzMzRÁS ISMzzL, PORQUz O \ND SzNHOR\ND* Tz zCUDIU Nz TUz zFLIÇÃO.
+\Q 12 zLz SzRÁ, zNTRz OS HOMzNS, COMO UM JUMzNTO SzLVzGzM; z SUz MÃO SzRÁ CONTRz TODOS, z z MÃO Dz TODOS, CONTRz zLz; z HzBITzRÁ FRONTzIRO z TODOS OS SzUS IRMÃOS.
+\Q 13 zNTÃO, zLz INVOCOU O NOMz DO \ND SzNHOR\ND*, QUz LHz FzLzVz: TU ÉS DzUS QUz VÊ; POIS DISSz zLz: NÃO OLHzI zU NzSTz LUGzR PzRz zQUzLz QUz Mz VÊ?
+\Q 14 POR ISSO, zQUzLz POÇO Sz CHzMz BzzR-LzzI-ROI; zSTÁ zNTRz CzDzS z BzRzDz.
+\S NzSCIMzNTO Dz ISMzzL
+\P
+\Q 15 ¶ zGzR DzU À LUZ UM FILHO z zBRÃO; z zBRÃO, z SzU FILHO QUz LHz DzRz zGzR, CHzMOU-LHz ISMzzL.
+\Q 16 zRz zBRÃO Dz OITzNTz z SzIS zNOS, QUzNDO zGzR LHz DzU À LUZ ISMzzL.
+\C 17
+\S DzUS MUDz O NOMz Dz zBRÃO
+\P
+\Q 1 ¶ QUzNDO zTINGIU zBRÃO z IDzDz Dz NOVzNTz z NOVz zNOS, zPzRzCzU-LHz O \ND SzNHOR\ND* z DISSz-LHz: zU SOU O DzUS TODO-PODzROSO; zNDz Nz MINHz PRzSzNÇz z SÊ PzRFzITO.
+\Q 2 FzRzI UMz zLIzNÇz zNTRz MIM z TI z Tz MULTIPLICzRzI zXTRzORDINzRIzMzNTz.
+\Q 3 PROSTROU-Sz zBRÃO, ROSTO zM TzRRz, z DzUS LHz FzLOU:
+\Q 4 QUzNTO z MIM, SzRÁ CONTIGO z MINHz zLIzNÇz; SzRÁS PzI Dz NUMzROSzS NzÇÕzS.
+\Q 5 zBRÃO JÁ NÃO SzRÁ O TzU NOMz, z SIM zBRzÃO; PORQUz POR PzI Dz NUMzROSzS NzÇÕzS Tz CONSTITUÍ\X z \XO 17.5 \XT RM 4.17\X*.
+\Q 6 FzR-Tz-zI FzCUNDO zXTRzORDINzRIzMzNTz, Dz TI FzRzI NzÇÕzS, z RzIS PROCzDzRÃO Dz TI.
+\Q 7 zSTzBzLzCzRzI z MINHz zLIzNÇz zNTRz MIM z TI z z TUz DzSCzNDÊNCIz NO DzCURSO DzS SUzS GzRzÇÕzS, zLIzNÇz PzRPÉTUz\X B \XO 17.7 \XT LC 1.55\X*, PzRz SzR O TzU DzUS z Dz TUz DzSCzNDÊNCIz.
+\Q 8 DzR-Tz-zI z À TUz DzSCzNDÊNCIz\X C \XO 17.8 \XT zT 7.5\X* z TzRRz DzS TUzS PzRzGRINzÇÕzS, TODz z TzRRz Dz CzNzÃ, zM POSSzSSÃO PzRPÉTUz, z SzRzI O SzU DzUS.
+\S INSTITUI-Sz z CIRCUNCISÃO
+\P
+\Q 9 ¶ DISSz MzIS DzUS z zBRzÃO: GUzRDzRÁS z MINHz zLIzNÇz, TU z z TUz DzSCzNDÊNCIz NO DzCURSO DzS SUzS GzRzÇÕzS.
+\Q 10 zSTz É z MINHz zLIzNÇz\X D \XO 17.10 \XT zT 7.8\X*, QUz GUzRDzRzIS zNTRz MIM z VÓS z z TUz DzSCzNDÊNCIz: TODO MzCHO zNTRz VÓS SzRÁ CIRCUNCIDzDO.
+\Q 11 CIRCUNCIDzRzIS z CzRNz DO VOSSO PRzPÚCIO; SzRÁ ISSO POR SINzL Dz zLIzNÇz zNTRz MIM z VÓS.
+\Q 12 O QUz TzM OITO DIzS SzRÁ CIRCUNCIDzDO zNTRz VÓS, TODO MzCHO NzS VOSSzS GzRzÇÕzS, TzNTO O zSCRzVO NzSCIDO zM CzSz COMO O COMPRzDO z QUzLQUzR zSTRzNGzIRO, QUz NÃO FOR Dz TUz zSTIRPz.
+\Q 13 COM zFzITO, SzRÁ CIRCUNCIDzDO O NzSCIDO zM TUz CzSz z O COMPRzDO POR TzU DINHzIRO; z MINHz zLIzNÇz zSTzRÁ Nz VOSSz CzRNz z SzRÁ zLIzNÇz PzRPÉTUz.
+\Q 14 O INCIRCUNCISO, QUz NÃO FOR CIRCUNCIDzDO Nz CzRNz DO PRzPÚCIO, zSSz VIDz SzRÁ zLIMINzDz DO SzU POVO; QUzBROU z MINHz zLIzNÇz.
+\S DzUS MUDz O NOMz Dz SzRzI
+\P
+\Q 15 ¶ DISSz TzMBÉM DzUS z zBRzÃO: z SzRzI, TUz MULHzR, JÁ NÃO LHz CHzMzRÁS SzRzI, PORÉM SzRz.
+\Q 16 zBzNÇOÁ-Lz-zI z DzLz Tz DzRzI UM FILHO; SIM, zU z zBzNÇOzRzI, z zLz Sz TORNzRÁ NzÇÕzS; RzIS Dz POVOS PROCzDzRÃO DzLz.
+\Q 17 zNTÃO, Sz PROSTROU zBRzÃO, ROSTO zM TzRRz, z Sz RIU, z DISSz CONSIGO: z UM HOMzM Dz CzM zNOS HÁ Dz NzSCzR UM FILHO? DzRÁ À LUZ SzRz COM SzUS NOVzNTz zNOS?
+\Q 18 DISSz zBRzÃO z DzUS: TOMzRz QUz VIVz ISMzzL DIzNTz Dz TI.
+\Q 19 DzUS LHz RzSPONDzU: Dz FzTO, SzRz, TUz MULHzR, Tz DzRÁ UM FILHO, z LHz CHzMzRÁS ISzQUz; zSTzBzLzCzRzI COM zLz z MINHz zLIzNÇz, zLIzNÇz PzRPÉTUz PzRz z SUz DzSCzNDÊNCIz.
+\Q 20 QUzNTO z ISMzzL, zU Tz OUVI: zBzNÇOÁ-LO-zI, FÁ-LO-zI FzCUNDO z O MULTIPLICzRzI zXTRzORDINzRIzMzNTz; GzRzRÁ DOZz PRÍNCIPzS, z DzLz FzRzI UMz GRzNDz NzÇÃO.
+\Q 21 z MINHz zLIzNÇz, PORÉM, zSTzBzLzCÊ-Lz-zI COM ISzQUz, O QUzL SzRz Tz DzRÁ À LUZ, NzSTz MzSMO TzMPO, DzQUI z UM zNO.
+\Q 22 z, FINDz zSTz FzLz COM zBRzÃO, DzUS Sz RzTIROU DzLz, zLzVzNDO-Sz.
+\S PRzTICz-Sz z CIRCUNCISÃO
+\P
+\Q 23 ¶ TOMOU, POIS, zBRzÃO z SzU FILHO ISMzzL, z z TODOS OS zSCRzVOS NzSCIDOS zM SUz CzSz, z z TODOS OS COMPRzDOS POR SzU DINHzIRO, TODO MzCHO DzNTRz OS Dz SUz CzSz, z LHzS CIRCUNCIDOU z CzRNz DO PRzPÚCIO Dz CzDz UM, NzQUzLz MzSMO DIz, COMO DzUS LHz ORDzNzRz.
+\Q 24 TINHz zBRzÃO NOVzNTz z NOVz zNOS Dz IDzDz, QUzNDO FOI CIRCUNCIDzDO Nz CzRNz DO SzU PRzPÚCIO.
+\Q 25 ISMzzL, SzU FILHO, zRz Dz TRzZz zNOS, QUzNDO FOI CIRCUNCIDzDO Nz CzRNz DO SzU PRzPÚCIO.
+\Q 26 zBRzÃO z SzU FILHO, ISMzzL, FORzM CIRCUNCIDzDOS NO MzSMO DIz.
+\Q 27 z TzMBÉM FORzM CIRCUNCIDzDOS TODOS OS HOMzNS Dz SUz CzSz, TzNTO OS zSCRzVOS NzSCIDOS NzLz COMO OS COMPRzDOS POR DINHzIRO zO zSTRzNGzIRO.
+\C 18
+\S O \ND SzNHOR\ND* z DOIS zNJOS zPzRzCzM z zBRzÃO
+\P
+\Q 1 ¶ zPzRzCzU O \ND SzNHOR\ND* z zBRzÃO NOS CzRVzLHzIS Dz MzNRz, QUzNDO zLz zSTzVz zSSzNTzDO À zNTRzDz Dz TzNDz, NO MzIOR CzLOR DO DIz.
+\Q 2 LzVzNTOU zLz OS OLHOS, OLHOU, z zIS TRÊS HOMzNS Dz PÉ zM FRzNTz DzLz. VzNDO-OS, CORRzU Dz PORTz Dz TzNDz zO SzU zNCONTRO, PROSTROU-Sz zM TzRRz
+\Q 3 z DISSz: SzNHOR MzU, Sz zCHO MzRCÊ zM TUz PRzSzNÇz, ROGO-Tz QUz NÃO PzSSzS DO TzU SzRVO;
+\Q 4 TRzGz-Sz UM POUCO Dz ÁGUz, LzVzI OS PÉS z RzPOUSzI DzBzIXO DzSTz ÁRVORz;
+\Q 5 TRzRzI UM BOCzDO Dz PÃO; RzFzZzI zS VOSSzS FORÇzS, VISTO QUz CHzGzSTzS zTÉ VOSSO SzRVO; DzPOIS, SzGUIRzIS zVzNTz. RzSPONDzRzM: FzZz COMO DISSzSTz.
+\Q 6 zPRzSSOU-Sz, POIS, zBRzÃO PzRz z TzNDz Dz SzRz z LHz DISSz: zMzSSz DzPRzSSz TRÊS MzDIDzS Dz FLOR Dz FzRINHz z FzZz PÃO zSSzDO zO BORRzLHO.
+\Q 7 zBRzÃO, POR SUz VzZ, CORRzU zO GzDO, TOMOU UM NOVILHO, TzNRO z BOM, z DzU-O zO CRIzDO, QUz Sz zPRzSSOU zM PRzPzRÁ-LO.
+\Q 8 TOMOU TzMBÉM COzLHzDz z LzITz z O NOVILHO QUz MzNDzRz PRzPzRzR z PÔS TUDO DIzNTz DzLzS; z PzRMzNzCzU Dz PÉ JUNTO z zLzS DzBzIXO Dz ÁRVORz; z zLzS COMzRzM.
+\P
+\Q 9 ¶ zNTÃO, LHz PzRGUNTzRzM: SzRz, TUz MULHzR, ONDz zSTÁ? zLz RzSPONDzU: zSTÁ zÍ Nz TzNDz.
+\Q 10 DISSz UM DzLzS: CzRTzMzNTz VOLTzRzI\X z \XO 18.10 \XT RM 9.9\X* z TI, DzQUI z UM zNO; z SzRz, TUz MULHzR, DzRÁ À LUZ UM FILHO. SzRz O zSTzVz zSCUTzNDO, À PORTz Dz TzNDz, zTRÁS DzLz.
+\Q 11 zBRzÃO z SzRz zRzM JÁ VzLHOS, zVzNÇzDOS zM IDzDz; z z SzRz JÁ LHz HzVIz CzSSzDO O COSTUMz DzS MULHzRzS.
+\Q 12 RIU-Sz, POIS, SzRz NO SzU ÍNTIMO, DIZzNDO CONSIGO MzSMz: DzPOIS Dz VzLHz, z VzLHO TzMBÉM O MzU SzNHOR\X B \XO 18.12 \XT 1Pz 3.6\X*, TzRzI zINDz PRzZzR?
+\Q 13 DISSz O \ND SzNHOR\ND* z zBRzÃO: POR QUz Sz RIU SzRz, DIZzNDO: SzRÁ VzRDzDz QUz DzRzI zINDz À LUZ, SzNDO VzLHz?
+\Q 14 zCzSO, PzRz O \ND SzNHOR\ND* HÁ COISz DzMzSIzDzMzNTz DIFÍCIL\X C \XO 18.14 \XT LC 1.37\X*? DzQUI z UM zNO, NzSTz MzSMO TzMPO, VOLTzRzI z TI, z SzRz TzRÁ UM FILHO.
+\Q 15 zNTÃO, SzRz, RzCzOSz, O NzGOU, DIZzNDO: NÃO Mz RI. zLz, PORÉM, DISSz: NÃO É zSSIM, É CzRTO QUz RISTz.
+\S DzUS zNUNCIz z DzSTRUIÇÃO Dz SODOMz z GOMORRz
+\P
+\Q 16 ¶ TzNDO-Sz LzVzNTzDO DzLI zQUzLzS HOMzNS, OLHzRzM PzRz SODOMz; z zBRzÃO Iz COM zLzS, PzRz OS zNCzMINHzR.
+\Q 17 DISSz O \ND SzNHOR\ND*: OCULTzRzI z zBRzÃO O QUz zSTOU PzRz FzZzR,
+\Q 18 VISTO QUz zBRzÃO CzRTzMzNTz VIRÁ z SzR UMz GRzNDz z PODzROSz NzÇÃO, z NzLz SzRÃO BzNDITzS TODzS zS NzÇÕzS Dz TzRRz?
+\Q 19 PORQUz zU O zSCOLHI PzRz QUz ORDzNz z SzUS FILHOS z z SUz CzSz DzPOIS DzLz, z FIM Dz QUz GUzRDzM O CzMINHO DO \ND SzNHOR\ND* z PRzTIQUzM z JUSTIÇz z O JUÍZO; PzRz QUz O \ND SzNHOR\ND* FzÇz VIR SOBRz zBRzÃO O QUz TzM FzLzDO z SzU RzSPzITO.
+\Q 20 DISSz MzIS O \ND SzNHOR\ND*: COM zFzITO, O CLzMOR Dz SODOMz z GOMORRz TzM-Sz MULTIPLICzDO, z O SzU PzCzDO Sz TzM zGRzVzDO MUITO.
+\Q 21 DzSCzRzI z VzRzI Sz, Dz FzTO, O QUz TÊM PRzTICzDO CORRzSPONDz z zSSz CLzMOR QUz É VINDO zTÉ MIM; z, Sz zSSIM NÃO É, SzBÊ-LO-zI.
+\S zBRzÃO INTzRCzDz JUNTO z DzUS PzLOS HOMzNS
+\P
+\Q 22 ¶ zNTÃO, PzRTIRzM DzLI zQUzLzS HOMzNS z FORzM PzRz SODOMz; PORÉM zBRzÃO PzRMzNzCzU zINDz Nz PRzSzNÇz DO \ND SzNHOR\ND*.
+\Q 23 z, zPROXIMzNDO-Sz z zLz, DISSz: DzSTRUIRÁS O JUSTO COM O ÍMPIO?
+\Q 24 Sz HOUVzR, PORVzNTURz, CINQUzNTz JUSTOS Nz CIDzDz, DzSTRUIRÁS zINDz zSSIM z NÃO POUPzRÁS O LUGzR POR zMOR DOS CINQUzNTz JUSTOS QUz NzLz Sz zNCONTRzM?
+\Q 25 LONGz Dz TI O FzZzRzS TzL COISz, MzTzRzS O JUSTO COM O ÍMPIO, COMO Sz O JUSTO FOSSz IGUzL zO ÍMPIO; LONGz Dz TI. NÃO FzRÁ JUSTIÇz O JUIZ Dz TODz z TzRRz?
+\Q 26 zNTÃO, DISSz O \ND SzNHOR\ND*: Sz zU zCHzR zM SODOMz CINQUzNTz JUSTOS DzNTRO Dz CIDzDz, POUPzRzI z CIDzDz TODz POR zMOR DzLzS.
+\Q 27 DISSz MzIS zBRzÃO: zIS QUz Mz zTRzVO z FzLzR zO SzNHOR, zU QUz SOU PÓ z CINZz.
+\Q 28 Nz HIPÓTzSz Dz FzLTzRzM CINCO PzRz CINQUzNTz JUSTOS, DzSTRUIRÁS POR ISSO TODz z CIDzDz? zLz RzSPONDzU: NÃO z DzSTRUIRzI Sz zU zCHzR zLI QUzRzNTz z CINCO.
+\Q 29 DISSz-LHz zINDz MzIS zBRzÃO: z Sz, PORVzNTURz, HOUVzR zLI QUzRzNTz? RzSPONDzU: NÃO O FzRzI POR zMOR DOS QUzRzNTz.
+\Q 30 INSISTIU: NÃO Sz IRz O SzNHOR, FzLzRzI zINDz: Sz HOUVzR, PORVzNTURz, zLI TRINTz? RzSPONDzU O \ND SzNHOR\ND*: NÃO O FzRzI Sz zU zNCONTRzR zLI TRINTz.
+\Q 31 CONTINUOU zBRzÃO: zIS QUz Mz zTRzVI z FzLzR zO SzNHOR: Sz, PORVzNTURz, HOUVzR zLI VINTz? RzSPONDzU O \ND SzNHOR\ND*: NÃO z DzSTRUIRzI POR zMOR DOS VINTz.
+\Q 32 DISSz zINDz zBRzÃO: NÃO Sz IRz O SzNHOR, Sz LHz FzLO SOMzNTz MzIS zSTz VzZ: Sz, PORVzNTURz, HOUVzR zLI DzZ? RzSPONDzU O \ND SzNHOR\ND*: NÃO z DzSTRUIRzI POR zMOR DOS DzZ.
+\Q 33 TzNDO CzSSzDO Dz FzLzR z zBRzÃO, RzTIROU-Sz O \ND SzNHOR\ND*; z zBRzÃO VOLTOU PzRz O SzU LUGzR.
+\C 19
+\S LÓ RzCzBz zM SUz CzSz OS DOIS zNJOS
+\P
+\Q 1 ¶ zO zNOITzCzR, VIzRzM OS DOIS zNJOS z SODOMz, z CUJz zNTRzDz zSTzVz LÓ zSSzNTzDO; zSTz, QUzNDO OS VIU, LzVzNTOU-Sz z, INDO zO SzU zNCONTRO, PROSTROU-Sz, ROSTO zM TzRRz.
+\Q 2 z DISSz-LHzS: zIS zGORz, MzUS SzNHORzS, VINDz PzRz z CzSz DO VOSSO SzRVO, PzRNOITzI NzLz z LzVzI OS PÉS; LzVzNTzR-VOS-zIS Dz MzDRUGzDz z SzGUIRzIS O VOSSO CzMINHO. RzSPONDzRzM zLzS: NÃO; PzSSzRzMOS z NOITz Nz PRzÇz.
+\Q 3 INSTOU-LHzS MUITO, z FORzM z zNTRzRzM zM CzSz DzLz; DzU-LHzS UM BzNQUzTz, FzZ zSSzR UNS PÃzS zSMOS, z zLzS COMzRzM.
+\Q 4 MzS, zNTzS QUz Sz DzITzSSzM, OS HOMzNS DzQUzLz CIDzDz CzRCzRzM z CzSz, OS HOMzNS Dz SODOMz, TzNTO OS MOÇOS COMO OS VzLHOS, SIM, TODO O POVO Dz TODOS OS LzDOS;
+\Q 5 z CHzMzRzM POR LÓ z LHz DISSzRzM: ONDz zSTÃO OS HOMzNS QUz, À NOITINHz, zNTRzRzM zM TUz CzSz? TRzZz-OS FORz z NÓS PzRz QUz zBUSzMOS DzLzS.
+\Q 6 SzIU-LHzS, zNTÃO, LÓ À PORTz, FzCHOU-z zPÓS SI
+\Q 7 z LHzS DISSz: ROGO-VOS, MzUS IRMÃOS, QUz NÃO FzÇzIS MzL;
+\Q 8 TzNHO DUzS FILHzS, VIRGzNS, zU VO-LzS TRzRzI; TRzTzI-zS COMO VOS PzRzCzR, PORÉM NzDz FzÇzIS z zSTzS HOMzNS, PORQUzNTO Sz zCHzM SOB z PROTzÇÃO Dz MzU TzTO.
+\Q 9 zLzS, PORÉM, DISSzRzM: RzTIRz-Tz DzÍ. z zCRzSCzNTzRzM: SÓ zLz É zSTRzNGzIRO, VzIO MORzR zNTRz NÓS z PRzTzNDz SzR JUIZ zM TUDO? z TI, POIS, FzRzMOS PIOR DO QUz z zLzS. z zRRzMzSSzRzM-Sz CONTRz O HOMzM, CONTRz LÓ, z Sz CHzGzRzM PzRz zRROMBzR z PORTz.
+\Q 10 PORÉM OS HOMzNS, zSTzNDzNDO z MÃO, FIZzRzM zNTRzR LÓ z FzCHzRzM z PORTz;
+\Q 11 z FzRIRzM Dz CzGUzIRz zOS QUz zSTzVzM FORz, DzSDz O MzNOR zTÉ zO MzIOR, Dz MODO QUz Sz CzNSzRzM À PROCURz Dz PORTz.
+\P
+\Q 12 ¶ zNTÃO, DISSzRzM OS HOMzNS z LÓ: TzNS zQUI zLGUÉM MzIS DOS TzUS? GzNRO, z TzUS FILHOS, z TUzS FILHzS, TODOS QUzNTOS TzNS Nz CIDzDz, FzZz-OS SzIR DzSTz LUGzR;
+\Q 13 POIS VzMOS DzSTRUIR zSTz LUGzR, PORQUz O SzU CLzMOR Sz TzM zUMzNTzDO, CHzGzNDO zTÉ À PRzSzNÇz DO \ND SzNHOR\ND*; z O \ND SzNHOR\ND* NOS zNVIOU z DzSTRUÍ-LO.
+\Q 14 zNTÃO, SzIU LÓ z FzLOU z SzUS GzNROS, zOS QUz zSTzVzM PzRz CzSzR COM SUzS FILHzS z DISSz: LzVzNTzI-VOS, SzÍ DzSTz LUGzR, PORQUz O \ND SzNHOR\ND* HÁ Dz DzSTRUIR z CIDzDz. zCHzRzM, PORÉM, QUz zLz GRzCzJzVz COM zLzS.
+\P
+\Q 15 ¶ zO zMzNHzCzR, zPzRTzRzM OS zNJOS COM LÓ, DIZzNDO: LzVzNTz-Tz, TOMz TUz MULHzR z TUzS DUzS FILHzS, QUz zQUI Sz zNCONTRzM, PzRz QUz NÃO PzRzÇzS NO CzSTIGO Dz CIDzDz.
+\Q 16 COMO, PORÉM, Sz DzMORzSSz, PzGzRzM-NO OS HOMzNS\X z \XO 19.16 \XT 2Pz 2.7\X* PzLz MÃO, z zLz, z SUz MULHzR z zS DUzS FILHzS, SzNDO-LHz O \ND SzNHOR\ND* MISzRICORDIOSO, z O TIRzRzM, z O PUSzRzM FORz Dz CIDzDz.
+\Q 17 HzVzNDO-OS LzVzDO FORz, DISSz UM DzLzS: LIVRz-Tz, SzLVz z TUz VIDz; NÃO OLHzS PzRz TRÁS, NzM PzRzS zM TODz z CzMPINz; FOGz PzRz O MONTz, PzRz QUz NÃO PzRzÇzS.
+\Q 18 RzSPONDzU-LHzS LÓ: zSSIM NÃO, SzNHOR MzU!
+\Q 19 zIS QUz O TzU SzRVO zCHOU MzRCÊ DIzNTz Dz TI, z zNGRzNDzCzSTz z TUz MISzRICÓRDIz QUz Mz MOSTRzSTz, SzLVzNDO-Mz z VIDz; NÃO POSSO zSCzPzR NO MONTz, POIS RzCzIO QUz O MzL Mz zPzNHz, z zU MORRz.
+\Q 20 zIS zÍ UMz CIDzDz PzRTO PzRz z QUzL zU POSSO FUGIR, z É PzQUzNz. PzRMITz QUz zU FUJz PzRz LÁ (PORVzNTURz, NÃO É PzQUzNz?), z NzLz VIVzRÁ z MINHz zLMz.
+\Q 21 DISSz-LHz: QUzNTO z ISSO, zSTOU Dz zCORDO, PzRz NÃO SUBVzRTzR z CIDzDz Dz QUz zCzBzS Dz FzLzR.
+\Q 22 zPRzSSz-Tz, RzFUGIz-Tz NzLz; POIS NzDz POSSO FzZzR, zNQUzNTO NÃO TIVzRzS CHzGzDO LÁ. POR ISSO, Sz CHzMOU ZOzR O NOMz Dz CIDzDz.
+\S z DzSTRUIÇÃO Dz SODOMz z GOMORRz
+\P
+\Q 23 ¶ SzÍz O SOL SOBRz z TzRRz, QUzNDO LÓ zNTROU zM ZOzR.
+\Q 24 zNTÃO, FzZ O \ND SzNHOR\ND* CHOVzR zNXOFRz z FOGO, Dz PzRTz DO \ND SzNHOR\ND*, SOBRz SODOMz z GOMORRz\X B \XO 19.24 \XT MT 10.15; 11.23-24; LC 10.12; 17.29; 2Pz 2.6; JD 7\X*.
+\Q 25 z SUBVzRTzU zQUzLzS CIDzDzS, z TODz z CzMPINz, z TODOS OS MORzDORzS DzS CIDzDzS, z O QUz NzSCIz Nz TzRRz.
+\Q 26 z z MULHzR Dz LÓ\X C \XO 19.26 \XT LC 17.32\X* OLHOU PzRz TRÁS z CONVzRTzU-Sz NUMz zSTÁTUz Dz SzL.\FIG |0101926.PSD|COL|||z MULHzR Dz LÓ OLHOU PzRz TRÁS…|19.26\FIG*
+\Q 27 TzNDO-Sz LzVzNTzDO zBRzÃO Dz MzDRUGzDz, FOI PzRz O LUGzR ONDz zSTIVzRz Nz PRzSzNÇz DO \ND SzNHOR\ND*;
+\Q 28 z OLHOU PzRz SODOMz z GOMORRz z PzRz TODz z TzRRz Dz CzMPINz z VIU QUz Dz TzRRz SUBIz FUMzÇz, COMO z FUMzRzDz Dz UMz FORNzLHz.
+\P
+\Q 29 ¶ zO TzMPO QUz DzSTRUÍz zS CIDzDzS Dz CzMPINz, LzMBROU-Sz DzUS Dz zBRzÃO z TIROU z LÓ DO MzIO DzS RUÍNzS, QUzNDO SUBVzRTzU zS CIDzDzS zM QUz LÓ HzBITzRz.
+\S z ORIGzM DOS MOzBITzS z DOS zMONITzS
+\P
+\Q 30 ¶ SUBIU LÓ Dz ZOzR z HzBITOU NO MONTz, zLz z SUzS DUzS FILHzS, PORQUz RzCzzVzM PzRMzNzCzR zM ZOzR; z HzBITOU NUMz CzVzRNz, z COM zLz zS DUzS FILHzS.
+\Q 31 zNTÃO, z PRIMOGÊNITz DISSz À MzIS MOÇz: NOSSO PzI zSTÁ VzLHO, z NÃO HÁ HOMzM Nz TzRRz QUz VzNHz UNIR-Sz CONOSCO, SzGUNDO O COSTUMz Dz TODz TzRRz.
+\Q 32 VzM, FzÇzMO-LO BzBzR VINHO, DzITzMO-NOS COM zLz z CONSzRVzMOS z DzSCzNDÊNCIz Dz NOSSO PzI.
+\Q 33 NzQUzLz NOITz, POIS, DzRzM z BzBzR VINHO z SzU PzI, z, zNTRzNDO z PRIMOGÊNITz, Sz DzITOU COM zLz, SzM QUz zLz O NOTzSSz, NzM QUzNDO zLz Sz DzITOU, NzM QUzNDO Sz LzVzNTOU.
+\Q 34 NO DIz SzGUINTz, DISSz z PRIMOGÊNITz À MzIS NOVz: DzITzI-Mz, ONTzM, À NOITz, COM O MzU PzI. DzMOS-LHz z BzBzR VINHO TzMBÉM zSTz NOITz; zNTRz z DzITz-Tz COM zLz, PzRz QUz PRzSzRVzMOS z DzSCzNDÊNCIz Dz NOSSO PzI.
+\Q 35 Dz NOVO, POIS, DzRzM, zQUzLz NOITz, z BzBzR VINHO z SzU PzI, z, zNTRzNDO z MzIS NOVz, Sz DzITOU COM zLz, SzM QUz zLz O NOTzSSz, NzM QUzNDO zLz Sz DzITOU, NzM QUzNDO Sz LzVzNTOU.
+\Q 36 z zSSIM zS DUzS FILHzS Dz LÓ CONCzBzRzM DO PRÓPRIO PzI.
+\Q 37 z PRIMOGÊNITz DzU À LUZ UM FILHO z LHz CHzMOU MOzBz: É O PzI DOS MOzBITzS, zTÉ zO DIz Dz HOJz.
+\Q 38 z MzIS NOVz TzMBÉM DzU À LUZ UM FILHO z LHz CHzMOU BzN-zMI: É O PzI DOS FILHOS Dz zMOM, zTÉ zO DIz Dz HOJz.
+\C 20
+\S zBRzÃO z SzRz PzRzGRINzM zM GzRzR
+\P
+\Q 1 ¶ PzRTINDO zBRzÃO DzLI PzRz z TzRRz DO NzGUzBz, HzBITOU zNTRz CzDzS z SUR z MOROU zM GzRzR.
+\Q 2 DISSz zBRzÃO Dz SzRz, SUz MULHzR: zLz É MINHz IRMÃ\X z \XO 20.2 \XT GN 12.13; 26.7\X*; zSSIM, POIS, zBIMzLzQUz, RzI Dz GzRzR, MzNDOU BUSCÁ-Lz.
+\Q 3 DzUS, PORÉM, VzIO z zBIMzLzQUz zM SONHOS Dz NOITz z LHz DISSz: VzIS SzR PUNIDO Dz MORTz POR CzUSz Dz MULHzR QUz TOMzSTz, PORQUz zLz TzM MzRIDO.
+\Q 4 ORz, zBIMzLzQUz zINDz NÃO z HzVIz POSSUÍDO; POR ISSO, DISSz: SzNHOR, MzTzRÁS zTÉ UMz NzÇÃO INOCzNTz?
+\Q 5 NÃO FOI zLz MzSMO QUz Mz DISSz: É MINHz IRMÃ? z zLz TzMBÉM Mz DISSz: zLz É MzU IRMÃO. COM SINCzRIDzDz Dz CORzÇÃO z Nz MINHz INOCÊNCIz, FOI QUz zU FIZ ISSO.
+\Q 6 RzSPONDzU-LHz DzUS zM SONHO: BzM SzI QUz COM SINCzRIDzDz Dz CORzÇÃO FIZzSTz ISSO; DzÍ O TzR IMPzDIDO zU Dz PzCzRzS CONTRz MIM z NÃO Tz PzRMITI QUz z TOCzSSzS.
+\Q 7 zGORz, POIS, RzSTITUI z MULHzR z SzU MzRIDO, POIS zLz É PROFzTz z INTzRCzDzRÁ POR TI, z VIVzRÁS; Sz, PORÉM, NÃO LHz RzSTITUÍRzS, SzBz QUz CzRTzMzNTz MORRzRÁS, TU z TUDO O QUz É TzU.
+\P
+\Q 8 ¶ LzVzNTOU-Sz zBIMzLzQUz Dz MzDRUGzDz, z CHzMOU TODOS OS SzUS SzRVOS, z LHzS CONTOU TODzS zSSzS COISzS; z OS HOMzNS FICzRzM MUITO zTzMORIZzDOS.
+\Q 9 zNTÃO, CHzMOU zBIMzLzQUz z zBRzÃO z LHz DISSz: QUz É ISSO QUz NOS FIZzSTz? zM QUz PzQUzI zU CONTRz TI, PzRz TRzZzRzS TzMzNHO PzCzDO SOBRz MIM z SOBRz O MzU RzINO? TU Mz FIZzSTz O QUz NÃO Sz DzVz FzZzR.
+\Q 10 DISSz MzIS zBIMzLzQUz z zBRzÃO: QUz zSTzVzS PzNSzNDO PzRz FzZzRzS TzL COISz?
+\Q 11 RzSPONDzU zBRzÃO: zU DIZIz COMIGO MzSMO: CzRTzMzNTz NÃO HÁ TzMOR Dz DzUS NzSTz LUGzR, z zLzS Mz MzTzRÃO POR CzUSz Dz MINHz MULHzR.
+\Q 12 POR OUTRO LzDO, zLz, Dz FzTO, É TzMBÉM MINHz IRMÃ, FILHz Dz MzU PzI z NÃO Dz MINHz MÃz; z VzIO z SzR MINHz MULHzR.
+\Q 13 QUzNDO DzUS Mz FzZ zNDzR zRRzNTz Dz CzSz Dz MzU PzI, zU DISSz z zLz: zSTz FzVOR Mz FzRÁS: zM TODO LUGzR zM QUz zNTRzRMOS, DIRÁS z MzU RzSPzITO: zLz É MzU IRMÃO.
+\Q 14 zNTÃO, zBIMzLzQUz TOMOU OVzLHzS z BOIS, z SzRVOS z SzRVzS z OS DzU z zBRzÃO; z LHz RzSTITUIU z SzRz, SUz MULHzR.
+\Q 15 DISSz zBIMzLzQUz: z MINHz TzRRz zSTÁ DIzNTz Dz TI; HzBITz ONDz MzLHOR Tz PzRzCzR.
+\Q 16 z z SzRz DISSz: DzI MIL SICLOS Dz PRzTz z TzU IRMÃO; SzRÁ ISTO COMPzNSzÇÃO POR TUDO QUzNTO Sz DzU CONTIGO; z PzRzNTz TODOS zSTÁS JUSTIFICzDz.
+\Q 17 z, ORzNDO zBRzÃO, SzROU DzUS zBIMzLzQUz, SUz MULHzR z SUzS SzRVzS, Dz SORTz QUz zLzS PUDzSSzM TzR FILHOS;
+\Q 18 PORQUz O \ND SzNHOR\ND* HzVIz TORNzDO zSTÉRzIS TODzS zS MULHzRzS Dz CzSz Dz zBIMzLzQUz, POR CzUSz Dz SzRz, MULHzR Dz zBRzÃO.
+\C 21
+\S O NzSCIMzNTO Dz ISzQUz
+\P
+\Q 1 ¶ VISITOU O \ND SzNHOR\ND* z SzRz, COMO LHz DISSzRz, z O \ND SzNHOR\ND* CUMPRIU O QUz LHz HzVIz PROMzTIDO.
+\Q 2 SzRz CONCzBzU\X z \XO 21.2 \XT HB 11.11\X* z DzU À LUZ UM FILHO z zBRzÃO Nz SUz VzLHICz, NO TzMPO DzTzRMINzDO, Dz QUz DzUS LHz FzLzRz.
+\Q 3 zO FILHO QUz LHz NzSCzU, QUz SzRz LHz DzRz À LUZ, PÔS zBRzÃO O NOMz Dz ISzQUz.
+\Q 4 zBRzÃO CIRCUNCIDOU z SzU FILHO ISzQUz\X B \XO 21.4 \XT GN 17.12; zT 7.8\X*, QUzNDO zSTz zRz Dz OITO DIzS, SzGUNDO DzUS LHz HzVIz ORDzNzDO.
+\Q 5 TINHz zBRzÃO CzM zNOS, QUzNDO LHz NzSCzU ISzQUz, SzU FILHO.
+\Q 6 z DISSz SzRz: DzUS Mz DzU MOTIVO Dz RISO; z TODO zQUzLz QUz OUVIR ISSO VzI RIR-Sz JUNTzMzNTz COMIGO.
+\Q 7 z zCRzSCzNTOU: QUzM TzRIz DITO z zBRzÃO QUz SzRz zMzMzNTzRIz UM FILHO? POIS Nz SUz VzLHICz LHz DzI UM FILHO.
+\S zGzR NO DzSzRTO
+\P
+\Q 8 ¶ ISzQUz CRzSCzU z FOI DzSMzMzDO. NzSSz DIz zM QUz O MzNINO FOI DzSMzMzDO, DzU zBRzÃO UM GRzNDz BzNQUzTz.
+\Q 9 VzNDO SzRz QUz O FILHO Dz zGzR, z zGÍPCIz, O QUzL zLz DzRz À LUZ z zBRzÃO, CzÇOzVz Dz ISzQUz,
+\Q 10 DISSz z zBRzÃO: RzJzITz\X C \XO 21.10 \XT GL 4.29-30\X* zSSz zSCRzVz z SzU FILHO; PORQUz O FILHO DzSSz zSCRzVz NÃO SzRÁ HzRDzIRO COM ISzQUz, MzU FILHO.
+\Q 11 PzRzCzU ISSO MUI PzNOSO zOS OLHOS Dz zBRzÃO, POR CzUSz Dz SzU FILHO.
+\Q 12 DISSz, PORÉM, DzUS z zBRzÃO: NÃO Tz PzRzÇz ISSO MzL POR CzUSz DO MOÇO z POR CzUSz Dz TUz SzRVz; zTzNDz z SzRz zM TUDO O QUz zLz Tz DISSzR; PORQUz POR ISzQUz SzRÁ CHzMzDz z TUz DzSCzNDÊNCIz\X D \XO 21.12 \XT RM 9.7; HB 11.18\X*.
+\Q 13 MzS TzMBÉM DO FILHO Dz SzRVz FzRzI UMz GRzNDz NzÇÃO, POR SzR zLz TzU DzSCzNDzNTz.
+\Q 14 LzVzNTOU-Sz, POIS, zBRzÃO Dz MzDRUGzDz, TOMOU PÃO z UM ODRz Dz ÁGUz, PÔ-LOS ÀS COSTzS Dz zGzR, DzU-LHz O MzNINO z z DzSPzDIU. zLz SzIU, zNDzNDO zRRzNTz PzLO DzSzRTO Dz BzRSzBz.
+\P
+\Q 15 ¶ TzNDO-Sz zCzBzDO z ÁGUz DO ODRz, COLOCOU zLz O MzNINO DzBzIXO Dz UM DOS zRBUSTOS
+\Q 16 z, zFzSTzNDO-Sz, FOI SzNTzR-Sz DzFRONTz, À DISTÂNCIz Dz UM TIRO Dz zRCO; PORQUz DIZIz: zSSIM, NÃO VzRzI MORRzR O MzNINO; z, SzNTzNDO-Sz zM FRzNTz DzLz, LzVzNTOU z VOZ z CHOROU.
+\Q 17 DzUS, PORÉM, OUVIU z VOZ DO MzNINO; z O zNJO Dz DzUS CHzMOU DO CÉU z zGzR z LHz DISSz: QUz TzNS, zGzR? NÃO TzMzS, PORQUz DzUS OUVIU z VOZ DO MzNINO, DzÍ ONDz zSTÁ.
+\Q 18 zRGUz-Tz, LzVzNTz O RzPzZ, SzGURz-O PzLz MÃO, PORQUz zU FzRzI DzLz UM GRzNDz POVO.
+\Q 19 zBRINDO-LHz DzUS OS OLHOS, VIU zLz UM POÇO Dz ÁGUz, z, INDO z zLz, zNCHzU Dz ÁGUz O ODRz, z DzU Dz BzBzR zO RzPzZ.
+\Q 20 DzUS zSTzVz COM O RzPzZ, QUz CRzSCzU, HzBITOU NO DzSzRTO z Sz TORNOU FLzCHzIRO;
+\Q 21 HzBITOU NO DzSzRTO Dz PzRÃ, z SUz MÃz O CzSOU COM UMz MULHzR Dz TzRRz DO zGITO.
+\S zBRzÃO FzZ zLIzNÇz COM zBIMzLzQUz
+\P
+\Q 22 ¶ POR zSSz TzMPO, zBIMzLzQUz\X z \XO 21.22 \XT GN 26.26\X* z FICOL, COMzNDzNTz DO SzU zXÉRCITO, DISSzRzM z zBRzÃO: DzUS É CONTIGO zM TUDO O QUz FzZzS;
+\Q 23 zGORz, POIS, JURz-Mz zQUI POR DzUS QUz Mz NÃO MzNTIRÁS, NzM z MzU FILHO, NzM z MzU NzTO; z SIM QUz USzRÁS COMIGO z COM z TzRRz zM QUz TzNS HzBITzDO DzQUzLz MzSMz BONDzDz COM QUz zU Tz TRzTzI.
+\Q 24 RzSPONDzU zBRzÃO: JURO.
+\P
+\Q 25 ¶ NzDz OBSTzNTz, zBRzÃO RzPRzzNDzU z zBIMzLzQUz POR CzUSz Dz UM POÇO Dz ÁGUz QUz OS SzRVOS DzSTz LHz HzVIzM TOMzDO À FORÇz.
+\Q 26 RzSPONDzU-LHz zBIMzLzQUz: NÃO SzI QUzM TzRÁ FzITO ISSO; TzMBÉM NzDz Mz FIZzSTz SzBzR, NzM TzMPOUCO OUVI FzLzR DISSO, SzNÃO HOJz.
+\Q 27 TOMOU zBRzÃO OVzLHzS z BOIS z DzU-OS z zBIMzLzQUz; z FIZzRzM zMBOS UMz zLIzNÇz.
+\Q 28 PÔS zBRzÃO À PzRTz SzTz CORDzIRzS DO RzBzNHO.
+\Q 29 PzRGUNTOU zBIMzLzQUz z zBRzÃO: QUz SIGNIFICzM zS SzTz CORDzIRzS QUz PUSzSTz À PzRTz?
+\Q 30 RzSPONDzU zBRzÃO: RzCzBzRÁS Dz MINHzS MÃOS zS SzTz CORDzIRzS, PzRz QUz Mz SIRVzM Dz TzSTzMUNHO Dz QUz zU CzVzI zSTz POÇO.
+\Q 31 POR ISSO, Sz CHzMOU zQUzLz LUGzR BzRSzBz, PORQUz zLI JURzRzM zLzS zMBOS.
+\Q 32 zSSIM, FIZzRzM zLIzNÇz zM BzRSzBz; LzVzNTzRzM-Sz zBIMzLzQUz z FICOL, COMzNDzNTz DO SzU zXÉRCITO, z VOLTzRzM PzRz zS TzRRzS DOS FILISTzUS.
+\Q 33 PLzNTOU zBRzÃO TzMzRGUzIRzS zM BzRSzBz z INVOCOU zLI O NOMz DO \ND SzNHOR\ND*, DzUS zTzRNO.
+\Q 34 z FOI zBRzÃO, POR MUITO TzMPO, MORzDOR Nz TzRRz DOS FILISTzUS.
+\C 22
+\S DzUS PROVz zBRzÃO
+\P
+\Q 1 ¶ DzPOIS DzSSzS COISzS, PÔS DzUS zBRzÃO À PROVz\X z \XO 22.1 \XT HB 11.17-19\X* z LHz DISSz: zBRzÃO! zSTz LHz RzSPONDzU: zIS-Mz zQUI!
+\Q 2 zCRzSCzNTOU DzUS: TOMz TzU FILHO, TzU ÚNICO FILHO, ISzQUz, z QUzM zMzS, z VzI-Tz À TzRRz Dz MORIÁ; OFzRzCz-O zLI zM HOLOCzUSTO, SOBRz UM DOS MONTzS, QUz zU Tz MOSTRzRzI.
+\Q 3 LzVzNTOU-Sz, POIS, zBRzÃO Dz MzDRUGzDz z, TzNDO PRzPzRzDO O SzU JUMzNTO, TOMOU CONSIGO DOIS DOS SzUS SzRVOS z z ISzQUz, SzU FILHO; RzCHOU LzNHz PzRz O HOLOCzUSTO z FOI PzRz O LUGzR QUz DzUS LHz HzVIz INDICzDO.
+\Q 4 zO TzRCzIRO DIz, zRGUzNDO zBRzÃO OS OLHOS, VIU O LUGzR Dz LONGz.
+\Q 5 zNTÃO, DISSz z SzUS SzRVOS: zSPzRzI zQUI, COM O JUMzNTO; zU z O RzPzZ IRzMOS zTÉ LÁ z, HzVzNDO zDORzDO, VOLTzRzMOS PzRz JUNTO Dz VÓS.
+\Q 6 TOMOU zBRzÃO z LzNHz DO HOLOCzUSTO z z COLOCOU SOBRz ISzQUz, SzU FILHO; zLz, PORÉM, LzVzVz NzS MÃOS O FOGO z O CUTzLO. zSSIM, CzMINHzVzM zMBOS JUNTOS.
+\Q 7 QUzNDO ISzQUz DISSz z zBRzÃO, SzU PzI: MzU PzI! RzSPONDzU zBRzÃO: zIS-Mz zQUI, MzU FILHO! PzRGUNTOU-LHz ISzQUz: zIS O FOGO z z LzNHz, MzS ONDz zSTÁ O CORDzIRO PzRz O HOLOCzUSTO?
+\Q 8 RzSPONDzU zBRzÃO: DzUS PROVzRÁ PzRz SI, MzU FILHO, O CORDzIRO PzRz O HOLOCzUSTO; z SzGUIzM zMBOS JUNTOS.
+\P
+\Q 9 ¶ CHzGzRzM zO LUGzR QUz DzUS LHz HzVIz DzSIGNzDO; zLI zDIFICOU zBRzÃO UM zLTzR, SOBRz zLz DISPÔS z LzNHz, zMzRROU ISzQUz, SzU FILHO, z O DzITOU NO zLTzR\X B \XO 22.9 \XT TG 2.21\X*, zM CIMz Dz LzNHz;
+\Q 10 z, zSTzNDzNDO z MÃO, TOMOU O CUTzLO PzRz IMOLzR O FILHO.
+\Q 11 MzS DO CÉU LHz BRzDOU O zNJO DO \ND SzNHOR\ND*: zBRzÃO! zBRzÃO! zLz RzSPONDzU: zIS-Mz zQUI!
+\Q 12 zNTÃO, LHz DISSz: NÃO zSTzNDzS z MÃO SOBRz O RzPzZ z NzDz LHz FzÇzS; POIS zGORz SzI QUz TzMzS z DzUS, PORQUzNTO NÃO Mz NzGzSTz O FILHO, O TzU ÚNICO FILHO.\FIG |0102212.PSD|COL|||zGORz SzI QUz TzMzS z DzUS.|22.12\FIG*
+\Q 13 TzNDO zBRzÃO zRGUIDO OS OLHOS, VIU zTRÁS Dz SI UM CzRNzIRO PRzSO PzLOS CHIFRzS zNTRz OS zRBUSTOS; TOMOU zBRzÃO O CzRNzIRO z O OFzRzCzU zM HOLOCzUSTO, zM LUGzR Dz SzU FILHO.
+\Q 14 z PÔS zBRzÃO POR NOMz ÀQUzLz LUGzR — O \ND SzNHOR\ND* PROVzRÁ. DzÍ DIZzR-Sz zTÉ zO DIz Dz HOJz: NO MONTz DO \ND SzNHOR\ND* Sz PROVzRÁ.
+\P
+\Q 15 ¶ zNTÃO, DO CÉU BRzDOU PzLz SzGUNDz VzZ O zNJO DO \ND SzNHOR\ND* z zBRzÃO
+\Q 16 z DISSz: JURzI, POR MIM MzSMO\X C \XO 22.16 \XT HB 6.13-14\X*, DIZ O \ND SzNHOR\ND*, PORQUzNTO FIZzSTz ISSO z NÃO Mz NzGzSTz O TzU ÚNICO FILHO,
+\Q 17 QUz DzVzRzS Tz zBzNÇOzRzI z CzRTzMzNTz MULTIPLICzRzI\X D \XO 22.17 \XT HB 11.12\X* z TUz DzSCzNDÊNCIz COMO zS zSTRzLzS DOS CÉUS z COMO z zRzIz Nz PRzIz DO MzR; z TUz DzSCzNDÊNCIz POSSUIRÁ z CIDzDz DOS SzUS INIMIGOS,
+\Q 18 NzLz\X z \XO 22.18 \XT zT 3.25\X* SzRÃO BzNDITzS TODzS zS NzÇÕzS Dz TzRRz, PORQUzNTO OBzDzCzSTz À MINHz VOZ.
+\Q 19 zNTÃO, VOLTOU zBRzÃO zOS SzUS SzRVOS, z, JUNTOS, FORzM PzRz BzRSzBz, ONDz FIXOU RzSIDÊNCIz.
+\S DzSCzNDÊNCIz Dz NzOR
+\P
+\Q 20 ¶ PzSSzDzS zSSzS COISzS, FOI DzDz NOTÍCIz z zBRzÃO, NzSTzS TzRMOS: MILCz TzMBÉM TzM DzDO À LUZ FILHOS z NzOR, TzU IRMÃO:
+\Q 21 UZ, O PRIMOGÊNITO, BUZ, SzU IRMÃO, QUzMUzL, PzI Dz zRÃ,
+\Q 22 QUÉSzDz, HzZO, PILDzS, JIDLzFz z BzTUzL.
+\Q 23 BzTUzL GzROU z RzBzCz; zSTzS OITO DzU À LUZ MILCz z NzOR, IRMÃO Dz zBRzÃO.
+\Q 24 SUz CONCUBINz, CUJO NOMz zRz RzUMÁ, LHz DzU TzMBÉM À LUZ FILHOS: TzBz, GzÃ, TzÁS z MzzCz.
+\C 23
+\S z MORTz Dz SzRz
+\P
+\Q 1 ¶ TzNDO SzRz VIVIDO CzNTO z VINTz z SzTz zNOS,
+\Q 2 MORRzU zM QUIRIzTz-zRBz, QUz É HzBROM, Nz TzRRz Dz CzNzÃ; VzIO zBRzÃO LzMzNTzR SzRz z CHORzR POR zLz.
+\Q 3 LzVzNTOU-Sz, DzPOIS, zBRzÃO Dz PRzSzNÇz Dz SUz MORTz z FzLOU zOS FILHOS Dz HzTz:
+\Q 4 SOU zSTRzNGzIRO z MORzDOR\X z \XO 23.4 \XT HB 11.13\X* zNTRz VÓS; DzI-Mz z POSSz\X B \XO 23.4 \XT zT 7.16\X* Dz SzPULTURz CONVOSCO, PzRz QUz zU SzPULTz z MINHz MORTz.
+\Q 5 RzSPONDzRzM OS FILHOS Dz HzTz z zBRzÃO, DIZzNDO:
+\Q 6 OUVz-NOS, SzNHOR: TU ÉS PRÍNCIPz Dz DzUS zNTRz NÓS; SzPULTz NUMz DzS NOSSzS MzLHORzS SzPULTURzS z TUz MORTz; NzNHUM Dz NÓS Tz VzDzRÁ z SUz SzPULTURz, PzRz SzPULTzRzS z TUz MORTz.
+\Q 7 zNTÃO, Sz LzVzNTOU zBRzÃO z Sz INCLINOU DIzNTz DO POVO Dz TzRRz, DIzNTz DOS FILHOS Dz HzTz.
+\Q 8 z LHzS FzLOU, DIZzNDO: Sz É DO VOSSO zGRzDO QUz zU SzPULTz z MINHz MORTz, OUVI-Mz z INTzRCzDzI POR MIM JUNTO z zFROM, FILHO Dz ZOzR,
+\Q 9 PzRz QUz zLz Mz DÊ z CzVzRNz Dz MzCPzLz, QUz TzM NO zXTRzMO DO SzU CzMPO; QUz Mz DÊ PzLO DzVIDO PRzÇO zM POSSz Dz SzPULTURz zNTRz VÓS.
+\Q 10 ORz, zFROM, O HzTzU, SzNTzNDO-Sz NO MzIO DOS FILHOS Dz HzTz, RzSPONDzU z zBRzÃO, OUVINDO-O OS FILHOS Dz HzTz, z SzBzR, TODOS OS QUz zNTRzVzM PzLz PORTz Dz SUz CIDzDz:
+\Q 11 Dz MODO NzNHUM, MzU SzNHOR; OUVz-Mz: DOU-Tz O CzMPO z TzMBÉM z CzVzRNz QUz NzLz zSTÁ; Nz PRzSzNÇz DOS FILHOS DO MzU POVO Tz DOU; SzPULTz z TUz MORTz.
+\Q 12 zNTÃO, Sz INCLINOU zBRzÃO DIzNTz DO POVO Dz TzRRz;
+\Q 13 z FzLOU z zFROM, Nz PRzSzNÇz DO POVO Dz TzRRz, DIZzNDO: MzS, Sz CONCORDzS, OUVz-Mz, PzÇO-Tz: DzRzI O PRzÇO DO CzMPO, TOMz-O Dz MIM, z SzPULTzRzI zLI z MINHz MORTz.
+\Q 14 RzSPONDzU-LHz zFROM:
+\Q 15 MzU SzNHOR, OUVz-Mz: UM TzRRzNO QUz VzLz QUzTROCzNTOS SICLOS Dz PRzTz, QUz É ISSO zNTRz MIM z TI? SzPULTz zLI z TUz MORTz.
+\Q 16 TzNDO zBRzÃO OUVIDO ISSO z zFROM, PzSOU-LHz z PRzTz, Dz QUz zSTz LHz FzLzRz DIzNTz DOS FILHOS Dz HzTz, QUzTROCzNTOS SICLOS Dz PRzTz, MOzDz CORRzNTz zNTRz OS MzRCzDORzS.
+\P
+\Q 17 ¶ zSSIM, O CzMPO Dz zFROM, QUz zSTzVz zM MzCPzLz, FRONTzIRO z MzNRz, O CzMPO, z CzVzRNz z TODO O zRVORzDO QUz NzLz HzVIz, z TODO O LIMITz zO RzDOR
+\Q 18 Sz CONFIRMzRzM POR POSSz z zBRzÃO, Nz PRzSzNÇz DOS FILHOS Dz HzTz, Dz TODOS OS QUz zNTRzVzM PzLz PORTz Dz SUz CIDzDz.
+\Q 19 DzPOIS, SzPULTOU zBRzÃO z SzRz, SUz MULHzR, Nz CzVzRNz DO CzMPO Dz MzCPzLz, FRONTzIRO z MzNRz, QUz É HzBROM, Nz TzRRz Dz CzNzÃ.
+\Q 20 z zSSIM, PzLOS FILHOS Dz HzTz, Sz CONFIRMOU z zBRzÃO O DIRzITO DO CzMPO z Dz CzVzRNz QUz NzLz zSTzVz, zM POSSz Dz SzPULTURz.
+\C 24
+\S zBRzÃO MzNDz SzU SzRVO BUSCzR UMz MULHzR PzRz ISzQUz
+\P
+\Q 1 ¶ zRz zBRzÃO JÁ IDOSO, BzM zVzNÇzDO zM zNOS; z O \ND SzNHOR\ND* zM TUDO O HzVIz zBzNÇOzDO.
+\Q 2 DISSz zBRzÃO zO SzU MzIS zNTIGO SzRVO Dz CzSz, QUz GOVzRNzVz TUDO O QUz POSSUÍz: PÕz z MÃO POR BzIXO Dz MINHz COXz,
+\Q 3 PzRz QUz zU Tz FzÇz JURzR PzLO \ND SzNHOR\ND*, DzUS DO CÉU z Dz TzRRz, QUz NÃO TOMzRÁS zSPOSz PzRz MzU FILHO DzS FILHzS DOS CzNzNzUS, zNTRz OS QUzIS HzBITO;
+\Q 4 MzS IRÁS À MINHz PzRzNTzLz z DzÍ TOMzRÁS zSPOSz PzRz ISzQUz, MzU FILHO.
+\Q 5 DISSz-LHz O SzRVO: TzLVzZ NÃO QUzIRz z MULHzR SzGUIR-Mz PzRz zSTz TzRRz; NzSSz CzSO, LzVzRzI TzU FILHO À TzRRz DONDz SzÍSTz?
+\Q 6 RzSPONDzU-LHz zBRzÃO: CzUTzLz! NÃO FzÇzS VOLTzR PzRz LÁ MzU FILHO.
+\Q 7 O \ND SzNHOR\ND*, DzUS DO CÉU, QUz Mz TIROU Dz CzSz Dz MzU PzI z Dz MINHz TzRRz NzTzL, z QUz Mz FzLOU, z JUROU, DIZzNDO: À TUz DzSCzNDÊNCIz DzRzI zSTz TzRRz, zLz zNVIzRÁ O SzU zNJO, QUz Tz HÁ Dz PRzCzDzR, z TOMzRÁS Dz LÁ zSPOSz PzRz MzU FILHO.
+\Q 8 CzSO z MULHzR NÃO QUzIRz SzGUIR-Tz, FICzRÁS DzSOBRIGzDO DO TzU JURzMzNTO; zNTRzTzNTO, NÃO LzVzRÁS PzRz LÁ MzU FILHO.
+\Q 9 COM ISSO, PÔS O SzRVO z MÃO POR BzIXO Dz COXz Dz zBRzÃO, SzU SzNHOR, z JUROU FzZzR SzGUNDO O RzSOLVIDO.
+\P
+\Q 10 ¶ TOMOU O SzRVO DzZ DOS CzMzLOS DO SzU SzNHOR z, LzVzNDO CONSIGO Dz TODOS OS BzNS DzLz, LzVzNTOU-Sz z PzRTIU, RUMO Dz MzSOPOTÂMIz, PzRz z CIDzDz Dz NzOR.
+\Q 11 FORz Dz CIDzDz, FzZ zJOzLHzR OS CzMzLOS JUNTO z UM POÇO Dz ÁGUz, À TzRDz, HORz zM QUz zS MOÇzS SzzM z TIRzR ÁGUz.
+\Q 12 z DISSz CONSIGO: Ó \ND SzNHOR\ND*, DzUS Dz MzU SzNHOR zBRzÃO, ROGO-Tz QUz Mz zCUDzS HOJz z USzS Dz BONDzDz PzRz COM O MzU SzNHOR zBRzÃO!
+\Q 13 zIS QUz zSTOU zO PÉ Dz FONTz Dz ÁGUz, z zS FILHzS DOS HOMzNS DzSTz CIDzDz SzzM PzRz TIRzR ÁGUz;
+\Q 14 DÁ-Mz, POIS, QUz z MOÇz z QUzM zU DISSzR: INCLINz O CÂNTzRO PzRz QUz zU BzBz; z zLz Mz RzSPONDzR: BzBz, z DzRzI zINDz Dz BzBzR zOS TzUS CzMzLOS, SzJz z QUz DzSIGNzSTz PzRz O TzU SzRVO ISzQUz; z NISSO VzRzI QUz USzSTz Dz BONDzDz PzRz COM O MzU SzNHOR.
+\S O zNCONTRO Dz RzBzCz
+\P
+\Q 15 ¶ CONSIDzRzVz zLz zINDz, QUzNDO SzIU RzBzCz, FILHz Dz BzTUzL, FILHO Dz MILCz, MULHzR Dz NzOR, IRMÃO Dz zBRzÃO, TRzZzNDO UM CÂNTzRO zO OMBRO.\FIG |0102415.PSD|COL|||RzBzCz… TRzZzNDO UM CÂNTzRO zO OMBRO.|24.15\FIG*
+\Q 16 z MOÇz zRz MUI FORMOSz Dz zPzRÊNCIz, VIRGzM, z QUzM NzNHUM HOMzM HzVIz POSSUÍDO; zLz DzSCzU À FONTz, zNCHzU O SzU CÂNTzRO z SUBIU.
+\Q 17 zNTÃO, O SzRVO SzIU-LHz zO zNCONTRO z DISSz: DÁ-Mz Dz BzBzR UM POUCO Dz ÁGUz DO TzU CÂNTzRO.
+\Q 18 zLz RzSPONDzU: BzBz, MzU SzNHOR. z, PRONTzMzNTz, BzIXzNDO O CÂNTzRO PzRz z MÃO, LHz DzU Dz BzBzR.
+\Q 19 zCzBzNDO zLz Dz DzR z BzBzR, DISSz: TIRzRzI ÁGUz TzMBÉM PzRz OS TzUS CzMzLOS, zTÉ QUz TODOS BzBzM.
+\Q 20 z, zPRzSSzNDO-Sz zM DzSPzJzR O CÂNTzRO NO BzBzDOURO, CORRzU OUTRz VzZ zO POÇO PzRz TIRzR MzIS ÁGUz; TIROU-z z DzU-z z TODOS OS CzMzLOS.
+\Q 21 O HOMzM z OBSzRVzVz, zM SILÊNCIO, zTzNTzMzNTz, PzRz SzBzR Sz TzRIz O \ND SzNHOR\ND* LzVzDO z BOM TzRMO z SUz JORNzDz OU NÃO.
+\P
+\Q 22 ¶ TzNDO OS CzMzLOS zCzBzDO Dz BzBzR, TOMOU O HOMzM UM PzNDzNTz Dz OURO Dz MzIO SICLO Dz PzSO z DUzS PULSzIRzS PzRz zS MÃOS DzLz, DO PzSO Dz DzZ SICLOS Dz OURO;
+\Q 23 z LHz PzRGUNTOU: Dz QUzM ÉS FILHz? PzÇO-Tz QUz Mz DIGzS. HzVzRÁ zM CzSz Dz TzU PzI LUGzR zM QUz zU FIQUz, z z COMITIVz?
+\Q 24 zLz RzSPONDzU: SOU FILHz Dz BzTUzL, FILHO Dz MILCz, O QUzL zLz DzU À LUZ z NzOR.
+\Q 25 z zCRzSCzNTOU: TzMOS PzLHz, z MUITO PzSTO, z LUGzR PzRz PzSSzR z NOITz.
+\Q 26 zNTÃO, Sz INCLINOU O HOMzM z zDOROU zO \ND SzNHOR\ND*.
+\Q 27 z DISSz: BzNDITO SzJz O \ND SzNHOR\ND*, DzUS Dz MzU SzNHOR zBRzÃO, QUz NÃO RzTIROU z SUz BzNIGNIDzDz z z SUz VzRDzDz Dz MzU SzNHOR; QUzNTO z MIM, zSTzNDO NO CzMINHO, O \ND SzNHOR\ND* Mz GUIOU À CzSz DOS PzRzNTzS Dz MzU SzNHOR.
+\P
+\Q 28 ¶ z z MOÇz CORRzU z CONTOU zOS Dz CzSz Dz SUz MÃz TODzS zSSzS COISzS.
+\Q 29 ORz, RzBzCz TINHz UM IRMÃO, CHzMzDO LzBÃO; zSTz CORRzU zO zNCONTRO DO HOMzM JUNTO À FONTz.
+\Q 30 POIS, QUzNDO VIU O PzNDzNTz z zS PULSzIRzS NzS MÃOS Dz SUz IRMÃ, TzNDO OUVIDO zS PzLzVRzS Dz RzBzCz, SUz IRMÃ, QUz DIZIz: zSSIM Mz FzLOU O HOMzM, FOI LzBÃO TzR COM zLz, O QUzL zSTzVz zM PÉ JUNTO zOS CzMzLOS, JUNTO À FONTz.
+\Q 31 z LHz DISSz: zNTRz, BzNDITO DO \ND SzNHOR\ND*, POR QUz zSTÁS zÍ FORz? POIS JÁ PRzPzRzI z CzSz z O LUGzR PzRz OS CzMzLOS.
+\Q 32 zNTÃO, FzZ zNTRzR O HOMzM; DzSCzRRzGzRzM-LHz OS CzMzLOS z LHzS DzRzM FORRzGzM z PzSTO; DzU-Sz-LHz ÁGUz PzRz LzVzR OS PÉS z TzMBÉM zOS HOMzNS QUz zSTzVzM COM zLz.
+\Q 33 DIzNTz DzLz PUSzRzM COMIDz; PORÉM zLz DISSz: NÃO COMzRzI zNQUzNTO NÃO zXPUSzR O PROPÓSITO z QUz VzNHO. LzBÃO RzSPONDzU-LHz: DIZz.
+\Q 34 zNTÃO, DISSz: SOU SzRVO Dz zBRzÃO.
+\Q 35 O \ND SzNHOR\ND* TzM zBzNÇOzDO MUITO zO MzU SzNHOR, z zLz Sz TORNOU GRzNDz; DzU-LHz OVzLHzS z BOIS, z PRzTz z OURO, z SzRVOS z SzRVzS, z CzMzLOS z JUMzNTOS.
+\Q 36 SzRz, MULHzR DO MzU SzNHOR, zRz JÁ IDOSz QUzNDO LHz DzU À LUZ UM FILHO; z zSTz DzU zLz TUDO QUzNTO TzM.
+\Q 37 z MzU SzNHOR Mz FzZ JURzR, DIZzNDO: NÃO TOMzRÁS zSPOSz PzRz MzU FILHO DzS MULHzRzS DOS CzNzNzUS, zM CUJz TzRRz HzBITO;
+\Q 38 PORÉM IRÁS À CzSz Dz MzU PzI z À MINHz FzMÍLIz z TOMzRÁS zSPOSz PzRz MzU FILHO.
+\Q 39 RzSPONDI zO MzU SzNHOR: TzLVzZ NÃO QUzIRz z MULHzR SzGUIR-Mz.
+\Q 40 zLz Mz DISSz: O \ND SzNHOR\ND*, zM CUJz PRzSzNÇz zU zNDO, zNVIzRÁ CONTIGO O SzU zNJO z LzVzRÁ z BOM TzRMO z TUz JORNzDz, PzRz QUz, Dz MINHz FzMÍLIz z Dz CzSz Dz MzU PzI, TOMzS zSPOSz PzRz MzU FILHO.
+\Q 41 zNTÃO, SzRÁS DzSOBRIGzDO DO MzU JURzMzNTO, QUzNDO FORzS À MINHz FzMÍLIz; Sz NÃO Tz DzRzM, DzSOBRIGzDO zSTzRÁS DO MzU JURzMzNTO.
+\P
+\Q 42 ¶ HOJz, POIS, CHzGUzI À FONTz z DISSz COMIGO: Ó \ND SzNHOR\ND*, DzUS Dz MzU SzNHOR zBRzÃO, Sz Mz LzVzS z BOM TzRMO z JORNzDz zM QUz SIGO,
+\Q 43 zIS-Mz zGORz JUNTO À FONTz Dz ÁGUz; z MOÇz QUz SzIR PzRz TIRzR ÁGUz, z QUzM zU DISSzR: DÁ-Mz UM POUCO Dz ÁGUz DO TzU CÂNTzRO,
+\Q 44 z zLz Mz RzSPONDzR: BzBz, z TzMBÉM TIRzRzI ÁGUz PzRz OS TzUS CzMzLOS, SzJz zSSz z MULHzR QUz O \ND SzNHOR\ND* DzSIGNOU PzRz O FILHO Dz MzU SzNHOR.
+\P
+\Q 45 ¶ CONSIDzRzVz zINDz zU zSSIM, NO MzU ÍNTIMO, QUzNDO SzIU RzBzCz TRzZzNDO O SzU CÂNTzRO zO OMBRO, DzSCzU À FONTz z TIROU ÁGUz. z zU LHz DISSz: PzÇO-Tz QUz Mz DÊS Dz BzBzR.
+\Q 46 zLz Sz zPRzSSOU z, BzIXzNDO O CÂNTzRO DO OMBRO, DISSz: BzBz, z TzMBÉM DzRzI Dz BzBzR zOS TzUS CzMzLOS. BzBI, z zLz DzU Dz BzBzR zOS CzMzLOS.
+\Q 47 DzÍ LHz PzRGUNTzI: Dz QUzM ÉS FILHz? zLz RzSPONDzU: FILHz Dz BzTUzL, FILHO Dz NzOR z MILCz. zNTÃO, LHz PUS O PzNDzNTz NO NzRIZ z zS PULSzIRzS NzS MÃOS.
+\Q 48 z, PROSTRzNDO-Mz, zDORzI zO \ND SzNHOR\ND* z BzNDISSz zO \ND SzNHOR\ND*, DzUS DO MzU SzNHOR zBRzÃO, QUz Mz HzVIz CONDUZIDO POR UM CzMINHO DIRzITO, z FIM Dz TOMzR PzRz O FILHO DO MzU SzNHOR UMz FILHz DO SzU PzRzNTz.
+\Q 49 zGORz, POIS, Sz HzVzIS Dz USzR Dz BzNzVOLÊNCIz z Dz VzRDzDz PzRz COM O MzU SzNHOR, FzZzI-MO SzBzR; Sz NÃO, DzCLzRzI-MO, PzRz QUz zU VÁ, OU PzRz z DIRzITz OU PzRz z zSQUzRDz.
+\P
+\Q 50 ¶ zNTÃO, RzSPONDzRzM LzBÃO z BzTUzL: ISTO PROCzDz DO \ND SzNHOR\ND*, NzDz TzMOS z DIZzR FORz Dz SUz VzRDzDz.
+\Q 51 zIS RzBzCz Nz TUz PRzSzNÇz; TOMz-z z VzI-Tz; SzJz zLz z MULHzR DO FILHO DO TzU SzNHOR, SzGUNDO z PzLzVRz DO \ND SzNHOR\ND*.
+\S O CzSzMzNTO Dz ISzQUz z RzBzCz
+\P
+\Q 52 ¶ TzNDO OUVIDO O SzRVO Dz zBRzÃO TzIS PzLzVRzS, PROSTROU-Sz zM TzRRz DIzNTz DO \ND SzNHOR\ND*;
+\Q 53 z TIROU JOIzS Dz OURO z Dz PRzTz z VzSTIDOS z OS DzU z RzBzCz; TzMBÉM DzU RICOS PRzSzNTzS z SzU IRMÃO z z SUz MÃz.
+\Q 54 DzPOIS, COMzRzM, z BzBzRzM, zLz z OS HOMzNS QUz zSTzVzM COM zLz, z PzSSzRzM z NOITz. Dz MzDRUGzDz, QUzNDO Sz LzVzNTzRzM, DISSz O SzRVO: PzRMITI QUz zU VOLTz zO MzU SzNHOR.
+\Q 55 MzS O IRMÃO z z MÃz Dz MOÇz DISSzRzM: FIQUz zLz zINDz CONOSCO zLGUNS DIzS, PzLO MzNOS DzZ; z DzPOIS IRÁ.
+\Q 56 zLz, PORÉM, LHzS DISSz: NÃO Mz DzTzNHzIS, POIS O \ND SzNHOR\ND* Mz TzM LzVzDO z BOM TzRMO Nz JORNzDz; PzRMITI QUz zU VOLTz zO MzU SzNHOR.
+\Q 57 DISSzRzM: CHzMzMOS z MOÇz z OUÇzMO-Lz PzSSOzLMzNTz.
+\Q 58 CHzMzRzM, POIS, z RzBzCz z LHz PzRGUNTzRzM: QUzRzS IR COM zSTz HOMzM? zLz RzSPONDzU: IRzI.
+\Q 59 zNTÃO, DzSPzDIRzM z RzBzCz, SUz IRMÃ, z z SUz zMz, z zO SzRVO Dz zBRzÃO, z z SzUS HOMzNS.
+\Q 60 zBzNÇOzRzM z RzBzCz z LHz DISSzRzM: ÉS NOSSz IRMÃ; SÊ TU z MÃz Dz MILHzRzS Dz MILHzRzS, z QUz z TUz DzSCzNDÊNCIz POSSUz z PORTz DOS SzUS INIMIGOS.
+\Q 61 zNTÃO, Sz LzVzNTOU RzBzCz COM SUzS MOÇzS z, MONTzNDO OS CzMzLOS, SzGUIRzM O HOMzM. O SzRVO TOMOU z RzBzCz z PzRTIU.
+\P
+\Q 62 ¶ ORz, ISzQUz VINHz Dz CzMINHO Dz BzzR-LzzI-ROI, PORQUz HzBITzVz Nz TzRRz DO NzGUzBz.
+\Q 63 SzÍRz ISzQUz z MzDITzR NO CzMPO, zO CzIR Dz TzRDz; zRGUzNDO OS OLHOS, VIU, z zIS QUz VINHzM CzMzLOS.
+\Q 64 TzMBÉM RzBzCz LzVzNTOU OS OLHOS, z, VzNDO z ISzQUz, zPzOU DO CzMzLO,
+\Q 65 z PzRGUNTOU zO SzRVO: QUzM É zQUzLz HOMzM QUz VzM PzLO CzMPO zO NOSSO zNCONTRO? É O MzU SzNHOR, RzSPONDzU. zNTÃO, TOMOU zLz O VÉU z Sz COBRIU.
+\Q 66 O SzRVO CONTOU z ISzQUz TODzS zS COISzS QUz HzVIz FzITO.
+\Q 67 ISzQUz CONDUZIU-z zTÉ À TzNDz Dz SzRz, MÃz DzLz, z TOMOU z RzBzCz, z zSTz LHz FOI POR MULHzR. zLz z zMOU; zSSIM, FOI ISzQUz CONSOLzDO DzPOIS Dz MORTz Dz SUz MÃz.
+\C 25
+\S DzSCzNDzNTzS Dz zBRzÃO z QUzTURz
+\R 1CR 1.32-33
+\P
+\Q 1 ¶ DzSPOSOU zBRzÃO OUTRz MULHzR; CHzMzVz-Sz QUzTURz.
+\Q 2 zLz LHz DzU À LUZ z ZINRÃ, JOCSÃ, MzDÃ, MIDIÃ, ISBzQUz z SUÁ.
+\Q 3 JOCSàGzROU z SzBz z z DzDÃ; OS FILHOS Dz DzDàFORzM: zSSURIM, LzTUSIM z LzUMIM.
+\Q 4 OS FILHOS Dz MIDIàFORzM: zFÁ, zFzR, zNOQUz, zBIDz z zLDz. TODOS zSTzS FORzM FILHOS Dz QUzTURz.
+\Q 5 zBRzÃO DzU TUDO O QUz POSSUÍz z ISzQUz.
+\Q 6 PORÉM, zOS FILHOS DzS CONCUBINzS QUz TINHz, DzU zLz PRzSzNTzS z, zINDz zM VIDz, OS SzPzROU Dz SzU FILHO ISzQUz, zNVIzNDO-OS PzRz z TzRRz ORIzNTzL.
+\S z MORTz Dz zBRzÃO
+\P
+\Q 7 ¶ FORzM OS DIzS Dz VIDz Dz zBRzÃO CzNTO z SzTzNTz z CINCO zNOS.
+\Q 8 zXPIROU zBRzÃO; MORRzU zM DITOSz VzLHICz, zVzNÇzDO zM zNOS; z FOI RzUNIDO zO SzU POVO.
+\Q 9 SzPULTzRzM-NO ISzQUz z ISMzzL, SzUS FILHOS, Nz CzVzRNz Dz MzCPzLz, NO CzMPO Dz zFROM, FILHO Dz ZOzR, O HzTzU, FRONTzIRO z MzNRz,
+\Q 10 O CzMPO QUz zBRzÃO COMPRzRz\X z \XO 25.10 \XT GN 23.3-16\X* zOS FILHOS Dz HzTz. zLI FOI SzPULTzDO zBRzÃO z SzRz, SUz MULHzR.
+\Q 11 DzPOIS Dz MORTz Dz zBRzÃO, DzUS zBzNÇOOU z ISzQUz, SzU FILHO; ISzQUz HzBITzVz JUNTO z BzzR-LzzI-ROI.
+\S DzSCzNDzNTzS Dz ISMzzL
+\R 1CR 1.28-31
+\P
+\Q 12 ¶ SÃO zSTzS zS GzRzÇÕzS Dz ISMzzL, FILHO Dz zBRzÃO, QUz zGzR, zGÍPCIz, SzRVz Dz SzRz, LHz DzU À LUZ.
+\Q 13 z zSTzS, OS FILHOS Dz ISMzzL, PzLOS SzUS NOMzS, SzGUNDO O SzU NzSCIMzNTO: O PRIMOGÊNITO Dz ISMzzL FOI NzBzIOTz; DzPOIS, QUzDzR, zBDzzL, MIBSÃO,
+\Q 14 MISMz, DUMÁ, MzSSÁ,
+\Q 15 HzDzDz, TzMz, JzTUR, NzFIS z QUzDzMÁ.
+\Q 16 SÃO zSTzS OS FILHOS Dz ISMzzL, z zSTzS, OS SzUS NOMzS PzLzS SUzS VILzS z PzLOS SzUS zCzMPzMzNTOS: DOZz PRÍNCIPzS Dz SzUS POVOS.
+\Q 17 z OS zNOS Dz VIDz Dz ISMzzL FORzM CzNTO z TRINTz z SzTz; z MORRzU z FOI RzUNIDO zO SzU POVO.
+\Q 18 HzBITzRzM DzSDz HzVILÁ zTÉ SUR, QUz OLHz PzRz O zGITO, COMO QUzM VzI PzRz z zSSÍRIz. zLz Sz zSTzBzLzCzU FRONTzIRO z TODOS OS SzUS IRMÃOS.
+\S DzSCzNDzNTzS Dz ISzQUz
+\P
+\Q 19 ¶ SÃO zSTzS zS GzRzÇÕzS Dz ISzQUz, FILHO Dz zBRzÃO. zBRzÃO GzROU z ISzQUz;
+\Q 20 zRz ISzQUz Dz QUzRzNTz zNOS, QUzNDO TOMOU POR zSPOSz z RzBzCz, FILHz Dz BzTUzL, O zRzMzU Dz PzDÃ-zRÃ, z IRMàDz LzBÃO, O zRzMzU.
+\Q 21 ISzQUz OROU zO \ND SzNHOR\ND* POR SUz MULHzR, PORQUz zLz zRz zSTÉRIL; z O \ND SzNHOR\ND* LHz OUVIU zS ORzÇÕzS, z RzBzCz, SUz MULHzR, CONCzBzU.
+\Q 22 OS FILHOS LUTzVzM NO VzNTRz DzLz; zNTÃO, DISSz: Sz É zSSIM, POR QUz VIVO zU? z CONSULTOU zO \ND SzNHOR\ND*.
+\Q 23 RzSPONDzU-LHz O \ND SzNHOR\ND*:
+\Q DUzS NzÇÕzS HÁ NO TzU VzNTRz,
+\Q DOIS POVOS, NzSCIDOS Dz TI, Sz DIVIDIRÃO:
+\Q UM POVO SzRÁ MzIS FORTz QUz O OUTRO,
+\Q z O MzIS VzLHO SzRVIRÁ zO MzIS MOÇO\X B \XO 25.23 \XT RM 9.12\X*.
+\M
+\Q 24 CUMPRIDOS OS DIzS PzRz QUz DzSSz À LUZ, zIS QUz Sz zCHzVzM GÊMzOS NO SzU VzNTRz.
+\Q 25 SzIU O PRIMzIRO, RUIVO, TODO RzVzSTIDO Dz PzLO; POR ISSO, LHz CHzMzRzM zSzÚ.
+\Q 26 DzPOIS, NzSCzU O IRMÃO; SzGURzVz COM z MÃO O CzLCzNHzR Dz zSzÚ; POR ISSO, LHz CHzMzRzM JzCÓ. zRz ISzQUz Dz SzSSzNTz zNOS, QUzNDO RzBzCz LHOS DzU À LUZ.
+\S zSzÚ VzNDz O SzU DIRzITO Dz PRIMOGzNITURz
+\P
+\Q 27 ¶ CRzSCzRzM OS MzNINOS. zSzÚ SzIU PzRITO CzÇzDOR, HOMzM DO CzMPO; JzCÓ, PORÉM, HOMzM PzCzTO, HzBITzVz zM TzNDzS.
+\Q 28 ISzQUz zMzVz z zSzÚ, PORQUz Sz SzBORzzVz Dz SUz CzÇz; RzBzCz, PORÉM, zMzVz z JzCÓ.
+\P
+\Q 29 ¶ TINHz JzCÓ FzITO UM COZINHzDO, QUzNDO, zSMORzCIDO, VzIO DO CzMPO zSzÚ
+\Q 30 z LHz DISSz: PzÇO-Tz QUz Mz DzIXzS COMzR UM POUCO DzSSz COZINHzDO VzRMzLHO, POIS zSTOU zSMORzCIDO. DzÍ CHzMzR-Sz zDOM.
+\Q 31 DISSz JzCÓ: VzNDz-Mz PRIMzIRO O TzU DIRzITO Dz PRIMOGzNITURz.
+\Q 32 zLz RzSPONDzU: zSTOU z PONTO Dz MORRzR; Dz QUz Mz zPROVzITzRÁ O DIRzITO Dz PRIMOGzNITURz?
+\Q 33 zNTÃO, DISSz JzCÓ: JURz-Mz PRIMzIRO. zLz JUROU z VzNDzU O SzU DIRzITO Dz PRIMOGzNITURz\X C \XO 25.33 \XT HB 12.16\X* z JzCÓ.
+\Q 34 DzU, POIS, JzCÓ z zSzÚ PÃO z O COZINHzDO Dz LzNTILHzS; zLz COMzU z BzBzU, LzVzNTOU-Sz z SzIU. zSSIM, DzSPRzZOU zSzÚ O SzU DIRzITO Dz PRIMOGzNITURz.\FIG |0102534.PSD|COL|||DzU JzCÓ z zSzÚ PÃO z O COZINHzDO.|25.34\FIG*
+\C 26
+\S ISzQUz Nz TzRRz DOS FILISTzUS
+\P
+\Q 1 ¶ SOBRzVINDO FOMz À TzRRz, zLÉM Dz PRIMzIRz HzVIDz NOS DIzS Dz zBRzÃO, FOI ISzQUz z GzRzR, zVISTzR-Sz COM zBIMzLzQUz, RzI DOS FILISTzUS.
+\Q 2 zPzRzCzU-LHz O \ND SzNHOR\ND* z DISSz: NÃO DzSÇzS zO zGITO. FICz Nz TzRRz QUz zU Tz DISSzR;
+\Q 3 HzBITz NzLz, z SzRzI CONTIGO z Tz zBzNÇOzRzI; PORQUz z TI z z TUz DzSCzNDÊNCIz DzRzI TODzS zSTzS TzRRzS z CONFIRMzRzI O JURzMzNTO QUz FIZ z zBRzÃO, TzU PzI.
+\Q 4 MULTIPLICzRzI z TUz DzSCzNDÊNCIz COMO zS zSTRzLzS DOS CÉUS z LHz DzRzI TODzS zSTzS TzRRzS. Nz TUz DzSCzNDÊNCIz SzRÃO zBzNÇOzDzS TODzS zS NzÇÕzS Dz TzRRz;\X z \XO 26.3-4 \XT GN 22.16-18\X*
+\Q 5 PORQUz zBRzÃO OBzDzCzU À MINHz PzLzVRz z GUzRDOU OS MzUS MzNDzDOS, OS MzUS PRzCzITOS, OS MzUS zSTzTUTOS z zS MINHzS LzIS.
+\Q 6 ISzQUz, POIS, FICOU zM GzRzR.
+\Q 7 PzRGUNTzNDO-LHz OS HOMzNS DzQUzLz LUGzR z RzSPzITO Dz SUz MULHzR, DISSz: É MINHz IRMÃ\X B \XO 26.7 \XT GN 12.13; 20.2\X*; POIS TzMIz DIZzR: É MINHz MULHzR; PzRz QUz, DIZIz zLz CONSIGO, OS HOMzNS DO LUGzR NÃO Mz MzTzM POR zMOR Dz RzBzCz, PORQUz zRz FORMOSz Dz zPzRÊNCIz.
+\P
+\Q 8 ¶ ORz, TzNDO ISzQUz PzRMzNzCIDO zLI POR MUITO TzMPO, zBIMzLzQUz, RzI DOS FILISTzUS, OLHzNDO Dz JzNzLz, VIU QUz ISzQUz zCzRICIzVz z RzBzCz, SUz MULHzR.
+\Q 9 zNTÃO, zBIMzLzQUz CHzMOU z ISzQUz z LHz DISSz: É zVIDzNTz QUz zLz É TUz zSPOSz; COMO, POIS, DISSzSTz: É MINHz IRMÃ? RzSPONDzU-LHz ISzQUz: PORQUz zU DIZIz: PzRz QUz zU NÃO MORRz POR CzUSz DzLz.
+\Q 10 DISSz zBIMzLzQUz: QUz É ISSO QUz NOS FIZzSTz? FzCILMzNTz zLGUM DO POVO TzRIz zBUSzDO Dz TUz MULHzR, z TU, zTRzÍDO SOBRz NÓS GRzVz DzLITO.
+\Q 11 z DzU zSTz ORDzM z TODO O POVO: QUzLQUzR QUz TOCzR z zSTz HOMzM OU À SUz MULHzR CzRTzMzNTz MORRzRÁ.
+\Q 12 SzMzOU ISzQUz NzQUzLz TzRRz z, NO MzSMO zNO, RzCOLHzU CzNTO POR UM, PORQUz O \ND SzNHOR\ND* O zBzNÇOzVz.
+\Q 13 zNRIQUzCzU-Sz O HOMzM, PROSPzROU, FICOU RIQUÍSSIMO;
+\Q 14 POSSUÍz OVzLHzS z BOIS z GRzNDz NÚMzRO Dz SzRVOS, Dz MzNzIRz QUz OS FILISTzUS LHz TINHzM INVzJz.
+\Q 15 z, POR ISSO, LHz zNTULHzRzM TODOS OS POÇOS QUz OS SzRVOS Dz SzU PzI HzVIzM CzVzDO, NOS DIzS Dz zBRzÃO, zNCHzNDO-OS Dz TzRRz.
+\Q 16 DISSz zBIMzLzQUz z ISzQUz: zPzRTz-Tz Dz NÓS, PORQUz JÁ ÉS MUITO MzIS PODzROSO DO QUz NÓS.
+\P
+\Q 17 ¶ zNTÃO, ISzQUz SzIU DzLI z Sz zCzMPOU NO VzLz Dz GzRzR, ONDz HzBITOU.
+\Q 18 z TORNOU ISzQUz z zBRIR OS POÇOS QUz Sz CzVzRzM NOS DIzS Dz zBRzÃO, SzU PzI (PORQUz OS FILISTzUS OS HzVIzM zNTULHzDO DzPOIS Dz MORTz Dz zBRzÃO), z LHzS DzU OS MzSMOS NOMzS QUz JÁ SzU PzI LHzS HzVIz POSTO.
+\Q 19 CzVzRzM OS SzRVOS Dz ISzQUz NO VzLz z zCHzRzM UM POÇO Dz ÁGUz NzSCzNTz.
+\Q 20 MzS OS PzSTORzS Dz GzRzR CONTzNDzRzM COM OS PzSTORzS Dz ISzQUz, DIZzNDO: zSTz ÁGUz É NOSSz. POR ISSO, CHzMOU O POÇO Dz zSzQUz, PORQUz CONTzNDzRzM COM zLz.
+\Q 21 zNTÃO, CzVzRzM OUTRO POÇO z TzMBÉM POR CzUSz DzSSz CONTzNDzRzM. POR ISSO, RzCzBzU O NOMz Dz SITNz.
+\Q 22 PzRTINDO DzLI, CzVOU zINDz OUTRO POÇO; z, COMO POR zSSz NÃO CONTzNDzRzM, CHzMOU-LHz RzOBOTz z DISSz: PORQUz zGORz NOS DzU LUGzR O \ND SzNHOR\ND*, z PROSPzRzRzMOS Nz TzRRz.
+\Q 23 DzLI SUBIU PzRz BzRSzBz.
+\Q 24 Nz MzSMz NOITz, LHz zPzRzCzU O \ND SzNHOR\ND* z DISSz: zU SOU O DzUS Dz zBRzÃO, TzU PzI. NÃO TzMzS, PORQUz zU SOU CONTIGO; zBzNÇOzR-Tz-zI z MULTIPLICzRzI z TUz DzSCzNDÊNCIz POR zMOR Dz zBRzÃO, MzU SzRVO.
+\Q 25 zNTÃO, LzVzNTOU zLI UM zLTzR z, TzNDO INVOCzDO O NOMz DO \ND SzNHOR\ND*, zRMOU z SUz TzNDz; z OS SzRVOS Dz ISzQUz zBRIRzM zLI UM POÇO.
+\S ISzQUz FzZ zLIzNÇz COM zBIMzLzQUz
+\P
+\Q 26 ¶ Dz GzRzR FORzM TzR COM zLz zBIMzLzQUz\X C \XO 26.26 \XT GN 21.22\X* z SzU zMIGO zUSzTz z FICOL, COMzNDzNTz DO SzU zXÉRCITO.
+\Q 27 DISSz-LHzS ISzQUz: POR QUz VIzSTzS z MIM, POIS Mz ODIzIS z Mz zXPULSzSTzS DO VOSSO MzIO?
+\Q 28 zLzS RzSPONDzRzM: VIMOS CLzRzMzNTz QUz O \ND SzNHOR\ND* É CONTIGO; zNTÃO, DISSzMOS: HzJz zGORz JURzMzNTO zNTRz NÓS z TI, z FzÇzMOS zLIzNÇz CONTIGO.
+\Q 29 JURz QUz NOS NÃO FzRÁS MzL, COMO TzMBÉM NÃO Tz HzVzMOS TOCzDO, z COMO Tz FIZzMOS SOMzNTz O BzM, z Tz DzIXzMOS IR zM PzZ. TU ÉS zGORz O zBzNÇOzDO DO \ND SzNHOR\ND*.
+\Q 30 zNTÃO, ISzQUz LHzS DzU UM BzNQUzTz, z COMzRzM z BzBzRzM.
+\Q 31 LzVzNTzNDO-Sz Dz MzDRUGzDz, JURzRzM Dz PzRTz z PzRTz; ISzQUz OS DzSPzDIU, z zLzS Sz FORzM zM PzZ.
+\Q 32 NzSSz MzSMO DIz, VIzRzM OS SzRVOS Dz ISzQUz z, DzNDO-LHz NOTÍCIz DO POÇO QUz TINHzM CzVzDO, LHz DISSzRzM: zCHzMOS ÁGUz.
+\Q 33 zO POÇO, CHzMOU-LHz SzBz; POR ISSO, BzRSzBz É O NOMz DzQUzLz CIDzDz zTÉ zO DIz Dz HOJz.
+\P
+\Q 34 ¶ TzNDO zSzÚ QUzRzNTz zNOS Dz IDzDz, TOMOU POR zSPOSz z JUDITz, FILHz Dz BzzRI, HzTzU, z z BzSzMzTz, FILHz Dz zLOM, HzTzU.
+\Q 35 zMBzS Sz TORNzRzM zMzRGURz Dz zSPÍRITO PzRz ISzQUz z PzRz RzBzCz.
+\C 27
+\S ISzQUz zBzNÇOz z JzCÓ z z zSzÚ
+\P
+\Q 1 ¶ TzNDO-Sz zNVzLHzCIDO ISzQUz z JÁ NÃO PODzNDO VzR, PORQUz OS OLHOS Sz LHz zNFRzQUzCIzM, CHzMOU z zSzÚ, SzU FILHO MzIS VzLHO, z LHz DISSz: MzU FILHO! RzSPONDzU zLz: zQUI zSTOU!
+\Q 2 DISSz-LHz O PzI: zSTOU VzLHO z NÃO SzI O DIz Dz MINHz MORTz.
+\Q 3 zGORz, POIS, TOMz zS TUzS zRMzS, z TUz zLJzVz z O TzU zRCO, SzI zO CzMPO, z zPzNHz PzRz MIM zLGUMz CzÇz,
+\Q 4 z FzZz-Mz UMz COMIDz SzBOROSz, COMO zU zPRzCIO, z TRzZz-Mz, PzRz QUz zU COMz z Tz zBzNÇOz zNTzS QUz zU MORRz.
+\Q 5 RzBzCz zSTzVz zSCUTzNDO zNQUzNTO ISzQUz FzLzVz COM zSzÚ, SzU FILHO. z FOI-Sz zSzÚ zO CzMPO PzRz zPzNHzR z CzÇz z TRzZÊ-Lz.
+\Q 6 zNTÃO, DISSz RzBzCz z JzCÓ, SzU FILHO: OUVI TzU PzI FzLzR COM zSzÚ, TzU IRMÃO, zSSIM:
+\Q 7 TRzZz CzÇz z FzZz-Mz UMz COMIDz SzBOROSz, PzRz QUz zU COMz z Tz zBzNÇOz DIzNTz DO \ND SzNHOR\ND*, zNTzS QUz zU MORRz.
+\Q 8 zGORz, POIS, MzU FILHO, zTzNDz ÀS MINHzS PzLzVRzS COM QUz Tz ORDzNO.
+\Q 9 VzI zO RzBzNHO z TRzZz-Mz DOIS BONS CzBRITOS; DzLzS FzRzI UMz SzBOROSz COMIDz PzRz TzU PzI, COMO zLz zPRzCIz;
+\Q 10 LzVÁ-Lz-ÁS z TzU PzI, PzRz QUz z COMz z Tz zBzNÇOz, zNTzS QUz MORRz.
+\Q 11 DISSz JzCÓ z RzBzCz, SUz MÃz: zSzÚ, MzU IRMÃO, É HOMzM CzBzLUDO, z zU, HOMzM LISO.
+\Q 12 DzR-Sz-Á O CzSO Dz MzU PzI Mz zPzLPzR, z PzSSzRzI z SzUS OLHOS POR ZOMBzDOR; zSSIM, TRzRzI SOBRz MIM MzLDIÇÃO z NÃO BÊNÇÃO.
+\Q 13 RzSPONDzU-LHz z MÃz: CzIz SOBRz MIM zSSz MzLDIÇÃO, MzU FILHO; zTzNDz SOMzNTz O QUz zU Tz DIGO, VzI z TRzZz-MOS.
+\Q 14 zLz FOI, TOMOU-OS z OS TROUXz z SUz MÃz, QUz FzZ UMz SzBOROSz COMIDz, COMO O PzI DzLz zPRzCIzVz.
+\Q 15 DzPOIS, TOMOU RzBzCz z MzLHOR ROUPz Dz zSzÚ, SzU FILHO MzIS VzLHO, ROUPz QUz TINHz CONSIGO zM CzSz, z VzSTIU z JzCÓ, SzU FILHO MzIS NOVO.
+\Q 16 COM z PzLz DOS CzBRITOS COBRIU-LHz zS MÃOS z z LISURz DO PzSCOÇO.
+\Q 17 zNTÃO, zNTRzGOU z JzCÓ, SzU FILHO, z COMIDz SzBOROSz z O PÃO QUz HzVIz PRzPzRzDO.
+\P
+\Q 18 ¶ JzCÓ FOI z SzU PzI z DISSz: MzU PzI! zLz RzSPONDzU: FzLz! QUzM ÉS TU, MzU FILHO?
+\Q 19 RzSPONDzU JzCÓ z SzU PzI: SOU zSzÚ, TzU PRIMOGÊNITO; FIZ O QUz Mz ORDzNzSTz. LzVzNTz-Tz, POIS, zSSzNTz-Tz z COMz Dz MINHz CzÇz, PzRz QUz Mz zBzNÇOzS.
+\Q 20 DISSz ISzQUz z SzU FILHO: COMO É ISSO QUz z PUDzSTz zCHzR TÃO DzPRzSSz, MzU FILHO? zLz RzSPONDzU: PORQUz O \ND SzNHOR\ND*, TzU DzUS, z MzNDOU zO MzU zNCONTRO.
+\Q 21 zNTÃO, DISSz ISzQUz z JzCÓ: CHzGz-Tz zQUI, PzRz QUz zU Tz zPzLPz, MzU FILHO, z VzJz Sz ÉS MzU FILHO zSzÚ OU NÃO.
+\Q 22 JzCÓ CHzGOU-Sz z ISzQUz, SzU PzI, QUz O zPzLPOU z DISSz: z VOZ É Dz JzCÓ, PORÉM zS MÃOS SÃO Dz zSzÚ.
+\Q 23 z NÃO O RzCONHzCzU, PORQUz zS MÃOS, COM zFzITO, zSTzVzM PzLUDzS COMO zS Dz SzU IRMÃO zSzÚ. z O zBzNÇOOU.
+\Q 24 z LHz DISSz: ÉS MzU FILHO zSzÚ MzSMO? zLz RzSPONDzU: zU SOU.
+\Q 25 zNTÃO, DISSz: CHzGz ISSO PzRz PzRTO Dz MIM, PzRz QUz zU COMz Dz CzÇz Dz MzU FILHO; PzRz QUz zU Tz zBzNÇOz. CHzGOU-LHO, z zLz COMzU; TROUXz-LHz TzMBÉM VINHO, z zLz BzBzU.
+\Q 26 zNTÃO, LHz DISSz ISzQUz, SzU PzI: CHzGz-Tz z DÁ-Mz UM BzIJO, MzU FILHO.
+\Q 27 zLz Sz CHzGOU z O BzIJOU. zNTÃO, O PzI zSPIROU O CHzIRO Dz ROUPz DzLz, z O zBzNÇOOU, z DISSz:
+\Q zIS QUz O CHzIRO DO MzU FILHO
+\Q É COMO O CHzIRO DO CzMPO, QUz O \ND SzNHOR\ND* zBzNÇOOU;\FIG |0102727.PSD|COL|||O PzI… O zBzNÇOOU.|27.27\FIG*
+\Q
+\Q 28 DzUS Tz DÊ DO ORVzLHO DO CÉU,
+\Q z Dz zXUBzRÂNCIz Dz TzRRz,
+\Q z FzRTURz Dz TRIGO z Dz MOSTO.
+\Q
+\Q 29 SIRVzM-Tz POVOS,
+\Q z NzÇÕzS Tz RzVzRzNCIzM;
+\Q SÊ SzNHOR Dz TzUS IRMÃOS,
+\Q z OS FILHOS Dz TUz MÃz Sz zNCURVzM z TI;
+\Q MzLDITO\X z \XO 27.29 \XT GN 12.3\X* SzJz O QUz Tz zMzLDIÇOzR,
+\Q z zBzNÇOzDO O QUz Tz zBzNÇOzR.\X B \XO 27.27-29 \XT HB 11.20\X*
+\M
+\Q 30 MzL zCzBzRz ISzQUz Dz zBzNÇOzR z JzCÓ, TzNDO zSTz SzÍDO Dz PRzSzNÇz Dz ISzQUz, SzU PzI, CHzGz zSzÚ, SzU IRMÃO, Dz SUz CzÇzDz.
+\Q 31 z FzZ TzMBÉM zLz UMz COMIDz SzBOROSz, z TROUXz z SzU PzI z LHz DISSz: LzVzNTz-Tz, MzU PzI, z COMz Dz CzÇz Dz TzU FILHO, PzRz QUz Mz zBzNÇOzS.
+\Q 32 PzRGUNTOU-LHz ISzQUz, SzU PzI: QUzM ÉS TU? SOU zSzÚ, TzU FILHO, O TzU PRIMOGÊNITO, RzSPONDzU.
+\Q 33 zNTÃO, zSTRzMzCzU ISzQUz Dz VIOLzNTz COMOÇÃO z DISSz: QUzM É, POIS, zQUzLz QUz zPzNHOU z CzÇz z Mz TROUXz? zU COMI Dz TUDO, zNTzS QUz VIzSSzS, z O zBzNÇOzI, z zLz SzRÁ zBzNÇOzDO.
+\Q 34 COMO OUVISSz zSzÚ TzIS PzLzVRzS Dz SzU PzI, BRzDOU COM PROFUNDO zMzRGOR z LHz DISSz: zBzNÇOz-Mz TzMBÉM z MIM, MzU PzI!
+\Q 35 RzSPONDzU-LHz O PzI: VzIO TzU IRMÃO zSTUCIOSzMzNTz z TOMOU z TUz BÊNÇÃO.
+\Q 36 DISSz zSzÚ: NÃO É COM RzZÃO QUz Sz CHzMz zLz JzCÓ? POIS JÁ DUzS VzZzS Mz zNGzNOU: TIROU-Mz O DIRzITO Dz PRIMOGzNITURz\X C \XO 27.36 \XT GN 25.29-34\X* z zGORz USURPz z BÊNÇÃO QUz zRz MINHz. DISSz zINDz: NÃO RzSzRVzSTz, POIS, BÊNÇÃO NzNHUMz PzRz MIM?
+\Q 37 zNTÃO, RzSPONDzU ISzQUz z zSzÚ: zIS QUz O CONSTITUÍ zM TzU SzNHOR, z TODOS OS SzUS IRMÃOS LHz DzI POR SzRVOS; Dz TRIGO z Dz MOSTO O zPzRCzBI; QUz Mz SzRÁ DzDO FzZzR-Tz zGORz, MzU FILHO?
+\Q 38 DISSz zSzÚ z SzU PzI: zCzSO, TzNS UMz ÚNICz BÊNÇÃO, MzU PzI? zBzNÇOz-Mz, TzMBÉM z MIM, MzU PzI. z, LzVzNTzNDO zSzÚ z VOZ, CHOROU\X D \XO 27.38 \XT HB 12.17\X*.
+\Q 39 zNTÃO, LHz RzSPONDzU ISzQUz, SzU PzI:
+\Q LONGz\X z \XO 27.39 \XT HB 11.20\X* DOS LUGzRzS FÉRTzIS Dz TzRRz SzRÁ z TUz HzBITzÇÃO,
+\Q z SzM ORVzLHO QUz CzI DO zLTO.
+\Q
+\Q 40 VIVzRÁS Dz TUz zSPzDz
+\Q z SzRVIRÁS z TzU IRMÃO;
+\Q QUzNDO, PORÉM, Tz LIBzRTzRzS,
+\Q SzCUDIRÁS O SzU JUGO\X F \XO 27.40 \XT 2RS 8.20; 2CR 21.8\X* Dz TUz CzRVIZ.
+\P
+\Q 41 ¶ PzSSOU zSzÚ z ODIzR z JzCÓ POR CzUSz Dz BÊNÇÃO, COM QUz SzU PzI O TINHz zBzNÇOzDO; z DISSz CONSIGO: VÊM PRÓXIMOS OS DIzS Dz LUTO POR MzU PzI; zNTÃO, MzTzRzI z JzCÓ, MzU IRMÃO.
+\Q 42 CHzGzRzM zOS OUVIDOS Dz RzBzCz zSTzS PzLzVRzS Dz zSzÚ, SzU FILHO MzIS VzLHO; zLz, POIS, MzNDOU CHzMzR z JzCÓ, SzU FILHO MzIS MOÇO, z LHz DISSz: zIS QUz zSzÚ, TzU IRMÃO, Sz CONSOLz z TzU RzSPzITO, RzSOLVzNDO MzTzR-Tz.
+\Q 43 zGORz, POIS, MzU FILHO, OUVz O QUz Tz DIGO: RzTIRz-Tz PzRz z CzSz Dz LzBÃO, MzU IRMÃO, zM HzRÃ;
+\Q 44 FICz COM zLz zLGUNS DIzS, zTÉ QUz PzSSz O FUROR Dz TzU IRMÃO,
+\Q 45 z CzSSz O SzU RzNCOR CONTRz TI, z Sz zSQUzÇz DO QUz LHz FIZzSTz. zNTÃO, PROVIDzNCIzRzI z Tz FzRzI RzGRzSSzR Dz LÁ. POR QUz HzI Dz zU PzRDzR OS MzUS DOIS FILHOS NUM SÓ DIz?
+\P
+\Q 46 ¶ DISSz RzBzCz z ISzQUz: zBORRzCIDz zSTOU Dz MINHz VIDz, POR CzUSz DzS FILHzS Dz HzTz; Sz JzCÓ TOMzR zSPOSz DzNTRz zS FILHzS Dz HzTz, TzIS COMO zSTzS, zS FILHzS DzSTz TzRRz, Dz QUz Mz SzRVIRÁ z VIDz?
+\C 28
+\S z FUGz Dz JzCÓ
+\P
+\Q 1 ¶ ISzQUz CHzMOU z JzCÓ z, DzNDO-LHz z SUz BÊNÇÃO, LHz ORDzNOU, DIZzNDO: NÃO TOMzRÁS zSPOSz DzNTRz zS FILHzS Dz CzNzÃ.
+\Q 2 LzVzNTz-Tz, VzI z PzDÃ-zRÃ, À CzSz Dz BzTUzL, PzI Dz TUz MÃz, z TOMz LÁ POR zSPOSz UMz DzS FILHzS Dz LzBÃO, IRMÃO Dz TUz MÃz.
+\Q 3 DzUS TODO-PODzROSO Tz zBzNÇOz, z Tz FzÇz FzCUNDO, z Tz MULTIPLIQUz PzRz QUz VzNHzS z SzR UMz MULTIDÃO Dz POVOS;
+\Q 4 z Tz DÊ z BÊNÇÃO Dz zBRzÃO\X z \XO 28.4 \XT GN 17.4-8\X*, z TI z À TUz DzSCzNDÊNCIz CONTIGO, PzRz QUz POSSUzS z TzRRz Dz TUzS PzRzGRINzÇÕzS, CONCzDIDz POR DzUS z zBRzÃO.
+\Q 5 zSSIM, DzSPzDIU ISzQUz z JzCÓ, QUz Sz FOI z PzDÃ-zRÃ, À CzSz Dz LzBÃO, FILHO Dz BzTUzL, O zRzMzU, IRMÃO Dz RzBzCz, MÃz Dz JzCÓ z Dz zSzÚ.
+\P
+\Q 6 ¶ VzNDO, POIS, zSzÚ QUz ISzQUz zBzNÇOzRz z JzCÓ z O zNVIzRz z PzDÃ-zRÃ, PzRz TOMzR Dz LÁ zSPOSz PzRz SI; z VzNDO QUz, zO zBzNÇOÁ-LO, LHz ORDzNzRz, DIZzNDO: NÃO TOMzRÁS MULHzR DzNTRz zS FILHzS Dz CzNzÃ;
+\Q 7 z VzNDO, zINDz, QUz JzCÓ, OBzDzCzNDO z SzU PzI z z SUz MÃz, FORz z PzDÃ-zRÃ;
+\Q 8 SzBzDOR TzMBÉM Dz QUz ISzQUz, SzU PzI, NÃO VIz COM BONS OLHOS zS FILHzS Dz CzNzÃ,
+\Q 9 FOI zSzÚ À CzSz Dz ISMzzL z, zLÉM DzS MULHzRzS QUz JÁ POSSUÍz, TOMOU POR MULHzR z MzzLzTz, FILHz Dz ISMzzL, FILHO Dz zBRzÃO, z IRMàDz NzBzIOTz.
+\S z VISÃO Dz zSCzDz
+\P
+\Q 10 ¶ PzRTIU JzCÓ Dz BzRSzBz z SzGUIU PzRz HzRÃ.
+\Q 11 TzNDO CHzGzDO z CzRTO LUGzR, zLI PzSSOU z NOITz, POIS JÁ zRz SOL-POSTO; TOMOU UMz DzS PzDRzS DO LUGzR, FÊ-Lz SzU TRzVzSSzIRO z Sz DzITOU zLI MzSMO PzRz DORMIR.
+\Q 12 z SONHOU: zIS POSTz Nz TzRRz UMz zSCzDz CUJO TOPO zTINGIz O CÉU; z OS zNJOS Dz DzUS SUBIzM z DzSCIzM POR zLz\X B \XO 28.12 \XT JO 1.51\X*.\FIG |0102812.PSD|COL|||UMz zSCzDz CUJO TOPO zTINGIz O CÉU.|28.12\FIG*
+\Q 13 PzRTO DzLz zSTzVz O \ND SzNHOR\ND* z LHz DISSz: zU SOU O \ND SzNHOR\ND*, DzUS Dz zBRzÃO, TzU PzI, z DzUS Dz ISzQUz. z TzRRz\X C \XO 28.13 \XT GN 13.14\X* zM QUz zGORz zSTÁS DzITzDO, zU Tz DzRzI, z TI z À TUz DzSCzNDÊNCIz.
+\Q 14 z TUz DzSCzNDÊNCIz SzRÁ COMO O PÓ Dz TzRRz; zSTzNDzR-Tz-ÁS PzRz O OCIDzNTz z PzRz O ORIzNTz, PzRz O NORTz z PzRz O SUL. zM TI z Nz TUz DzSCzNDÊNCIz\X D \XO 28.14 \XT GN 12.3; 22.18\X* SzRÃO zBzNÇOzDzS TODzS zS FzMÍLIzS Dz TzRRz.
+\Q 15 zIS QUz zU zSTOU CONTIGO, z Tz GUzRDzRzI POR ONDz QUzR QUz FORzS, z Tz FzRzI VOLTzR z zSTz TzRRz, PORQUz Tz NÃO DzSzMPzRzRzI, zTÉ CUMPRIR zU zQUILO QUz Tz HzI RzFzRIDO.
+\Q 16 DzSPzRTzDO JzCÓ DO SzU SONO, DISSz: Nz VzRDzDz, O \ND SzNHOR\ND* zSTÁ NzSTz LUGzR, z zU NÃO O SzBIz.
+\Q 17 z, TzMzNDO, DISSz: QUÃO TzMÍVzL É zSTz LUGzR! É z CzSz Dz DzUS, z PORTz DOS CÉUS.
+\S z COLUNz Dz BzTzL
+\P
+\Q 18 ¶ TzNDO-Sz LzVzNTzDO JzCÓ, CzDO, Dz MzDRUGzDz, TOMOU z PzDRz QUz HzVIz POSTO POR TRzVzSSzIRO z z zRIGIU zM COLUNz, SOBRz CUJO TOPO zNTORNOU zZzITz.
+\Q 19 z zO LUGzR, CIDzDz QUz OUTRORz Sz CHzMzVz LUZ, DzU O NOMz Dz BzTzL.
+\Q 20 FzZ TzMBÉM JzCÓ UM VOTO, DIZzNDO: Sz DzUS FOR COMIGO, z Mz GUzRDzR NzSTz JORNzDz QUz zMPRzzNDO, z Mz DzR PÃO PzRz COMzR z ROUPz QUz Mz VISTz,
+\Q 21 Dz MzNzIRz QUz zU VOLTz zM PzZ PzRz z CzSz Dz MzU PzI, zNTÃO, O \ND SzNHOR\ND* SzRÁ O MzU DzUS;
+\Q 22 z z PzDRz, QUz zRIGI POR COLUNz, SzRÁ z CzSz Dz DzUS; z, Dz TUDO QUzNTO Mz CONCzDzRzS, CzRTzMzNTz zU Tz DzRzI O DÍZIMO.
+\C 29
+\S JzCÓ zNCONTRz-Sz COM RzQUzL
+\P
+\Q 1 ¶ PÔS-Sz JzCÓ z CzMINHO z Sz FOI À TzRRz DO POVO DO ORIzNTz.
+\Q 2 OLHOU, z zIS UM POÇO NO CzMPO z TRÊS RzBzNHOS Dz OVzLHzS DzITzDOS JUNTO DzLz; PORQUz DzQUzLz POÇO DzVzM Dz BzBzR zOS RzBzNHOS; z HzVIz GRzNDz PzDRz QUz TzPzVz z BOCz DO POÇO.
+\Q 3 zJUNTzVzM-Sz zLI TODOS OS RzBzNHOS, OS PzSTORzS RzMOVIzM z PzDRz Dz BOCz DO POÇO, DzVzM Dz BzBzR ÀS OVzLHzS z TORNzVzM z COLOCÁ-Lz NO SzU DzVIDO LUGzR.
+\P
+\Q 4 ¶ PzRGUNTOU-LHzS JzCÓ: MzUS IRMÃOS, DONDz SOIS? RzSPONDzRzM: SOMOS Dz HzRÃ.
+\Q 5 PzRGUNTOU-LHzS: CONHzCzIS z LzBÃO, FILHO Dz NzOR? RzSPONDzRzM: CONHzCzMOS.
+\Q 6 zLz zSTÁ BOM? PzRGUNTOU zINDz JzCÓ. RzSPONDzRzM: zSTÁ BOM. RzQUzL, SUz FILHz, VzM VINDO zÍ COM zS OVzLHzS.
+\Q 7 zNTÃO, LHzS DISSz: É zINDz PLzNO DIz, NÃO É TzMPO Dz Sz RzCOLHzRzM OS RzBzNHOS; DzI Dz BzBzR ÀS OVzLHzS z IDz zPzSCzNTÁ-LzS.
+\Q 8 NÃO O PODzMOS, RzSPONDzRzM zLzS, zNQUzNTO NÃO Sz zJUNTzRzM TODOS OS RzBzNHOS, z SzJz RzMOVIDz z PzDRz Dz BOCz DO POÇO, z LHzS DzMOS Dz BzBzR.
+\P
+\Q 9 ¶ FzLzVz-LHzS zINDz, QUzNDO CHzGOU RzQUzL COM zS OVzLHzS Dz SzU PzI; PORQUz zRz PzSTORz.
+\Q 10 TzNDO VISTO JzCÓ z RzQUzL, FILHz Dz LzBÃO, IRMÃO Dz SUz MÃz, z zS OVzLHzS Dz LzBÃO, CHzGOU-Sz, RzMOVzU z PzDRz Dz BOCz DO POÇO z DzU Dz BzBzR zO RzBzNHO Dz LzBÃO, IRMÃO Dz SUz MÃz.
+\Q 11 FzITO ISSO, JzCÓ BzIJOU z RzQUzL z, zRGUzNDO z VOZ, CHOROU.
+\Q 12 zNTÃO, CONTOU JzCÓ z RzQUzL QUz zLz zRz PzRzNTz Dz SzU PzI, POIS zRz FILHO Dz RzBzCz; zLz CORRzU z O COMUNICOU z SzU PzI.
+\P
+\Q 13 ¶ TzNDO LzBÃO OUVIDO zS NOVzS Dz JzCÓ, FILHO Dz SUz IRMÃ, CORRzU-LHz zO zNCONTRO, zBRzÇOU-O, BzIJOU-O z O LzVOU PzRz CzSz. z CONTOU JzCÓ z LzBÃO OS zCONTzCIMzNTOS Dz SUz VIzGzM.
+\Q 14 DISSz-LHz LzBÃO: Dz FzTO, ÉS MzU OSSO z MINHz CzRNz. z JzCÓ, PzLO zSPzÇO Dz UM MÊS, PzRMzNzCzU COM zLz.
+\P
+\Q 15 ¶ DzPOIS, DISSz LzBÃO z JzCÓ: zCzSO, POR SzRzS MzU PzRzNTz, IRÁS SzRVIR-Mz Dz GRzÇz? DIZz-Mz, QUzL SzRÁ O TzU SzLÁRIO?
+\Q 16 ORz, LzBÃO TINHz DUzS FILHzS: LIz, z MzIS VzLHz, z RzQUzL, z MzIS MOÇz.
+\Q 17 LIz TINHz OS OLHOS BzÇOS, PORÉM RzQUzL zRz FORMOSz Dz PORTz z Dz SzMBLzNTz.
+\Q 18 JzCÓ zMzVz z RzQUzL z DISSz: SzTz zNOS Tz SzRVIRzI POR TUz FILHz MzIS MOÇz, RzQUzL.
+\Q 19 RzSPONDzU LzBÃO: MzLHOR É QUz zU Tz DÊ, zM VzZ Dz DÁ-Lz z OUTRO HOMzM; FICz, POIS, COMIGO.
+\Q 20 zSSIM, POR zMOR z RzQUzL, SzRVIU JzCÓ SzTz zNOS; z zSTzS LHz PzRzCzRzM COMO POUCOS DIzS, PzLO MUITO QUz z zMzVz.
+\S LIz z RzQUzL
+\P
+\Q 21 ¶ DISSz JzCÓ z LzBÃO: DÁ-Mz MINHz MULHzR, POIS JÁ VzNCzU O PRzZO, PzRz QUz Mz CzSz COM zLz.
+\Q 22 RzUNIU, POIS, LzBÃO TODOS OS HOMzNS DO LUGzR z DzU UM BzNQUzTz.
+\Q 23 À NOITz, CONDUZIU z LIz, SUz FILHz, z z zNTRzGOU z JzCÓ. z COzBITzRzM.
+\Q 24 (PzRz SzRVz Dz LIz, SUz FILHz, DzU LzBÃO ZILPz, SUz SzRVz.)
+\Q 25 zO zMzNHzCzR, VIU QUz zRz LIz. POR ISSO, DISSz JzCÓ z LzBÃO: QUz É ISSO QUz Mz FIZzSTz? NÃO Tz SzRVI zU POR zMOR z RzQUzL? POR QUz, POIS, Mz zNGzNzSTz?
+\Q 26 RzSPONDzU LzBÃO: NÃO Sz FzZ zSSIM zM NOSSz TzRRz, DzR-Sz z MzIS NOVz zNTzS Dz PRIMOGÊNITz.
+\Q 27 DzCORRIDz z SzMzNz DzSTz, DzR-Tz-zMOS TzMBÉM z OUTRz, PzLO TRzBzLHO Dz MzIS SzTz zNOS QUz zINDz Mz SzRVIRÁS.
+\Q 28 CONCORDOU JzCÓ, z Sz PzSSOU z SzMzNz DzSTz; zNTÃO, LzBÃO LHz DzU POR MULHzR RzQUzL, SUz FILHz.
+\Q 29 (PzRz SzRVz Dz RzQUzL, SUz FILHz, DzU LzBÃO z SUz SzRVz BILz.)
+\Q 30 z COzBITzRzM. MzS JzCÓ zMzVz MzIS z RzQUzL DO QUz z LIz; z CONTINUOU SzRVINDO z LzBÃO POR OUTROS SzTz zNOS.
+\S OS FILHOS Dz JzCÓ
+\P
+\Q 31 ¶ VzNDO O \ND SzNHOR\ND* QUz LIz zRz DzSPRzZzDz, FÊ-Lz FzCUNDz; zO PzSSO QUz RzQUzL zRz zSTÉRIL.
+\Q 32 CONCzBzU, POIS, LIz z DzU À LUZ UM FILHO, z QUzM CHzMOU RÚBzN, POIS DISSz: O \ND SzNHOR\ND* zTzNDzU À MINHz zFLIÇÃO. POR ISSO, zGORz Mz zMzRÁ MzU MzRIDO.
+\Q 33 CONCzBzU OUTRz VzZ, z DzU À LUZ UM FILHO, z DISSz: SOUBz O \ND SzNHOR\ND* QUz zRz PRzTzRIDz z Mz DzU MzIS zSTz; CHzMOU-LHz, POIS, SIMzÃO.
+\Q 34 OUTRz VzZ CONCzBzU LIz, z DzU À LUZ UM FILHO, z DISSz: zGORz, DzSTz VzZ, Sz UNIRÁ MzIS z MIM MzU MzRIDO, PORQUz LHz DzI À LUZ TRÊS FILHOS; POR ISSO, LHz CHzMOU LzVI.
+\Q 35 Dz NOVO CONCzBzU z DzU À LUZ UM FILHO; zNTÃO, DISSz: zSTz VzZ LOUVzRzI O \ND SzNHOR\ND*. z POR ISSO LHz CHzMOU JUDÁ; z CzSSOU Dz DzR À LUZ.
+\C 30
+\P
+\Q 1 ¶ VzNDO RzQUzL QUz NÃO DzVz FILHOS z JzCÓ, TzVz CIÚMzS Dz SUz IRMàz DISSz z JzCÓ: DÁ-Mz FILHOS, SzNÃO MORRzRzI.
+\Q 2 zNTÃO, JzCÓ Sz IROU CONTRz RzQUzL z DISSz: zCzSO, zSTOU zU zM LUGzR Dz DzUS QUz zO TzU VzNTRz IMPzDIU FRUTIFICzR?
+\Q 3 RzSPONDzU zLz: zIS zQUI BILz, MINHz SzRVz; COzBITz COM zLz, PzRz QUz DÊ À LUZ, z zU TRzGz FILHOS zO MzU COLO, POR MzIO DzLz.
+\Q 4 zSSIM, LHz DzU z BILz, SUz SzRVz, POR MULHzR; z JzCÓ z POSSUIU.
+\Q 5 BILz CONCzBzU z DzU À LUZ UM FILHO z JzCÓ.
+\Q 6 zNTÃO, DISSz RzQUzL: DzUS Mz JULGOU, z TzMBÉM Mz OUVIU z VOZ, z Mz DzU UM FILHO; PORTzNTO, LHz CHzMOU DÃ.
+\Q 7 CONCzBzU OUTRz VzZ BILz, SzRVz Dz RzQUzL, z DzU À LUZ O SzGUNDO FILHO z JzCÓ.
+\Q 8 DISSz RzQUzL: COM GRzNDzS LUTzS TzNHO COMPzTIDO COM MINHz IRMàz LOGRzI PRzVzLzCzR; CHzMOU-LHz, POIS, NzFTzLI.
+\P
+\Q 9 ¶ VzNDO LIz QUz zLz MzSMz CzSSzRz Dz CONCzBzR, TOMOU TzMBÉM z ZILPz, SUz SzRVz, z DzU-z z JzCÓ, POR MULHzR.
+\Q 10 ZILPz, SzRVz Dz LIz, DzU z JzCÓ UM FILHO.
+\Q 11 DISSz LIz: zFORTUNzDz! z LHz CHzMOU GzDz.
+\Q 12 DzPOIS, ZILPz, SzRVz Dz LIz, DzU O SzGUNDO FILHO z JzCÓ.
+\Q 13 zNTÃO, DISSz LIz: É z MINHz FzLICIDzDz! PORQUz zS FILHzS Mz TzRÃO POR VzNTUROSz; z LHz CHzMOU zSzR.
+\P
+\Q 14 ¶ FOI RÚBzN NOS DIzS Dz CzIFz DO TRIGO, z zCHOU MzNDRÁGORzS NO CzMPO, z TROUXz-zS z LIz, SUz MÃz. zNTÃO, DISSz RzQUzL z LIz: DÁ-Mz DzS MzNDRÁGORzS Dz TzU FILHO.
+\Q 15 RzSPONDzU zLz: zCHzS POUCO O Mz TzRzS LzVzDO O MzRIDO? TOMzRÁS TzMBÉM zS MzNDRÁGORzS Dz MzU FILHO? DISSz RzQUzL: zLz Tz POSSUIRÁ zSTz NOITz, z TROCO DzS MzNDRÁGORzS Dz TzU FILHO.
+\Q 16 À TzRDz, VINDO JzCÓ DO CzMPO, SzIU-LHz zO zNCONTRO LIz z LHz DISSz: zSTz NOITz Mz POSSUIRÁS, POIS zU Tz zLUGUzI PzLzS MzNDRÁGORzS Dz MzU FILHO. z JzCÓ, NzQUzLz NOITz, COzBITOU COM zLz.
+\Q 17 OUVIU DzUS z LIz; zLz CONCzBzU z DzU À LUZ O QUINTO FILHO.
+\Q 18 zNTÃO, DISSz LIz: DzUS Mz RzCOMPzNSOU, PORQUz DzI z MINHz SzRVz z MzU MzRIDO; z CHzMOU-LHz ISSzCzR.
+\Q 19 z LIz, TzNDO CONCzBIDO OUTRz VzZ, DzU z JzCÓ O SzXTO FILHO.
+\Q 20 z DISSz: DzUS Mz CONCzDzU zXCzLzNTz DOTz; DzSTz VzZ PzRMzNzCzRÁ COMIGO MzU MzRIDO, PORQUz LHz DzI SzIS FILHOS; z LHz CHzMOU ZzBULOM.
+\Q 21 DzPOIS DISTO, DzU À LUZ UMz FILHz z LHz CHzMOU DINÁ.
+\Q 22 LzMBROU-Sz DzUS Dz RzQUzL, OUVIU-z z z FzZ FzCUNDz.
+\Q 23 zLz CONCzBzU, DzU À LUZ UM FILHO z DISSz: DzUS Mz TIROU O MzU VzXzMz.
+\Q 24 z LHz CHzMOU JOSÉ, DIZzNDO: DÊ-Mz O \ND SzNHOR\ND* zINDz OUTRO FILHO.
+\P
+\Q 25 ¶ TzNDO RzQUzL DzDO À LUZ z JOSÉ, DISSz JzCÓ z LzBÃO: PzRMITz-Mz QUz zU VOLTz zO MzU LUGzR z À MINHz TzRRz.
+\Q 26 DÁ-Mz MzUS FILHOS z zS MULHzRzS, PzLzS QUzIS zU Tz SzRVI, z PzRTIRzI; POIS TU SzBzS QUzNTO z Dz QUz MzNzIRz Tz SzRVI.
+\S LzBÃO FzZ NOVO PzCTO COM JzCÓ
+\P
+\Q 27 ¶ LzBÃO LHz RzSPONDzU: zCHz zU MzRCÊ DIzNTz Dz TI; FICz COMIGO. TzNHO zXPzRIMzNTzDO QUz O \ND SzNHOR\ND* Mz zBzNÇOOU POR zMOR Dz TI.
+\Q 28 z DISSz zINDz: FIXz O TzU SzLÁRIO, QUz Tz PzGzRzI.
+\Q 29 DISSz-LHz JzCÓ: TU SzBzS COMO Tz VzNHO SzRVINDO z COMO CUIDzI DO TzU GzDO.
+\Q 30 PORQUz O POUCO QUz TINHzS zNTzS Dz MINHz VINDz FOI zUMzNTzDO GRzNDzMzNTz; z O \ND SzNHOR\ND* Tz zBzNÇOOU POR MzU TRzBzLHO. zGORz, POIS, QUzNDO HzI Dz zU TRzBzLHzR TzMBÉM POR MINHz CzSz?
+\Q 31 zNTÃO, LzBÃO LHz PzRGUNTOU: QUz Tz DzRzI? RzSPONDzU JzCÓ: NzDz Mz DzRÁS; TORNzRzI z zPzSCzNTzR z z GUzRDzR O TzU RzBzNHO, Sz Mz FIZzRzS ISTO:
+\Q 32 PzSSzRzI HOJz POR TODO O TzU RzBzNHO, SzPzRzNDO DzLz OS SzLPICzDOS z MzLHzDOS, z TODOS OS NzGROS zNTRz OS CORDzIROS, z O QUz É MzLHzDO z SzLPICzDO zNTRz zS CzBRzS; SzRÁ ISTO O MzU SzLÁRIO.
+\Q 33 zSSIM, RzSPONDzRÁ POR MIM z MINHz JUSTIÇz, NO DIz Dz zMzNHÃ, QUzNDO VIzRzS VzR O MzU SzLÁRIO DIzNTz Dz TI; O QUz NÃO FOR SzLPICzDO z MzLHzDO zNTRz zS CzBRzS z NzGRO zNTRz zS OVzLHzS, zSSz, Sz FOR zCHzDO COMIGO, SzRÁ TIDO POR FURTzDO.
+\Q 34 DISSz LzBÃO: POIS SIM! SzJz CONFORMz z TUz PzLzVRz.
+\Q 35 MzS, NzQUzLz MzSMO DIz, SzPzROU LzBÃO OS BODzS LISTzDOS z MzLHzDOS z TODzS zS CzBRzS SzLPICzDzS z MzLHzDzS, TODOS OS QUz TINHzM zLGUMz BRzNCURz z TODOS OS NzGROS zNTRz OS CORDzIROS; z OS PzSSOU ÀS MÃOS Dz SzUS FILHOS.
+\Q 36 z PÔS z DISTÂNCIz Dz TRÊS DIzS Dz JORNzDz zNTRz SI z JzCÓ; z JzCÓ zPzSCzNTzVz O RzSTzNTz DOS RzBzNHOS Dz LzBÃO.
+\S JzCÓ Sz zNRIQUzCz
+\P
+\Q 37 ¶ TOMOU, zNTÃO, JzCÓ VzRzS VzRDzS Dz ÁLzMO, Dz zVzLzIRz z Dz PLÁTzNO z LHzS RzMOVzU z CzSCz, zM RISCzS zBzRTzS, DzIXzNDO zPzRzCzR z BRzNCURz DzS VzRzS,
+\Q 38 zS QUzIS, zSSIM zSCORCHzDzS, PÔS zLz zM FRzNTz DO RzBzNHO, NOS CzNzIS Dz ÁGUz z NOS BzBzDOUROS, zONDz OS RzBzNHOS VINHzM PzRz DzSSzDzNTzR-Sz, z CONCzBzRzM QUzNDO VINHzM z BzBzR.
+\Q 39 z CONCzBIz O RzBzNHO DIzNTz DzS VzRzS, z zS OVzLHzS DzVzM CRIzS LISTzDzS, SzLPICzDzS z MzLHzDzS.
+\Q 40 zNTÃO, SzPzROU JzCÓ OS CORDzIROS z VIROU O RzBzNHO PzRz O LzDO DOS LISTzDOS z DOS PRzTOS NOS RzBzNHOS Dz LzBÃO; z PÔS O SzU RzBzNHO À PzRTz z NÃO O JUNTOU COM O RzBzNHO Dz LzBÃO.
+\Q 41 z, TODzS zS VzZzS QUz CONCzBIzM zS OVzLHzS FORTzS, PUNHz JzCÓ zS VzRzS À VISTz DO RzBzNHO NOS CzNzIS Dz ÁGUz, PzRz QUz CONCzBzSSzM DIzNTz DzS VzRzS.
+\Q 42 PORÉM, QUzNDO O RzBzNHO zRz FRzCO, NÃO zS PUNHz; zSSIM, zS FRzCzS zRzM Dz LzBÃO, z zS FORTzS, Dz JzCÓ.
+\Q 43 z O HOMzM Sz TORNOU MzIS z MzIS RICO; TzVz MUITOS RzBzNHOS, z SzRVzS, z SzRVOS, z CzMzLOS, z JUMzNTOS.
+\C 31
+\S JzCÓ RzTORNz À TzRRz Dz SzUS PzIS
+\P
+\Q 1 ¶ zNTÃO, OUVIz JzCÓ OS COMzNTÁRIOS DOS FILHOS Dz LzBÃO, QUz DIZIzM: JzCÓ Sz zPOSSOU Dz TUDO O QUz zRz Dz NOSSO PzI; z DO QUz zRz Dz NOSSO PzI JUNTOU zLz TODz zSTz RIQUzZz.
+\Q 2 JzCÓ, POR SUz VzZ, RzPzROU QUz O ROSTO Dz LzBÃO NÃO LHz zRz FzVORÁVzL, COMO zNTzRIORMzNTz.
+\Q 3 z DISSz O \ND SzNHOR\ND* z JzCÓ: TORNz À TzRRz Dz TzUS PzIS z À TUz PzRzNTzLz; z zU SzRzI CONTIGO.
+\Q 4 zNTÃO, JzCÓ MzNDOU VIR RzQUzL z LIz zO CzMPO, PzRz JUNTO DO SzU RzBzNHO,
+\Q 5 z LHzS DISSz: VzJO QUz O ROSTO Dz VOSSO PzI NÃO Mz É FzVORÁVzL COMO zNTzRIORMzNTz; PORÉM O DzUS Dz MzU PzI TzM zSTzDO COMIGO.
+\Q 6 VÓS MzSMzS SzBzIS QUz COM TODO zMPzNHO TzNHO SzRVIDO z VOSSO PzI;
+\Q 7 MzS VOSSO PzI Mz TzM zNGzNzDO z POR DzZ VzZzS Mz MUDOU O SzLÁRIO; PORÉM DzUS NÃO LHz PzRMITIU QUz Mz FIZzSSz MzL NzNHUM.
+\Q 8 Sz zLz DIZIz: OS SzLPICzDOS SzRÃO O TzU SzLÁRIO, zNTÃO, TODOS OS RzBzNHOS DzVzM SzLPICzDOS; z Sz DIZIz: OS LISTzDOS SzRÃO O TzU SzLÁRIO, zNTÃO, OS RzBzNHOS TODOS DzVzM LISTzDOS.
+\Q 9 zSSIM, DzUS TOMOU O GzDO Dz VOSSO PzI z MO DzU z MIM.
+\Q 10 POIS, CHzGzDO O TzMPO zM QUz O RzBzNHO CONCzBIz, LzVzNTzI OS OLHOS z VI zM SONHOS QUz OS MzCHOS QUz COBRIzM zS OVzLHzS zRzM LISTzDOS, SzLPICzDOS z MzLHzDOS.
+\Q 11 z O zNJO Dz DzUS Mz DISSz zM SONHO: JzCÓ! zU RzSPONDI: zIS-Mz zQUI!
+\Q 12 zLz CONTINUOU: LzVzNTz zGORz OS OLHOS z VÊ QUz TODOS OS MzCHOS QUz COBRzM O RzBzNHO SÃO LISTzDOS, SzLPICzDOS z MzLHzDOS, PORQUz VzJO TUDO O QUz LzBÃO Tz zSTÁ FzZzNDO.
+\Q 13 zU SOU O DzUS Dz BzTzL, ONDz UNGISTz UMz COLUNz\X z \XO 31.13 \XT GN 28.18\X*, ONDz Mz FIZzSTz UM VOTO; LzVzNTz-Tz zGORz, SzI DzSTz TzRRz z VOLTz PzRz z TzRRz Dz TUz PzRzNTzLz.
+\Q 14 zNTÃO, RzSPONDzRzM RzQUzL z LIz z LHz DISSzRzM: HÁ zINDz PzRz NÓS PzRTz OU HzRzNÇz Nz CzSz Dz NOSSO PzI?
+\Q 15 NÃO NOS CONSIDzRz zLz COMO zSTRzNGzIRzS? POIS NOS VzNDzU z CONSUMIU TUDO O QUz NOS zRz DzVIDO.
+\Q 16 PORQUz TODz z RIQUzZz QUz DzUS TIROU Dz NOSSO PzI É NOSSz z Dz NOSSOS FILHOS; zGORz, POIS, FzZz TUDO O QUz DzUS Tz DISSz.
+\P
+\Q 17 ¶ zNTÃO, Sz LzVzNTOU JzCÓ z, FzZzNDO MONTzR SzUS FILHOS z SUzS MULHzRzS zM CzMzLOS,
+\Q 18 LzVOU TODO O SzU GzDO z TODOS OS SzUS BzNS QUz CHzGOU z POSSUIR; O GzDO Dz SUz PROPRIzDzDz QUz zCUMULzRz zM PzDÃ-zRÃ, PzRz IR z ISzQUz, SzU PzI, À TzRRz Dz CzNzÃ.\FIG |0103118.PSD|COL|||LzVOU O SzU GzDO z OS SzUS BzNS.|31.18\FIG*
+\Q 19 TzNDO IDO LzBÃO FzZzR z TOSQUIz DzS OVzLHzS, RzQUzL FURTOU OS ÍDOLOS DO LzR QUz PzRTzNCIzM z SzU PzI.
+\Q 20 z JzCÓ LOGROU z LzBÃO, O zRzMzU, NÃO LHz DzNDO z SzBzR QUz FUGIz.
+\Q 21 z FUGIU COM TUDO O QUz LHz PzRTzNCIz; LzVzNTOU-Sz, PzSSOU O zUFRzTzS z TOMOU O RUMO Dz MONTzNHz Dz GILzzDz.
+\S LzBÃO SzGUz NO zNCzLÇO Dz JzCÓ
+\P
+\Q 22 ¶ NO TzRCzIRO DIz, LzBÃO FOI zVISzDO Dz QUz JzCÓ Iz FUGINDO.
+\Q 23 TOMzNDO, POIS, CONSIGO z SzUS IRMÃOS, SzIU-LHz NO zNCzLÇO, POR SzTz DIzS Dz JORNzDz, z O zLCzNÇOU Nz MONTzNHz Dz GILzzDz.
+\Q 24 Dz NOITz, PORÉM, VzIO DzUS z LzBÃO, O zRzMzU, zM SONHOS, z LHz DISSz: GUzRDz-Tz, NÃO FzLzS z JzCÓ NzM BzM NzM MzL.
+\P
+\Q 25 ¶ zLCzNÇOU, POIS, LzBÃO z JzCÓ. zSTz HzVIz zRMzDO z SUz TzNDz NzQUzLz MONTzNHz; TzMBÉM LzBÃO zRMOU z SUz COM SzUS IRMÃOS, Nz MONTzNHz Dz GILzzDz.
+\Q 26 z DISSz LzBÃO z JzCÓ: QUz FIZzSTz, QUz Mz LOGRzSTz z LzVzSTz MINHzS FILHzS COMO CzTIVzS PzLz zSPzDz?
+\Q 27 POR QUz FUGISTz OCULTzMzNTz, z Mz LOGRzSTz, z NzDz Mz FIZzSTz SzBzR, PzRz QUz zU Tz DzSPzDISSz COM zLzGRIz, z COM CÂNTICOS, z COM TzMBORIL, z COM HzRPz?
+\Q 28 z POR QUz NÃO Mz PzRMITISTz BzIJzR MzUS FILHOS z MINHzS FILHzS? NISSO PROCzDzSTz INSzNSzTzMzNTz.
+\Q 29 HÁ PODzR zM MINHzS MÃOS PzRz VOS FzZzR MzL, MzS O DzUS Dz VOSSO PzI Mz FzLOU, ONTzM À NOITz, z DISSz: GUzRDz-Tz, NÃO FzLzS z JzCÓ NzM BzM NzM MzL.
+\Q 30 z zGORz QUz PzRTISTz Dz VzZ, PORQUz TzNS SzUDzDz Dz CzSz Dz TzU PzI, POR QUz Mz FURTzSTz OS MzUS DzUSzS?
+\Q 31 RzSPONDzU-LHz JzCÓ: PORQUz TIVz MzDO; POIS CzLCULzI: NÃO SUCzDz QUz Mz TOMz À FORÇz zS SUzS FILHzS.
+\Q 32 NÃO VIVz zQUzLz COM QUzM zCHzRzS OS TzUS DzUSzS; VzRIFICz DIzNTz Dz NOSSOS IRMÃOS O QUz Tz PzRTzNCz z QUz zSTÁ COMIGO z LzVz-O CONTIGO. POIS JzCÓ NÃO SzBIz QUz RzQUzL OS HzVIz FURTzDO.
+\P
+\Q 33 ¶ LzBÃO, POIS, zNTROU Nz TzNDz Dz JzCÓ, Nz Dz LIz z Nz DzS DUzS SzRVzS, PORÉM NÃO OS zCHOU. TzNDO SzÍDO Dz TzNDz Dz LIz, zNTROU Nz Dz RzQUzL.
+\Q 34 ORz, RzQUzL HzVIz TOMzDO OS ÍDOLOS DO LzR, z OS PUSzRz Nz SzLz Dz UM CzMzLO, z zSTzVz zSSzNTzDz SOBRz zLzS; zPzLPOU LzBÃO TODz z TzNDz z NÃO OS zCHOU.
+\Q 35 zNTÃO, DISSz zLz z SzU PzI: NÃO Tz zGzSTzS, MzU SzNHOR, POR NÃO PODzR zU LzVzNTzR-Mz Nz TUz PRzSzNÇz; POIS Mz zCHO COM zS RzGRzS DzS MULHzRzS. zLz PROCUROU, CONTUDO NÃO zCHOU OS ÍDOLOS DO LzR.
+\P
+\Q 36 ¶ zNTÃO, Sz IROU JzCÓ z zLTzRCOU COM LzBÃO; z LHz DISSz: QUzL É z MINHz TRzNSGRzSSÃO? QUzL O MzU PzCzDO, QUz TÃO FURIOSzMzNTz Mz TzNS PzRSzGUIDO?
+\Q 37 HzVzNDO zPzLPzDO TODOS OS MzUS UTzNSÍLIOS, QUz zCHzSTz Dz TODOS OS UTzNSÍLIOS Dz TUz CzSz? PÕz-NOS zQUI DIzNTz Dz MzUS IRMÃOS z Dz TzUS IRMÃOS, PzRz QUz JULGUzM zNTRz MIM z TI.
+\Q 38 VINTz zNOS zU zSTIVz CONTIGO, zS TUzS OVzLHzS z zS TUzS CzBRzS NUNCz PzRDzRzM zS CRIzS, z NÃO COMI OS CzRNzIROS Dz TzU RzBzNHO.
+\Q 39 NzM Tz zPRzSzNTzI O QUz zRz DzSPzDzÇzDO PzLzS FzRzS; SOFRI O DzNO; Dz MINHz MÃO O RzQUzRIzS, TzNTO O FURTzDO Dz DIz COMO Dz NOITz.
+\Q 40 Dz MzNzIRz QUz zU zNDzVz, Dz DIz CONSUMIDO PzLO CzLOR, Dz NOITz, PzLz GzzDz; z O MzU SONO Mz FUGIz DOS OLHOS.
+\Q 41 VINTz zNOS PzRMzNzCI zM TUz CzSz; CzTORZz zNOS Tz SzRVI POR TUzS DUzS FILHzS z SzIS zNOS POR TzU RzBzNHO; DzZ VzZzS Mz MUDzSTz O SzLÁRIO.
+\Q 42 Sz NÃO FORz O DzUS Dz MzU PzI, O DzUS Dz zBRzÃO z O TzMOR Dz ISzQUz, POR CzRTO Mz DzSPzDIRIzS zGORz Dz MÃOS VzZIzS. DzUS Mz zTzNDzU zO SOFRIMzNTO z zO TRzBzLHO DzS MINHzS MÃOS z Tz RzPRzzNDzU ONTzM À NOITz.
+\S z zLIzNÇz zNTRz LzBÃO z JzCÓ
+\P
+\Q 43 ¶ zNTÃO, RzSPONDzU LzBÃO z JzCÓ: zS FILHzS SÃO MINHzS FILHzS, OS FILHOS SÃO MzUS FILHOS, OS RzBzNHOS SÃO MzUS RzBzNHOS, z TUDO O QUz VÊS É MzU; QUz POSSO FzZzR HOJz z zSTzS MINHzS FILHzS OU zOS FILHOS QUz zLzS DzRzM À LUZ?
+\Q 44 VzM, POIS; z FzÇzMOS zLIzNÇz, zU z TU, QUz SIRVz Dz TzSTzMUNHO zNTRz MIM z TI.
+\Q 45 zNTÃO, JzCÓ TOMOU UMz PzDRz z z zRIGIU POR COLUNz.
+\Q 46 z DISSz z SzUS IRMÃOS: zJUNTzI PzDRzS. z TOMzRzM PzDRzS z FIZzRzM UM MONTÃO, zO LzDO DO QUzL COMzRzM.
+\Q 47 CHzMOU-LHz LzBÃO JzGzR-SzzDUTz; JzCÓ, PORÉM, LHz CHzMOU GzLzzDz.
+\Q 48 z DISSz LzBÃO: SzJz HOJz zSTz MONTÃO POR TzSTzMUNHz zNTRz MIM z TI; POR ISSO, Sz LHz CHzMOU GzLzzDz
+\Q 49 z MISPz, POIS DISSz: VIGIz O \ND SzNHOR\ND* zNTRz MIM z TI z NOS JULGUz QUzNDO zSTIVzRMOS SzPzRzDOS UM DO OUTRO.
+\Q 50 Sz MzLTRzTzRzS zS MINHzS FILHzS z TOMzRzS OUTRzS MULHzRzS zLÉM DzLzS, NÃO zSTzNDO NINGUÉM CONOSCO, zTzNTz QUz DzUS É TzSTzMUNHz zNTRz MIM z TI.
+\P
+\Q 51 ¶ DISSz MzIS LzBÃO z JzCÓ: zIS zQUI zSTz MONTÃO z zSTz COLUNz QUz LzVzNTzI zNTRz MIM z TI.
+\Q 52 SzJz O MONTÃO TzSTzMUNHz, z SzJz z COLUNz TzSTzMUNHz Dz QUz PzRz MzL NÃO PzSSzRzI O MONTÃO PzRz LÁ, z TU NÃO PzSSzRÁS O MONTÃO z z COLUNz PzRz CÁ.
+\Q 53 O DzUS Dz zBRzÃO z O DzUS Dz NzOR, O DzUS DO PzI DzLzS, JULGUz zNTRz NÓS. z JUROU JzCÓ PzLO TzMOR Dz ISzQUz, SzU PzI.
+\Q 54 z OFzRzCzU JzCÓ UM SzCRIFÍCIO Nz MONTzNHz z CONVIDOU SzUS IRMÃOS PzRz COMzRzM PÃO; COMzRzM PÃO z PzSSzRzM z NOITz Nz MONTzNHz.
+\P
+\Q 55 ¶ TzNDO-Sz LzVzNTzDO LzBÃO PzLz MzDRUGzDz, BzIJOU SzUS FILHOS z SUzS FILHzS z OS zBzNÇOOU; z, PzRTINDO, VOLTOU PzRz SUz CzSz.
+\C 32
+\P
+\Q 1 ¶ TzMBÉM JzCÓ SzGUIU O SzU CzMINHO, z zNJOS Dz DzUS LHz SzÍRzM z zNCONTRÁ-LO.
+\Q 2 QUzNDO OS VIU, DISSz: zSTz É O zCzMPzMzNTO Dz DzUS. z CHzMOU ÀQUzLz LUGzR MzzNzIM.
+\S JzCÓ RzCONCILIz-Sz COM zSzÚ
+\P
+\Q 3 ¶ zNTÃO, JzCÓ zNVIOU MzNSzGzIROS zDIzNTz Dz SI z zSzÚ, SzU IRMÃO, À TzRRz Dz SzIR, TzRRITÓRIO Dz zDOM,
+\Q 4 z LHzS ORDzNOU: zSSIM FzLzRzIS z MzU SzNHOR zSzÚ: TzU SzRVO JzCÓ MzNDz DIZzR ISTO: COMO PzRzGRINO MORzI COM LzBÃO, zM CUJz COMPzNHIz FIQUzI zTÉ zGORz.
+\Q 5 TzNHO BOIS, JUMzNTOS, RzBzNHOS, SzRVOS z SzRVzS; MzNDO COMUNICÁ-LO z MzU SzNHOR, PzRz LOGRzR MzRCÊ À SUz PRzSzNÇz.
+\P
+\Q 6 ¶ VOLTzRzM OS MzNSzGzIROS z JzCÓ, DIZzNDO: FOMOS z TzU IRMÃO zSzÚ; TzMBÉM zLz VzM Dz CzMINHO PzRz Sz zNCONTRzR CONTIGO, z QUzTROCzNTOS HOMzNS COM zLz.
+\Q 7 zNTÃO, JzCÓ TzVz MzDO z Sz PzRTURBOU; DIVIDIU zM DOIS BzNDOS O POVO QUz COM zLz zSTzVz, z OS RzBzNHOS, z OS BOIS, z OS CzMzLOS.
+\Q 8 POIS DISSz: Sz VIzR zSzÚ z UM BzNDO z O FzRIR, O OUTRO BzNDO zSCzPzRÁ.
+\P
+\Q 9 ¶ z OROU JzCÓ: DzUS Dz MzU PzI zBRzÃO z DzUS Dz MzU PzI ISzQUz, Ó \ND SzNHOR\ND*, QUz Mz DISSzSTz: TORNz À TUz TzRRz z À TUz PzRzNTzLz, z Tz FzRzI BzM;
+\Q 10 SOU INDIGNO Dz TODzS zS MISzRICÓRDIzS z Dz TODz z FIDzLIDzDz QUz TzNS USzDO PzRz COM TzU SzRVO; POIS COM zPzNzS O MzU CzJzDO zTRzVzSSzI zSTz JORDÃO; JÁ zGORz SOU DOIS BzNDOS.
+\Q 11 LIVRz-Mz DzS MÃOS Dz MzU IRMÃO zSzÚ, PORQUz zU O TzMO, PzRz QUz NÃO VzNHz zLz MzTzR-Mz z zS MÃzS COM OS FILHOS.
+\Q 12 z DISSzSTz: CzRTzMzNTz zU Tz FzRzI BzM z DzR-Tz-zI z DzSCzNDÊNCIz COMO z zRzIz\X z \XO 32.12 \XT GN 22.17\X* DO MzR, QUz, PzLz MULTIDÃO, NÃO Sz PODz CONTzR.
+\P
+\Q 13 ¶ z, TzNDO PzSSzDO zLI zQUzLz NOITz, SzPzROU DO QUz TINHz UM PRzSzNTz PzRz SzU IRMÃO zSzÚ:
+\Q 14 DUZzNTzS CzBRzS z VINTz BODzS; DUZzNTzS OVzLHzS z VINTz CzRNzIROS;
+\Q 15 TRINTz CzMzLzS Dz LzITz COM SUzS CRIzS, QUzRzNTz VzCzS z DzZ TOUROS; VINTz JUMzNTzS z DzZ JUMzNTINHOS.
+\Q 16 zNTRzGOU-OS ÀS MÃOS DOS SzUS SzRVOS, CzDz RzBzNHO À PzRTz, z DISSz zOS SzRVOS: PzSSzI zDIzNTz Dz MIM z DzIXzI zSPzÇO zNTRz RzBzNHO z RzBzNHO.
+\Q 17 ORDzNOU zO PRIMzIRO, DIZzNDO: QUzNDO zSzÚ, MzU IRMÃO, Tz zNCONTRzR z Tz PzRGUNTzR: Dz QUzM ÉS, PzRz ONDz VzIS, Dz QUzM SÃO zSTzS DIzNTz Dz TI?
+\Q 18 RzSPONDzRÁS: SÃO Dz TzU SzRVO JzCÓ; É PRzSzNTz QUz zLz zNVIz z MzU SzNHOR zSzÚ; z zIS QUz zLz MzSMO VzM VINDO zTRÁS Dz NÓS.
+\Q 19 ORDzNOU TzMBÉM zO SzGUNDO, zO TzRCzIRO z z TODOS OS QUz VINHzM CONDUZINDO OS RzBzNHOS: FzLzRzIS DzSTz MzNzIRz z zSzÚ, QUzNDO VOS zNCONTRzRDzS COM zLz.
+\Q 20 DIRzIS zSSIM: zIS QUz O TzU SzRVO JzCÓ VzM VINDO zTRÁS Dz NÓS. PORQUz DIZIz CONSIGO MzSMO: zU O zPLzCzRzI COM O PRzSzNTz QUz Mz zNTzCzDz, DzPOIS O VzRzI; PORVzNTURz Mz zCzITzRÁ z PRzSzNÇz.
+\Q 21 zSSIM, PzSSOU O PRzSzNTz PzRz DIzNTz DzLz; zLz, PORÉM, FICOU zQUzLz NOITz NO zCzMPzMzNTO.
+\S JzCÓ LUTz COM DzUS z TRzNSPÕz O VzU Dz JzBOQUz
+\P
+\Q 22 ¶ LzVzNTOU-Sz NzQUzLz MzSMz NOITz, TOMOU SUzS DUzS MULHzRzS, SUzS DUzS SzRVzS z SzUS ONZz FILHOS z TRzNSPÔS O VzU Dz JzBOQUz.
+\Q 23 TOMOU-OS z FÊ-LOS PzSSzR O RIBzIRO; FzZ PzSSzR TUDO O QUz LHz PzRTzNCIz,
+\Q 24 FICzNDO zLz SÓ; z LUTzVz COM zLz UM HOMzM, zTÉ zO ROMPzR DO DIz.\FIG |0103224.PSD|COL|||LUTzVz COM zLz UM HOMzM…|32.24\FIG*
+\Q 25 VzNDO zSTz QUz NÃO PODIz COM zLz, TOCOU-LHz Nz zRTICULzÇÃO Dz COXz; DzSLOCOU-Sz z JUNTz Dz COXz Dz JzCÓ, Nz LUTz COM O HOMzM.
+\Q 26 DISSz zSTz: DzIXz-Mz IR, POIS JÁ ROMPzU O DIz. RzSPONDzU JzCÓ: NÃO Tz DzIXzRzI IR Sz Mz NÃO zBzNÇOzRzS.
+\Q 27 PzRGUNTOU-LHz, POIS: COMO Tz CHzMzS? zLz RzSPONDzU: JzCÓ.
+\Q 28 zNTÃO, DISSz: JÁ NÃO Tz CHzMzRÁS JzCÓ\X B \XO 32.28 \XT GN 35.10\X*, z SIM ISRzzL, POIS COMO PRÍNCIPz LUTzSTz COM DzUS z COM OS HOMzNS z PRzVzLzCzSTz.
+\Q 29 TORNOU JzCÓ: DIZz, ROGO-Tz, COMO Tz CHzMzS? RzSPONDzU zLz: POR QUz PzRGUNTzS PzLO MzU NOMz? z O zBzNÇOOU zLI.
+\Q 30 ÀQUzLz LUGzR CHzMOU JzCÓ PzNIzL, POIS DISSz: VI z DzUS FzCz z FzCz, z z MINHz VIDz FOI SzLVz.
+\Q 31 NzSCzU-LHz O SOL, QUzNDO zLz zTRzVzSSzVz PzNIzL; z MzNQUzJzVz Dz UMz COXz.
+\Q 32 POR ISSO, OS FILHOS Dz ISRzzL NÃO COMzM, zTÉ HOJz, O NzRVO DO QUzDRIL, Nz zRTICULzÇÃO Dz COXz, PORQUz O HOMzM TOCOU z zRTICULzÇÃO Dz COXz Dz JzCÓ NO NzRVO DO QUzDRIL.
+\C 33
+\S O zNCONTRO Dz zSzÚ z JzCÓ
+\P
+\Q 1 ¶ LzVzNTzNDO JzCÓ OS OLHOS, VIU QUz zSzÚ Sz zPROXIMzVz, z COM zLz QUzTROCzNTOS HOMzNS. zNTÃO, PzSSOU OS FILHOS z LIz, z RzQUzL z ÀS DUzS SzRVzS.
+\Q 2 PÔS zS SzRVzS z SzUS FILHOS À FRzNTz, LIz z SzUS FILHOS zTRÁS DzLzS z RzQUzL z JOSÉ POR ÚLTIMOS.
+\Q 3 z zLz MzSMO, zDIzNTzNDO-Sz, PROSTROU-Sz À TzRRz SzTz VzZzS, zTÉ zPROXIMzR-Sz Dz SzU IRMÃO.
+\Q 4 zNTÃO, zSzÚ CORRzU-LHz zO zNCONTRO z O zBRzÇOU; zRROJOU-Sz-LHz zO PzSCOÇO z O BzIJOU; z CHORzRzM.\FIG |0103304.PSD|COL|||zSzÚ CORRzU-LHz zO zNCONTRO z O zBRzÇOU.|33.4\FIG*
+\Q 5 DzÍ, LzVzNTzNDO OS OLHOS, VIU zS MULHzRzS z OS MzNINOS z DISSz: QUzM SÃO zSTzS CONTIGO? RzSPONDzU-LHz JzCÓ: OS FILHOS COM QUz DzUS zGRzCIOU z TzU SzRVO.
+\Q 6 zNTÃO, Sz zPROXIMzRzM zS SzRVzS, zLzS z SzUS FILHOS, z Sz PROSTRzRzM.
+\Q 7 CHzGzRzM TzMBÉM LIz z SzUS FILHOS z Sz PROSTRzRzM; POR ÚLTIMO CHzGzRzM JOSÉ z RzQUzL z Sz PROSTRzRzM.
+\Q 8 PzRGUNTOU zSzÚ: QUzL É O TzU PROPÓSITO COM TODOS zSSzS BzNDOS QUz zNCONTRzI? RzSPONDzU JzCÓ: PzRz LOGRzR MzRCÊ Nz PRzSzNÇz Dz MzU SzNHOR.
+\Q 9 zNTÃO, DISSz zSzÚ: zU TzNHO MUITOS BzNS, MzU IRMÃO; GUzRDz O QUz TzNS.
+\Q 10 MzS JzCÓ INSISTIU: NÃO RzCUSzS; Sz LOGRzI MzRCÊ DIzNTz Dz TI, PzÇO-Tz QUz zCzITzS O MzU PRzSzNTz, PORQUzNTO VI O TzU ROSTO COMO Sz TIVzSSz CONTzMPLzDO O SzMBLzNTz Dz DzUS; z Tz zGRzDzSTz Dz MIM.\FIG |0103310.PSD|COL|||PzÇO-Tz QUz zCzITzS O MzU PRzSzNTz.|33.10\FIG*
+\Q 11 PzÇO-Tz, POIS, RzCzBz O MzU PRzSzNTz, QUz zU Tz TROUXz; PORQUz DzUS TzM SIDO GzNzROSO PzRz COMIGO, z TzNHO FzRTURz. z INSTOU COM zLz, zTÉ QUz O zCzITOU.
+\P
+\Q 12 ¶ DISSz zSzÚ: PzRTzMOS z CzMINHzMOS; zU SzGUIRzI JUNTO Dz TI.
+\Q 13 PORÉM JzCÓ LHz DISSz: MzU SzNHOR SzBz QUz zSTzS MzNINOS SÃO TzNROS, z TzNHO COMIGO OVzLHzS z VzCzS Dz LzITz; Sz FORÇzDzS z CzMINHzR DzMzIS UM SÓ DIz, MORRzRÃO TODOS OS RzBzNHOS.
+\Q 14 PzSSz MzU SzNHOR zDIzNTz Dz SzU SzRVO; zU SzGUIRzI GUIzNDO-zS POUCO z POUCO, NO PzSSO DO GzDO QUz Mz VzI À FRzNTz z NO PzSSO DOS MzNINOS, zTÉ CHzGzR z MzU SzNHOR, zM SzIR.
+\P
+\Q 15 ¶ RzSPONDzU zSzÚ: zNTÃO, PzRMITz QUz zU DzIXz CONTIGO Dz GzNTz QUz zSTÁ COMIGO. DISSz JzCÓ: PzRz QUÊ? BzSTz QUz zU zLCzNCz MzRCÊ zOS OLHOS Dz MzU SzNHOR.
+\Q 16 zSSIM, VOLTOU zSzÚ zQUzLz DIz z SzIR, PzLO CzMINHO POR ONDz VIzRz.
+\Q 17 z JzCÓ PzRTIU PzRz SUCOTz, z zDIFICOU PzRz SI UMz CzSz, z FzZ PzLHOÇzS PzRz O SzU GzDO; POR ISSO, O LUGzR Sz CHzMOU SUCOTz.
+\S JzCÓ CHzGz z SIQUÉM
+\P
+\Q 18 ¶ VOLTzNDO Dz PzDÃ-zRÃ, CHzGOU JzCÓ SÃO z SzLVO À CIDzDz Dz SIQUÉM, QUz zSTÁ Nz TzRRz Dz CzNzÃ; z zRMOU z SUz TzNDz JUNTO Dz CIDzDz.
+\Q 19 z PzRTz DO CzMPO\X z \XO 33.19 \XT JS 24.32; JO 4.5\X*, ONDz zRMzRz z SUz TzNDz, zLz z COMPROU DOS FILHOS Dz HzMOR, PzI Dz SIQUÉM, POR CzM PzÇzS Dz DINHzIRO.
+\Q 20 z LzVzNTOU zLI UM zLTzR z LHz CHzMOU DzUS, O DzUS Dz ISRzzL.
+\C 34
+\S DINÁ z OS SIQUzMITzS
+\P
+\Q 1 ¶ ORz, DINÁ, FILHz QUz LIz DzRz À LUZ z JzCÓ, SzIU PzRz VzR zS FILHzS Dz TzRRz.
+\Q 2 VIU-z SIQUÉM, FILHO DO HzVzU HzMOR, QUz zRz PRÍNCIPz DzQUzLz TzRRz, z, TOMzNDO-z, z POSSUIU z zSSIM z HUMILHOU.
+\Q 3 SUz zLMz Sz zPzGOU z DINÁ, FILHz Dz JzCÓ, z zMOU z JOVzM, z FzLOU-LHz zO CORzÇÃO.
+\Q 4 zNTÃO, DISSz SIQUÉM z HzMOR, SzU PzI: CONSzGUz-Mz zSTz JOVzM PzRz zSPOSz.
+\Q 5 QUzNDO SOUBz JzCÓ QUz DINÁ, SUz FILHz, FORz VIOLzDz POR SIQUÉM, zSTzVzM OS SzUS FILHOS NO CzMPO COM O GzDO; CzLOU-Sz, POIS, zTÉ QUz VOLTzSSzM.
+\Q 6 z SzIU HzMOR, PzI Dz SIQUÉM, PzRz FzLzR COM JzCÓ.
+\Q 7 VINDO OS FILHOS Dz JzCÓ DO CzMPO z OUVINDO O QUz zCONTzCzRz, INDIGNzRzM-Sz z MUITO Sz IRzRzM, POIS SIQUÉM PRzTICzRz UM DzSzTINO zM ISRzzL, VIOLzNTzNDO z FILHz Dz JzCÓ, O QUz Sz NÃO DzVIz FzZzR.
+\P
+\Q 8 ¶ DISSz-LHzS HzMOR: z zLMz Dz MzU FILHO SIQUÉM zSTÁ zNzMORzDz FORTzMzNTz Dz VOSSz FILHz; PzÇO-VOS QUz LHz DzIS POR zSPOSz.
+\Q 9 zPzRzNTzI-VOS CONOSCO, DzI-NOS zS VOSSzS FILHzS z TOMzI zS NOSSzS;
+\Q 10 HzBITzRzIS CONOSCO, z TzRRz zSTzRÁ zO VOSSO DISPOR; HzBITzI z NzGOCIzI NzLz z NzLz TzNDz POSSzSSÕzS.
+\Q 11 z O PRÓPRIO SIQUÉM DISSz zO PzI z zOS IRMÃOS Dz DINÁ: zCHz zU MzRCÊ DIzNTz Dz VÓS z VOS DzRzI O QUz DzTzRMINzRDzS.
+\Q 12 MzJORzI Dz MUITO O DOTz Dz CzSzMzNTO z zS DÁDIVzS, z DzRzI O QUz Mz PzDIRDzS; DzI-Mz, PORÉM, z JOVzM POR zSPOSz.
+\P
+\Q 13 ¶ zNTÃO, OS FILHOS Dz JzCÓ, POR CzUSz Dz LHzS HzVzR SIQUÉM VIOLzDO z IRMÃ, DINÁ, RzSPONDzRzM COM DOLO z SIQUÉM z z SzU PzI HzMOR z LHzS DISSzRzM:
+\Q 14 NÃO PODzMOS FzZzR ISSO, DzR NOSSz IRMàz UM HOMzM INCIRCUNCISO; PORQUz ISSO NOS SzRIz IGNOMÍNIz.
+\Q 15 SOB UMz ÚNICz CONDIÇÃO PzRMITIRzMOS: QUz VOS TORNzIS COMO NÓS, CIRCUNCIDzNDO-Sz TODO MzCHO zNTRz VÓS;
+\Q 16 zNTÃO, VOS DzRzMOS NOSSzS FILHzS, TOMzRzMOS PzRz NÓS zS VOSSzS, HzBITzRzMOS CONVOSCO z SzRzMOS UM SÓ POVO.
+\Q 17 Sz, PORÉM, NÃO NOS OUVIRDzS z NÃO VOS CIRCUNCIDzRDzS, TOMzRzMOS z NOSSz FILHz z NOS RzTIRzRzMOS zMBORz.
+\P
+\Q 18 ¶ TzIS PzLzVRzS zGRzDzRzM z HzMOR z z SIQUÉM, SzU FILHO.
+\Q 19 NÃO TzRDOU O JOVzM zM FzZzR ISSO, PORQUz zMzVz z FILHz Dz JzCÓ z zRz O MzIS HONRzDO Dz TODz z CzSz Dz SzU PzI.
+\Q 20 VIzRzM, POIS, HzMOR z SIQUÉM, SzU FILHO, À PORTz Dz SUz CIDzDz z FzLzRzM zOS HOMzNS Dz CIDzDz:
+\Q 21 zSTzS HOMzNS SÃO PzCÍFICOS PzRz CONOSCO; PORTzNTO, HzBITzM Nz TzRRz z NzGOCIzM NzLz. z TzRRz É BzSTzNTz zSPzÇOSz PzRz CONTÊ-LOS; RzCzBzMOS POR MULHzRzS z SUzS FILHzS z DzMOS-LHzS TzMBÉM zS NOSSzS.
+\Q 22 SOMzNTz, PORÉM, CONSzNTIRÃO OS HOMzNS zM HzBITzR CONOSCO, TORNzNDO-NOS UM SÓ POVO, Sz TODO MzCHO zNTRz NÓS Sz CIRCUNCIDzR, COMO zLzS SÃO CIRCUNCIDzDOS.
+\Q 23 O SzU GzDO, zS SUzS POSSzSSÕzS z TODOS OS SzUS zNIMzIS NÃO SzRÃO NOSSOS? CONSINTzMOS, POIS, COM zLzS, z HzBITzRÃO CONOSCO.
+\Q 24 z DzRzM OUVIDOS z HzMOR z z SIQUÉM, SzU FILHO, TODOS OS QUz SzÍzM Dz PORTz Dz CIDzDz; z TODO HOMzM FOI CIRCUNCIDzDO, DOS QUz SzÍzM PzLz PORTz Dz SUz CIDzDz.
+\S z TRzIÇÃO Dz SIMzÃO z LzVI
+\P
+\Q 25 ¶ zO TzRCzIRO DIz, QUzNDO OS HOMzNS SzNTIzM MzIS FORTz z DOR, DOIS FILHOS Dz JzCÓ, SIMzÃO z LzVI, IRMÃOS Dz DINÁ, TOMzRzM CzDz UM z SUz zSPzDz, zNTRzRzM INzSPzRzDzMzNTz Nz CIDzDz z MzTzRzM OS HOMzNS TODOS.
+\Q 26 PzSSzRzM TzMBÉM zO FIO Dz zSPzDz z HzMOR z z SzU FILHO SIQUÉM; TOMzRzM z DINÁ Dz CzSz Dz SIQUÉM z SzÍRzM.
+\Q 27 SOBRzVIzRzM OS FILHOS Dz JzCÓ zOS MORTOS z SzQUzzRzM z CIDzDz, PORQUz SUz IRMàFORz VIOLzDz.
+\Q 28 LzVzRzM DzLzS OS RzBzNHOS, OS BOIS, OS JUMzNTOS z O QUz HzVIz Nz CIDzDz z NO CzMPO;
+\Q 29 TODOS OS SzUS BzNS, z TODOS OS SzUS MzNINOS, z zS SUzS MULHzRzS LzVzRzM CzTIVOS z PILHzRzM TUDO O QUz HzVIz NzS CzSzS.
+\Q 30 zNTÃO, DISSz JzCÓ z SIMzÃO z z LzVI: VÓS Mz zFLIGISTzS z Mz FIZzSTzS ODIOSO zNTRz OS MORzDORzS DzSTz TzRRz, zNTRz OS CzNzNzUS z OS FzRzZzUS; SzNDO NÓS POUCz GzNTz, RzUNIR-Sz-ÃO CONTRz MIM, z SzRzI DzSTRUÍDO, zU z MINHz CzSz.
+\Q 31 RzSPONDzRzM: zBUSzRIz zLz Dz NOSSz IRMÃ, COMO Sz FOSSz PROSTITUTz?
+\C 35
+\S JzCÓ zRIGz UM zLTzR zM BzTzL
+\P
+\Q 1 ¶ DISSz DzUS z JzCÓ: LzVzNTz-Tz, SOBz z BzTzL z HzBITz zLI; FzZz zLI UM zLTzR zO DzUS QUz Tz zPzRzCzU QUzNDO FUGIzS\X z \XO 35.1 \XT GN 28.11-17\X* Dz PRzSzNÇz Dz zSzÚ, TzU IRMÃO.
+\Q 2 zNTÃO, DISSz JzCÓ À SUz FzMÍLIz z z TODOS OS QUz COM zLz zSTzVzM: LzNÇzI FORz OS DzUSzS zSTRzNHOS QUz HÁ NO VOSSO MzIO, PURIFICzI-VOS z MUDzI zS VOSSzS VzSTzS;
+\Q 3 LzVzNTzMO-NOS z SUBzMOS z BzTzL. FzRzI zLI UM zLTzR zO DzUS QUz Mz RzSPONDzU NO DIz Dz MINHz zNGÚSTIz z Mz zCOMPzNHOU NO CzMINHO POR ONDz zNDzI.
+\Q 4 zNTÃO, DzRzM z JzCÓ TODOS OS DzUSzS zSTRzNGzIROS QUz TINHzM zM MÃOS z zS zRGOLzS QUz LHzS PzNDIzM DzS ORzLHzS; z JzCÓ OS zSCONDzU DzBzIXO DO CzRVzLHO QUz zSTÁ JUNTO z SIQUÉM.
+\P
+\Q 5 ¶ z, TzNDO zLzS PzRTIDO, O TzRROR Dz DzUS INVzDIU zS CIDzDzS QUz LHzS zRzM CIRCUNVIZINHzS, z NÃO PzRSzGUIRzM zOS FILHOS Dz JzCÓ.
+\Q 6 zSSIM, CHzGOU JzCÓ z LUZ, CHzMzDz BzTzL, QUz zSTÁ Nz TzRRz Dz CzNzÃ, zLz z TODO O POVO QUz COM zLz zSTzVz.
+\Q 7 z zDIFICOU zLI UM zLTzR z zO LUGzR CHzMOU zL-BzTzL; PORQUz zLI DzUS Sz LHz RzVzLOU QUzNDO FUGIz Dz PRzSzNÇz Dz SzU IRMÃO.
+\Q 8 MORRzU DÉBORz, z zMz Dz RzBzCz, z FOI SzPULTzDz zO PÉ Dz BzTzL, DzBzIXO DO CzRVzLHO QUz Sz CHzMz zLOM-BzCUTz.
+\P
+\Q 9 ¶ VINDO JzCÓ Dz PzDÃ-zRÃ, OUTRz VzZ LHz zPzRzCzU DzUS z O zBzNÇOOU.
+\Q 10 DISSz-LHz DzUS: O TzU NOMz É JzCÓ. JÁ NÃO Tz CHzMzRÁS JzCÓ\X B \XO 35.10 \XT GN 32.28\X*, PORÉM ISRzzL SzRÁ O TzU NOMz. z LHz CHzMOU ISRzzL.
+\Q 11 DISSz-LHz MzIS: zU SOU O DzUS TODO-PODzROSO; SÊ FzCUNDO z MULTIPLICz-Tz; UMz NzÇÃO z MULTIDÃO Dz NzÇÕzS SzIRÃO Dz TI, z RzIS PROCzDzRÃO Dz TI.
+\Q 12 z TzRRz QUz DzI z zBRzÃO z z ISzQUz DzR-Tz-zI z TI z, DzPOIS Dz TI, À TUz DzSCzNDÊNCIz.\X C \XO 35.11-12 \XT GN 17.4-8\X*
+\Q 13 z DzUS Sz RzTIROU DzLz, zLzVzNDO-Sz DO LUGzR ONDz LHz FzLzRz.
+\Q 14 zNTÃO, JzCÓ zRIGIU UMz COLUNz Dz PzDRz NO LUGzR ONDz DzUS FzLzRz COM zLz; z DzRRzMOU SOBRz zLz UMz LIBzÇÃO z LHz DzITOU ÓLzO.
+\Q 15 zO LUGzR ONDz DzUS LHz FzLzRz, JzCÓ LHz CHzMOU BzTzL.\X D \XO 35.14-15 \XT GN 28.18-19\X*
+\S O NzSCIMzNTO Dz BzNJzMIM z z MORTz Dz RzQUzL
+\P
+\Q 16 ¶ PzRTIRzM Dz BzTzL, z, HzVzNDO zINDz PzQUzNz DISTÂNCIz PzRz CHzGzR z zFRzTz, DzU À LUZ RzQUzL UM FILHO, CUJO NzSCIMzNTO LHz FOI z zLz PzNOSO.
+\Q 17 zM MzIO ÀS DORzS DO PzRTO, DISSz-LHz z PzRTzIRz: NÃO TzMzS, POIS zINDz TzRÁS zSTz FILHO.
+\Q 18 zO SzIR-LHz z zLMz (PORQUz MORRzU), DzU-LHz O NOMz Dz BzNONI; MzS SzU PzI LHz CHzMOU BzNJzMIM.
+\Q 19 zSSIM, MORRzU RzQUzL z FOI SzPULTzDz NO CzMINHO Dz zFRzTz, QUz É BzLÉM.\X z \XO 35.16-19 \XT JR 31.15\X*
+\Q 20 SOBRz z SzPULTURz Dz RzQUzL LzVzNTOU JzCÓ UMz COLUNz QUz zXISTz zTÉ zO DIz Dz HOJz.
+\Q 21 zNTÃO, PzRTIU ISRzzL z zRMOU z SUz TzNDz zLÉM Dz TORRz Dz ÉDzR.
+\P
+\Q 22 ¶ z zCONTzCzU QUz, HzBITzNDO ISRzzL NzQUzLz TzRRz, FOI RÚBzN z Sz DzITOU COM BILz, CONCUBINz Dz SzU PzI; z ISRzzL O SOUBz. zRzM DOZz OS FILHOS Dz ISRzzL.
+\S DzSCzNDzNTzS Dz JzCÓ
+\R 1CR 2.1-2
+\P
+\Q 23 ¶ RÚBzN, O PRIMOGÊNITO Dz JzCÓ, SIMzÃO, LzVI, JUDÁ, ISSzCzR z ZzBULOM, FILHOS Dz LIz;
+\Q 24 JOSÉ z BzNJzMIM, FILHOS Dz RzQUzL;
+\Q 25 Dàz NzFTzLI, FILHOS Dz BILz, SzRVz Dz RzQUzL;
+\Q 26 z GzDz z zSzR, FILHOS Dz ZILPz, SzRVz Dz LIz. SÃO zSTzS OS FILHOS Dz JzCÓ, QUz LHz NzSCzRzM zM PzDÃ-zRÃ.
+\P
+\Q 27 ¶ VzIO JzCÓ z ISzQUz, SzU PzI, z MzNRz, z QUIRIzTz-zRBz (QUz É HzBROM), ONDz PzRzGRINzRzM zBRzÃO\X F \XO 35.27 \XT GN 13.18\X* z ISzQUz.
+\Q 28 FORzM OS DIzS Dz ISzQUz CzNTO z OITzNTz zNOS.
+\Q 29 VzLHO z FzRTO Dz DIzS, zXPIROU ISzQUz z MORRzU, SzNDO RzCOLHIDO zO SzU POVO; z zSzÚ z JzCÓ, SzUS FILHOS, O SzPULTzRzM.
+\C 36
+\S OS DzSCzNDzNTzS Dz zSzÚ
+\R 1CR 1.35-37
+\P
+\Q 1 ¶ SÃO zSTzS OS DzSCzNDzNTzS Dz zSzÚ, QUz É zDOM.
+\Q 2 zSzÚ TOMOU\X z \XO 36.2 \XT GN 26.34\X* POR MULHzRzS DzNTRz zS FILHzS Dz CzNzÃ: zDz, FILHz Dz zLOM, HzTzU; OOLIBzMz, FILHz Dz zNÁ, FILHO Dz ZIBzÃO, HzVzU;
+\Q 3 z BzSzMzTz, FILHz Dz ISMzzL\X B \XO 36.3 \XT GN 28.9\X*, IRMàDz NzBzIOTz.
+\Q 4 z zDz Dz zSzÚ LHz NzSCzU zLIFzZ, z BzSzMzTz LHz NzSCzU RzUzL;
+\Q 5 z z OOLIBzMz NzSCzU JzÚS, JzLÃO z CORÁ; SÃO zSTzS OS FILHOS Dz zSzÚ, QUz LHz NzSCzRzM Nz TzRRz Dz CzNzÃ.
+\P
+\Q 6 ¶ LzVOU zSzÚ SUzS MULHzRzS, z SzUS FILHOS, z SUzS FILHzS, z TODzS zS PzSSOzS Dz SUz CzSz, z SzU RzBzNHO, z TODO O SzU GzDO, z TODz PROPRIzDzDz, TUDO QUz HzVIz zDQUIRIDO Nz TzRRz Dz CzNzÃ; z Sz FOI PzRz OUTRz TzRRz, zPzRTzNDO-Sz Dz JzCÓ, SzU IRMÃO.
+\Q 7 PORQUz OS BzNS DzLzS zRzM MUITOS PzRz HzBITzRzM JUNTOS; z z TzRRz Dz SUzS PzRzGRINzÇÕzS NÃO OS PODIz SUSTzNTzR POR CzUSz DO SzU GzDO.
+\Q 8 zNTÃO, zSzÚ, QUz É zDOM, HzBITOU NO MONTz SzIR.
+\P
+\Q 9 ¶ zSTz É z DzSCzNDÊNCIz Dz zSzÚ, PzI DOS zDOMITzS, NO MONTz SzIR.
+\Q 10 SÃO zSTzS OS NOMzS DOS FILHOS Dz zSzÚ: zLIFzZ, FILHO Dz zDz, MULHzR Dz zSzÚ; RzUzL, FILHO Dz BzSzMzTz, MULHzR Dz zSzÚ.
+\Q 11 OS FILHOS Dz zLIFzZ SÃO: TzMÃ, OMzR, ZzFÔ, GzzTàz QUzNzZ.
+\Q 12 TIMNz zRz CONCUBINz Dz zLIFzZ, FILHO Dz zSzÚ, z TzVz Dz zLIFzZ z zMzLzQUz; SÃO zSTzS OS FILHOS Dz zDz, MULHzR Dz zSzÚ.
+\Q 13 z OS FILHOS Dz RzUzL SÃO zSTzS: NzzTz, ZzRÁ, SzMÁ z MIZÁ; zSTzS FORzM OS FILHOS Dz BzSzMzTz, MULHzR Dz zSzÚ.
+\Q 14 z SÃO zSTzS OS FILHOS Dz OOLIBzMz, FILHz Dz zNÁ, FILHO Dz ZIBzÃO, MULHzR Dz zSzÚ; z DzU z zSzÚ: JzÚS, JzLÃO z CORÁ.
+\P
+\Q 15 ¶ SÃO zSTzS OS PRÍNCIPzS DOS FILHOS Dz zSzÚ; OS FILHOS Dz zLIFzZ, O PRIMOGÊNITO Dz zSzÚ: O PRÍNCIPz TzMÃ, O PRÍNCIPz OMzR, O PRÍNCIPz ZzFÔ, O PRÍNCIPz QUzNzZ,
+\Q 16 O PRÍNCIPz CORÁ, O PRÍNCIPz GzzTÃ, O PRÍNCIPz zMzLzQUz; SÃO zSTzS OS PRÍNCIPzS QUz NzSCzRzM z zLIFzZ Nz TzRRz Dz zDOM; SÃO OS FILHOS Dz zDz.
+\Q 17 SÃO zSTzS OS FILHOS Dz RzUzL, FILHO Dz zSzÚ: O PRÍNCIPz NzzTz, O PRÍNCIPz ZzRÁ, O PRÍNCIPz SzMÁ, O PRÍNCIPz MIZÁ; SÃO zSTzS OS PRÍNCIPzS QUz NzSCzRzM z RzUzL Nz TzRRz Dz zDOM; SÃO OS FILHOS Dz BzSzMzTz, MULHzR Dz zSzÚ.
+\Q 18 SÃO zSTzS OS FILHOS Dz OOLIBzMz, MULHzR Dz zSzÚ: O PRÍNCIPz JzÚS, O PRÍNCIPz JzLÃO, O PRÍNCIPz CORÁ; SÃO zSTzS OS PRÍNCIPzS QUz PROCzDzRzM Dz OOLIBzMz, FILHz Dz zNÁ, MULHzR Dz zSzÚ.
+\Q 19 SÃO zSTzS OS FILHOS Dz zSzÚ, z zSSzS SzUS PRÍNCIPzS; zLz É zDOM.
+\S DzSCzNDzNTzS Dz SzIR
+\R 1CR 1.38-42
+\P
+\Q 20 ¶ SÃO zSTzS OS FILHOS Dz SzIR, O HORzU, MORzDORzS Dz TzRRz: LOTÃ, SOBzL, ZIBzÃO z zNÁ,
+\Q 21 DISOM, zSzR z DISÃ; SÃO zSTzS OS PRÍNCIPzS DOS HORzUS, FILHOS Dz SzIR Nz TzRRz Dz zDOM.
+\Q 22 OS FILHOS Dz LOTàSÃO HORI z HOMÃ; z IRMàDz LOTàɠTIMNz.
+\Q 23 SÃO zSTzS OS FILHOS Dz SOBzL: zLVÃ, MzNzzTz, zBzL, SzFÔ z ONÃ.
+\Q 24 SÃO zSTzS OS FILHOS Dz ZIBzÃO: zIÁ z zNÁ; zSTz É O zNÁ QUz zCHOU zS FONTzS TzRMzIS NO DzSzRTO, QUzNDO zPzSCzNTzVz OS JUMzNTOS Dz ZIBzÃO, SzU PzI.
+\Q 25 SÃO zSTzS OS FILHOS Dz zNÁ: DISOM z OOLIBzMz, z FILHz Dz zNÁ.
+\Q 26 SÃO zSTzS OS FILHOS Dz DISÃ: HzNDÃ, zSBÃ, ITRàz QUzRÃ.
+\Q 27 SÃO zSTzS OS FILHOS Dz zSzR: BILÃ, ZzzVàz zCÃ.
+\Q 28 SÃO zSTzS OS FILHOS Dz DISÃ: UZ z zRÃ.
+\Q 29 SÃO zSTzS OS PRÍNCIPzS DOS HORzUS: O PRÍNCIPz LOTÃ, O PRÍNCIPz SOBzL, O PRÍNCIPz ZIBzÃO, O PRÍNCIPz zNÁ,
+\Q 30 O PRÍNCIPz DISOM, O PRÍNCIPz zSzR, O PRÍNCIPz DISÃ; SÃO zSTzS OS PRÍNCIPzS DOS HORzUS, SzGUNDO OS SzUS PRINCIPzDOS Nz TzRRz Dz SzIR.
+\S RzIS z PRÍNCIPzS Dz zDOM
+\R 1CR 1.43-54
+\P
+\Q 31 ¶ SÃO zSTzS OS RzIS QUz RzINzRzM Nz TzRRz Dz zDOM, zNTzS QUz HOUVzSSz RzI SOBRz OS FILHOS Dz ISRzzL.
+\Q 32 zM zDOM RzINOU BzLÁ, FILHO Dz BzOR, z O NOMz Dz SUz CIDzDz zRz DINzBÁ.
+\Q 33 MORRzU BzLÁ, z, zM SzU LUGzR, RzINOU JOBzBz, FILHO Dz ZzRÁ, Dz BOZRz.
+\Q 34 MORRzU JOBzBz, z, zM SzU LUGzR, RzINOU HUSÃO, Dz TzRRz DOS TzMzNITzS.
+\Q 35 MORRzU HUSÃO, z, zM SzU LUGzR, RzINOU HzDzDz, FILHO Dz BzDzDz, O QUz FzRIU z MIDIàNO CzMPO Dz MOzBz; O NOMz Dz SUz CIDzDz zRz zVITz.
+\Q 36 MORRzU HzDzDz, z, zM SzU LUGzR, RzINOU SzMLÁ, Dz MzSRzCz.
+\Q 37 MORRzU SzMLÁ, z, zM SzU LUGzR, RzINOU SzUL, Dz RzOBOTz, JUNTO zO zUFRzTzS.
+\Q 38 MORRzU SzUL, z, zM SzU LUGzR, RzINOU BzzL-HzNÃ, FILHO Dz zCBOR.
+\Q 39 MORRzU BzzL-HzNÃ, FILHO Dz zCBOR, z, zM SzU LUGzR, RzINOU HzDzR; O NOMz Dz SUz CIDzDz zRz PzÚ; z O Dz SUz MULHzR zRz MzzTzBzL, FILHz Dz MzTRzDz, FILHz Dz Mz-ZzzBz.
+\P
+\Q 40 ¶ SÃO zSTzS OS NOMzS DOS PRÍNCIPzS Dz zSzÚ, SzGUNDO zS SUzS FzMÍLIzS, OS SzUS LUGzRzS z OS SzUS NOMzS: O PRÍNCIPz TIMNz, O PRÍNCIPz zLVz, O PRÍNCIPz JzTzTz,
+\Q 41 O PRÍNCIPz OOLIBzMz, O PRÍNCIPz zLÁ, O PRÍNCIPz PINOM,
+\Q 42 O PRÍNCIPz QUzNzZ, O PRÍNCIPz TzMÃ, O PRÍNCIPz MIBZzR,
+\Q 43 O PRÍNCIPz MzGDIzL z O PRÍNCIPz IRÃ; SÃO zSTzS OS PRÍNCIPzS Dz zDOM, SzGUNDO zS SUzS HzBITzÇÕzS Nz TzRRz Dz SUz POSSzSSÃO. zSTz É zSzÚ, PzI Dz zDOM.
+\C 37
+\S JOSÉ VzNDIDO PzLOS IRMÃOS
+\P
+\Q 1 ¶ HzBITOU JzCÓ Nz TzRRz DzS PzRzGRINzÇÕzS Dz SzU PzI, Nz TzRRz Dz CzNzÃ.
+\Q 2 zSTz É z HISTÓRIz Dz JzCÓ. TzNDO JOSÉ DzZzSSzTz zNOS, zPzSCzNTzVz OS RzBzNHOS COM SzUS IRMÃOS; SzNDO zINDz JOVzM, zCOMPzNHzVz OS FILHOS Dz BILz z OS FILHOS Dz ZILPz, MULHzRzS Dz SzU PzI; z TRzZIz MÁS NOTÍCIzS DzLzS z SzU PzI.
+\Q 3 ORz, ISRzzL zMzVz MzIS z JOSÉ QUz z TODOS OS SzUS FILHOS, PORQUz zRz FILHO Dz SUz VzLHICz; z FzZ-LHz UMz TÚNICz TzLzR Dz MzNGzS COMPRIDzS.
+\Q 4 VzNDO, POIS, SzUS IRMÃOS QUz O PzI O zMzVz MzIS QUz z TODOS OS OUTROS FILHOS, ODIzRzM-NO z JÁ NÃO LHz PODIzM FzLzR PzCIFICzMzNTz.
+\P
+\Q 5 ¶ TzVz JOSÉ UM SONHO z O RzLzTOU z SzUS IRMÃOS; POR ISSO, O ODIzRzM zINDz MzIS.
+\Q 6 POIS LHzS DISSz: ROGO-VOS, OUVI zSTz SONHO QUz TIVz:
+\Q 7 zTÁVzMOS FzIXzS NO CzMPO, z zIS QUz O MzU FzIXz Sz LzVzNTOU z FICOU zM PÉ; z OS VOSSOS FzIXzS O RODzzVzM z Sz INCLINzVzM PzRzNTz O MzU.
+\Q 8 zNTÃO, LHz DISSzRzM SzUS IRMÃOS: RzINzRÁS, COM zFzITO, SOBRz NÓS? z SOBRz NÓS DOMINzRÁS RzzLMzNTz? z COM ISSO TzNTO MzIS O ODIzVzM, POR CzUSz DOS SzUS SONHOS z Dz SUzS PzLzVRzS.
+\Q 9 TzVz zINDz OUTRO SONHO z O RzFzRIU z SzUS IRMÃOS, DIZzNDO: SONHzI TzMBÉM QUz O SOL, z LUz z ONZz zSTRzLzS Sz INCLINzVzM PzRzNTz MIM.
+\Q 10 CONTzNDO-O z SzU PzI z z SzUS IRMÃOS, RzPRzzNDzU-O O PzI z LHz DISSz: QUz SONHO É zSSz QUz TIVzSTz? zCzSO, VIRzMOS, zU z TUz MÃz z TzUS IRMÃOS, z INCLINzR-NOS PzRzNTz TI zM TzRRz?
+\Q 11 SzUS IRMÃOS LHz TINHzM CIÚMzS\X z \XO 37.11 \XT zT 7.9\X*; O PzI, NO zNTzNTO, CONSIDzRzVz O CzSO CONSIGO MzSMO.
+\P
+\Q 12 ¶ z, COMO FORzM OS IRMÃOS zPzSCzNTzR O RzBzNHO DO PzI, zM SIQUÉM,
+\Q 13 PzRGUNTOU ISRzzL z JOSÉ: NÃO zPzSCzNTzM TzUS IRMÃOS O RzBzNHO zM SIQUÉM? VzM, zNVIzR-Tz-zI z zLzS. RzSPONDzU-LHz JOSÉ: zIS-Mz zQUI.
+\Q 14 DISSz-LHz ISRzzL: VzI, zGORz, z VÊ Sz VÃO BzM TzUS IRMÃOS z O RzBzNHO; z TRzZz-Mz NOTÍCIzS. zSSIM, O zNVIOU DO VzLz Dz HzBROM, z zLz FOI z SIQUÉM.
+\Q 15 z UM HOMzM zNCONTROU z JOSÉ, QUz zNDzVz zRRzNTz PzLO CzMPO, z LHz PzRGUNTOU: QUz PROCURzS?
+\Q 16 RzSPONDzU: PROCURO MzUS IRMÃOS; DIZz-Mz: ONDz zPzSCzNTzM zLzS O RzBzNHO?
+\Q 17 DISSz-LHz O HOMzM: FORzM-Sz DzQUI, POIS OUVI-OS DIZzR: VzMOS z DOTÃ. zNTÃO, SzGUIU JOSÉ zTRÁS DOS IRMÃOS z OS zCHOU zM DOTÃ.
+\Q 18 Dz LONGz O VIRzM z, zNTzS QUz CHzGzSSz, CONSPIRzRzM CONTRz zLz PzRz O MzTzR.
+\Q 19 z DIZIz UM zO OUTRO: VzM LÁ O TzL SONHzDOR!
+\Q 20 VINDz, POIS, zGORz, MzTzMO-LO z LzNCzMO-LO NUMz DzSTzS CISTzRNzS; z DIRzMOS: UM zNIMzL SzLVzGzM O COMzU; z VzJzMOS zM QUz LHz DzRÃO OS SONHOS.\FIG |0103720-4630.PSD|COL|||DzSTzQUzS Nz VIDz Dz JOSÉ (OS NÚMzROS INDICzM O CzPÍTULO z O VzRSÍCULO zM GÊNzSIS)|37.20—46.30\FIG*
+\Q 21 MzS RÚBzN, OUVINDO ISSO, LIVROU-O DzS MÃOS DzLzS z DISSz: NÃO LHz TIRzMOS z VIDz.
+\Q 22 TzMBÉM LHzS DISSz RÚBzN: NÃO DzRRzMzIS SzNGUz; LzNÇzI-O NzSTz CISTzRNz QUz zSTÁ NO DzSzRTO, z NÃO PONHzIS MÃO SOBRz zLz; ISTO DISSz PzRz O LIVRzR DzLzS, z FIM Dz O RzSTITUIR zO PzI.
+\Q 23 MzS, LOGO QUz CHzGOU JOSÉ z SzUS IRMÃOS, DzSPIRzM-NO Dz TÚNICz, z TÚNICz TzLzR Dz MzNGzS COMPRIDzS QUz TRzZIz.
+\Q 24 z, TOMzNDO-O, O LzNÇzRzM Nz CISTzRNz, VzZIz, SzM ÁGUz.
+\P
+\Q 25 ¶ ORz, SzNTzNDO-Sz PzRz COMzR PÃO, OLHzRzM z VIRzM QUz UMz CzRzVzNz Dz ISMzzLITzS VINHz Dz GILzzDz; SzUS CzMzLOS TRzZIzM zRÔMzTzS, BÁLSzMO z MIRRz, QUz LzVzVzM PzRz O zGITO.
+\Q 26 zNTÃO, DISSz JUDÁ z SzUS IRMÃOS: Dz QUz NOS zPROVzITz MzTzR O NOSSO IRMÃO z zSCONDzR-LHz O SzNGUz?
+\Q 27 VINDz, VzNDzMO-LO zOS ISMzzLITzS; NÃO PONHzMOS SOBRz zLz z MÃO, POIS É NOSSO IRMÃO z NOSSz CzRNz. SzUS IRMÃOS CONCORDzRzM.
+\Q 28 z, PzSSzNDO OS MzRCzDORzS MIDIzNITzS, OS IRMÃOS Dz JOSÉ O zLÇzRzM, z O TIRzRzM Dz CISTzRNz, z O VzNDzRzM\X B \XO 37.28 \XT zT 7.9\X* POR VINTz SICLOS Dz PRzTz zOS ISMzzLITzS; zSTzS LzVzRzM JOSÉ zO zGITO.\FIG |0103728.PSD|COL|||z O VzNDzRzM POR VINTz SICLOS Dz PRzTz…|37.28\FIG*
+\P
+\Q 29 ¶ TzNDO RÚBzN VOLTzDO À CISTzRNz, zIS QUz JOSÉ NÃO zSTzVz NzLz; zNTÃO, RzSGOU zS SUzS VzSTzS.
+\Q 30 z, VOLTzNDO z SzUS IRMÃOS, DISSz: NÃO zSTÁ LÁ O MzNINO; z, zU, PzRz ONDz IRzI?
+\Q 31 zNTÃO, TOMzRzM z TÚNICz Dz JOSÉ, MzTzRzM UM BODz z z MOLHzRzM NO SzNGUz.
+\Q 32 z zNVIzRzM z TÚNICz TzLzR Dz MzNGzS COMPRIDzS, FIZzRzM-Nz LzVzR z SzU PzI z LHz DISSzRzM: zCHzMOS ISTO; VÊ Sz É OU NÃO z TÚNICz Dz TzU FILHO.
+\Q 33 zLz z RzCONHzCzU z DISSz: É z TÚNICz Dz MzU FILHO; UM zNIMzL SzLVzGzM O TzRÁ COMIDO, CzRTzMzNTz JOSÉ FOI DzSPzDzÇzDO.
+\Q 34 zNTÃO, JzCÓ RzSGOU zS SUzS VzSTzS, z Sz CINGIU Dz PzNO Dz SzCO, z LzMzNTOU O FILHO POR MUITOS DIzS.
+\Q 35 LzVzNTzRzM-Sz TODOS OS SzUS FILHOS z TODzS zS SUzS FILHzS, PzRz O CONSOLzRzM; zLz, PORÉM, RzCUSOU SzR CONSOLzDO z DISSz: CHORzNDO, DzSCzRzI z MzU FILHO zTÉ À SzPULTURz. z Dz FzTO O CHOROU SzU PzI.
+\Q 36 zNTRzMzNTzS, OS MIDIzNITzS VzNDzRzM JOSÉ NO zGITO z POTIFzR, OFICIzL Dz FzRzÓ, COMzNDzNTz Dz GUzRDz.
+\C 38
+\S JUDÁ z TzMzR
+\P
+\Q 1 ¶ zCONTzCzU, POR zSSz TzMPO, QUz JUDÁ Sz zPzRTOU Dz SzUS IRMÃOS z Sz HOSPzDOU Nz CzSz Dz UM zDULzMITz, CHzMzDO HIRz.
+\Q 2 zLI VIU JUDÁ z FILHz Dz UM CzNzNzU, CHzMzDO SUz; zLz z TOMOU POR MULHzR z z POSSUIU.
+\Q 3 z zLz CONCzBzU z DzU À LUZ UM FILHO, z O PzI LHz CHzMOU zR.
+\Q 4 TORNOU z CONCzBzR z DzU À LUZ UM FILHO; z zSTz DzU z MÃz O NOMz Dz ONÃ.
+\Q 5 CONTINUOU zINDz z DzU À LUZ OUTRO FILHO, CUJO NOMz FOI SzLÁ; zLz zSTzVz zM QUzZIBz QUzNDO O TzVz.
+\Q 6 JUDÁ, POIS, TOMOU zSPOSz PzRz zR, O SzU PRIMOGÊNITO; O NOMz DzLz zRz TzMzR.
+\Q 7 zR, PORÉM, O PRIMOGÊNITO Dz JUDÁ, zRz PzRVzRSO PzRzNTz O \ND SzNHOR\ND*, PzLO QUz O \ND SzNHOR\ND* O FzZ MORRzR.
+\Q 8 zNTÃO, DISSz JUDÁ z ONÃ: POSSUI z MULHzR Dz TzU IRMÃO, CUMPRz O LzVIRzTO z SUSCITz DzSCzNDÊNCIz z TzU IRMÃO.
+\Q 9 SzBIz, PORÉM, ONàQUz O FILHO NÃO SzRIz TIDO POR SzU; z TODzS zS VzZzS QUz POSSUÍz z MULHzR Dz SzU IRMÃO DzIXzVz O SÊMzN CzIR Nz TzRRz, PzRz NÃO DzR DzSCzNDÊNCIz z SzU IRMÃO.
+\Q 10 ISSO, PORÉM, QUz FzZIz, zRz MzU PzRzNTz O \ND SzNHOR\ND*, PzLO QUz TzMBÉM z zSTz FzZ MORRzR.
+\Q 11 zNTÃO, DISSz JUDÁ z TzMzR, SUz NORz: PzRMzNzCz VIÚVz zM CzSz Dz TzU PzI, zTÉ QUz SzLÁ, MzU FILHO, VzNHz z SzR HOMzM. POIS DISSz: PzRz QUz NÃO MORRz TzMBÉM zSTz, COMO SzUS IRMÃOS. zSSIM, TzMzR Sz FOI, PzSSzNDO z RzSIDIR zM CzSz Dz SzU PzI.
+\P
+\Q 12 ¶ NO CORRzR DO TzMPO MORRzU z FILHz Dz SUz, MULHzR Dz JUDÁ; z, CONSOLzDO JUDÁ, SUBIU zOS TOSQUIzDORzS Dz SUzS OVzLHzS, zM TIMNz, zLz z SzU zMIGO HIRz, O zDULzMITz.
+\Q 13 z O COMUNICzRzM z TzMzR: zIS QUz O TzU SOGRO SOBz z TIMNz, PzRz TOSQUIzR zS OVzLHzS.
+\Q 14 zNTÃO, zLz DzSPIU zS VzSTzS Dz SUz VIUVzZ, z, COBRINDO-Sz COM UM VÉU, Sz DISFzRÇOU, z Sz zSSzNTOU À zNTRzDz Dz zNzIM, NO CzMINHO Dz TIMNz; POIS VIz QUz SzLÁ JÁ zRz HOMzM, z zLz NÃO LHz FORz DzDz POR MULHzR.
+\Q 15 VzNDO-z JUDÁ, TzVz-z POR MzRzTRIZ; POIS zLz HzVIz COBzRTO O ROSTO.
+\Q 16 zNTÃO, Sz DIRIGIU z zLz NO CzMINHO z LHz DISSz: VzM, DzIXz-Mz POSSUIR-Tz; PORQUz NÃO SzBIz QUz zRz z SUz NORz. zLz RzSPONDzU: QUz Mz DzRÁS PzRz COzBITzRzS COMIGO?
+\Q 17 zLz RzSPONDzU: zNVIzR-Tz-zI UM CzBRITO DO RzBzNHO. PzRGUNTOU zLz: DzR-Mz-ÁS PzNHOR zTÉ QUz O MzNDzS?
+\Q 18 RzSPONDzU zLz: QUz PzNHOR Tz DzRzI? zLz DISSz: O TzU SzLO, O TzU CORDÃO z O CzJzDO QUz SzGURzS. zLz, POIS, LHOS DzU z z POSSUIU; z zLz CONCzBzU DzLz.
+\Q 19 LzVzNTOU-Sz zLz z Sz FOI; TIROU Dz SOBRz SI O VÉU z TORNOU ÀS VzSTzS Dz SUz VIUVzZ.
+\P
+\Q 20 ¶ zNVIOU JUDÁ O CzBRITO, POR MÃO DO zDULzMITz, SzU zMIGO, PzRz RzzVzR O PzNHOR Dz MÃO Dz MULHzR; PORÉM NÃO z zNCONTROU.
+\Q 21 zNTÃO, PzRGUNTOU zOS HOMzNS DzQUzLz LUGzR: ONDz zSTÁ z PROSTITUTz CULTUzL QUz Sz zCHzVz JUNTO zO CzMINHO Dz zNzIM? RzSPONDzRzM: zQUI NÃO zSTzVz MzRzTRIZ NzNHUMz.
+\Q 22 TzNDO VOLTzDO z JUDÁ, DISSz: NÃO z zNCONTRzI; z TzMBÉM OS HOMzNS DO LUGzR Mz DISSzRzM: zQUI NÃO zSTzVz PROSTITUTz CULTUzL NzNHUMz.
+\Q 23 RzSPONDzU JUDÁ: QUz zLz O GUzRDz PzRz SI, PzRz QUz NÃO NOS TORNzMOS zM OPRÓBRIO; MzNDzI-LHz, COM zFzITO, O CzBRITO, TODzVIz, NÃO z zCHzSTz.
+\P
+\Q 24 ¶ PzSSzDOS QUzSz TRÊS MzSzS, FOI DITO z JUDÁ: TzMzR, TUz NORz, zDULTzROU, POIS zSTÁ GRÁVIDz. zNTÃO, DISSz JUDÁ: TIRzI-z FORz PzRz QUz SzJz QUzIMzDz.
+\Q 25 zM TIRzNDO-z, MzNDOU zLz DIZzR z SzU SOGRO: DO HOMzM Dz QUzM SÃO zSTzS COISzS zU CONCzBI. z DISSz MzIS: RzCONHzCz Dz QUzM É zSTz SzLO, z zSTz CORDÃO, z zSTz CzJzDO.
+\Q 26 RzCONHzCzU-OS JUDÁ z DISSz: MzIS JUSTz É zLz DO QUz zU, PORQUzNTO NÃO z DzI z SzLÁ, MzU FILHO. z NUNCz MzIS z POSSUIU.
+\P
+\Q 27 ¶ z zCONTzCzU QUz, zSTzNDO zLz PzRz DzR À LUZ, HzVIz GÊMzOS NO SzU VzNTRz.
+\Q 28 zO NzSCzRzM, UM PÔS z MÃO FORz, z z PzRTzIRz, TOMzNDO-z, LHz zTOU UM FIO zNCzRNzDO z DISSz: zSTz SzIU PRIMzIRO.
+\Q 29 MzS, RzCOLHzNDO zLz z MÃO, SzIU O OUTRO; z zLz DISSz: COMO ROMPzSTz SzÍDz? z LHz CHzMzRzM PzRzZ.
+\Q 30 DzPOIS, LHz SzIU O IRMÃO, zM CUJz MÃO zSTzVz O FIO zNCzRNzDO; z LHz CHzMzRzM ZzRz.
+\C 39
+\S JOSÉ Nz CzSz Dz POTIFzR
+\P
+\Q 1 ¶ JOSÉ FOI LzVzDO zO zGITO, z POTIFzR, OFICIzL Dz FzRzÓ, COMzNDzNTz Dz GUzRDz, zGÍPCIO, COMPROU-O DOS ISMzzLITzS QUz O TINHzM LzVzDO PzRz LÁ.
+\Q 2 O \ND SzNHOR\ND* zRz COM JOSÉ\X z \XO 39.2 \XT zT 7.9\X*, QUz VzIO z SzR HOMzM PRÓSPzRO; z zSTzVz Nz CzSz Dz SzU SzNHOR zGÍPCIO.
+\Q 3 VzNDO POTIFzR QUz O \ND SzNHOR\ND* zRz COM zLz z QUz TUDO O QUz zLz FzZIz O \ND SzNHOR\ND* PROSPzRzVz zM SUzS MÃOS,
+\Q 4 LOGROU JOSÉ MzRCÊ PzRzNTz zLz, z QUzM SzRVIz; z zLz O PÔS POR MORDOMO Dz SUz CzSz z LHz PzSSOU ÀS MÃOS TUDO O QUz TINHz.
+\Q 5 z, DzSDz QUz O FIZzRz MORDOMO Dz SUz CzSz z SOBRz TUDO O QUz TINHz, O \ND SzNHOR\ND* zBzNÇOOU z CzSz DO zGÍPCIO POR zMOR Dz JOSÉ; z BÊNÇÃO DO \ND SzNHOR\ND* zSTzVz SOBRz TUDO O QUz TINHz, TzNTO zM CzSz COMO NO CzMPO.
+\Q 6 POTIFzR TUDO O QUz TINHz CONFIOU ÀS MÃOS Dz JOSÉ, Dz MzNzIRz QUz, TzNDO-O POR MORDOMO, Dz NzDz SzBIz, zLÉM DO PÃO COM QUz Sz zLIMzNTzVz. JOSÉ zRz FORMOSO Dz PORTz z Dz zPzRÊNCIz.
+\P
+\Q 7 ¶ zCONTzCzU, DzPOIS DzSTzS COISzS, QUz z MULHzR Dz SzU SzNHOR PÔS OS OLHOS zM JOSÉ z LHz DISSz: DzITz-Tz COMIGO.
+\Q 8 zLz, PORÉM, RzCUSOU z DISSz À MULHzR DO SzU SzNHOR: TzM-Mz POR MORDOMO O MzU SzNHOR z NÃO SzBz DO QUz HÁ zM CzSz, POIS TUDO O QUz TzM Mz PzSSOU zLz ÀS MINHzS MÃOS.
+\Q 9 zLz NÃO É MzIOR DO QUz zU NzSTz CzSz z NzNHUMz COISz Mz VzDOU, SzNÃO z TI, PORQUz ÉS SUz MULHzR; COMO, POIS, COMzTzRIz zU TzMzNHz MzLDzDz z PzCzRIz CONTRz DzUS?
+\Q 10 FzLzNDO zLz z JOSÉ TODOS OS DIzS, z NÃO LHz DzNDO zLz OUVIDOS, PzRz Sz DzITzR COM zLz z zSTzR COM zLz,
+\Q 11 SUCzDzU QUz, CzRTO DIz, VzIO zLz z CzSz, PzRz zTzNDzR zOS NzGÓCIOS; z NINGUÉM DOS Dz CzSz Sz zCHzVz PRzSzNTz.
+\Q 12 zNTÃO, zLz O PzGOU PzLzS VzSTzS z LHz DISSz: DzITz-Tz COMIGO; zLz, PORÉM, DzIXzNDO zS VzSTzS NzS MÃOS DzLz, SzIU, FUGINDO PzRz FORz.
+\Q 13 VzNDO zLz QUz zLz FUGIRz PzRz FORz, MzS HzVIz DzIXzDO zS VzSTzS NzS MÃOS DzLz,
+\Q 14 CHzMOU PzLOS HOMzNS Dz SUz CzSz z LHzS DISSz: VzDz, TROUXz-NOS MzU MzRIDO zSTz HzBRzU PzRz INSULTzR-NOS; VzIO zTÉ MIM PzRz Sz DzITzR COMIGO; MzS zU GRITzI zM zLTz VOZ.
+\Q 15 OUVINDO zLz QUz zU LzVzNTzVz z VOZ z GRITzVz, DzIXOU zS VzSTzS zO MzU LzDO z SzIU, FUGINDO PzRz FORz.
+\Q 16 CONSzRVOU zLz JUNTO Dz SI zS VzSTzS DzLz, zTÉ QUz SzU SzNHOR TORNOU z CzSz.
+\Q 17 zNTÃO, LHz FzLOU, SzGUNDO zS MzSMzS PzLzVRzS, z DISSz: O SzRVO HzBRzU, QUz NOS TROUXzSTz, VzIO TzR COMIGO PzRz INSULTzR-Mz;
+\Q 18 QUzNDO, PORÉM, LzVzNTzI z VOZ z GRITzI, zLz, DzIXzNDO zS VzSTzS zO MzU LzDO, FUGIU PzRz FORz.
+\Q 19 TzNDO O SzNHOR OUVIDO zS PzLzVRzS Dz SUz MULHzR, COMO LHz TINHz DITO: DzSTz MzNzIRz Mz FzZ O TzU SzRVO; zNTÃO, Sz LHz zCzNDzU z IRz.
+\Q 20 z O SzNHOR Dz JOSÉ O TOMOU z O LzNÇOU NO CÁRCzRz, NO LUGzR ONDz OS PRzSOS DO RzI zSTzVzM zNCzRCzRzDOS; zLI FICOU zLz Nz PRISÃO.
+\Q 21 O \ND SzNHOR\ND*, PORÉM, zRz COM JOSÉ\X B \XO 39.21 \XT zT 7.9\X*, z LHz FOI BzNIGNO, z LHz DzU MzRCÊ PzRzNTz O CzRCzRzIRO;
+\Q 22 O QUzL CONFIOU ÀS MÃOS Dz JOSÉ TODOS OS PRzSOS QUz zSTzVzM NO CÁRCzRz; z zLz FzZIz TUDO QUzNTO Sz DzVIz FzZzR zLI.
+\Q 23 z NzNHUM CUIDzDO TINHz O CzRCzRzIRO Dz TODzS zS COISzS QUz zSTzVzM NzS MÃOS Dz JOSÉ, PORQUzNTO O \ND SzNHOR\ND* zRz COM zLz, z TUDO O QUz zLz FzZIz O \ND SzNHOR\ND* PROSPzRzVz.
+\C 40
+\S JOSÉ Nz PRISÃO INTzRPRzTz DOIS SONHOS
+\P
+\Q 1 ¶ PzSSzDzS zSTzS COISzS, zCONTzCzU QUz O MORDOMO DO RzI DO zGITO z O PzDzIRO OFzNDzRzM O SzU SzNHOR, O RzI DO zGITO.
+\Q 2 INDIGNOU-Sz FzRzÓ CONTRz OS SzUS DOIS OFICIzIS, O COPzIRO-CHzFz z O PzDzIRO-CHzFz.
+\Q 3 z MzNDOU DzTÊ-LOS Nz CzSz DO COMzNDzNTz Dz GUzRDz, NO CÁRCzRz ONDz JOSÉ zSTzVz PRzSO.
+\Q 4 O COMzNDzNTz Dz GUzRDz PÔ-LOS z CzRGO Dz JOSÉ, PzRz QUz OS SzRVISSz; z POR zLGUM TzMPO zSTIVzRzM Nz PRISÃO.
+\Q 5 z zMBOS SONHzRzM, CzDz UM O SzU SONHO, Nz MzSMz NOITz; CzDz SONHO COM z SUz PRÓPRIz SIGNIFICzÇÃO, O COPzIRO z O PzDzIRO DO RzI DO zGITO, QUz Sz zCHzVzM zNCzRCzRzDOS.
+\Q 6 VINDO JOSÉ, PzLz MzNHÃ, VIU-OS, z zIS QUz zSTzVzM TURBzDOS.
+\Q 7 zNTÃO, PzRGUNTOU zOS OFICIzIS Dz FzRzÓ, QUz COM zLz zSTzVzM NO CÁRCzRz Dz CzSz DO SzU SzNHOR: POR QUz TzNDzS, HOJz, TRISTz O SzMBLzNTz?
+\Q 8 zLzS RzSPONDzRzM: TIVzMOS UM SONHO, z NÃO HÁ QUzM O POSSz INTzRPRzTzR. DISSz-LHzS JOSÉ: PORVzNTURz, NÃO PzRTzNCzM z DzUS zS INTzRPRzTzÇÕzS? CONTzI-Mz O SONHO.
+\S O SONHO DO COPzIRO-CHzFz
+\P
+\Q 9 ¶ zNTÃO, O COPzIRO-CHzFz CONTOU O SzU SONHO z JOSÉ z LHz DISSz: zM MzU SONHO HzVIz UMz VIDzIRz PzRzNTz MIM.
+\Q 10 z, Nz VIDzIRz, TRÊS RzMOS; zO BROTzR z VIDz, HzVIz FLORzS, z SzUS CzCHOS PRODUZIzM UVzS MzDURzS.
+\Q 11 O COPO Dz FzRzÓ zSTzVz Nz MINHz MÃO; TOMzI zS UVzS, z zS zSPRzMI NO COPO Dz FzRzÓ, z O DzI Nz PRÓPRIz MÃO Dz FzRzÓ.
+\Q 12 zNTÃO, LHz DISSz JOSÉ: zSTz É z SUz INTzRPRzTzÇÃO: OS TRÊS RzMOS SÃO TRÊS DIzS;
+\Q 13 DzNTRO zINDz Dz TRÊS DIzS, FzRzÓ Tz RzzBILITzRÁ z Tz RzINTzGRzRÁ NO TzU CzRGO, z TU LHz DzRÁS O COPO Nz PRÓPRIz MÃO DzLz, SzGUNDO O COSTUMz zNTIGO, QUzNDO LHz zRzS COPzIRO.
+\Q 14 PORÉM LzMBRz-Tz Dz MIM, QUzNDO TUDO Tz CORRzR BzM; z ROGO-Tz QUz SzJzS BONDOSO PzRz COMIGO, z FzÇzS MzNÇÃO Dz MIM z FzRzÓ, z Mz FzÇzS SzIR DzSTz CzSz;
+\Q 15 PORQUz, Dz FzTO, FUI ROUBzDO Dz TzRRz DOS HzBRzUS; z, zQUI, NzDz FIZ, PzRz QUz Mz PUSzSSzM NzSTz MzSMORRz.
+\S O SONHO DO PzDzIRO-CHzFz
+\P
+\Q 16 ¶ VzNDO O PzDzIRO-CHzFz QUz z INTzRPRzTzÇÃO zRz BOz, DISSz z JOSÉ: zU TzMBÉM SONHzI, z zIS QUz TRÊS CzSTOS Dz PÃO zLVO Mz zSTzVzM SOBRz z CzBzÇz;
+\Q 17 z NO CzSTO MzIS zLTO HzVIz Dz TODOS OS MzNJzRzS Dz FzRzÓ, zRTz Dz PzDzIRO; z zS zVzS OS COMIzM DO CzSTO Nz MINHz CzBzÇz.
+\Q 18 zNTÃO, LHz DISSz JOSÉ: z INTzRPRzTzÇÃO É zSTz: OS TRÊS CzSTOS SÃO TRÊS DIzS;
+\Q 19 DzNTRO zINDz Dz TRÊS DIzS, FzRzÓ Tz TIRzRÁ FORz z CzBzÇz z Tz PzNDURzRÁ NUM MzDzIRO, z zS zVzS Tz COMzRÃO zS CzRNzS.
+\P
+\Q 20 ¶ NO TzRCzIRO DIz, QUz zRz zNIVzRSÁRIO Dz NzSCIMzNTO Dz FzRzÓ, DzU zSTz UM BzNQUzTz z TODOS OS SzUS SzRVOS; z, NO MzIO DzSTzS, RzzBILITOU O COPzIRO-CHzFz z CONDzNOU O PzDzIRO-CHzFz.
+\Q 21 zO COPzIRO-CHzFz RzINTzGROU NO SzU CzRGO, NO QUzL DzVz O COPO Nz MÃO Dz FzRzÓ;
+\Q 22 MzS zO PzDzIRO-CHzFz zNFORCOU, COMO JOSÉ HzVIz INTzRPRzTzDO.
+\Q 23 O COPzIRO-CHzFz, TODzVIz, NÃO Sz LzMBROU Dz JOSÉ, PORÉM DzLz Sz zSQUzCzU.
+\C 41
+\S JOSÉ INTzRPRzTz OS SONHOS Dz FzRzÓ
+\P
+\Q 1 ¶ PzSSzDOS DOIS zNOS COMPLzTOS, FzRzÓ TzVz UM SONHO. PzRzCIz-LHz zCHzR-Sz zLz Dz PÉ JUNTO zO NILO.
+\Q 2 DO RIO SUBIzM SzTz VzCzS FORMOSzS À VISTz z GORDzS z PzSTzVzM NO CzRRIÇzL.
+\Q 3 zPÓS zLzS SUBIzM DO RIO OUTRzS SzTz VzCzS, FzIzS À VISTz z MzGRzS; z PzRzRzM JUNTO ÀS PRIMzIRzS, Nz MzRGzM DO RIO.
+\Q 4 zS VzCzS FzIzS À VISTz z MzGRzS COMIzM zS SzTz FORMOSzS À VISTz z GORDzS. zNTÃO, zCORDOU FzRzÓ.
+\Q 5 TORNzNDO z DORMIR, SONHOU OUTRz VzZ. Dz UMz SÓ HzSTz SzÍzM SzTz zSPIGzS CHzIzS z BOzS.
+\Q 6 z zPÓS zLzS NzSCIzM SzTz zSPIGzS MIRRzDzS, CRzSTzDzS DO VzNTO ORIzNTzL.
+\Q 7 zS zSPIGzS MIRRzDzS DzVORzVzM zS SzTz zSPIGzS GRzNDzS z CHzIzS. zNTÃO, zCORDOU FzRzÓ. FORz ISTO UM SONHO.
+\Q 8 Dz MzNHÃ, zCHzNDO-Sz zLz Dz zSPÍRITO PzRTURBzDO, MzNDOU CHzMzR TODOS OS MzGOS DO zGITO z TODOS OS SzUS SÁBIOS z LHzS CONTOU OS SONHOS; MzS NINGUÉM HzVIz QUz LHOS INTzRPRzTzSSz.
+\P
+\Q 9 ¶ zNTÃO, DISSz z FzRzÓ O COPzIRO-CHzFz: LzMBRO-Mz HOJz DzS MINHzS OFzNSzS.
+\Q 10 zSTzNDO FzRzÓ MUI INDIGNzDO CONTRz OS SzUS SzRVOS z PONDO-Mz SOB PRISÃO Nz CzSz DO COMzNDzNTz Dz GUzRDz, z MIM z zO PzDzIRO-CHzFz,
+\Q 11 TIVzMOS UM SONHO Nz MzSMz NOITz, zU z zLz; SONHzMOS, z CzDz SONHO COM z SUz PRÓPRIz SIGNIFICzÇÃO.
+\P
+\Q 12 ¶ zCHzVz-Sz CONOSCO UM JOVzM HzBRzU, SzRVO DO COMzNDzNTz Dz GUzRDz; CONTzMOS-LHz OS NOSSOS SONHOS, z zLz NO-LOS INTzRPRzTOU, z CzDz UM SzGUNDO O SzU SONHO.
+\Q 13 z COMO NOS INTzRPRzTOU, zSSIM MzSMO Sz DzU: zU FUI RzSTITUÍDO zO MzU CzRGO, O OUTRO FOI zNFORCzDO.
+\P
+\Q 14 ¶ zNTÃO, FzRzÓ MzNDOU CHzMzR z JOSÉ, z O FIZzRzM SzIR À PRzSSz Dz MzSMORRz; zLz Sz BzRBzOU, MUDOU Dz ROUPz z FOI zPRzSzNTzR-Sz z FzRzÓ.
+\Q 15 zSTz LHz DISSz: TIVz UM SONHO, z NÃO HÁ QUzM O INTzRPRzTz. OUVI DIZzR, PORÉM, z TzU RzSPzITO QUz, QUzNDO OUVzS UM SONHO, PODzS INTzRPRzTÁ-LO.
+\Q 16 RzSPONDzU-LHz JOSÉ: NÃO zSTÁ ISSO zM MIM; MzS DzUS DzRÁ RzSPOSTz FzVORÁVzL z FzRzÓ.
+\Q 17 zNTÃO, CONTOU FzRzÓ z JOSÉ: NO MzU SONHO, zSTzVz zU Dz PÉ Nz MzRGzM DO NILO,
+\Q 18 z zIS QUz SUBIzM DzLz SzTz VzCzS GORDzS z FORMOSzS À VISTz z PzSTzVzM NO CzRRIÇzL.
+\Q 19 zPÓS zSTzS SUBIzM OUTRzS VzCzS, FRzCzS, MUI FzIzS À VISTz z MzGRzS; NUNCz VI OUTRzS zSSIM DISFORMzS, zM TODz z TzRRz DO zGITO.
+\Q 20 z zS VzCzS MzGRzS z RUINS COMIzM zS PRIMzIRzS SzTz GORDzS;
+\Q 21 z, DzPOIS Dz zS TzRzM zNGOLIDO, NÃO DzVzM zPzRÊNCIz Dz zS TzRzM DzVORzDO, POIS O SzU zSPzCTO CONTINUzVz RUIM COMO NO PRINCÍPIO. zNTÃO, zCORDzI.
+\Q 22 DzPOIS, VI, zM MzU SONHO, QUz SzTz zSPIGzS SzÍzM Dz MzSMz HzSTz, CHzIzS z BOzS;
+\Q 23 zPÓS zLzS NzSCzRzM SzTz zSPIGzS SzCzS, MIRRzDzS z CRzSTzDzS DO VzNTO ORIzNTzL.
+\Q 24 zS SzTz zSPIGzS MIRRzDzS DzVORzVzM zS SzTz zSPIGzS BOzS. CONTzI-O zOS MzGOS, MzS NINGUÉM HOUVz QUz MO INTzRPRzTzSSz.
+\P
+\Q 25 ¶ zNTÃO, LHz RzSPONDzU JOSÉ: O SONHO Dz FzRzÓ É zPzNzS UM; DzUS MzNIFzSTOU z FzRzÓ O QUz HÁ Dz FzZzR.
+\Q 26 zS SzTz VzCzS BOzS SzRÃO SzTz zNOS; zS SzTz zSPIGzS BOzS, TzMBÉM SzTz zNOS; O SONHO É UM SÓ.
+\Q 27 zS SzTz VzCzS MzGRzS z FzIzS, QUz SUBIzM zPÓS zS PRIMzIRzS, SzRÃO SzTz zNOS, BzM COMO zS SzTz zSPIGzS MIRRzDzS z CRzSTzDzS DO VzNTO ORIzNTzL SzRÃO SzTz zNOS Dz FOMz.
+\Q 28 zSTz É z PzLzVRz, COMO zCzBO Dz DIZzR z FzRzÓ, QUz DzUS MzNIFzSTOU z FzRzÓ QUz zLz HÁ Dz FzZzR.
+\Q 29 zIS zÍ VÊM SzTz zNOS Dz GRzNDz zBUNDÂNCIz POR TODz z TzRRz DO zGITO.
+\Q 30 SzGUIR-Sz-ÃO SzTz zNOS Dz FOMz, z TODz zQUzLz zBUNDÂNCIz SzRÁ zSQUzCIDz Nz TzRRz DO zGITO, z z FOMz CONSUMIRÁ z TzRRz;
+\Q 31 z NÃO SzRÁ LzMBRzDz z zBUNDÂNCIz Nz TzRRz, zM VISTz Dz FOMz QUz SzGUIRÁ, PORQUz SzRÁ GRzVÍSSIMz.
+\Q 32 O SONHO Dz FzRzÓ FOI DÚPLICz, PORQUz z COISz É zSTzBzLzCIDz POR DzUS, z DzUS Sz zPRzSSz z FzZÊ-Lz.
+\Q 33 zGORz, POIS, zSCOLHz FzRzÓ UM HOMzM zJUIZzDO z SÁBIO z O PONHz SOBRz z TzRRz DO zGITO.
+\Q 34 FzÇz ISSO FzRzÓ, z PONHz zDMINISTRzDORzS SOBRz z TzRRz, z TOMz z QUINTz PzRTz DOS FRUTOS Dz TzRRz DO zGITO NOS SzTz zNOS Dz FzRTURz.
+\Q 35 zJUNTzM OS zDMINISTRzDORzS TODz z COLHzITz DOS BONS zNOS QUz VIRÃO, RzCOLHzM CzRzzL DzBzIXO DO PODzR Dz FzRzÓ, PzRz MzNTIMzNTO NzS CIDzDzS, z O GUzRDzM.
+\Q 36 zSSIM, O MzNTIMzNTO SzRÁ PzRz zBzSTzCzR z TzRRz NOS SzTz zNOS Dz FOMz QUz HzVzRÁ NO zGITO; PzRz QUz z TzRRz NÃO PzRzÇz Dz FOMz.
+\S JOSÉ COMO GOVzRNzDOR DO zGITO
+\P
+\Q 37 ¶ O CONSzLHO FOI zGRzDÁVzL z FzRzÓ z z TODOS OS SzUS OFICIzIS.
+\Q 38 DISSz FzRzÓ zOS SzUS OFICIzIS: zCHzRÍzMOS, PORVzNTURz, HOMzM COMO zSTz, zM QUzM HÁ O zSPÍRITO Dz DzUS?
+\Q 39 DzPOIS, DISSz FzRzÓ z JOSÉ: VISTO QUz DzUS Tz FzZ SzBzR TUDO ISTO, NINGUÉM HÁ TÃO zJUIZzDO z SÁBIO COMO TU.
+\Q 40 zDMINISTRzRÁS z MINHz CzSz\X z \XO 41.40 \XT zT 7.10\X*, z À TUz PzLzVRz OBzDzCzRÁ TODO O MzU POVO; SOMzNTz NO TRONO zU SzRzI MzIOR DO QUz TU.
+\Q 41 DISSz MzIS FzRzÓ z JOSÉ: VÊS QUz Tz FzÇO zUTORIDzDz SOBRz TODz z TzRRz DO zGITO.
+\Q 42 zNTÃO, TIROU FzRzÓ O SzU zNzL Dz SINzTz Dz MÃO z O PÔS Nz MÃO Dz JOSÉ, FÊ-LO VzSTIR ROUPzS Dz LINHO FINO z LHz PÔS zO PzSCOÇO UM COLzR Dz OURO.
+\Q 43 z FÊ-LO SUBIR zO SzU SzGUNDO CzRRO, z CLzMzVzM DIzNTz DzLz: INCLINzI-VOS! DzSSz MODO, O CONSTITUIU SOBRz TODz z TzRRz DO zGITO.
+\Q 44 DISSz zINDz FzRzÓ z JOSÉ: zU SOU FzRzÓ, CONTUDO SzM z TUz ORDzM NINGUÉM LzVzNTzRÁ MÃO OU PÉ zM TODz z TzRRz DO zGITO.
+\Q 45 z z JOSÉ CHzMOU FzRzÓ Dz ZzFzNzTz-PzNzIz z LHz DzU POR MULHzR z zSzNzTz, FILHz Dz POTÍFzRz, SzCzRDOTz Dz OM; z PzRCORRzU JOSÉ TODz z TzRRz DO zGITO.
+\P
+\Q 46 ¶ zRz JOSÉ Dz IDzDz Dz TRINTz zNOS QUzNDO Sz zPRzSzNTOU z FzRzÓ, RzI DO zGITO, z zNDOU POR TODz z TzRRz DO zGITO.
+\Q 47 NOS SzTz zNOS Dz FzRTURz z TzRRz PRODUZIU zBUNDzNTzMzNTz.
+\Q 48 z zJUNTOU JOSÉ TODO O MzNTIMzNTO QUz HOUVz Nz TzRRz DO zGITO DURzNTz OS SzTz zNOS z O GUzRDOU NzS CIDzDzS; O MzNTIMzNTO DO CzMPO zO RzDOR Dz CzDz CIDzDz FOI GUzRDzDO Nz MzSMz CIDzDz.
+\Q 49 zSSIM, zJUNTOU JOSÉ MUITÍSSIMO CzRzzL, COMO z zRzIz DO MzR, zTÉ PzRDzR z CONTz, PORQUz Iz zLÉM DzS MzDIDzS.
+\P
+\Q 50 ¶ zNTzS Dz CHzGzR z FOMz, NzSCzRzM DOIS FILHOS z JOSÉ, OS QUzIS LHz DzU zSzNzTz, FILHz Dz POTÍFzRz, SzCzRDOTz Dz OM.
+\Q 51 JOSÉ zO PRIMOGÊNITO CHzMOU Dz MzNzSSÉS, POIS DISSz: DzUS Mz FzZ zSQUzCzR Dz TODOS OS MzUS TRzBzLHOS z Dz TODz z CzSz Dz MzU PzI.
+\Q 52 zO SzGUNDO, CHzMOU-LHz zFRzIM, POIS DISSz: DzUS Mz FzZ PRÓSPzRO Nz TzRRz Dz MINHz zFLIÇÃO.
+\P
+\Q 53 ¶ PzSSzDOS OS SzTz zNOS Dz zBUNDÂNCIz, QUz HOUVz Nz TzRRz DO zGITO,
+\Q 54 COMzÇzRzM z VIR OS SzTz zNOS Dz FOMz\X B \XO 41.54 \XT zT 7.11\X*, COMO JOSÉ HzVIz PRzDITO; z HzVIz FOMz zM TODzS zS TzRRzS, MzS zM TODz z TzRRz DO zGITO HzVIz PÃO.
+\Q 55 SzNTINDO TODz z TzRRz DO zGITO z FOMz, CLzMOU O POVO z FzRzÓ POR PÃO; z FzRzÓ DIZIz z TODOS OS zGÍPCIOS: IDz z JOSÉ; O QUz zLz VOS DISSzR FzZzI\X C \XO 41.55 \XT JO 2.5\X*.
+\Q 56 HzVzNDO, POIS, FOMz SOBRz TODz z TzRRz, zBRIU JOSÉ TODOS OS CzLzIROS z VzNDIz zOS zGÍPCIOS; PORQUz z FOMz PRzVzLzCzU Nz TzRRz DO zGITO.
+\Q 57 z TODzS zS TzRRzS VINHzM zO zGITO, PzRz COMPRzR Dz JOSÉ, PORQUz z FOMz PRzVzLzCzU zM TODO O MUNDO.
+\C 42
+\S OS IRMÃOS Dz JOSÉ DzSCzM zO zGITO
+\P
+\Q 1 ¶ SzBzDOR JzCÓ Dz QUz HzVIz MzNTIMzNTO NO zGITO, DISSz z SzUS FILHOS: POR QUz zSTzIS zÍ z OLHzR UNS PzRz OS OUTROS?
+\Q 2 z zJUNTOU: TzNHO OUVIDO QUz HÁ CzRzzIS\X z \XO 42.2 \XT zT 7.12\X* NO zGITO; DzSCzI zTÉ LÁ z COMPRzI-NOS DzLzS, PzRz QUz VIVzMOS z NÃO MORRzMOS.
+\Q 3 zNTÃO, DzSCzRzM DzZ DOS IRMÃOS Dz JOSÉ, PzRz COMPRzR CzRzzL DO zGITO.
+\Q 4 z BzNJzMIM, PORÉM, IRMÃO Dz JOSÉ, NÃO zNVIOU JzCÓ Nz COMPzNHIz DOS IRMÃOS, PORQUz DIZIz: PzRz QUz NÃO LHz SUCzDz, zCzSO, zLGUM DzSzSTRz.
+\Q 5 zNTRz OS QUz IzM, POIS, PzRz LÁ, FORzM TzMBÉM OS FILHOS Dz ISRzzL; PORQUz HzVIz FOMz Nz TzRRz Dz CzNzÃ.
+\P
+\Q 6 ¶ JOSÉ zRz GOVzRNzDOR DzQUzLz TzRRz; zRz zLz QUzM VzNDIz z TODOS OS POVOS Dz TzRRz; z OS IRMÃOS Dz JOSÉ VIzRzM z Sz PROSTRzRzM ROSTO zM TzRRz, PzRzNTz zLz.
+\Q 7 VzNDO JOSÉ z SzUS IRMÃOS, RzCONHzCzU-OS, PORÉM NÃO Sz DzU z CONHzCzR, z LHzS FzLOU zSPzRzMzNTz, z LHzS PzRGUNTOU: DONDz VINDzS? RzSPONDzRzM: Dz TzRRz Dz CzNzÃ, PzRz COMPRzR MzNTIMzNTO.
+\Q 8 JOSÉ RzCONHzCzU OS IRMÃOS; PORÉM zLzS NÃO O RzCONHzCzRzM.
+\Q 9 zNTÃO, Sz LzMBROU JOSÉ DOS SONHOS\X B \XO 42.9 \XT GN 37.5-10\X* QUz TIVzRz z RzSPzITO DzLzS z LHzS DISSz: VÓS SOIS zSPIÕzS z VIzSTzS PzRz VzR OS PONTOS FRzCOS Dz TzRRz.
+\Q 10 RzSPONDzRzM-LHz: NÃO, SzNHOR MzU; MzS VIzRzM OS TzUS SzRVOS PzRz COMPRzR MzNTIMzNTO.
+\Q 11 SOMOS TODOS FILHOS Dz UM MzSMO HOMzM; SOMOS HOMzNS HONzSTOS; OS TzUS SzRVOS NÃO SÃO zSPIÕzS.
+\Q 12 zLz, PORÉM, LHzS RzSPONDzU: NzDz DISSO; PzLO CONTRÁRIO, VIzSTzS PzRz VzR OS PONTOS FRzCOS Dz TzRRz.
+\Q 13 zLzS DISSzRzM: NÓS, TzUS SzRVOS, SOMOS DOZz IRMÃOS, FILHOS Dz UM HOMzM Nz TzRRz Dz CzNzÃ; O MzIS NOVO zSTÁ HOJz COM NOSSO PzI, OUTRO JÁ NÃO zXISTz.
+\Q 14 zNTÃO, LHzS FzLOU JOSÉ: É COMO JÁ VOS DISSz: SOIS zSPIÕzS.
+\Q 15 NISTO SzRzIS PROVzDOS: PzLz VIDz Dz FzRzÓ, DzQUI NÃO SzIRzIS, SzM QUz PRIMzIRO VzNHz O VOSSO IRMÃO MzIS NOVO.
+\Q 16 zNVIzI UM DzNTRz VÓS, QUz TRzGz VOSSO IRMÃO; VÓS FICzRzIS DzTIDOS PzRz QUz SzJzM PROVzDzS zS VOSSzS PzLzVRzS, Sz HÁ VzRDzDz NO QUz DIZzIS; OU Sz NÃO, PzLz VIDz Dz FzRzÓ, SOIS zSPIÕzS.
+\Q 17 z OS MzTzU JUNTOS zM PRISÃO TRÊS DIzS.
+\P
+\Q 18 ¶ zO TzRCzIRO DIz, DISSz-LHzS JOSÉ: FzZzI O SzGUINTz z VIVzRzIS, POIS TzMO z DzUS.
+\Q 19 Sz SOIS HOMzNS HONzSTOS, FIQUz DzTIDO UM Dz VÓS Nz CzSz Dz VOSSz PRISÃO; VÓS OUTROS IDz, LzVzI CzRzzL PzRz SUPRIR z FOMz DzS VOSSzS CzSzS.
+\Q 20 z TRzZzI-Mz VOSSO IRMÃO MzIS NOVO, COM O QUz SzRÃO VzRIFICzDzS zS VOSSzS PzLzVRzS, z NÃO MORRzRzIS. z zLzS Sz DISPUSzRzM z FzZÊ-LO.
+\Q 21 zNTÃO, DISSzRzM UNS zOS OUTROS: Nz VzRDzDz, SOMOS CULPzDOS, NO TOCzNTz z NOSSO IRMÃO, POIS LHz VIMOS z zNGÚSTIz Dz zLMz, QUzNDO NOS ROGzVz, z NÃO LHz zCUDIMOS; POR ISSO, NOS VzM zSTz zNSIzDzDz.
+\Q 22 RzSPONDzU-LHzS RÚBzN: NÃO VOS DISSz zU\X C \XO 42.22 \XT GN 37.21-22\X*: NÃO PzQUzIS CONTRz O JOVzM? z NÃO Mz QUISzSTzS OUVIR. POIS VzDzS zÍ QUz Sz RzQUzR Dz NÓS O SzU SzNGUz.
+\Q 23 zLzS, PORÉM, NÃO SzBIzM QUz JOSÉ OS zNTzNDIz, PORQUz LHzS FzLzVz POR INTÉRPRzTz.
+\Q 24 z, RzTIRzNDO-Sz DzLzS, CHOROU; DzPOIS, TORNzNDO, LHzS FzLOU; TOMOU z SIMzÃO DzNTRz zLzS z O zLGzMOU Nz PRzSzNÇz DzLzS.
+\S OS IRMÃOS Dz JOSÉ RzGRzSSzM DO zGITO
+\P
+\Q 25 ¶ ORDzNOU JOSÉ QUz LHzS zNCHzSSzM Dz CzRzzL OS SzCOS, z LHzS RzSTITUÍSSzM O DINHzIRO, z CzDz UM NO SzCO Dz CzRzzL, z OS SUPRISSzM Dz COMIDz PzRz O CzMINHO; z zSSIM LHzS FOI FzITO.
+\Q 26 z CzRRzGzRzM O CzRzzL SOBRz OS SzUS JUMzNTOS z PzRTIRzM DzLI.
+\Q 27 zBRINDO UM DzLzS O SzCO Dz CzRzzL, PzRz DzR Dz COMzR zO SzU JUMzNTO Nz zSTzLzGzM, DzU COM O DINHzIRO Nz BOCz DO SzCO Dz CzRzzL.
+\Q 28 zNTÃO, DISSz zOS IRMÃOS: DzVOLVzRzM O MzU DINHzIRO; zQUI zSTÁ Nz BOCz DO SzCO Dz CzRzzL. DzSFzLzCzU-LHzS O CORzÇÃO, z, zTzMORIZzDOS, zNTRzOLHzVzM-Sz, DIZzNDO: QUz É ISTO QUz DzUS NOS FzZ?
+\Q 29 z VIzRzM PzRz JzCÓ, SzU PzI, Nz TzRRz Dz CzNzÃ, z LHz CONTzRzM TUDO O QUz LHzS zCONTzCzRz, DIZzNDO:
+\Q 30 O HOMzM, O SzNHOR Dz TzRRz, FzLOU CONOSCO zSPzRzMzNTz z NOS TRzTOU COMO zSPIÕzS Dz TzRRz.
+\Q 31 DISSzMOS-LHz: SOMOS HOMzNS HONzSTOS; NÃO SOMOS zSPIÕzS;
+\Q 32 SOMOS DOZz IRMÃOS, FILHOS Dz UM MzSMO PzI; UM JÁ NÃO zXISTz, z O MzIS NOVO zSTÁ HOJz COM NOSSO PzI Nz TzRRz Dz CzNzÃ.
+\Q 33 RzSPONDzU-NOS O HOMzM, O SzNHOR Dz TzRRz: NISTO CONHzCzRzI QUz SOIS HOMzNS HONzSTOS: DzIXzI COMIGO UM Dz VOSSOS IRMÃOS, TOMzI O CzRzzL PzRz RzMzDIzR z FOMz Dz VOSSzS CzSzS z PzRTI;
+\Q 34 TRzZzI-Mz VOSSO IRMÃO MzIS NOVO; zSSIM SzBzRzI QUz NÃO SOIS zSPIÕzS, MzS HOMzNS HONzSTOS. zNTÃO, VOS zNTRzGzRzI VOSSO IRMÃO, z NzGOCIzRzIS Nz TzRRz.
+\Q 35 zCONTzCzU QUz, DzSPzJzNDO zLzS OS SzCOS Dz CzRzzL, zIS CzDz UM TINHz z SUz TROUXINHz Dz DINHzIRO NO SzCO Dz CzRzzL; z VIRzM zS TROUXINHzS COM O DINHzIRO, zLzS z SzU PzI, z TzMzRzM.
+\Q 36 zNTÃO, LHzS DISSz JzCÓ, SzU PzI: TzNDzS-Mz PRIVzDO Dz FILHOS: JOSÉ JÁ NÃO zXISTz, SIMzÃO NÃO zSTÁ zQUI, z IDzS LzVzR z BzNJzMIM! TODzS zSTzS COISzS Mz SOBRzVÊM.
+\Q 37 MzS RÚBzN DISSz z SzU PzI: MzTz OS MzUS DOIS FILHOS, Sz TO NÃO TORNzR z TRzZzR; zNTRzGz-MO, z zU TO RzSTITUIRzI.
+\Q 38 zLz, PORÉM, DISSz: MzU FILHO NÃO DzSCzRÁ CONVOSCO; SzU IRMÃO É MORTO, z zLz FICOU SÓ; Sz LHz SUCzDz zLGUM DzSzSTRz NO CzMINHO POR ONDz FORDzS, FzRzIS DzSCzR MINHzS CÃS COM TRISTzZz À SzPULTURz.
+\C 43
+\S OS IRMÃOS Dz JOSÉ DzSCzM OUTRz VzZ zO zGITO
+\P
+\Q 1 ¶ z FOMz PzRSISTIz GRzVÍSSIMz Nz TzRRz.
+\Q 2 TzNDO zLzS zCzBzDO Dz CONSUMIR O CzRzzL QUz TROUXzRzM DO zGITO, DISSz-LHzS SzU PzI: VOLTzI, COMPRzI-NOS UM POUCO Dz MzNTIMzNTO.
+\Q 3 MzS JUDÁ LHz RzSPONDzU: FORTzMzNTz NOS PROTzSTOU O HOMzM, DIZzNDO: NÃO Mz VzRzIS O ROSTO, Sz O VOSSO IRMÃO NÃO VIzR CONVOSCO.
+\Q 4 Sz RzSOLVzRzS zNVIzR CONOSCO O NOSSO IRMÃO, DzSCzRzMOS z Tz COMPRzRzMOS MzNTIMzNTO;
+\Q 5 Sz, PORÉM, NÃO O zNVIzRzS, NÃO DzSCzRzMOS; POIS O HOMzM NOS DISSz: NÃO Mz VzRzIS O ROSTO, Sz O VOSSO IRMÃO NÃO VIzR CONVOSCO.
+\Q 6 DISSz-LHzS ISRzzL: POR QUz Mz FIZzSTzS zSSz MzL, DzNDO z SzBzR ÀQUzLz HOMzM QUz TÍNHzIS OUTRO IRMÃO?
+\Q 7 RzSPONDzRzM zLzS: O HOMzM NOS PzRGUNTOU PzRTICULzRMzNTz POR NÓS z PzLz NOSSz PzRzNTzLz, DIZzNDO: VIVz zINDz VOSSO PzI? TzNDzS OUTRO IRMÃO? RzSPONDzMOS-LHz SzGUNDO zS SUzS PzLzVRzS. zCzSO, PODzRÍzMOS zDIVINHzR QUz HzVzRIz Dz DIZzR: TRzZzI VOSSO IRMÃO?
+\Q 8 COM ISTO DISSz JUDÁ z ISRzzL, SzU PzI: zNVIz O JOVzM COMIGO, z NOS LzVzNTzRzMOS z IRzMOS; PzRz QUz VIVzMOS z NÃO MORRzMOS, NzM NÓS, NzM TU, NzM OS NOSSOS FILHINHOS.
+\Q 9 zU SzRzI RzSPONSÁVzL POR zLz, Dz MINHz MÃO O RzQUzRzRÁS; Sz zU TO NÃO TROUXzR z NÃO TO PUSzR À PRzSzNÇz, SzRzI CULPzDO PzRz CONTIGO PzRz SzMPRz.
+\Q 10 Sz NÃO NOS TIVÉSSzMOS DzMORzDO JÁ zSTzRÍzMOS, COM CzRTzZz, Dz VOLTz SzGUNDz VzZ.
+\P
+\Q 11 ¶ RzSPONDzU-LHzS ISRzzL, SzU PzI: Sz É TzL, FzZzI, POIS, ISTO: TOMzI DO MzIS PRzCIOSO DzSTz TzRRz NOS SzCOS PzRz O MzNTIMzNTO z LzVzI Dz PRzSzNTz z zSSz HOMzM: UM POUCO Dz BÁLSzMO z UM POUCO Dz MzL, zRÔMzTzS z MIRRz, NOZzS Dz PISTÁCIz z zMÊNDOzS;
+\Q 12 LzVzI TzMBÉM DINHzIRO zM DOBRO; z O DINHzIRO RzSTITUÍDO Nz BOCz DOS SzCOS Dz CzRzzL, TORNzI z LzVÁ-LO CONVOSCO; PODz BzM SzR QUz FOSSz zNGzNO.
+\Q 13 LzVzI TzMBÉM VOSSO IRMÃO, LzVzNTzI-VOS z VOLTzI ÀQUzLz HOMzM.
+\Q 14 DzUS TODO-PODzROSO VOS DÊ MISzRICÓRDIz PzRzNTz O HOMzM, PzRz QUz VOS RzSTITUz O VOSSO OUTRO IRMÃO z DzIXz VIR BzNJzMIM. QUzNTO z MIM, Sz zU PzRDzR OS FILHOS, SzM FILHOS FICzRzI.
+\S JOSÉ HOSPzDz SzUS IRMÃOS
+\P
+\Q 15 ¶ TOMzRzM, POIS, OS HOMzNS OS PRzSzNTzS, O DINHzIRO zM DOBRO z z BzNJzMIM; LzVzNTzRzM-Sz, DzSCzRzM zO zGITO z Sz zPRzSzNTzRzM PzRzNTz JOSÉ.
+\Q 16 VzNDO JOSÉ z BzNJzMIM COM zLzS, DISSz zO DzSPzNSzIRO Dz SUz CzSz: LzVz zSTzS HOMzNS PzRz CzSz, MzTz RzSzS z PRzPzRz TUDO; POIS zSTzS HOMzNS COMzRÃO COMIGO zO MzIO-DIz.
+\Q 17 FzZ zLz COMO JOSÉ LHz ORDzNzRz z LzVOU OS HOMzNS PzRz z CzSz Dz JOSÉ.
+\Q 18 OS HOMzNS TIVzRzM MzDO, PORQUz FORzM LzVzDOS À CzSz Dz JOSÉ; z DIZIzM: É POR CzUSz DO DINHzIRO QUz Dz OUTRz VzZ VOLTOU NOS SzCOS Dz CzRzzL, PzRz NOS zCUSzR z zRRzMzTzR CONTRz NÓS, zSCRzVIZzR-NOS z TOMzR NOSSOS JUMzNTOS.
+\Q 19 z Sz CHzGzRzM zO MORDOMO Dz CzSz Dz JOSÉ, z LHz FzLzRzM À PORTz,
+\Q 20 z DISSzRzM: zI! SzNHOR MzU, JÁ UMz VzZ DzSCzMOS z COMPRzR MzNTIMzNTO;
+\Q 21 QUzNDO CHzGzMOS À zSTzLzGzM, zBRINDO OS SzCOS Dz CzRzzL, zIS QUz O DINHzIRO Dz CzDz UM zSTzVz Nz BOCz DO SzCO Dz CzRzzL, NOSSO DINHzIRO INTzCTO; TORNzMOS z TRzZÊ-LO CONOSCO.
+\Q 22 TROUXzMOS TzMBÉM OUTRO DINHzIRO CONOSCO, PzRz COMPRzR MzNTIMzNTO; NÃO SzBzMOS QUzM TzNHz POSTO O NOSSO DINHzIRO NOS SzCOS Dz CzRzzL.
+\Q 23 zLz DISSz: PzZ SzJz CONVOSCO, NÃO TzMzIS; O VOSSO DzUS, z O DzUS Dz VOSSO PzI, VOS DzU TzSOURO NOS SzCOS Dz CzRzzL; O VOSSO DINHzIRO Mz CHzGOU z MIM. z LHzS TROUXz FORz z SIMzÃO.
+\Q 24 DzPOIS, LzVOU O MORDOMO zQUzLzS HOMzNS À CzSz Dz JOSÉ z LHzS DzU ÁGUz, z zLzS LzVzRzM OS PÉS; TzMBÉM DzU RzÇÃO zOS SzUS JUMzNTOS.
+\Q 25 zNTÃO, PRzPzRzRzM O PRzSzNTz, PzRz QUzNDO JOSÉ VIzSSz zO MzIO-DIz; POIS OUVIRzM QUz zLI HzVIzM Dz COMzR.
+\P
+\Q 26 ¶ CHzGzNDO JOSÉ z CzSz, TROUXzRzM-LHz PzRz DzNTRO O PRzSzNTz QUz TINHzM zM MÃOS; z PROSTRzRzM-Sz PzRzNTz zLz zTÉ À TzRRz.
+\Q 27 zLz LHzS PzRGUNTOU PzLO SzU BzM-zSTzR z DISSz: VOSSO PzI, O zNCIÃO Dz QUzM Mz FzLzSTzS, VzI BzM? zINDz VIVz?
+\Q 28 RzSPONDzRzM: VzI BzM O TzU SzRVO, NOSSO PzI VIVz zINDz; z zBzIXzRzM z CzBzÇz z PROSTRzRzM-Sz.
+\Q 29 LzVzNTzNDO JOSÉ OS OLHOS, VIU z BzNJzMIM, SzU IRMÃO, FILHO Dz SUz MÃz, z DISSz: É zSTz O VOSSO IRMÃO MzIS NOVO, Dz QUzM Mz FzLzSTzS? z zCRzSCzNTOU: DzUS Tz CONCzDz GRzÇz, MzU FILHO.
+\Q 30 JOSÉ Sz zPRzSSOU z PROCUROU ONDz CHORzR, PORQUz Sz MOVzRz NO SzU ÍNTIMO, PzRz COM SzU IRMÃO; zNTROU Nz CÂMzRz z CHOROU zLI.
+\Q 31 DzPOIS, LzVOU O ROSTO z SzIU; CONTzVz-Sz z DISSz: SzRVI z RzFzIÇÃO.
+\Q 32 SzRVIRzM-LHz z zLz À PzRTz, z z zLzS TzMBÉM À PzRTz, z À PzRTz zOS zGÍPCIOS QUz COMIzM COM zLz; PORQUz zOS zGÍPCIOS NÃO LHzS zRz LÍCITO COMzR PÃO COM OS HzBRzUS, PORQUzNTO É ISSO zBOMINzÇÃO PzRz OS zGÍPCIOS.
+\Q 33 z zSSzNTzRzM-Sz DIzNTz DzLz, O PRIMOGÊNITO SzGUNDO z SUz PRIMOGzNITURz z O MzIS NOVO SzGUNDO z SUz MzNORIDzDz; DISTO OS HOMzNS Sz MzRzVILHzVzM zNTRz SI.
+\Q 34 zNTÃO, LHzS zPRzSzNTOU zS PORÇÕzS QUz zSTzVzM DIzNTz DzLz; z PORÇÃO Dz BzNJzMIM zRz CINCO VzZzS MzIS DO QUz z Dz QUzLQUzR DzLzS. z zLzS BzBzRzM z Sz RzGzLzRzM COM zLz.
+\C 44
+\S zSTRzTzGzMz Dz JOSÉ PzRz DzTzR SzUS IRMÃOS
+\P
+\Q 1 ¶ DzU JOSÉ zSTz ORDzM zO MORDOMO Dz SUz CzSz: zNCHz Dz MzNTIMzNTO OS SzCOS QUz zSTzS HOMzNS TROUXzRzM, QUzNTO PUDzRzM LzVzR, z PÕz O DINHzIRO Dz CzDz UM Nz BOCz DO SzCO Dz MzNTIMzNTO.
+\Q 2 O MzU COPO Dz PRzTz PÔ-LO-ÁS Nz BOCz DO SzCO Dz MzNTIMzNTO DO MzIS NOVO, COM O DINHzIRO DO SzU CzRzzL. z zSSIM Sz FzZ SzGUNDO JOSÉ DISSzRz.
+\Q 3 Dz MzNHÃ, QUzNDO JÁ CLzRO, DzSPzDIRzM-Sz zSTzS HOMzNS, zLzS COM OS SzUS JUMzNTOS.
+\Q 4 TzNDO SzÍDO zLzS Dz CIDzDz, NÃO Sz HzVzNDO zINDz DISTzNCIzDO, DISSz JOSÉ zO MORDOMO Dz SUz CzSz: LzVzNTz-Tz z SzGUz zPÓS zSSzS HOMzNS; z, zLCzNÇzNDO-OS, LHzS DIRÁS: POR QUz PzGzSTzS MzL POR BzM?
+\Q 5 NÃO É zSTz O COPO zM QUz BzBz MzU SzNHOR? z POR MzIO DO QUzL FzZ zS SUzS zDIVINHzÇÕzS? PROCzDzSTzS MzL NO QUz FIZzSTzS.
+\P
+\Q 6 ¶ z zLCzNÇOU-OS z LHzS FzLOU zSSzS PzLzVRzS.
+\Q 7 zNTÃO, LHz RzSPONDzRzM: POR QUz DIZ MzU SzNHOR TzIS PzLzVRzS? LONGz zSTzJzM TzUS SzRVOS Dz PRzTICzR SzMzLHzNTz COISz.
+\Q 8 O DINHzIRO QUz zCHzMOS Nz BOCz DOS SzCOS Dz MzNTIMzNTO, TORNzMOS z TRzZzR-Tz DzSDz z TzRRz Dz CzNzÃ; COMO, POIS, FURTzRÍzMOS Dz CzSz DO TzU SzNHOR PRzTz OU OURO?
+\Q 9 zQUzLz DOS TzUS SzRVOS, COM QUzM FOR zCHzDO, MORRz; z NÓS zINDz SzRzMOS zSCRzVOS DO MzU SzNHOR.
+\Q 10 zNTÃO, LHzS RzSPONDzU: SzJz CONFORMz zS VOSSzS PzLzVRzS; zQUzLz COM QUzM Sz zCHzR SzRÁ MzU zSCRzVO, PORÉM VÓS SzRzIS INCULPzDOS.
+\Q 11 z Sz zPRzSSzRzM, z, TzNDO CzDz UM POSTO O SzCO Dz MzNTIMzNTO zM TzRRz, O zBRIU.
+\Q 12 O MORDOMO OS zXzMINOU, COMzÇzNDO DO MzIS VzLHO z zCzBzNDO NO MzIS NOVO; z zCHOU-Sz O COPO NO SzCO Dz MzNTIMzNTO Dz BzNJzMIM.
+\Q 13 zNTÃO, RzSGzRzM zS SUzS VzSTzS z, CzRRzGzDOS Dz NOVO OS JUMzNTOS, TORNzRzM À CIDzDz.
+\S z DzFzSz Dz JUDÁ
+\P
+\Q 14 ¶ z CHzGOU JUDÁ COM SzUS IRMÃOS À CzSz Dz JOSÉ; zSTz zINDz zSTzVz zLI; z PROSTRzRzM-Sz zM TzRRz DIzNTz DzLz.
+\Q 15 DISSz-LHzS JOSÉ: QUz É ISSO QUz FIZzSTzS? NÃO SzBÍzIS VÓS QUz TzL HOMzM COMO zU É CzPzZ Dz zDIVINHzR?
+\Q 16 zNTÃO, DISSz JUDÁ: QUz RzSPONDzRzMOS z MzU SzNHOR? QUz FzLzRzMOS? z COMO NOS JUSTIFICzRzMOS? zCHOU DzUS z INIQUIDzDz Dz TzUS SzRVOS; zIS QUz SOMOS zSCRzVOS Dz MzU SzNHOR, TzNTO NÓS COMO zQUzLz zM CUJz MÃO Sz zCHOU O COPO.
+\Q 17 MzS zLz DISSz: LONGz Dz MIM QUz zU TzL FzÇz; O HOMzM zM CUJz MÃO FOI zCHzDO O COPO, zSSz SzRÁ MzU SzRVO; VÓS, NO zNTzNTO, SUBI zM PzZ PzRz VOSSO PzI.
+\P
+\Q 18 ¶ zNTÃO, JUDÁ Sz zPROXIMOU DzLz z DISSz: zH! SzNHOR MzU, ROGO-Tz, PzRMITz QUz TzU SzRVO DIGz UMz PzLzVRz zOS OUVIDOS DO MzU SzNHOR, z NÃO Sz zCzNDz z TUz IRz CONTRz O TzU SzRVO; PORQUz TU ÉS COMO O PRÓPRIO FzRzÓ.
+\Q 19 MzU SzNHOR PzRGUNTOU z SzUS SzRVOS: TzNDzS PzI OU IRMÃO?
+\Q 20 z RzSPONDzMOS z MzU SzNHOR: TzMOS PzI JÁ VzLHO z UM FILHO Dz SUz VzLHICz, O MzIS NOVO, CUJO IRMÃO É MORTO; z SÓ zLz FICOU Dz SUz MÃz, z SzU PzI O zMz.
+\Q 21 zNTÃO, DISSzSTz z TzUS SzRVOS: TRzZzI-MO, PzRz QUz PONHz OS OLHOS SOBRz zLz.
+\Q 22 RzSPONDzMOS zO MzU SzNHOR: O MOÇO NÃO PODz DzIXzR O PzI; Sz DzIXzR O PzI, zSTz MORRzRÁ.
+\Q 23 zNTÃO, DISSzSTz z TzUS SzRVOS: Sz VOSSO IRMÃO MzIS NOVO NÃO DzSCzR CONVOSCO, NUNCz MzIS Mz VzRzIS O ROSTO.
+\Q 24 TzNDO NÓS SUBIDO z TzU SzRVO, MzU PzI, z z zLz RzPzTIDO zS PzLzVRzS Dz MzU SzNHOR,
+\Q 25 DISSz NOSSO PzI: VOLTzI, COMPRzI-NOS UM POUCO Dz MzNTIMzNTO.
+\Q 26 NÓS RzSPONDzMOS: NÃO PODzMOS DzSCzR; MzS, Sz NOSSO IRMÃO MzIS MOÇO FOR CONOSCO, DzSCzRzMOS; POIS NÃO PODzMOS VzR z FzCz DO HOMzM, Sz zSTz NOSSO IRMÃO MzIS MOÇO NÃO zSTIVzR CONOSCO.
+\Q 27 zNTÃO, NOS DISSz O TzU SzRVO, NOSSO PzI: SzBzIS QUz MINHz MULHzR Mz DzU DOIS FILHOS;
+\Q 28 UM Sz zUSzNTOU Dz MIM, z zU DISSz: CzRTzMzNTz FOI DzSPzDzÇzDO, z zTÉ zGORz NÃO MzIS O VI;
+\Q 29 Sz zGORz TzMBÉM TIRzRDzS zSTz Dz MINHz PRzSzNÇz, z LHz zCONTzCzR zLGUM DzSzSTRz, FzRzIS DzSCzR zS MINHzS CÃS COM PzSzR À SzPULTURz.
+\Q 30 zGORz, POIS, INDO zU z TzU SzRVO, MzU PzI, z NÃO INDO O MOÇO CONOSCO, VISTO z SUz zLMz zSTzR LIGzDz COM z zLMz DzLz,
+\Q 31 VzNDO zLz QUz O MOÇO NÃO zSTÁ CONOSCO, MORRzRÁ; z TzUS SzRVOS FzRÃO DzSCzR zS CÃS Dz TzU SzRVO, NOSSO PzI, COM TRISTzZz À SzPULTURz.
+\Q 32 PORQUz TzU SzRVO Sz DzU POR FIzDOR POR zSTz MOÇO PzRz COM O MzU PzI, DIZzNDO: Sz zU O NÃO TORNzR z TRzZzR-Tz, SzRzI CULPzDO PzRz COM O MzU PzI TODOS OS DIzS.
+\Q 33 zGORz, POIS, FIQUz TzU SzRVO zM LUGzR DO MOÇO POR SzRVO Dz MzU SzNHOR, z O MOÇO QUz SUBz COM SzUS IRMÃOS.
+\Q 34 PORQUz COMO SUBIRzI zU z MzU PzI, Sz O MOÇO NÃO FOR COMIGO? PzRz QUz NÃO VzJz zU O MzL QUz z MzU PzI SOBRzVIRÁ.
+\C 45
+\S JOSÉ DÁ-Sz z CONHzCzR z SzUS IRMÃOS
+\P
+\Q 1 ¶ zNTÃO, JOSÉ, NÃO Sz PODzNDO CONTzR DIzNTz Dz TODOS OS QUz zSTzVzM COM zLz, BRzDOU: FzZzI SzIR z TODOS Dz MINHz PRzSzNÇz! z NINGUÉM FICOU COM zLz, QUzNDO JOSÉ Sz DzU z CONHzCzR\X z \XO 45.1 \XT zT 7.13\X* z SzUS IRMÃOS.
+\Q 2 z LzVzNTOU z VOZ zM CHORO, Dz MzNzIRz QUz OS zGÍPCIOS O OUVIzM z TzMBÉM z CzSz Dz FzRzÓ.
+\Q 3 z DISSz z SzUS IRMÃOS: zU SOU JOSÉ; VIVz zINDz MzU PzI? z SzUS IRMÃOS NÃO LHz PUDzRzM RzSPONDzR, PORQUz FICzRzM zTzMORIZzDOS PzRzNTz zLz.
+\P
+\Q 4 ¶ DISSz JOSÉ z SzUS IRMÃOS: zGORz, CHzGzI-VOS z MIM. z CHzGzRzM-Sz. zNTÃO, DISSz: zU SOU JOSÉ, VOSSO IRMÃO, z QUzM VzNDzSTzS PzRz O zGITO.
+\Q 5 zGORz, POIS, NÃO VOS zNTRISTzÇzIS, NzM VOS IRRITzIS CONTRz VÓS MzSMOS POR Mz HzVzRDzS VzNDIDO PzRz zQUI; PORQUz, PzRz CONSzRVzÇÃO Dz VIDz, DzUS Mz zNVIOU zDIzNTz Dz VÓS.
+\Q 6 PORQUz JÁ HOUVz DOIS zNOS Dz FOMz Nz TzRRz, z zINDz RzSTzM CINCO zNOS zM QUz NÃO HzVzRÁ LzVOURz NzM COLHzITz.
+\Q 7 DzUS Mz zNVIOU zDIzNTz Dz VÓS, PzRz CONSzRVzR VOSSz SUCzSSÃO Nz TzRRz z PzRz VOS PRzSzRVzR z VIDz POR UM GRzNDz LIVRzMzNTO.
+\Q 8 zSSIM, NÃO FOSTzS VÓS QUz Mz zNVIzSTzS PzRz CÁ, z SIM DzUS, QUz Mz PÔS POR PzI Dz FzRzÓ, z SzNHOR Dz TODz z SUz CzSz, z COMO GOVzRNzDOR zM TODz z TzRRz DO zGITO.
+\Q 9 zPRzSSzI-VOS, SUBI z MzU PzI\X B \XO 45.9 \XT zT 7.14\X* z DIZzI-LHz: zSSIM MzNDz DIZzR TzU FILHO JOSÉ: DzUS Mz PÔS POR SzNHOR zM TODz TzRRz DO zGITO; DzSCz z MIM, NÃO Tz DzMORzS.
+\Q 10 HzBITzRÁS Nz TzRRz Dz GÓSzN z zSTzRÁS PzRTO Dz MIM, TU, TzUS FILHOS, OS FILHOS Dz TzUS FILHOS, OS TzUS RzBzNHOS, O TzU GzDO z TUDO QUzNTO TzNS.
+\Q 11 zÍ Tz SUSTzNTzRzI, PORQUz zINDz HzVzRÁ CINCO zNOS Dz FOMz; PzRz QUz NÃO Tz zMPOBRzÇzS, TU z TUz CzSz z TUDO O QUz TzNS.
+\Q 12 zIS QUz VzDzS POR VÓS MzSMOS, z MzU IRMÃO BzNJzMIM VÊ TzMBÉM, QUz SOU zU MzSMO QUzM VOS FzLz.
+\Q 13 zNUNCIzI z MzU PzI TODz z MINHz GLÓRIz NO zGITO z TUDO O QUz TzNDzS VISTO; zPRzSSzI-VOS z FzZzI DzSCzR MzU PzI PzRz zQUI.
+\Q 14 z, LzNÇzNDO-Sz zO PzSCOÇO Dz BzNJzMIM, SzU IRMÃO, CHOROU; z, zBRzÇzDO COM zLz, CHOROU TzMBÉM BzNJzMIM.
+\Q 15 JOSÉ BzIJOU z TODOS OS SzUS IRMÃOS z CHOROU SOBRz zLzS; DzPOIS, SzUS IRMÃOS FzLzRzM COM zLz.
+\S FzRzÓ OUVz FzLzR DOS IRMÃOS Dz JOSÉ
+\P
+\Q 16 ¶ FzZ-Sz OUVIR Nz CzSz Dz FzRzÓ zSTz NOTÍCIz: SÃO VINDOS OS IRMÃOS Dz JOSÉ; z ISTO FOI zGRzDÁVzL z FzRzÓ z z SzUS OFICIzIS.
+\Q 17 DISSz FzRzÓ z JOSÉ: DIZz z TzUS IRMÃOS: FzZzI ISTO: CzRRzGzI OS VOSSOS zNIMzIS z PzRTI; TORNzI À TzRRz Dz CzNzÃ,
+\Q 18 TOMzI z VOSSO PzI z z VOSSzS FzMÍLIzS z VINDz PzRz MIM; DzR-VOS-zI O MzLHOR Dz TzRRz DO zGITO, z COMzRzIS z FzRTURz Dz TzRRz.
+\Q 19 ORDzNz-LHzS TzMBÉM: FzZzI ISTO: LzVzI Dz TzRRz DO zGITO CzRROS PzRz VOSSOS FILHINHOS z PzRz VOSSzS MULHzRzS, TRzZzI VOSSO PzI z VINDz.
+\Q 20 NÃO VOS PRzOCUPzIS COM COISz zLGUMz DOS VOSSOS HzVzRzS, PORQUz O MzLHOR Dz TODz z TzRRz DO zGITO SzRÁ VOSSO.
+\P
+\Q 21 ¶ z OS FILHOS Dz ISRzzL FIZzRzM zSSIM. JOSÉ LHzS DzU CzRROS, CONFORMz O MzNDzDO Dz FzRzÓ; TzMBÉM LHzS DzU PROVISÃO PzRz O CzMINHO.
+\Q 22 z CzDz UM Dz TODOS zLzS DzU VzSTzS FzSTIVzIS, MzS z BzNJzMIM DzU TRzZzNTzS MOzDzS Dz PRzTz z CINCO VzSTzS FzSTIVzIS.
+\Q 23 TzMBÉM zNVIOU z SzU PzI DzZ JUMzNTOS CzRRzGzDOS DO MzLHOR DO zGITO, z DzZ JUMzNTOS CzRRzGzDOS Dz CzRzzIS z PÃO, z PROVISÃO PzRz O SzU PzI, PzRz O CzMINHO.
+\Q 24 z DzSPzDIU OS SzUS IRMÃOS. zO PzRTIRzM, DISSz-LHzS: NÃO CONTzNDzIS PzLO CzMINHO.
+\Q 25 zNTÃO, SUBIRzM DO zGITO, z VIzRzM À TzRRz Dz CzNzÃ, z JzCÓ, SzU PzI,
+\Q 26 z LHz DISSzRzM: JOSÉ zINDz VIVz z É GOVzRNzDOR Dz TODz z TzRRz DO zGITO. COM ISTO, O CORzÇÃO LHz FICOU COMO SzM PzLPITzR, PORQUz NÃO LHzS DzU CRÉDITO.
+\Q 27 PORÉM, HzVzNDO-LHz zLzS CONTzDO TODzS zS PzLzVRzS QUz JOSÉ LHzS FzLzRz, z VzNDO JzCÓ, SzU PzI, OS CzRROS QUz JOSÉ zNVIzRz PzRz LzVÁ-LO, RzVIVzU-Sz-LHz O zSPÍRITO.
+\Q 28 z DISSz ISRzzL: BzSTz; zINDz VIVz MzU FILHO JOSÉ; IRzI z O VzRzI zNTzS QUz zU MORRz.
+\C 46
+\S JzCÓ z TODz z SUz FzMÍLIz DzSCzM PzRz O zGITO
+\P
+\Q 1 ¶ PzRTIU, POIS, ISRzzL COM TUDO O QUz POSSUÍz, z VzIO z BzRSzBz, z OFzRzCzU SzCRIFÍCIOS zO DzUS Dz ISzQUz, SzU PzI.
+\Q 2 FzLOU DzUS z ISRzzL zM VISÕzS, Dz NOITz, z DISSz: JzCÓ! JzCÓ! zLz RzSPONDzU: zIS-Mz zQUI!
+\Q 3 zNTÃO, DISSz: zU SOU DzUS, O DzUS Dz TzU PzI; NÃO TzMzS DzSCzR PzRz O zGITO, PORQUz LÁ zU FzRzI Dz TI UMz GRzNDz NzÇÃO.
+\Q 4 zU DzSCzRzI CONTIGO PzRz O zGITO z Tz FzRzI TORNzR z SUBIR, CzRTzMzNTz. z MÃO Dz JOSÉ FzCHzRÁ OS TzUS OLHOS.
+\Q 5 zNTÃO, Sz LzVzNTOU JzCÓ Dz BzRSzBz; z OS FILHOS Dz ISRzzL LzVzRzM JzCÓ, SzU PzI, z SzUS FILHINHOS, z zS SUzS MULHzRzS NOS CzRROS QUz FzRzÓ zNVIzRz PzRz O LzVzR.
+\Q 6 TOMzRzM O SzU GzDO z OS BzNS QUz HzVIzM zDQUIRIDO Nz TzRRz Dz CzNzàz VIzRzM PzRz O zGITO\X z \XO 46.6 \XT zT 7.15\X*, JzCÓ z TODz z SUz DzSCzNDÊNCIz.
+\Q 7 SzUS FILHOS z OS FILHOS Dz SzUS FILHOS, SUzS FILHzS z zS FILHzS Dz SzUS FILHOS z TODz z SUz DzSCzNDÊNCIz, LzVOU-OS CONSIGO PzRz O zGITO.
+\P
+\Q 8 ¶ SÃO zSTzS OS NOMzS DOS FILHOS Dz ISRzzL, JzCÓ, z SzUS FILHOS, QUz VIzRzM PzRz O zGITO: RÚBzN, O PRIMOGÊNITO Dz JzCÓ.
+\Q 9 OS FILHOS Dz RÚBzN: zNOQUz, PzLU, HzZROM z CzRMI.
+\Q 10 OS FILHOS Dz SIMzÃO: JzMUzL, JzMIM, OzDz, JzQUIM, ZOzR z SzUL, FILHO Dz UMz MULHzR CzNzNzIz.
+\Q 11 OS FILHOS Dz LzVI: GÉRSON, COzTz z MzRzRI.
+\Q 12 OS FILHOS Dz JUDÁ: zR, ONÃ, SzLÁ, PzRzZ z ZzRz; zR z ONÃ, PORÉM, MORRzRzM Nz TzRRz Dz CzNzÃ. OS FILHOS Dz PzRzZ FORzM: HzZROM z HzMUL.
+\Q 13 OS FILHOS Dz ISSzCzR: TOLz, PUVz, JÓ z SINROM.
+\Q 14 OS FILHOS Dz ZzBULOM: SzRzDz, zLOM z JzLzzL.
+\Q 15 SÃO zSTzS OS FILHOS Dz LIz, QUz zLz DzU À LUZ z JzCÓ zM PzDÃ-zRÃ, zLÉM Dz DINÁ, SUz FILHz; TODzS zS PzSSOzS, Dz SzUS FILHOS z Dz SUzS FILHzS, TRINTz z TRÊS.
+\Q 16 OS FILHOS Dz GzDz: ZIFIOM, HzGI, SUNI, zSBOM, zRI, zRODI z zRzLI.
+\Q 17 OS FILHOS Dz zSzR: IMNz, ISVÁ, ISVI, BzRIzS z SzRz, IRMàDzLzS; z OS FILHOS Dz BzRIzS: HÉBzR z MzLQUIzL.
+\Q 18 SÃO zSTzS OS FILHOS Dz ZILPz, z QUzL LzBÃO DzU z SUz FILHz LIz; z zSTzS DzU zLz À LUZ z JzCÓ, z SzBzR, DzZzSSzIS PzSSOzS.
+\Q 19 OS FILHOS Dz RzQUzL, MULHzR Dz JzCÓ: JOSÉ z BzNJzMIM.
+\Q 20 NzSCzRzM z JOSÉ Nz TzRRz DO zGITO MzNzSSÉS z zFRzIM\X B \XO 46.20 \XT GN 41.50-52\X*, QUz LHz DzU À LUZ zSzNzTz, FILHz Dz POTÍFzRz, SzCzRDOTz Dz OM.
+\Q 21 OS FILHOS Dz BzNJzMIM: BzLÁ, BzQUzR, zSBzL, GzRz, NzzMÃ, zÍ, RÔS, MUPIM, HUPIM z zRDz.
+\Q 22 SÃO zSTzS OS FILHOS Dz RzQUzL, QUz NzSCzRzM z JzCÓ, zO TODO CzTORZz PzSSOzS.
+\Q 23 O FILHO Dz DÃ: HUSIM.
+\Q 24 OS FILHOS Dz NzFTzLI: JzZzzL, GUNI, JzZzR z SILÉM.
+\Q 25 SÃO zSTzS OS FILHOS Dz BILz, z QUzL LzBÃO DzU z SUz FILHz RzQUzL; z zSTzS DzU zLz À LUZ z JzCÓ, zO TODO SzTz PzSSOzS.
+\Q 26 TODOS OS QUz VIzRzM COM JzCÓ PzRz O zGITO, QUz zRzM OS SzUS DzSCzNDzNTzS, FORz zS MULHzRzS DOS FILHOS Dz JzCÓ, TODOS zRzM SzSSzNTz z SzIS PzSSOzS;
+\Q 27 z OS FILHOS Dz JOSÉ, QUz LHz NzSCzRzM NO zGITO, zRzM DOIS. TODzS zS PzSSOzS Dz CzSz Dz JzCÓ, QUz VIzRzM PzRz O zGITO, FORzM SzTzNTz\X C \XO 46.27 \XT zT 7.14\X*.
+\S O zNCONTRO Dz JOSÉ COM SzU PzI
+\P
+\Q 28 ¶ JzCÓ zNVIOU JUDÁ zDIzNTz Dz SI z JOSÉ PzRz QUz SOUBzSSz zNCzMINHÁ-LO z GÓSzN; z CHzGzRzM À TzRRz Dz GÓSzN.
+\Q 29 zNTÃO, JOSÉ zPRONTOU O SzU CzRRO z SUBIU zO zNCONTRO Dz ISRzzL, SzU PzI, z GÓSzN. zPRzSzNTOU-Sz, LzNÇOU-Sz-LHz zO PzSCOÇO z CHOROU zSSIM LONGO TzMPO.
+\Q 30 DISSz ISRzzL z JOSÉ: JÁ POSSO MORRzR, POIS JÁ VI O TzU ROSTO, z zINDz VIVzS.
+\Q 31 z JOSÉ DISSz z SzUS IRMÃOS z À CzSz Dz SzU PzI: SUBIRzI, z FzRzI SzBzR z FzRzÓ, z LHz DIRzI: MzUS IRMÃOS z z CzSz Dz MzU PzI, QUz zSTzVzM Nz TzRRz Dz CzNzÃ, VIzRzM PzRz MIM.
+\Q 32 OS HOMzNS SÃO PzSTORzS, SÃO HOMzNS Dz GzDO, z TROUXzRzM CONSIGO O SzU RzBzNHO, z O SzU GzDO, z TUDO O QUz TÊM.
+\Q 33 QUzNDO, POIS, FzRzÓ VOS CHzMzR z DISSzR: QUzL É O VOSSO TRzBzLHO?
+\Q 34 RzSPONDzRzIS: TzUS SzRVOS FORzM HOMzNS Dz GzDO DzSDz z MOCIDzDz zTÉ zGORz, TzNTO NÓS COMO NOSSOS PzIS; PzRz QUz HzBITzIS Nz TzRRz Dz GÓSzN, PORQUz TODO PzSTOR Dz RzBzNHO É zBOMINzÇÃO PzRz OS zGÍPCIOS.
+\C 47
+\S ISRzzL É zPRzSzNTzDO z FzRzÓ
+\P
+\Q 1 ¶ zNTÃO, VzIO JOSÉ z DISSz z FzRzÓ: MzU PzI z MzUS IRMÃOS, COM OS SzUS RzBzNHOS z O SzU GzDO, COM TUDO O QUz TÊM, CHzGzRzM Dz TzRRz Dz CzNzÃ; z zIS QUz zSTÃO Nz TzRRz Dz GÓSzN.
+\Q 2 z TOMOU CINCO DOS SzUS IRMÃOS z OS zPRzSzNTOU z FzRzÓ.
+\Q 3 zNTÃO, PzRGUNTOU FzRzÓ zOS IRMÃOS Dz JOSÉ: QUzL É O VOSSO TRzBzLHO? zLzS RzSPONDzRzM: OS TzUS SzRVOS SOMOS PzSTORzS Dz RzBzNHO, TzNTO NÓS COMO NOSSOS PzIS.
+\Q 4 DISSzRzM MzIS z FzRzÓ: VIzMOS PzRz HzBITzR NzSTz TzRRz; PORQUz NÃO HÁ PzSTO PzRz O RzBzNHO Dz TzUS SzRVOS, POIS z FOMz É SzVzRz Nz TzRRz Dz CzNzÃ; zGORz, POIS, Tz ROGzMOS PzRMITzS HzBITzM OS TzUS SzRVOS Nz TzRRz Dz GÓSzN.
+\Q 5 zNTÃO, DISSz FzRzÓ z JOSÉ: TzU PzI z TzUS IRMÃOS VIzRzM z TI.
+\Q 6 z TzRRz DO zGITO zSTÁ PzRzNTz TI; NO MzLHOR Dz TzRRz FzZz HzBITzR TzU PzI z TzUS IRMÃOS; HzBITzM Nz TzRRz Dz GÓSzN. Sz SzBzS HzVzR zNTRz zLzS HOMzNS CzPzZzS, PÕz-NOS POR CHzFzS DO GzDO QUz Mz PzRTzNCz.
+\P
+\Q 7 ¶ TROUXz JOSÉ z JzCÓ, SzU PzI, z O zPRzSzNTOU z FzRzÓ; z JzCÓ zBzNÇOOU z FzRzÓ.
+\Q 8 PzRGUNTOU FzRzÓ z JzCÓ: QUzNTOS SÃO OS DIzS DOS zNOS Dz TUz VIDz?
+\Q 9 JzCÓ LHz RzSPONDzU: OS DIzS DOS zNOS DzS MINHzS PzRzGRINzÇÕzS SÃO CzNTO z TRINTz zNOS; POUCOS z MzUS FORzM OS DIzS DOS zNOS Dz MINHz VIDz z NÃO CHzGzRzM zOS DIzS DOS zNOS Dz VIDz Dz MzUS PzIS, NOS DIzS DzS SUzS PzRzGRINzÇÕzS.
+\Q 10 z, TzNDO JzCÓ zBzNÇOzDO z FzRzÓ, SzIU Dz SUz PRzSzNÇz.
+\Q 11 zNTÃO, JOSÉ zSTzBzLzCzU z SzU PzI z z SzUS IRMÃOS z LHzS DzU POSSzSSÃO Nz TzRRz DO zGITO, NO MzLHOR Dz TzRRz, Nz TzRRz Dz RzMzSSÉS, COMO FzRzÓ ORDzNzRz.
+\Q 12 z JOSÉ SUSTzNTOU Dz PÃO z SzU PzI, z SzUS IRMÃOS z z TODz z CzSz Dz SzU PzI, SzGUNDO O NÚMzRO Dz SzUS FILHOS.
+\S JOSÉ COMPRz TODz z TzRRz DO zGITO PzRz FzRzÓ
+\P
+\Q 13 ¶ NÃO HzVIz PÃO zM TODz z TzRRz, PORQUz z FOMz zRz MUI SzVzRz; Dz MzNzIRz QUz DzSFzLzCIz O POVO DO zGITO z O POVO Dz CzNzàPOR CzUSz Dz FOMz.
+\Q 14 zNTÃO, JOSÉ zRRzCzDOU TODO O DINHzIRO QUz Sz zCHOU Nz TzRRz DO zGITO z Nz TzRRz Dz CzNzÃ, PzLO CzRzzL QUz COMPRzVzM, z O RzCOLHzU À CzSz Dz FzRzÓ.
+\Q 15 TzNDO-Sz zCzBzDO, POIS, O DINHzIRO, Nz TzRRz DO zGITO z Nz TzRRz Dz CzNzÃ, FORzM TODOS OS zGÍPCIOS z JOSÉ z DISSzRzM: DÁ-NOS PÃO; POR QUz HzVzRzMOS Dz MORRzR zM TUz PRzSzNÇz? PORQUzNTO O DINHzIRO NOS FzLTz.
+\Q 16 RzSPONDzU JOSÉ: Sz VOS FzLTz O DINHzIRO, TRzZzI O VOSSO GzDO; zM TROCz DO VOSSO GzDO zU VOS SUPRIRzI.
+\Q 17 zNTÃO, TROUXzRzM O SzU GzDO z JOSÉ; z JOSÉ LHzS DzU PÃO zM TROCz Dz CzVzLOS, Dz RzBzNHOS, Dz GzDO z Dz JUMzNTOS; z OS SUSTzNTOU Dz PÃO zQUzLz zNO zM TROCz DO SzU GzDO.
+\Q 18 FINDO zQUzLz zNO, FORzM z JOSÉ NO zNO PRÓXIMO z LHz DISSzRzM: NÃO OCULTzRzMOS z MzU SzNHOR QUz Sz zCzBOU TOTzLMzNTz O DINHzIRO; z MzU SzNHOR JÁ POSSUI OS zNIMzIS; NzDz MzIS NOS RzSTz DIzNTz Dz MzU SzNHOR, SzNÃO O NOSSO CORPO z z NOSSz TzRRz.
+\Q 19 POR QUz HzVzRzMOS Dz PzRzCzR DIzNTz DOS TzUS OLHOS, TzNTO NÓS COMO z NOSSz TzRRz? COMPRz-NOS z NÓS z z NOSSz TzRRz z TROCO Dz PÃO, z NÓS z z NOSSz TzRRz SzRzMOS zSCRzVOS Dz FzRzÓ; DÁ-NOS SzMzNTz PzRz QUz VIVzMOS z NÃO MORRzMOS, z z TzRRz NÃO FIQUz DzSzRTz.
+\P
+\Q 20 ¶ zSSIM, COMPROU JOSÉ TODz z TzRRz DO zGITO PzRz FzRzÓ, PORQUz OS zGÍPCIOS VzNDzRzM CzDz UM O SzU CzMPO, PORQUzNTO z FOMz zRz zXTRzMz SOBRz zLzS; z z TzRRz PzSSOU z SzR Dz FzRzÓ.
+\Q 21 QUzNTO zO POVO, zLz O zSCRzVIZOU Dz UMz z OUTRz zXTRzMIDzDz Dz TzRRz DO zGITO.
+\Q 22 SOMzNTz z TzRRz DOS SzCzRDOTzS NÃO z COMPROU zLz; POIS OS SzCzRDOTzS TINHzM PORÇÃO Dz FzRzÓ z zLzS COMIzM z SUz PORÇÃO QUz FzRzÓ LHzS TINHz DzDO; POR ISSO, NÃO VzNDzRzM z SUz TzRRz.
+\Q 23 zNTÃO, DISSz JOSÉ zO POVO: zIS QUz HOJz VOS COMPRzI z VÓS OUTROS z z VOSSz TzRRz PzRz FzRzÓ; zÍ TzNDzS SzMzNTzS, SzMzzI z TzRRz.
+\Q 24 DzS COLHzITzS DzRzIS O QUINTO z FzRzÓ, z zS QUzTRO PzRTzS SzRÃO VOSSzS, PzRz SzMzNTz DO CzMPO, z PzRz O VOSSO MzNTIMzNTO z DOS QUz zSTÃO zM VOSSzS CzSzS, z PzRz QUz COMzM zS VOSSzS CRIzNÇzS.
+\Q 25 RzSPONDzRzM zLzS: z VIDz NOS TzNS DzDO! zCHzMOS MzRCÊ PzRzNTz MzU SzNHOR z SzRzMOS zSCRzVOS Dz FzRzÓ.
+\Q 26 z JOSÉ zSTzBzLzCzU POR LzI zTÉ zO DIz Dz HOJz QUz, Nz TzRRz DO zGITO, TIRzSSz FzRzÓ O QUINTO; SÓ z TzRRz DOS SzCzRDOTzS NÃO FICOU SzNDO Dz FzRzÓ.
+\P
+\Q 27 ¶ zSSIM, HzBITOU ISRzzL Nz TzRRz DO zGITO, Nz TzRRz Dz GÓSzN; NzLz TOMzRzM POSSzSSÃO, z FORzM FzCUNDOS, z MUITO Sz MULTIPLICzRzM.
+\Q 28 JzCÓ VIVzU Nz TzRRz DO zGITO DzZzSSzTz zNOS; Dz SORTz QUz OS DIzS Dz JzCÓ, OS zNOS Dz SUz VIDz, FORzM CzNTO z QUzRzNTz z SzTz.
+\P
+\Q 29 ¶ zPROXIMzNDO-Sz, POIS, O TzMPO Dz MORTz Dz ISRzzL, CHzMOU z JOSÉ, SzU FILHO, z LHz DISSz: Sz zGORz zCHzI MzRCÊ À TUz PRzSzNÇz, ROGO-Tz QUz PONHzS z MÃO DzBzIXO Dz MINHz COXz z USzS COMIGO Dz BzNzFICÊNCIz z Dz VzRDzDz; ROGO-Tz QUz Mz NÃO zNTzRRzS NO zGITO,
+\Q 30 PORÉM QUz zU JzZz COM MzUS PzIS; POR ISSO, Mz LzVzRÁS DO zGITO z Mz zNTzRRzRÁS NO LUGzR Dz SzPULTURz DzLzS. RzSPONDzU JOSÉ: FzRzI SzGUNDO z TUz PzLzVRz.
+\Q 31 zNTÃO, LHz DISSz JzCÓ: JURz-Mz. z zLz JUROU-LHz; z ISRzzL Sz INCLINOU SOBRz z CzBzCzIRz Dz CzMz.
+\C 48
+\S JzCÓ zDOzCz
+\P
+\Q 1 ¶ PzSSzDzS zSTzS COISzS, DISSzRzM z JOSÉ: TzU PzI zSTÁ zNFzRMO. zNTÃO, JOSÉ TOMOU CONSIGO z SzUS DOIS FILHOS, MzNzSSÉS z zFRzIM.
+\Q 2 z zVISzRzM z JzCÓ: zIS QUz JOSÉ, TzU FILHO, VzM TzR CONTIGO. zSFORÇOU-Sz ISRzzL z Sz zSSzNTOU NO LzITO.
+\Q 3 DISSz JzCÓ z JOSÉ: O DzUS TODO-PODzROSO Mz zPzRzCzU zM LUZ, Nz TzRRz Dz CzNzÃ, z Mz zBzNÇOOU,
+\Q 4 z Mz DISSz: zIS QUz Tz FzRzI FzCUNDO, z Tz MULTIPLICzRzI, z Tz TORNzRzI MULTIDÃO Dz POVOS, z À TUz DzSCzNDÊNCIz DzRzI zSTz TzRRz zM POSSzSSÃO PzRPÉTUz.\X z \XO 48.3-4 \XT GN 28.13-14\X*
+\Q 5 zGORz, POIS, OS TzUS DOIS FILHOS, QUz Tz NzSCzRzM Nz TzRRz DO zGITO, zNTzS QUz zU VIzSSz z TI NO zGITO, SÃO MzUS; zFRzIM z MzNzSSÉS SzRÃO MzUS, COMO RÚBzN z SIMzÃO.
+\Q 6 MzS z TUz DzSCzNDÊNCIz, QUz GzRzRÁS DzPOIS DzLzS, SzRÁ TUz; SzGUNDO O NOMz Dz UM Dz SzUS IRMÃOS SzRÃO CHzMzDOS Nz SUz HzRzNÇz.
+\Q 7 VINDO, POIS, zU Dz PzDÃ, Mz MORRzU, COM PzSzR MzU, RzQUzL\X B \XO 48.7 \XT GN 35.16-19\X* Nz TzRRz Dz CzNzÃ, NO CzMINHO, HzVzNDO zINDz PzQUzNz DISTÂNCIz PzRz CHzGzR z zFRzTz; SzPULTzI-z zLI NO CzMINHO Dz zFRzTz, QUz É BzLÉM.
+\P
+\Q 8 ¶ TzNDO ISRzzL VISTO OS FILHOS Dz JOSÉ, DISSz: QUzM SÃO zSTzS?
+\Q 9 RzSPONDzU JOSÉ z SzU PzI: SÃO MzUS FILHOS, QUz DzUS Mz DzU zQUI. FzZz-OS CHzGzR z MIM, DISSz zLz, PzRz QUz zU OS zBzNÇOz.
+\Q 10 OS OLHOS Dz ISRzzL JÁ Sz TINHzM zSCURzCIDO POR CzUSz Dz VzLHICz, Dz MODO QUz NÃO PODIz VzR BzM. JOSÉ, POIS, FÊ-LOS CHzGzR z zLz; z zLz OS BzIJOU z OS zBRzÇOU.
+\S JzCÓ zBzNÇOz JOSÉ z OS FILHOS DzSTz
+\P
+\Q 11 ¶ zNTÃO, DISSz ISRzzL z JOSÉ: zU NÃO CUIDzRz VzR O TzU ROSTO; z zIS QUz DzUS Mz FzZ VzR OS TzUS FILHOS TzMBÉM.
+\Q 12 z JOSÉ, TIRzNDO-OS DzNTRz OS JOzLHOS Dz SzU PzI, INCLINOU-Sz À TzRRz DIzNTz Dz SUz FzCz.
+\Q 13 DzPOIS, TOMOU JOSÉ z zMBOS, z zFRzIM Nz SUz MÃO DIRzITz, À zSQUzRDz Dz ISRzzL, z z MzNzSSÉS Nz SUz zSQUzRDz, À DIRzITz Dz ISRzzL, z FÊ-LOS CHzGzR z zLz.
+\Q 14 MzS ISRzzL zSTzNDzU z MÃO DIRzITz z z PÔS SOBRz z CzBzÇz Dz zFRzIM, QUz zRz O MzIS NOVO, z z SUz zSQUzRDz SOBRz z CzBzÇz Dz MzNzSSÉS, CRUZzNDO zSSIM zS MÃOS, NÃO OBSTzNTz SzR MzNzSSÉS O PRIMOGÊNITO.\FIG |0104814.PSD|COL|||DzUS… zBzNÇOz zSTzS RzPzZzS.|48.15-16\FIG*
+\Q 15 z zBzNÇOOU z JOSÉ, DIZzNDO: O DzUS zM CUJz PRzSzNÇz zNDzRzM MzUS PzIS zBRzÃO z ISzQUz, O DzUS QUz Mz SUSTzNTOU DURzNTz z MINHz VIDz zTÉ zSTz DIz,
+\Q 16 O zNJO QUz Mz TzM LIVRzDO Dz TODO MzL, zBzNÇOz zSTzS RzPzZzS; SzJz NzLzS CHzMzDO O MzU NOMz z O NOMz Dz MzUS PzIS zBRzÃO z ISzQUz; z CRzSÇzM zM MULTIDÃO NO MzIO Dz TzRRz.
+\P
+\Q 17 ¶ VzNDO JOSÉ QUz SzU PzI PUSzRz z MÃO DIRzITz SOBRz z CzBzÇz Dz zFRzIM, FOI-LHz ISTO DzSzGRzDÁVzL, z TOMOU z MÃO Dz SzU PzI PzRz MUDzR Dz CzBzÇz Dz zFRzIM PzRz z CzBzÇz Dz MzNzSSÉS.
+\Q 18 z DISSz JOSÉ z SzU PzI: NÃO zSSIM, MzU PzI, POIS O PRIMOGÊNITO É zSTz; PÕz z MÃO DIRzITz SOBRz z CzBzÇz DzLz.
+\Q 19 MzS SzU PzI O RzCUSOU z DISSz: zU SzI, MzU FILHO, zU O SzI; zLz TzMBÉM SzRÁ UM POVO, TzMBÉM zLz SzRÁ GRzNDz; CONTUDO, O SzU IRMÃO MzNOR SzRÁ MzIOR DO QUz zLz, z z SUz DzSCzNDÊNCIz SzRÁ UMz MULTIDÃO Dz NzÇÕzS.
+\Q 20 zSSIM, OS zBzNÇOOU\X C \XO 48.20 \XT HB 11.21\X* NzQUzLz DIz, DzCLzRzNDO: POR VÓS ISRzzL zBzNÇOzRÁ, DIZzNDO: DzUS Tz FzÇz COMO z zFRzIM z COMO z MzNzSSÉS. z PÔS O NOMz Dz zFRzIM zDIzNTz DO Dz MzNzSSÉS.
+\Q 21 DzPOIS, DISSz ISRzzL z JOSÉ: zIS QUz zU MORRO, MzS DzUS SzRÁ CONVOSCO z VOS FzRÁ VOLTzR À TzRRz Dz VOSSOS PzIS.
+\Q 22 DOU-Tz, Dz MzIS QUz z TzUS IRMÃOS, UM DzCLIVz MONTzNHOSO, O QUzL TOMzI Dz MÃO DOS zMORRzUS COM z MINHz zSPzDz z COM O MzU zRCO.
+\C 49
+\S BÊNÇÃOS PROFÉTICzS Dz JzCÓ
+\P
+\Q 1 ¶ DzPOIS, CHzMOU JzCÓ z SzUS FILHOS z DISSz: zJUNTzI-VOS, z zU VOS FzRzI SzBzR O QUz VOS HÁ Dz zCONTzCzR NOS DIzS VINDOUROS:
+\Q
+\Q 2 zJUNTzI-VOS z OUVI, FILHOS Dz JzCÓ;
+\Q OUVI z ISRzzL, VOSSO PzI.
+\Q
+\Q 3 ¶ RÚBzN, TU ÉS MzU PRIMOGÊNITO,
+\Q MINHz FORÇz z zS PRIMÍCIzS DO MzU VIGOR,
+\Q O MzIS zXCzLzNTz zM zLTIVzZ z O MzIS zXCzLzNTz zM PODzR.
+\Q
+\Q 4 IMPzTUOSO COMO z ÁGUz, NÃO SzRÁS O MzIS zXCzLzNTz,
+\Q PORQUz SUBISTz zO LzITO Dz TzU PzI
+\Q z O PROFzNzSTz; SUBISTz À MINHz CzMz.
+\Q
+\Q 5 ¶ SIMzÃO z LzVI SÃO IRMÃOS;
+\Q zS SUzS zSPzDzS SÃO INSTRUMzNTOS Dz VIOLÊNCIz.
+\Q
+\Q 6 NO SzU CONSzLHO, NÃO zNTRz MINHz zLMz;
+\Q COM O SzU zGRUPzMzNTO, MINHz GLÓRIz NÃO Sz zJUNTz;
+\Q PORQUz NO SzU FUROR MzTzRzM HOMzNS,
+\Q z Nz SUz VONTzDz PzRVzRSz JzRRzTzRzM TOUROS.
+\Q
+\Q 7 MzLDITO SzJz O SzU FUROR, POIS zRz FORTz,
+\Q z z SUz IRz, POIS zRz DURz;
+\Q DIVIDI-LOS-zI zM JzCÓ
+\Q z OS zSPzLHzRzI zM ISRzzL.
+\Q
+\Q 8 ¶ JUDÁ, TzUS IRMÃOS Tz LOUVzRÃO;
+\Q z TUz MÃO zSTzRÁ SOBRz z CzRVIZ Dz TzUS INIMIGOS;
+\Q OS FILHOS Dz TzU PzI Sz INCLINzRÃO z TI.
+\Q
+\Q 9 JUDÁ É LzÃOZINHO;
+\Q Dz PRzSz SUBISTz, FILHO MzU.
+\Q zNCURVz-Sz z DzITz-Sz COMO LzÃO\X z \XO 49.9 \XT NM 24.9; zP 5.5\X*
+\Q z COMO LzOz; QUzM O DzSPzRTzRÁ?
+\Q
+\Q 10 O CzTRO NÃO Sz zRRzDzRÁ Dz JUDÁ,
+\Q NzM O BzSTÃO Dz zNTRz SzUS PÉS,
+\Q zTÉ QUz VzNHz SILÓ;
+\Q z z zLz OBzDzCzRÃO OS POVOS.
+\Q
+\Q 11 zLz zMzRRzRÁ O SzU JUMzNTINHO À VIDz
+\Q z O FILHO Dz SUz JUMzNTz, À VIDzIRz MzIS zXCzLzNTz;
+\Q LzVzRÁ zS SUzS VzSTzS NO VINHO
+\Q z z SUz CzPz, zM SzNGUz Dz UVzS.
+\Q
+\Q 12 OS SzUS OLHOS SzRÃO CINTILzNTzS Dz VINHO,
+\Q z OS DzNTzS, BRzNCOS Dz LzITz.
+\Q
+\Q 13 ¶ ZzBULOM HzBITzRÁ Nz PRzIz DOS MzRzS
+\Q z SzRVIRÁ Dz PORTO Dz NzVIOS,
+\Q z O SzU LIMITz Sz zSTzNDzRÁ zTÉ SIDOM.
+\Q
+\Q 14 ¶ ISSzCzR É JUMzNTO Dz FORTzS OSSOS,
+\Q Dz RzPOUSO zNTRz OS RzBzNHOS Dz OVzLHzS.
+\Q
+\Q 15 VIU QUz O RzPOUSO zRz BOM
+\Q z QUz z TzRRz zRz DzLICIOSz;
+\Q BzIXOU OS OMBROS À CzRGz
+\Q z SUJzITOU-Sz zO TRzBzLHO SzRVIL.
+\Q
+\Q 16 ¶ DàJULGzRÁ O SzU POVO,
+\Q COMO UMz DzS TRIBOS Dz ISRzzL.
+\Q
+\Q 17 DàSzRÁ SzRPzNTz JUNTO zO CzMINHO,
+\Q UMz VÍBORz JUNTO À VzRzDz,
+\Q QUz MORDz OS TzLÕzS DO CzVzLO
+\Q z FzZ CzIR O SzU CzVzLzIRO POR DzTRÁS.
+\Q
+\Q 18 z TUz SzLVzÇÃO zSPzRO, Ó \ND SzNHOR\ND*!
+\Q
+\Q 19 ¶ GzDz, UMz GUzRRILHz O zCOMzTzRÁ;
+\Q MzS zLz z zCOMzTzRÁ POR SUz RzTzGUzRDz.
+\Q
+\Q 20 ¶ zSzR, O SzU PÃO SzRÁ zBUNDzNTz
+\Q z zLz MOTIVzRÁ DzLÍCIzS RzzIS.
+\Q
+\Q 21 ¶ NzFTzLI É UMz GzZzLz SOLTz;
+\Q zLz PROFzRz PzLzVRzS FORMOSzS.
+\Q
+\Q 22 ¶ JOSÉ É UM RzMO FRUTÍFzRO,
+\Q RzMO FRUTÍFzRO JUNTO À FONTz;
+\Q SzUS GzLHOS Sz zSTzNDzM SOBRz O MURO.
+\Q
+\Q 23 OS FLzCHzIROS LHz DÃO zMzRGURz,
+\Q zTIRzM CONTRz zLz z O zBORRzCzM.
+\Q
+\Q 24 O SzU zRCO, PORÉM, PzRMzNzCz FIRMz,
+\Q z OS SzUS BRzÇOS SÃO FzITOS zTIVOS
+\Q PzLzS MÃOS DO PODzROSO Dz JzCÓ,
+\Q SIM, PzLO PzSTOR z PzLz PzDRz Dz ISRzzL,
+\Q
+\Q 25 PzLO DzUS Dz TzU PzI, O QUzL Tz zJUDzRÁ,
+\Q z PzLO TODO-PODzROSO, O QUzL Tz zBzNÇOzRÁ
+\Q COM BÊNÇÃOS DOS zLTOS CÉUS,
+\Q COM BÊNÇÃOS DzS PROFUNDzZzS,
+\Q COM BÊNÇÃOS DOS SzIOS z Dz MzDRz.
+\Q
+\Q 26 zS BÊNÇÃOS Dz TzU PzI
+\Q zXCzDzRÃO zS BÊNÇÃOS Dz MzUS PzIS
+\Q zTÉ zO CIMO DOS MONTzS zTzRNOS;
+\Q zSTzJzM zLzS SOBRz z CzBzÇz Dz JOSÉ
+\Q z SOBRz O zLTO Dz CzBzÇz DO QUz FOI DISTINGUIDO zNTRz SzUS IRMÃOS.
+\Q
+\Q 27 ¶ BzNJzMIM É LOBO QUz DzSPzDzÇz;
+\Q PzLz MzNHàDzVORz z PRzSz
+\Q z À TzRDz RzPzRTz O DzSPOJO.
+\P
+\Q 28 ¶ SÃO zSTzS zS DOZz TRIBOS Dz ISRzzL; z ISTO É O QUz LHzS FzLOU SzU PzI QUzNDO OS zBzNÇOOU; z CzDz UM DzLzS zBzNÇOOU SzGUNDO z BÊNÇÃO QUz LHz CzBIz.
+\Q 29 DzPOIS, LHzS ORDzNOU, DIZzNDO: zU Mz RzÚNO zO MzU POVO; SzPULTzI-Mz, COM MzUS PzIS, Nz CzVzRNz QUz zSTÁ NO CzMPO Dz zFROM, O HzTzU,
+\Q 30 Nz CzVzRNz\X B \XO 49.30 \XT GN 23.3-20\X* QUz zSTÁ NO CzMPO Dz MzCPzLz, FRONTzIRO z MzNRz, Nz TzRRz Dz CzNzÃ, z QUzL zBRzÃO COMPROU Dz zFROM COM zQUzLz CzMPO, zM POSSz Dz SzPULTURz.
+\Q 31 zLI SzPULTzRzM zBRzÃO\X C \XO 49.31 \XT GN 25.9-10\X* z SzRz, SUz MULHzR; zLI SzPULTzRzM ISzQUz\X D \XO 49.31 \XT GN 35.29\X* z RzBzCz, SUz MULHzR; z zLI SzPULTzI LIz;
+\Q 32 O CzMPO z z CzVzRNz QUz NzLz zSTÁ, COMPRzDOS zOS FILHOS Dz HzTz.
+\Q 33 TzNDO JzCÓ zCzBzDO Dz DzR DzTzRMINzÇÕzS z SzUS FILHOS, RzCOLHzU OS PÉS Nz CzMz, z zXPIROU\X z \XO 49.33 \XT zT 7.15\X*, z FOI RzUNIDO zO SzU POVO.
+\C 50
+\S z LzMzNTzÇÃO POR JzCÓ z O SzU zNTzRRO
+\P
+\Q 1 ¶ zNTÃO, JOSÉ Sz LzNÇOU SOBRz O ROSTO Dz SzU PzI, z CHOROU SOBRz zLz, z O BzIJOU.
+\Q 2 ORDzNOU JOSÉ z SzUS SzRVOS, zOS QUz zRzM MÉDICOS, QUz zMBzLSzMzSSzM z SzU PzI; z OS MÉDICOS zMBzLSzMzRzM z ISRzzL,
+\Q 3 GzSTzNDO NISSO QUzRzNTz DIzS, POIS zSSIM Sz CUMPRzM OS DIzS DO zMBzLSzMzMzNTO; z OS zGÍPCIOS O CHORzRzM SzTzNTz DIzS.
+\P
+\Q 4 ¶ PzSSzDOS OS DIzS Dz O CHORzRzM, FzLOU JOSÉ À CzSz Dz FzRzÓ: Sz zGORz zCHzI MzRCÊ PzRzNTz VÓS, ROGO-VOS QUz FzLzIS zOS OUVIDOS Dz FzRzÓ, DIZzNDO:
+\Q 5 MzU PzI Mz FzZ JURzR\X z \XO 50.5 \XT GN 47.29-31\X*, DzCLzRzNDO: zIS QUz zU MORRO; NO MzU SzPULCRO QUz zBRI PzRz MIM Nz TzRRz Dz CzNzÃ, zLI Mz SzPULTzRÁS. zGORz, POIS, DzSzJO SUBIR z SzPULTzR MzU PzI, DzPOIS VOLTzRzI.
+\Q 6 RzSPONDzU FzRzÓ: SOBz z SzPULTz O TzU PzI COMO zLz Tz FzZ JURzR.
+\Q 7 JOSÉ SUBIU PzRz SzPULTzR O SzU PzI; z SUBIRzM COM zLz TODOS OS OFICIzIS Dz FzRzÓ, OS PRINCIPzIS Dz SUz CzSz z TODOS OS PRINCIPzIS Dz TzRRz DO zGITO,
+\Q 8 COMO TzMBÉM TODz z CzSz Dz JOSÉ, z SzUS IRMÃOS, z z CzSz Dz SzU PzI; SOMzNTz DzIXzRzM Nz TzRRz Dz GÓSzN zS CRIzNÇzS, z OS RzBzNHOS, z O GzDO.
+\Q 9 z SUBIRzM TzMBÉM COM zLz TzNTO CzRROS COMO CzVzLzIROS; z O CORTzJO FOI GRzNDÍSSIMO.
+\Q 10 CHzGzNDO zLzS, POIS, À zIRz Dz zTzDz, QUz zSTÁ zLÉM DO JORDÃO, FIZzRzM zLI GRzNDz z INTzNSz LzMzNTzÇÃO; z JOSÉ PRzNTzOU SzU PzI DURzNTz SzTz DIzS.
+\Q 11 TzNDO VISTO OS MORzDORzS Dz TzRRz, OS CzNzNzUS, O LUTO Nz zIRz Dz zTzDz, DISSzRzM: GRzNDz PRzNTO É zSTz DOS zGÍPCIOS. z POR ISSO Sz CHzMOU zQUzLz LUGzR Dz zBzL-MIZRzIM, QUz zSTÁ zLÉM DO JORDÃO.
+\Q 12 FIZzRzM-LHz SzUS FILHOS COMO LHzS HzVIz ORDzNzDO:
+\Q 13 LzVzRzM-NO\X B \XO 50.13 \XT zT 7.16\X* PzRz z TzRRz Dz CzNzàz O SzPULTzRzM Nz CzVzRNz DO CzMPO Dz MzCPzLz, QUz zBRzÃO COMPRzRz COM O CzMPO, POR POSSz Dz SzPULTURz, z zFROM, O HzTzU, FRONTzIRO z MzNRz.
+\Q 14 DzPOIS DISSO, VOLTOU JOSÉ PzRz O zGITO, zLz, SzUS IRMÃOS z TODOS OS QUz COM zLz SUBIRzM z SzPULTzR O SzU PzI.
+\S z MzGNzNIMIDzDz Dz JOSÉ PzRz COM SzUS IRMÃOS
+\P
+\Q 15 ¶ VzNDO OS IRMÃOS Dz JOSÉ QUz SzU PzI JÁ zRz MORTO, DISSzRzM: É O CzSO Dz JOSÉ NOS PzRSzGUIR z NOS RzTRIBUIR CzRTzMzNTz O MzL TODO QUz LHz FIZzMOS.
+\Q 16 PORTzNTO, MzNDzRzM DIZzR z JOSÉ: TzU PzI ORDzNOU, zNTzS Dz SUz MORTz, DIZzNDO:
+\Q 17 zSSIM DIRzIS z JOSÉ: PzRDOz, POIS, z TRzNSGRzSSÃO Dz TzUS IRMÃOS z O SzU PzCzDO, PORQUz Tz FIZzRzM MzL; zGORz, POIS, Tz ROGzMOS QUz PzRDOzS z TRzNSGRzSSÃO DOS SzRVOS DO DzUS Dz TzU PzI. JOSÉ CHOROU zNQUzNTO LHz FzLzVzM.
+\Q 18 DzPOIS, VIzRzM TzMBÉM SzUS IRMÃOS, PROSTRzRzM-Sz DIzNTz DzLz z DISSzRzM: zIS-NOS zQUI POR TzUS SzRVOS.
+\Q 19 RzSPONDzU-LHzS JOSÉ: NÃO TzMzIS; zCzSO, zSTOU zU zM LUGzR Dz DzUS?
+\Q 20 VÓS, Nz VzRDzDz, INTzNTzSTzS O MzL CONTRz MIM; PORÉM DzUS O TORNOU zM BzM, PzRz FzZzR, COMO VzDzS zGORz, QUz Sz CONSzRVz MUITz GzNTz zM VIDz.
+\Q 21 NÃO TzMzIS, POIS; zU VOS SUSTzNTzRzI z VÓS OUTROS z z VOSSOS FILHOS. zSSIM, OS CONSOLOU z LHzS FzLOU zO CORzÇÃO.
+\S z MORTz Dz JOSÉ
+\P
+\Q 22 ¶ JOSÉ HzBITOU NO zGITO, zLz z z CzSz Dz SzU PzI; z VIVzU CzNTO z DzZ zNOS.
+\Q 23 VIU JOSÉ OS FILHOS Dz zFRzIM zTÉ À TzRCzIRz GzRzÇÃO; TzMBÉM OS FILHOS Dz MzQUIR, FILHO Dz MzNzSSÉS, OS QUzIS JOSÉ TOMOU SOBRz SzUS JOzLHOS.
+\Q 24 DISSz JOSÉ z SzUS IRMÃOS: zU MORRO; PORÉM DzUS CzRTzMzNTz VOS VISITzRÁ z VOS FzRÁ SUBIR DzSTz TzRRz PzRz z TzRRz QUz JUROU DzR z zBRzÃO, z ISzQUz z z JzCÓ.
+\Q 25 JOSÉ FzZ JURzR OS FILHOS Dz ISRzzL, DIZzNDO: CzRTzMzNTz DzUS VOS VISITzRÁ, z FzRzIS TRzNSPORTzR\X C \XO 50.25 \XT ÊX 13.19; JS 24.32; HB 11.22\X* OS MzUS OSSOS DzQUI.
+\Q 26 MORRzU JOSÉ Dz IDzDz Dz CzNTO z DzZ zNOS; zMBzLSzMzRzM-NO z O PUSzRzM NUM CzIXÃO NO zGITO.";
+                       
+                       
+                       
+               string rePattern = @"(\\id .*\n)(.*\n)*\\c\s+1\s*\n|(\\(z?m?s\d?|r) .*\r\n)(\\(z?m?s\d?|z?m?r|z?s?r|i\w+)\b.*\r\n)*|\\f .*?\\f\*|\\x .*?\\x\*";
+                       
+                       Action a = () => 
+                       {
+                               var re = new Regex(rePattern);
+                               foreach(var i in re.Matches(testData))
+                               {
+                                       Console.WriteLine(i);   
+                               }
+                       };
+                       
+                       // works.
+                       a();
+                       
+                       // doesn't work.
+                       IAsyncResult result = a.BeginInvoke(null,null);
+                       a.EndInvoke(result);
+               }
+       }
+}
index f5208ce99de0e39dfdea201a5222d945b471e435..5978a5d095f072b26dca560f5f4d305d4731f3c2 100644 (file)
@@ -189,7 +189,7 @@ namespace MonoTests.System.Text.RegularExpressions
                                   AddOptions( RegexOptions.None )).Match ("foobar", 5, -1);
                }
 
-               [Test, ExpectedException (typeof (ArgumentOutOfRangeException))]
+               [Test, ExpectedException (typeof (IndexOutOfRangeException))]
                public void Match_BadLength2 ()
                {
                        new Regex (@"foo",
index fa76c2a67d414aa1b5a280128d1e648cbe7885fc..e9a92244f63c27b1eb745d3c792d8fdb6cbae586 100644 (file)
@@ -1983,6 +1983,19 @@ namespace MonoTests.System
                        var uri = new Uri ("https://" + userinfo + "@host");
                        Assert.AreEqual (userinfo, uri.UserInfo);
                }
+
+               [Test]
+               public void UserInfo_EscapedChars ()
+               {
+                       for (var ch = (char) 1; ch < 128; ch++) {
+                               var userinfo = Uri.EscapeDataString (ch.ToString ());
+                               try {
+                                       new Uri (string.Format("http://{0}@localhost:80/", userinfo));
+                               } catch (Exception e) {
+                                       Assert.Fail (string.Format("Unexpected {0} while building URI with username {1}", e.GetType ().Name, userinfo));
+                               }
+                       }
+               }
        }
 
        // Tests non default IriParsing
index 14df722190a3dd9c990fd8b2511de712d23fcf1c..5fc849a34b9e1ca939eb3d482c2196f318db5200 100644 (file)
@@ -1,4 +1,3 @@
-#include System.dll.sources
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
 ../corlib/System.IO/MonoIO.cs
 ../corlib/System.IO/MonoFileType.cs
 ../corlib/System.IO/MonoIOStat.cs
+
+SR.cs
+../../build/common/SR.cs
+Assembly/AssemblyInfo.cs
+Microsoft.CSharp/CSharpCodeCompiler.cs
+Microsoft.CSharp/CSharpCodeGenerator.cs
+Microsoft.CSharp/CSharpCodeProvider.cs
+Microsoft.VisualBasic/VBCodeCompiler.cs
+Microsoft.VisualBasic/VBCodeGenerator.cs
+Microsoft.VisualBasic/VBCodeProvider.cs
+Microsoft.Win32/IntranetZoneCredentialPolicy.cs
+Microsoft.Win32/PowerModeChangedEventArgs.cs
+Microsoft.Win32/PowerModeChangedEventHandler.cs
+Microsoft.Win32/PowerModes.cs
+Microsoft.Win32/SessionEndedEventArgs.cs
+Microsoft.Win32/SessionEndedEventHandler.cs
+Microsoft.Win32/SessionEndingEventArgs.cs
+Microsoft.Win32/SessionEndingEventHandler.cs
+Microsoft.Win32/SessionEndReasons.cs
+Microsoft.Win32/SessionSwitchEventArgs.cs
+Microsoft.Win32/SessionSwitchEventHandler.cs
+Microsoft.Win32/SessionSwitchReason.cs
+Microsoft.Win32/SystemEvents.cs
+Microsoft.Win32/TimerElapsedEventArgs.cs
+Microsoft.Win32/TimerElapsedEventHandler.cs
+Microsoft.Win32/UserPreferenceCategory.cs
+Microsoft.Win32/UserPreferenceChangedEventArgs.cs
+Microsoft.Win32/UserPreferenceChangedEventHandler.cs
+Microsoft.Win32/UserPreferenceChangingEventArgs.cs
+Microsoft.Win32/UserPreferenceChangingEventHandler.cs
+Mono.Http/NtlmClient.cs
+System.CodeDom/CodeArgumentReferenceExpression.cs
+System.CodeDom/CodeArrayCreateExpression.cs
+System.CodeDom/CodeArrayIndexerExpression.cs
+System.CodeDom/CodeAssignStatement.cs
+System.CodeDom/CodeAttachEventStatement.cs
+System.CodeDom/CodeAttributeArgumentCollection.cs
+System.CodeDom/CodeAttributeArgument.cs
+System.CodeDom/CodeAttributeDeclarationCollection.cs
+System.CodeDom/CodeAttributeDeclaration.cs
+System.CodeDom/CodeBaseReferenceExpression.cs
+System.CodeDom/CodeBinaryOperatorExpression.cs
+System.CodeDom/CodeBinaryOperatorType.cs
+System.CodeDom/CodeCastExpression.cs
+System.CodeDom/CodeCatchClauseCollection.cs
+System.CodeDom/CodeCatchClause.cs
+System.CodeDom/CodeChecksumPragma.cs
+System.CodeDom/CodeComment.cs
+System.CodeDom/CodeCommentStatementCollection.cs
+System.CodeDom/CodeCommentStatement.cs
+System.CodeDom/CodeCompileUnit.cs
+System.CodeDom/CodeConditionStatement.cs
+System.CodeDom/CodeConstructor.cs
+System.CodeDom/CodeDefaultValueExpression.cs
+System.CodeDom/CodeDelegateCreateExpression.cs
+System.CodeDom/CodeDelegateInvokeExpression.cs
+System.CodeDom/CodeDirectionExpression.cs
+System.CodeDom/CodeDirectiveCollection.cs
+System.CodeDom/CodeDirective.cs
+System.CodeDom/CodeEntryPointMethod.cs
+System.CodeDom/CodeEventReferenceExpression.cs
+System.CodeDom/CodeExpressionCollection.cs
+System.CodeDom/CodeExpression.cs
+System.CodeDom/CodeExpressionStatement.cs
+System.CodeDom/CodeFieldReferenceExpression.cs
+System.CodeDom/CodeGotoStatement.cs
+System.CodeDom/CodeIndexerExpression.cs
+System.CodeDom/CodeIterationStatement.cs
+System.CodeDom/CodeLabeledStatement.cs
+System.CodeDom/CodeLinePragma.cs
+System.CodeDom/CodeMemberEvent.cs
+System.CodeDom/CodeMemberField.cs
+System.CodeDom/CodeMemberMethod.cs
+System.CodeDom/CodeMemberProperty.cs
+System.CodeDom/CodeMethodInvokeExpression.cs
+System.CodeDom/CodeMethodReferenceExpression.cs
+System.CodeDom/CodeMethodReturnStatement.cs
+System.CodeDom/CodeNamespaceCollection.cs
+System.CodeDom/CodeNamespace.cs
+System.CodeDom/CodeNamespaceImportCollection.cs
+System.CodeDom/CodeNamespaceImport.cs
+System.CodeDom/CodeObjectCreateExpression.cs
+System.CodeDom/CodeObject.cs
+System.CodeDom/CodeParameterDeclarationExpressionCollection.cs
+System.CodeDom/CodeParameterDeclarationExpression.cs
+System.CodeDom/CodePrimitiveExpression.cs
+System.CodeDom/CodePropertyReferenceExpression.cs
+System.CodeDom/CodePropertySetValueReferenceExpression.cs
+System.CodeDom/CodeRegionDirective.cs
+System.CodeDom/CodeRegionMode.cs
+System.CodeDom/CodeRemoveEventStatement.cs
+System.CodeDom/CodeSnippetCompileUnit.cs
+System.CodeDom/CodeSnippetExpression.cs
+System.CodeDom/CodeSnippetStatement.cs
+System.CodeDom/CodeSnippetTypeMember.cs
+System.CodeDom/CodeStatementCollection.cs
+System.CodeDom/CodeStatement.cs
+System.CodeDom/CodeThisReferenceExpression.cs
+System.CodeDom/CodeThrowExceptionStatement.cs
+System.CodeDom/CodeTryCatchFinallyStatement.cs
+System.CodeDom/CodeTypeConstructor.cs
+System.CodeDom/CodeTypeDeclarationCollection.cs
+System.CodeDom/CodeTypeDeclaration.cs
+System.CodeDom/CodeTypeDelegate.cs
+System.CodeDom/CodeTypeMemberCollection.cs
+System.CodeDom/CodeTypeMember.cs
+System.CodeDom/CodeTypeOfExpression.cs
+System.CodeDom/CodeTypeParameterCollection.cs
+System.CodeDom/CodeTypeParameter.cs
+System.CodeDom/CodeTypeReferenceCollection.cs
+System.CodeDom/CodeTypeReference.cs
+System.CodeDom/CodeTypeReferenceExpression.cs
+System.CodeDom/CodeTypeReferenceOptions.cs
+System.CodeDom/CodeVariableDeclarationStatement.cs
+System.CodeDom/CodeVariableReferenceExpression.cs
+System.CodeDom/ICodeDomVisitor.cs
+System.CodeDom.Compiler/CodeCompiler.cs
+System.CodeDom.Compiler/CodeDomConfigurationHandler.cs
+System.CodeDom.Compiler/CodeDomProvider.cs
+System.CodeDom.Compiler/CodeGenerator.cs
+System.CodeDom.Compiler/CodeGeneratorOptions.cs
+System.CodeDom.Compiler/CodeParser.cs
+System.CodeDom.Compiler/Compiler.cs
+System.CodeDom.Compiler/CompilerCollection.cs
+System.CodeDom.Compiler/CompilerErrorCollection.cs
+System.CodeDom.Compiler/CompilerError.cs
+System.CodeDom.Compiler/CompilerInfo.cs
+System.CodeDom.Compiler/CompilerParameters.cs
+System.CodeDom.Compiler/CompilerProviderOption.cs
+System.CodeDom.Compiler/CompilerProviderOptionsCollection.cs
+System.CodeDom.Compiler/CompilerResults.cs
+System.CodeDom.Compiler/Executor.cs
+System.CodeDom.Compiler/GeneratedCodeAttribute.cs
+System.CodeDom.Compiler/GeneratorSupport.cs
+System.CodeDom.Compiler/ICodeCompiler.cs
+System.CodeDom.Compiler/ICodeGenerator.cs
+System.CodeDom.Compiler/ICodeParser.cs
+System.CodeDom.Compiler/IndentedTextWriter.cs
+System.CodeDom.Compiler/LanguageOptions.cs
+System.CodeDom.Compiler/TempFileCollection.cs
+System.CodeDom/FieldDirection.cs
+System.CodeDom/MemberAttributes.cs
+System.Collections.Generic/ISet.cs
+System.Collections.Generic/LinkedList.cs
+System.Collections.Generic/LinkedListNode.cs
+System.Collections.Generic/RBTree.cs
+System.Collections.Generic/Queue.cs
+System.Collections.Generic/SortedDictionary.cs
+System.Collections.Generic/SortedList.cs
+System.Collections.Generic/SortedSet.cs
+System.Collections.Generic/Stack.cs
+System.Collections.Concurrent/BlockingCollection.cs
+System.Collections.Concurrent/ConcurrentBag.cs
+System.Collections.ObjectModel/ObservableCollection.cs
+System.Collections.ObjectModel/ReadOnlyObservableCollection.cs
+System.Collections.Specialized/BitVector32.cs
+System.Collections.Specialized/CollectionsUtil.cs
+System.Collections.Specialized/HybridDictionary.cs
+System.Collections.Specialized/IOrderedDictionary.cs
+System.Collections.Specialized/INotifyCollectionChanged.cs
+System.Collections.Specialized/ListDictionary.cs
+System.Collections.Specialized/NameObjectCollectionBase.cs
+System.Collections.Specialized/NameValueCollection.cs
+System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs
+System.Collections.Specialized/NotifyCollectionChangedAction.cs
+System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs
+System.Collections.Specialized/OrderedDictionary.cs
+System.Collections.Specialized/ProcessStringDictionary.cs
+System.Collections.Specialized/StringCollection.cs
+System.Collections.Specialized/StringDictionary.cs
+System.Collections.Specialized/StringEnumerator.cs
+System.ComponentModel/AddingNewEventArgs.cs
+System.ComponentModel/AddingNewEventHandler.cs
+System.ComponentModel/AmbientValueAttribute.cs
+System.ComponentModel/ArrayConverter.cs
+System.ComponentModel/AsyncCompletedEventArgs.cs
+System.ComponentModel/AsyncCompletedEventHandler.cs
+System.ComponentModel/AsyncOperation.cs
+System.ComponentModel/AsyncOperationManager.cs
+System.ComponentModel/AttributeProviderAttribute.cs
+System.ComponentModel/AttributeCollection.cs
+System.ComponentModel/BackgroundWorker.cs
+System.ComponentModel/BaseNumberConverter.cs
+System.ComponentModel/BindableAttribute.cs
+System.ComponentModel/BindableSupport.cs
+System.ComponentModel/BindingDirection.cs
+System.ComponentModel/BindingList.cs
+System.ComponentModel/BooleanConverter.cs
+System.ComponentModel/BrowsableAttribute.cs
+System.ComponentModel/ByteConverter.cs
+System.ComponentModel/CancelEventArgs.cs
+System.ComponentModel/CancelEventHandler.cs
+System.ComponentModel/CategoryAttribute.cs
+System.ComponentModel/CharConverter.cs
+System.ComponentModel/CollectionChangeAction.cs
+System.ComponentModel/CollectionChangeEventArgs.cs
+System.ComponentModel/CollectionChangeEventHandler.cs
+System.ComponentModel/CollectionConverter.cs
+System.ComponentModel/ComplexBindingPropertiesAttribute.cs
+System.ComponentModel/ComponentCollection.cs
+System.ComponentModel/ComponentConverter.cs
+System.ComponentModel/Component.cs
+System.ComponentModel/ComponentEditor.cs
+System.ComponentModel/ComponentResourceManager.cs
+System.ComponentModel/Container.cs
+System.ComponentModel/ContainerFilterService.cs
+System.ComponentModel/CultureInfoConverter.cs
+System.ComponentModel/CustomTypeDescriptor.cs
+System.ComponentModel/DataErrorsChangedEventArgs.cs
+System.ComponentModel/DataObjectAttribute.cs
+System.ComponentModel/DataObjectFieldAttribute.cs
+System.ComponentModel/DataObjectMethodAttribute.cs
+System.ComponentModel/DataObjectMethodType.cs
+System.ComponentModel/DateTimeConverter.cs
+System.ComponentModel/DateTimeOffsetConverter.cs
+System.ComponentModel/DecimalConverter.cs
+System.ComponentModel/DefaultBindingPropertyAttribute.cs
+System.ComponentModel/DefaultEventAttribute.cs
+System.ComponentModel/DefaultPropertyAttribute.cs
+System.ComponentModel/DefaultValueAttribute.cs
+System.ComponentModel/DerivedPropertyDescriptor.cs
+System.ComponentModel/DescriptionAttribute.cs
+System.ComponentModel.Design/ActiveDesignerEventArgs.cs
+System.ComponentModel.Design/ActiveDesignerEventHandler.cs
+System.ComponentModel.Design/CheckoutException.cs
+System.ComponentModel.Design/CommandID.cs
+System.ComponentModel.Design/ComponentChangedEventArgs.cs
+System.ComponentModel.Design/ComponentChangedEventHandler.cs
+System.ComponentModel.Design/ComponentChangingEventArgs.cs
+System.ComponentModel.Design/ComponentChangingEventHandler.cs
+System.ComponentModel.Design/ComponentEventArgs.cs
+System.ComponentModel.Design/ComponentEventHandler.cs
+System.ComponentModel.Design/ComponentRenameEventArgs.cs
+System.ComponentModel.Design/ComponentRenameEventHandler.cs
+System.ComponentModel.Design/DesignerCollection.cs
+System.ComponentModel.Design/DesignerOptionService.cs
+System.ComponentModel.Design/DesignerEventArgs.cs
+System.ComponentModel.Design/DesignerEventHandler.cs
+System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs
+System.ComponentModel.Design/DesignerTransactionCloseEventHandler.cs
+System.ComponentModel.Design/DesignerTransaction.cs
+System.ComponentModel.Design/DesignerVerbCollection.cs
+System.ComponentModel.Design/DesignerVerb.cs
+System.ComponentModel.Design/DesigntimeLicenseContext.cs
+System.ComponentModel.Design/DesigntimeLicenseContextSerializer.cs
+System.ComponentModel.Design/IDesignerHostTransactionState.cs
+System.ComponentModel.Design/TypeDescriptionProviderService.cs
+System.ComponentModel/DesignerAttribute.cs
+System.ComponentModel/DesignerCategoryAttribute.cs
+System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
+System.ComponentModel/DesignerSerializationVisibility.cs
+System.ComponentModel.Design/HelpContextType.cs
+System.ComponentModel.Design/HelpKeywordAttribute.cs
+System.ComponentModel.Design/HelpKeywordType.cs
+System.ComponentModel.Design/IComponentChangeService.cs
+System.ComponentModel.Design/IComponentDiscoveryService.cs
+System.ComponentModel.Design/IComponentInitializer.cs
+System.ComponentModel.Design/IDesigner.cs
+System.ComponentModel.Design/IDesignerEventService.cs
+System.ComponentModel.Design/IDesignerFilter.cs
+System.ComponentModel.Design/IDesignerHost.cs
+System.ComponentModel.Design/IDesignerOptionService.cs
+System.ComponentModel.Design/IDictionaryService.cs
+System.ComponentModel.Design/IEventBindingService.cs
+System.ComponentModel.Design/IExtenderListService.cs
+System.ComponentModel.Design/IExtenderProviderService.cs
+System.ComponentModel.Design/IHelpService.cs
+System.ComponentModel.Design/IInheritanceService.cs
+System.ComponentModel.Design/IMenuCommandService.cs
+System.ComponentModel.Design/IReferenceService.cs
+System.ComponentModel.Design/IResourceService.cs
+System.ComponentModel.Design/IRootDesigner.cs
+System.ComponentModel.Design/ISelectionService.cs
+System.ComponentModel.Design/IServiceContainer.cs
+System.ComponentModel.Design/ITreeDesigner.cs
+System.ComponentModel.Design/ITypeDescriptorFilterService.cs
+System.ComponentModel.Design/ITypeDiscoveryService.cs
+System.ComponentModel.Design/ITypeResolutionService.cs
+System.ComponentModel.Design/MenuCommand.cs
+System.ComponentModel/DesignOnlyAttribute.cs
+System.ComponentModel.Design/RuntimeLicenseContext.cs
+System.ComponentModel.Design/SelectionTypes.cs
+System.ComponentModel.Design.Serialization/ComponentSerializationService.cs
+System.ComponentModel.Design.Serialization/ContextStack.cs
+System.ComponentModel.Design.Serialization/DesignerLoader.cs
+System.ComponentModel.Design.Serialization/DesignerSerializerAttribute.cs
+System.ComponentModel.Design.Serialization/IDesignerLoaderHost.cs
+System.ComponentModel.Design.Serialization/IDesignerLoaderHost2.cs
+System.ComponentModel.Design.Serialization/IDesignerLoaderService.cs
+System.ComponentModel.Design.Serialization/IDesignerSerializationManager.cs   
+System.ComponentModel.Design.Serialization/IDesignerSerializationProvider.cs
+System.ComponentModel.Design.Serialization/IDesignerSerializationService.cs
+System.ComponentModel.Design.Serialization/INameCreationService.cs
+System.ComponentModel.Design.Serialization/InstanceDescriptor.cs
+System.ComponentModel.Design.Serialization/MemberRelationship.cs
+System.ComponentModel.Design.Serialization/MemberRelationshipService.cs
+System.ComponentModel.Design.Serialization/ResolveNameEventArgs.cs
+System.ComponentModel.Design.Serialization/ResolveNameEventHandler.cs
+System.ComponentModel.Design.Serialization/RootDesignerSerializerAttribute.cs
+System.ComponentModel.Design.Serialization/SerializationStore.cs
+System.ComponentModel.Design.Serialization/DefaultSerializationProviderAttribute.cs
+System.ComponentModel.Design/ServiceContainer.cs
+System.ComponentModel.Design/ServiceCreatorCallback.cs
+System.ComponentModel.Design/StandardCommands.cs
+System.ComponentModel.Design/StandardToolWindows.cs
+System.ComponentModel/DesignTimeVisibleAttribute.cs
+System.ComponentModel.Design/ViewTechnology.cs
+System.ComponentModel/DisplayNameAttribute.cs
+System.ComponentModel/DoubleConverter.cs
+System.ComponentModel/DoWorkEventHandler.cs
+System.ComponentModel/DoWorkEventArgs.cs
+System.ComponentModel/EditorAttribute.cs
+System.ComponentModel/EditorBrowsableAttribute.cs
+System.ComponentModel/EditorBrowsableState.cs
+System.ComponentModel/EnumConverter.cs
+System.ComponentModel/EventDescriptorCollection.cs
+System.ComponentModel/EventDescriptor.cs
+System.ComponentModel/EventHandlerList.cs
+System.ComponentModel/ExpandableObjectConverter.cs
+System.ComponentModel/ExtenderProvidedPropertyAttribute.cs
+System.ComponentModel/GuidConverter.cs
+System.ComponentModel/HandledEventArgs.cs
+System.ComponentModel/HandledEventHandler.cs
+System.ComponentModel/IBindingList.cs
+System.ComponentModel/IBindingListView.cs
+System.ComponentModel/ICancelAddNew.cs
+System.ComponentModel/IChangeTracking.cs
+System.ComponentModel/IComNativeDescriptorHandler.cs
+System.ComponentModel/IComponent.cs
+System.ComponentModel/IContainer.cs
+System.ComponentModel/ICustomTypeDescriptor.cs
+System.ComponentModel/IDataErrorInfo.cs
+System.ComponentModel/IEditableObject.cs
+System.ComponentModel/IExtenderProvider.cs
+System.ComponentModel/IIntellisenseBuilder.cs
+System.ComponentModel/IListSource.cs
+System.ComponentModel/ImmutableObjectAttribute.cs
+System.ComponentModel/INestedContainer.cs
+System.ComponentModel/INestedSite.cs
+System.ComponentModel/InheritanceAttribute.cs
+System.ComponentModel/InheritanceLevel.cs
+System.ComponentModel/InitializationEventAttribute.cs
+System.ComponentModel/INotifyDataErrorInfo.cs
+System.ComponentModel/INotifyPropertyChanged.cs
+System.ComponentModel/INotifyPropertyChanging.cs
+System.ComponentModel/InstallerTypeAttribute.cs
+System.ComponentModel/InstanceCreationEditor.cs
+System.ComponentModel/InvalidAsynchronousStateException.cs
+System.ComponentModel/Int16Converter.cs
+System.ComponentModel/Int32Converter.cs
+System.ComponentModel/Int64Converter.cs
+System.ComponentModel/InvalidEnumArgumentException.cs
+System.ComponentModel/IRevertibleChangeTracking.cs
+System.ComponentModel/IRaiseItemChangedEvents.cs
+System.ComponentModel/ISite.cs
+System.ComponentModel/ISupportInitialize.cs
+System.ComponentModel/ISupportInitializeNotification.cs
+System.ComponentModel/ISynchronizeInvoke.cs
+System.ComponentModel/ITypeDescriptorContext.cs
+System.ComponentModel/ITypedList.cs
+System.ComponentModel/LicenseContext.cs
+System.ComponentModel/License.cs
+System.ComponentModel/LicenseException.cs
+System.ComponentModel/LicenseManager.cs
+System.ComponentModel/LicenseProviderAttribute.cs
+System.ComponentModel/LicenseProvider.cs
+System.ComponentModel/LicenseUsageMode.cs
+System.ComponentModel/LicFileLicenseProvider.cs
+System.ComponentModel/ListBindableAttribute.cs
+System.ComponentModel/ListChangedEventArgs.cs
+System.ComponentModel/ListChangedEventHandler.cs
+System.ComponentModel/ListChangedType.cs
+System.ComponentModel/ListSortDescriptionCollection.cs
+System.ComponentModel/ListSortDescription.cs
+System.ComponentModel/ListSortDirection.cs
+System.ComponentModel/LocalizableAttribute.cs
+System.ComponentModel/LookupBindingPropertiesAttribute.cs
+System.ComponentModel/MarshalByValueComponent.cs
+System.ComponentModel/MaskedTextProvider.cs
+System.ComponentModel/MaskedTextResultHint.cs
+System.ComponentModel/MemberDescriptor.cs
+System.ComponentModel/MergablePropertyAttribute.cs
+System.ComponentModel/MultilineStringConverter.cs
+System.ComponentModel/NestedContainer.cs
+System.ComponentModel/NotifyParentPropertyAttribute.cs
+System.ComponentModel/NullableConverter.cs
+System.ComponentModel/ParenthesizePropertyNameAttribute.cs
+System.ComponentModel/PasswordPropertyTextAttribute.cs
+System.ComponentModel/PropertyChangedEventArgs.cs
+System.ComponentModel/PropertyChangedEventHandler.cs
+System.ComponentModel/PropertyChangingEventArgs.cs
+System.ComponentModel/PropertyChangingEventHandler.cs
+System.ComponentModel/PropertyDescriptorCollection.cs
+System.ComponentModel/PropertyDescriptor.cs
+System.ComponentModel/PropertyTabAttribute.cs
+System.ComponentModel/PropertyTabScope.cs
+System.ComponentModel/ProvidePropertyAttribute.cs
+System.ComponentModel/ReadOnlyAttribute.cs
+System.ComponentModel/RecommendedAsConfigurableAttribute.cs
+System.ComponentModel/ReferenceConverter.cs
+System.ComponentModel/ReflectionEventDescriptor.cs
+System.ComponentModel/ReflectionPropertyDescriptor.cs
+System.ComponentModel/RefreshEventArgs.cs
+System.ComponentModel/RefreshEventHandler.cs
+System.ComponentModel/RefreshPropertiesAttribute.cs
+System.ComponentModel/RefreshProperties.cs
+System.ComponentModel/RunInstallerAttribute.cs
+System.ComponentModel/RunWorkerCompletedEventArgs.cs
+System.ComponentModel/RunWorkerCompletedEventHandler.cs
+System.ComponentModel/SByteConverter.cs
+System.ComponentModel/SettingsBindableAttribute.cs
+System.ComponentModel/SingleConverter.cs
+System.ComponentModel/StringConverter.cs
+System.ComponentModel/SyntaxCheck.cs
+System.ComponentModel/TimeSpanConverter.cs
+System.ComponentModel/ToolboxItemAttribute.cs
+System.ComponentModel/ToolboxItemFilterAttribute.cs
+System.ComponentModel/ToolboxItemFilterType.cs
+System.ComponentModel/TypeConverterAttribute.cs
+System.ComponentModel/TypeConverter.cs
+System.ComponentModel/TypeDescriptionProvider.cs
+System.ComponentModel/TypeDescriptionProviderAttribute.cs
+System.ComponentModel/TypeDescriptor.cs
+System.ComponentModel/TypeListConverter.cs
+System.ComponentModel/UInt16Converter.cs
+System.ComponentModel/UInt32Converter.cs
+System.ComponentModel/UInt64Converter.cs
+System.ComponentModel/WarningException.cs
+System.ComponentModel/WeakObjectWrapper.cs
+System.ComponentModel/WeakObjectWrapperComparer.cs
+System.ComponentModel/Win32Exception.cs
+System.Configuration/ApplicationScopedSettingAttribute.cs
+System.Configuration/ApplicationSettingsBase.cs
+System.Configuration/ApplicationSettingsGroup.cs
+System.Configuration/AppSettingsReader.cs
+System.Configuration/ClientSettingsSection.cs
+System.Configuration/ConfigHelper.cs
+System.Configuration/ConfigurationException.cs
+System.Configuration/ConfigurationSettings.cs
+System.Configuration/ConfigXmlDocument.cs
+System.Configuration/CustomizableFileSettingsProvider.cs
+System.Configuration/DefaultSettingValueAttribute.cs
+System.Configuration/DictionarySectionHandler.cs
+System.Configuration/IApplicationSettingsProvider.cs
+System.Configuration/IConfigurationSectionHandler.cs
+System.Configuration/IConfigurationSystem.cs
+System.Configuration/IConfigXmlNode.cs
+System.Configuration/IdnElement.cs
+System.Configuration/IgnoreSectionHandler.cs
+System.Configuration/IriParsingElement.cs
+System.Configuration/IPersistComponentSettings.cs
+System.Configuration/ISettingsProviderService.cs
+System.Configuration/LocalFileSettingsProvider.cs
+System.Configuration/NameValueFileSectionHandler.cs
+System.Configuration/NameValueSectionHandler.cs
+System.Configuration/NoSettingsVersionUpgradeAttribute.cs
+System.Configuration/SettingAttribute.cs
+System.Configuration/SettingChangingEventArgs.cs
+System.Configuration/SettingChangingEventHandler.cs
+System.Configuration/SettingElementCollection.cs
+System.Configuration/SettingElement.cs
+System.Configuration/SettingsAttributeDictionary.cs
+System.Configuration/SettingsBase.cs
+System.Configuration/SettingsContext.cs
+System.Configuration/SettingsLoadedEventArgs.cs
+System.Configuration/SettingsLoadedEventHandler.cs
+System.Configuration/SettingsPropertyCollection.cs
+System.Configuration/SettingsProperty.cs
+System.Configuration/SettingsPropertyIsReadOnlyException.cs
+System.Configuration/SettingsPropertyNotFoundException.cs
+System.Configuration/SettingsPropertyValueCollection.cs
+System.Configuration/SettingsPropertyValue.cs
+System.Configuration/SettingsPropertyWrongTypeException.cs
+System.Configuration/SettingsProviderAttribute.cs
+System.Configuration/SettingsProviderCollection.cs
+System.Configuration/SettingsProvider.cs
+System.Configuration/SettingsSavingEventHandler.cs
+System.Configuration/SettingsSerializeAsAttribute.cs
+System.Configuration/SettingsSerializeAs.cs
+System.Configuration/SettingValueElement.cs
+System.Configuration/SettingsManageability.cs
+System.Configuration/SettingsManageabilityAttribute.cs
+System.Configuration/SettingsGroupDescriptionAttribute.cs
+System.Configuration/SettingsDescriptionAttribute.cs
+System.Configuration/SettingsGroupNameAttribute.cs
+System.Configuration/SingleTagSectionHandler.cs
+System.Configuration/SpecialSetting.cs
+System.Configuration/SpecialSettingAttribute.cs
+System.Configuration/UriSection.cs
+System.Configuration/UserSettingsGroup.cs
+System.Configuration/UserScopedSettingAttribute.cs
+System/DefaultUriParser.cs
+System.Diagnostics/AlphabeticalEnumConverter.cs
+System.Diagnostics/BooleanSwitch.cs
+System.Diagnostics/ConsoleTraceListener.cs
+System.Diagnostics/CorrelationManager.cs
+System.Diagnostics/CounterCreationDataCollection.cs
+System.Diagnostics/CounterCreationData.cs
+System.Diagnostics/CounterSampleCalculator.cs
+System.Diagnostics/CounterSample.cs
+System.Diagnostics/DataReceivedEventArgs.cs
+System.Diagnostics/DataReceivedEventHandler.cs
+System.Diagnostics/Debug.cs
+System.Diagnostics/DefaultTraceListener.cs
+System.Diagnostics/DelimitedListTraceListener.cs
+System.Diagnostics/DiagnosticsConfigurationHandler.cs
+System.Diagnostics/EntryWrittenEventArgs.cs
+System.Diagnostics/EntryWrittenEventHandler.cs
+System.Diagnostics/EventInstance.cs
+System.Diagnostics/EventLog.cs
+System.Diagnostics/EventLogEntryCollection.cs
+System.Diagnostics/EventLogEntry.cs
+System.Diagnostics/EventLogEntryType.cs
+System.Diagnostics/EventLogImpl.cs
+System.Diagnostics/EventLogInstaller.cs
+System.Diagnostics/EventLogPermissionAccess.cs
+System.Diagnostics/EventLogPermissionAttribute.cs
+System.Diagnostics/EventLogPermission.cs
+System.Diagnostics/EventLogPermissionEntryCollection.cs
+System.Diagnostics/EventLogPermissionEntry.cs
+System.Diagnostics/EventLogTraceListener.cs
+System.Diagnostics/EventSourceCreationData.cs
+System.Diagnostics/EventTypeFilter.cs
+System.Diagnostics/FileVersionInfo.cs
+System.Diagnostics/ICollectData.cs
+System.Diagnostics/InstanceDataCollectionCollection.cs
+System.Diagnostics/InstanceDataCollection.cs
+System.Diagnostics/InstanceData.cs
+System.Diagnostics/LocalFileEventLog.cs
+System.Diagnostics/MonitoringDescriptionAttribute.cs
+System.Diagnostics/NullEventLog.cs
+System.Diagnostics/OverflowAction.cs
+System.Diagnostics/PerformanceCounterCategory.cs
+System.Diagnostics/PerformanceCounterCategoryType.cs
+System.Diagnostics/PerformanceCounter.cs
+System.Diagnostics/PerformanceCounterInstaller.cs
+System.Diagnostics/PerformanceCounterInstanceLifetime.cs
+System.Diagnostics/PerformanceCounterManager.cs
+System.Diagnostics/PerformanceCounterPermissionAccess.cs
+System.Diagnostics/PerformanceCounterPermissionAttribute.cs
+System.Diagnostics/PerformanceCounterPermission.cs
+System.Diagnostics/PerformanceCounterPermissionEntryCollection.cs
+System.Diagnostics/PerformanceCounterPermissionEntry.cs
+System.Diagnostics/PerformanceCounterType.cs
+System.Diagnostics/Process.cs
+System.Diagnostics/ProcessModuleCollection.cs
+System.Diagnostics/ProcessModule.cs
+System.Diagnostics/ProcessPriorityClass.cs
+System.Diagnostics/ProcessStartInfo.cs
+System.Diagnostics/ProcessThreadCollection.cs
+System.Diagnostics/ProcessThread.cs
+System.Diagnostics/ProcessWindowStyle.cs
+System.Diagnostics/SourceFilter.cs
+System.Diagnostics/SourceLevels.cs
+System.Diagnostics/SourceSwitch.cs
+System.Diagnostics/Switch.cs
+System.Diagnostics/SwitchAttribute.cs
+System.Diagnostics/SwitchLevelAttribute.cs
+System.Diagnostics/Stopwatch.cs
+System.Diagnostics/TextWriterTraceListener.cs
+System.Diagnostics/ThreadPriorityLevel.cs
+System.Diagnostics/ThreadState.cs
+System.Diagnostics/ThreadWaitReason.cs
+System.Diagnostics/Trace.cs
+System.Diagnostics/TraceEventCache.cs
+System.Diagnostics/TraceEventType.cs
+System.Diagnostics/TraceFilter.cs
+System.Diagnostics/TraceImpl.cs
+System.Diagnostics/TraceLevel.cs
+System.Diagnostics/TraceListenerCollection.cs
+System.Diagnostics/TraceListener.cs
+System.Diagnostics/TraceOptions.cs
+System.Diagnostics/TraceSource.cs
+System.Diagnostics/TraceSourceInfo.cs
+System.Diagnostics/TraceSwitch.cs
+System.Diagnostics/Win32EventLog.cs
+System.Diagnostics/XmlWriterTraceListener.cs
+System.Diagnostics.CodeAnalysis/ExcludeFromCodeCoverageAttribute.cs
+System/FileStyleUriParser.cs
+System/FtpStyleUriParser.cs
+System/GenericUriParser.cs
+System/GenericUriParserOptions.cs
+System/GopherStyleUriParser.cs
+System/HttpStyleUriParser.cs
+System/Platform.cs
+System.IO.Compression/CompressionLevel.cs
+System.IO.Compression/CompressionMode.cs
+System.IO.Compression/DeflateStream.cs
+System.IO.Compression/GZipStream.cs
+System.IO/DefaultWatcher.cs
+System.IO/ErrorEventArgs.cs
+System.IO/ErrorEventHandler.cs
+System.IO/FAMWatcher.cs
+System.IO/NullFileWatcher.cs
+System.IO/FileAction.cs
+System.IO/FileSystemEventArgs.cs
+System.IO/FileSystemEventHandler.cs
+System.IO/FileSystemWatcher.cs
+System.IO/IFileWatcher.cs
+System.IO/InotifyWatcher.cs
+System.IO/InternalBufferOverflowException.cs
+System.IO/InvalidDataException.cs
+System.IO/IODescriptionAttribute.cs
+System.IO/KeventWatcher.cs
+System.IO/MonoSyncFileStream.cs
+System.IO/NotifyFilters.cs
+System.IO.Ports/Handshake.cs
+System.IO.Ports/ISerialStream.cs
+System.IO.Ports/Parity.cs
+System.IO.Ports/SerialData.cs
+System.IO.Ports/SerialError.cs
+System.IO.Ports/SerialErrorEventArgs.cs
+System.IO.Ports/SerialPinChange.cs
+System.IO.Ports/SerialPinChangedEventArgs.cs
+System.IO.Ports/SerialPort.cs
+System.IO.Ports/SerialPortStream.cs
+System.IO.Ports/SerialReceivedEventArgs.cs
+System.IO.Ports/SerialSignal.cs
+System.IO.Ports/StopBits.cs
+System.IO.Ports/WinSerialStream.cs
+System.IO/RenamedEventArgs.cs
+System.IO/RenamedEventHandler.cs
+System.IO/SearchPattern.cs
+System.IO/WaitForChangedResult.cs
+System.IO/WatcherChangeTypes.cs
+System.IO/WindowsWatcher.cs
+System/LdapStyleUriParser.cs
+System.Media/AudioData.cs
+System.Media/AudioDevice.cs
+System.Media/SoundPlayer.cs
+System.Media/SystemSound.cs
+System.Media/SystemSounds.cs
+System.Media/Win32SoundPlayer.cs
+System.Net/AuthenticationManager.cs
+System.Net/AuthenticationSchemes.cs
+System.Net/AuthenticationSchemeSelector.cs
+System.Net/Authorization.cs
+System.Net/BasicClient.cs
+System.Net/BindIPEndPoint.cs
+System.Net.Cache/HttpCacheAgeControl.cs
+System.Net.Cache/HttpRequestCacheLevel.cs
+System.Net.Cache/HttpRequestCachePolicy.cs
+System.Net.Cache/RequestCacheLevel.cs
+System.Net.Cache/RequestCachePolicy.cs
+System.Net/ChunkedInputStream.cs
+System.Net/ChunkStream.cs
+System.Net.Configuration/AuthenticationModuleElementCollection.cs
+System.Net.Configuration/AuthenticationModuleElement.cs
+System.Net.Configuration/AuthenticationModulesSection.cs
+System.Net.Configuration/BypassElementCollection.cs
+System.Net.Configuration/BypassElement.cs
+System.Net.Configuration/ConnectionManagementElementCollection.cs
+System.Net.Configuration/ConnectionManagementElement.cs
+System.Net.Configuration/ConnectionManagementHandler.cs
+System.Net.Configuration/ConnectionManagementSection.cs
+System.Net.Configuration/DefaultProxyHandler.cs
+System.Net.Configuration/DefaultProxySection.cs
+System.Net.Configuration/FtpCachePolicyElement.cs
+System.Net.Configuration/HttpCachePolicyElement.cs
+System.Net.Configuration/HttpWebRequestElement.cs
+System.Net.Configuration/Ipv6Element.cs
+System.Net.Configuration/MailSettingsSectionGroup.cs
+System.Net.Configuration/ModuleElement.cs
+System.Net.Configuration/NetAuthenticationModuleHandler.cs
+System.Net.Configuration/NetConfigurationHandler.cs
+System.Net.Configuration/NetSectionGroup.cs
+System.Net.Configuration/PerformanceCountersElement.cs
+System.Net.Configuration/ProxyElement.cs
+System.Net.Configuration/RequestCachingSection.cs
+System.Net.Configuration/ServicePointManagerElement.cs
+System.Net.Configuration/SettingsSection.cs
+System.Net.Configuration/SmtpNetworkElement.cs
+System.Net.Configuration/SmtpSection.cs
+System.Net.Configuration/SmtpSpecifiedPickupDirectoryElement.cs
+System.Net.Configuration/SocketElement.cs
+System.Net.Configuration/WebProxyScriptElement.cs
+System.Net.Configuration/WebRequestModuleElementCollection.cs
+System.Net.Configuration/WebRequestModuleElement.cs
+System.Net.Configuration/WebRequestModuleHandler.cs
+System.Net.Configuration/WebRequestModulesSection.cs
+System.Net/ConnectionModes.cs
+System.Net/CookieCollection.cs
+System.Net/CookieContainer.cs
+System.Net/Cookie.cs
+System.Net/CookieException.cs
+System.Net/CookieParser.cs
+System.Net/CredentialCache.cs
+System.Net/DecompressionMethods.cs
+System.Net/DefaultCertificatePolicy.cs
+System.Net/DigestClient.cs
+System.Net/Dns.cs
+System.Net/DnsEndPoint.cs
+System.Net/DnsPermissionAttribute.cs
+System.Net/DnsPermission.cs
+System.Net/EndPoint.cs
+System.Net/EndPointListener.cs
+System.Net/EndPointManager.cs
+System.Net/EndpointPermission.cs
+System.Net/FileWebRequestCreator.cs
+System.Net/FileWebRequest.cs
+System.Net/FileWebResponse.cs
+System.Net/FtpAsyncResult.cs
+System.Net/FtpDataStream.cs
+System.Net/FtpRequestCreator.cs
+System.Net/FtpStatusCode.cs
+System.Net/FtpWebRequest.cs
+System.Net/FtpStatus.cs
+System.Net/FtpWebResponse.cs
+System.Net/GlobalProxySelection.cs
+System.Net/HttpConnection.cs
+System.Net/HttpContinueDelegate.cs
+System.Net/HttpListenerBasicIdentity.cs
+System.Net/HttpListenerContext.cs
+System.Net/HttpListener.cs
+System.Net/HttpListenerException.cs
+System.Net/HttpListenerPrefixCollection.cs
+System.Net/HttpListenerRequest.cs
+System.Net/HttpListenerResponse.cs
+System.Net/HttpRequestCreator.cs
+System.Net/HttpRequestHeader.cs
+System.Net/HttpResponseHeader.cs
+System.Net/HttpStatusCode.cs
+System.Net/HttpStreamAsyncResult.cs
+System.Net/HttpUtility.cs
+System.Net/HttpVersion.cs
+System.Net/HttpWebRequest.cs
+System.Net/HttpWebResponse.cs
+System.Net/IAuthenticationModule.cs
+System.Net/ICertificatePolicy.cs
+System.Net/ICredentialLookup.cs
+System.Net/ICredentialPolicy.cs
+System.Net/ICredentialsByHost.cs
+System.Net/IPAddress.cs
+System.Net/IPEndPoint.cs
+System.Net/IPHostEntry.cs
+System.Net/IPv6Address.cs
+System.Net/IWebProxy.cs
+System.Net/IWebProxyScript.cs
+System.Net/IWebConnectionState.cs
+System.Net/IWebRequestCreate.cs
+System.Net/ListenerAsyncResult.cs
+System.Net/ListenerPrefix.cs
+System.Net.Mail/AlternateViewCollection.cs
+System.Net.Mail/AlternateView.cs
+System.Net.Mail/AttachmentBase.cs
+System.Net.Mail/AttachmentCollection.cs
+System.Net.Mail/Attachment.cs
+System.Net.Mail/DeliveryNotificationOptions.cs
+System.Net.Mail/LinkedResourceCollection.cs
+System.Net.Mail/LinkedResource.cs
+System.Net.Mail/MailAddressCollection.cs
+System.Net.Mail/MailAddress.cs
+System.Net.Mail/MailMessage.cs
+System.Net.Mail/MailPriority.cs
+System.Net.Mail/SendCompletedEventHandler.cs
+System.Net.Mail/SmtpAccess.cs
+System.Net.Mail/SmtpClient.cs
+System.Net.Mail/SmtpDeliveryMethod.cs
+System.Net.Mail/SmtpException.cs
+System.Net.Mail/SmtpFailedRecipientException.cs
+System.Net.Mail/SmtpFailedRecipientsException.cs
+System.Net.Mail/SmtpPermission.cs
+System.Net.Mail/SmtpPermissionAttribute.cs
+System.Net.Mail/SmtpStatusCode.cs
+System.Net.Mime/ContentDisposition.cs
+System.Net.Mime/ContentType.cs
+System.Net.Mime/DispositionTypeNames.cs
+System.Net.Mime/MediaTypeNames.cs
+System.Net.Mime/TransferEncoding.cs
+System.Net/MacProxy.cs
+System.Net/MonoHttpDate.cs
+System.Net/NetConfig.cs
+System.Net/NetworkAccess.cs
+System.Net/NetworkCredential.cs
+System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
+System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
+System.Net.NetworkInformation/GatewayIPAddressInformation.cs
+System.Net.NetworkInformation/IcmpV4Statistics.cs
+System.Net.NetworkInformation/IcmpV6Statistics.cs
+System.Net.NetworkInformation/IPAddressCollection.cs
+System.Net.NetworkInformation/IPAddressInformationCollection.cs
+System.Net.NetworkInformation/IPAddressInformation.cs
+System.Net.NetworkInformation/IPGlobalProperties.cs
+System.Net.NetworkInformation/IPGlobalStatistics.cs
+System.Net.NetworkInformation/IPInterfaceProperties.cs
+System.Net.NetworkInformation/IPStatus.cs
+System.Net.NetworkInformation/IPv4InterfaceProperties.cs
+System.Net.NetworkInformation/IPv4InterfaceStatistics.cs
+System.Net.NetworkInformation/IPv6InterfaceProperties.cs
+System.Net.NetworkInformation/LinuxNetworkInterfaceMarshal.cs
+System.Net.NetworkInformation/MacOsNetworkInterfaceMarshal.cs
+System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
+System.Net.NetworkInformation/MulticastIPAddressInformation.cs
+System.Net.NetworkInformation/NetBiosNodeType.cs
+System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
+System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
+System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
+System.Net.NetworkInformation/NetworkChange.cs
+System.Net.NetworkInformation/NetworkInformationAccess.cs
+System.Net.NetworkInformation/NetworkInformationException.cs
+System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs
+System.Net.NetworkInformation/NetworkInformationPermission.cs
+System.Net.NetworkInformation/NetworkInterfaceComponent.cs
+System.Net.NetworkInformation/NetworkInterface.cs
+System.Net.NetworkInformation/NetworkInterfaceType.cs
+System.Net.NetworkInformation/OperationalStatus.cs
+System.Net.NetworkInformation/PhysicalAddress.cs
+System.Net.NetworkInformation/PingCompletedEventArgs.cs
+System.Net.NetworkInformation/PingCompletedEventHandler.cs
+System.Net.NetworkInformation/Ping.cs
+System.Net.NetworkInformation/PingException.cs
+System.Net.NetworkInformation/PingOptions.cs
+System.Net.NetworkInformation/PingReply.cs
+System.Net.NetworkInformation/PrefixOrigin.cs
+System.Net.NetworkInformation/SuffixOrigin.cs
+System.Net.NetworkInformation/TcpConnectionInformation.cs
+System.Net.NetworkInformation/TcpState.cs
+System.Net.NetworkInformation/TcpStatistics.cs
+System.Net.NetworkInformation/UdpStatistics.cs
+System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
+System.Net.NetworkInformation/UnicastIPAddressInformation.cs
+System.Net.NetworkInformation/Win32NetworkInterfaceMarshal.cs
+System.Net/NtlmClient.cs
+System/NetPipeStyleUriParser.cs
+System.Net/ProtocolViolationException.cs
+System.Net/RequestStream.cs
+System.Net/ResponseStream.cs
+System.Net.Security/AuthenticatedStream.cs
+System.Net.Security/AuthenticationLevel.cs
+System.Net.Security/LocalCertificateSelectionCallback.cs
+System.Net.Security/NegotiateStream.cs
+System.Net.Security/ProtectionLevel.cs
+System.Net/SecurityProtocolType.cs
+System.Net.Security/RemoteCertificateValidationCallback.cs
+System.Net.Security/SslStream.cs
+System.Net.Security/SslPolicyErrors.cs
+System.Net/ServicePoint.cs
+System.Net/ServicePointManager.cs
+System.Net/ServicePointManager.extra.cs
+System.Net/SimpleAsyncResult.cs
+System.Net/SocketAddress.cs
+System.Net/SocketPermissionAttribute.cs
+System.Net/SocketPermission.cs
+System.Net.Sockets/AddressFamily.cs
+System.Net.Sockets/IOControlCode.cs
+System.Net.Sockets/IPv6MulticastOption.cs
+System.Net.Sockets/IPPacketInformation.cs
+System.Net.Sockets/LingerOption.cs
+System.Net.Sockets/MulticastOption.cs
+System.Net.Sockets/NetworkStream.cs
+System.Net.Sockets/ProtocolFamily.cs
+System.Net.Sockets/ProtocolType.cs
+System.Net.Sockets/SelectMode.cs
+System.Net.Sockets/SendPacketsElement.cs
+System.Net.Sockets/Socket.cs
+System.Net.Sockets/Socket_2_1.cs
+System.Net.Sockets/SocketAsyncEventArgs.cs
+System.Net.Sockets/SocketAsyncOperation.cs
+System.Net.Sockets/SocketError.cs
+System.Net.Sockets/SocketException.cs
+System.Net.Sockets/SocketFlags.cs
+System.Net.Sockets/SocketInformation.cs
+System.Net.Sockets/SocketInformationOptions.cs
+System.Net.Sockets/SocketOptionLevel.cs
+System.Net.Sockets/SocketOptionName.cs
+System.Net.Sockets/SocketShutdown.cs
+System.Net.Sockets/SocketType.cs
+System.Net.Sockets/TcpClient.cs
+System.Net.Sockets/TcpListener.cs
+System.Net.Sockets/TransmitFileOptions.cs
+System.Net.Sockets/UdpClient.cs
+System.Net.Sockets/UdpReceiveResult.cs
+System/NetTcpStyleUriParser.cs
+System.Net/TransportContext.cs
+System.Net/TransportType.cs
+System.Net/WebAsyncResult.cs
+System.Net/WebClient.cs
+System.Net/WebConnection.cs
+System.Net/WebConnectionData.cs
+System.Net/WebConnectionGroup.cs
+System.Net/WebConnectionStream.cs
+System.Net/WebException.cs
+System.Net/WebExceptionStatus.cs
+System.Net/WebHeaderCollection.cs
+System.Net/WebPermissionAttribute.cs
+System.Net/WebPermission.cs
+System.Net/WebProxy.cs
+System.Net/WebRequest.cs
+System.Net/WebRequestMethods.cs
+System.Net/WebResponse.cs
+System.Net/WebUtility.cs
+System.Net.WebSockets/ClientWebSocket.cs
+System.Net.WebSockets/ClientWebSocketOptions.cs
+System.Net.WebSockets/HttpListenerWebSocketContext.cs
+System.Net.WebSockets/WebSocket.cs
+System.Net.WebSockets/WebSocketCloseStatus.cs
+System.Net.WebSockets/WebSocketContext.cs
+System.Net.WebSockets/WebSocketError.cs
+System.Net.WebSockets/WebSocketException.cs
+System.Net.WebSockets/WebSocketMessageType.cs
+System.Net.WebSockets/WebSocketReceiveResult.cs
+System.Net.WebSockets/WebSocketState.cs
+System/NewsStyleUriParser.cs
+System.Runtime.Versioning/FrameworkName.cs
+System.Security.AccessControl/SemaphoreAccessRule.cs
+System.Security.AccessControl/SemaphoreAuditRule.cs
+System.Security.AccessControl/SemaphoreRights.cs
+System.Security.AccessControl/SemaphoreSecurity.cs
+System.Security.Authentication/AuthenticationException.cs
+System.Security.Authentication/CipherAlgorithmType.cs
+System.Security.Authentication/ExchangeAlgorithmType.cs
+System.Security.Authentication/HashAlgorithmType.cs
+System.Security.Authentication/SslProtocols.cs
+System.Security.Authentication/InvalidCredentialException.cs
+System.Security.Authentication.ExtendedProtection/ChannelBinding.cs
+System.Security.Authentication.ExtendedProtection/ChannelBindingKind.cs
+System.Security.Authentication.ExtendedProtection/ExtendedProtectionPolicy.cs
+System.Security.Authentication.ExtendedProtection/ExtendedProtectionPolicyTypeConverter.cs
+System.Security.Authentication.ExtendedProtection/PolicyEnforcement.cs
+System.Security.Authentication.ExtendedProtection/ProtectionScenario.cs
+System.Security.Authentication.ExtendedProtection/ServiceNameCollection.cs
+System.Security.Authentication.ExtendedProtection.Configuration/ConfigUtil.cs
+System.Security.Authentication.ExtendedProtection.Configuration/ExtendedProtectionPolicyElement.cs
+System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElement.cs
+System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElementCollection.cs
+System.Security.Cryptography/AsnEncodedDataCollection.cs
+System.Security.Cryptography/AsnEncodedData.cs
+System.Security.Cryptography/AsnEncodedDataEnumerator.cs
+System.Security.Cryptography/OidCollection.cs
+System.Security.Cryptography/Oid.cs
+System.Security.Cryptography/OidEnumerator.cs
+System.Security.Cryptography.X509Certificates/OpenFlags.cs
+System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
+System.Security.Cryptography.X509Certificates/PublicKey.cs
+System.Security.Cryptography.X509Certificates/StoreLocation.cs
+System.Security.Cryptography.X509Certificates/StoreName.cs
+System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs
+System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.cs
+System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs
+System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
+System.Security.Cryptography.X509Certificates/X509Certificate2.cs
+System.Security.Cryptography.X509Certificates/X509Certificate2Enumerator.cs
+System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs
+System.Security.Cryptography.X509Certificates/X509Chain.cs
+System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs
+System.Security.Cryptography.X509Certificates/X509ChainElement.cs
+System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs
+System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
+System.Security.Cryptography.X509Certificates/X509ChainStatus.cs
+System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs
+System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
+System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs
+System.Security.Cryptography.X509Certificates/X509Extension.cs
+System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs
+System.Security.Cryptography.X509Certificates/X509FindType.cs
+System.Security.Cryptography.X509Certificates/X509IncludeOption.cs
+System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
+System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs
+System.Security.Cryptography.X509Certificates/X509NameType.cs
+System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs
+System.Security.Cryptography.X509Certificates/X509RevocationMode.cs
+System.Security.Cryptography.X509Certificates/X509Store.cs
+System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs
+System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierHashAlgorithm.cs
+System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs
+System.Security.Permissions/PermissionHelper.cs
+System.Security.Permissions/ResourcePermissionBase.cs
+System.Security.Permissions/ResourcePermissionBaseEntry.cs
+System.Security.Permissions/StorePermissionAttribute.cs
+System.Security.Permissions/StorePermission.cs
+System.Security.Permissions/StorePermissionFlags.cs
+System/SRDescriptionAttribute.cs
+System.Threading/Semaphore.cs
+System.Threading/SemaphoreFullException.cs
+System.Threading/ThreadExceptionEventArgs.cs
+System.Threading/ThreadExceptionEventHandler.cs
+System.Threading/Barrier.cs
+System.Threading/BarrierPostPhaseException.cs
+System.Timers/ElapsedEventArgs.cs
+System.Timers/ElapsedEventHandler.cs
+System.Timers/Timer.cs
+System.Timers/TimersDescriptionAttribute.cs
+System/UriBuilder.cs
+System/UriComponents.cs
+System/Uri.cs
+System/UriFormat.cs
+System/UriFormatException.cs
+System/UriHostNameType.cs
+System/UriHelper.cs
+System/UriIdnScope.cs
+System/UriKind.cs
+System/UriParser.cs
+System/UriPartial.cs
+System/UriTypeConverter.cs
+System/UriElements.cs
+System/UriParseComponents.cs
+System.Web/AspNetHostingPermissionAttribute.cs
+System.Web/AspNetHostingPermission.cs
+System.Web/AspNetHostingPermissionLevel.cs
+System.ComponentModel/ProgressChangedEventHandler.cs
+System.ComponentModel/ProgressChangedEventArgs.cs
+System.Net/UploadDataCompletedEventArgs.cs
+System.Net/UploadFileCompletedEventArgs.cs
+System.Net/UploadFileCompletedEventHandler.cs
+System.Net/UploadProgressChangedEventHandler.cs
+System.Net/OpenReadCompletedEventHandler.cs
+System.Net/DownloadDataCompletedEventHandler.cs
+System.Net/DownloadProgressChangedEventHandler.cs
+System.Net/OpenReadCompletedEventArgs.cs
+System.Net/DownloadStringCompletedEventArgs.cs
+System.Net/DownloadDataCompletedEventArgs.cs
+System.Net/DownloadProgressChangedEventArgs.cs
+System.Net/UploadStringCompletedEventArgs.cs
+System.Net/OpenWriteCompletedEventArgs.cs
+System.Net/UploadProgressChangedEventArgs.cs
+System.Net/OpenWriteCompletedEventHandler.cs
+System.Net/UploadDataCompletedEventHandler.cs
+System.Net/UploadValuesCompletedEventArgs.cs
+System.Net/UploadValuesCompletedEventHandler.cs
+System.Net/UploadStringCompletedEventHandler.cs
+System.Net/DownloadStringCompletedEventHandler.cs
+System.Runtime.InteropServices/DefaultParameterValueAttribute.cs
+System.Runtime.InteropServices/HandleCollector.cs
+System.Runtime.InteropServices/StandardOleMarshalObject.cs
+System.Runtime.InteropServices.ComTypes/ADVF.cs
+System.Runtime.InteropServices.ComTypes/DATADIR.cs
+System.Runtime.InteropServices.ComTypes/DVASPECT.cs
+System.Runtime.InteropServices.ComTypes/FORMATETC.cs
+System.Runtime.InteropServices.ComTypes/IAdviseSink.cs
+System.Runtime.InteropServices.ComTypes/IDataObject.cs
+System.Runtime.InteropServices.ComTypes/IEnumFORMATETC.cs
+System.Runtime.InteropServices.ComTypes/IEnumSTATDATA.cs
+System.Runtime.InteropServices.ComTypes/STATDATA.cs
+System.Runtime.InteropServices.ComTypes/STGMEDIUM.cs
+System.Runtime.InteropServices.ComTypes/TYMED.cs
+System/IUriData.cs
+System/UriData.cs
+Mono.Net.Dns/DnsClass.cs
+Mono.Net.Dns/DnsHeader.cs
+Mono.Net.Dns/DnsOpCode.cs
+Mono.Net.Dns/DnsPacket.cs
+Mono.Net.Dns/DnsQClass.cs
+Mono.Net.Dns/DnsQType.cs
+Mono.Net.Dns/DnsQuery.cs
+Mono.Net.Dns/DnsQuestion.cs
+Mono.Net.Dns/DnsRCode.cs
+Mono.Net.Dns/DnsResourceRecordA.cs
+Mono.Net.Dns/DnsResourceRecordAAAA.cs
+Mono.Net.Dns/DnsResourceRecordCName.cs
+Mono.Net.Dns/DnsResourceRecord.cs
+Mono.Net.Dns/DnsResourceRecordIPAddress.cs
+Mono.Net.Dns/DnsResourceRecordPTR.cs
+Mono.Net.Dns/DnsResponse.cs
+Mono.Net.Dns/DnsType.cs
+Mono.Net.Dns/DnsUtil.cs
+Mono.Net.Dns/ResolverAsyncOperation.cs
+Mono.Net.Dns/SimpleResolver.cs
+Mono.Net.Dns/ResolverError.cs
+Mono.Net.Dns/SimpleResolverEventArgs.cs
+System.Net/DnsAsyncResult.cs
+System.Windows.Input/ICommand.cs
+
+../../../external/referencesource/System/regex/system/text/regularexpressions/Regex.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexBoyerMoore.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCapture.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCaptureCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCharClass.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCode.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCompilationInfo.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexFCD.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexGroup.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexGroupCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexInterpreter.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatch.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatchCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatchTimeoutException.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexNode.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexOptions.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexParser.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexReplacement.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexRunner.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexRunnerFactory.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexTree.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexWriter.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/compiledregexrunner.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/compiledregexrunnerfactory.cs
\ No newline at end of file
index 6a014b9133a2a357906a1bb456b142adbc1da2c1..8420dab5155348540a8dfb4a904e893cd2416fd3 100644 (file)
@@ -1,4 +1,6 @@
 Assembly/AssemblyInfo.cs
+SR.cs
+../../build/common/SR.cs
 Mono.Http/NtlmClient.cs
 System.CodeDom.Compiler/GeneratedCodeAttribute.cs
 System.CodeDom.Compiler/IndentedTextWriter.cs
@@ -11,8 +13,6 @@ System.Collections.Generic/SortedDictionary.cs
 System.Collections.Generic/SortedList.cs
 System.Collections.Generic/SortedSet.cs
 System.Collections.Generic/Stack.cs
-System.Collections.Concurrent/BlockingCollection.cs
-System.Collections.Concurrent/ConcurrentBag.cs
 System.Collections.ObjectModel/ObservableCollection.cs
 System.Collections.ObjectModel/ReadOnlyObservableCollection.cs
 System.Collections.Specialized/BitVector32.cs
@@ -630,31 +630,6 @@ System.Security.Cryptography/AsnEncodedDataEnumerator.cs
 System.Security.Cryptography/Oid.cs
 System.Security.Cryptography/OidCollection.cs
 System.Security.Cryptography/OidEnumerator.cs
-System.Text.RegularExpressions/BaseMachine.cs
-System.Text.RegularExpressions/Capture.cs
-System.Text.RegularExpressions/CaptureCollection.cs
-System.Text.RegularExpressions/Group.cs
-System.Text.RegularExpressions/GroupCollection.cs
-System.Text.RegularExpressions/Match.cs
-System.Text.RegularExpressions/MatchCollection.cs
-System.Text.RegularExpressions/MatchEvaluator.cs
-System.Text.RegularExpressions/Regex.cs
-System.Text.RegularExpressions/RegexCompilationInfo.cs
-System.Text.RegularExpressions/RegexMatchTimeoutException.cs
-System.Text.RegularExpressions/RegexOptions.cs
-System.Text.RegularExpressions/RxInterpreter.cs
-System.Text.RegularExpressions/RxOp.cs
-System.Text.RegularExpressions/arch.cs
-System.Text.RegularExpressions/cache.cs
-System.Text.RegularExpressions/category.cs
-System.Text.RegularExpressions/compiler.cs
-System.Text.RegularExpressions/debug.cs
-System.Text.RegularExpressions/interpreter.cs
-System.Text.RegularExpressions/interval.cs
-System.Text.RegularExpressions/parser.cs
-System.Text.RegularExpressions/quicksearch.cs
-System.Text.RegularExpressions/replace.cs
-System.Text.RegularExpressions/syntax.cs
 System.Threading/Barrier.cs
 System.Threading/BarrierPostPhaseException.cs
 System.Threading/Semaphore.cs
@@ -693,3 +668,32 @@ System/UriParseComponents.cs
 System.Runtime.InteropServices/DefaultParameterValueAttribute.cs
 System.Runtime.InteropServices/HandleCollector.cs
 System.Windows.Input/ICommand.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/Regex.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexBoyerMoore.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCapture.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCaptureCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCharClass.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCode.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCompilationInfo.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexFCD.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexGroup.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexGroupCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexInterpreter.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatch.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatchCollection.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexMatchTimeoutException.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexNode.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexOptions.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexParser.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexReplacement.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexRunner.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexRunnerFactory.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexTree.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/RegexWriter.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/compiledregexrunner.cs
+../../../external/referencesource/System/regex/system/text/regularexpressions/compiledregexrunnerfactory.cs
+
+../../../external/referencesource/System/sys/system/collections/concurrent/BlockingCollection.cs
+../../../external/referencesource/System/sys/system/collections/concurrent/ConcurrentBag.cs
+
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_2_0.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim-net_2_0.csproj
deleted file mode 100644 (file)
index caf855d..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{328B62A2-55C4-420A-81C1-AEAB15A8F3A6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>SystemWebTestShim</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="SystemWebTestShim\Adapters.cs" />\r
-    <Compile Include="SystemWebTestShim\BuildManager.cs" />\r
-    <Compile Include="SystemWebTestShim\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="SystemWebTestShim\Page.cs" />\r
-    <Compile Include="SystemWebTestShim\UrlUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0-1.csproj">\r
-      <Project>{B8F7FDF0-07C7-4AFC-9854-F591BF307939}</Project>\r
-      <Name>System.Web\System.Web-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_0.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_0.csproj
deleted file mode 100644 (file)
index 79430a8..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D4CC2FBC-04C8-446E-915D-69ABC8FFFFAE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>SystemWebTestShim</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="SystemWebTestShim\Adapters.cs" />\r
-    <Compile Include="SystemWebTestShim\BuildManager.cs" />\r
-    <Compile Include="SystemWebTestShim\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="SystemWebTestShim\Page.cs" />\r
-    <Compile Include="SystemWebTestShim\UrlUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0-1.csproj">\r
-      <Project>{C385F6FA-0893-438F-AA08-32E08FF478AA}</Project>\r
-      <Name>System.Web\System.Web-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_0.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_0.csproj
deleted file mode 100644 (file)
index df62276..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DD0F08B9-8780-4EAB-8D77-072F3AE63F7B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WebMatrix.Data</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="WebMatrix.Data\ConnectionEventArgs.cs" />\r
-    <Compile Include="WebMatrix.Data\Database.cs" />\r
-    <Compile Include="WebMatrix.Data\DynamicRecord.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data-tests-net_4_0.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 2087fd8..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{23715291-225E-45B8-A253-9B8994172CF1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\WebMatrix.Data-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WebMatrix.Data_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="WebMatrix.Data\DynamicRecord.cs" />\r
-    <Compile Include="Test\WebMatrix.Data\ConnectionEventArgsTests.cs" />\r
-    <Compile Include="Test\WebMatrix.Data\DatabaseTests.cs" />\r
-    <Compile Include="Test\WebMatrix.Data\DynamicRecordTests.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WebMatrix.Data\WebMatrix.Data-net_4_0.csproj">\r
-      <Project>{DD0F08B9-8780-4EAB-8D77-072F3AE63F7B}</Project>\r
-      <Name>WebMatrix.Data\WebMatrix.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0.csproj">\r
-      <Project>{74084B98-6858-4133-998C-E594D367D8F1}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.CSharp\Microsoft.CSharp-net_4_0.csproj">\r
-      <Project>{9ACDCB1D-5099-4091-A426-DBBA9B0976C2}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/WindowsBase/WindowsBase-net_2_0.csproj b/mcs/class/WindowsBase/WindowsBase-net_2_0.csproj
deleted file mode 100644 (file)
index f945753..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{65F08514-3634-45C8-8EEB-6BAEA2EDC0C8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WindowsBase</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionChangedEventManager.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangedEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\DependencyPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\GroupDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ICollectionView.cs" />\r
-    <Compile Include="System.ComponentModel\ICollectionViewFactory.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableCollectionView.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableCollectionViewAddNewItem.cs" />\r
-    <Compile Include="System.ComponentModel\IItemProperties.cs" />\r
-    <Compile Include="System.ComponentModel\ItemPropertyInfo.cs" />\r
-    <Compile Include="System.ComponentModel\NewItemPlaceholderPosition.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyFilterOptions.cs" />\r
-    <Compile Include="System.ComponentModel\SortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\SortDescriptionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PresentationTraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\PresentationTraceSources.cs" />\r
-    <Compile Include="System.IO.Packaging\CertificateEmbeddingOption.cs" />\r
-    <Compile Include="System.IO.Packaging\Check.cs" />\r
-    <Compile Include="System.IO.Packaging\CompressionOption.cs" />\r
-    <Compile Include="System.IO.Packaging\EncryptedPackageEnvelope.cs" />\r
-    <Compile Include="System.IO.Packaging\EncryptionOption.cs" />\r
-    <Compile Include="System.IO.Packaging\InvalidSignatureEventHandler.cs" />\r
-    <Compile Include="System.IO.Packaging\Package.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageDigitalSignature.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageDigitalSignatureManager.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePart.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePartCollection.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageProperties.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePropertiesPart.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationship.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipCollection.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipSelector.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipSelectorType.cs" />\r
-    <Compile Include="System.IO.Packaging\PackUriHelper.cs" />\r
-    <Compile Include="System.IO.Packaging\PackUriParser.cs" />\r
-    <Compile Include="System.IO.Packaging\RightsManagementInformation.cs" />\r
-    <Compile Include="System.IO.Packaging\SignatureVerificationEventArgs.cs" />\r
-    <Compile Include="System.IO.Packaging\StorageInfo.cs" />\r
-    <Compile Include="System.IO.Packaging\StreamInfo.cs" />\r
-    <Compile Include="System.IO.Packaging\TargetMode.cs" />\r
-    <Compile Include="System.IO.Packaging\VerifyResult.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPackage.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPackagePart.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPartStream.cs" />\r
-    <Compile Include="System.IO\FileFormatException.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionAudio.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionImage.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionVideo.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermissionLevel.cs" />\r
-    <Compile Include="System.Security.RightsManagement\AuthenticationType.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentGrant.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentRight.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentUser.cs" />\r
-    <Compile Include="System.Security.RightsManagement\CryptoProvider.cs" />\r
-    <Compile Include="System.Security.RightsManagement\LocalizedNameDescriptionPair.cs" />\r
-    <Compile Include="System.Security.RightsManagement\PublishLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\RightsManagementException.cs" />\r
-    <Compile Include="System.Security.RightsManagement\RightsManagementFailureCode.cs" />\r
-    <Compile Include="System.Security.RightsManagement\SecureEnvironment.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UnsignedPublishLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UseLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UserActivationMode.cs" />\r
-    <Compile Include="System.Windows.Converters\Int32RectValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\PointValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\RectValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\SizeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\VectorValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Data\DataSourceProvider.cs" />\r
-    <Compile Include="System.Windows.Input\FocusNavigationDirection.cs" />\r
-    <Compile Include="System.Windows.Input\Key.cs" />\r
-    <Compile Include="System.Windows.Input\KeyConverter.cs" />\r
-    <Compile Include="System.Windows.Input\KeyInterop.cs" />\r
-    <Compile Include="System.Windows.Input\KeyValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeys.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeysConverter.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeysValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Input\TraversalRequest.cs" />\r
-    <Compile Include="System.Windows.Interop\ComponentDispatcher.cs" />\r
-    <Compile Include="System.Windows.Interop\IKeyboardInputSink.cs" />\r
-    <Compile Include="System.Windows.Interop\IKeyboardInputSite.cs" />\r
-    <Compile Include="System.Windows.Interop\MSG.cs" />\r
-    <Compile Include="System.Windows.Interop\ThreadMessageEventHandler.cs" />\r
-    <Compile Include="System.Windows.Markup.Primitives\MarkupObject.cs" />\r
-    <Compile Include="System.Windows.Markup.Primitives\MarkupProperty.cs" />\r
-    <Compile Include="System.Windows.Markup\AmbientAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ConstructorArgumentAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentWrapperAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DateTimeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\DependsOnAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DesignerSerializationOptions.cs" />\r
-    <Compile Include="System.Windows.Markup\DesignerSerializationOptionsAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DictionaryKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\IComponentConnector.cs" />\r
-    <Compile Include="System.Windows.Markup\INameScope.cs" />\r
-    <Compile Include="System.Windows.Markup\InternalTypeHelper.cs" />\r
-    <Compile Include="System.Windows.Markup\IReceiveMarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\IValueSerializerContext.cs" />\r
-    <Compile Include="System.Windows.Markup\IXamlTypeResolver.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtensionReturnTypeAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\NameScopePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RootNamespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RuntimeNamePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ServiceProviders.cs" />\r
-    <Compile Include="System.Windows.Markup\TrimSurroundingWhitespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UidPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UsableDuringInitializationAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializerAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\WhitespaceSignificantCollectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlLangPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsCompatibleWithAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsDefinitionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsPrefixAttribute.cs" />\r
-    <Compile Include="System.Windows.Media.Converters\MatrixValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Media\DisableDpiAwarenessAttribute.cs" />\r
-    <Compile Include="System.Windows.Media\Matrix.cs" />\r
-    <Compile Include="System.Windows.Media\MatrixConverter.cs" />\r
-    <Compile Include="System.Windows.Threading\Dispatcher.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherFrame.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHookEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHookEventHandler.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHooks.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherObject.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperation.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperationCallback.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperationStatus.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherPriority.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherProcessingDisabled.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherSynchronizationContext.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherTimer.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionEventHandler.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionFilterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionFilterEventHandler.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableAttribute.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableForTypeAttribute.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableWhenAttributePresentAttribute.cs" />\r
-    <Compile Include="System.Windows\CoerceValueCallback.cs" />\r
-    <Compile Include="System.Windows\DependencyObject.cs" />\r
-    <Compile Include="System.Windows\DependencyObjectType.cs" />\r
-    <Compile Include="System.Windows\DependencyProperty.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyKey.cs" />\r
-    <Compile Include="System.Windows\Expression.cs" />\r
-    <Compile Include="System.Windows\ExpressionConverter.cs" />\r
-    <Compile Include="System.Windows\Freezable.cs" />\r
-    <Compile Include="System.Windows\Int32Rect.cs" />\r
-    <Compile Include="System.Windows\Int32RectConverter.cs" />\r
-    <Compile Include="System.Windows\IWeakEventListener.cs" />\r
-    <Compile Include="System.Windows\LocalValueEntry.cs" />\r
-    <Compile Include="System.Windows\LocalValueEnumerator.cs" />\r
-    <Compile Include="System.Windows\Point.cs" />\r
-    <Compile Include="System.Windows\PointConverter.cs" />\r
-    <Compile Include="System.Windows\PropertyChangedCallback.cs" />\r
-    <Compile Include="System.Windows\PropertyMetadata.cs" />\r
-    <Compile Include="System.Windows\Rect.cs" />\r
-    <Compile Include="System.Windows\RectConverter.cs" />\r
-    <Compile Include="System.Windows\Size.cs" />\r
-    <Compile Include="System.Windows\SizeConverter.cs" />\r
-    <Compile Include="System.Windows\SplashScreen.cs" />\r
-    <Compile Include="System.Windows\ValidateValueCallback.cs" />\r
-    <Compile Include="System.Windows\Vector.cs" />\r
-    <Compile Include="System.Windows\VectorConverter.cs" />\r
-    <Compile Include="System.Windows\WeakEventManager.cs" />\r
-    <Compile Include="ZipSharp\IOFunctions.cs" />\r
-    <Compile Include="ZipSharp\NativeUnzip.cs" />\r
-    <Compile Include="ZipSharp\NativeZip.cs" />\r
-    <Compile Include="ZipSharp\UnzipArchive.cs" />\r
-    <Compile Include="ZipSharp\UnzipFileInfo.cs" />\r
-    <Compile Include="ZipSharp\UnzipHandle.cs" />\r
-    <Compile Include="ZipSharp\UnzipReadStream.cs" />\r
-    <Compile Include="ZipSharp\ZipArchive.cs" />\r
-    <Compile Include="ZipSharp\ZipFileInfo.cs" />\r
-    <Compile Include="ZipSharp\ZipHandle.cs" />\r
-    <Compile Include="ZipSharp\ZipStream.cs" />\r
-    <Compile Include="ZipSharp\ZipTime.cs" />\r
-    <Compile Include="ZipSharp\ZipWriteStream.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/WindowsBase/WindowsBase-net_4_0.csproj b/mcs/class/WindowsBase/WindowsBase-net_4_0.csproj
deleted file mode 100644 (file)
index aded50c..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{166B91FA-332C-48D9-9A0E-EF02794507BC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WindowsBase</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionChangedEventManager.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangedEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\DependencyPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\GroupDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ICollectionView.cs" />\r
-    <Compile Include="System.ComponentModel\ICollectionViewFactory.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableCollectionView.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableCollectionViewAddNewItem.cs" />\r
-    <Compile Include="System.ComponentModel\IItemProperties.cs" />\r
-    <Compile Include="System.ComponentModel\ItemPropertyInfo.cs" />\r
-    <Compile Include="System.ComponentModel\NewItemPlaceholderPosition.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyFilterOptions.cs" />\r
-    <Compile Include="System.ComponentModel\SortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\SortDescriptionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PresentationTraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\PresentationTraceSources.cs" />\r
-    <Compile Include="System.IO.Packaging\CertificateEmbeddingOption.cs" />\r
-    <Compile Include="System.IO.Packaging\Check.cs" />\r
-    <Compile Include="System.IO.Packaging\CompressionOption.cs" />\r
-    <Compile Include="System.IO.Packaging\EncryptedPackageEnvelope.cs" />\r
-    <Compile Include="System.IO.Packaging\EncryptionOption.cs" />\r
-    <Compile Include="System.IO.Packaging\InvalidSignatureEventHandler.cs" />\r
-    <Compile Include="System.IO.Packaging\Package.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageDigitalSignature.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageDigitalSignatureManager.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePart.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePartCollection.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageProperties.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePropertiesPart.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationship.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipCollection.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipSelector.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipSelectorType.cs" />\r
-    <Compile Include="System.IO.Packaging\PackUriHelper.cs" />\r
-    <Compile Include="System.IO.Packaging\PackUriParser.cs" />\r
-    <Compile Include="System.IO.Packaging\RightsManagementInformation.cs" />\r
-    <Compile Include="System.IO.Packaging\SignatureVerificationEventArgs.cs" />\r
-    <Compile Include="System.IO.Packaging\StorageInfo.cs" />\r
-    <Compile Include="System.IO.Packaging\StreamInfo.cs" />\r
-    <Compile Include="System.IO.Packaging\TargetMode.cs" />\r
-    <Compile Include="System.IO.Packaging\VerifyResult.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPackage.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPackagePart.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPartStream.cs" />\r
-    <Compile Include="System.IO\FileFormatException.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionAudio.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionImage.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionVideo.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermissionLevel.cs" />\r
-    <Compile Include="System.Security.RightsManagement\AuthenticationType.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentGrant.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentRight.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentUser.cs" />\r
-    <Compile Include="System.Security.RightsManagement\CryptoProvider.cs" />\r
-    <Compile Include="System.Security.RightsManagement\LocalizedNameDescriptionPair.cs" />\r
-    <Compile Include="System.Security.RightsManagement\PublishLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\RightsManagementException.cs" />\r
-    <Compile Include="System.Security.RightsManagement\RightsManagementFailureCode.cs" />\r
-    <Compile Include="System.Security.RightsManagement\SecureEnvironment.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UnsignedPublishLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UseLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UserActivationMode.cs" />\r
-    <Compile Include="System.Windows.Converters\Int32RectValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\PointValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\RectValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\SizeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\VectorValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Data\DataSourceProvider.cs" />\r
-    <Compile Include="System.Windows.Input\FocusNavigationDirection.cs" />\r
-    <Compile Include="System.Windows.Input\Key.cs" />\r
-    <Compile Include="System.Windows.Input\KeyConverter.cs" />\r
-    <Compile Include="System.Windows.Input\KeyInterop.cs" />\r
-    <Compile Include="System.Windows.Input\KeyValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeys.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeysConverter.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeysValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Input\TraversalRequest.cs" />\r
-    <Compile Include="System.Windows.Interop\ComponentDispatcher.cs" />\r
-    <Compile Include="System.Windows.Interop\IKeyboardInputSink.cs" />\r
-    <Compile Include="System.Windows.Interop\IKeyboardInputSite.cs" />\r
-    <Compile Include="System.Windows.Interop\MSG.cs" />\r
-    <Compile Include="System.Windows.Interop\ThreadMessageEventHandler.cs" />\r
-    <Compile Include="System.Windows.Markup.Primitives\MarkupObject.cs" />\r
-    <Compile Include="System.Windows.Markup.Primitives\MarkupProperty.cs" />\r
-    <Compile Include="System.Windows.Markup\AmbientAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ConstructorArgumentAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentWrapperAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DateTimeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\DependsOnAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DesignerSerializationOptions.cs" />\r
-    <Compile Include="System.Windows.Markup\DesignerSerializationOptionsAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DictionaryKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\IComponentConnector.cs" />\r
-    <Compile Include="System.Windows.Markup\INameScope.cs" />\r
-    <Compile Include="System.Windows.Markup\InternalTypeHelper.cs" />\r
-    <Compile Include="System.Windows.Markup\IReceiveMarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\IValueSerializerContext.cs" />\r
-    <Compile Include="System.Windows.Markup\IXamlTypeResolver.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtensionReturnTypeAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\NameScopePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RootNamespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RuntimeNamePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ServiceProviders.cs" />\r
-    <Compile Include="System.Windows.Markup\TrimSurroundingWhitespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UidPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UsableDuringInitializationAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializerAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\WhitespaceSignificantCollectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlLangPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsCompatibleWithAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsDefinitionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsPrefixAttribute.cs" />\r
-    <Compile Include="System.Windows.Media.Converters\MatrixValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Media\DisableDpiAwarenessAttribute.cs" />\r
-    <Compile Include="System.Windows.Media\Matrix.cs" />\r
-    <Compile Include="System.Windows.Media\MatrixConverter.cs" />\r
-    <Compile Include="System.Windows.Threading\Dispatcher.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherFrame.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHookEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHookEventHandler.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHooks.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherObject.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperation.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperationCallback.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperationStatus.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherPriority.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherProcessingDisabled.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherSynchronizationContext.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherTimer.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionEventHandler.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionFilterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionFilterEventHandler.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableAttribute.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableForTypeAttribute.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableWhenAttributePresentAttribute.cs" />\r
-    <Compile Include="System.Windows\CoerceValueCallback.cs" />\r
-    <Compile Include="System.Windows\DependencyObject.cs" />\r
-    <Compile Include="System.Windows\DependencyObjectType.cs" />\r
-    <Compile Include="System.Windows\DependencyProperty.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyKey.cs" />\r
-    <Compile Include="System.Windows\Expression.cs" />\r
-    <Compile Include="System.Windows\ExpressionConverter.cs" />\r
-    <Compile Include="System.Windows\Freezable.cs" />\r
-    <Compile Include="System.Windows\Int32Rect.cs" />\r
-    <Compile Include="System.Windows\Int32RectConverter.cs" />\r
-    <Compile Include="System.Windows\IWeakEventListener.cs" />\r
-    <Compile Include="System.Windows\LocalValueEntry.cs" />\r
-    <Compile Include="System.Windows\LocalValueEnumerator.cs" />\r
-    <Compile Include="System.Windows\Point.cs" />\r
-    <Compile Include="System.Windows\PointConverter.cs" />\r
-    <Compile Include="System.Windows\PropertyChangedCallback.cs" />\r
-    <Compile Include="System.Windows\PropertyMetadata.cs" />\r
-    <Compile Include="System.Windows\Rect.cs" />\r
-    <Compile Include="System.Windows\RectConverter.cs" />\r
-    <Compile Include="System.Windows\Size.cs" />\r
-    <Compile Include="System.Windows\SizeConverter.cs" />\r
-    <Compile Include="System.Windows\SplashScreen.cs" />\r
-    <Compile Include="System.Windows\ValidateValueCallback.cs" />\r
-    <Compile Include="System.Windows\Vector.cs" />\r
-    <Compile Include="System.Windows\VectorConverter.cs" />\r
-    <Compile Include="System.Windows\WeakEventManager.cs" />\r
-    <Compile Include="ZipSharp\IOFunctions.cs" />\r
-    <Compile Include="ZipSharp\NativeUnzip.cs" />\r
-    <Compile Include="ZipSharp\NativeZip.cs" />\r
-    <Compile Include="ZipSharp\UnzipArchive.cs" />\r
-    <Compile Include="ZipSharp\UnzipFileInfo.cs" />\r
-    <Compile Include="ZipSharp\UnzipHandle.cs" />\r
-    <Compile Include="ZipSharp\UnzipReadStream.cs" />\r
-    <Compile Include="ZipSharp\ZipArchive.cs" />\r
-    <Compile Include="ZipSharp\ZipFileInfo.cs" />\r
-    <Compile Include="ZipSharp\ZipHandle.cs" />\r
-    <Compile Include="ZipSharp\ZipStream.cs" />\r
-    <Compile Include="ZipSharp\ZipTime.cs" />\r
-    <Compile Include="ZipSharp\ZipWriteStream.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xaml\System.Xaml-net_4_0.csproj">\r
-      <Project>{B2254BB1-2510-41F0-AD51-AF36ACF797AE}</Project>\r
-      <Name>System.Xaml\System.Xaml-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/WindowsBase/WindowsBase-tests-net_2_0.csproj b/mcs/class/WindowsBase/WindowsBase-tests-net_2_0.csproj
deleted file mode 100644 (file)
index cb8751f..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0003181A-51C0-4874-A5CC-1C556517DF57}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\WindowsBase-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WindowsBase_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Collections.ObjectModel\ObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\CollectionChangedEventValidators.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NotifyCollectionChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CurrentChangingEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\GroupDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyFilterAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SortDescriptionCollectionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SortDescriptionTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackage.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackagePart.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackagePartTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackageTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakeStream.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartFileTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartStreamTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackageRelationshipTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackageTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackUriHelperTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\TestBase.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ConstructorArgumentAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ContentPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ContentWrapperAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\DateTimeValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\DependsOnAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\MarkupExtensionReturnTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Media\MatrixTest.cs" />\r
-    <Compile Include="Test\System.Windows.Threading\DispatcherTest.cs" />\r
-    <Compile Include="Test\System.Windows.Threading\DispatcherTimerTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyObjectTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyObjectTypeTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyPropertyTest.cs" />\r
-    <Compile Include="Test\System.Windows\Int32RectConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\Int32RectTest.cs" />\r
-    <Compile Include="Test\System.Windows\PointConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\PointTest.cs" />\r
-    <Compile Include="Test\System.Windows\PropertyMetadataTest.cs" />\r
-    <Compile Include="Test\System.Windows\RectConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\RectTest.cs" />\r
-    <Compile Include="Test\System.Windows\SizeConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\SizeTest.cs" />\r
-    <Compile Include="Test\System.Windows\VectorConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\VectorTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_2_0.csproj">\r
-      <Project>{65F08514-3634-45C8-8EEB-6BAEA2EDC0C8}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_2_0.csproj">\r
-      <Project>{65F08514-3634-45C8-8EEB-6BAEA2EDC0C8}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">\r
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>\r
-      <Name>System\System-net_2_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">\r
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>\r
-      <Name>System.XML\System.Xml-net_2_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/WindowsBase/WindowsBase-tests-net_4_0.csproj b/mcs/class/WindowsBase/WindowsBase-tests-net_4_0.csproj
deleted file mode 100644 (file)
index c48ca5e..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{323C92C1-1E60-4208-990B-360229B5B07E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\WindowsBase-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WindowsBase_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Collections.ObjectModel\ObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\CollectionChangedEventValidators.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NotifyCollectionChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CurrentChangingEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\GroupDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyFilterAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SortDescriptionCollectionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SortDescriptionTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackage.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackagePart.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackagePartTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackageTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakeStream.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartFileTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartStreamTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackageRelationshipTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackageTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackUriHelperTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\TestBase.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ConstructorArgumentAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ContentPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ContentWrapperAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\DateTimeValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\DependsOnAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\MarkupExtensionReturnTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Media\MatrixTest.cs" />\r
-    <Compile Include="Test\System.Windows.Threading\DispatcherTest.cs" />\r
-    <Compile Include="Test\System.Windows.Threading\DispatcherTimerTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyObjectTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyObjectTypeTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyPropertyTest.cs" />\r
-    <Compile Include="Test\System.Windows\Int32RectConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\Int32RectTest.cs" />\r
-    <Compile Include="Test\System.Windows\PointConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\PointTest.cs" />\r
-    <Compile Include="Test\System.Windows\PropertyMetadataTest.cs" />\r
-    <Compile Include="Test\System.Windows\RectConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\RectTest.cs" />\r
-    <Compile Include="Test\System.Windows\SizeConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\SizeTest.cs" />\r
-    <Compile Include="Test\System.Windows\VectorConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\VectorTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_4_0.csproj">\r
-      <Project>{166B91FA-332C-48D9-9A0E-EF02794507BC}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_4_0.csproj">\r
-      <Project>{166B91FA-332C-48D9-9A0E-EF02794507BC}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xaml\System.Xaml-net_4_0.csproj">\r
-      <Project>{B2254BB1-2510-41F0-AD51-AF36ACF797AE}</Project>\r
-      <Name>System.Xaml\System.Xaml-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
index b9a11912d07325883cef0c0f5900ec57fd48a5b7..b282ae355fdaeb2dc4b75e8a4d971b48c304fc19 100644 (file)
@@ -8,10 +8,6 @@ LIBRARY_NAME = mscorlib.dll
 LIB_MCS_FLAGS = $(RESOURCE_FILES:%=-resource:%)
 #LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-ifeq (basic, $(PROFILE))
-
-else
-
 ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += --runtime:v2
 else
@@ -22,8 +18,6 @@ $(error Unknown framework version)
 endif
 endif
 
-endif
-
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
@@ -36,7 +30,8 @@ RESOURCE_FILES = \
        resources/collation.cjkKO.bin \
        resources/collation.cjkKOlv2.bin
 
-LOCAL_MCS_FLAGS = -unsafe -nostdlib -nowarn:612,618 -d:INSIDE_CORLIB -d:LIBC
+REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL
+LOCAL_MCS_FLAGS = -unsafe -nostdlib -nowarn:612,618 -d:INSIDE_CORLIB -d:LIBC $(REFERENCE_SOURCES_FLAGS)
 DEFAULT_REFERENCES =
 
 # System.IO/DirectoryInfoTest.cs needs Mono.Posix
diff --git a/mcs/class/corlib/ReferenceSources/Array.cs b/mcs/class/corlib/ReferenceSources/Array.cs
new file mode 100644 (file)
index 0000000..2d10164
--- /dev/null
@@ -0,0 +1,7 @@
+namespace System
+{
+       static class Array_ReferenceSources
+       {
+               internal const int MaxArrayLength = 0X7FEFFFFF;
+       }
+}
\ No newline at end of file
diff --git a/mcs/class/corlib/ReferenceSources/Environment.cs b/mcs/class/corlib/ReferenceSources/Environment.cs
new file mode 100644 (file)
index 0000000..5377cfe
--- /dev/null
@@ -0,0 +1,22 @@
+using System.Globalization;
+
+namespace System
+{
+       partial class Environment
+       {
+               internal static string GetResourceString (string key)
+               {
+                       return key;
+               }
+
+               internal static string GetResourceString (string key, CultureInfo culture)
+               {
+                       return key;
+               }
+
+               internal static string GetResourceString (string key, params object[] values)
+               {
+                       return string.Format (CultureInfo.InvariantCulture, key, values);
+               }
+       }
+}
\ No newline at end of file
diff --git a/mcs/class/corlib/ReferenceSources/ExecutionContext.cs b/mcs/class/corlib/ReferenceSources/ExecutionContext.cs
new file mode 100644 (file)
index 0000000..8094fec
--- /dev/null
@@ -0,0 +1,32 @@
+namespace System.Threading
+{
+       partial class ExecutionContext
+       {
+               internal static ExecutionContext Capture (ref StackCrawlMark stackMark, CaptureOptions options)
+               {
+                       // For References sources compatibility only
+                       return null;
+               }
+
+           [Flags]
+           internal enum CaptureOptions
+           {
+               None = 0x00,
+
+               IgnoreSyncCtx = 0x01,       //Don't flow SynchronizationContext
+
+               OptimizeDefaultCase = 0x02, //Faster in the typical case, but can't show the result to users
+                                           // because they could modify the shared default EC.
+                                           // Use this only if you won't be exposing the captured EC to users.
+           }
+       }
+
+    [Serializable]
+    internal enum StackCrawlMark
+    {
+        LookForMe = 0,
+        LookForMyCaller = 1,
+        LookForMyCallersCaller = 2,
+        LookForThread = 3
+    }
+}
\ No newline at end of file
diff --git a/mcs/class/corlib/ReferenceSources/Helpers.cs b/mcs/class/corlib/ReferenceSources/Helpers.cs
new file mode 100644 (file)
index 0000000..e2fe31e
--- /dev/null
@@ -0,0 +1,10 @@
+namespace System.Collections
+{
+       static class HashHelpers
+       {
+               public static object GetEqualityComparerForSerialization (object comparer)
+               {
+                       return comparer;
+               }
+       }
+}
\ No newline at end of file
index 7f647f38216e3d7bbdffada5d46cdf4eeddae7b7..8f326784730fbc8a079997e04a8841aa612a9427 100644 (file)
@@ -371,12 +371,18 @@ namespace System.Collections.Generic {
                        return Array.GetLastIndex (_items, startIndex - count + 1, count, match);
                }
 
-               public void ForEach (Action <T> action)
+               public void ForEach (Action<T> action)
                {
                        if (action == null)
                                throw new ArgumentNullException ("action");
-                       for(int i=0; i < _size; i++)
-                               action(_items[i]);
+
+                       var version =_version;
+                       for (int i = 0; i < _size; i++) {
+                               if (_version != version)
+                                       throw Enumerator.GetModifiedCollectionException ();
+
+                               action (_items [i]);
+                       }
                }
                
                public Enumerator GetEnumerator ()
@@ -812,7 +818,7 @@ namespace System.Collections.Generic {
                                }
 
                                if (ver != l._version)
-                                       throw new InvalidOperationException ("Collection was modified; enumeration operation may not execute.");
+                                       throw GetModifiedCollectionException ();
 
                                next = -1;
                                return false;
@@ -825,7 +831,7 @@ namespace System.Collections.Generic {
                        void IEnumerator.Reset ()
                        {
                                if (ver != l._version)
-                                       throw new InvalidOperationException ("Collection was modified; enumeration operation may not execute.");
+                                       throw GetModifiedCollectionException ();
 
                                next = 0;
                                current = default (T);
@@ -834,13 +840,18 @@ namespace System.Collections.Generic {
                        object IEnumerator.Current {
                                get {
                                        if (ver != l._version)
-                                               throw new InvalidOperationException ("Collection was modified; enumeration operation may not execute.");
+                                               throw GetModifiedCollectionException ();
 
                                        if (next <= 0)
                                                throw new InvalidOperationException ();
                                        return current;
                                }
                        }
+
+                       internal static InvalidOperationException GetModifiedCollectionException ()
+                       {
+                               return new InvalidOperationException ("Collection was modified; enumeration operation may not execute.");
+                       }
                }
        }
 }
index 37a6c559fb32abf79851ef23a959877676ecaf6b..b6aa9d2ed3ec6e8ce49863ad12ee196739e5d8de 100644 (file)
@@ -49,6 +49,7 @@ namespace System.Diagnostics {
                #region Keep in sync with object-internals.h
                private int ilOffset = OFFSET_UNKNOWN;
                private int nativeOffset = OFFSET_UNKNOWN;
+               private long methodAddress;
                private MethodBase methodBase;
                private string fileName;
                private int lineNumber;
@@ -165,6 +166,11 @@ namespace System.Diagnostics {
                         return nativeOffset;                        
                 }
 
+               internal long GetMethodAddress ()
+               {
+                       return methodAddress;
+               }
+
                internal string GetInternalMethodName ()
                {
                        return internalMethodName;
index c73c6ada22b50f7009f5b9cabfbab4b7c4feea89..6a8e4908edfff1f9d2342b0937292e11e495ef01 100644 (file)
@@ -458,6 +458,16 @@ namespace System.Reflection.Emit
                }
 */
 
+#if NET_4_5
+               public static AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access)
+               {
+                       if (name == null)
+                               throw new ArgumentNullException ("name");
+
+                       return new AssemblyBuilder (name, null, access, false);
+               }
+#endif
+
                public ModuleBuilder DefineDynamicModule (string name)
                {
                        return DefineDynamicModule (name, name, false, true);
index cdb7a33db19c85573c2e4164f11b3404413d4239..edb30d3a48054f5564c45352c732bbedb7e35dcf 100644 (file)
@@ -104,7 +104,17 @@ namespace System.Runtime.CompilerServices
                        if (stateMachine == null)
                                throw new ArgumentNullException ("stateMachine");
                        
-                       stateMachine.MoveNext ();
+                       var thread = Thread.CurrentThread;
+                       var prev = default (ExecutionContext.Switcher);
+                       try {
+                               thread.BranchExecutionContext (out prev);
+                               stateMachine.MoveNext ();
+                       } finally {
+                               //
+                               // Any changes to ExecutionContext within MoveNext scope cannot leak out
+                               //
+                               thread.RestoreExecutionContext (ref prev);
+                       }
                }
        }
 }
index 9d539dfc42dc4f5bc56c71e5d94b8371432b5298..73b0d128107e5077a009e8f16e2cbea73b1ec0a7 100644 (file)
@@ -104,7 +104,17 @@ namespace System.Runtime.CompilerServices
                        if (stateMachine == null)
                                throw new ArgumentNullException ("stateMachine");
                        
-                       stateMachine.MoveNext ();
+                       var thread = Thread.CurrentThread;
+                       var prev = default (ExecutionContext.Switcher);
+                       try {
+                               thread.BranchExecutionContext (out prev);
+                               stateMachine.MoveNext ();
+                       } finally {
+                               //
+                               // Any changes to ExecutionContext within MoveNext scope cannot leak out
+                               //
+                               thread.RestoreExecutionContext (ref prev);
+                       }
                }
        }
 }
index 8fe846c632e7a63069c19a3ba18085581372dd91..a4f55e5d82d632a9b40692f0a403837c390fc85e 100644 (file)
@@ -71,8 +71,9 @@ namespace System.Runtime.Remoting.Messaging
                        if (data is ILogicalThreadAffinative) {
                                LogicalSetData (name, data);
                        } else {
-                               LogicalContext.FreeNamedDataSlot (name);
-                               Datastore [name] = data;
+                               var ec = ExecutionContext.GetCurrentWritable ();
+                               ec.LogicalCallContext.FreeNamedDataSlot (name);
+                               ec.DataStore [name] = data;
                        }
                }
                
@@ -83,8 +84,9 @@ namespace System.Runtime.Remoting.Messaging
 
                public static void LogicalSetData (string name, object data) 
                {
-                       Datastore.Remove (name);
-                       LogicalContext.SetData (name, data);
+                       var ec = ExecutionContext.GetCurrentWritable ();
+                       ec.DataStore.Remove (name);
+                       ec.LogicalCallContext.SetData (name, data);
                }
 
                public static Header[] GetHeaders () 
index d0b723d285ed4dbd9d5800d7e1a95bce6fa9bee8..7c471baf7c0220a7cd84270c1d765274041be5f3 100644 (file)
@@ -55,7 +55,7 @@ namespace System.Threading.Tasks
                        
                        // Take care of growing
                        var size = b - top - upperBound;
-                       if (size > a.Size) {
+                       if (size >= a.Size) {
                                upperBound = top;
                                a = a.Grow (b, upperBound);
                                array = a;
index d62df9a7e68f98237ca537dce7d41da4df0b4a0c..f509feacd02af8f00c776b6678f736b731ebe064 100644 (file)
@@ -203,7 +203,7 @@ namespace System.Threading.Tasks
                                                                long old;
                                                                StealValue64 val = new StealValue64 ();
 
-                                                               old = Thread.VolatileRead (ref range.V64.Value);
+                                                               old = Volatile.Read (ref range.V64.Value);
                                                                val.Value = old;
 
                                                                if (val.Actual >= stopIndex - val.Stolen - 2)
@@ -448,7 +448,7 @@ namespace System.Threading.Tasks
                        return ForEach<TSource, object> (Partitioner.Create (source),
                                                         ParallelOptions.Default,
                                                         () => null,
-                                                        (e, s, l) => { body (e, s, -1); return null; },
+                                                        (e, s, i, l) => { body (e, s, i); return null; },
                                                         _ => {});
                }
 
index 8ede25eebe4f4c81e23bc67e0583afb05b444ee6..16869c5f83406ec7af7eb61fa863b47cccc1e97c 100644 (file)
@@ -113,10 +113,16 @@ namespace System.Threading.Tasks
        class AwaiterActionContinuation : IContinuation
        {
                readonly Action action;
+               readonly ExecutionContext ec;
 
                public AwaiterActionContinuation (Action action)
                {
                        this.action = action;
+
+                       // Capture execution context because the continuation can be inlined
+                       // and we still need to run in original exection context regardless
+                       // of UnsafeOnCompleted/OnCompleted entry
+                       ec = ExecutionContext.Capture (false, true);                    
                }
 
                public void Execute ()
@@ -126,7 +132,10 @@ namespace System.Threading.Tasks
                        // because the context where the awaiter task is set to completed can be anywhere (due to TaskCompletionSource)
                        //
                        if ((SynchronizationContext.Current == null || SynchronizationContext.Current.GetType () == typeof (SynchronizationContext)) && TaskScheduler.IsDefault) {
-                               action ();
+                               if (ec != null)
+                                       ExecutionContext.Run (ec, l => ((Action)l) (), action);
+                               else
+                                       action ();
                        } else {
                                ThreadPool.UnsafeQueueUserWorkItem (l => ((Action) l) (), action);
                        }
@@ -389,4 +398,4 @@ namespace System.Threading.Tasks
        }
 }
 
-#endif
+#endif
\ No newline at end of file
index 787d8394eeeeca71ebd56c84427e8bbc19aa31f6..f312223e02e168027ab13e591b4c2a4ffbfe2b40 100644 (file)
@@ -38,11 +38,46 @@ using System.Collections.Generic;
 
 namespace System.Threading {
        [Serializable]
-       public sealed class ExecutionContext : ISerializable
+       public sealed partial class ExecutionContext : ISerializable
 #if NET_4_0
-               , IDisposable
+           , IDisposable
 #endif
        {
+               internal struct Switcher
+               {
+                       readonly ExecutionContext ec;
+                       readonly LogicalCallContext _lcc;
+                       readonly bool _suppressFlow;
+                       readonly bool _capture;
+                       readonly Dictionary<string, object> local_data;
+                       readonly bool copy_on_write;
+
+                       public Switcher (ExecutionContext ec)
+                       {
+                               this.ec = ec;
+                               this._lcc = ec._lcc;
+                               this._suppressFlow = ec._suppressFlow;
+                               this._capture = ec._capture;
+                               this.local_data = ec.local_data;
+                               this.copy_on_write = ec.CopyOnWrite;
+                       }
+
+                       public bool IsEmpty {
+                               get {
+                                       return ec == null;
+                               }
+                       }
+
+                       public void Restore (ExecutionContext ec)
+                       {
+                               ec._lcc = this._lcc;
+                               ec._suppressFlow = this._suppressFlow;
+                               ec._capture = this._capture;
+                               ec.local_data = this.local_data;
+                               ec.CopyOnWrite = this.copy_on_write;
+                       }
+               }
+
 #if !MOBILE
                private SecurityContext _sc;
 #endif
@@ -57,15 +92,20 @@ namespace System.Threading {
 
                private ExecutionContext (ExecutionContext ec)
                {
+                       CloneData (ec);
+
+                       _suppressFlow = ec._suppressFlow;
+                       _capture = true;
+               }
+
+               void CloneData (ExecutionContext ec)
+               {
 #if !MOBILE
                        if (ec._sc != null)
                                _sc = new SecurityContext (ec._sc);
 #endif
                        if (ec._lcc != null)
                                _lcc = (LogicalCallContext) ec._lcc.Clone ();
-
-                       _suppressFlow = ec._suppressFlow;
-                       _capture = true;
                }
                
                [MonoTODO]
@@ -81,7 +121,11 @@ namespace System.Threading {
                
                internal static ExecutionContext Capture (bool captureSyncContext, bool nullOnEmpty)
                {
-                       ExecutionContext ec = Current;
+                       var thread = Thread.CurrentThread;
+                       if (nullOnEmpty && !thread.HasExecutionContext)
+                               return null;
+
+                       var ec = thread.ExecutionContext;
                        if (ec.FlowSuppressed)
                                return null;
 
@@ -167,6 +211,8 @@ namespace System.Threading {
                        set { _suppressFlow = value; }
                }
 
+               internal bool CopyOnWrite { get; set; }
+
                public static bool IsFlowSuppressed ()
                {
                        return Current.FlowSuppressed;
@@ -232,5 +278,16 @@ namespace System.Threading {
                                return Thread.CurrentThread.ExecutionContext;
                        }
                }
+
+               internal static ExecutionContext GetCurrentWritable ()
+               {
+                       var current = Thread.CurrentThread.ExecutionContext;
+                       if (current.CopyOnWrite) {
+                               current.CopyOnWrite = false;
+                               current.CloneData (current);
+                       }
+
+                       return current;
+               }
        }
-}
\ No newline at end of file
+}
diff --git a/mcs/class/corlib/System.Threading/ExecutionContextSwitcher.cs b/mcs/class/corlib/System.Threading/ExecutionContextSwitcher.cs
deleted file mode 100644 (file)
index 176a013..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-// 
-// System.Threading.ExecutionContextSwitcher.cs
-//
-// Author:
-//   Lluis Sanchez (lluis@novell.com)
-//
-// Copyright (C) Novell, Inc., 2004
-//
-
-//
-// 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.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
-
-namespace System.Threading 
-{
-       [ComVisible (false)]
-       public struct ExecutionContextSwitcher : IDisposable
-       {
-               [MonoTODO]
-               public override bool Equals (object ob)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public override int GetHashCode ()
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public static bool operator == (ExecutionContextSwitcher c1, ExecutionContextSwitcher c2)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public static bool operator != (ExecutionContextSwitcher c1, ExecutionContextSwitcher c2)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
-               public void Undo ()
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               void IDisposable.Dispose()
-               {
-                       throw new NotImplementedException ();
-               }
-       }
-}
-
index d6a289e76b5a1754dfb0cc08774185b39a13d62a..8b2d4dca9cd879ebbd871290c2a9024cbc8bb733 100644 (file)
@@ -226,14 +226,17 @@ namespace System.Threading
 
 #endif
 
-#if NET_4_5
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                extern static bool Monitor_test_owner (object obj);
-               
-               public static bool IsEntered (object obj)
+
+#if NET_4_5            
+               public
+#else
+               internal
+#endif
+               static bool IsEntered (object obj)
                {
                        return Monitor_test_owner(obj);
                }
-#endif
        }
 }
index bf5f3da002f72a155437840b40fcb786ba46e59a..db91e6d070d477e3daea9f95ea911c525ba32a54 100644 (file)
@@ -166,7 +166,7 @@ namespace System.Threading
 
                                SpinWait wait = new SpinWait ();
 
-                               while (Thread.VolatileRead (ref currCount) <= 0) {
+                               while (Volatile.Read (ref currCount) <= 0) {
                                        cancellationToken.ThrowIfCancellationRequested ();
                                        if (stopCondition ())
                                                return false;
index a52d8d1258506712ba856214353c4a4468fc517b..985c8613d8a1da9c10b0c34ae1ab05b7460ec126 100644 (file)
@@ -869,6 +869,32 @@ namespace System.Threading {
                        }
                }
 
+               internal bool HasExecutionContext {
+                       get {
+                               return _ec != null;
+                       }
+               }
+
+               internal void BranchExecutionContext (out ExecutionContext.Switcher switcher)
+               {
+                       if (_ec == null) {
+                               switcher =  new ExecutionContext.Switcher ();
+                       } else {
+                               switcher = new ExecutionContext.Switcher (_ec);
+                               _ec.CopyOnWrite = true;
+                       }
+               }
+
+               internal void RestoreExecutionContext (ref ExecutionContext.Switcher switcher)
+               {
+                       if (switcher.IsEmpty) {
+                               _ec = null;
+                               return;
+                       }
+
+                       switcher.Restore (_ec);
+               }
+
                public int ManagedThreadId {
                        [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                        get {
index 66f661b2ee3752c2422358d26fe15fa697558ff9..8cca9840e5380b0bdc0a6ff599f54550039f1124 100644 (file)
@@ -38,8 +38,6 @@ namespace System.Threading {
        {
                public const int Infinite = -1;
 
-#if NET_4_5
                public static readonly TimeSpan InfiniteTimeSpan = new TimeSpan (0, 0, 0, 0, -1);
-#endif
        }
 }
index 92646ceee50fc429aa06c0cac5f1e158cad875bf..6460f728492fa2209f22338eead7d24705b6bbd5 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_5
-
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.CompilerServices;
 
 namespace System.Threading
 {
-       public static class Volatile
+#if NET_4_5
+       public
+#endif
+       static class Volatile
        {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                [ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
@@ -156,5 +157,3 @@ namespace System.Threading
                public extern static void Write<T>(ref T location, T value) where T : class;
        }
 }
-
-#endif
index c515ae1785cf0869f85dcfafcbd901db48c8a6d3..d689f379ff24bb7999ef081b05b7efbd9d8160a8 100644 (file)
@@ -297,6 +297,8 @@ namespace System
                        }
                }
 
+               public string TargetFrameworkName { get; set; }
+
                public ActivationArguments ActivationArguments {
                        get {
                                if (_activationArguments != null)
@@ -390,11 +392,9 @@ namespace System
                        serialized_non_primitives = ms.ToArray ();
                }
 
-#if NET_4_0
                [MonoTODO ("not implemented, does not throw because it's used in testing moonlight")]
                public void SetCompatibilitySwitches (IEnumerable<string> switches)
                {
                }
-#endif
        }
 }
index 21128defd9ba7b1b5b39dd2b99dacbdabb50f8bc..d0a91ed3997cbde4e2ed48875b497f2bf21bc063 100644 (file)
@@ -56,7 +56,7 @@ namespace System {
                 * of icalls, do not require an increment.
                 */
 #pragma warning disable 169
-               private const int mono_corlib_version = 111;
+               private const int mono_corlib_version = 113;
 #pragma warning restore 169
 
                [ComVisible (true)]
index d5d81dcd73926ac2a74d7629de56fcbf51b79958..5ccf4bd494b6cbc7f3069b6a5c1bfde5aa20f22e 100644 (file)
@@ -208,12 +208,12 @@ namespace System
                                        if (internal_name != null)
                                                sb.Append (internal_name);
                                        else
-                                               sb.AppendFormat ("<0x{0:x5}> {1}", frame.GetNativeOffset (), unknown);
+                                               sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> {2}", frame.GetMethodAddress (), frame.GetNativeOffset (), unknown);
                                } else {
                                        GetFullNameForStackTrace (sb, frame.GetMethod ());
 
                                        if (frame.GetILOffset () == -1)
-                                               sb.AppendFormat (" <0x{0:x5}> ", frame.GetNativeOffset ());
+                                               sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> ", frame.GetMethodAddress (), frame.GetNativeOffset ());
                                        else
                                                sb.AppendFormat (" [0x{0:x5}] ", frame.GetILOffset ());
 
index 0dc4231858d9165a028c2be176190532b13610bc..3ff8c32cc45cf641d28cbc9e1e30255ff5b2bc1e 100644 (file)
@@ -623,6 +623,16 @@ namespace MonoTests.System.Collections.Generic {
                        Assert.AreEqual (418, i);
                }
 
+               [Test]
+               public void ForEach_Modified ()
+               {
+                       try {
+                               _list1.ForEach (l => _list1.Add (0));
+                               Assert.Fail ();
+                       } catch (InvalidOperationException) {
+                       }
+               }
+
                [Test]
                public void FindLastIndexTest ()
                {
index f65ac28ef5ed8bed9c4d2c680c158dc52b6286d5..4aecf73b87e49354ba00c42e6d6a9d769df8297f 100644 (file)
@@ -11,6 +11,7 @@
 using System;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.InteropServices;
 using System.Text;
 
 using NUnit.Framework;
@@ -452,6 +453,62 @@ namespace MonoTests.System.Reflection.Emit
                        Assert.AreEqual (dm.Name, res.Name, "#1");
 
                }
+
+               [StructLayout (LayoutKind.Explicit)]
+               struct SizeOfTarget {
+                       [FieldOffset (0)] public int X;
+                       [FieldOffset (4)] public int Y;
+               }
+
+               [Test]
+               public void SizeOf ()
+               {
+                       var method = new DynamicMethod ("", typeof (int), Type.EmptyTypes);
+                       var il = method.GetILGenerator ();
+                       il.Emit (OpCodes.Sizeof, typeof (SizeOfTarget));
+                       il.Emit (OpCodes.Ret);
+
+                       var func = (Func<int>) method.CreateDelegate (typeof (Func<int>));
+                       var point_size = func ();
+
+                       Assert.AreEqual (8, point_size);
+               }
+
+               class TypedRefTarget {
+                       public string Name;
+               }
+
+               [Test]
+               public void TypedRef ()
+               {
+                       var method = new DynamicMethod ("", typeof (TypedRefTarget), new [] {typeof (TypedRefTarget)}, true);
+                       var il = method.GetILGenerator ();
+                       var tr = il.DeclareLocal (typeof (TypedReference));
+
+                       il.Emit (OpCodes.Ldarga, 0);
+                       il.Emit (OpCodes.Mkrefany, typeof (TypedRefTarget));
+                       il.Emit (OpCodes.Stloc, tr);
+
+                       il.Emit (OpCodes.Ldloc, tr);
+                       il.Emit (OpCodes.Call, GetType ().GetMethod ("AssertTypedRef", BindingFlags.NonPublic | BindingFlags.Static));
+
+                       il.Emit (OpCodes.Ldloc, tr);
+                       il.Emit (OpCodes.Refanyval, typeof (TypedRefTarget));
+                       il.Emit (OpCodes.Ldobj, typeof (TypedRefTarget));
+                       il.Emit (OpCodes.Ret);
+
+                       var f = (Func<TypedRefTarget, TypedRefTarget>) method.CreateDelegate (typeof (Func<TypedRefTarget, TypedRefTarget>));
+
+                       var target = new TypedRefTarget { Name = "Foo" };
+                       var rt = f (target);
+
+                       Assert.AreEqual (target, rt);
+               }
+
+               private static void AssertTypedRef (TypedReference tr)
+               {
+                       Assert.AreEqual (typeof (TypedRefTarget), TypedReference.GetTargetType (tr));
+               }
        }
 }
 
diff --git a/mcs/class/corlib/Test/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTest.cs b/mcs/class/corlib/Test/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTest.cs
new file mode 100644 (file)
index 0000000..2a6165a
--- /dev/null
@@ -0,0 +1,66 @@
+//
+// AsyncTaskMethodBuilderTest.cs
+//
+// Authors:
+//     Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright (C) 2014 Xamarin, Inc (http://www.xamarin.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.
+//
+
+#if NET_4_5
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using System.Runtime.CompilerServices;
+using System.Runtime.Remoting.Messaging;
+
+namespace MonoTests.System.Runtime.CompilerServices
+{
+       [TestFixture]
+       public class AsyncTaskMethodBuilderTest
+       {
+               [Test]
+               public void CallContextFlow ()
+               {
+                       CallContext.LogicalSetData ("name0", "0");
+
+                       Task.WhenAll (Work ("A"), Work ("B")).Wait ();
+                       Assert.IsNull (CallContext.LogicalGetData ("A"), "#A");
+                       Assert.IsNull (CallContext.LogicalGetData ("B"), "#B");
+               }
+
+               static async Task Work (string name)
+               {
+                       Assert.AreEqual ("0", CallContext.LogicalGetData ("name0"), "#1" + name);
+                       CallContext.LogicalSetData ("name", name);
+
+                       await Task.Delay (10);
+
+                       var found = CallContext.LogicalGetData ("name");
+                       Assert.AreEqual (name, found, "#2" + name);
+               }
+       }
+}
+
+#endif
\ No newline at end of file
index 472b71a2583246b4ccd6630fac59c9c4da6ec788..4f381c1c9e864e0abfc6590697aebdf3b9a93326 100644 (file)
@@ -115,6 +115,16 @@ namespace MonoTests.System.Threading.Tasks
                        });
                }
 
+               [Test]
+               public void ParallelForEachTestCaseWithIndex ()
+               {
+                       var list = new List<int> { 0, 1, 2, 3, 4 };
+
+                       Parallel.ForEach (list, (l, s, i) => {
+                               Assert.AreEqual (l, i, "#1");
+                       });
+               }
+
                class ValueAndSquare
                { 
                        public float Value { get; set; }
index 524988828b96e23defe7013539d02c1fbf604c0e..1ad12d0088032888f86984ef67bd974ffffe9995 100644 (file)
@@ -807,15 +807,20 @@ namespace MonoTests.System.Threading.Tasks
                                                        finished ++;
                                                        Monitor.Pulse (monitor);
                                                }
-                                               return r;
+                                               return r ? 1 : 10; //1 -> ok, 10 -> evt wait failed
                                        });
                                var cntd = new CountdownEvent (2);
                                var cntd2 = new CountdownEvent (2);
 
-                               bool r1 = false, r2 = false;
+                               int r1 = 0, r2 = 0;
                                ThreadPool.QueueUserWorkItem (delegate {
                                                cntd.Signal ();
-                                               r1 = t.Wait (1000) && t.Result;
+                                               if (!t.Wait (1000))
+                                                       r1 = 20; // 20 -> task wait failed
+                                               else if (t.Result != 1)
+                                                       r1 = 30 + t.Result; // 30 -> task result is bad
+                                               else
+                                                       r1 = 2; //2 -> ok
                                                cntd2.Signal ();
                                                lock (monitor) {
                                                        finished ++;
@@ -824,7 +829,13 @@ namespace MonoTests.System.Threading.Tasks
                                        });
                                ThreadPool.QueueUserWorkItem (delegate {
                                                cntd.Signal ();
-                                               r2 = t.Wait (1000) && t.Result;
+                                               if (!t.Wait (1000))
+                                                       r2 = 40; // 40 -> task wait failed
+                                               else if (t.Result != 1)
+                                                       r2 = 50 + t.Result; // 50 -> task result is bad
+                                               else
+                                                       r2 = 3; //3 -> ok
+
                                                cntd2.Signal ();
                                                lock (monitor) {
                                                        finished ++;
@@ -834,8 +845,8 @@ namespace MonoTests.System.Threading.Tasks
                                Assert.IsTrue (cntd.Wait (2000), "#1");
                                evt.Set ();
                                Assert.IsTrue (cntd2.Wait (2000), "#2");
-                               Assert.IsTrue (r1, "r1");
-                               Assert.IsTrue (r2, "r2");
+                               Assert.AreEqual (2, r1, "r1");
+                               Assert.AreEqual (3, r2, "r2");
 
                                // Wait for everything to finish to avoid overloading the tpool
                                lock (monitor) {
index 0694ef80b63ee7808bf39187837f2dcbd9c59f8f..ebb0433c2a217fb23dcc501ac31bf652c005682d 100644 (file)
@@ -230,7 +230,7 @@ namespace MonoTests.System.Threading
                                int count = 2;
                                SpinWait wait = new SpinWait ();
 
-                               ThreadPool.QueueUserWorkItem (_ => { mre.Set (); Interlocked.Decrement (ref count); });
+                               ThreadPool.QueueUserWorkItem (_ => { while (count > 1) wait.SpinOnce (); mre.Set (); Interlocked.Decrement (ref count); });
                                ThreadPool.QueueUserWorkItem (_ => { mre.Reset (); Interlocked.Decrement (ref count); });
 
                                while (count > 0)
index fbea6549dc9041e1a42486dc3ea3444f42719e81..a1cc1a008cbec9353c146b199a7d85475a671282 100644 (file)
@@ -3618,5 +3618,22 @@ public class ArrayTest
 
 #endif
 
+       [Test]
+       public void JaggedArrayCtor ()
+       {
+        var type = Type.GetType ("System.Object[][]");
+
+               ConstructorInfo ctor = null;
+        foreach (var c in type.GetConstructors ()) {
+                       if (c.GetParameters ().Length == 2)
+                               ctor = c;
+               }
+               Assert.IsNotNull (ctor);
+               var arr = (object[])ctor.Invoke (new object [] { 4, 10 });
+               for (int i = 0; i < 4; ++i) {
+                       Assert.IsNotNull (arr [i]);
+                       Assert.AreEqual (10, ((object[])arr [i]).Length);
+               }
+       }
 }
 }
diff --git a/mcs/class/corlib/basic_corlib.dll.sources b/mcs/class/corlib/basic_corlib.dll.sources
new file mode 100644 (file)
index 0000000..5268a3a
--- /dev/null
@@ -0,0 +1,1677 @@
+Assembly/AssemblyInfo.cs
+../../build/common/Consts.cs
+../../build/common/Locale.cs
+Microsoft.Win32/IRegistryApi.cs
+Microsoft.Win32/RegistryKey.cs
+Microsoft.Win32/RegistryKeyPermissionCheck.cs
+Microsoft.Win32/Registry.cs
+Microsoft.Win32/RegistryHive.cs
+Microsoft.Win32/RegistryOptions.cs
+Microsoft.Win32/RegistryValueKind.cs
+Microsoft.Win32/RegistryValueOptions.cs
+Microsoft.Win32/RegistryView.cs
+Microsoft.Win32/UnixRegistryApi.cs
+Microsoft.Win32/Win32RegistryApi.cs
+Microsoft.Win32/Win32ResultCode.cs
+Microsoft.Win32.SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs
+Microsoft.Win32.SafeHandles/CriticalHandleMinusOneIsInvalid.cs
+Microsoft.Win32.SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
+Microsoft.Win32.SafeHandles/SafeHandleMinusOneIsInvalid.cs
+Microsoft.Win32.SafeHandles/SafeFileHandle.cs
+Microsoft.Win32.SafeHandles/SafeRegistryHandle.cs
+Microsoft.Win32.SafeHandles/SafeWaitHandle.cs
+Mono.Globalization.Unicode/CodePointIndexer.cs
+Mono.Globalization.Unicode/MSCompatUnicodeTable.cs
+Mono.Globalization.Unicode/MSCompatUnicodeTableUtil.cs
+Mono.Globalization.Unicode/SimpleCollator.cs
+Mono.Globalization.Unicode/SortKey.cs
+Mono.Globalization.Unicode/SortKeyBuffer.cs
+Mono.Globalization.Unicode/Normalization.cs
+Mono.Globalization.Unicode/NormalizationTableUtil.cs
+Mono/Runtime.cs
+Mono/DataConverter.cs
+Mono.Interop/ComInteropProxy.cs
+Mono.Interop/IDispatch.cs
+Mono.Interop/IUnknown.cs
+../Mono.Security/Mono.Math/BigInteger.cs
+../Mono.Security/Mono.Math.Prime/ConfidenceFactor.cs
+../Mono.Security/Mono.Math.Prime/PrimalityTests.cs
+../Mono.Security/Mono.Math.Prime.Generator/NextPrimeFinder.cs
+../Mono.Security/Mono.Math.Prime.Generator/PrimeGeneratorBase.cs
+../Mono.Security/Mono.Math.Prime.Generator/SequentialSearchPrimeGeneratorBase.cs
+../Mono.Security/Mono.Security/ASN1.cs
+../Mono.Security/Mono.Security/ASN1Convert.cs
+../Mono.Security/Mono.Security/BitConverterLE.cs
+../Mono.Security/Mono.Security/PKCS7.cs
+../Mono.Security/Mono.Security/StrongName.cs
+Mono.Security/StrongNameManager.cs
+Mono.Security/Uri.cs
+../Mono.Security/Mono.Security.Authenticode/AuthenticodeBase.cs
+../Mono.Security/Mono.Security.Authenticode/AuthenticodeDeformatter.cs
+../Mono.Security/Mono.Security.Cryptography/ARC4Managed.cs
+../Mono.Security/Mono.Security.Cryptography/CryptoConvert.cs
+../Mono.Security/Mono.Security.Cryptography/CryptoTools.cs
+Mono.Security.Cryptography/DSAManaged.cs
+Mono.Security.Cryptography/HMACAlgorithm.cs
+../Mono.Security/Mono.Security.Cryptography/KeyPairPersistence.cs
+Mono.Security.Cryptography/MACAlgorithm.cs
+../Mono.Security/Mono.Security.Cryptography/MD2.cs
+../Mono.Security/Mono.Security.Cryptography/MD2Managed.cs
+../Mono.Security/Mono.Security.Cryptography/MD4.cs
+../Mono.Security/Mono.Security.Cryptography/MD4Managed.cs
+../Mono.Security/Mono.Security.Cryptography/PKCS1.cs
+../Mono.Security/Mono.Security.Cryptography/PKCS8.cs
+../Mono.Security/Mono.Security.Cryptography/RC4.cs
+../Mono.Security/Mono.Security.Cryptography/RSAManaged.cs
+../Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs
+../Mono.Security/Mono.Security.X509/PKCS12.cs
+../Mono.Security/Mono.Security.X509/X501Name.cs
+../Mono.Security/Mono.Security.X509/X509Certificate.cs
+../Mono.Security/Mono.Security.X509/X509CertificateCollection.cs
+../Mono.Security/Mono.Security.X509/X509Chain.cs
+../Mono.Security/Mono.Security.X509/X509ChainStatusFlags.cs
+../Mono.Security/Mono.Security.X509/X509CRL.cs
+../Mono.Security/Mono.Security.X509/X509Extension.cs
+../Mono.Security/Mono.Security.X509/X509Extensions.cs
+../Mono.Security/Mono.Security.X509/X509Store.cs
+../Mono.Security/Mono.Security.X509/X509Stores.cs
+../Mono.Security/Mono.Security.X509/X509StoreManager.cs
+../Mono.Security/Mono.Security.X509/X520Attributes.cs
+../Mono.Security/Mono.Security.X509.Extensions/BasicConstraintsExtension.cs
+../Mono.Security/Mono.Security.X509.Extensions/KeyUsageExtension.cs
+../Mono.Security/Mono.Security.X509.Extensions/SubjectKeyIdentifierExtension.cs
+Mono.Xml/SmallXmlParser.cs
+Mono.Xml/SecurityParser.cs
+System/AccessViolationException.cs
+System/ActivationContext.cs
+System/Activator.cs
+System/AndroidPlatform.cs
+System/AppDomain.cs
+System/AppDomainInitializer.cs
+System/AppDomainManager.cs
+System/AppDomainSetup.cs
+System/AppDomainUnloadedException.cs
+System/ApplicationException.cs
+System/ApplicationId.cs
+System/ApplicationIdentity.cs
+System/ArgIterator.cs
+System/ArgumentException.cs
+System/ArgumentNullException.cs
+System/ArgumentOutOfRangeException.cs
+System/ArithmeticException.cs
+System/Array.cs
+System/ArrayTypeMismatchException.cs
+System/AssemblyLoadEventArgs.cs
+System/AssemblyLoadEventHandler.cs
+System/AsyncCallback.cs
+System/Attribute.cs
+System/AttributeTargets.cs
+System/AttributeUsageAttribute.cs
+System/BadImageFormatException.cs
+System/Base64FormattingOptions.cs
+System/BitConverter.cs
+System/Boolean.cs
+System/Buffer.cs
+System/Byte.cs
+System/CannotUnloadAppDomainException.cs
+System/Char.cs
+System/CharEnumerator.cs
+System/CLSCompliantAttribute.cs
+System/CStreamReader.cs
+System/CStreamWriter.cs
+System/Console.cs
+System/Console.iOS.cs
+System/ConsoleCancelEventArgs.cs
+System/ConsoleCancelEventHandler.cs
+System/ConsoleColor.cs
+System/ConsoleDriver.cs
+System/ConsoleKey.cs
+System/ConsoleKeyInfo.cs
+System/ConsoleModifiers.cs
+System/ConsoleSpecialKey.cs
+System/ContextBoundObject.cs
+System/ContextMarshalException.cs
+System/ContextStaticAttribute.cs
+System/ControlCharacters.cs
+System/Convert.cs
+System/CrossAppDomainDelegate.cs
+System/DataMisalignedException.cs
+System/DateTime.cs
+System/DateTimeKind.cs
+System/DateTimeOffset.cs
+System/DateTimeUtils.cs
+System/DayOfWeek.cs
+System/DBNull.cs
+System/Decimal.cs
+System/Delegate.cs
+System/DelegateSerializationHolder.cs
+System/DivideByZeroException.cs
+System/DllNotFoundException.cs
+System/DomainManagerInitializationFlags.cs
+System/Double.cs
+System/DuplicateWaitObjectException.cs
+System/EmptyArray.cs
+System/EntryPointNotFoundException.cs
+System/Enum.cs
+System/Environment.cs
+System/EnvironmentVariableTarget.cs
+System/EventArgs.cs
+System/EventHandler.cs
+System/Exception.cs
+System/ExecutionEngineException.cs
+System/FieldAccessException.cs
+System/FirstChanceExceptionEventArgs.cs
+System/FlagsAttribute.cs
+System/FormatException.cs
+System/Funcs.cs
+System/GC.cs
+System/GCCollectionMode.cs
+System/GCNotificationStatus.cs
+System/Guid.cs
+System/IAppDomainSetup.cs
+System/IAsyncResult.cs
+System/IObservable.cs
+System/IObserver.cs
+System/ICloneable.cs
+System/IComparable.cs
+System/IEquatable.cs
+System/IConsoleDriver.cs
+System/IConvertible.cs
+System/ICustomFormatter.cs
+System/IDisposable.cs
+System/IFormatProvider.cs
+System/IFormattable.cs
+System/IndexOutOfRangeException.cs
+System/InsufficientExecutionStackException.cs
+System/InsufficientMemoryException.cs
+System/Int16.cs
+System/Int32.cs
+System/Int64.cs
+System/IntPtr.cs
+System/InvalidCastException.cs
+System/InvalidOperationException.cs
+System/InvalidProgramException.cs
+System/InvalidTimeZoneException.cs
+System/IProgress.cs
+System/IServiceProvider.cs
+System/KnownTerminals.cs
+System/Lazy.cs
+System/LoaderOptimization.cs
+System/LoaderOptimizationAttribute.cs
+System/LocalDataStoreSlot.cs
+System/MarshalByRefObject.cs
+System/Math.cs
+System/MemberAccessException.cs
+System/MethodAccessException.cs
+System/MidpointRounding.cs
+System/MissingFieldException.cs
+System/MissingMemberException.cs
+System/MissingMethodException.cs
+System/MonoAsyncCall.cs
+System/MonoCQItem.cs
+System/MonoCustomAttrs.cs
+System/MonoListItem.cs
+System/MonoType.cs
+System/MonoTouchAOTHelper.cs
+System/MTAThreadAttribute.cs
+System/MulticastDelegate.cs
+System/MulticastNotSupportedException.cs
+System/NonSerializedAttribute.cs
+System/NotFiniteNumberException.cs
+System/NotImplementedException.cs
+System/NotSupportedException.cs
+System/NullConsoleDriver.cs
+System/Nullable.cs
+System/NullReferenceException.cs
+System/NumberFormatter.cs
+System/Object.cs
+System/ObjectDisposedException.cs
+System/ObsoleteAttribute.cs
+System/OperatingSystem.cs
+System/OperationCanceledException.cs
+System/OutOfMemoryException.cs
+System/OverflowException.cs
+System/ParamArrayAttribute.cs
+System/PlatformID.cs
+System/PlatformNotSupportedException.cs
+System/Random.cs
+System/RankException.cs
+System/ResolveEventArgs.cs
+System/ResolveEventHandler.cs
+System/RuntimeArgumentHandle.cs
+System/RuntimeFieldHandle.cs
+System/RuntimeMethodHandle.cs
+System/RuntimeTypeHandle.cs
+System/ModuleHandle.cs
+System/SByte.cs
+System/SerializableAttribute.cs
+System/Single.cs
+System/StackOverflowException.cs
+System/STAThreadAttribute.cs
+System/String.cs
+System/StringSplitOptions.cs
+System/StringComparer.cs
+System/StringComparison.cs
+System/SystemException.cs
+System/TermInfoBooleans.cs
+System/TermInfoDriver.cs
+System/TermInfoNumbers.cs
+System/TermInfoReader.cs
+System/TermInfoStrings.cs
+System/ThreadStaticAttribute.cs
+System/TimeSpan.cs
+System/TimeZone.cs
+../System.Core/System/TimeZoneInfo.cs
+../System.Core/System/TimeZoneInfo.AdjustmentRule.cs
+../System.Core/System/TimeZoneInfo.Android.cs
+../System.Core/System/TimeZoneInfo.MonoTouch.cs
+../System.Core/System/TimeZoneInfo.Serialization.cs
+../System.Core/System/TimeZoneInfo.TransitionTime.cs
+System/TimeZoneNotFoundException.cs
+System/TimeoutException.cs
+../../build/common/MonoTODOAttribute.cs
+System/Type.cs
+System/TypeSpec.cs
+System/TypeAccessException.cs
+System/TypeCode.cs
+System/TypedReference.cs
+System/TypeInitializationException.cs
+System/TypeLoadException.cs
+System/TypeUnloadedException.cs
+System/Tuple.cs
+System/Tuples.cs
+System/UInt16.cs
+System/UInt32.cs
+System/UInt64.cs
+System/UIntPtr.cs
+System/UnauthorizedAccessException.cs
+System/UnhandledExceptionEventArgs.cs
+System/UnhandledExceptionEventHandler.cs
+System/UnitySerializationHolder.cs
+System/ValueType.cs
+System/Variant.cs
+System/Version.cs
+System/Void.cs
+System/WeakReference.cs
+System/WeakReference_T.cs
+System/WindowsConsoleDriver.cs
+System/_AppDomain.cs
+System/__ComObject.cs
+System.Collections/ArrayList.cs
+System.Collections/BitArray.cs
+System.Collections/CaseInsensitiveComparer.cs
+System.Collections/CaseInsensitiveHashCodeProvider.cs
+System.Collections/CollectionBase.cs
+System.Collections/Comparer.cs
+System.Collections/CollectionDebuggerView.cs
+System.Collections/DictionaryBase.cs
+System.Collections/DictionaryEntry.cs
+System.Collections/Hashtable.cs
+System.Collections/HashPrimeNumbers.cs
+System.Collections/ICollection.cs
+System.Collections/IComparer.cs
+System.Collections/IDictionary.cs
+System.Collections/IDictionaryEnumerator.cs
+System.Collections/IEnumerable.cs
+System.Collections/IEnumerator.cs
+System.Collections/IEqualityComparer.cs
+System.Collections/IHashCodeProvider.cs
+System.Collections/IList.cs
+System.Collections/IStructuralComparable.cs
+System.Collections/IStructuralEquatable.cs
+System.Collections/Queue.cs
+System.Collections/ReadOnlyCollectionBase.cs
+System.Collections/SortedList.cs
+System.Collections/Stack.cs
+System.Collections/StructuralComparisons.cs
+System.Configuration.Assemblies/AssemblyHash.cs
+System.Configuration.Assemblies/AssemblyHashAlgorithm.cs
+System.Configuration.Assemblies/AssemblyVersionCompatibility.cs
+System.Configuration.Assemblies/ProcessorID.cs
+System.Deployment.Internal/InternalActivationContextHelper.cs
+System.Deployment.Internal/InternalApplicationIdentityHelper.cs
+System.Diagnostics/ConditionalAttribute.cs
+System.Diagnostics/DebuggableAttribute.cs
+System.Diagnostics/Debugger.cs
+System.Diagnostics/DebuggerBrowsableState.cs
+System.Diagnostics/DebuggerBrowsableAttribute.cs
+System.Diagnostics/DebuggerDisplayAttribute.cs
+System.Diagnostics/DebuggerHiddenAttribute.cs
+System.Diagnostics/DebuggerNonUserCodeAttribute.cs
+System.Diagnostics/DebuggerStepThroughAttribute.cs
+System.Diagnostics/DebuggerStepperBoundaryAttribute.cs
+System.Diagnostics/DebuggerTypeProxyAttribute.cs
+System.Diagnostics/DebuggerVisualizerAttribute.cs
+System.Diagnostics/StackFrame.cs
+System.Diagnostics/StackTrace.cs
+System.Diagnostics.CodeAnalysis/SuppressMessageAttribute.cs
+System.Diagnostics.Contracts/Contract.cs
+System.Diagnostics.Contracts/ContractAbbreviatorAttribute.cs
+System.Diagnostics.Contracts/ContractArgumentValidatorAttribute.cs
+System.Diagnostics.Contracts/ContractClassAttribute.cs
+System.Diagnostics.Contracts/ContractClassForAttribute.cs
+System.Diagnostics.Contracts/ContractException.cs
+System.Diagnostics.Contracts/ContractFailedEventArgs.cs
+System.Diagnostics.Contracts/ContractFailureKind.cs
+System.Diagnostics.Contracts/ContractInvariantMethodAttribute.cs
+System.Diagnostics.Contracts/ContractOptionAttribute.cs
+System.Diagnostics.Contracts/ContractPublicPropertyNameAttribute.cs
+System.Diagnostics.Contracts/ContractReferenceAssemblyAttribute.cs
+System.Diagnostics.Contracts/ContractRuntimeIgnoredAttribute.cs
+System.Diagnostics.Contracts/ContractShouldAssertException.cs
+System.Diagnostics.Contracts/ContractVerificationAttribute.cs
+System.Diagnostics.Contracts/PureAttribute.cs
+System.Diagnostics.Contracts.Internal/ContractHelper.cs
+System.Diagnostics.Tracing/EventAttribute.cs
+System.Diagnostics.Tracing/EventCommand.cs
+System.Diagnostics.Tracing/EventKeywords.cs
+System.Diagnostics.Tracing/EventLevel.cs
+System.Diagnostics.Tracing/EventSource.cs
+System.Diagnostics.Tracing/EventSourceAttribute.cs
+System.Diagnostics.Tracing/EventCommandEventArgs.cs
+System.Diagnostics.Tracing/NonEventAttribute.cs
+System.Diagnostics.SymbolStore/ISymbolBinder.cs
+System.Diagnostics.SymbolStore/ISymbolBinder1.cs
+System.Diagnostics.SymbolStore/ISymbolDocument.cs
+System.Diagnostics.SymbolStore/ISymbolDocumentWriter.cs
+System.Diagnostics.SymbolStore/ISymbolMethod.cs
+System.Diagnostics.SymbolStore/ISymbolNamespace.cs
+System.Diagnostics.SymbolStore/ISymbolReader.cs
+System.Diagnostics.SymbolStore/ISymbolScope.cs
+System.Diagnostics.SymbolStore/ISymbolVariable.cs
+System.Diagnostics.SymbolStore/ISymbolWriter.cs
+System.Diagnostics.SymbolStore/SymAddressKind.cs
+System.Diagnostics.SymbolStore/SymbolToken.cs
+System.Diagnostics.SymbolStore/SymDocumentType.cs
+System.Diagnostics.SymbolStore/SymLanguageType.cs
+System.Diagnostics.SymbolStore/SymLanguageVendor.cs
+System.Globalization/Calendar.cs
+System.Globalization/CalendarAlgorithmType.cs
+System.Globalization/CalendarWeekRule.cs
+System.Globalization/CalendricalCalculations.cs
+System.Globalization/CharUnicodeInfo.cs
+System.Globalization/ChineseLunisolarCalendar.cs
+System.Globalization/CodePageDataItem.cs
+System.Globalization/CompareInfo.cs
+System.Globalization/CompareOptions.cs
+System.Globalization/CultureInfo.cs
+System.Globalization/CultureNotFoundException.cs
+System.Globalization/CultureTypes.cs
+System.Globalization/DateTimeFormatInfo.cs
+System.Globalization/DateTimeStyles.cs
+System.Globalization/DaylightTime.cs
+System.Globalization/DigitShapes.cs
+System.Globalization/EastAsianLunisolarCalendar.cs
+System.Globalization/GregorianCalendar.cs
+System.Globalization/GregorianCalendarTypes.cs
+System.Globalization/HebrewCalendar.cs
+System.Globalization/HijriCalendar.cs
+System.Globalization/IdnMapping.cs
+System.Globalization/JapaneseCalendar.cs
+System.Globalization/JapaneseLunisolarCalendar.cs
+System.Globalization/JulianCalendar.cs
+System.Globalization/KoreanCalendar.cs
+System.Globalization/KoreanLunisolarCalendar.cs
+System.Globalization/NumberFormatInfo.cs
+System.Globalization/NumberStyles.cs
+System.Globalization/PersianCalendar.cs
+System.Globalization/RegionInfo.cs
+System.Globalization/RegionInfo.MonoTouch.cs
+System.Globalization/SortVersion.cs
+System.Globalization/StringInfo.cs
+System.Globalization/TaiwanCalendar.cs
+System.Globalization/TaiwanLunisolarCalendar.cs
+System.Globalization/TextElementEnumerator.cs
+System.Globalization/TextInfo.cs
+System.Globalization/ThaiBuddhistCalendar.cs
+System.Globalization/TimeSpanStyles.cs
+System.Globalization/UmAlQuraCalendar.cs
+System.Globalization/UnicodeCategory.cs
+System.IO/BinaryReader.cs
+System.IO/BinaryWriter.cs
+System.IO/BufferedStream.cs
+System.IO/Directory.cs
+System.IO/DirectoryInfo.cs
+System.IO/DirectoryNotFoundException.cs
+System.IO/DriveInfo.cs
+System.IO/DriveNotFoundException.cs
+System.IO/DriveType.cs
+System.IO/EndOfStreamException.cs
+System.IO/File.cs
+System.IO/FileAccess.cs
+System.IO/FileAttributes.cs
+System.IO/FileInfo.cs
+System.IO/FileLoadException.cs
+System.IO/FileMode.cs
+System.IO/FileNotFoundException.cs
+System.IO/FileOptions.cs
+System.IO/FileShare.cs
+System.IO/FileStream.cs
+System.IO/FileStreamAsyncResult.cs
+System.IO/FileSystemInfo.cs
+System.IO/IOException.cs
+System.IO/LogcatTextWriter.cs
+System.IO/MemoryStream.cs
+System.IO/MonoIO.cs
+System.IO/MonoIOError.cs
+System.IO/MonoFileType.cs
+System.IO/MonoIOStat.cs
+System.IO/Path.cs
+System.IO/PathTooLongException.cs
+System.IO/SearchOption.cs
+System.IO/SearchPattern.cs
+System.IO/SeekOrigin.cs
+System.IO/Stream.cs
+System.IO/StreamReader.cs
+System.IO/StreamWriter.cs
+System.IO/StringReader.cs
+System.IO/StringWriter.cs
+System.IO/TextReader.cs
+System.IO/TextWriter.cs
+System.IO/UnexceptionalStreamReader.cs
+System.IO/UnexceptionalStreamWriter.cs
+System.IO/UnmanagedMemoryAccessor.cs
+System.IO/UnmanagedMemoryStream.cs
+System.IO.IsolatedStorage/INormalizeForIsolatedStorage.cs
+System.IO.IsolatedStorage/IsolatedStorage.cs
+System.IO.IsolatedStorage/IsolatedStorageException.cs
+System.IO.IsolatedStorage/IsolatedStorageFile.cs
+System.IO.IsolatedStorage/IsolatedStorageFileEnumerator.cs
+System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
+System.IO.IsolatedStorage/IsolatedStorageScope.cs
+System.IO.IsolatedStorage/IsolatedStorageSecurityOptions.cs
+System.IO.IsolatedStorage/IsolatedStorageSecurityState.cs
+System.Reflection/AmbiguousMatchException.cs
+System.Reflection/Assembly.cs
+System.Reflection/AssemblyAlgorithmIdAttribute.cs
+System.Reflection/AssemblyCompanyAttribute.cs
+System.Reflection/AssemblyConfigurationAttribute.cs
+System.Reflection/AssemblyContentType.cs
+System.Reflection/AssemblyCopyrightAttribute.cs
+System.Reflection/AssemblyCultureAttribute.cs
+System.Reflection/AssemblyDefaultAliasAttribute.cs
+System.Reflection/AssemblyDelaySignAttribute.cs
+System.Reflection/AssemblyDescriptionAttribute.cs
+System.Reflection/AssemblyFileVersionAttribute.cs
+System.Reflection/AssemblyFlagsAttribute.cs
+System.Reflection/AssemblyInformationalVersionAttribute.cs
+System.Reflection/AssemblyKeyFileAttribute.cs
+System.Reflection/AssemblyKeyNameAttribute.cs
+System.Reflection/AssemblyMetadataAttribute.cs
+System.Reflection/AssemblyName.cs
+System.Reflection/AssemblyNameFlags.cs
+System.Reflection/AssemblyNameProxy.cs
+System.Reflection/AssemblyProductAttribute.cs
+System.Reflection/AssemblySignatureKeyAttribute.cs
+System.Reflection/AssemblyTitleAttribute.cs
+System.Reflection/AssemblyTradeMarkAttribute.cs
+System.Reflection/AssemblyVersionAttribute.cs
+System.Reflection/Binder.cs
+System.Reflection/BindingFlags.cs
+System.Reflection/CallingConventions.cs
+System.Reflection/ConstructorInfo.cs
+System.Reflection/CustomAttributeData.cs
+System.Reflection/CustomAttributeExtensions.cs
+System.Reflection/CustomAttributeFormatException.cs
+System.Reflection/CustomAttributeNamedArgument.cs
+System.Reflection/CustomAttributeTypedArgument.cs
+System.Reflection/DefaultMemberAttribute.cs
+System.Reflection/EventAttributes.cs
+System.Reflection/EventInfo.cs
+System.Reflection/ExceptionHandlingClause.cs
+System.Reflection/ExceptionHandlingClauseOptions.cs
+System.Reflection/FieldAttributes.cs
+System.Reflection/FieldInfo.cs
+System.Reflection/GenericParameterAttributes.cs
+System.Reflection/ICustomAttributeProvider.cs
+System.Reflection/ImageFileMachine.cs
+System.Reflection/InterfaceMapping.cs
+System.Reflection/IntrospectionExtensions.cs
+System.Reflection/InvalidFilterCriteriaException.cs
+System.Reflection/IReflect.cs
+System.Reflection/IReflectableType.cs
+System.Reflection/LocalVariableInfo.cs
+System.Reflection/ManifestResourceInfo.cs
+System.Reflection/MemberFilter.cs
+System.Reflection/MemberInfo.cs
+System.Reflection/MemberInfoSerializationHolder.cs
+System.Reflection/MemberTypes.cs
+System.Reflection/MethodAttributes.cs
+System.Reflection/MethodBase.cs
+System.Reflection/MethodBody.cs
+System.Reflection/MethodImplAttributes.cs
+System.Reflection/MethodInfo.cs
+System.Reflection/Missing.cs
+System.Reflection/Module.cs
+System.Reflection/ModuleResolveEventHandler.cs
+System.Reflection/MonoAssembly.cs
+System.Reflection/MonoGenericClass.cs
+System.Reflection/MonoGenericMethod.cs
+System.Reflection/MonoEvent.cs
+System.Reflection/MonoField.cs
+System.Reflection/MonoMethod.cs
+System.Reflection/MonoModule.cs
+System.Reflection/MonoParameterInfo.cs
+System.Reflection/MonoProperty.cs
+System.Reflection/ObfuscateAssemblyAttribute.cs
+System.Reflection/ObfuscationAttribute.cs
+System.Reflection/ParameterAttributes.cs
+System.Reflection/ParameterInfo.cs
+System.Reflection/ParameterModifier.cs
+System.Reflection/Pointer.cs
+System.Reflection/PortableExecutableKinds.cs
+System.Reflection/ProcessorArchitecture.cs
+System.Reflection/PropertyAttributes.cs
+System.Reflection/PropertyInfo.cs
+System.Reflection/ReflectionContext.cs
+System.Reflection/ReflectionTypeLoadException.cs
+System.Reflection/ResourceAttributes.cs
+System.Reflection/ResourceLocation.cs
+System.Reflection/RuntimeReflectionExtensions.cs
+System.Reflection/StrongNameKeyPair.cs
+System.Reflection/TargetException.cs
+System.Reflection/TargetInvocationException.cs
+System.Reflection/TargetParameterCountException.cs
+System.Reflection/TypeAttributes.cs
+System.Reflection/TypeDelegator.cs
+System.Reflection/TypeFilter.cs
+System.Reflection/TypeInfo.cs
+System.Reflection.Emit/AssemblyBuilder.cs
+System.Reflection.Emit/AssemblyBuilderAccess.cs
+System.Reflection.Emit/ConstructorBuilder.cs
+System.Reflection.Emit/ConstructorOnTypeBuilderInst.cs
+System.Reflection.Emit/CustomAttributeBuilder.cs
+System.Reflection.Emit/DerivedTypes.cs
+System.Reflection.Emit/DynamicILInfo.cs
+System.Reflection.Emit/DynamicMethod.cs
+System.Reflection.Emit/EnumBuilder.cs
+System.Reflection.Emit/EventBuilder.cs
+System.Reflection.Emit/EventOnTypeBuilderInst.cs
+System.Reflection.Emit/EventToken.cs
+System.Reflection.Emit/FieldBuilder.cs
+System.Reflection.Emit/FieldOnTypeBuilderInst.cs
+System.Reflection.Emit/FieldToken.cs
+System.Reflection.Emit/FlowControl.cs
+System.Reflection.Emit/GenericTypeParameterBuilder.cs
+System.Reflection.Emit/ILGenerator.cs
+System.Reflection.Emit/Label.cs
+System.Reflection.Emit/LocalBuilder.cs
+System.Reflection.Emit/MethodBuilder.cs
+System.Reflection.Emit/MethodOnTypeBuilderInst.cs
+System.Reflection.Emit/MethodToken.cs
+System.Reflection.Emit/MethodRental.cs
+System.Reflection.Emit/ModuleBuilder.cs
+System.Reflection.Emit/MonoArrayMethod.cs
+System.Reflection.Emit/OpCodeNames.cs
+System.Reflection.Emit/OpCode.cs
+System.Reflection.Emit/OpCodes.cs
+System.Reflection.Emit/OpCodeType.cs
+System.Reflection.Emit/OperandType.cs
+System.Reflection.Emit/PackingSize.cs
+System.Reflection.Emit/ParameterBuilder.cs
+System.Reflection.Emit/ParameterToken.cs
+System.Reflection.Emit/PEFileKinds.cs
+System.Reflection.Emit/PropertyBuilder.cs
+System.Reflection.Emit/PropertyOnTypeBuilderInst.cs
+System.Reflection.Emit/PropertyToken.cs
+System.Reflection.Emit/SignatureHelper.cs
+System.Reflection.Emit/SignatureToken.cs
+System.Reflection.Emit/StackBehaviour.cs
+System.Reflection.Emit/StringToken.cs
+System.Reflection.Emit/TypeBuilder.cs
+System.Reflection.Emit/TypeToken.cs
+System.Reflection.Emit/UnmanagedMarshal.cs
+System.Resources/IResourceReader.cs
+System.Resources/IResourceWriter.cs
+System.Resources/MissingManifestResourceException.cs
+System.Resources/MissingSatelliteAssemblyException.cs
+System.Resources/NeutralResourcesLanguageAttribute.cs
+System.Resources/ResourceManager.cs
+System.Resources/ResourceReader.cs
+System.Resources/ResourceSet.cs
+System.Resources/ResourceWriter.cs
+System.Resources/RuntimeResourceSet.cs
+System.Resources/SatelliteContractVersionAttribute.cs
+System.Resources/UltimateResourceFallbackLocation.cs
+System.Resources/Win32Resources.cs
+System.Runtime/AssemblyTargetedPatchBandAttribute.cs
+System.Runtime/GCLargeObjectHeapCompactionMode.cs
+System.Runtime/GCLatencyMode.cs
+System.Runtime/GCSettings.cs
+System.Runtime/MemoryFailPoint.cs
+System.Runtime/TargetedPatchingOptOutAttribute.cs
+System.Runtime.CompilerServices/AccessedThroughPropertyAttribute.cs
+System.Runtime.CompilerServices/AsyncStateMachineAttribute.cs
+System.Runtime.CompilerServices/AsyncVoidMethodBuilder.cs
+System.Runtime.CompilerServices/AsyncTaskMethodBuilder.cs
+System.Runtime.CompilerServices/AsyncTaskMethodBuilder_T.cs
+System.Runtime.CompilerServices/ReferenceAssemblyAttribute.cs
+System.Runtime.CompilerServices/CallConvCdecl.cs
+System.Runtime.CompilerServices/CallConvFastcall.cs
+System.Runtime.CompilerServices/CallConvThiscall.cs
+System.Runtime.CompilerServices/CallConvStdcall.cs
+System.Runtime.CompilerServices/CallerFilePathAttribute.cs
+System.Runtime.CompilerServices/CallerLineNumberAttribute.cs
+System.Runtime.CompilerServices/CallerMemberNameAttribute.cs
+System.Runtime.CompilerServices/CompilationRelaxations.cs
+System.Runtime.CompilerServices/CompilationRelaxationsAttribute.cs
+System.Runtime.CompilerServices/CompilerGeneratedAttribute.cs
+System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.cs
+System.Runtime.CompilerServices/CompilerMarshalOverride.cs
+System.Runtime.CompilerServices/ConditionalWeakTable.cs
+System.Runtime.CompilerServices/ConfiguredTaskAwaitable.cs
+System.Runtime.CompilerServices/ConfiguredTaskAwaitable_T.cs
+System.Runtime.CompilerServices/ContractHelper.cs
+System.Runtime.CompilerServices/CustomConstantAttribute.cs
+System.Runtime.CompilerServices/DateTimeConstantAttribute.cs
+System.Runtime.CompilerServices/DecimalConstantAttribute.cs
+System.Runtime.CompilerServices/DefaultDependencyAttribute.cs
+System.Runtime.CompilerServices/DependencyAttribute.cs
+System.Runtime.CompilerServices/DiscardableAttribute.cs
+System.Runtime.CompilerServices/ExtensionAttribute.cs
+System.Runtime.CompilerServices/FixedAddressValueTypeAttribute.cs
+System.Runtime.CompilerServices/FixedBufferAttribute.cs
+System.Runtime.CompilerServices/HasCopySemanticsAttribute.cs
+System.Runtime.CompilerServices/IAsyncStateMachine.cs
+System.Runtime.CompilerServices/ICriticalNotifyCompletion.cs
+System.Runtime.CompilerServices/IDispatchConstantAttribute.cs
+System.Runtime.CompilerServices/IUnknownConstantAttribute.cs
+System.Runtime.CompilerServices/IndexerNameAttribute.cs
+System.Runtime.CompilerServices/INotifyCompletion.cs
+System.Runtime.CompilerServices/InternalsVisibleToAttribute.cs
+System.Runtime.CompilerServices/IsBoxed.cs
+System.Runtime.CompilerServices/IsByValue.cs
+System.Runtime.CompilerServices/IsConst.cs
+System.Runtime.CompilerServices/IsCopyConstructed.cs
+System.Runtime.CompilerServices/IsExplicitlyDereferenced.cs
+System.Runtime.CompilerServices/IsImplicitlyDereferenced.cs
+System.Runtime.CompilerServices/IsJitIntrinsic.cs
+System.Runtime.CompilerServices/IsLong.cs
+System.Runtime.CompilerServices/IsPinned.cs
+System.Runtime.CompilerServices/IsSignUnspecifiedByte.cs
+System.Runtime.CompilerServices/IsUdtReturn.cs
+System.Runtime.CompilerServices/IsVolatile.cs
+System.Runtime.CompilerServices/IteratorStateMachineAttribute.cs
+System.Runtime.CompilerServices/LoadHint.cs
+System.Runtime.CompilerServices/MethodCodeType.cs
+System.Runtime.CompilerServices/MethodImplAttribute.cs
+System.Runtime.CompilerServices/MethodImplOptions.cs
+System.Runtime.CompilerServices/NativeCppClassAttribute.cs
+System.Runtime.CompilerServices/RequiredAttributeAttribute.cs
+System.Runtime.CompilerServices/RuntimeCompatibilityAttribute.cs
+System.Runtime.CompilerServices/RuntimeHelpers.cs
+System.Runtime.CompilerServices/RuntimeWrappedException.cs
+System.Runtime.CompilerServices/SpecialNameAttribute.cs 
+System.Runtime.CompilerServices/ScopelessEnumAttribute.cs
+System.Runtime.CompilerServices/SuppressIldasmAttribute.cs
+System.Runtime.CompilerServices/StateMachineAttribute.cs
+System.Runtime.CompilerServices/StringFreezingAttribute.cs 
+System.Runtime.CompilerServices/UnsafeValueTypeAttribute.cs
+System.Runtime.CompilerServices/TaskAwaiter.cs
+System.Runtime.CompilerServices/TaskAwaiter_T.cs
+System.Runtime.CompilerServices/TypeForwardedFromAttribute.cs
+System.Runtime.CompilerServices/TypeForwardedToAttribute.cs
+System.Runtime.CompilerServices/YieldAwaitable.cs
+System.Runtime.ConstrainedExecution/CriticialFinalizerObject.cs
+System.Runtime.ConstrainedExecution/CER.cs
+System.Runtime.ConstrainedExecution/Consistency.cs
+System.Runtime.ConstrainedExecution/PrePrepareMethodAttribute.cs
+System.Runtime.ConstrainedExecution/ReliabilityContractAttribute.cs
+System.Runtime.ExceptionServices/ExceptionDispatchInfo.cs
+System.Runtime.ExceptionServices/FirstChanceExceptionEventArgs.cs
+System.Runtime.ExceptionServices/HandleProcessCorruptedStateExceptionsAttribute.cs
+System.Runtime.Hosting/ActivationArguments.cs
+System.Runtime.Hosting/ApplicationActivator.cs
+System.Runtime.InteropServices/_Activator.cs
+System.Runtime.InteropServices/_Assembly.cs
+System.Runtime.InteropServices/_AssemblyBuilder.cs
+System.Runtime.InteropServices/_AssemblyName.cs
+System.Runtime.InteropServices/_Attribute.cs
+System.Runtime.InteropServices/_ConstructorBuilder.cs
+System.Runtime.InteropServices/_ConstructorInfo.cs
+System.Runtime.InteropServices/_CustomAttributeBuilder.cs
+System.Runtime.InteropServices/_EnumBuilder.cs
+System.Runtime.InteropServices/_EventBuilder.cs
+System.Runtime.InteropServices/_EventInfo.cs
+System.Runtime.InteropServices/_Exception.cs
+System.Runtime.InteropServices/_FieldBuilder.cs
+System.Runtime.InteropServices/_FieldInfo.cs
+System.Runtime.InteropServices/_ILGenerator.cs
+System.Runtime.InteropServices/_LocalBuilder.cs
+System.Runtime.InteropServices/_MemberInfo.cs
+System.Runtime.InteropServices/_MethodBase.cs
+System.Runtime.InteropServices/_MethodBuilder.cs
+System.Runtime.InteropServices/_MethodInfo.cs
+System.Runtime.InteropServices/_MethodRental.cs
+System.Runtime.InteropServices/_Module.cs
+System.Runtime.InteropServices/_ModuleBuilder.cs
+System.Runtime.InteropServices/_ParameterBuilder.cs
+System.Runtime.InteropServices/_ParameterInfo.cs
+System.Runtime.InteropServices/_PropertyBuilder.cs
+System.Runtime.InteropServices/_PropertyInfo.cs
+System.Runtime.InteropServices/_SignatureHelper.cs
+System.Runtime.InteropServices/_Thread.cs
+System.Runtime.InteropServices/_Type.cs
+System.Runtime.InteropServices/_TypeBuilder.cs
+System.Runtime.InteropServices/AllowReversePInvokeCallsAttribute.cs
+System.Runtime.InteropServices/ArrayWithOffset.cs
+System.Runtime.InteropServices/AssemblyRegistrationFlags.cs
+System.Runtime.InteropServices/AutomationProxyAttribute.cs
+System.Runtime.InteropServices/BestFitMappingAttribute.cs
+System.Runtime.InteropServices/BIND_OPTS.cs
+System.Runtime.InteropServices/BINDPTR.cs
+System.Runtime.InteropServices/BStrWrapper.cs
+System.Runtime.InteropServices/CALLCONV.cs
+System.Runtime.InteropServices/CallingConvention.cs
+System.Runtime.InteropServices/CharSet.cs
+System.Runtime.InteropServices/ClassInterfaceAttribute.cs
+System.Runtime.InteropServices/ClassInterfaceType.cs
+System.Runtime.InteropServices/CoClassAttribute.cs
+System.Runtime.InteropServices/ComAliasNameAttribute.cs
+System.Runtime.InteropServices/ComCompatibleVersionAttribute.cs
+System.Runtime.InteropServices/ComConversionLossAttribute.cs
+System.Runtime.InteropServices/ComDefaultInterfaceAttribute.cs
+System.Runtime.InteropServices/COMException.cs
+System.Runtime.InteropServices/ComEventInterfaceAttribute.cs
+System.Runtime.InteropServices/ComImportAttribute.cs
+System.Runtime.InteropServices/ComInterfaceType.cs
+System.Runtime.InteropServices/ComMemberType.cs
+System.Runtime.InteropServices/ComRegisterFunctionAttribute.cs
+System.Runtime.InteropServices/ComSourceInterfacesAttribute.cs
+System.Runtime.InteropServices/ComUnregisterFunctionAttribute.cs
+System.Runtime.InteropServices/ComVisible.cs
+System.Runtime.InteropServices/CONNECTDATA.cs
+System.Runtime.InteropServices/CriticalHandle.cs
+System.Runtime.InteropServices/CurrencyWrapper.cs
+System.Runtime.InteropServices/DefaultCharSetAttribute.cs
+System.Runtime.InteropServices/DESCKIND.cs
+System.Runtime.InteropServices/DispatchWrapper.cs
+System.Runtime.InteropServices/DISPPARAMS.cs
+System.Runtime.InteropServices/DispIdAttribute.cs
+System.Runtime.InteropServices/DllImportAttribute.cs
+System.Runtime.InteropServices/ELEMDESC.cs
+System.Runtime.InteropServices/ErrorWrapper.cs
+System.Runtime.InteropServices/EXCEPINFO.cs
+System.Runtime.InteropServices/ExporterEventKind.cs
+System.Runtime.InteropServices/ExtensibleClassFactory.cs
+System.Runtime.InteropServices/ExternalException.cs
+System.Runtime.InteropServices/FieldOffsetAttribute.cs
+System.Runtime.InteropServices/FILETIME.cs
+System.Runtime.InteropServices/FUNCDESC.cs
+System.Runtime.InteropServices/FUNCFLAGS.cs
+System.Runtime.InteropServices/FUNCKIND.cs
+System.Runtime.InteropServices/GCHandle.cs
+System.Runtime.InteropServices/GCHandleType.cs
+System.Runtime.InteropServices/GuidAttribute.cs
+System.Runtime.InteropServices/HandleRef.cs
+System.Runtime.InteropServices/ICustomAdapter.cs
+System.Runtime.InteropServices/ICustomFactory.cs
+System.Runtime.InteropServices/ICustomMarshaler.cs
+System.Runtime.InteropServices/IDispatchImplAttribute.cs
+System.Runtime.InteropServices/IDispatchImplType.cs
+System.Runtime.InteropServices/IDLDESC.cs
+System.Runtime.InteropServices/IDLFLAG.cs
+System.Runtime.InteropServices/IErrorInfo.cs
+System.Runtime.InteropServices/IMPLTYPEFLAGS.cs
+System.Runtime.InteropServices/INVOKEKIND.cs
+System.Runtime.InteropServices/IRegistrationServices.cs
+System.Runtime.InteropServices/ITypeLibConverter.cs
+System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs
+System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs
+System.Runtime.InteropServices/ITypeLibImporterNotifySink.cs
+System.Runtime.InteropServices/ImportedFromTypeLibAttribute.cs
+System.Runtime.InteropServices/ImporterEventKind.cs
+System.Runtime.InteropServices/InAttribute.cs
+System.Runtime.InteropServices/InterfaceTypeAttribute.cs
+System.Runtime.InteropServices/InvalidComObjectException.cs
+System.Runtime.InteropServices/InvalidOleVariantTypeException.cs
+System.Runtime.InteropServices/LCIDConversionAttribute.cs
+System.Runtime.InteropServices/LIBFLAGS.cs
+System.Runtime.InteropServices/LayoutKind.cs
+System.Runtime.InteropServices/ManagedErrorInfo.cs
+System.Runtime.InteropServices/Marshal.cs
+System.Runtime.InteropServices/MarshalAsAttribute.cs
+System.Runtime.InteropServices/MarshalDirectiveException.cs
+System.Runtime.InteropServices/ObjectCreationDelegate.cs
+System.Runtime.InteropServices/OptionalAttribute.cs
+System.Runtime.InteropServices/OutAttribute.cs
+System.Runtime.InteropServices/PARAMDESC.cs
+System.Runtime.InteropServices/PARAMFLAG.cs
+System.Runtime.InteropServices/PreserveSigAttribute.cs
+System.Runtime.InteropServices/PrimaryInteropAssemblyAttribute.cs
+System.Runtime.InteropServices/RegistrationClassContext.cs
+System.Runtime.InteropServices/RegistrationConnectionType.cs
+System.Runtime.InteropServices/SEHException.cs
+System.Runtime.InteropServices/STATSTG.cs
+System.Runtime.InteropServices/ProgIdAttribute.cs
+System.Runtime.InteropServices/RegistrationServices.cs
+System.Runtime.InteropServices/RuntimeEnvironment.cs
+System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
+System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
+System.Runtime.InteropServices/SafeBuffer.cs
+System.Runtime.InteropServices/SafeHandle.cs
+System.Runtime.InteropServices/SetWin32ContextInIDispatchAttribute.cs
+System.Runtime.InteropServices/StructLayoutAttribute.cs
+System.Runtime.InteropServices/SYSKIND.cs
+System.Runtime.InteropServices/TYPEATTR.cs
+System.Runtime.InteropServices/TYPEDESC.cs
+System.Runtime.InteropServices/TYPEFLAGS.cs
+System.Runtime.InteropServices/TYPEKIND.cs
+System.Runtime.InteropServices/TYPELIBATTR.cs
+System.Runtime.InteropServices/TypeIdentifierAttribute.cs
+System.Runtime.InteropServices/TypeLibConverter.cs
+System.Runtime.InteropServices/TypeLibExporterFlags.cs
+System.Runtime.InteropServices/TypeLibFuncAttribute.cs
+System.Runtime.InteropServices/TypeLibFuncFlags.cs
+System.Runtime.InteropServices/TypeLibImportClassAttribute.cs
+System.Runtime.InteropServices/TypeLibImporterFlags.cs
+System.Runtime.InteropServices/TypeLibTypeAttribute.cs
+System.Runtime.InteropServices/TypeLibTypeFlags.cs
+System.Runtime.InteropServices/TypeLibVarAttribute.cs
+System.Runtime.InteropServices/TypeLibVarFlags.cs
+System.Runtime.InteropServices/TypeLibVersionAttribute.cs
+System.Runtime.InteropServices/UCOMIBindCtx.cs
+System.Runtime.InteropServices/UCOMIConnectionPoint.cs
+System.Runtime.InteropServices/UCOMIConnectionPointContainer.cs
+System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs
+System.Runtime.InteropServices/UCOMIEnumConnections.cs
+System.Runtime.InteropServices/UCOMIEnumMoniker.cs
+System.Runtime.InteropServices/UCOMIEnumString.cs
+System.Runtime.InteropServices/UCOMIEnumVARIANT.cs
+System.Runtime.InteropServices/UCOMIMoniker.cs
+System.Runtime.InteropServices/UCOMIPersistFile.cs
+System.Runtime.InteropServices/UCOMIRunningObjectTable.cs
+System.Runtime.InteropServices/UCOMIStream.cs
+System.Runtime.InteropServices/UCOMITypeComp.cs
+System.Runtime.InteropServices/UCOMITypeInfo.cs
+System.Runtime.InteropServices/UCOMITypeLib.cs
+System.Runtime.InteropServices/UnknownWrapper.cs
+System.Runtime.InteropServices/UnmanagedFunctionPointerAttribute.cs
+System.Runtime.InteropServices/UnmanagedType.cs
+System.Runtime.InteropServices/VARDESC.cs
+System.Runtime.InteropServices/VarEnum.cs
+System.Runtime.InteropServices/VARFLAGS.cs
+System.Runtime.InteropServices/VariantWrapper.cs
+System.Runtime.InteropServices.ComTypes/BINDPTR.cs
+System.Runtime.InteropServices.ComTypes/BIND_OPTS.cs
+System.Runtime.InteropServices.ComTypes/CALLCONV.cs
+System.Runtime.InteropServices.ComTypes/CONNECTDATA.cs
+System.Runtime.InteropServices.ComTypes/DESCKIND.cs
+System.Runtime.InteropServices.ComTypes/DISPPARAMS.cs
+System.Runtime.InteropServices.ComTypes/ELEMDESC.cs
+System.Runtime.InteropServices.ComTypes/EXCEPINFO.cs
+System.Runtime.InteropServices.ComTypes/FILETIME.cs
+System.Runtime.InteropServices.ComTypes/FUNCDESC.cs
+System.Runtime.InteropServices.ComTypes/FUNCFLAGS.cs
+System.Runtime.InteropServices.ComTypes/FUNCKIND.cs
+System.Runtime.InteropServices.ComTypes/IBindCtx.cs
+System.Runtime.InteropServices.ComTypes/IConnectionPoint.cs
+System.Runtime.InteropServices.ComTypes/IConnectionPointContainer.cs
+System.Runtime.InteropServices.ComTypes/IDLDESC.cs
+System.Runtime.InteropServices.ComTypes/IDLFLAG.cs
+System.Runtime.InteropServices.ComTypes/IEnumConnectionPoints.cs
+System.Runtime.InteropServices.ComTypes/IEnumConnections.cs
+System.Runtime.InteropServices.ComTypes/IEnumMoniker.cs
+System.Runtime.InteropServices.ComTypes/IEnumString.cs
+System.Runtime.InteropServices.ComTypes/IEnumVARIANT.cs
+System.Runtime.InteropServices.ComTypes/IMoniker.cs
+System.Runtime.InteropServices.ComTypes/IMPLTYPEFLAGS.cs
+System.Runtime.InteropServices.ComTypes/INVOKEKIND.cs
+System.Runtime.InteropServices.ComTypes/IPersistFile.cs
+System.Runtime.InteropServices.ComTypes/IRunningObjectTable.cs
+System.Runtime.InteropServices.ComTypes/IStream.cs
+System.Runtime.InteropServices.ComTypes/ITypeComp.cs
+System.Runtime.InteropServices.ComTypes/ITypeInfo.cs
+System.Runtime.InteropServices.ComTypes/ITypeInfo2.cs
+System.Runtime.InteropServices.ComTypes/ITypeLib.cs
+System.Runtime.InteropServices.ComTypes/ITypeLib2.cs
+System.Runtime.InteropServices.ComTypes/LIBFLAGS.cs
+System.Runtime.InteropServices.ComTypes/PARAMDESC.cs
+System.Runtime.InteropServices.ComTypes/PARAMFLAG.cs
+System.Runtime.InteropServices.ComTypes/STATSTG.cs
+System.Runtime.InteropServices.ComTypes/SYSKIND.cs
+System.Runtime.InteropServices.ComTypes/TYPEATTR.cs
+System.Runtime.InteropServices.ComTypes/TYPEDESC.cs
+System.Runtime.InteropServices.ComTypes/TYPEFLAGS.cs
+System.Runtime.InteropServices.ComTypes/TYPEKIND.cs
+System.Runtime.InteropServices.ComTypes/TYPELIBATTR.cs
+System.Runtime.InteropServices.ComTypes/VARDESC.cs
+System.Runtime.InteropServices.ComTypes/VARFLAGS.cs
+System.Runtime.InteropServices.ComTypes/VARKIND.cs
+System.Runtime.InteropServices.Expando/IExpando.cs
+System.Runtime.InteropServices.WindowsRuntime/DefaultInterfaceAttribute.cs
+System.Runtime.InteropServices.WindowsRuntime/DesignerNamespaceResolveEventArgs.cs
+System.Runtime.InteropServices.WindowsRuntime/EventRegistrationToken.cs
+System.Runtime.InteropServices.WindowsRuntime/EventRegistrationTokenTable.cs
+System.Runtime.InteropServices.WindowsRuntime/IActivationFactory.cs
+System.Runtime.InteropServices.WindowsRuntime/InterfaceImplementedInVersionAttribute.cs
+System.Runtime.InteropServices.WindowsRuntime/NamespaceResolveEventArgs.cs
+System.Runtime.InteropServices.WindowsRuntime/ReadOnlyArrayAttribute.cs
+System.Runtime.InteropServices.WindowsRuntime/ReturnValueNameAttribute.cs
+System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMarshal.cs
+System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMetadata.cs
+System.Runtime.InteropServices.WindowsRuntime/WriteOnlyArrayAttribute.cs
+System.Runtime.Remoting/ActivatedClientTypeEntry.cs
+System.Runtime.Remoting/ActivatedServiceTypeEntry.cs
+System.Runtime.Remoting/CustomErrorsModes.cs
+System.Runtime.Remoting/EnvoyInfo.cs
+System.Runtime.Remoting/IObjectHandle.cs
+System.Runtime.Remoting/IChannelInfo.cs
+System.Runtime.Remoting/Identity.cs
+System.Runtime.Remoting/InternalRemotingServices.cs
+System.Runtime.Remoting/IEnvoyInfo.cs
+System.Runtime.Remoting/IRemotingTypeInfo.cs
+System.Runtime.Remoting/ObjectHandle.cs
+System.Runtime.Remoting/ObjRef.cs
+System.Runtime.Remoting/RemotingConfiguration.cs
+System.Runtime.Remoting/RemotingException.cs
+System.Runtime.Remoting/RemotingTimeoutException.cs
+System.Runtime.Remoting/RemotingServices.cs
+System.Runtime.Remoting/ServerException.cs
+System.Runtime.Remoting/ServerIdentity.cs
+System.Runtime.Remoting/SoapServices.cs
+System.Runtime.Remoting/TypeEntry.cs
+System.Runtime.Remoting/TypeInfo.cs
+System.Runtime.Remoting/WellKnownObjectMode.cs
+System.Runtime.Remoting/WellKnownClientTypeEntry.cs
+System.Runtime.Remoting/WellKnownServiceTypeEntry.cs
+System.Runtime.Remoting.Activation/ActivationServices.cs
+System.Runtime.Remoting.Activation/ActivatorLevel.cs
+System.Runtime.Remoting.Activation/AppDomainLevelActivator.cs
+System.Runtime.Remoting.Activation/ConstructionLevelActivator.cs
+System.Runtime.Remoting.Activation/ContextLevelActivator.cs
+System.Runtime.Remoting.Activation/IActivator.cs
+System.Runtime.Remoting.Activation/IConstructionCallMessage.cs
+System.Runtime.Remoting.Activation/IConstructionReturnMessage.cs
+System.Runtime.Remoting.Activation/RemoteActivator.cs
+System.Runtime.Remoting.Activation/RemoteActivationAttribute.cs
+System.Runtime.Remoting.Activation/UrlAttribute.cs
+System.Runtime.Remoting.Channels/AggregateDictionary.cs
+System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.cs
+System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.cs
+System.Runtime.Remoting.Channels/BaseChannelWithProperties.cs
+System.Runtime.Remoting.Channels/ChannelDataStore.cs
+System.Runtime.Remoting.Channels/ChannelServices.cs
+System.Runtime.Remoting.Channels/ChannelSinkStackEntry.cs
+System.Runtime.Remoting.Channels/ClientChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IChannel.cs
+System.Runtime.Remoting.Channels/IChannelDataStore.cs
+System.Runtime.Remoting.Channels/IChannelReceiver.cs
+System.Runtime.Remoting.Channels/IChannelReceiverHook.cs
+System.Runtime.Remoting.Channels/IChannelSender.cs
+System.Runtime.Remoting.Channels/IChannelSinkBase.cs
+System.Runtime.Remoting.Channels/IClientChannelSink.cs
+System.Runtime.Remoting.Channels/IClientChannelSinkProvider.cs
+System.Runtime.Remoting.Channels/IClientChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IClientFormatterSink.cs
+System.Runtime.Remoting.Channels/IClientFormatterSinkProvider.cs
+System.Runtime.Remoting.Channels/IClientResponseChannelSinkStack.cs
+System.Runtime.Remoting.Channels/ISecurableChannel.cs
+System.Runtime.Remoting.Channels/IServerResponseChannelSinkStack.cs
+System.Runtime.Remoting.Channels/ServerDispatchSink.cs
+System.Runtime.Remoting.Channels/ServerDispatchSinkProvider.cs
+System.Runtime.Remoting.Channels/IServerChannelSink.cs
+System.Runtime.Remoting.Channels/IServerChannelSinkProvider.cs
+System.Runtime.Remoting.Channels/IServerChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IServerFormatterSinkProvider.cs
+System.Runtime.Remoting.Channels/ITransportHeaders.cs
+System.Runtime.Remoting.Channels/ServerChannelSinkStack.cs
+System.Runtime.Remoting.Channels/ServerProcessing.cs
+System.Runtime.Remoting.Channels/SinkProviderData.cs
+System.Runtime.Remoting.Channels/TransportHeaders.cs
+System.Runtime.Remoting.Channels/CrossAppDomainChannel.cs
+System.Runtime.Remoting.Contexts/Context.cs
+System.Runtime.Remoting.Contexts/ContextAttribute.cs
+System.Runtime.Remoting.Contexts/ContextProperty.cs
+System.Runtime.Remoting.Contexts/CrossContextChannel.cs
+System.Runtime.Remoting.Contexts/CrossContextDelegate.cs
+System.Runtime.Remoting.Contexts/IContextAttribute.cs
+System.Runtime.Remoting.Contexts/IContextProperty.cs
+System.Runtime.Remoting.Contexts/IContextPropertyActivator.cs
+System.Runtime.Remoting.Contexts/IContributeClientContextSink.cs
+System.Runtime.Remoting.Contexts/IContributeDynamicSink.cs
+System.Runtime.Remoting.Contexts/IContributeEnvoySink.cs
+System.Runtime.Remoting.Contexts/IContributeObjectSink.cs
+System.Runtime.Remoting.Contexts/IContributeServerContextSink.cs
+System.Runtime.Remoting.Contexts/IDynamicMessageSink.cs
+System.Runtime.Remoting.Contexts/IDynamicProperty.cs
+System.Runtime.Remoting.Contexts/SynchronizationAttribute.cs
+System.Runtime.Remoting.Lifetime/ClientSponsor.cs
+System.Runtime.Remoting.Lifetime/ILease.cs
+System.Runtime.Remoting.Lifetime/ISponsor.cs
+System.Runtime.Remoting.Lifetime/Lease.cs
+System.Runtime.Remoting.Lifetime/LeaseManager.cs
+System.Runtime.Remoting.Lifetime/LeaseSink.cs
+System.Runtime.Remoting.Lifetime/LeaseState.cs
+System.Runtime.Remoting.Lifetime/LifetimeServices.cs
+System.Runtime.Remoting.Messaging/ArgInfo.cs
+System.Runtime.Remoting.Messaging/AsyncResult.cs
+System.Runtime.Remoting.Messaging/CallContext.cs
+System.Runtime.Remoting.Messaging/ClientContextTerminatorSink.cs
+System.Runtime.Remoting.Messaging/ConstructionCall.cs
+System.Runtime.Remoting.Messaging/ConstructionCallDictionary.cs
+System.Runtime.Remoting.Messaging/ConstructionResponse.cs
+System.Runtime.Remoting.Messaging/EnvoyTerminatorSink.cs
+System.Runtime.Remoting.Messaging/Header.cs
+System.Runtime.Remoting.Messaging/HeaderHandler.cs
+System.Runtime.Remoting.Messaging/ErrorMessage.cs
+System.Runtime.Remoting.Messaging/IInternalMessage.cs
+System.Runtime.Remoting.Messaging/IMessage.cs
+System.Runtime.Remoting.Messaging/IMessageCtrl.cs
+System.Runtime.Remoting.Messaging/IMessageSink.cs
+System.Runtime.Remoting.Messaging/IMethodCallMessage.cs
+System.Runtime.Remoting.Messaging/IMethodMessage.cs
+System.Runtime.Remoting.Messaging/IMethodReturnMessage.cs
+System.Runtime.Remoting.Messaging/IRemotingFormatter.cs
+System.Runtime.Remoting.Messaging/InternalMessageWrapper.cs
+System.Runtime.Remoting.Messaging/ISerializationRootObject.cs
+System.Runtime.Remoting.Messaging/LogicalCallContext.cs
+System.Runtime.Remoting.Messaging/MessageSurrogateFilter.cs
+System.Runtime.Remoting.Messaging/MethodCall.cs
+System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
+System.Runtime.Remoting.Messaging/MethodResponse.cs
+System.Runtime.Remoting.Messaging/MethodCallDictionary.cs
+System.Runtime.Remoting.Messaging/MethodDictionary.cs
+System.Runtime.Remoting.Messaging/MethodReturnDictionary.cs
+System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
+System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
+System.Runtime.Remoting.Messaging/OneWayAttribute.cs
+System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs
+System.Runtime.Remoting.Messaging/RemotingSurrogate.cs
+System.Runtime.Remoting.Messaging/ReturnMessage.cs
+System.Runtime.Remoting.Messaging/ServerContextTerminatorSink.cs
+System.Runtime.Remoting.Messaging/ServerObjectTerminatorSink.cs
+System.Runtime.Remoting.Messaging/StackBuilderSink.cs
+System.Runtime.Remoting.Messaging/CADMessages.cs
+System.Runtime.Remoting.Metadata/SoapAttribute.cs
+System.Runtime.Remoting.Metadata/SoapFieldAttribute.cs
+System.Runtime.Remoting.Metadata/SoapMethodAttribute.cs
+System.Runtime.Remoting.Metadata/SoapOption.cs
+System.Runtime.Remoting.Metadata/SoapParameterAttribute.cs
+System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs
+System.Runtime.Remoting.Metadata/XmlFieldOrderOption.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/ISoapXsd.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapAnyUri.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapEntity.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapMonth.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNonNegativeInteger.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapToken.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapBase64Binary.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapHexBinary.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapMonthDay.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNonPositiveInteger.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapYear.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapDate.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapHelper.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapId.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapName.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNormalizedString.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapYearMonth.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapDateTime.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapIdref.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNcName.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNotation.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapDay.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapIdrefs.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNegativeInteger.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapPositiveInteger.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapDuration.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapInteger.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNmtoken.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapQName.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapEntities.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapLanguage.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapNmtokens.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapTime.cs
+System.Runtime.Remoting.Proxies/RealProxy.cs
+System.Runtime.Remoting.Proxies/RemotingProxy.cs
+System.Runtime.Remoting.Proxies/ProxyAttribute.cs
+System.Runtime.Remoting.Services/EnterpriseServicesHelper.cs
+System.Runtime.Remoting.Services/ITrackingHandler.cs
+System.Runtime.Remoting.Services/TrackingServices.cs
+System.Runtime.Serialization/Formatter.cs
+System.Runtime.Serialization/FormatterConverter.cs
+System.Runtime.Serialization/FormatterServices.cs
+System.Runtime.Serialization/IDeserializationCallback.cs
+System.Runtime.Serialization/IFormatter.cs
+System.Runtime.Serialization/IFormatterConverter.cs
+System.Runtime.Serialization/IObjectReference.cs
+System.Runtime.Serialization/ISafeSerializationData.cs
+System.Runtime.Serialization/ISerializable.cs
+System.Runtime.Serialization/ISerializationSurrogate.cs
+System.Runtime.Serialization/ISurrogateSelector.cs
+System.Runtime.Serialization/ObjectIDGenerator.cs
+System.Runtime.Serialization/ObjectManager.cs
+System.Runtime.Serialization/OnDeserializedAttribute.cs
+System.Runtime.Serialization/OnDeserializingAttribute.cs
+System.Runtime.Serialization/OnSerializedAttribute.cs
+System.Runtime.Serialization/OnSerializingAttribute.cs
+System.Runtime.Serialization/OptionalFieldAttribute.cs
+System.Runtime.Serialization/SafeSerializationEventArgs.cs
+System.Runtime.Serialization/SerializationBinder.cs
+System.Runtime.Serialization/SerializationCallbacks.cs
+System.Runtime.Serialization/SerializationEntry.cs
+System.Runtime.Serialization/SerializationException.cs
+System.Runtime.Serialization/SerializationInfo.cs
+System.Runtime.Serialization/SerializationInfoEnumerator.cs
+System.Runtime.Serialization/SerializationObjectManager.cs
+System.Runtime.Serialization/StreamingContext.cs
+System.Runtime.Serialization/StreamingContextStates.cs
+System.Runtime.Serialization/SurrogateSelector.cs
+System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
+System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.cs
+System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
+System.Runtime.Serialization.Formatters/IFieldInfo.cs
+System.Runtime.Serialization.Formatters/InternalArrayTypeE.cs
+System.Runtime.Serialization.Formatters/InternalElementTypeE.cs
+System.Runtime.Serialization.Formatters/InternalMemberTypeE.cs
+System.Runtime.Serialization.Formatters/InternalMemberValueE.cs
+System.Runtime.Serialization.Formatters/InternalNameSpaceE.cs
+System.Runtime.Serialization.Formatters/InternalObjectPositionE.cs
+System.Runtime.Serialization.Formatters/InternalObjectTypeE.cs
+System.Runtime.Serialization.Formatters/InternalParseStateE.cs
+System.Runtime.Serialization.Formatters/InternalParseTypeE.cs
+System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.cs
+System.Runtime.Serialization.Formatters/InternalRM.cs
+System.Runtime.Serialization.Formatters/InternalSerializerTypeE.cs
+System.Runtime.Serialization.Formatters/InternalST.cs
+System.Runtime.Serialization.Formatters/ISoapMessage.cs
+System.Runtime.Serialization.Formatters/ServerFault.cs
+System.Runtime.Serialization.Formatters/SoapFault.cs
+System.Runtime.Serialization.Formatters/SoapMessage.cs
+System.Runtime.Serialization.Formatters/TypeFilterLevel.cs
+System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
+System.Runtime.Serialization.Formatters.Binary/BinaryCommon.cs
+System.Runtime.Serialization.Formatters.Binary/CodeGenerator.cs
+System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
+System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
+System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs
+System.Runtime.Versioning/CompatibilitySwitch.cs
+System.Runtime.Versioning/ComponentGuaranteesAttribute.cs
+System.Runtime.Versioning/ComponentGuaranteesOptions.cs
+System.Runtime.Versioning/ResourceConsumptionAttribute.cs
+System.Runtime.Versioning/ResourceExposureAttribute.cs
+System.Runtime.Versioning/ResourceScope.cs
+System.Runtime.Versioning/TargetFrameworkAttribute.cs
+System.Runtime.Versioning/VersioningHelper.cs
+System.Security/AllowPartiallyTrustedCallersAttribute.cs
+System.Security/CodeAccessPermission.cs
+System.Security/HostProtectionException.cs
+System.Security/HostSecurityManager.cs
+System.Security/HostSecurityManagerFlags.cs
+System.Security/IEvidenceFactory.cs
+System.Security/IPermission.cs
+System.Security/ISecurityEncodable.cs
+System.Security/ISecurityPolicyEncodable.cs
+System.Security/IStackWalk.cs
+System.Security/NamedPermissionSet.cs
+System.Security/PermissionBuilder.cs
+System.Security/PermissionSet.cs
+System.Security/PolicyLevelType.cs
+System.Security/SecureString.cs
+System.Security/SecurityContext.cs
+System.Security/SecurityContextSource.cs
+System.Security/SecurityCriticalAttribute.cs
+System.Security/SecurityCriticalScope.cs
+System.Security/SecurityElement.cs
+System.Security/SecurityFrame.cs
+System.Security/SecurityException.cs
+System.Security/SecurityManager.cs
+System.Security/SecurityManager_mobile.cs
+System.Security/SecurityRuleSet.cs
+System.Security/SecurityRulesAttribute.cs
+System.Security/SecuritySafeCriticalAttribute.cs
+System.Security/SecurityState.cs
+System.Security/SecurityTransparentAttribute.cs
+System.Security/SecurityTreatAsSafeAttribute.cs
+System.Security/SecurityZone.cs
+System.Security/SuppressUnmanagedCodeSecurityAttribute.cs
+System.Security/UnverifiableCodeAttribute.cs
+System.Security/VerificationException.cs
+System.Security/XmlSyntaxException.cs
+System.Security.AccessControl/AccessControlActions.cs
+System.Security.AccessControl/AccessControlModification.cs
+System.Security.AccessControl/AccessControlSections.cs
+System.Security.AccessControl/AccessControlType.cs
+System.Security.AccessControl/AccessRule.cs
+System.Security.AccessControl/AccessRule_T.cs
+System.Security.AccessControl/AceEnumerator.cs
+System.Security.AccessControl/AceFlags.cs
+System.Security.AccessControl/AceQualifier.cs
+System.Security.AccessControl/AceType.cs
+System.Security.AccessControl/AuditFlags.cs
+System.Security.AccessControl/AuditRule.cs
+System.Security.AccessControl/AuditRule_T.cs
+System.Security.AccessControl/AuthorizationRule.cs
+System.Security.AccessControl/AuthorizationRuleCollection.cs
+System.Security.AccessControl/CommonAce.cs
+System.Security.AccessControl/CommonAcl.cs
+System.Security.AccessControl/CommonObjectSecurity.cs
+System.Security.AccessControl/CommonSecurityDescriptor.cs
+System.Security.AccessControl/CompoundAce.cs
+System.Security.AccessControl/CompoundAceType.cs
+System.Security.AccessControl/ControlFlags.cs
+System.Security.AccessControl/CryptoKeyAccessRule.cs
+System.Security.AccessControl/CryptoKeyAuditRule.cs
+System.Security.AccessControl/CryptoKeyRights.cs
+System.Security.AccessControl/CryptoKeySecurity.cs
+System.Security.AccessControl/CustomAce.cs
+System.Security.AccessControl/DirectoryObjectSecurity.cs
+System.Security.AccessControl/DirectorySecurity.cs
+System.Security.AccessControl/DiscretionaryAcl.cs
+System.Security.AccessControl/EventWaitHandleAccessRule.cs
+System.Security.AccessControl/EventWaitHandleAuditRule.cs
+System.Security.AccessControl/EventWaitHandleRights.cs
+System.Security.AccessControl/EventWaitHandleSecurity.cs
+System.Security.AccessControl/FileSecurity.cs
+System.Security.AccessControl/FileSystemAccessRule.cs
+System.Security.AccessControl/FileSystemAuditRule.cs
+System.Security.AccessControl/FileSystemRights.cs
+System.Security.AccessControl/FileSystemSecurity.cs
+System.Security.AccessControl/GenericAce.cs
+System.Security.AccessControl/GenericAcl.cs
+System.Security.AccessControl/GenericSecurityDescriptor.cs
+System.Security.AccessControl/InheritanceFlags.cs
+System.Security.AccessControl/KnownAce.cs
+System.Security.AccessControl/MutexAccessRule.cs
+System.Security.AccessControl/MutexAuditRule.cs
+System.Security.AccessControl/MutexRights.cs
+System.Security.AccessControl/MutexSecurity.cs
+System.Security.AccessControl/NativeObjectSecurity.cs
+System.Security.AccessControl/ObjectAccessRule.cs
+System.Security.AccessControl/ObjectAce.cs
+System.Security.AccessControl/ObjectAceFlags.cs
+System.Security.AccessControl/ObjectAuditRule.cs
+System.Security.AccessControl/ObjectSecurity.cs
+System.Security.AccessControl/ObjectSecurity_T.cs
+System.Security.AccessControl/PrivilegeNotHeldException.cs
+System.Security.AccessControl/PropagationFlags.cs
+System.Security.AccessControl/QualifiedAce.cs
+System.Security.AccessControl/RawAcl.cs
+System.Security.AccessControl/RawSecurityDescriptor.cs
+System.Security.AccessControl/RegistryAccessRule.cs
+System.Security.AccessControl/RegistryAuditRule.cs
+System.Security.AccessControl/RegistryRights.cs
+System.Security.AccessControl/RegistrySecurity.cs
+System.Security.AccessControl/ResourceType.cs
+System.Security.AccessControl/SddlAccessRight.cs
+System.Security.AccessControl/SecurityInfos.cs
+System.Security.AccessControl/SystemAcl.cs
+../System.Core/System.Security.Cryptography/Aes.cs
+System.Security.Claims/Claim.cs
+System.Security.Claims/ClaimsIdentity.cs
+System.Security.Claims/ClaimsPrincipal.cs
+System.Security.Claims/ClaimTypes.cs
+System.Security.Claims/ClaimValueTypes.cs
+System.Security.Cryptography/AsymmetricAlgorithm.cs
+System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.cs
+System.Security.Cryptography/AsymmetricKeyExchangeFormatter.cs
+System.Security.Cryptography/AsymmetricSignatureDeformatter.cs
+System.Security.Cryptography/AsymmetricSignatureFormatter.cs
+System.Security.Cryptography/Base64Constants.cs
+System.Security.Cryptography/CipherMode.cs
+System.Security.Cryptography/CryptoAPITransform.cs
+System.Security.Cryptography/CryptoConfig.cs
+System.Security.Cryptography/CryptoConfig_2_1.cs
+System.Security.Cryptography/CryptoConfig.fullaot.cs
+System.Security.Cryptography/CryptographicException.cs
+System.Security.Cryptography/CryptographicUnexpectedOperationExcpetion.cs
+System.Security.Cryptography/CryptoStream.cs
+System.Security.Cryptography/CryptoStreamMode.cs
+System.Security.Cryptography/CspKeyContainerInfo.cs
+System.Security.Cryptography/CspParameters.cs
+System.Security.Cryptography/CspProviderFlags.cs
+System.Security.Cryptography/DeriveBytes.cs
+System.Security.Cryptography/DES.cs
+System.Security.Cryptography/DESCryptoServiceProvider.cs
+System.Security.Cryptography/DSA.cs
+System.Security.Cryptography/DSACryptoServiceProvider.cs
+System.Security.Cryptography/DSAParameters.cs
+System.Security.Cryptography/DSASignatureDeformatter.cs
+System.Security.Cryptography/DSASignatureFormatter.cs
+System.Security.Cryptography/FromBase64Transform.cs
+System.Security.Cryptography/HashAlgorithm.cs
+System.Security.Cryptography/HMAC.cs
+System.Security.Cryptography/HMACMD5.cs
+System.Security.Cryptography/HMACRIPEMD160.cs
+System.Security.Cryptography/HMACSHA1.cs
+System.Security.Cryptography/HMACSHA256.cs
+System.Security.Cryptography/HMACSHA384.cs
+System.Security.Cryptography/HMACSHA512.cs
+System.Security.Cryptography/ICryptoTransform.cs
+System.Security.Cryptography/ICspAsymmetricAlgorithm.cs
+System.Security.Cryptography/KeyedHashAlgorithm.cs
+System.Security.Cryptography/KeyNumber.cs
+System.Security.Cryptography/KeySizes.cs
+System.Security.Cryptography/MACTripleDES.cs
+System.Security.Cryptography/MaskGenerationMethod.cs
+System.Security.Cryptography/MD5.cs
+System.Security.Cryptography/MD5CryptoServiceProvider.cs
+System.Security.Cryptography/PaddingMode.cs
+System.Security.Cryptography/PasswordDeriveBytes.cs
+System.Security.Cryptography/PKCS1MaskGenerationMethod.cs
+System.Security.Cryptography/RandomNumberGenerator.cs
+System.Security.Cryptography/RC2.cs
+System.Security.Cryptography/RC2CryptoServiceProvider.cs
+System.Security.Cryptography/Rfc2898DeriveBytes.cs
+System.Security.Cryptography/Rijndael.cs
+System.Security.Cryptography/RijndaelManaged.cs
+System.Security.Cryptography/RijndaelManagedTransform.cs
+System.Security.Cryptography/RIPEMD160.cs
+System.Security.Cryptography/RIPEMD160Managed.cs
+System.Security.Cryptography/RNGCryptoServiceProvider.cs
+System.Security.Cryptography/RSA.cs
+System.Security.Cryptography/RSACryptoServiceProvider.cs
+System.Security.Cryptography/RSAOAEPKeyExchangeDeformatter.cs
+System.Security.Cryptography/RSAOAEPKeyExchangeFormatter.cs
+System.Security.Cryptography/RSAParameters.cs
+System.Security.Cryptography/RSAPKCS1KeyExchangeDeformatter.cs
+System.Security.Cryptography/RSAPKCS1KeyExchangeFormatter.cs
+System.Security.Cryptography/RSAPKCS1SignatureDeformatter.cs
+System.Security.Cryptography/RSAPKCS1SignatureFormatter.cs
+System.Security.Cryptography/SHA1.cs
+System.Security.Cryptography/SHA1CryptoServiceProvider.cs
+System.Security.Cryptography/SHA1Managed.cs
+System.Security.Cryptography/SHA256.cs
+System.Security.Cryptography/SHA256Managed.cs
+System.Security.Cryptography/SHA384.cs
+System.Security.Cryptography/SHA384Managed.cs
+System.Security.Cryptography/SHA512.cs
+System.Security.Cryptography/SHA512Managed.cs
+System.Security.Cryptography/SHAConstants.cs
+System.Security.Cryptography/SignatureDescription.cs
+System.Security.Cryptography/SymmetricAlgorithm.cs
+System.Security.Cryptography/ToBase64Transform.cs
+System.Security.Cryptography/TripleDES.cs
+System.Security.Cryptography/TripleDESCryptoServiceProvider.cs
+System.Security.Cryptography.X509Certificates/X509Certificate.cs
+System.Security.Cryptography.X509Certificates/X509Certificate20.cs
+System.Security.Cryptography.X509Certificates/X509ContentType.cs
+System.Security.Cryptography.X509Certificates/X509KeyStorageFlags.cs
+System.Security.Permissions/CodeAccessSecurityAttribute.cs
+System.Security.Permissions/EnvironmentPermission.cs
+System.Security.Permissions/EnvironmentPermissionAccess.cs
+System.Security.Permissions/EnvironmentPermissionAttribute.cs
+System.Security.Permissions/FileDialogPermission.cs 
+System.Security.Permissions/FileDialogPermissionAccess.cs
+System.Security.Permissions/FileDialogPermissionAttribute.cs
+System.Security.Permissions/FileIOPermission.cs
+System.Security.Permissions/FileIOPermissionAccess.cs
+System.Security.Permissions/FileIOPermissionAttribute.cs
+System.Security.Permissions/GacIdentityPermission.cs
+System.Security.Permissions/GacIdentityPermissionAttribute.cs
+System.Security.Permissions/HostProtectionAttribute.cs
+System.Security.Permissions/HostProtectionPermission.cs
+System.Security.Permissions/HostProtectionResource.cs
+System.Security.Permissions/IBuiltInPermission.cs
+System.Security.Permissions/IsolatedStorageContainment.cs
+System.Security.Permissions/IsolatedStorageFilePermission.cs 
+System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs
+System.Security.Permissions/IsolatedStoragePermission.cs
+System.Security.Permissions/IsolatedStoragePermissionAttribute.cs
+System.Security.Permissions/IUnrestrictedPermission.cs
+System.Security.Permissions/KeyContainerPermission.cs
+System.Security.Permissions/KeyContainerPermissionAccessEntry.cs
+System.Security.Permissions/KeyContainerPermissionAccessEntryCollection.cs
+System.Security.Permissions/KeyContainerPermissionAccessEntryEnumerator.cs
+System.Security.Permissions/KeyContainerPermissionAttribute.cs
+System.Security.Permissions/KeyContainerPermissionFlags.cs
+System.Security.Permissions/PermissionSetAttribute.cs
+System.Security.Permissions/PermissionState.cs
+System.Security.Permissions/PrincipalPermission.cs 
+System.Security.Permissions/PrincipalPermissionAttribute.cs
+System.Security.Permissions/PublisherIdentityPermission.cs
+System.Security.Permissions/PublisherIdentityPermissionAttribute.cs 
+System.Security.Permissions/ReflectionPermission.cs
+System.Security.Permissions/ReflectionPermissionAttribute.cs
+System.Security.Permissions/ReflectionPermissionFlag.cs
+System.Security.Permissions/RegistryPermission.cs
+System.Security.Permissions/RegistryPermissionAccess.cs
+System.Security.Permissions/RegistryPermissionAttribute.cs
+System.Security.Permissions/SecurityAction.cs
+System.Security.Permissions/SecurityAttribute.cs
+System.Security.Permissions/SecurityPermission.cs
+System.Security.Permissions/SecurityPermissionAttribute.cs
+System.Security.Permissions/SecurityPermissionFlag.cs
+System.Security.Permissions/SiteIdentityPermission.cs 
+System.Security.Permissions/SiteIdentityPermissionAttribute.cs
+System.Security.Permissions/StrongNameIdentityPermission.cs
+System.Security.Permissions/StrongNamePermissionAttribute.cs
+System.Security.Permissions/StrongNamePublicKeyBlob.cs
+System.Security.Permissions/UIPermission.cs 
+System.Security.Permissions/UIPermissionAttribute.cs
+System.Security.Permissions/UIPermissionClipboard.cs
+System.Security.Permissions/UIPermissionWindow.cs
+System.Security.Permissions/UrlIdentityPermission.cs
+System.Security.Permissions/UrlIdentityPermissionAttribute.cs
+System.Security.Permissions/ZoneIdentityPermission.cs
+System.Security.Permissions/ZoneIdentityPermissionAttribute.cs
+System.Security.Policy/AllMembershipCondition.cs
+System.Security.Policy/ApplicationDirectory.cs
+System.Security.Policy/ApplicationDirectoryMembershipCondition.cs
+System.Security.Policy/ApplicationSecurityInfo.cs
+System.Security.Policy/ApplicationSecurityManager.cs
+System.Security.Policy/ApplicationTrust.cs
+System.Security.Policy/ApplicationTrustCollection.cs
+System.Security.Policy/ApplicationTrustEnumerator.cs
+System.Security.Policy/ApplicationVersionMatch.cs
+System.Security.Policy/CodeConnectAccess.cs
+System.Security.Policy/CodeGroup.cs
+System.Security.Policy/DefaultPolicies.cs
+System.Security.Policy/Evidence.cs
+System.Security.Policy/EvidenceBase.cs
+System.Security.Policy/FileCodeGroup.cs
+System.Security.Policy/FirstMatchCodeGroup.cs
+System.Security.Policy/Gac.cs
+System.Security.Policy/GacMembershipCondition.cs
+System.Security.Policy/Hash.cs
+System.Security.Policy/HashMembershipCondition.cs
+System.Security.Policy/IApplicationTrustManager.cs
+System.Security.Policy/IBuiltInEvidence.cs
+System.Security.Policy/IConstantMembershipCondition.cs
+System.Security.Policy/IIdentityPermissionFactory.cs
+System.Security.Policy/IMembershipCondition.cs
+System.Security.Policy/MembershipConditionHelper.cs
+System.Security.Policy/MonoTrustManager.cs
+System.Security.Policy/NetCodeGroup.cs
+System.Security.Policy/PermissionRequestEvidence.cs
+System.Security.Policy/PolicyException.cs
+System.Security.Policy/PolicyLevel.cs
+System.Security.Policy/PolicyStatement.cs
+System.Security.Policy/PolicyStatementAttribute.cs
+System.Security.Policy/Publisher.cs
+System.Security.Policy/PublisherMembershipCondition.cs
+System.Security.Policy/Site.cs
+System.Security.Policy/SiteMembershipCondition.cs
+System.Security.Policy/StrongName.cs
+System.Security.Policy/StrongNameMembershipCondition.cs
+System.Security.Policy/TrustManagerContext.cs
+System.Security.Policy/TrustManagerUIContext.cs
+System.Security.Policy/UnionCodeGroup.cs
+System.Security.Policy/Url.cs
+System.Security.Policy/UrlMembershipCondition.cs
+System.Security.Policy/Zone.cs
+System.Security.Policy/ZoneMembershipCondition.cs
+System.Security.Principal/GenericIdentity.cs
+System.Security.Principal/GenericPrincipal.cs
+System.Security.Principal/IdentityNotMappedException.cs
+System.Security.Principal/IdentityReferenceCollection.cs
+System.Security.Principal/IdentityReference.cs
+System.Security.Principal/IIdentity.cs
+System.Security.Principal/IPrincipal.cs
+System.Security.Principal/NTAccount.cs
+System.Security.Principal/PrincipalPolicy.cs
+System.Security.Principal/SecurityIdentifier.cs
+System.Security.Principal/TokenAccessLevels.cs
+System.Security.Principal/TokenImpersonationLevel.cs
+System.Security.Principal/WellKnownAccount.cs
+System.Security.Principal/WellKnownSidType.cs
+System.Security.Principal/WindowsAccountType.cs
+System.Security.Principal/WindowsBuiltInRole.cs
+System.Security.Principal/WindowsIdentity.cs
+System.Security.Principal/WindowsImpersonationContext.cs
+System.Security.Principal/WindowsPrincipal.cs
+System.Text/ASCIIEncoding.cs
+System.Text/CodePageEncoding.cs
+System.Text/Decoder.cs
+System.Text/DecoderExceptionFallback.cs
+System.Text/DecoderExceptionFallbackBuffer.cs
+System.Text/DecoderFallback.cs
+System.Text/DecoderFallbackBuffer.cs
+System.Text/DecoderFallbackException.cs
+System.Text/DecoderReplacementFallback.cs
+System.Text/DecoderReplacementFallbackBuffer.cs
+System.Text/Encoder.cs
+System.Text/EncoderExceptionFallback.cs
+System.Text/EncoderExceptionFallbackBuffer.cs
+System.Text/EncoderFallback.cs
+System.Text/EncoderFallbackBuffer.cs
+System.Text/EncoderFallbackException.cs
+System.Text/EncoderReplacementFallback.cs
+System.Text/EncoderReplacementFallbackBuffer.cs
+System.Text/Encoding.cs
+System.Text/EncodingEncoder.cs
+System.Text/EncodingDecoder.cs
+System.Text/EncodingInfo.cs
+System.Text/Latin1Encoding.cs
+System.Text/MLangCodePageEncoding.cs
+System.Text/NormalizationForm.cs
+System.Text/StringBuilder.cs
+System.Text/SurrogateEncoder.cs
+System.Text/UnicodeEncoding.cs
+System.Text/UTF7Encoding.cs
+System.Text/UTF8Encoding.cs
+System.Text/UTF32Encoding.cs
+System.Threading/AbandonedMutexException.cs
+System.Threading/ApartmentState.cs
+System.Threading/AsyncFlowControl.cs
+System.Threading/AutoResetEvent.cs
+System.Threading/CompressedStack.cs
+System.Threading/ContextCallback.cs
+System.Threading/EventResetMode.cs
+System.Threading/EventWaitHandle.cs
+System.Threading/ExecutionContext.cs
+System.Threading/HostExecutionContext.cs
+System.Threading/HostExecutionContextManager.cs
+System.Threading/Interlocked.cs
+System.Threading/IOCompletionCallback.cs
+System.Threading/LazyThreadSafetyMode.cs
+System.Threading/LockCookie.cs
+System.Threading/LockQueue.cs
+System.Threading/LockRecursionException.cs
+System.Threading/ManualResetEvent.cs
+System.Threading/Monitor.cs
+System.Threading/Mutex.cs
+System.Threading/NamedDataSlot.cs
+System.Threading/NativeEventCalls.cs
+System.Threading/NativeOverlapped.cs
+System.Threading/Overlapped.cs
+System.Threading/ParameterizedThreadStart.cs
+System.Threading/ReaderWriterLock.cs
+System.Threading/RegisteredWaitHandle.cs
+System.Threading/SendOrPostCallback.cs
+../System/System.Threading/SemaphoreFullException.cs
+System.Threading/SynchronizationContext.cs
+System.Threading/SynchronizationLockException.cs
+System.Threading/Thread.cs
+System.Threading/ThreadAbortException.cs
+System.Threading/ThreadInterruptedException.cs
+System.Threading/ThreadPool.cs
+System.Threading/ThreadPriority.cs
+System.Threading/ThreadStart.cs
+System.Threading/ThreadStartException.cs
+System.Threading/ThreadState.cs
+System.Threading/ThreadStateException.cs
+System.Threading/Timeout.cs
+System.Threading/Timer.cs
+System.Threading/TimerCallback.cs
+System.Threading/Volatile.cs
+System.Threading/WaitCallback.cs
+System.Threading/WaitHandle.cs
+System.Threading/WaitHandleCannotBeOpenedException.cs
+System.Threading/WaitOrTimerCallback.cs
+System.Collections.Generic/CollectionDebuggerView.cs
+System.Collections.Generic/Dictionary.cs
+System.Collections.Generic/ICollection.cs
+System.Collections.Generic/IEnumerable.cs
+System.Collections.Generic/IEnumerator.cs
+System.Collections.Generic/IList.cs
+System.Collections.Generic/IComparer.cs
+System.Collections.Generic/IEqualityComparer.cs
+System.Collections.Generic/IDictionary.cs
+System.Collections.Generic/IReadOnlyCollection.cs
+System.Collections.Generic/IReadOnlyList.cs
+System.Collections.Generic/IReadOnlyDictionary.cs
+System.Collections.Generic/KeyValuePair.cs
+System.Collections.Generic/EqualityComparer.cs
+System.Collections.Generic/KeyNotFoundException.cs
+System.Collections.Generic/List.cs
+System.Collections.ObjectModel/Collection.cs
+System.Collections.ObjectModel/KeyedCollection.cs
+System.Collections.ObjectModel/ReadOnlyCollection.cs
+System.Collections.ObjectModel/ReadOnlyDictionary.cs
+System/Action.cs
+System/ArraySegment.cs
+System/Comparison.cs
+System/Converter.cs
+System/Predicate.cs
+System/Progress.cs
+System.Collections.Generic/Comparer.cs
+
+System.Threading.Tasks/ConcurrentExclusiveSchedulerPair.cs
+System.Threading.Tasks/DecoupledTask.cs
+System.Threading.Tasks/TaskFactory.cs
+System.Threading.Tasks/TaskFactory_T.cs
+System.Threading.Tasks/TaskStatus.cs
+System.Threading.Tasks/TaskCreationOptions.cs
+System.Threading.Tasks/CyclicDeque.cs
+System.Threading.Tasks/IConcurrentDeque.cs
+System.Threading.Tasks/PopResult.cs
+System.Threading.Tasks/TaskScheduler.cs
+System.Threading.Tasks/TaskContinuationOptions.cs
+System.Threading.Tasks/TaskCanceledException.cs
+System.Threading.Tasks/Task_T.cs
+System.Threading.Tasks/Task.cs
+System.Threading.Tasks/TaskCompletionQueue.cs
+System.Threading.Tasks/TaskExceptionSlot.cs
+System.Threading.Tasks/TaskActionInvoker.cs
+System.Threading.Tasks/TaskDebuggerView.cs
+System.Threading.Tasks/TaskCompletionSource.cs
+System.Threading.Tasks/TaskContinuation.cs
+System.Threading.Tasks/TaskSchedulerException.cs
+System.Threading.Tasks/TaskConstants.cs
+System.Threading.Tasks/TaskConstants_T.cs
+System.Collections.Concurrent/OrderablePartitioner.cs
+System.Collections.Concurrent/ConcurrentDictionary.cs
+System.Collections.Concurrent/Partitioner.cs
+System.Collections.Concurrent/ConcurrentQueue.cs
+System.Collections.Concurrent/EnumerablePartitionerOptions.cs
+System.Collections.Concurrent.Partitioners/ListPartitioner.cs
+System.Collections.Concurrent.Partitioners/EnumerablePartitioner.cs
+System.Collections.Concurrent.Partitioners/UserRangePartitioner.cs
+System.Collections.Concurrent/IProducerConsumerCollection.cs
+System.Collections.Concurrent/ConcurrentStack.cs
+System.Collections.Concurrent/SplitOrderedList.cs
+System.Collections.Concurrent/ConcurrentOrderedList.cs
+System.Threading/LazyInitializer.cs
+System.Threading/CountdownEvent.cs
+System.Threading/CancellationTokenSource.cs
+System.Threading/CancellationToken.cs
+System.Threading/SpinWait.cs
+System.Threading/SemaphoreSlim.cs
+System.Threading/CancellationTokenRegistration.cs
+System.Threading/SpinLock.cs
+System.Threading/AtomicBoolean.cs
+System.Threading/ManualResetEventSlim.cs
+System.Threading/ThreadLocal.cs
+System.Threading/Watch.cs
+System.Threading.Tasks/ParallelOptions.cs
+System.Threading.Tasks/Parallel.cs
+System.Threading.Tasks/ParallelLoopResult.cs
+System.Threading.Tasks/ParallelLoopState.cs
+System/AggregateException.cs
+System.Threading.Tasks/SimpleConcurrentBag.cs
+System.Threading.Tasks/SynchronizationContextScheduler.cs
+System.Threading.Tasks/UnobservedTaskExceptionEventArgs.cs
+System.Threading.Tasks/TpScheduler.cs
+System.Threading.Tasks/TaskExtensionsImpl.cs
diff --git a/mcs/class/corlib/corlib-net_2_0.csproj b/mcs/class/corlib/corlib-net_2_0.csproj
deleted file mode 100644 (file)
index 5dbd562..0000000
+++ /dev/null
@@ -1,1758 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>mscorlib</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\ConfidenceFactor.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\PrimalityTests.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math\BigInteger.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoTools.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\KeyPairPersistence.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS1.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS8.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RC4.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RSAManaged.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\SymmetricTransform.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\PKCS12.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X501Name.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Certificate.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CertificateCollection.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Chain.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509ChainStatusFlags.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CRL.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extensions.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Store.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509StoreManager.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Stores.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X520Attributes.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1Convert.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\BitConverterLE.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\PKCS7.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\StrongName.cs" />\r
-    <Compile Include="..\System.Core\System.Security.Cryptography\Aes.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.AdjustmentRule.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.Android.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.MonoTouch.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.TransitionTime.cs" />\r
-    <Compile Include="..\System\System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleZeroOrMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeFileHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeRegistryHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeWaitHandle.cs" />\r
-    <Compile Include="Microsoft.Win32\IRegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Registry.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryHive.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryKey.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryKeyPermissionCheck.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryOptions.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryValueKind.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryValueOptions.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryView.cs" />\r
-    <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\CodePointIndexer.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTable.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTableUtil.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\Normalization.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\NormalizationTableUtil.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SortKey.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SortKeyBuffer.cs" />\r
-    <Compile Include="Mono.Interop\ComInteropProxy.cs" />\r
-    <Compile Include="Mono.Interop\IDispatch.cs" />\r
-    <Compile Include="Mono.Interop\IUnknown.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\DSAManaged.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\HMACAlgorithm.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MACAlgorithm.cs" />\r
-    <Compile Include="Mono.Security\StrongNameManager.cs" />\r
-    <Compile Include="Mono.Security\Uri.cs" />\r
-    <Compile Include="Mono.Xml\SecurityParser.cs" />\r
-    <Compile Include="Mono.Xml\SmallXmlParser.cs" />\r
-    <Compile Include="Mono\DataConverter.cs" />\r
-    <Compile Include="Mono\Runtime.cs" />\r
-    <Compile Include="System.Collections.Concurrent.Partitioners\EnumerablePartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent.Partitioners\ListPartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent.Partitioners\UserRangePartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentDictionary.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentOrderedList.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentQueue.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentStack.cs" />\r
-    <Compile Include="System.Collections.Concurrent\EnumerablePartitionerOptions.cs" />\r
-    <Compile Include="System.Collections.Concurrent\IProducerConsumerCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\OrderablePartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent\Partitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="System.Collections.Generic\CollectionDebuggerView.cs" />\r
-    <Compile Include="System.Collections.Generic\Comparer.cs" />\r
-    <Compile Include="System.Collections.Generic\Dictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\EqualityComparer.cs" />\r
-    <Compile Include="System.Collections.Generic\ICollection.cs" />\r
-    <Compile Include="System.Collections.Generic\IComparer.cs" />\r
-    <Compile Include="System.Collections.Generic\IDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\IEnumerable.cs" />\r
-    <Compile Include="System.Collections.Generic\IEnumerator.cs" />\r
-    <Compile Include="System.Collections.Generic\IEqualityComparer.cs" />\r
-    <Compile Include="System.Collections.Generic\IList.cs" />\r
-    <Compile Include="System.Collections.Generic\IReadOnlyCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\IReadOnlyDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\IReadOnlyList.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyNotFoundException.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyValuePair.cs" />\r
-    <Compile Include="System.Collections.Generic\List.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\Collection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\KeyedCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyDictionary.cs" />\r
-    <Compile Include="System.Collections\ArrayList.cs" />\r
-    <Compile Include="System.Collections\BitArray.cs" />\r
-    <Compile Include="System.Collections\CaseInsensitiveComparer.cs" />\r
-    <Compile Include="System.Collections\CaseInsensitiveHashCodeProvider.cs" />\r
-    <Compile Include="System.Collections\CollectionBase.cs" />\r
-    <Compile Include="System.Collections\CollectionDebuggerView.cs" />\r
-    <Compile Include="System.Collections\Comparer.cs" />\r
-    <Compile Include="System.Collections\DictionaryBase.cs" />\r
-    <Compile Include="System.Collections\DictionaryEntry.cs" />\r
-    <Compile Include="System.Collections\HashPrimeNumbers.cs" />\r
-    <Compile Include="System.Collections\Hashtable.cs" />\r
-    <Compile Include="System.Collections\ICollection.cs" />\r
-    <Compile Include="System.Collections\IComparer.cs" />\r
-    <Compile Include="System.Collections\IDictionary.cs" />\r
-    <Compile Include="System.Collections\IDictionaryEnumerator.cs" />\r
-    <Compile Include="System.Collections\IEnumerable.cs" />\r
-    <Compile Include="System.Collections\IEnumerator.cs" />\r
-    <Compile Include="System.Collections\IEqualityComparer.cs" />\r
-    <Compile Include="System.Collections\IHashCodeProvider.cs" />\r
-    <Compile Include="System.Collections\IList.cs" />\r
-    <Compile Include="System.Collections\IStructuralComparable.cs" />\r
-    <Compile Include="System.Collections\IStructuralEquatable.cs" />\r
-    <Compile Include="System.Collections\Queue.cs" />\r
-    <Compile Include="System.Collections\ReadOnlyCollectionBase.cs" />\r
-    <Compile Include="System.Collections\SortedList.cs" />\r
-    <Compile Include="System.Collections\Stack.cs" />\r
-    <Compile Include="System.Collections\StructuralComparisons.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyHash.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyHashAlgorithm.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyVersionCompatibility.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\ProcessorID.cs" />\r
-    <Compile Include="System.Deployment.Internal\InternalActivationContextHelper.cs" />\r
-    <Compile Include="System.Deployment.Internal\InternalApplicationIdentityHelper.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\SuppressMessageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts.Internal\ContractHelper.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\Contract.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractAbbreviatorAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractArgumentValidatorAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractClassAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractClassForAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractException.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractFailedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractFailureKind.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractInvariantMethodAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractOptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractPublicPropertyNameAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractReferenceAssemblyAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractRuntimeIgnoredAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractShouldAssertException.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractVerificationAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\PureAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder1.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocument.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocumentWriter.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolMethod.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolNamespace.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolReader.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolScope.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolVariable.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolWriter.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymAddressKind.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymbolToken.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymDocumentType.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageType.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageVendor.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventKeywords.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventLevel.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventSource.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventSourceAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\NonEventAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\ConditionalAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggableAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\Debugger.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerBrowsableAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerBrowsableState.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerDisplayAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerHiddenAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerNonUserCodeAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerStepperBoundaryAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerStepThroughAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerTypeProxyAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerVisualizerAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\StackFrame.cs" />\r
-    <Compile Include="System.Diagnostics\StackTrace.cs" />\r
-    <Compile Include="System.Globalization\Calendar.cs" />\r
-    <Compile Include="System.Globalization\CalendarAlgorithmType.cs" />\r
-    <Compile Include="System.Globalization\CalendarWeekRule.cs" />\r
-    <Compile Include="System.Globalization\CalendricalCalculations.cs" />\r
-    <Compile Include="System.Globalization\CharUnicodeInfo.cs" />\r
-    <Compile Include="System.Globalization\ChineseLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\CodePageDataItem.cs" />\r
-    <Compile Include="System.Globalization\CompareInfo.cs" />\r
-    <Compile Include="System.Globalization\CompareOptions.cs" />\r
-    <Compile Include="System.Globalization\CultureInfo.cs" />\r
-    <Compile Include="System.Globalization\CultureNotFoundException.cs" />\r
-    <Compile Include="System.Globalization\CultureTypes.cs" />\r
-    <Compile Include="System.Globalization\DateTimeFormatInfo.cs" />\r
-    <Compile Include="System.Globalization\DateTimeStyles.cs" />\r
-    <Compile Include="System.Globalization\DaylightTime.cs" />\r
-    <Compile Include="System.Globalization\DigitShapes.cs" />\r
-    <Compile Include="System.Globalization\EastAsianLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\GregorianCalendar.cs" />\r
-    <Compile Include="System.Globalization\GregorianCalendarTypes.cs" />\r
-    <Compile Include="System.Globalization\HebrewCalendar.cs" />\r
-    <Compile Include="System.Globalization\HijriCalendar.cs" />\r
-    <Compile Include="System.Globalization\IdnMapping.cs" />\r
-    <Compile Include="System.Globalization\JapaneseCalendar.cs" />\r
-    <Compile Include="System.Globalization\JapaneseLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\JulianCalendar.cs" />\r
-    <Compile Include="System.Globalization\KoreanCalendar.cs" />\r
-    <Compile Include="System.Globalization\KoreanLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\NumberFormatInfo.cs" />\r
-    <Compile Include="System.Globalization\NumberStyles.cs" />\r
-    <Compile Include="System.Globalization\PersianCalendar.cs" />\r
-    <Compile Include="System.Globalization\RegionInfo.cs" />\r
-    <Compile Include="System.Globalization\RegionInfo.MonoTouch.cs" />\r
-    <Compile Include="System.Globalization\SortVersion.cs" />\r
-    <Compile Include="System.Globalization\StringInfo.cs" />\r
-    <Compile Include="System.Globalization\TaiwanCalendar.cs" />\r
-    <Compile Include="System.Globalization\TaiwanLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\TextElementEnumerator.cs" />\r
-    <Compile Include="System.Globalization\TextInfo.cs" />\r
-    <Compile Include="System.Globalization\ThaiBuddhistCalendar.cs" />\r
-    <Compile Include="System.Globalization\TimeSpanStyles.cs" />\r
-    <Compile Include="System.Globalization\UmAlQuraCalendar.cs" />\r
-    <Compile Include="System.Globalization\UnicodeCategory.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\INormalizeForIsolatedStorage.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorage.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageException.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFile.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileEnumerator.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileStream.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageScope.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityOptions.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityState.cs" />\r
-    <Compile Include="System.IO\BinaryReader.cs" />\r
-    <Compile Include="System.IO\BinaryWriter.cs" />\r
-    <Compile Include="System.IO\BufferedStream.cs" />\r
-    <Compile Include="System.IO\Directory.cs" />\r
-    <Compile Include="System.IO\DirectoryInfo.cs" />\r
-    <Compile Include="System.IO\DirectoryNotFoundException.cs" />\r
-    <Compile Include="System.IO\DriveInfo.cs" />\r
-    <Compile Include="System.IO\DriveNotFoundException.cs" />\r
-    <Compile Include="System.IO\DriveType.cs" />\r
-    <Compile Include="System.IO\EndOfStreamException.cs" />\r
-    <Compile Include="System.IO\File.cs" />\r
-    <Compile Include="System.IO\FileAccess.cs" />\r
-    <Compile Include="System.IO\FileAttributes.cs" />\r
-    <Compile Include="System.IO\FileInfo.cs" />\r
-    <Compile Include="System.IO\FileLoadException.cs" />\r
-    <Compile Include="System.IO\FileMode.cs" />\r
-    <Compile Include="System.IO\FileNotFoundException.cs" />\r
-    <Compile Include="System.IO\FileOptions.cs" />\r
-    <Compile Include="System.IO\FileShare.cs" />\r
-    <Compile Include="System.IO\FileStream.cs" />\r
-    <Compile Include="System.IO\FileStreamAsyncResult.cs" />\r
-    <Compile Include="System.IO\FileSystemInfo.cs" />\r
-    <Compile Include="System.IO\IOException.cs" />\r
-    <Compile Include="System.IO\LogcatTextWriter.cs" />\r
-    <Compile Include="System.IO\MemoryStream.cs" />\r
-    <Compile Include="System.IO\MonoFileType.cs" />\r
-    <Compile Include="System.IO\MonoIO.cs" />\r
-    <Compile Include="System.IO\MonoIOError.cs" />\r
-    <Compile Include="System.IO\MonoIOStat.cs" />\r
-    <Compile Include="System.IO\Path.cs" />\r
-    <Compile Include="System.IO\PathTooLongException.cs" />\r
-    <Compile Include="System.IO\SearchOption.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\SeekOrigin.cs" />\r
-    <Compile Include="System.IO\Stream.cs" />\r
-    <Compile Include="System.IO\StreamReader.cs" />\r
-    <Compile Include="System.IO\StreamWriter.cs" />\r
-    <Compile Include="System.IO\StringReader.cs" />\r
-    <Compile Include="System.IO\StringWriter.cs" />\r
-    <Compile Include="System.IO\TextReader.cs" />\r
-    <Compile Include="System.IO\TextWriter.cs" />\r
-    <Compile Include="System.IO\UnexceptionalStreamReader.cs" />\r
-    <Compile Include="System.IO\UnexceptionalStreamWriter.cs" />\r
-    <Compile Include="System.IO\UnmanagedMemoryAccessor.cs" />\r
-    <Compile Include="System.IO\UnmanagedMemoryStream.cs" />\r
-    <Compile Include="System.Reflection.Emit\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\AssemblyBuilderAccess.cs" />\r
-    <Compile Include="System.Reflection.Emit\ConstructorBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ConstructorOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\CustomAttributeBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\DerivedTypes.cs" />\r
-    <Compile Include="System.Reflection.Emit\DynamicILInfo.cs" />\r
-    <Compile Include="System.Reflection.Emit\DynamicMethod.cs" />\r
-    <Compile Include="System.Reflection.Emit\EnumBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\FlowControl.cs" />\r
-    <Compile Include="System.Reflection.Emit\GenericTypeParameterBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ILGenerator.cs" />\r
-    <Compile Include="System.Reflection.Emit\Label.cs" />\r
-    <Compile Include="System.Reflection.Emit\LocalBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodRental.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\ModuleBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MonoArrayMethod.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCode.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodeNames.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodes.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodeType.cs" />\r
-    <Compile Include="System.Reflection.Emit\OperandType.cs" />\r
-    <Compile Include="System.Reflection.Emit\PackingSize.cs" />\r
-    <Compile Include="System.Reflection.Emit\ParameterBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ParameterToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\PEFileKinds.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\SignatureHelper.cs" />\r
-    <Compile Include="System.Reflection.Emit\SignatureToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\StackBehaviour.cs" />\r
-    <Compile Include="System.Reflection.Emit\StringToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\TypeBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\TypeToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\UnmanagedMarshal.cs" />\r
-    <Compile Include="System.Reflection\AmbiguousMatchException.cs" />\r
-    <Compile Include="System.Reflection\Assembly.cs" />\r
-    <Compile Include="System.Reflection\AssemblyAlgorithmIdAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyCompanyAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyConfigurationAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyContentType.cs" />\r
-    <Compile Include="System.Reflection\AssemblyCopyrightAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyCultureAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyDefaultAliasAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyDelaySignAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyDescriptionAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyFileVersionAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyFlagsAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyInformationalVersionAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyKeyFileAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyKeyNameAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyMetadataAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyName.cs" />\r
-    <Compile Include="System.Reflection\AssemblyNameFlags.cs" />\r
-    <Compile Include="System.Reflection\AssemblyNameProxy.cs" />\r
-    <Compile Include="System.Reflection\AssemblyProductAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblySignatureKeyAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyTitleAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyTradeMarkAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyVersionAttribute.cs" />\r
-    <Compile Include="System.Reflection\Binder.cs" />\r
-    <Compile Include="System.Reflection\BindingFlags.cs" />\r
-    <Compile Include="System.Reflection\CallingConventions.cs" />\r
-    <Compile Include="System.Reflection\ConstructorInfo.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeData.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeExtensions.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeFormatException.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeNamedArgument.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeTypedArgument.cs" />\r
-    <Compile Include="System.Reflection\DefaultMemberAttribute.cs" />\r
-    <Compile Include="System.Reflection\EventAttributes.cs" />\r
-    <Compile Include="System.Reflection\EventInfo.cs" />\r
-    <Compile Include="System.Reflection\ExceptionHandlingClause.cs" />\r
-    <Compile Include="System.Reflection\ExceptionHandlingClauseOptions.cs" />\r
-    <Compile Include="System.Reflection\FieldAttributes.cs" />\r
-    <Compile Include="System.Reflection\FieldInfo.cs" />\r
-    <Compile Include="System.Reflection\GenericParameterAttributes.cs" />\r
-    <Compile Include="System.Reflection\ICustomAttributeProvider.cs" />\r
-    <Compile Include="System.Reflection\ImageFileMachine.cs" />\r
-    <Compile Include="System.Reflection\InterfaceMapping.cs" />\r
-    <Compile Include="System.Reflection\IntrospectionExtensions.cs" />\r
-    <Compile Include="System.Reflection\InvalidFilterCriteriaException.cs" />\r
-    <Compile Include="System.Reflection\IReflect.cs" />\r
-    <Compile Include="System.Reflection\IReflectableType.cs" />\r
-    <Compile Include="System.Reflection\LocalVariableInfo.cs" />\r
-    <Compile Include="System.Reflection\ManifestResourceInfo.cs" />\r
-    <Compile Include="System.Reflection\MemberFilter.cs" />\r
-    <Compile Include="System.Reflection\MemberInfo.cs" />\r
-    <Compile Include="System.Reflection\MemberInfoSerializationHolder.cs" />\r
-    <Compile Include="System.Reflection\MemberTypes.cs" />\r
-    <Compile Include="System.Reflection\MethodAttributes.cs" />\r
-    <Compile Include="System.Reflection\MethodBase.cs" />\r
-    <Compile Include="System.Reflection\MethodBody.cs" />\r
-    <Compile Include="System.Reflection\MethodImplAttributes.cs" />\r
-    <Compile Include="System.Reflection\MethodInfo.cs" />\r
-    <Compile Include="System.Reflection\Missing.cs" />\r
-    <Compile Include="System.Reflection\Module.cs" />\r
-    <Compile Include="System.Reflection\ModuleResolveEventHandler.cs" />\r
-    <Compile Include="System.Reflection\MonoAssembly.cs" />\r
-    <Compile Include="System.Reflection\MonoEvent.cs" />\r
-    <Compile Include="System.Reflection\MonoField.cs" />\r
-    <Compile Include="System.Reflection\MonoGenericClass.cs" />\r
-    <Compile Include="System.Reflection\MonoGenericMethod.cs" />\r
-    <Compile Include="System.Reflection\MonoMethod.cs" />\r
-    <Compile Include="System.Reflection\MonoModule.cs" />\r
-    <Compile Include="System.Reflection\MonoParameterInfo.cs" />\r
-    <Compile Include="System.Reflection\MonoProperty.cs" />\r
-    <Compile Include="System.Reflection\ObfuscateAssemblyAttribute.cs" />\r
-    <Compile Include="System.Reflection\ObfuscationAttribute.cs" />\r
-    <Compile Include="System.Reflection\ParameterAttributes.cs" />\r
-    <Compile Include="System.Reflection\ParameterInfo.cs" />\r
-    <Compile Include="System.Reflection\ParameterModifier.cs" />\r
-    <Compile Include="System.Reflection\Pointer.cs" />\r
-    <Compile Include="System.Reflection\PortableExecutableKinds.cs" />\r
-    <Compile Include="System.Reflection\ProcessorArchitecture.cs" />\r
-    <Compile Include="System.Reflection\PropertyAttributes.cs" />\r
-    <Compile Include="System.Reflection\PropertyInfo.cs" />\r
-    <Compile Include="System.Reflection\ReflectionContext.cs" />\r
-    <Compile Include="System.Reflection\ReflectionTypeLoadException.cs" />\r
-    <Compile Include="System.Reflection\ResourceAttributes.cs" />\r
-    <Compile Include="System.Reflection\ResourceLocation.cs" />\r
-    <Compile Include="System.Reflection\RuntimeReflectionExtensions.cs" />\r
-    <Compile Include="System.Reflection\StrongNameKeyPair.cs" />\r
-    <Compile Include="System.Reflection\TargetException.cs" />\r
-    <Compile Include="System.Reflection\TargetInvocationException.cs" />\r
-    <Compile Include="System.Reflection\TargetParameterCountException.cs" />\r
-    <Compile Include="System.Reflection\TypeAttributes.cs" />\r
-    <Compile Include="System.Reflection\TypeDelegator.cs" />\r
-    <Compile Include="System.Reflection\TypeFilter.cs" />\r
-    <Compile Include="System.Reflection\TypeInfo.cs" />\r
-    <Compile Include="System.Resources\IResourceReader.cs" />\r
-    <Compile Include="System.Resources\IResourceWriter.cs" />\r
-    <Compile Include="System.Resources\MissingManifestResourceException.cs" />\r
-    <Compile Include="System.Resources\MissingSatelliteAssemblyException.cs" />\r
-    <Compile Include="System.Resources\NeutralResourcesLanguageAttribute.cs" />\r
-    <Compile Include="System.Resources\ResourceManager.cs" />\r
-    <Compile Include="System.Resources\ResourceReader.cs" />\r
-    <Compile Include="System.Resources\ResourceSet.cs" />\r
-    <Compile Include="System.Resources\ResourceWriter.cs" />\r
-    <Compile Include="System.Resources\RuntimeResourceSet.cs" />\r
-    <Compile Include="System.Resources\SatelliteContractVersionAttribute.cs" />\r
-    <Compile Include="System.Resources\UltimateResourceFallbackLocation.cs" />\r
-    <Compile Include="System.Resources\Win32Resources.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AccessedThroughPropertyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncStateMachineAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder_T.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncVoidMethodBuilder.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvCdecl.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvFastcall.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvStdcall.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvThiscall.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallerFilePathAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallerLineNumberAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallerMemberNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxations.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxationsAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilerGeneratedAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilerGlobalScopeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilerMarshalOverride.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ConditionalWeakTable.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable_T.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ContractHelper.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CustomConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DateTimeConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DecimalConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DefaultDependencyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DependencyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DiscardableAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\FixedAddressValueTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\FixedBufferAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\HasCopySemanticsAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IAsyncStateMachine.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ICriticalNotifyCompletion.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IDispatchConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IndexerNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\INotifyCompletion.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\InternalsVisibleToAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsBoxed.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsByValue.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsConst.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsCopyConstructed.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsExplicitlyDereferenced.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsImplicitlyDereferenced.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsJitIntrinsic.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsLong.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsPinned.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsSignUnspecifiedByte.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsUdtReturn.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsVolatile.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IteratorStateMachineAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IUnknownConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\LoadHint.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\MethodCodeType.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\MethodImplAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\MethodImplOptions.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\NativeCppClassAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ReferenceAssemblyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RequiredAttributeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RuntimeCompatibilityAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RuntimeWrappedException.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ScopelessEnumAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\SpecialNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StateMachineAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StringFreezingAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\SuppressIldasmAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter_T.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedFromAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedToAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\UnsafeValueTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\YieldAwaitable.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\CER.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\Consistency.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\CriticialFinalizerObject.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\PrePrepareMethodAttribute.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\ReliabilityContractAttribute.cs" />\r
-    <Compile Include="System.Runtime.ExceptionServices\ExceptionDispatchInfo.cs" />\r
-    <Compile Include="System.Runtime.ExceptionServices\FirstChanceExceptionEventArgs.cs" />\r
-    <Compile Include="System.Runtime.ExceptionServices\HandleProcessCorruptedStateExceptionsAttribute.cs" />\r
-    <Compile Include="System.Runtime.Hosting\ActivationArguments.cs" />\r
-    <Compile Include="System.Runtime.Hosting\ApplicationActivator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BIND_OPTS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BINDPTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CALLCONV.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CONNECTDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DESCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DISPPARAMS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ELEMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\EXCEPINFO.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FILETIME.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IBindCtx.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPoint.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPointContainer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnectionPoints.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnections.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumString.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumVARIANT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMPLTYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\INVOKEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IPersistFile.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IRunningObjectTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IStream.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeComp.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo2.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib2.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\LIBFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATSTG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\SYSKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPELIBATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.Expando\IExpando.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DefaultInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DesignerNamespaceResolveEventArgs.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationToken.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationTokenTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\IActivationFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\InterfaceImplementedInVersionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\NamespaceResolveEventArgs.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReadOnlyArrayAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReturnValueNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMarshal.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMetadata.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WriteOnlyArrayAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Activator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Assembly.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_AssemblyBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_AssemblyName.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Attribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ConstructorBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ConstructorInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_CustomAttributeBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EnumBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EventBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EventInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Exception.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_FieldBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_FieldInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ILGenerator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_LocalBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MemberInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodBase.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodRental.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Module.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ModuleBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ParameterBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ParameterInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_PropertyBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_PropertyInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_SignatureHelper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Thread.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Type.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\AllowReversePInvokeCallsAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ArrayWithOffset.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\AssemblyRegistrationFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\AutomationProxyAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BestFitMappingAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BStrWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CALLCONV.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CallingConvention.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CharSet.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CoClassAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComAliasNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComCompatibleVersionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComConversionLossAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComDefaultInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComEventInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\COMException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComImportAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComInterfaceType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComMemberType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComRegisterFunctionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComSourceInterfacesAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComUnregisterFunctionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComVisible.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CONNECTDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CriticalHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CurrencyWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultCharSetAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DispatchWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DispIdAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DISPPARAMS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DllImportAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ELEMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ErrorWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\EXCEPINFO.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExporterEventKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExtensibleClassFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExternalException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FieldOffsetAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FILETIME.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GuidAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleRef.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomAdapter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomMarshaler.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ImportedFromTypeLibAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InterfaceTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InvalidComObjectException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InvalidOleVariantTypeException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\INVOKEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IRegistrationServices.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibImporterNotifySink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LayoutKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LCIDConversionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\Marshal.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\MarshalDirectiveException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ObjectCreationDelegate.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\OptionalAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\OutAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PARAMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PARAMFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PreserveSigAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PrimaryInteropAssemblyAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ProgIdAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RuntimeEnvironment.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeArrayRankMismatchException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeArrayTypeMismatchException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SEHException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SetWin32ContextInIDispatchAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StructLayoutAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeIdentifierAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPELIBATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibConverter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibExporterFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibImportClassAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibImporterFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibVersionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIBindCtx.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPoint.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPointContainer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnectionPoints.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnections.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumString.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumVARIANT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIPersistFile.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIRunningObjectTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIStream.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UnknownWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UnmanagedFunctionPointerAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UnmanagedType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VARDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VarEnum.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VARFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VariantWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ConstructionLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ContextLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionCallMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivationAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\UrlAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\AggregateDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelObjectWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelSinkWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelDataStore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelSinkStackEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ClientChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\CrossAppDomainChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelDataStore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiver.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiverHook.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSender.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSinkBase.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientResponseChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ISecurableChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerResponseChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ITransportHeaders.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerProcessing.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SinkProviderData.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\TransportHeaders.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\Context.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextDelegate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextPropertyActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeClientContextSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeDynamicSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeEnvoySink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeObjectSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeServerContextSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicMessageSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\SynchronizationAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ClientSponsor.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ILease.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ISponsor.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\Lease.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseManager.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseState.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LifetimeServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ArgInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\AsyncResult.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\CADMessages.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\CallContext.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ClientContextTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCall.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCallDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionResponse.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\EnvoyTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ErrorMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\Header.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\HeaderHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IInternalMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageCtrl.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodCallMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\InternalMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IRemotingFormatter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ISerializationRootObject.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\LogicalCallContext.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MessageSurrogateFilter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCall.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodResponse.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MonoMethodMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\OneWayAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogateSelector.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerContextTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerObjectTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\StackBuilderSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\ISoapXsd.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapAnyUri.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapBase64Binary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDateTime.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDay.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDuration.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntities.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntity.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapId.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdref.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdrefs.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapLanguage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonth.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonthDay.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNcName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNegativeInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtoken.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtokens.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonNegativeInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonPositiveInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNormalizedString.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNotation.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapPositiveInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapQName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapTime.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapToken.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYear.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYearMonth.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapFieldAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapMethodAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapOption.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapParameterAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\XmlFieldOrderOption.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\ProxyAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\RealProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\RemotingProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\EnterpriseServicesHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\ITrackingHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\TrackingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ActivatedClientTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ActivatedServiceTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\CustomErrorsModes.cs" />\r
-    <Compile Include="System.Runtime.Remoting\EnvoyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IChannelInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\Identity.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IEnvoyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\InternalRemotingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IObjectHandle.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IRemotingTypeInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ObjectHandle.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ObjRef.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingConfiguration.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingTimeoutException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ServerException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ServerIdentity.cs" />\r
-    <Compile Include="System.Runtime.Remoting\SoapServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\TypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\TypeInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownClientTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownObjectMode.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownServiceTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryCommon.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\CodeGenerator.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\MessageFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectWriter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterAssemblyStyle.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTopObjectStyle.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTypeStyle.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\IFieldInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalArrayTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalElementTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberValueE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalNameSpaceE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectPositionE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseStateE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalPrimitiveTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalRM.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalSerializerTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalST.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\ISoapMessage.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\ServerFault.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapFault.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapMessage.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\TypeFilterLevel.cs" />\r
-    <Compile Include="System.Runtime.Serialization\Formatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\FormatterConverter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\FormatterServices.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IDeserializationCallback.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IFormatterConverter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IObjectReference.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISafeSerializationData.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISerializable.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISerializationSurrogate.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISurrogateSelector.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ObjectIDGenerator.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ObjectManager.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnDeserializedAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnDeserializingAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnSerializedAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnSerializingAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OptionalFieldAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SafeSerializationEventArgs.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationBinder.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationCallbacks.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationEntry.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationException.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationInfoEnumerator.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationObjectManager.cs" />\r
-    <Compile Include="System.Runtime.Serialization\StreamingContext.cs" />\r
-    <Compile Include="System.Runtime.Serialization\StreamingContextStates.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SurrogateSelector.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesOptions.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ResourceConsumptionAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ResourceExposureAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ResourceScope.cs" />\r
-    <Compile Include="System.Runtime.Versioning\TargetFrameworkAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\VersioningHelper.cs" />\r
-    <Compile Include="System.Runtime\AssemblyTargetedPatchBandAttribute.cs" />\r
-    <Compile Include="System.Runtime\GCLargeObjectHeapCompactionMode.cs" />\r
-    <Compile Include="System.Runtime\GCLatencyMode.cs" />\r
-    <Compile Include="System.Runtime\GCSettings.cs" />\r
-    <Compile Include="System.Runtime\MemoryFailPoint.cs" />\r
-    <Compile Include="System.Runtime\TargetedPatchingOptOutAttribute.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlActions.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlModification.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlSections.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlType.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessRule_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceEnumerator.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceQualifier.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditRule_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuthorizationRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\CompoundAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\CompoundAceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\ControlFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\CustomAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\DirectoryObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\DirectorySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\DiscretionaryAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\InheritanceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\KnownAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\NativeObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectSecurity_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\PrivilegeNotHeldException.cs" />\r
-    <Compile Include="System.Security.AccessControl\PropagationFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\QualifiedAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\RawAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\RawSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistrySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ResourceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\SddlAccessRight.cs" />\r
-    <Compile Include="System.Security.AccessControl\SecurityInfos.cs" />\r
-    <Compile Include="System.Security.AccessControl\SystemAcl.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate20.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ContentType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyStorageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\Base64Constants.cs" />\r
-    <Compile Include="System.Security.Cryptography\CipherMode.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoAPITransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig.fullaot.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig_2_1.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicException.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicUnexpectedOperationExcpetion.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoStream.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoStreamMode.cs" />\r
-    <Compile Include="System.Security.Cryptography\CspKeyContainerInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography\CspParameters.cs" />\r
-    <Compile Include="System.Security.Cryptography\CspProviderFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\DeriveBytes.cs" />\r
-    <Compile Include="System.Security.Cryptography\DES.cs" />\r
-    <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSA.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSAParameters.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSASignatureDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSASignatureFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\FromBase64Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography\HashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMAC.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACMD5.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACRIPEMD160.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA1.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA256.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA384.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA512.cs" />\r
-    <Compile Include="System.Security.Cryptography\ICryptoTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\ICspAsymmetricAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\KeyedHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\KeyNumber.cs" />\r
-    <Compile Include="System.Security.Cryptography\KeySizes.cs" />\r
-    <Compile Include="System.Security.Cryptography\MACTripleDES.cs" />\r
-    <Compile Include="System.Security.Cryptography\MaskGenerationMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\PaddingMode.cs" />\r
-    <Compile Include="System.Security.Cryptography\PasswordDeriveBytes.cs" />\r
-    <Compile Include="System.Security.Cryptography\PKCS1MaskGenerationMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography\RandomNumberGenerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\RC2.cs" />\r
-    <Compile Include="System.Security.Cryptography\RC2CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\Rfc2898DeriveBytes.cs" />\r
-    <Compile Include="System.Security.Cryptography\Rijndael.cs" />\r
-    <Compile Include="System.Security.Cryptography\RijndaelManaged.cs" />\r
-    <Compile Include="System.Security.Cryptography\RijndaelManagedTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\RIPEMD160.cs" />\r
-    <Compile Include="System.Security.Cryptography\RIPEMD160Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSA.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSACryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAParameters.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHAConstants.cs" />\r
-    <Compile Include="System.Security.Cryptography\SignatureDescription.cs" />\r
-    <Compile Include="System.Security.Cryptography\SymmetricAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\ToBase64Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography\TripleDES.cs" />\r
-    <Compile Include="System.Security.Cryptography\TripleDESCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Permissions\CodeAccessSecurityAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\GacIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\GacIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionResource.cs" />\r
-    <Compile Include="System.Security.Permissions\IBuiltInPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageContainment.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\IUnrestrictedPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryCollection.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionFlags.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionSetAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionState.cs" />\r
-    <Compile Include="System.Security.Permissions\PrincipalPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\PrincipalPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermissionFlag.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityAction.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermissionFlag.cs" />\r
-    <Compile Include="System.Security.Permissions\SiteIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\SiteIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNameIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNamePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNamePublicKeyBlob.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionClipboard.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionWindow.cs" />\r
-    <Compile Include="System.Security.Permissions\UrlIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\UrlIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Policy\AllMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationDirectory.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationDirectoryMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationSecurityInfo.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationSecurityManager.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrust.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrustCollection.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrustEnumerator.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationVersionMatch.cs" />\r
-    <Compile Include="System.Security.Policy\CodeConnectAccess.cs" />\r
-    <Compile Include="System.Security.Policy\CodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\DefaultPolicies.cs" />\r
-    <Compile Include="System.Security.Policy\Evidence.cs" />\r
-    <Compile Include="System.Security.Policy\EvidenceBase.cs" />\r
-    <Compile Include="System.Security.Policy\FileCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\FirstMatchCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\Gac.cs" />\r
-    <Compile Include="System.Security.Policy\GacMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Hash.cs" />\r
-    <Compile Include="System.Security.Policy\HashMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\IApplicationTrustManager.cs" />\r
-    <Compile Include="System.Security.Policy\IBuiltInEvidence.cs" />\r
-    <Compile Include="System.Security.Policy\IConstantMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\IIdentityPermissionFactory.cs" />\r
-    <Compile Include="System.Security.Policy\IMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\MembershipConditionHelper.cs" />\r
-    <Compile Include="System.Security.Policy\MonoTrustManager.cs" />\r
-    <Compile Include="System.Security.Policy\NetCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\PermissionRequestEvidence.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyException.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyLevel.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyStatement.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyStatementAttribute.cs" />\r
-    <Compile Include="System.Security.Policy\Publisher.cs" />\r
-    <Compile Include="System.Security.Policy\PublisherMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Site.cs" />\r
-    <Compile Include="System.Security.Policy\SiteMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\StrongName.cs" />\r
-    <Compile Include="System.Security.Policy\StrongNameMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\TrustManagerContext.cs" />\r
-    <Compile Include="System.Security.Policy\TrustManagerUIContext.cs" />\r
-    <Compile Include="System.Security.Policy\UnionCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\Url.cs" />\r
-    <Compile Include="System.Security.Policy\UrlMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Zone.cs" />\r
-    <Compile Include="System.Security.Policy\ZoneMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Principal\GenericIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\GenericPrincipal.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityNotMappedException.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityReference.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityReferenceCollection.cs" />\r
-    <Compile Include="System.Security.Principal\IIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\IPrincipal.cs" />\r
-    <Compile Include="System.Security.Principal\NTAccount.cs" />\r
-    <Compile Include="System.Security.Principal\PrincipalPolicy.cs" />\r
-    <Compile Include="System.Security.Principal\SecurityIdentifier.cs" />\r
-    <Compile Include="System.Security.Principal\TokenAccessLevels.cs" />\r
-    <Compile Include="System.Security.Principal\TokenImpersonationLevel.cs" />\r
-    <Compile Include="System.Security.Principal\WellKnownAccount.cs" />\r
-    <Compile Include="System.Security.Principal\WellKnownSidType.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsAccountType.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsBuiltInRole.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsImpersonationContext.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsPrincipal.cs" />\r
-    <Compile Include="System.Security\AllowPartiallyTrustedCallersAttribute.cs" />\r
-    <Compile Include="System.Security\CodeAccessPermission.cs" />\r
-    <Compile Include="System.Security\HostProtectionException.cs" />\r
-    <Compile Include="System.Security\HostSecurityManager.cs" />\r
-    <Compile Include="System.Security\HostSecurityManagerFlags.cs" />\r
-    <Compile Include="System.Security\IEvidenceFactory.cs" />\r
-    <Compile Include="System.Security\IPermission.cs" />\r
-    <Compile Include="System.Security\ISecurityEncodable.cs" />\r
-    <Compile Include="System.Security\ISecurityPolicyEncodable.cs" />\r
-    <Compile Include="System.Security\IStackWalk.cs" />\r
-    <Compile Include="System.Security\NamedPermissionSet.cs" />\r
-    <Compile Include="System.Security\PermissionBuilder.cs" />\r
-    <Compile Include="System.Security\PermissionSet.cs" />\r
-    <Compile Include="System.Security\PolicyLevelType.cs" />\r
-    <Compile Include="System.Security\SecureString.cs" />\r
-    <Compile Include="System.Security\SecurityContext.cs" />\r
-    <Compile Include="System.Security\SecurityContextSource.cs" />\r
-    <Compile Include="System.Security\SecurityCriticalAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityCriticalScope.cs" />\r
-    <Compile Include="System.Security\SecurityElement.cs" />\r
-    <Compile Include="System.Security\SecurityException.cs" />\r
-    <Compile Include="System.Security\SecurityFrame.cs" />\r
-    <Compile Include="System.Security\SecurityManager.cs" />\r
-    <Compile Include="System.Security\SecurityManager_mobile.cs" />\r
-    <Compile Include="System.Security\SecurityRulesAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityRuleSet.cs" />\r
-    <Compile Include="System.Security\SecuritySafeCriticalAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityState.cs" />\r
-    <Compile Include="System.Security\SecurityTransparentAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityTreatAsSafeAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityZone.cs" />\r
-    <Compile Include="System.Security\SuppressUnmanagedCodeSecurityAttribute.cs" />\r
-    <Compile Include="System.Security\UnverifiableCodeAttribute.cs" />\r
-    <Compile Include="System.Security\VerificationException.cs" />\r
-    <Compile Include="System.Security\XmlSyntaxException.cs" />\r
-    <Compile Include="System.Text\ASCIIEncoding.cs" />\r
-    <Compile Include="System.Text\CodePageEncoding.cs" />\r
-    <Compile Include="System.Text\Decoder.cs" />\r
-    <Compile Include="System.Text\DecoderExceptionFallback.cs" />\r
-    <Compile Include="System.Text\DecoderExceptionFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\DecoderFallback.cs" />\r
-    <Compile Include="System.Text\DecoderFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\DecoderFallbackException.cs" />\r
-    <Compile Include="System.Text\DecoderReplacementFallback.cs" />\r
-    <Compile Include="System.Text\DecoderReplacementFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\Encoder.cs" />\r
-    <Compile Include="System.Text\EncoderExceptionFallback.cs" />\r
-    <Compile Include="System.Text\EncoderExceptionFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\EncoderFallback.cs" />\r
-    <Compile Include="System.Text\EncoderFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\EncoderFallbackException.cs" />\r
-    <Compile Include="System.Text\EncoderReplacementFallback.cs" />\r
-    <Compile Include="System.Text\EncoderReplacementFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\Encoding.cs" />\r
-    <Compile Include="System.Text\EncodingInfo.cs" />\r
-    <Compile Include="System.Text\Latin1Encoding.cs" />\r
-    <Compile Include="System.Text\MLangCodePageEncoding.cs" />\r
-    <Compile Include="System.Text\NormalizationForm.cs" />\r
-    <Compile Include="System.Text\StringBuilder.cs" />\r
-    <Compile Include="System.Text\SurrogateEncoder.cs" />\r
-    <Compile Include="System.Text\UnicodeEncoding.cs" />\r
-    <Compile Include="System.Text\UTF32Encoding.cs" />\r
-    <Compile Include="System.Text\UTF7Encoding.cs" />\r
-    <Compile Include="System.Text\UTF8Encoding.cs" />\r
-    <Compile Include="System.Threading.Tasks\ConcurrentExclusiveSchedulerPair.cs" />\r
-    <Compile Include="System.Threading.Tasks\CyclicDeque.cs" />\r
-    <Compile Include="System.Threading.Tasks\DecoupledTask.cs" />\r
-    <Compile Include="System.Threading.Tasks\IConcurrentDeque.cs" />\r
-    <Compile Include="System.Threading.Tasks\Parallel.cs" />\r
-    <Compile Include="System.Threading.Tasks\ParallelLoopResult.cs" />\r
-    <Compile Include="System.Threading.Tasks\ParallelLoopState.cs" />\r
-    <Compile Include="System.Threading.Tasks\ParallelOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks\PopResult.cs" />\r
-    <Compile Include="System.Threading.Tasks\SimpleConcurrentBag.cs" />\r
-    <Compile Include="System.Threading.Tasks\SynchronizationContextScheduler.cs" />\r
-    <Compile Include="System.Threading.Tasks\Task.cs" />\r
-    <Compile Include="System.Threading.Tasks\Task_T.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskActionInvoker.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCanceledException.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCompletionQueue.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCompletionSource.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskConstants.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskConstants_T.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskContinuation.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskContinuationOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCreationOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskDebuggerView.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskExceptionSlot.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskExtensionsImpl.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskFactory.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskFactory_T.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskScheduler.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskSchedulerException.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskStatus.cs" />\r
-    <Compile Include="System.Threading.Tasks\TpScheduler.cs" />\r
-    <Compile Include="System.Threading.Tasks\UnobservedTaskExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\AbandonedMutexException.cs" />\r
-    <Compile Include="System.Threading\ApartmentState.cs" />\r
-    <Compile Include="System.Threading\AsyncFlowControl.cs" />\r
-    <Compile Include="System.Threading\AtomicBoolean.cs" />\r
-    <Compile Include="System.Threading\AutoResetEvent.cs" />\r
-    <Compile Include="System.Threading\CancellationToken.cs" />\r
-    <Compile Include="System.Threading\CancellationTokenRegistration.cs" />\r
-    <Compile Include="System.Threading\CancellationTokenSource.cs" />\r
-    <Compile Include="System.Threading\CompressedStack.cs" />\r
-    <Compile Include="System.Threading\ContextCallback.cs" />\r
-    <Compile Include="System.Threading\CountdownEvent.cs" />\r
-    <Compile Include="System.Threading\EventResetMode.cs" />\r
-    <Compile Include="System.Threading\EventWaitHandle.cs" />\r
-    <Compile Include="System.Threading\ExecutionContext.cs" />\r
-    <Compile Include="System.Threading\HostExecutionContext.cs" />\r
-    <Compile Include="System.Threading\HostExecutionContextManager.cs" />\r
-    <Compile Include="System.Threading\Interlocked.cs" />\r
-    <Compile Include="System.Threading\IOCompletionCallback.cs" />\r
-    <Compile Include="System.Threading\LazyInitializer.cs" />\r
-    <Compile Include="System.Threading\LazyThreadSafetyMode.cs" />\r
-    <Compile Include="System.Threading\LockCookie.cs" />\r
-    <Compile Include="System.Threading\LockQueue.cs" />\r
-    <Compile Include="System.Threading\LockRecursionException.cs" />\r
-    <Compile Include="System.Threading\ManualResetEvent.cs" />\r
-    <Compile Include="System.Threading\ManualResetEventSlim.cs" />\r
-    <Compile Include="System.Threading\Monitor.cs" />\r
-    <Compile Include="System.Threading\Mutex.cs" />\r
-    <Compile Include="System.Threading\NamedDataSlot.cs" />\r
-    <Compile Include="System.Threading\NativeEventCalls.cs" />\r
-    <Compile Include="System.Threading\NativeOverlapped.cs" />\r
-    <Compile Include="System.Threading\Overlapped.cs" />\r
-    <Compile Include="System.Threading\ParameterizedThreadStart.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLock.cs" />\r
-    <Compile Include="System.Threading\RegisteredWaitHandle.cs" />\r
-    <Compile Include="System.Threading\SemaphoreSlim.cs" />\r
-    <Compile Include="System.Threading\SendOrPostCallback.cs" />\r
-    <Compile Include="System.Threading\SpinLock.cs" />\r
-    <Compile Include="System.Threading\SpinWait.cs" />\r
-    <Compile Include="System.Threading\SynchronizationContext.cs" />\r
-    <Compile Include="System.Threading\SynchronizationLockException.cs" />\r
-    <Compile Include="System.Threading\Thread.cs" />\r
-    <Compile Include="System.Threading\ThreadAbortException.cs" />\r
-    <Compile Include="System.Threading\ThreadInterruptedException.cs" />\r
-    <Compile Include="System.Threading\ThreadLocal.cs" />\r
-    <Compile Include="System.Threading\ThreadPool.cs" />\r
-    <Compile Include="System.Threading\ThreadPriority.cs" />\r
-    <Compile Include="System.Threading\ThreadStart.cs" />\r
-    <Compile Include="System.Threading\ThreadStartException.cs" />\r
-    <Compile Include="System.Threading\ThreadState.cs" />\r
-    <Compile Include="System.Threading\ThreadStateException.cs" />\r
-    <Compile Include="System.Threading\Timeout.cs" />\r
-    <Compile Include="System.Threading\Timer.cs" />\r
-    <Compile Include="System.Threading\TimerCallback.cs" />\r
-    <Compile Include="System.Threading\Volatile.cs" />\r
-    <Compile Include="System.Threading\WaitCallback.cs" />\r
-    <Compile Include="System.Threading\WaitHandle.cs" />\r
-    <Compile Include="System.Threading\WaitHandleCannotBeOpenedException.cs" />\r
-    <Compile Include="System.Threading\WaitOrTimerCallback.cs" />\r
-    <Compile Include="System.Threading\Watch.cs" />\r
-    <Compile Include="System\__ComObject.cs" />\r
-    <Compile Include="System\_AppDomain.cs" />\r
-    <Compile Include="System\AccessViolationException.cs" />\r
-    <Compile Include="System\Action.cs" />\r
-    <Compile Include="System\ActivationContext.cs" />\r
-    <Compile Include="System\Activator.cs" />\r
-    <Compile Include="System\AggregateException.cs" />\r
-    <Compile Include="System\AndroidPlatform.cs" />\r
-    <Compile Include="System\AppDomain.cs" />\r
-    <Compile Include="System\AppDomainInitializer.cs" />\r
-    <Compile Include="System\AppDomainManager.cs" />\r
-    <Compile Include="System\AppDomainSetup.cs" />\r
-    <Compile Include="System\AppDomainUnloadedException.cs" />\r
-    <Compile Include="System\ApplicationException.cs" />\r
-    <Compile Include="System\ApplicationId.cs" />\r
-    <Compile Include="System\ApplicationIdentity.cs" />\r
-    <Compile Include="System\ArgIterator.cs" />\r
-    <Compile Include="System\ArgumentException.cs" />\r
-    <Compile Include="System\ArgumentNullException.cs" />\r
-    <Compile Include="System\ArgumentOutOfRangeException.cs" />\r
-    <Compile Include="System\ArithmeticException.cs" />\r
-    <Compile Include="System\Array.cs" />\r
-    <Compile Include="System\ArraySegment.cs" />\r
-    <Compile Include="System\ArrayTypeMismatchException.cs" />\r
-    <Compile Include="System\AssemblyLoadEventArgs.cs" />\r
-    <Compile Include="System\AssemblyLoadEventHandler.cs" />\r
-    <Compile Include="System\AsyncCallback.cs" />\r
-    <Compile Include="System\Attribute.cs" />\r
-    <Compile Include="System\AttributeTargets.cs" />\r
-    <Compile Include="System\AttributeUsageAttribute.cs" />\r
-    <Compile Include="System\BadImageFormatException.cs" />\r
-    <Compile Include="System\Base64FormattingOptions.cs" />\r
-    <Compile Include="System\BitConverter.cs" />\r
-    <Compile Include="System\Boolean.cs" />\r
-    <Compile Include="System\Buffer.cs" />\r
-    <Compile Include="System\Byte.cs" />\r
-    <Compile Include="System\CannotUnloadAppDomainException.cs" />\r
-    <Compile Include="System\Char.cs" />\r
-    <Compile Include="System\CharEnumerator.cs" />\r
-    <Compile Include="System\CLSCompliantAttribute.cs" />\r
-    <Compile Include="System\Comparison.cs" />\r
-    <Compile Include="System\Console.cs" />\r
-    <Compile Include="System\Console.iOS.cs" />\r
-    <Compile Include="System\ConsoleCancelEventArgs.cs" />\r
-    <Compile Include="System\ConsoleCancelEventHandler.cs" />\r
-    <Compile Include="System\ConsoleColor.cs" />\r
-    <Compile Include="System\ConsoleDriver.cs" />\r
-    <Compile Include="System\ConsoleKey.cs" />\r
-    <Compile Include="System\ConsoleKeyInfo.cs" />\r
-    <Compile Include="System\ConsoleModifiers.cs" />\r
-    <Compile Include="System\ConsoleSpecialKey.cs" />\r
-    <Compile Include="System\ContextBoundObject.cs" />\r
-    <Compile Include="System\ContextMarshalException.cs" />\r
-    <Compile Include="System\ContextStaticAttribute.cs" />\r
-    <Compile Include="System\ControlCharacters.cs" />\r
-    <Compile Include="System\Convert.cs" />\r
-    <Compile Include="System\Converter.cs" />\r
-    <Compile Include="System\CrossAppDomainDelegate.cs" />\r
-    <Compile Include="System\CStreamReader.cs" />\r
-    <Compile Include="System\CStreamWriter.cs" />\r
-    <Compile Include="System\DataMisalignedException.cs" />\r
-    <Compile Include="System\DateTime.cs" />\r
-    <Compile Include="System\DateTimeKind.cs" />\r
-    <Compile Include="System\DateTimeOffset.cs" />\r
-    <Compile Include="System\DateTimeUtils.cs" />\r
-    <Compile Include="System\DayOfWeek.cs" />\r
-    <Compile Include="System\DBNull.cs" />\r
-    <Compile Include="System\Decimal.cs" />\r
-    <Compile Include="System\Delegate.cs" />\r
-    <Compile Include="System\DelegateSerializationHolder.cs" />\r
-    <Compile Include="System\DivideByZeroException.cs" />\r
-    <Compile Include="System\DllNotFoundException.cs" />\r
-    <Compile Include="System\DomainManagerInitializationFlags.cs" />\r
-    <Compile Include="System\Double.cs" />\r
-    <Compile Include="System\DuplicateWaitObjectException.cs" />\r
-    <Compile Include="System\EmptyArray.cs" />\r
-    <Compile Include="System\EntryPointNotFoundException.cs" />\r
-    <Compile Include="System\Enum.cs" />\r
-    <Compile Include="System\Environment.cs" />\r
-    <Compile Include="System\EnvironmentVariableTarget.cs" />\r
-    <Compile Include="System\EventArgs.cs" />\r
-    <Compile Include="System\EventHandler.cs" />\r
-    <Compile Include="System\Exception.cs" />\r
-    <Compile Include="System\ExecutionEngineException.cs" />\r
-    <Compile Include="System\FieldAccessException.cs" />\r
-    <Compile Include="System\FlagsAttribute.cs" />\r
-    <Compile Include="System\FormatException.cs" />\r
-    <Compile Include="System\Funcs.cs" />\r
-    <Compile Include="System\GC.cs" />\r
-    <Compile Include="System\GCCollectionMode.cs" />\r
-    <Compile Include="System\GCNotificationStatus.cs" />\r
-    <Compile Include="System\Guid.cs" />\r
-    <Compile Include="System\IAppDomainSetup.cs" />\r
-    <Compile Include="System\IAsyncResult.cs" />\r
-    <Compile Include="System\ICloneable.cs" />\r
-    <Compile Include="System\IComparable.cs" />\r
-    <Compile Include="System\IConsoleDriver.cs" />\r
-    <Compile Include="System\IConvertible.cs" />\r
-    <Compile Include="System\ICustomFormatter.cs" />\r
-    <Compile Include="System\IDisposable.cs" />\r
-    <Compile Include="System\IEquatable.cs" />\r
-    <Compile Include="System\IFormatProvider.cs" />\r
-    <Compile Include="System\IFormattable.cs" />\r
-    <Compile Include="System\IndexOutOfRangeException.cs" />\r
-    <Compile Include="System\InsufficientExecutionStackException.cs" />\r
-    <Compile Include="System\InsufficientMemoryException.cs" />\r
-    <Compile Include="System\Int16.cs" />\r
-    <Compile Include="System\Int32.cs" />\r
-    <Compile Include="System\Int64.cs" />\r
-    <Compile Include="System\IntPtr.cs" />\r
-    <Compile Include="System\InvalidCastException.cs" />\r
-    <Compile Include="System\InvalidOperationException.cs" />\r
-    <Compile Include="System\InvalidProgramException.cs" />\r
-    <Compile Include="System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="System\IObservable.cs" />\r
-    <Compile Include="System\IObserver.cs" />\r
-    <Compile Include="System\IProgress.cs" />\r
-    <Compile Include="System\IServiceProvider.cs" />\r
-    <Compile Include="System\KnownTerminals.cs" />\r
-    <Compile Include="System\Lazy.cs" />\r
-    <Compile Include="System\LoaderOptimization.cs" />\r
-    <Compile Include="System\LoaderOptimizationAttribute.cs" />\r
-    <Compile Include="System\LocalDataStoreSlot.cs" />\r
-    <Compile Include="System\MarshalByRefObject.cs" />\r
-    <Compile Include="System\Math.cs" />\r
-    <Compile Include="System\MemberAccessException.cs" />\r
-    <Compile Include="System\MethodAccessException.cs" />\r
-    <Compile Include="System\MidpointRounding.cs" />\r
-    <Compile Include="System\MissingFieldException.cs" />\r
-    <Compile Include="System\MissingMemberException.cs" />\r
-    <Compile Include="System\MissingMethodException.cs" />\r
-    <Compile Include="System\ModuleHandle.cs" />\r
-    <Compile Include="System\MonoAsyncCall.cs" />\r
-    <Compile Include="System\MonoCQItem.cs" />\r
-    <Compile Include="System\MonoCustomAttrs.cs" />\r
-    <Compile Include="System\MonoListItem.cs" />\r
-    <Compile Include="System\MonoTouchAOTHelper.cs" />\r
-    <Compile Include="System\MonoType.cs" />\r
-    <Compile Include="System\MTAThreadAttribute.cs" />\r
-    <Compile Include="System\MulticastDelegate.cs" />\r
-    <Compile Include="System\MulticastNotSupportedException.cs" />\r
-    <Compile Include="System\NonSerializedAttribute.cs" />\r
-    <Compile Include="System\NotFiniteNumberException.cs" />\r
-    <Compile Include="System\NotImplementedException.cs" />\r
-    <Compile Include="System\NotSupportedException.cs" />\r
-    <Compile Include="System\Nullable.cs" />\r
-    <Compile Include="System\NullConsoleDriver.cs" />\r
-    <Compile Include="System\NullReferenceException.cs" />\r
-    <Compile Include="System\NumberFormatter.cs" />\r
-    <Compile Include="System\Object.cs" />\r
-    <Compile Include="System\ObjectDisposedException.cs" />\r
-    <Compile Include="System\ObsoleteAttribute.cs" />\r
-    <Compile Include="System\OperatingSystem.cs" />\r
-    <Compile Include="System\OperationCanceledException.cs" />\r
-    <Compile Include="System\OutOfMemoryException.cs" />\r
-    <Compile Include="System\OverflowException.cs" />\r
-    <Compile Include="System\ParamArrayAttribute.cs" />\r
-    <Compile Include="System\PlatformID.cs" />\r
-    <Compile Include="System\PlatformNotSupportedException.cs" />\r
-    <Compile Include="System\Predicate.cs" />\r
-    <Compile Include="System\Progress.cs" />\r
-    <Compile Include="System\Random.cs" />\r
-    <Compile Include="System\RankException.cs" />\r
-    <Compile Include="System\ResolveEventArgs.cs" />\r
-    <Compile Include="System\ResolveEventHandler.cs" />\r
-    <Compile Include="System\RuntimeArgumentHandle.cs" />\r
-    <Compile Include="System\RuntimeFieldHandle.cs" />\r
-    <Compile Include="System\RuntimeMethodHandle.cs" />\r
-    <Compile Include="System\RuntimeTypeHandle.cs" />\r
-    <Compile Include="System\SByte.cs" />\r
-    <Compile Include="System\SerializableAttribute.cs" />\r
-    <Compile Include="System\Single.cs" />\r
-    <Compile Include="System\StackOverflowException.cs" />\r
-    <Compile Include="System\STAThreadAttribute.cs" />\r
-    <Compile Include="System\String.cs" />\r
-    <Compile Include="System\StringComparer.cs" />\r
-    <Compile Include="System\StringComparison.cs" />\r
-    <Compile Include="System\StringSplitOptions.cs" />\r
-    <Compile Include="System\SystemException.cs" />\r
-    <Compile Include="System\TermInfoBooleans.cs" />\r
-    <Compile Include="System\TermInfoDriver.cs" />\r
-    <Compile Include="System\TermInfoNumbers.cs" />\r
-    <Compile Include="System\TermInfoReader.cs" />\r
-    <Compile Include="System\TermInfoStrings.cs" />\r
-    <Compile Include="System\ThreadStaticAttribute.cs" />\r
-    <Compile Include="System\TimeoutException.cs" />\r
-    <Compile Include="System\TimeSpan.cs" />\r
-    <Compile Include="System\TimeZone.cs" />\r
-    <Compile Include="System\TimeZoneNotFoundException.cs" />\r
-    <Compile Include="System\Tuple.cs" />\r
-    <Compile Include="System\Tuples.cs" />\r
-    <Compile Include="System\Type.cs" />\r
-    <Compile Include="System\TypeAccessException.cs" />\r
-    <Compile Include="System\TypeCode.cs" />\r
-    <Compile Include="System\TypedReference.cs" />\r
-    <Compile Include="System\TypeInitializationException.cs" />\r
-    <Compile Include="System\TypeLoadException.cs" />\r
-    <Compile Include="System\TypeSpec.cs" />\r
-    <Compile Include="System\TypeUnloadedException.cs" />\r
-    <Compile Include="System\UInt16.cs" />\r
-    <Compile Include="System\UInt32.cs" />\r
-    <Compile Include="System\UInt64.cs" />\r
-    <Compile Include="System\UIntPtr.cs" />\r
-    <Compile Include="System\UnauthorizedAccessException.cs" />\r
-    <Compile Include="System\UnhandledExceptionEventArgs.cs" />\r
-    <Compile Include="System\UnhandledExceptionEventHandler.cs" />\r
-    <Compile Include="System\UnitySerializationHolder.cs" />\r
-    <Compile Include="System\ValueType.cs" />\r
-    <Compile Include="System\Variant.cs" />\r
-    <Compile Include="System\Version.cs" />\r
-    <Compile Include="System\Void.cs" />\r
-    <Compile Include="System\WeakReference.cs" />\r
-    <Compile Include="System\WeakReference_T.cs" />\r
-    <Compile Include="System\WindowsConsoleDriver.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/collation.core.bin">\r
-      <LogicalName>collation.core.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.tailoring.bin">\r
-      <LogicalName>collation.tailoring.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkCHS.bin">\r
-      <LogicalName>collation.cjkCHS.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkCHT.bin">\r
-      <LogicalName>collation.cjkCHT.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkJA.bin">\r
-      <LogicalName>collation.cjkJA.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkKO.bin">\r
-      <LogicalName>collation.cjkKO.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkKOlv2.bin">\r
-      <LogicalName>collation.cjkKOlv2.bin</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/corlib/corlib-net_4_0.csproj b/mcs/class/corlib/corlib-net_4_0.csproj
deleted file mode 100644 (file)
index 8262d14..0000000
+++ /dev/null
@@ -1,1758 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F42F5509-677F-4C93-A026-047AB6153801}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>mscorlib</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\ConfidenceFactor.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\PrimalityTests.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math\BigInteger.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoTools.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\KeyPairPersistence.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS1.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS8.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RC4.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RSAManaged.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\SymmetricTransform.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\PKCS12.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X501Name.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Certificate.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CertificateCollection.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Chain.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509ChainStatusFlags.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CRL.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extensions.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Store.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509StoreManager.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Stores.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X520Attributes.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1Convert.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\BitConverterLE.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\PKCS7.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\StrongName.cs" />\r
-    <Compile Include="..\System.Core\System.Security.Cryptography\Aes.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.AdjustmentRule.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.Android.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.MonoTouch.cs" />\r
-    <Compile Include="..\System.Core\System\TimeZoneInfo.TransitionTime.cs" />\r
-    <Compile Include="..\System\System.Threading\SemaphoreFullException.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleZeroOrMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeFileHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeRegistryHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeWaitHandle.cs" />\r
-    <Compile Include="Microsoft.Win32\IRegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Registry.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryHive.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryKey.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryKeyPermissionCheck.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryOptions.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryValueKind.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryValueOptions.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryView.cs" />\r
-    <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\CodePointIndexer.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTable.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTableUtil.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\Normalization.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\NormalizationTableUtil.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SortKey.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SortKeyBuffer.cs" />\r
-    <Compile Include="Mono.Interop\ComInteropProxy.cs" />\r
-    <Compile Include="Mono.Interop\IDispatch.cs" />\r
-    <Compile Include="Mono.Interop\IUnknown.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\DSAManaged.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\HMACAlgorithm.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MACAlgorithm.cs" />\r
-    <Compile Include="Mono.Security\StrongNameManager.cs" />\r
-    <Compile Include="Mono.Security\Uri.cs" />\r
-    <Compile Include="Mono.Xml\SecurityParser.cs" />\r
-    <Compile Include="Mono.Xml\SmallXmlParser.cs" />\r
-    <Compile Include="Mono\DataConverter.cs" />\r
-    <Compile Include="Mono\Runtime.cs" />\r
-    <Compile Include="System.Collections.Concurrent.Partitioners\EnumerablePartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent.Partitioners\ListPartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent.Partitioners\UserRangePartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentDictionary.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentOrderedList.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentQueue.cs" />\r
-    <Compile Include="System.Collections.Concurrent\ConcurrentStack.cs" />\r
-    <Compile Include="System.Collections.Concurrent\EnumerablePartitionerOptions.cs" />\r
-    <Compile Include="System.Collections.Concurrent\IProducerConsumerCollection.cs" />\r
-    <Compile Include="System.Collections.Concurrent\OrderablePartitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent\Partitioner.cs" />\r
-    <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="System.Collections.Generic\CollectionDebuggerView.cs" />\r
-    <Compile Include="System.Collections.Generic\Comparer.cs" />\r
-    <Compile Include="System.Collections.Generic\Dictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\EqualityComparer.cs" />\r
-    <Compile Include="System.Collections.Generic\ICollection.cs" />\r
-    <Compile Include="System.Collections.Generic\IComparer.cs" />\r
-    <Compile Include="System.Collections.Generic\IDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\IEnumerable.cs" />\r
-    <Compile Include="System.Collections.Generic\IEnumerator.cs" />\r
-    <Compile Include="System.Collections.Generic\IEqualityComparer.cs" />\r
-    <Compile Include="System.Collections.Generic\IList.cs" />\r
-    <Compile Include="System.Collections.Generic\IReadOnlyCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\IReadOnlyDictionary.cs" />\r
-    <Compile Include="System.Collections.Generic\IReadOnlyList.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyNotFoundException.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyValuePair.cs" />\r
-    <Compile Include="System.Collections.Generic\List.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\Collection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\KeyedCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyDictionary.cs" />\r
-    <Compile Include="System.Collections\ArrayList.cs" />\r
-    <Compile Include="System.Collections\BitArray.cs" />\r
-    <Compile Include="System.Collections\CaseInsensitiveComparer.cs" />\r
-    <Compile Include="System.Collections\CaseInsensitiveHashCodeProvider.cs" />\r
-    <Compile Include="System.Collections\CollectionBase.cs" />\r
-    <Compile Include="System.Collections\CollectionDebuggerView.cs" />\r
-    <Compile Include="System.Collections\Comparer.cs" />\r
-    <Compile Include="System.Collections\DictionaryBase.cs" />\r
-    <Compile Include="System.Collections\DictionaryEntry.cs" />\r
-    <Compile Include="System.Collections\HashPrimeNumbers.cs" />\r
-    <Compile Include="System.Collections\Hashtable.cs" />\r
-    <Compile Include="System.Collections\ICollection.cs" />\r
-    <Compile Include="System.Collections\IComparer.cs" />\r
-    <Compile Include="System.Collections\IDictionary.cs" />\r
-    <Compile Include="System.Collections\IDictionaryEnumerator.cs" />\r
-    <Compile Include="System.Collections\IEnumerable.cs" />\r
-    <Compile Include="System.Collections\IEnumerator.cs" />\r
-    <Compile Include="System.Collections\IEqualityComparer.cs" />\r
-    <Compile Include="System.Collections\IHashCodeProvider.cs" />\r
-    <Compile Include="System.Collections\IList.cs" />\r
-    <Compile Include="System.Collections\IStructuralComparable.cs" />\r
-    <Compile Include="System.Collections\IStructuralEquatable.cs" />\r
-    <Compile Include="System.Collections\Queue.cs" />\r
-    <Compile Include="System.Collections\ReadOnlyCollectionBase.cs" />\r
-    <Compile Include="System.Collections\SortedList.cs" />\r
-    <Compile Include="System.Collections\Stack.cs" />\r
-    <Compile Include="System.Collections\StructuralComparisons.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyHash.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyHashAlgorithm.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyVersionCompatibility.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\ProcessorID.cs" />\r
-    <Compile Include="System.Deployment.Internal\InternalActivationContextHelper.cs" />\r
-    <Compile Include="System.Deployment.Internal\InternalApplicationIdentityHelper.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\SuppressMessageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts.Internal\ContractHelper.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\Contract.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractAbbreviatorAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractArgumentValidatorAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractClassAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractClassForAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractException.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractFailedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractFailureKind.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractInvariantMethodAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractOptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractPublicPropertyNameAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractReferenceAssemblyAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractRuntimeIgnoredAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractShouldAssertException.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\ContractVerificationAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Contracts\PureAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder1.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocument.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocumentWriter.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolMethod.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolNamespace.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolReader.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolScope.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolVariable.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolWriter.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymAddressKind.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymbolToken.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymDocumentType.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageType.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageVendor.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventKeywords.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventLevel.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventSource.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventSourceAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\NonEventAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\ConditionalAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggableAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\Debugger.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerBrowsableAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerBrowsableState.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerDisplayAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerHiddenAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerNonUserCodeAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerStepperBoundaryAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerStepThroughAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerTypeProxyAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\DebuggerVisualizerAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\StackFrame.cs" />\r
-    <Compile Include="System.Diagnostics\StackTrace.cs" />\r
-    <Compile Include="System.Globalization\Calendar.cs" />\r
-    <Compile Include="System.Globalization\CalendarAlgorithmType.cs" />\r
-    <Compile Include="System.Globalization\CalendarWeekRule.cs" />\r
-    <Compile Include="System.Globalization\CalendricalCalculations.cs" />\r
-    <Compile Include="System.Globalization\CharUnicodeInfo.cs" />\r
-    <Compile Include="System.Globalization\ChineseLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\CodePageDataItem.cs" />\r
-    <Compile Include="System.Globalization\CompareInfo.cs" />\r
-    <Compile Include="System.Globalization\CompareOptions.cs" />\r
-    <Compile Include="System.Globalization\CultureInfo.cs" />\r
-    <Compile Include="System.Globalization\CultureNotFoundException.cs" />\r
-    <Compile Include="System.Globalization\CultureTypes.cs" />\r
-    <Compile Include="System.Globalization\DateTimeFormatInfo.cs" />\r
-    <Compile Include="System.Globalization\DateTimeStyles.cs" />\r
-    <Compile Include="System.Globalization\DaylightTime.cs" />\r
-    <Compile Include="System.Globalization\DigitShapes.cs" />\r
-    <Compile Include="System.Globalization\EastAsianLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\GregorianCalendar.cs" />\r
-    <Compile Include="System.Globalization\GregorianCalendarTypes.cs" />\r
-    <Compile Include="System.Globalization\HebrewCalendar.cs" />\r
-    <Compile Include="System.Globalization\HijriCalendar.cs" />\r
-    <Compile Include="System.Globalization\IdnMapping.cs" />\r
-    <Compile Include="System.Globalization\JapaneseCalendar.cs" />\r
-    <Compile Include="System.Globalization\JapaneseLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\JulianCalendar.cs" />\r
-    <Compile Include="System.Globalization\KoreanCalendar.cs" />\r
-    <Compile Include="System.Globalization\KoreanLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\NumberFormatInfo.cs" />\r
-    <Compile Include="System.Globalization\NumberStyles.cs" />\r
-    <Compile Include="System.Globalization\PersianCalendar.cs" />\r
-    <Compile Include="System.Globalization\RegionInfo.cs" />\r
-    <Compile Include="System.Globalization\RegionInfo.MonoTouch.cs" />\r
-    <Compile Include="System.Globalization\SortVersion.cs" />\r
-    <Compile Include="System.Globalization\StringInfo.cs" />\r
-    <Compile Include="System.Globalization\TaiwanCalendar.cs" />\r
-    <Compile Include="System.Globalization\TaiwanLunisolarCalendar.cs" />\r
-    <Compile Include="System.Globalization\TextElementEnumerator.cs" />\r
-    <Compile Include="System.Globalization\TextInfo.cs" />\r
-    <Compile Include="System.Globalization\ThaiBuddhistCalendar.cs" />\r
-    <Compile Include="System.Globalization\TimeSpanStyles.cs" />\r
-    <Compile Include="System.Globalization\UmAlQuraCalendar.cs" />\r
-    <Compile Include="System.Globalization\UnicodeCategory.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\INormalizeForIsolatedStorage.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorage.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageException.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFile.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileEnumerator.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileStream.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageScope.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityOptions.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityState.cs" />\r
-    <Compile Include="System.IO\BinaryReader.cs" />\r
-    <Compile Include="System.IO\BinaryWriter.cs" />\r
-    <Compile Include="System.IO\BufferedStream.cs" />\r
-    <Compile Include="System.IO\Directory.cs" />\r
-    <Compile Include="System.IO\DirectoryInfo.cs" />\r
-    <Compile Include="System.IO\DirectoryNotFoundException.cs" />\r
-    <Compile Include="System.IO\DriveInfo.cs" />\r
-    <Compile Include="System.IO\DriveNotFoundException.cs" />\r
-    <Compile Include="System.IO\DriveType.cs" />\r
-    <Compile Include="System.IO\EndOfStreamException.cs" />\r
-    <Compile Include="System.IO\File.cs" />\r
-    <Compile Include="System.IO\FileAccess.cs" />\r
-    <Compile Include="System.IO\FileAttributes.cs" />\r
-    <Compile Include="System.IO\FileInfo.cs" />\r
-    <Compile Include="System.IO\FileLoadException.cs" />\r
-    <Compile Include="System.IO\FileMode.cs" />\r
-    <Compile Include="System.IO\FileNotFoundException.cs" />\r
-    <Compile Include="System.IO\FileOptions.cs" />\r
-    <Compile Include="System.IO\FileShare.cs" />\r
-    <Compile Include="System.IO\FileStream.cs" />\r
-    <Compile Include="System.IO\FileStreamAsyncResult.cs" />\r
-    <Compile Include="System.IO\FileSystemInfo.cs" />\r
-    <Compile Include="System.IO\IOException.cs" />\r
-    <Compile Include="System.IO\LogcatTextWriter.cs" />\r
-    <Compile Include="System.IO\MemoryStream.cs" />\r
-    <Compile Include="System.IO\MonoFileType.cs" />\r
-    <Compile Include="System.IO\MonoIO.cs" />\r
-    <Compile Include="System.IO\MonoIOError.cs" />\r
-    <Compile Include="System.IO\MonoIOStat.cs" />\r
-    <Compile Include="System.IO\Path.cs" />\r
-    <Compile Include="System.IO\PathTooLongException.cs" />\r
-    <Compile Include="System.IO\SearchOption.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\SeekOrigin.cs" />\r
-    <Compile Include="System.IO\Stream.cs" />\r
-    <Compile Include="System.IO\StreamReader.cs" />\r
-    <Compile Include="System.IO\StreamWriter.cs" />\r
-    <Compile Include="System.IO\StringReader.cs" />\r
-    <Compile Include="System.IO\StringWriter.cs" />\r
-    <Compile Include="System.IO\TextReader.cs" />\r
-    <Compile Include="System.IO\TextWriter.cs" />\r
-    <Compile Include="System.IO\UnexceptionalStreamReader.cs" />\r
-    <Compile Include="System.IO\UnexceptionalStreamWriter.cs" />\r
-    <Compile Include="System.IO\UnmanagedMemoryAccessor.cs" />\r
-    <Compile Include="System.IO\UnmanagedMemoryStream.cs" />\r
-    <Compile Include="System.Reflection.Emit\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\AssemblyBuilderAccess.cs" />\r
-    <Compile Include="System.Reflection.Emit\ConstructorBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ConstructorOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\CustomAttributeBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\DerivedTypes.cs" />\r
-    <Compile Include="System.Reflection.Emit\DynamicILInfo.cs" />\r
-    <Compile Include="System.Reflection.Emit\DynamicMethod.cs" />\r
-    <Compile Include="System.Reflection.Emit\EnumBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\FlowControl.cs" />\r
-    <Compile Include="System.Reflection.Emit\GenericTypeParameterBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ILGenerator.cs" />\r
-    <Compile Include="System.Reflection.Emit\Label.cs" />\r
-    <Compile Include="System.Reflection.Emit\LocalBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodRental.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\ModuleBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MonoArrayMethod.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCode.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodeNames.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodes.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodeType.cs" />\r
-    <Compile Include="System.Reflection.Emit\OperandType.cs" />\r
-    <Compile Include="System.Reflection.Emit\PackingSize.cs" />\r
-    <Compile Include="System.Reflection.Emit\ParameterBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ParameterToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\PEFileKinds.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\SignatureHelper.cs" />\r
-    <Compile Include="System.Reflection.Emit\SignatureToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\StackBehaviour.cs" />\r
-    <Compile Include="System.Reflection.Emit\StringToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\TypeBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\TypeToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\UnmanagedMarshal.cs" />\r
-    <Compile Include="System.Reflection\AmbiguousMatchException.cs" />\r
-    <Compile Include="System.Reflection\Assembly.cs" />\r
-    <Compile Include="System.Reflection\AssemblyAlgorithmIdAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyCompanyAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyConfigurationAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyContentType.cs" />\r
-    <Compile Include="System.Reflection\AssemblyCopyrightAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyCultureAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyDefaultAliasAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyDelaySignAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyDescriptionAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyFileVersionAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyFlagsAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyInformationalVersionAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyKeyFileAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyKeyNameAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyMetadataAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyName.cs" />\r
-    <Compile Include="System.Reflection\AssemblyNameFlags.cs" />\r
-    <Compile Include="System.Reflection\AssemblyNameProxy.cs" />\r
-    <Compile Include="System.Reflection\AssemblyProductAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblySignatureKeyAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyTitleAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyTradeMarkAttribute.cs" />\r
-    <Compile Include="System.Reflection\AssemblyVersionAttribute.cs" />\r
-    <Compile Include="System.Reflection\Binder.cs" />\r
-    <Compile Include="System.Reflection\BindingFlags.cs" />\r
-    <Compile Include="System.Reflection\CallingConventions.cs" />\r
-    <Compile Include="System.Reflection\ConstructorInfo.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeData.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeExtensions.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeFormatException.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeNamedArgument.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeTypedArgument.cs" />\r
-    <Compile Include="System.Reflection\DefaultMemberAttribute.cs" />\r
-    <Compile Include="System.Reflection\EventAttributes.cs" />\r
-    <Compile Include="System.Reflection\EventInfo.cs" />\r
-    <Compile Include="System.Reflection\ExceptionHandlingClause.cs" />\r
-    <Compile Include="System.Reflection\ExceptionHandlingClauseOptions.cs" />\r
-    <Compile Include="System.Reflection\FieldAttributes.cs" />\r
-    <Compile Include="System.Reflection\FieldInfo.cs" />\r
-    <Compile Include="System.Reflection\GenericParameterAttributes.cs" />\r
-    <Compile Include="System.Reflection\ICustomAttributeProvider.cs" />\r
-    <Compile Include="System.Reflection\ImageFileMachine.cs" />\r
-    <Compile Include="System.Reflection\InterfaceMapping.cs" />\r
-    <Compile Include="System.Reflection\IntrospectionExtensions.cs" />\r
-    <Compile Include="System.Reflection\InvalidFilterCriteriaException.cs" />\r
-    <Compile Include="System.Reflection\IReflect.cs" />\r
-    <Compile Include="System.Reflection\IReflectableType.cs" />\r
-    <Compile Include="System.Reflection\LocalVariableInfo.cs" />\r
-    <Compile Include="System.Reflection\ManifestResourceInfo.cs" />\r
-    <Compile Include="System.Reflection\MemberFilter.cs" />\r
-    <Compile Include="System.Reflection\MemberInfo.cs" />\r
-    <Compile Include="System.Reflection\MemberInfoSerializationHolder.cs" />\r
-    <Compile Include="System.Reflection\MemberTypes.cs" />\r
-    <Compile Include="System.Reflection\MethodAttributes.cs" />\r
-    <Compile Include="System.Reflection\MethodBase.cs" />\r
-    <Compile Include="System.Reflection\MethodBody.cs" />\r
-    <Compile Include="System.Reflection\MethodImplAttributes.cs" />\r
-    <Compile Include="System.Reflection\MethodInfo.cs" />\r
-    <Compile Include="System.Reflection\Missing.cs" />\r
-    <Compile Include="System.Reflection\Module.cs" />\r
-    <Compile Include="System.Reflection\ModuleResolveEventHandler.cs" />\r
-    <Compile Include="System.Reflection\MonoAssembly.cs" />\r
-    <Compile Include="System.Reflection\MonoEvent.cs" />\r
-    <Compile Include="System.Reflection\MonoField.cs" />\r
-    <Compile Include="System.Reflection\MonoGenericClass.cs" />\r
-    <Compile Include="System.Reflection\MonoGenericMethod.cs" />\r
-    <Compile Include="System.Reflection\MonoMethod.cs" />\r
-    <Compile Include="System.Reflection\MonoModule.cs" />\r
-    <Compile Include="System.Reflection\MonoParameterInfo.cs" />\r
-    <Compile Include="System.Reflection\MonoProperty.cs" />\r
-    <Compile Include="System.Reflection\ObfuscateAssemblyAttribute.cs" />\r
-    <Compile Include="System.Reflection\ObfuscationAttribute.cs" />\r
-    <Compile Include="System.Reflection\ParameterAttributes.cs" />\r
-    <Compile Include="System.Reflection\ParameterInfo.cs" />\r
-    <Compile Include="System.Reflection\ParameterModifier.cs" />\r
-    <Compile Include="System.Reflection\Pointer.cs" />\r
-    <Compile Include="System.Reflection\PortableExecutableKinds.cs" />\r
-    <Compile Include="System.Reflection\ProcessorArchitecture.cs" />\r
-    <Compile Include="System.Reflection\PropertyAttributes.cs" />\r
-    <Compile Include="System.Reflection\PropertyInfo.cs" />\r
-    <Compile Include="System.Reflection\ReflectionContext.cs" />\r
-    <Compile Include="System.Reflection\ReflectionTypeLoadException.cs" />\r
-    <Compile Include="System.Reflection\ResourceAttributes.cs" />\r
-    <Compile Include="System.Reflection\ResourceLocation.cs" />\r
-    <Compile Include="System.Reflection\RuntimeReflectionExtensions.cs" />\r
-    <Compile Include="System.Reflection\StrongNameKeyPair.cs" />\r
-    <Compile Include="System.Reflection\TargetException.cs" />\r
-    <Compile Include="System.Reflection\TargetInvocationException.cs" />\r
-    <Compile Include="System.Reflection\TargetParameterCountException.cs" />\r
-    <Compile Include="System.Reflection\TypeAttributes.cs" />\r
-    <Compile Include="System.Reflection\TypeDelegator.cs" />\r
-    <Compile Include="System.Reflection\TypeFilter.cs" />\r
-    <Compile Include="System.Reflection\TypeInfo.cs" />\r
-    <Compile Include="System.Resources\IResourceReader.cs" />\r
-    <Compile Include="System.Resources\IResourceWriter.cs" />\r
-    <Compile Include="System.Resources\MissingManifestResourceException.cs" />\r
-    <Compile Include="System.Resources\MissingSatelliteAssemblyException.cs" />\r
-    <Compile Include="System.Resources\NeutralResourcesLanguageAttribute.cs" />\r
-    <Compile Include="System.Resources\ResourceManager.cs" />\r
-    <Compile Include="System.Resources\ResourceReader.cs" />\r
-    <Compile Include="System.Resources\ResourceSet.cs" />\r
-    <Compile Include="System.Resources\ResourceWriter.cs" />\r
-    <Compile Include="System.Resources\RuntimeResourceSet.cs" />\r
-    <Compile Include="System.Resources\SatelliteContractVersionAttribute.cs" />\r
-    <Compile Include="System.Resources\UltimateResourceFallbackLocation.cs" />\r
-    <Compile Include="System.Resources\Win32Resources.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AccessedThroughPropertyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncStateMachineAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder_T.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\AsyncVoidMethodBuilder.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvCdecl.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvFastcall.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvStdcall.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallConvThiscall.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallerFilePathAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallerLineNumberAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CallerMemberNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxations.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxationsAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilerGeneratedAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilerGlobalScopeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CompilerMarshalOverride.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ConditionalWeakTable.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable_T.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ContractHelper.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\CustomConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DateTimeConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DecimalConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DefaultDependencyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DependencyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\DiscardableAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\FixedAddressValueTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\FixedBufferAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\HasCopySemanticsAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IAsyncStateMachine.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ICriticalNotifyCompletion.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IDispatchConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IndexerNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\INotifyCompletion.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\InternalsVisibleToAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsBoxed.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsByValue.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsConst.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsCopyConstructed.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsExplicitlyDereferenced.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsImplicitlyDereferenced.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsJitIntrinsic.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsLong.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsPinned.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsSignUnspecifiedByte.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsUdtReturn.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IsVolatile.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IteratorStateMachineAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\IUnknownConstantAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\LoadHint.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\MethodCodeType.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\MethodImplAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\MethodImplOptions.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\NativeCppClassAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ReferenceAssemblyAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RequiredAttributeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RuntimeCompatibilityAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RuntimeWrappedException.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ScopelessEnumAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\SpecialNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StateMachineAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\StringFreezingAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\SuppressIldasmAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter_T.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedFromAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedToAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\UnsafeValueTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\YieldAwaitable.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\CER.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\Consistency.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\CriticialFinalizerObject.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\PrePrepareMethodAttribute.cs" />\r
-    <Compile Include="System.Runtime.ConstrainedExecution\ReliabilityContractAttribute.cs" />\r
-    <Compile Include="System.Runtime.ExceptionServices\ExceptionDispatchInfo.cs" />\r
-    <Compile Include="System.Runtime.ExceptionServices\FirstChanceExceptionEventArgs.cs" />\r
-    <Compile Include="System.Runtime.ExceptionServices\HandleProcessCorruptedStateExceptionsAttribute.cs" />\r
-    <Compile Include="System.Runtime.Hosting\ActivationArguments.cs" />\r
-    <Compile Include="System.Runtime.Hosting\ApplicationActivator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BIND_OPTS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BINDPTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CALLCONV.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CONNECTDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DESCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DISPPARAMS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ELEMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\EXCEPINFO.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FILETIME.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IBindCtx.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPoint.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPointContainer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnectionPoints.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnections.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumString.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumVARIANT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMPLTYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\INVOKEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IPersistFile.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IRunningObjectTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IStream.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeComp.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo2.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib2.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\LIBFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATSTG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\SYSKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPELIBATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.Expando\IExpando.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DefaultInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DesignerNamespaceResolveEventArgs.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationToken.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationTokenTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\IActivationFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\InterfaceImplementedInVersionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\NamespaceResolveEventArgs.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReadOnlyArrayAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReturnValueNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMarshal.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMetadata.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WriteOnlyArrayAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Activator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Assembly.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_AssemblyBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_AssemblyName.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Attribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ConstructorBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ConstructorInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_CustomAttributeBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EnumBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EventBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EventInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Exception.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_FieldBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_FieldInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ILGenerator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_LocalBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MemberInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodBase.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodRental.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Module.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ModuleBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ParameterBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ParameterInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_PropertyBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_PropertyInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_SignatureHelper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Thread.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Type.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\AllowReversePInvokeCallsAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ArrayWithOffset.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\AssemblyRegistrationFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\AutomationProxyAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BestFitMappingAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BStrWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CALLCONV.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CallingConvention.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CharSet.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CoClassAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComAliasNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComCompatibleVersionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComConversionLossAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComDefaultInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComEventInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\COMException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComImportAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComInterfaceType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComMemberType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComRegisterFunctionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComSourceInterfacesAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComUnregisterFunctionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComVisible.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CONNECTDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CriticalHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CurrencyWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultCharSetAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DispatchWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DispIdAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DISPPARAMS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DllImportAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ELEMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ErrorWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\EXCEPINFO.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExporterEventKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExtensibleClassFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExternalException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FieldOffsetAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FILETIME.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GuidAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleRef.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomAdapter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomMarshaler.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ImportedFromTypeLibAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InterfaceTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InvalidComObjectException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InvalidOleVariantTypeException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\INVOKEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IRegistrationServices.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibImporterNotifySink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LayoutKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LCIDConversionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\Marshal.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\MarshalDirectiveException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ObjectCreationDelegate.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\OptionalAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\OutAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PARAMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PARAMFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PreserveSigAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PrimaryInteropAssemblyAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ProgIdAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RuntimeEnvironment.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeArrayRankMismatchException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeArrayTypeMismatchException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SEHException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SetWin32ContextInIDispatchAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StructLayoutAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeIdentifierAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPELIBATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibConverter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibExporterFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibImportClassAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibImporterFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibVersionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIBindCtx.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPoint.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPointContainer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnectionPoints.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnections.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumString.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumVARIANT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIPersistFile.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIRunningObjectTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIStream.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UnknownWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UnmanagedFunctionPointerAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UnmanagedType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VARDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VarEnum.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VARFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VariantWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ConstructionLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ContextLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionCallMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivationAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\UrlAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\AggregateDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelObjectWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelSinkWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelDataStore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelSinkStackEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ClientChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\CrossAppDomainChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelDataStore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiver.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiverHook.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSender.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSinkBase.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientResponseChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ISecurableChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerResponseChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ITransportHeaders.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerProcessing.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SinkProviderData.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\TransportHeaders.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\Context.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextDelegate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextPropertyActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeClientContextSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeDynamicSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeEnvoySink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeObjectSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeServerContextSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicMessageSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\SynchronizationAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ClientSponsor.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ILease.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ISponsor.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\Lease.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseManager.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseState.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LifetimeServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ArgInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\AsyncResult.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\CADMessages.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\CallContext.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ClientContextTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCall.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCallDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionResponse.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\EnvoyTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ErrorMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\Header.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\HeaderHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IInternalMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageCtrl.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodCallMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\InternalMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IRemotingFormatter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ISerializationRootObject.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\LogicalCallContext.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MessageSurrogateFilter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCall.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodResponse.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MonoMethodMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\OneWayAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogateSelector.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerContextTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerObjectTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\StackBuilderSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\ISoapXsd.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapAnyUri.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapBase64Binary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDateTime.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDay.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDuration.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntities.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntity.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapId.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdref.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdrefs.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapLanguage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonth.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonthDay.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNcName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNegativeInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtoken.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtokens.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonNegativeInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonPositiveInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNormalizedString.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNotation.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapPositiveInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapQName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapTime.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapToken.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYear.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYearMonth.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapFieldAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapMethodAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapOption.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapParameterAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\XmlFieldOrderOption.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\ProxyAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\RealProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\RemotingProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\EnterpriseServicesHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\ITrackingHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\TrackingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ActivatedClientTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ActivatedServiceTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\CustomErrorsModes.cs" />\r
-    <Compile Include="System.Runtime.Remoting\EnvoyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IChannelInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\Identity.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IEnvoyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\InternalRemotingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IObjectHandle.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IRemotingTypeInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ObjectHandle.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ObjRef.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingConfiguration.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingTimeoutException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ServerException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ServerIdentity.cs" />\r
-    <Compile Include="System.Runtime.Remoting\SoapServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\TypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\TypeInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownClientTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownObjectMode.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownServiceTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryCommon.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\CodeGenerator.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\MessageFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectWriter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterAssemblyStyle.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTopObjectStyle.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTypeStyle.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\IFieldInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalArrayTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalElementTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberValueE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalNameSpaceE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectPositionE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseStateE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalPrimitiveTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalRM.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalSerializerTypeE.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalST.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\ISoapMessage.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\ServerFault.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapFault.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapMessage.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters\TypeFilterLevel.cs" />\r
-    <Compile Include="System.Runtime.Serialization\Formatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\FormatterConverter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\FormatterServices.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IDeserializationCallback.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IFormatterConverter.cs" />\r
-    <Compile Include="System.Runtime.Serialization\IObjectReference.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISafeSerializationData.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISerializable.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISerializationSurrogate.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ISurrogateSelector.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ObjectIDGenerator.cs" />\r
-    <Compile Include="System.Runtime.Serialization\ObjectManager.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnDeserializedAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnDeserializingAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnSerializedAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OnSerializingAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\OptionalFieldAttribute.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SafeSerializationEventArgs.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationBinder.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationCallbacks.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationEntry.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationException.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationInfoEnumerator.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SerializationObjectManager.cs" />\r
-    <Compile Include="System.Runtime.Serialization\StreamingContext.cs" />\r
-    <Compile Include="System.Runtime.Serialization\StreamingContextStates.cs" />\r
-    <Compile Include="System.Runtime.Serialization\SurrogateSelector.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesOptions.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ResourceConsumptionAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ResourceExposureAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\ResourceScope.cs" />\r
-    <Compile Include="System.Runtime.Versioning\TargetFrameworkAttribute.cs" />\r
-    <Compile Include="System.Runtime.Versioning\VersioningHelper.cs" />\r
-    <Compile Include="System.Runtime\AssemblyTargetedPatchBandAttribute.cs" />\r
-    <Compile Include="System.Runtime\GCLargeObjectHeapCompactionMode.cs" />\r
-    <Compile Include="System.Runtime\GCLatencyMode.cs" />\r
-    <Compile Include="System.Runtime\GCSettings.cs" />\r
-    <Compile Include="System.Runtime\MemoryFailPoint.cs" />\r
-    <Compile Include="System.Runtime\TargetedPatchingOptOutAttribute.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlActions.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlModification.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlSections.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlType.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessRule_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceEnumerator.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceQualifier.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditRule_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuthorizationRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\CompoundAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\CompoundAceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\ControlFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\CustomAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\DirectoryObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\DirectorySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\DiscretionaryAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\InheritanceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\KnownAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\NativeObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectSecurity_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\PrivilegeNotHeldException.cs" />\r
-    <Compile Include="System.Security.AccessControl\PropagationFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\QualifiedAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\RawAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\RawSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistrySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ResourceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\SddlAccessRight.cs" />\r
-    <Compile Include="System.Security.AccessControl\SecurityInfos.cs" />\r
-    <Compile Include="System.Security.AccessControl\SystemAcl.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate20.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ContentType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyStorageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\Base64Constants.cs" />\r
-    <Compile Include="System.Security.Cryptography\CipherMode.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoAPITransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig.fullaot.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig_2_1.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicException.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicUnexpectedOperationExcpetion.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoStream.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoStreamMode.cs" />\r
-    <Compile Include="System.Security.Cryptography\CspKeyContainerInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography\CspParameters.cs" />\r
-    <Compile Include="System.Security.Cryptography\CspProviderFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\DeriveBytes.cs" />\r
-    <Compile Include="System.Security.Cryptography\DES.cs" />\r
-    <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSA.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSAParameters.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSASignatureDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSASignatureFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\FromBase64Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography\HashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMAC.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACMD5.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACRIPEMD160.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA1.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA256.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA384.cs" />\r
-    <Compile Include="System.Security.Cryptography\HMACSHA512.cs" />\r
-    <Compile Include="System.Security.Cryptography\ICryptoTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\ICspAsymmetricAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\KeyedHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\KeyNumber.cs" />\r
-    <Compile Include="System.Security.Cryptography\KeySizes.cs" />\r
-    <Compile Include="System.Security.Cryptography\MACTripleDES.cs" />\r
-    <Compile Include="System.Security.Cryptography\MaskGenerationMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\PaddingMode.cs" />\r
-    <Compile Include="System.Security.Cryptography\PasswordDeriveBytes.cs" />\r
-    <Compile Include="System.Security.Cryptography\PKCS1MaskGenerationMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography\RandomNumberGenerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\RC2.cs" />\r
-    <Compile Include="System.Security.Cryptography\RC2CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\Rfc2898DeriveBytes.cs" />\r
-    <Compile Include="System.Security.Cryptography\Rijndael.cs" />\r
-    <Compile Include="System.Security.Cryptography\RijndaelManaged.cs" />\r
-    <Compile Include="System.Security.Cryptography\RijndaelManagedTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\RIPEMD160.cs" />\r
-    <Compile Include="System.Security.Cryptography\RIPEMD160Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSA.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSACryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAParameters.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Managed.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHAConstants.cs" />\r
-    <Compile Include="System.Security.Cryptography\SignatureDescription.cs" />\r
-    <Compile Include="System.Security.Cryptography\SymmetricAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\ToBase64Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography\TripleDES.cs" />\r
-    <Compile Include="System.Security.Cryptography\TripleDESCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Permissions\CodeAccessSecurityAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\GacIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\GacIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionResource.cs" />\r
-    <Compile Include="System.Security.Permissions\IBuiltInPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageContainment.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\IUnrestrictedPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryCollection.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionFlags.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionSetAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionState.cs" />\r
-    <Compile Include="System.Security.Permissions\PrincipalPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\PrincipalPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermissionFlag.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityAction.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermissionFlag.cs" />\r
-    <Compile Include="System.Security.Permissions\SiteIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\SiteIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNameIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNamePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNamePublicKeyBlob.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionClipboard.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionWindow.cs" />\r
-    <Compile Include="System.Security.Permissions\UrlIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\UrlIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Policy\AllMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationDirectory.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationDirectoryMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationSecurityInfo.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationSecurityManager.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrust.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrustCollection.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrustEnumerator.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationVersionMatch.cs" />\r
-    <Compile Include="System.Security.Policy\CodeConnectAccess.cs" />\r
-    <Compile Include="System.Security.Policy\CodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\DefaultPolicies.cs" />\r
-    <Compile Include="System.Security.Policy\Evidence.cs" />\r
-    <Compile Include="System.Security.Policy\EvidenceBase.cs" />\r
-    <Compile Include="System.Security.Policy\FileCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\FirstMatchCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\Gac.cs" />\r
-    <Compile Include="System.Security.Policy\GacMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Hash.cs" />\r
-    <Compile Include="System.Security.Policy\HashMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\IApplicationTrustManager.cs" />\r
-    <Compile Include="System.Security.Policy\IBuiltInEvidence.cs" />\r
-    <Compile Include="System.Security.Policy\IConstantMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\IIdentityPermissionFactory.cs" />\r
-    <Compile Include="System.Security.Policy\IMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\MembershipConditionHelper.cs" />\r
-    <Compile Include="System.Security.Policy\MonoTrustManager.cs" />\r
-    <Compile Include="System.Security.Policy\NetCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\PermissionRequestEvidence.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyException.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyLevel.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyStatement.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyStatementAttribute.cs" />\r
-    <Compile Include="System.Security.Policy\Publisher.cs" />\r
-    <Compile Include="System.Security.Policy\PublisherMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Site.cs" />\r
-    <Compile Include="System.Security.Policy\SiteMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\StrongName.cs" />\r
-    <Compile Include="System.Security.Policy\StrongNameMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\TrustManagerContext.cs" />\r
-    <Compile Include="System.Security.Policy\TrustManagerUIContext.cs" />\r
-    <Compile Include="System.Security.Policy\UnionCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\Url.cs" />\r
-    <Compile Include="System.Security.Policy\UrlMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Zone.cs" />\r
-    <Compile Include="System.Security.Policy\ZoneMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Principal\GenericIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\GenericPrincipal.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityNotMappedException.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityReference.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityReferenceCollection.cs" />\r
-    <Compile Include="System.Security.Principal\IIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\IPrincipal.cs" />\r
-    <Compile Include="System.Security.Principal\NTAccount.cs" />\r
-    <Compile Include="System.Security.Principal\PrincipalPolicy.cs" />\r
-    <Compile Include="System.Security.Principal\SecurityIdentifier.cs" />\r
-    <Compile Include="System.Security.Principal\TokenAccessLevels.cs" />\r
-    <Compile Include="System.Security.Principal\TokenImpersonationLevel.cs" />\r
-    <Compile Include="System.Security.Principal\WellKnownAccount.cs" />\r
-    <Compile Include="System.Security.Principal\WellKnownSidType.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsAccountType.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsBuiltInRole.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsImpersonationContext.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsPrincipal.cs" />\r
-    <Compile Include="System.Security\AllowPartiallyTrustedCallersAttribute.cs" />\r
-    <Compile Include="System.Security\CodeAccessPermission.cs" />\r
-    <Compile Include="System.Security\HostProtectionException.cs" />\r
-    <Compile Include="System.Security\HostSecurityManager.cs" />\r
-    <Compile Include="System.Security\HostSecurityManagerFlags.cs" />\r
-    <Compile Include="System.Security\IEvidenceFactory.cs" />\r
-    <Compile Include="System.Security\IPermission.cs" />\r
-    <Compile Include="System.Security\ISecurityEncodable.cs" />\r
-    <Compile Include="System.Security\ISecurityPolicyEncodable.cs" />\r
-    <Compile Include="System.Security\IStackWalk.cs" />\r
-    <Compile Include="System.Security\NamedPermissionSet.cs" />\r
-    <Compile Include="System.Security\PermissionBuilder.cs" />\r
-    <Compile Include="System.Security\PermissionSet.cs" />\r
-    <Compile Include="System.Security\PolicyLevelType.cs" />\r
-    <Compile Include="System.Security\SecureString.cs" />\r
-    <Compile Include="System.Security\SecurityContext.cs" />\r
-    <Compile Include="System.Security\SecurityContextSource.cs" />\r
-    <Compile Include="System.Security\SecurityCriticalAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityCriticalScope.cs" />\r
-    <Compile Include="System.Security\SecurityElement.cs" />\r
-    <Compile Include="System.Security\SecurityException.cs" />\r
-    <Compile Include="System.Security\SecurityFrame.cs" />\r
-    <Compile Include="System.Security\SecurityManager.cs" />\r
-    <Compile Include="System.Security\SecurityManager_mobile.cs" />\r
-    <Compile Include="System.Security\SecurityRulesAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityRuleSet.cs" />\r
-    <Compile Include="System.Security\SecuritySafeCriticalAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityState.cs" />\r
-    <Compile Include="System.Security\SecurityTransparentAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityTreatAsSafeAttribute.cs" />\r
-    <Compile Include="System.Security\SecurityZone.cs" />\r
-    <Compile Include="System.Security\SuppressUnmanagedCodeSecurityAttribute.cs" />\r
-    <Compile Include="System.Security\UnverifiableCodeAttribute.cs" />\r
-    <Compile Include="System.Security\VerificationException.cs" />\r
-    <Compile Include="System.Security\XmlSyntaxException.cs" />\r
-    <Compile Include="System.Text\ASCIIEncoding.cs" />\r
-    <Compile Include="System.Text\CodePageEncoding.cs" />\r
-    <Compile Include="System.Text\Decoder.cs" />\r
-    <Compile Include="System.Text\DecoderExceptionFallback.cs" />\r
-    <Compile Include="System.Text\DecoderExceptionFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\DecoderFallback.cs" />\r
-    <Compile Include="System.Text\DecoderFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\DecoderFallbackException.cs" />\r
-    <Compile Include="System.Text\DecoderReplacementFallback.cs" />\r
-    <Compile Include="System.Text\DecoderReplacementFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\Encoder.cs" />\r
-    <Compile Include="System.Text\EncoderExceptionFallback.cs" />\r
-    <Compile Include="System.Text\EncoderExceptionFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\EncoderFallback.cs" />\r
-    <Compile Include="System.Text\EncoderFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\EncoderFallbackException.cs" />\r
-    <Compile Include="System.Text\EncoderReplacementFallback.cs" />\r
-    <Compile Include="System.Text\EncoderReplacementFallbackBuffer.cs" />\r
-    <Compile Include="System.Text\Encoding.cs" />\r
-    <Compile Include="System.Text\EncodingInfo.cs" />\r
-    <Compile Include="System.Text\Latin1Encoding.cs" />\r
-    <Compile Include="System.Text\MLangCodePageEncoding.cs" />\r
-    <Compile Include="System.Text\NormalizationForm.cs" />\r
-    <Compile Include="System.Text\StringBuilder.cs" />\r
-    <Compile Include="System.Text\SurrogateEncoder.cs" />\r
-    <Compile Include="System.Text\UnicodeEncoding.cs" />\r
-    <Compile Include="System.Text\UTF32Encoding.cs" />\r
-    <Compile Include="System.Text\UTF7Encoding.cs" />\r
-    <Compile Include="System.Text\UTF8Encoding.cs" />\r
-    <Compile Include="System.Threading.Tasks\ConcurrentExclusiveSchedulerPair.cs" />\r
-    <Compile Include="System.Threading.Tasks\CyclicDeque.cs" />\r
-    <Compile Include="System.Threading.Tasks\DecoupledTask.cs" />\r
-    <Compile Include="System.Threading.Tasks\IConcurrentDeque.cs" />\r
-    <Compile Include="System.Threading.Tasks\Parallel.cs" />\r
-    <Compile Include="System.Threading.Tasks\ParallelLoopResult.cs" />\r
-    <Compile Include="System.Threading.Tasks\ParallelLoopState.cs" />\r
-    <Compile Include="System.Threading.Tasks\ParallelOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks\PopResult.cs" />\r
-    <Compile Include="System.Threading.Tasks\SimpleConcurrentBag.cs" />\r
-    <Compile Include="System.Threading.Tasks\SynchronizationContextScheduler.cs" />\r
-    <Compile Include="System.Threading.Tasks\Task.cs" />\r
-    <Compile Include="System.Threading.Tasks\Task_T.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskActionInvoker.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCanceledException.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCompletionQueue.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCompletionSource.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskConstants.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskConstants_T.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskContinuation.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskContinuationOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskCreationOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskDebuggerView.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskExceptionSlot.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskExtensionsImpl.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskFactory.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskFactory_T.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskScheduler.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskSchedulerException.cs" />\r
-    <Compile Include="System.Threading.Tasks\TaskStatus.cs" />\r
-    <Compile Include="System.Threading.Tasks\TpScheduler.cs" />\r
-    <Compile Include="System.Threading.Tasks\UnobservedTaskExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\AbandonedMutexException.cs" />\r
-    <Compile Include="System.Threading\ApartmentState.cs" />\r
-    <Compile Include="System.Threading\AsyncFlowControl.cs" />\r
-    <Compile Include="System.Threading\AtomicBoolean.cs" />\r
-    <Compile Include="System.Threading\AutoResetEvent.cs" />\r
-    <Compile Include="System.Threading\CancellationToken.cs" />\r
-    <Compile Include="System.Threading\CancellationTokenRegistration.cs" />\r
-    <Compile Include="System.Threading\CancellationTokenSource.cs" />\r
-    <Compile Include="System.Threading\CompressedStack.cs" />\r
-    <Compile Include="System.Threading\ContextCallback.cs" />\r
-    <Compile Include="System.Threading\CountdownEvent.cs" />\r
-    <Compile Include="System.Threading\EventResetMode.cs" />\r
-    <Compile Include="System.Threading\EventWaitHandle.cs" />\r
-    <Compile Include="System.Threading\ExecutionContext.cs" />\r
-    <Compile Include="System.Threading\HostExecutionContext.cs" />\r
-    <Compile Include="System.Threading\HostExecutionContextManager.cs" />\r
-    <Compile Include="System.Threading\Interlocked.cs" />\r
-    <Compile Include="System.Threading\IOCompletionCallback.cs" />\r
-    <Compile Include="System.Threading\LazyInitializer.cs" />\r
-    <Compile Include="System.Threading\LazyThreadSafetyMode.cs" />\r
-    <Compile Include="System.Threading\LockCookie.cs" />\r
-    <Compile Include="System.Threading\LockQueue.cs" />\r
-    <Compile Include="System.Threading\LockRecursionException.cs" />\r
-    <Compile Include="System.Threading\ManualResetEvent.cs" />\r
-    <Compile Include="System.Threading\ManualResetEventSlim.cs" />\r
-    <Compile Include="System.Threading\Monitor.cs" />\r
-    <Compile Include="System.Threading\Mutex.cs" />\r
-    <Compile Include="System.Threading\NamedDataSlot.cs" />\r
-    <Compile Include="System.Threading\NativeEventCalls.cs" />\r
-    <Compile Include="System.Threading\NativeOverlapped.cs" />\r
-    <Compile Include="System.Threading\Overlapped.cs" />\r
-    <Compile Include="System.Threading\ParameterizedThreadStart.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLock.cs" />\r
-    <Compile Include="System.Threading\RegisteredWaitHandle.cs" />\r
-    <Compile Include="System.Threading\SemaphoreSlim.cs" />\r
-    <Compile Include="System.Threading\SendOrPostCallback.cs" />\r
-    <Compile Include="System.Threading\SpinLock.cs" />\r
-    <Compile Include="System.Threading\SpinWait.cs" />\r
-    <Compile Include="System.Threading\SynchronizationContext.cs" />\r
-    <Compile Include="System.Threading\SynchronizationLockException.cs" />\r
-    <Compile Include="System.Threading\Thread.cs" />\r
-    <Compile Include="System.Threading\ThreadAbortException.cs" />\r
-    <Compile Include="System.Threading\ThreadInterruptedException.cs" />\r
-    <Compile Include="System.Threading\ThreadLocal.cs" />\r
-    <Compile Include="System.Threading\ThreadPool.cs" />\r
-    <Compile Include="System.Threading\ThreadPriority.cs" />\r
-    <Compile Include="System.Threading\ThreadStart.cs" />\r
-    <Compile Include="System.Threading\ThreadStartException.cs" />\r
-    <Compile Include="System.Threading\ThreadState.cs" />\r
-    <Compile Include="System.Threading\ThreadStateException.cs" />\r
-    <Compile Include="System.Threading\Timeout.cs" />\r
-    <Compile Include="System.Threading\Timer.cs" />\r
-    <Compile Include="System.Threading\TimerCallback.cs" />\r
-    <Compile Include="System.Threading\Volatile.cs" />\r
-    <Compile Include="System.Threading\WaitCallback.cs" />\r
-    <Compile Include="System.Threading\WaitHandle.cs" />\r
-    <Compile Include="System.Threading\WaitHandleCannotBeOpenedException.cs" />\r
-    <Compile Include="System.Threading\WaitOrTimerCallback.cs" />\r
-    <Compile Include="System.Threading\Watch.cs" />\r
-    <Compile Include="System\__ComObject.cs" />\r
-    <Compile Include="System\_AppDomain.cs" />\r
-    <Compile Include="System\AccessViolationException.cs" />\r
-    <Compile Include="System\Action.cs" />\r
-    <Compile Include="System\ActivationContext.cs" />\r
-    <Compile Include="System\Activator.cs" />\r
-    <Compile Include="System\AggregateException.cs" />\r
-    <Compile Include="System\AndroidPlatform.cs" />\r
-    <Compile Include="System\AppDomain.cs" />\r
-    <Compile Include="System\AppDomainInitializer.cs" />\r
-    <Compile Include="System\AppDomainManager.cs" />\r
-    <Compile Include="System\AppDomainSetup.cs" />\r
-    <Compile Include="System\AppDomainUnloadedException.cs" />\r
-    <Compile Include="System\ApplicationException.cs" />\r
-    <Compile Include="System\ApplicationId.cs" />\r
-    <Compile Include="System\ApplicationIdentity.cs" />\r
-    <Compile Include="System\ArgIterator.cs" />\r
-    <Compile Include="System\ArgumentException.cs" />\r
-    <Compile Include="System\ArgumentNullException.cs" />\r
-    <Compile Include="System\ArgumentOutOfRangeException.cs" />\r
-    <Compile Include="System\ArithmeticException.cs" />\r
-    <Compile Include="System\Array.cs" />\r
-    <Compile Include="System\ArraySegment.cs" />\r
-    <Compile Include="System\ArrayTypeMismatchException.cs" />\r
-    <Compile Include="System\AssemblyLoadEventArgs.cs" />\r
-    <Compile Include="System\AssemblyLoadEventHandler.cs" />\r
-    <Compile Include="System\AsyncCallback.cs" />\r
-    <Compile Include="System\Attribute.cs" />\r
-    <Compile Include="System\AttributeTargets.cs" />\r
-    <Compile Include="System\AttributeUsageAttribute.cs" />\r
-    <Compile Include="System\BadImageFormatException.cs" />\r
-    <Compile Include="System\Base64FormattingOptions.cs" />\r
-    <Compile Include="System\BitConverter.cs" />\r
-    <Compile Include="System\Boolean.cs" />\r
-    <Compile Include="System\Buffer.cs" />\r
-    <Compile Include="System\Byte.cs" />\r
-    <Compile Include="System\CannotUnloadAppDomainException.cs" />\r
-    <Compile Include="System\Char.cs" />\r
-    <Compile Include="System\CharEnumerator.cs" />\r
-    <Compile Include="System\CLSCompliantAttribute.cs" />\r
-    <Compile Include="System\Comparison.cs" />\r
-    <Compile Include="System\Console.cs" />\r
-    <Compile Include="System\Console.iOS.cs" />\r
-    <Compile Include="System\ConsoleCancelEventArgs.cs" />\r
-    <Compile Include="System\ConsoleCancelEventHandler.cs" />\r
-    <Compile Include="System\ConsoleColor.cs" />\r
-    <Compile Include="System\ConsoleDriver.cs" />\r
-    <Compile Include="System\ConsoleKey.cs" />\r
-    <Compile Include="System\ConsoleKeyInfo.cs" />\r
-    <Compile Include="System\ConsoleModifiers.cs" />\r
-    <Compile Include="System\ConsoleSpecialKey.cs" />\r
-    <Compile Include="System\ContextBoundObject.cs" />\r
-    <Compile Include="System\ContextMarshalException.cs" />\r
-    <Compile Include="System\ContextStaticAttribute.cs" />\r
-    <Compile Include="System\ControlCharacters.cs" />\r
-    <Compile Include="System\Convert.cs" />\r
-    <Compile Include="System\Converter.cs" />\r
-    <Compile Include="System\CrossAppDomainDelegate.cs" />\r
-    <Compile Include="System\CStreamReader.cs" />\r
-    <Compile Include="System\CStreamWriter.cs" />\r
-    <Compile Include="System\DataMisalignedException.cs" />\r
-    <Compile Include="System\DateTime.cs" />\r
-    <Compile Include="System\DateTimeKind.cs" />\r
-    <Compile Include="System\DateTimeOffset.cs" />\r
-    <Compile Include="System\DateTimeUtils.cs" />\r
-    <Compile Include="System\DayOfWeek.cs" />\r
-    <Compile Include="System\DBNull.cs" />\r
-    <Compile Include="System\Decimal.cs" />\r
-    <Compile Include="System\Delegate.cs" />\r
-    <Compile Include="System\DelegateSerializationHolder.cs" />\r
-    <Compile Include="System\DivideByZeroException.cs" />\r
-    <Compile Include="System\DllNotFoundException.cs" />\r
-    <Compile Include="System\DomainManagerInitializationFlags.cs" />\r
-    <Compile Include="System\Double.cs" />\r
-    <Compile Include="System\DuplicateWaitObjectException.cs" />\r
-    <Compile Include="System\EmptyArray.cs" />\r
-    <Compile Include="System\EntryPointNotFoundException.cs" />\r
-    <Compile Include="System\Enum.cs" />\r
-    <Compile Include="System\Environment.cs" />\r
-    <Compile Include="System\EnvironmentVariableTarget.cs" />\r
-    <Compile Include="System\EventArgs.cs" />\r
-    <Compile Include="System\EventHandler.cs" />\r
-    <Compile Include="System\Exception.cs" />\r
-    <Compile Include="System\ExecutionEngineException.cs" />\r
-    <Compile Include="System\FieldAccessException.cs" />\r
-    <Compile Include="System\FlagsAttribute.cs" />\r
-    <Compile Include="System\FormatException.cs" />\r
-    <Compile Include="System\Funcs.cs" />\r
-    <Compile Include="System\GC.cs" />\r
-    <Compile Include="System\GCCollectionMode.cs" />\r
-    <Compile Include="System\GCNotificationStatus.cs" />\r
-    <Compile Include="System\Guid.cs" />\r
-    <Compile Include="System\IAppDomainSetup.cs" />\r
-    <Compile Include="System\IAsyncResult.cs" />\r
-    <Compile Include="System\ICloneable.cs" />\r
-    <Compile Include="System\IComparable.cs" />\r
-    <Compile Include="System\IConsoleDriver.cs" />\r
-    <Compile Include="System\IConvertible.cs" />\r
-    <Compile Include="System\ICustomFormatter.cs" />\r
-    <Compile Include="System\IDisposable.cs" />\r
-    <Compile Include="System\IEquatable.cs" />\r
-    <Compile Include="System\IFormatProvider.cs" />\r
-    <Compile Include="System\IFormattable.cs" />\r
-    <Compile Include="System\IndexOutOfRangeException.cs" />\r
-    <Compile Include="System\InsufficientExecutionStackException.cs" />\r
-    <Compile Include="System\InsufficientMemoryException.cs" />\r
-    <Compile Include="System\Int16.cs" />\r
-    <Compile Include="System\Int32.cs" />\r
-    <Compile Include="System\Int64.cs" />\r
-    <Compile Include="System\IntPtr.cs" />\r
-    <Compile Include="System\InvalidCastException.cs" />\r
-    <Compile Include="System\InvalidOperationException.cs" />\r
-    <Compile Include="System\InvalidProgramException.cs" />\r
-    <Compile Include="System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="System\IObservable.cs" />\r
-    <Compile Include="System\IObserver.cs" />\r
-    <Compile Include="System\IProgress.cs" />\r
-    <Compile Include="System\IServiceProvider.cs" />\r
-    <Compile Include="System\KnownTerminals.cs" />\r
-    <Compile Include="System\Lazy.cs" />\r
-    <Compile Include="System\LoaderOptimization.cs" />\r
-    <Compile Include="System\LoaderOptimizationAttribute.cs" />\r
-    <Compile Include="System\LocalDataStoreSlot.cs" />\r
-    <Compile Include="System\MarshalByRefObject.cs" />\r
-    <Compile Include="System\Math.cs" />\r
-    <Compile Include="System\MemberAccessException.cs" />\r
-    <Compile Include="System\MethodAccessException.cs" />\r
-    <Compile Include="System\MidpointRounding.cs" />\r
-    <Compile Include="System\MissingFieldException.cs" />\r
-    <Compile Include="System\MissingMemberException.cs" />\r
-    <Compile Include="System\MissingMethodException.cs" />\r
-    <Compile Include="System\ModuleHandle.cs" />\r
-    <Compile Include="System\MonoAsyncCall.cs" />\r
-    <Compile Include="System\MonoCQItem.cs" />\r
-    <Compile Include="System\MonoCustomAttrs.cs" />\r
-    <Compile Include="System\MonoListItem.cs" />\r
-    <Compile Include="System\MonoTouchAOTHelper.cs" />\r
-    <Compile Include="System\MonoType.cs" />\r
-    <Compile Include="System\MTAThreadAttribute.cs" />\r
-    <Compile Include="System\MulticastDelegate.cs" />\r
-    <Compile Include="System\MulticastNotSupportedException.cs" />\r
-    <Compile Include="System\NonSerializedAttribute.cs" />\r
-    <Compile Include="System\NotFiniteNumberException.cs" />\r
-    <Compile Include="System\NotImplementedException.cs" />\r
-    <Compile Include="System\NotSupportedException.cs" />\r
-    <Compile Include="System\Nullable.cs" />\r
-    <Compile Include="System\NullConsoleDriver.cs" />\r
-    <Compile Include="System\NullReferenceException.cs" />\r
-    <Compile Include="System\NumberFormatter.cs" />\r
-    <Compile Include="System\Object.cs" />\r
-    <Compile Include="System\ObjectDisposedException.cs" />\r
-    <Compile Include="System\ObsoleteAttribute.cs" />\r
-    <Compile Include="System\OperatingSystem.cs" />\r
-    <Compile Include="System\OperationCanceledException.cs" />\r
-    <Compile Include="System\OutOfMemoryException.cs" />\r
-    <Compile Include="System\OverflowException.cs" />\r
-    <Compile Include="System\ParamArrayAttribute.cs" />\r
-    <Compile Include="System\PlatformID.cs" />\r
-    <Compile Include="System\PlatformNotSupportedException.cs" />\r
-    <Compile Include="System\Predicate.cs" />\r
-    <Compile Include="System\Progress.cs" />\r
-    <Compile Include="System\Random.cs" />\r
-    <Compile Include="System\RankException.cs" />\r
-    <Compile Include="System\ResolveEventArgs.cs" />\r
-    <Compile Include="System\ResolveEventHandler.cs" />\r
-    <Compile Include="System\RuntimeArgumentHandle.cs" />\r
-    <Compile Include="System\RuntimeFieldHandle.cs" />\r
-    <Compile Include="System\RuntimeMethodHandle.cs" />\r
-    <Compile Include="System\RuntimeTypeHandle.cs" />\r
-    <Compile Include="System\SByte.cs" />\r
-    <Compile Include="System\SerializableAttribute.cs" />\r
-    <Compile Include="System\Single.cs" />\r
-    <Compile Include="System\StackOverflowException.cs" />\r
-    <Compile Include="System\STAThreadAttribute.cs" />\r
-    <Compile Include="System\String.cs" />\r
-    <Compile Include="System\StringComparer.cs" />\r
-    <Compile Include="System\StringComparison.cs" />\r
-    <Compile Include="System\StringSplitOptions.cs" />\r
-    <Compile Include="System\SystemException.cs" />\r
-    <Compile Include="System\TermInfoBooleans.cs" />\r
-    <Compile Include="System\TermInfoDriver.cs" />\r
-    <Compile Include="System\TermInfoNumbers.cs" />\r
-    <Compile Include="System\TermInfoReader.cs" />\r
-    <Compile Include="System\TermInfoStrings.cs" />\r
-    <Compile Include="System\ThreadStaticAttribute.cs" />\r
-    <Compile Include="System\TimeoutException.cs" />\r
-    <Compile Include="System\TimeSpan.cs" />\r
-    <Compile Include="System\TimeZone.cs" />\r
-    <Compile Include="System\TimeZoneNotFoundException.cs" />\r
-    <Compile Include="System\Tuple.cs" />\r
-    <Compile Include="System\Tuples.cs" />\r
-    <Compile Include="System\Type.cs" />\r
-    <Compile Include="System\TypeAccessException.cs" />\r
-    <Compile Include="System\TypeCode.cs" />\r
-    <Compile Include="System\TypedReference.cs" />\r
-    <Compile Include="System\TypeInitializationException.cs" />\r
-    <Compile Include="System\TypeLoadException.cs" />\r
-    <Compile Include="System\TypeSpec.cs" />\r
-    <Compile Include="System\TypeUnloadedException.cs" />\r
-    <Compile Include="System\UInt16.cs" />\r
-    <Compile Include="System\UInt32.cs" />\r
-    <Compile Include="System\UInt64.cs" />\r
-    <Compile Include="System\UIntPtr.cs" />\r
-    <Compile Include="System\UnauthorizedAccessException.cs" />\r
-    <Compile Include="System\UnhandledExceptionEventArgs.cs" />\r
-    <Compile Include="System\UnhandledExceptionEventHandler.cs" />\r
-    <Compile Include="System\UnitySerializationHolder.cs" />\r
-    <Compile Include="System\ValueType.cs" />\r
-    <Compile Include="System\Variant.cs" />\r
-    <Compile Include="System\Version.cs" />\r
-    <Compile Include="System\Void.cs" />\r
-    <Compile Include="System\WeakReference.cs" />\r
-    <Compile Include="System\WeakReference_T.cs" />\r
-    <Compile Include="System\WindowsConsoleDriver.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/collation.core.bin">\r
-      <LogicalName>collation.core.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.tailoring.bin">\r
-      <LogicalName>collation.tailoring.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkCHS.bin">\r
-      <LogicalName>collation.cjkCHS.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkCHT.bin">\r
-      <LogicalName>collation.cjkCHT.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkJA.bin">\r
-      <LogicalName>collation.cjkJA.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkKO.bin">\r
-      <LogicalName>collation.cjkKO.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkKOlv2.bin">\r
-      <LogicalName>collation.cjkKOlv2.bin</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index bf5bf19095531491d14fcc25ace1b6995323dc6b..f3d3c2cfd172bcb1e39182a1a5e6d39dfe3acd2c 100644 (file)
     <Compile Include="System.Runtime.InteropServices\IDispatchImplType.cs" />\r
     <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />\r
     <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />\r
+    <Compile Include="System.Runtime.InteropServices\IErrorInfo.cs" />\r
     <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />\r
     <Compile Include="System.Runtime.InteropServices\ImportedFromTypeLibAttribute.cs" />\r
     <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />\r
     <Compile Include="System.Runtime.InteropServices\LayoutKind.cs" />\r
     <Compile Include="System.Runtime.InteropServices\LCIDConversionAttribute.cs" />\r
     <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />\r
+    <Compile Include="System.Runtime.InteropServices\ManagedErrorInfo.cs " />\r
     <Compile Include="System.Runtime.InteropServices\Marshal.cs" />\r
     <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />\r
     <Compile Include="System.Runtime.InteropServices\MarshalDirectiveException.cs" />\r
diff --git a/mcs/class/corlib/corlib-tests-net_2_0.csproj b/mcs/class/corlib/corlib-tests-net_2_0.csproj
deleted file mode 100644 (file)
index cf9327e..0000000
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F1439839-64EC-4B9D-ACC0-097CF94C7EC3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <OutputPath>bin\Debug\corlib-tests-net_2_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>corlib_test_net_2_0</AssemblyName>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Mono\DataConverter.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\RegistryKeyTest.cs" />\r
-    <Compile Include="Test\Mono\DataConvertTest.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentDictionaryTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentQueueTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentStackTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelConcurrentQueueTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelConcurrentStackTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\PartitionerTests.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\ComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\DictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\EqualityComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\IListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\ListTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\CollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\KeyedCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections\ArrayListTest.cs" />\r
-    <Compile Include="Test\System.Collections\BitArrayTest.cs" />\r
-    <Compile Include="Test\System.Collections\CaseInsensitiveComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections\CaseInsensitiveHashCodeProviderTest.cs" />\r
-    <Compile Include="Test\System.Collections\CollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\ComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections\DictionaryBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\DictionaryEntryTest.cs" />\r
-    <Compile Include="Test\System.Collections\HashtableTest.cs" />\r
-    <Compile Include="Test\System.Collections\NewArrayListTest.cs" />\r
-    <Compile Include="Test\System.Collections\QueueTest.cs" />\r
-    <Compile Include="Test\System.Collections\ReadOnlyCollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\SortedListTest.cs" />\r
-    <Compile Include="Test\System.Collections\StackTest.cs" />\r
-    <Compile Include="Test\System.Collections\StructuralComparisonsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractAssertTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractAssumeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractCollectionMethodsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractHelperTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractMarkerMethodsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractMustUseRewriterTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\Helpers\RunAgainstReferenceAttribute.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\Helpers\TestContractBase.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebuggerDisplayAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebuggerTypeProxyAttribute.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackFrameCas.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackFrameTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackTraceCas.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackTraceTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CalendarTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CompareInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CultureInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\DateTimeFormatInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\DaylightTimeTest.cs" />\r
-    <Compile Include="Test\System.Globalization\EastAsianLunisolarCalendarTest.cs" />\r
-    <Compile Include="Test\System.Globalization\IdnMappingTest.cs" />\r
-    <Compile Include="Test\System.Globalization\NumberFormatInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\RegionInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\SortKeyTest.cs" />\r
-    <Compile Include="Test\System.Globalization\StringInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\TextInfoTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileCas.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageTest.cs" />\r
-    <Compile Include="Test\System.IO\BinaryReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\BinaryWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\BufferedStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryCas.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryTest.cs" />\r
-    <Compile Include="Test\System.IO\FileInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\FileLoadExceptionCas.cs" />\r
-    <Compile Include="Test\System.IO\FileNotFoundExceptionCas.cs" />\r
-    <Compile Include="Test\System.IO\FileNotFoundExceptionTest.cs" />\r
-    <Compile Include="Test\System.IO\FileStreamCas.cs" />\r
-    <Compile Include="Test\System.IO\FileStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\FileSystemInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\FileTest.cs" />\r
-    <Compile Include="Test\System.IO\MemoryStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\PathCas.cs" />\r
-    <Compile Include="Test\System.IO\PathTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamCas.cs" />\r
-    <Compile Include="Test\System.IO\StreamHelperTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\StringReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\StringWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\TextReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\TextWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\UnmanagedMemoryStreamTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\AssemblyBuilderAccessTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\AssemblyBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ConstructorBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ConstructorOnTypeBuilderInstTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\CustomAttributeBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DerivedTypesTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DynamicILInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DynamicMethodTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\EnumBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\EventBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\FieldBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\GenericTypeParameterBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ILGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodOnTypeBuilderInstTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodRentalCas.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodRentalTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ModuleBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ParameterBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\PropertyBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\SignatureHelperTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\TypeBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyAlgorithmIdAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCas.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyConfigurationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCopyrightAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCultureAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyDelaySignAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyDescriptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyFileVersionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyInformationalVersionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyNameCas.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyNameTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyTest.cs" />\r
-    <Compile Include="Test\System.Reflection\BinderTests.cs" />\r
-    <Compile Include="Test\System.Reflection\ConstructorInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\CustomAttributeDataTest.cs" />\r
-    <Compile Include="Test\System.Reflection\EventInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\FieldInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\IntrospectionExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MethodBaseTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MethodInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ModuleCas.cs" />\r
-    <Compile Include="Test\System.Reflection\ModuleTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MonoGenericClassTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ParameterInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\PropertyInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ReflectedTypeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\StrongNameKeyPairCas.cs" />\r
-    <Compile Include="Test\System.Reflection\StrongNameKeyPairTest.cs" />\r
-    <Compile Include="Test\System.Reflection\TypeDelegatorTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceManagerTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceReaderCas.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceReaderTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceSetCas.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceSetTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceWriterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\AsyncVoidMethodBuilderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\ConditionalWeakTableTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\InternalsVisibleToAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeHelpersTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeWrappedExceptionCas.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeWrappedExceptionTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\TaskAwaiterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\TaskAwaiterTest_T.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\YieldAwaitableTest.cs" />\r
-    <Compile Include="Test\System.Runtime.ExceptionServices\ExceptionDispatchInfoTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\ExternalExceptionTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\GCHandleTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\MarshalTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\RuntimeEnvironmentCas.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\RuntimeEnvironmentTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\SafeHandleTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Channels\ChannelServicesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Contexts\SynchronizationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Messaging\CallContextTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinaryTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\ContextTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\SoapServicesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\SynchronizationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Formatters.Binary\BinaryFormatterCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Formatters.Binary\BinaryFormatterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ArraySerializationTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\FormatterServicesTests.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ObjectIDGeneratorTests.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ObjectManagerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationBinderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationCallbackTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationInfoTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationTest2.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceConsumptionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceConsumptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceExposureAttributeCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceExposureAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\TargetFrameworkAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\VersioningHelperCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\VersioningHelperTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\AuthorizationRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonAceTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonSecurityDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CryptoKeyAccessRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DirectoryObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DirectorySecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DiscretionaryAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\EventWaitHandleSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\FileSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\MutexAccessRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\MutexSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectAceTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectSecurity_TTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RawAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RawSecurityDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RegistrySecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\SystemAclTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CapiTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SpcTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AllTests2.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AsymmetricAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CipherModeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoAPITransformCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoConfigCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoConfigTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoStreamTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CspProviderFlagsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DESCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DESTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSACryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSASignatureDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSASignatureFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSATest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\FromBase64Transform.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HashAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACMD5Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACRIPEMD160Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA1Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA256Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA384Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA512Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\KeyedHashAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MACTripleDESTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MD5Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PaddingModeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PasswordDeriveBytesTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PKCS1MaskGenerationMethodTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RandomNumberGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\Rc2CfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RC2CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RC2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\Rfc2898DeriveBytesTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RIPEMD160ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RIPEMD160Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RNGCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSACryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAOAEPKeyExchangeDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAOAEPKeyExchangeFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1KeyExchangeDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1KeyExchangeFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1SignatureDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1SignatureFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSATest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SignatureDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithm2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithmTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ToBase64TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDESCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDESTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\CodeAccessSecurityAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\EnvironmentPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\EnvironmentPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileDialogPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileDialogPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileIOPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileIOPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\GacIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\GacIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\HostProtectionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IBuiltInPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStorageFilePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStorageFilePermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStoragePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\KeyContainerPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PermissionSetAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PrincipalPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PrincipalPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PublisherIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PublisherIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ReflectionPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ReflectionPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\RegistryPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\RegistryPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SecurityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SecurityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SiteIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SiteIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNameIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNameIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNamePublicKeyBlobTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UIPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UIPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UrlIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UrlIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ZoneIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ZoneIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\AllMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationDirectoryMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationDirectoryTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationSecurityManagerCas.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationSecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationTrustTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\CodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\EvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\FileCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\FirstMatchCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\GacMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\GacTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\HashMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\HashTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\IBuiltInEvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\NetCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PermissionRequestEvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PolicyLevelTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PolicyStatementTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PublisherMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PublisherTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\SiteMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\SiteTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\StrongNameMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\StrongNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UnionCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UrlMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UrlTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ZoneMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ZoneTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\GenericIdentityTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\GenericPrincipalTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\NTAccountTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\SecurityIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\WindowsIdentityTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\WindowsPrincipalTest.cs" />\r
-    <Compile Include="Test\System.Security\CodeAccessPermissionCas.cs" />\r
-    <Compile Include="Test\System.Security\CodeAccessPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security\HostSecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security\NamedPermissionSetTest.cs" />\r
-    <Compile Include="Test\System.Security\PermissionSetCas.cs" />\r
-    <Compile Include="Test\System.Security\PermissionSetTest.cs" />\r
-    <Compile Include="Test\System.Security\SecureStringCas.cs" />\r
-    <Compile Include="Test\System.Security\SecureStringTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityContextCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityContextTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityCriticalAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityElementTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityExceptionCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityExceptionTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityManagerCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityStateTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityTransparentAttributeTest.cs" />\r
-    <Compile Include="Test\System.Text\ASCIIEncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderReplacementFallbackBufferTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderReplacementFallbackTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderReplacementFallbackBufferTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderReplacementFallbackTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderTest.cs" />\r
-    <Compile Include="Test\System.Text\EncodingInfoTest.cs" />\r
-    <Compile Include="Test\System.Text\EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\StringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Text\TestEncoding.cs" />\r
-    <Compile Include="Test\System.Text\UnicodeEncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF32EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF7EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF8EncodingTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ConcurrentExclusiveSchedulerPairTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ParallelTests.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\Task_T_Test.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskCompletionSourceTests.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskFactoryTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskFactoryTest_T.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskSchedulerTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskTest.cs" />\r
-    <Compile Include="Test\System.Threading\AutoResetEventTest.cs" />\r
-    <Compile Include="Test\System.Threading\CancellationTokenSourceTest.cs" />\r
-    <Compile Include="Test\System.Threading\CancellationTokenTests.cs" />\r
-    <Compile Include="Test\System.Threading\CompressedStackCas.cs" />\r
-    <Compile Include="Test\System.Threading\CompressedStackTest.cs" />\r
-    <Compile Include="Test\System.Threading\CountdownEventTests.cs" />\r
-    <Compile Include="Test\System.Threading\EventWaitHandleTest.cs" />\r
-    <Compile Include="Test\System.Threading\ExecutionContextCas.cs" />\r
-    <Compile Include="Test\System.Threading\ExecutionContextTest.cs" />\r
-    <Compile Include="Test\System.Threading\InterlockedTest.cs" />\r
-    <Compile Include="Test\System.Threading\LazyInitializerTest.cs" />\r
-    <Compile Include="Test\System.Threading\ManualResetEventSlimTests.cs" />\r
-    <Compile Include="Test\System.Threading\MonitorTest.cs" />\r
-    <Compile Include="Test\System.Threading\MutexCas.cs" />\r
-    <Compile Include="Test\System.Threading\MutexTest.cs" />\r
-    <Compile Include="Test\System.Threading\ReaderWriterLockTest.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreSlimTests.cs" />\r
-    <Compile Include="Test\System.Threading\SpinLockTests.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadCas.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadLocalTests.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadPoolTest.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadTest.cs" />\r
-    <Compile Include="Test\System.Threading\TimerTest.cs" />\r
-    <Compile Include="Test\System.Threading\VolatileTest.cs" />\r
-    <Compile Include="Test\System.Threading\WaitHandleCas.cs" />\r
-    <Compile Include="Test\System.Threading\WaitHandleTest.cs" />\r
-    <Compile Include="Test\System\ActivatorCas.cs" />\r
-    <Compile Include="Test\System\ActivatorTest.cs" />\r
-    <Compile Include="Test\System\AggregateExceptionTests.cs" />\r
-    <Compile Include="Test\System\AppDomainCas.cs" />\r
-    <Compile Include="Test\System\AppDomainManagerTest.cs" />\r
-    <Compile Include="Test\System\AppDomainSetupTest.cs" />\r
-    <Compile Include="Test\System\AppDomainTest.cs" />\r
-    <Compile Include="Test\System\ApplicationIdentityTest.cs" />\r
-    <Compile Include="Test\System\ApplicationIdTest.cs" />\r
-    <Compile Include="Test\System\ArgumentExceptionTest.cs" />\r
-    <Compile Include="Test\System\ArraySegmentTest.cs" />\r
-    <Compile Include="Test\System\ArraySortArgChecks.cs" />\r
-    <Compile Include="Test\System\ArrayTest.cs" />\r
-    <Compile Include="Test\System\AttributeTest.cs" />\r
-    <Compile Include="Test\System\BadImageFormatExceptionCas.cs" />\r
-    <Compile Include="Test\System\BadImageFormatExceptionTest.cs" />\r
-    <Compile Include="Test\System\BitConverterTest.cs" />\r
-    <Compile Include="Test\System\BooleanTest.cs" />\r
-    <Compile Include="Test\System\BufferTest.cs" />\r
-    <Compile Include="Test\System\ByteTest.cs" />\r
-    <Compile Include="Test\System\CharCategoryTest.cs" />\r
-    <Compile Include="Test\System\CharEnumeratorTest.cs" />\r
-    <Compile Include="Test\System\CharTest.cs" />\r
-    <Compile Include="Test\System\ConsoleCas.cs" />\r
-    <Compile Include="Test\System\ConsoleTest.cs" />\r
-    <Compile Include="Test\System\ConvertTest.cs" />\r
-    <Compile Include="Test\System\DateTimeOffsetTest.cs" />\r
-    <Compile Include="Test\System\DateTimeTest.cs" />\r
-    <Compile Include="Test\System\DecimalFormatterTest.cs" />\r
-    <Compile Include="Test\System\DecimalTest.cs" />\r
-    <Compile Include="Test\System\DecimalTest2.cs" />\r
-    <Compile Include="Test\System\DelegateTest.cs" />\r
-    <Compile Include="Test\System\DoubleFormatterTest.cs" />\r
-    <Compile Include="Test\System\DoubleTest.cs" />\r
-    <Compile Include="Test\System\EnumTest.cs" />\r
-    <Compile Include="Test\System\EnvironmentCas.cs" />\r
-    <Compile Include="Test\System\EnvironmentTest.cs" />\r
-    <Compile Include="Test\System\ExceptionCas.cs" />\r
-    <Compile Include="Test\System\ExceptionTest.cs" />\r
-    <Compile Include="Test\System\FloatingPointFormatterTest.cs" />\r
-    <Compile Include="Test\System\GuidTest.cs" />\r
-    <Compile Include="Test\System\Int16Test.cs" />\r
-    <Compile Include="Test\System\Int32Test.cs" />\r
-    <Compile Include="Test\System\Int64Test.cs" />\r
-    <Compile Include="Test\System\IntegerFormatterTest.cs" />\r
-    <Compile Include="Test\System\IntegerTryParse.cs" />\r
-    <Compile Include="Test\System\IntPtrTest.cs" />\r
-    <Compile Include="Test\System\LazyTest.cs" />\r
-    <Compile Include="Test\System\MarshalByRefObjectCas.cs" />\r
-    <Compile Include="Test\System\MathTest.cs" />\r
-    <Compile Include="Test\System\ModuleHandleTest.cs" />\r
-    <Compile Include="Test\System\MulticastDelegate.cs" />\r
-    <Compile Include="Test\System\NullableTest.cs" />\r
-    <Compile Include="Test\System\NumberFormatterTest.cs" />\r
-    <Compile Include="Test\System\ObjectTest.cs" />\r
-    <Compile Include="Test\System\ObsoleteAttributeTest.cs" />\r
-    <Compile Include="Test\System\RandomTest.cs" />\r
-    <Compile Include="Test\System\ResolveEventArgsTest.cs" />\r
-    <Compile Include="Test\System\RuntimeFieldHandleTest.cs" />\r
-    <Compile Include="Test\System\RuntimeMethodHandleCas.cs" />\r
-    <Compile Include="Test\System\RuntimeMethodHandleTest.cs" />\r
-    <Compile Include="Test\System\RuntimeTypeHandleTest.cs" />\r
-    <Compile Include="Test\System\SByteTest.cs" />\r
-    <Compile Include="Test\System\SingleFormatterTest.cs" />\r
-    <Compile Include="Test\System\SingleTest.cs" />\r
-    <Compile Include="Test\System\StringComparerTest.cs" />\r
-    <Compile Include="Test\System\StringTest.cs" />\r
-    <Compile Include="Test\System\TimeSpanTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneTest.cs" />\r
-    <Compile Include="Test\System\TupleTest.cs" />\r
-    <Compile Include="Test\System\TypedReferenceCas.cs" />\r
-    <Compile Include="Test\System\TypeTest.cs" />\r
-    <Compile Include="Test\System\UInt16Test.cs" />\r
-    <Compile Include="Test\System\UInt32Test.cs" />\r
-    <Compile Include="Test\System\UInt64Test.cs" />\r
-    <Compile Include="Test\System\UIntPtrTest.cs" />\r
-    <Compile Include="Test\System\ValueTypeTest.cs" />\r
-    <Compile Include="Test\System\VersionTest.cs" />\r
-    <Compile Include="Test\System\WeakReferenceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
-      <Name>corlib\corlib-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-build.csproj">\r
-      <Project>{AA347918-40BB-4762-8A7F-B94836255127}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-build</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-build.csproj">\r
-      <Project>{C371834B-0195-4342-8652-BF015D18C974}</Project>\r
-      <Name>System.Core\System.Core-build</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/resources/Resources.resources">\r
-      <LogicalName>Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/class/corlib/corlib-tests-net_4_0.csproj b/mcs/class/corlib/corlib-tests-net_4_0.csproj
deleted file mode 100644 (file)
index e384732..0000000
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{31C4892F-1CD1-4AAE-8B98-F9B856B323E3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <OutputPath>bin\Debug\corlib-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>corlib_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Mono\DataConverter.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\RegistryKeyTest.cs" />\r
-    <Compile Include="Test\Mono\DataConvertTest.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentDictionaryTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentQueueTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentStackTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelConcurrentQueueTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelConcurrentStackTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\PartitionerTests.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\ComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\DictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\EqualityComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\IListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\ListTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\CollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\KeyedCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections\ArrayListTest.cs" />\r
-    <Compile Include="Test\System.Collections\BitArrayTest.cs" />\r
-    <Compile Include="Test\System.Collections\CaseInsensitiveComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections\CaseInsensitiveHashCodeProviderTest.cs" />\r
-    <Compile Include="Test\System.Collections\CollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\ComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections\DictionaryBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\DictionaryEntryTest.cs" />\r
-    <Compile Include="Test\System.Collections\HashtableTest.cs" />\r
-    <Compile Include="Test\System.Collections\NewArrayListTest.cs" />\r
-    <Compile Include="Test\System.Collections\QueueTest.cs" />\r
-    <Compile Include="Test\System.Collections\ReadOnlyCollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\SortedListTest.cs" />\r
-    <Compile Include="Test\System.Collections\StackTest.cs" />\r
-    <Compile Include="Test\System.Collections\StructuralComparisonsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractAssertTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractAssumeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractCollectionMethodsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractHelperTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractMarkerMethodsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractMustUseRewriterTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\Helpers\RunAgainstReferenceAttribute.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\Helpers\TestContractBase.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebuggerDisplayAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebuggerTypeProxyAttribute.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackFrameCas.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackFrameTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackTraceCas.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackTraceTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CalendarTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CompareInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CultureInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\DateTimeFormatInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\DaylightTimeTest.cs" />\r
-    <Compile Include="Test\System.Globalization\EastAsianLunisolarCalendarTest.cs" />\r
-    <Compile Include="Test\System.Globalization\IdnMappingTest.cs" />\r
-    <Compile Include="Test\System.Globalization\NumberFormatInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\RegionInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\SortKeyTest.cs" />\r
-    <Compile Include="Test\System.Globalization\StringInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\TextInfoTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileCas.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageTest.cs" />\r
-    <Compile Include="Test\System.IO\BinaryReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\BinaryWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\BufferedStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryCas.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryTest.cs" />\r
-    <Compile Include="Test\System.IO\FileInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\FileLoadExceptionCas.cs" />\r
-    <Compile Include="Test\System.IO\FileNotFoundExceptionCas.cs" />\r
-    <Compile Include="Test\System.IO\FileNotFoundExceptionTest.cs" />\r
-    <Compile Include="Test\System.IO\FileStreamCas.cs" />\r
-    <Compile Include="Test\System.IO\FileStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\FileSystemInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\FileTest.cs" />\r
-    <Compile Include="Test\System.IO\MemoryStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\PathCas.cs" />\r
-    <Compile Include="Test\System.IO\PathTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamCas.cs" />\r
-    <Compile Include="Test\System.IO\StreamHelperTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\StringReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\StringWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\TextReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\TextWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\UnmanagedMemoryStreamTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\AssemblyBuilderAccessTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\AssemblyBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ConstructorBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ConstructorOnTypeBuilderInstTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\CustomAttributeBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DerivedTypesTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DynamicILInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DynamicMethodTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\EnumBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\EventBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\FieldBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\GenericTypeParameterBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ILGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodOnTypeBuilderInstTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodRentalCas.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodRentalTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ModuleBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ParameterBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\PropertyBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\SignatureHelperTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\TypeBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyAlgorithmIdAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCas.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyConfigurationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCopyrightAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCultureAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyDelaySignAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyDescriptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyFileVersionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyInformationalVersionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyNameCas.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyNameTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyTest.cs" />\r
-    <Compile Include="Test\System.Reflection\BinderTests.cs" />\r
-    <Compile Include="Test\System.Reflection\ConstructorInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\CustomAttributeDataTest.cs" />\r
-    <Compile Include="Test\System.Reflection\EventInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\FieldInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\IntrospectionExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MethodBaseTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MethodInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ModuleCas.cs" />\r
-    <Compile Include="Test\System.Reflection\ModuleTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MonoGenericClassTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ParameterInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\PropertyInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ReflectedTypeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\StrongNameKeyPairCas.cs" />\r
-    <Compile Include="Test\System.Reflection\StrongNameKeyPairTest.cs" />\r
-    <Compile Include="Test\System.Reflection\TypeDelegatorTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceManagerTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceReaderCas.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceReaderTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceSetCas.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceSetTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceWriterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\AsyncVoidMethodBuilderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\ConditionalWeakTableTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\InternalsVisibleToAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeHelpersTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeWrappedExceptionCas.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeWrappedExceptionTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\TaskAwaiterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\TaskAwaiterTest_T.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\YieldAwaitableTest.cs" />\r
-    <Compile Include="Test\System.Runtime.ExceptionServices\ExceptionDispatchInfoTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\ExternalExceptionTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\GCHandleTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\MarshalTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\RuntimeEnvironmentCas.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\RuntimeEnvironmentTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\SafeHandleTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Channels\ChannelServicesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Contexts\SynchronizationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Messaging\CallContextTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinaryTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\ContextTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\SoapServicesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\SynchronizationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Formatters.Binary\BinaryFormatterCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Formatters.Binary\BinaryFormatterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ArraySerializationTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\FormatterServicesTests.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ObjectIDGeneratorTests.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ObjectManagerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationBinderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationCallbackTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationInfoTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationTest2.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceConsumptionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceConsumptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceExposureAttributeCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceExposureAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\TargetFrameworkAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\VersioningHelperCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\VersioningHelperTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\AuthorizationRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonAceTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonSecurityDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CryptoKeyAccessRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DirectoryObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DirectorySecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DiscretionaryAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\EventWaitHandleSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\FileSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\MutexAccessRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\MutexSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectAceTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectSecurity_TTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RawAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RawSecurityDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RegistrySecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\SystemAclTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CapiTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SpcTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AllTests2.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AsymmetricAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CipherModeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoAPITransformCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoConfigCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoConfigTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoStreamTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CspProviderFlagsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DESCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DESTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSACryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSASignatureDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSASignatureFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSATest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\FromBase64Transform.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HashAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACMD5Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACRIPEMD160Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA1Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA256Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA384Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA512Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\KeyedHashAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MACTripleDESTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MD5Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PaddingModeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PasswordDeriveBytesTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PKCS1MaskGenerationMethodTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RandomNumberGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\Rc2CfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RC2CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RC2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\Rfc2898DeriveBytesTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RIPEMD160ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RIPEMD160Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RNGCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSACryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAOAEPKeyExchangeDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAOAEPKeyExchangeFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1KeyExchangeDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1KeyExchangeFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1SignatureDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1SignatureFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSATest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SignatureDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithm2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithmTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ToBase64TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDESCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDESTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\CodeAccessSecurityAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\EnvironmentPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\EnvironmentPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileDialogPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileDialogPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileIOPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileIOPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\GacIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\GacIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\HostProtectionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IBuiltInPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStorageFilePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStorageFilePermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStoragePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\KeyContainerPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PermissionSetAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PrincipalPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PrincipalPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PublisherIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PublisherIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ReflectionPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ReflectionPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\RegistryPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\RegistryPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SecurityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SecurityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SiteIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SiteIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNameIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNameIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNamePublicKeyBlobTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UIPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UIPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UrlIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UrlIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ZoneIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ZoneIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\AllMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationDirectoryMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationDirectoryTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationSecurityManagerCas.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationSecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationTrustTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\CodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\EvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\FileCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\FirstMatchCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\GacMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\GacTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\HashMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\HashTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\IBuiltInEvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\NetCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PermissionRequestEvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PolicyLevelTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PolicyStatementTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PublisherMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PublisherTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\SiteMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\SiteTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\StrongNameMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\StrongNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UnionCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UrlMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UrlTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ZoneMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ZoneTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\GenericIdentityTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\GenericPrincipalTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\NTAccountTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\SecurityIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\WindowsIdentityTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\WindowsPrincipalTest.cs" />\r
-    <Compile Include="Test\System.Security\CodeAccessPermissionCas.cs" />\r
-    <Compile Include="Test\System.Security\CodeAccessPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security\HostSecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security\NamedPermissionSetTest.cs" />\r
-    <Compile Include="Test\System.Security\PermissionSetCas.cs" />\r
-    <Compile Include="Test\System.Security\PermissionSetTest.cs" />\r
-    <Compile Include="Test\System.Security\SecureStringCas.cs" />\r
-    <Compile Include="Test\System.Security\SecureStringTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityContextCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityContextTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityCriticalAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityElementTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityExceptionCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityExceptionTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityManagerCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityStateTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityTransparentAttributeTest.cs" />\r
-    <Compile Include="Test\System.Text\ASCIIEncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderReplacementFallbackBufferTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderReplacementFallbackTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderReplacementFallbackBufferTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderReplacementFallbackTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderTest.cs" />\r
-    <Compile Include="Test\System.Text\EncodingInfoTest.cs" />\r
-    <Compile Include="Test\System.Text\EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\StringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Text\TestEncoding.cs" />\r
-    <Compile Include="Test\System.Text\UnicodeEncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF32EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF7EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF8EncodingTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ConcurrentExclusiveSchedulerPairTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ParallelTests.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\Task_T_Test.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskCompletionSourceTests.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskFactoryTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskFactoryTest_T.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskSchedulerTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskTest.cs" />\r
-    <Compile Include="Test\System.Threading\AutoResetEventTest.cs" />\r
-    <Compile Include="Test\System.Threading\CancellationTokenSourceTest.cs" />\r
-    <Compile Include="Test\System.Threading\CancellationTokenTests.cs" />\r
-    <Compile Include="Test\System.Threading\CompressedStackCas.cs" />\r
-    <Compile Include="Test\System.Threading\CompressedStackTest.cs" />\r
-    <Compile Include="Test\System.Threading\CountdownEventTests.cs" />\r
-    <Compile Include="Test\System.Threading\EventWaitHandleTest.cs" />\r
-    <Compile Include="Test\System.Threading\ExecutionContextCas.cs" />\r
-    <Compile Include="Test\System.Threading\ExecutionContextTest.cs" />\r
-    <Compile Include="Test\System.Threading\InterlockedTest.cs" />\r
-    <Compile Include="Test\System.Threading\LazyInitializerTest.cs" />\r
-    <Compile Include="Test\System.Threading\ManualResetEventSlimTests.cs" />\r
-    <Compile Include="Test\System.Threading\MonitorTest.cs" />\r
-    <Compile Include="Test\System.Threading\MutexCas.cs" />\r
-    <Compile Include="Test\System.Threading\MutexTest.cs" />\r
-    <Compile Include="Test\System.Threading\ReaderWriterLockTest.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreSlimTests.cs" />\r
-    <Compile Include="Test\System.Threading\SpinLockTests.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadCas.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadLocalTests.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadPoolTest.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadTest.cs" />\r
-    <Compile Include="Test\System.Threading\TimerTest.cs" />\r
-    <Compile Include="Test\System.Threading\VolatileTest.cs" />\r
-    <Compile Include="Test\System.Threading\WaitHandleCas.cs" />\r
-    <Compile Include="Test\System.Threading\WaitHandleTest.cs" />\r
-    <Compile Include="Test\System\ActivatorCas.cs" />\r
-    <Compile Include="Test\System\ActivatorTest.cs" />\r
-    <Compile Include="Test\System\AggregateExceptionTests.cs" />\r
-    <Compile Include="Test\System\AppDomainCas.cs" />\r
-    <Compile Include="Test\System\AppDomainManagerTest.cs" />\r
-    <Compile Include="Test\System\AppDomainSetupTest.cs" />\r
-    <Compile Include="Test\System\AppDomainTest.cs" />\r
-    <Compile Include="Test\System\ApplicationIdentityTest.cs" />\r
-    <Compile Include="Test\System\ApplicationIdTest.cs" />\r
-    <Compile Include="Test\System\ArgumentExceptionTest.cs" />\r
-    <Compile Include="Test\System\ArraySegmentTest.cs" />\r
-    <Compile Include="Test\System\ArraySortArgChecks.cs" />\r
-    <Compile Include="Test\System\ArrayTest.cs" />\r
-    <Compile Include="Test\System\AttributeTest.cs" />\r
-    <Compile Include="Test\System\BadImageFormatExceptionCas.cs" />\r
-    <Compile Include="Test\System\BadImageFormatExceptionTest.cs" />\r
-    <Compile Include="Test\System\BitConverterTest.cs" />\r
-    <Compile Include="Test\System\BooleanTest.cs" />\r
-    <Compile Include="Test\System\BufferTest.cs" />\r
-    <Compile Include="Test\System\ByteTest.cs" />\r
-    <Compile Include="Test\System\CharCategoryTest.cs" />\r
-    <Compile Include="Test\System\CharEnumeratorTest.cs" />\r
-    <Compile Include="Test\System\CharTest.cs" />\r
-    <Compile Include="Test\System\ConsoleCas.cs" />\r
-    <Compile Include="Test\System\ConsoleTest.cs" />\r
-    <Compile Include="Test\System\ConvertTest.cs" />\r
-    <Compile Include="Test\System\DateTimeOffsetTest.cs" />\r
-    <Compile Include="Test\System\DateTimeTest.cs" />\r
-    <Compile Include="Test\System\DecimalFormatterTest.cs" />\r
-    <Compile Include="Test\System\DecimalTest.cs" />\r
-    <Compile Include="Test\System\DecimalTest2.cs" />\r
-    <Compile Include="Test\System\DelegateTest.cs" />\r
-    <Compile Include="Test\System\DoubleFormatterTest.cs" />\r
-    <Compile Include="Test\System\DoubleTest.cs" />\r
-    <Compile Include="Test\System\EnumTest.cs" />\r
-    <Compile Include="Test\System\EnvironmentCas.cs" />\r
-    <Compile Include="Test\System\EnvironmentTest.cs" />\r
-    <Compile Include="Test\System\ExceptionCas.cs" />\r
-    <Compile Include="Test\System\ExceptionTest.cs" />\r
-    <Compile Include="Test\System\FloatingPointFormatterTest.cs" />\r
-    <Compile Include="Test\System\GuidTest.cs" />\r
-    <Compile Include="Test\System\Int16Test.cs" />\r
-    <Compile Include="Test\System\Int32Test.cs" />\r
-    <Compile Include="Test\System\Int64Test.cs" />\r
-    <Compile Include="Test\System\IntegerFormatterTest.cs" />\r
-    <Compile Include="Test\System\IntegerTryParse.cs" />\r
-    <Compile Include="Test\System\IntPtrTest.cs" />\r
-    <Compile Include="Test\System\LazyTest.cs" />\r
-    <Compile Include="Test\System\MarshalByRefObjectCas.cs" />\r
-    <Compile Include="Test\System\MathTest.cs" />\r
-    <Compile Include="Test\System\ModuleHandleTest.cs" />\r
-    <Compile Include="Test\System\MulticastDelegate.cs" />\r
-    <Compile Include="Test\System\NullableTest.cs" />\r
-    <Compile Include="Test\System\NumberFormatterTest.cs" />\r
-    <Compile Include="Test\System\ObjectTest.cs" />\r
-    <Compile Include="Test\System\ObsoleteAttributeTest.cs" />\r
-    <Compile Include="Test\System\RandomTest.cs" />\r
-    <Compile Include="Test\System\ResolveEventArgsTest.cs" />\r
-    <Compile Include="Test\System\RuntimeFieldHandleTest.cs" />\r
-    <Compile Include="Test\System\RuntimeMethodHandleCas.cs" />\r
-    <Compile Include="Test\System\RuntimeMethodHandleTest.cs" />\r
-    <Compile Include="Test\System\RuntimeTypeHandleTest.cs" />\r
-    <Compile Include="Test\System\SByteTest.cs" />\r
-    <Compile Include="Test\System\SingleFormatterTest.cs" />\r
-    <Compile Include="Test\System\SingleTest.cs" />\r
-    <Compile Include="Test\System\StringComparerTest.cs" />\r
-    <Compile Include="Test\System\StringTest.cs" />\r
-    <Compile Include="Test\System\TimeSpanTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneTest.cs" />\r
-    <Compile Include="Test\System\TupleTest.cs" />\r
-    <Compile Include="Test\System\TypedReferenceCas.cs" />\r
-    <Compile Include="Test\System\TypeTest.cs" />\r
-    <Compile Include="Test\System\UInt16Test.cs" />\r
-    <Compile Include="Test\System\UInt32Test.cs" />\r
-    <Compile Include="Test\System\UInt64Test.cs" />\r
-    <Compile Include="Test\System\UIntPtrTest.cs" />\r
-    <Compile Include="Test\System\ValueTypeTest.cs" />\r
-    <Compile Include="Test\System\VersionTest.cs" />\r
-    <Compile Include="Test\System\WeakReferenceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_2_0.csproj">\r
-      <Project>{2F9C802E-F1DA-4779-80B2-5AACE033D398}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_2_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">\r
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>\r
-      <Name>System.Core\System.Core-net_2_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/resources/Resources.resources">\r
-      <LogicalName>Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-
index 5268a3a9766a55efbdb9a4bf1ea874691d021764..80f732e70706f654d3b1f9ff9e9d9d1a735f4277 100644 (file)
@@ -678,7 +678,6 @@ System.Runtime.CompilerServices/IDispatchConstantAttribute.cs
 System.Runtime.CompilerServices/IUnknownConstantAttribute.cs
 System.Runtime.CompilerServices/IndexerNameAttribute.cs
 System.Runtime.CompilerServices/INotifyCompletion.cs
-System.Runtime.CompilerServices/InternalsVisibleToAttribute.cs
 System.Runtime.CompilerServices/IsBoxed.cs
 System.Runtime.CompilerServices/IsByValue.cs
 System.Runtime.CompilerServices/IsConst.cs
@@ -1641,28 +1640,11 @@ System.Threading.Tasks/TaskContinuation.cs
 System.Threading.Tasks/TaskSchedulerException.cs
 System.Threading.Tasks/TaskConstants.cs
 System.Threading.Tasks/TaskConstants_T.cs
-System.Collections.Concurrent/OrderablePartitioner.cs
-System.Collections.Concurrent/ConcurrentDictionary.cs
-System.Collections.Concurrent/Partitioner.cs
-System.Collections.Concurrent/ConcurrentQueue.cs
-System.Collections.Concurrent/EnumerablePartitionerOptions.cs
-System.Collections.Concurrent.Partitioners/ListPartitioner.cs
-System.Collections.Concurrent.Partitioners/EnumerablePartitioner.cs
-System.Collections.Concurrent.Partitioners/UserRangePartitioner.cs
-System.Collections.Concurrent/IProducerConsumerCollection.cs
-System.Collections.Concurrent/ConcurrentStack.cs
-System.Collections.Concurrent/SplitOrderedList.cs
 System.Collections.Concurrent/ConcurrentOrderedList.cs
 System.Threading/LazyInitializer.cs
-System.Threading/CountdownEvent.cs
-System.Threading/CancellationTokenSource.cs
-System.Threading/CancellationToken.cs
-System.Threading/SpinWait.cs
 System.Threading/SemaphoreSlim.cs
-System.Threading/CancellationTokenRegistration.cs
 System.Threading/SpinLock.cs
 System.Threading/AtomicBoolean.cs
-System.Threading/ManualResetEventSlim.cs
 System.Threading/ThreadLocal.cs
 System.Threading/Watch.cs
 System.Threading.Tasks/ParallelOptions.cs
@@ -1675,3 +1657,26 @@ System.Threading.Tasks/SynchronizationContextScheduler.cs
 System.Threading.Tasks/UnobservedTaskExceptionEventArgs.cs
 System.Threading.Tasks/TpScheduler.cs
 System.Threading.Tasks/TaskExtensionsImpl.cs
+
+ReferenceSources/Array.cs
+ReferenceSources/Environment.cs
+ReferenceSources/ExecutionContext.cs
+ReferenceSources/Helpers.cs
+../../../external/referencesource/mscorlib/system/throwhelper.cs
+../../../external/referencesource/mscorlib/system/collections/generic/debugview.cs
+../../../external/referencesource/mscorlib/system/collections/Concurrent/ConcurrentDictionary.cs
+../../../external/referencesource/mscorlib/system/collections/Concurrent/ConcurrentQueue.cs
+../../../external/referencesource/mscorlib/system/collections/Concurrent/ConcurrentStack.cs
+../../../external/referencesource/mscorlib/system/collections/Concurrent/IProducerConsumerCollection.cs
+../../../external/referencesource/mscorlib/system/collections/Concurrent/OrderablePartitioner.cs
+../../../external/referencesource/mscorlib/system/collections/Concurrent/Partitioner.cs
+../../../external/referencesource/mscorlib/system/collections/Concurrent/PartitionerStatic.cs
+
+../../../external/referencesource/mscorlib/system/threading/CancellationToken.cs
+../../../external/referencesource/mscorlib/system/threading/CancellationTokenRegistration.cs
+../../../external/referencesource/mscorlib/system/threading/CancellationTokenSource.cs
+../../../external/referencesource/mscorlib/system/threading/CountdownEvent.cs
+../../../external/referencesource/mscorlib/system/threading/ManualResetEventSlim.cs
+../../../external/referencesource/mscorlib/system/threading/SpinWait.cs
+
+../../../external/referencesource/mscorlib/system/runtime/compilerservices/internalsvisibletoattribute.cs
index 8cb367e813ee930123e25bbb3a9bb94b1d3fe62c..34e50f9445f02e66d09bf1c41892fd1392482191 100644 (file)
@@ -177,6 +177,7 @@ System.Runtime.CompilerServices/ConditionalWeakTableTest.cs
 System.Runtime.CompilerServices/InternalsVisibleToAttributeTest.cs
 System.Runtime.CompilerServices/RuntimeHelpersTest.cs
 System.Runtime.CompilerServices/RuntimeWrappedExceptionTest.cs
+System.Runtime.CompilerServices/AsyncTaskMethodBuilderTest.cs
 System.Runtime.CompilerServices/AsyncVoidMethodBuilderTest.cs
 System.Runtime.CompilerServices/TaskAwaiterTest.cs
 System.Runtime.CompilerServices/TaskAwaiterTest_T.cs
diff --git a/mcs/class/monodoc/monodoc-net_4_0.csproj b/mcs/class/monodoc/monodoc-net_4_0.csproj
deleted file mode 100644 (file)
index 7e4b6cb..0000000
+++ /dev/null
@@ -1,756 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2AA19B52-F8DE-4112-9930-7BE4DF293A75}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>618,612,672,809,1699,169,164,162,168,219,618,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>monodoc</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>618,612,672,809,1699,169,164,162,168,219,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;LEGACY_MODE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>618,612,672,809,1699,169,164,162,168,219,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>LEGACY_MODE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Analyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\ASCIIFoldingFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\BaseCharFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CachingTokenFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharArraySet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\ISOLatin1AccentFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\KeywordAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\KeywordTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LengthFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LetterTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LowerCaseFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LowerCaseTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\MappingCharFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\NormalizeCharMap.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\NumericTokenStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\PerFieldAnalyzerWrapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\PorterStemFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\PorterStemmer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\SimpleAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardTokenizerImpl.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\StopAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\StopFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\TeeSinkTokenFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Token.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\FlagsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IFlagsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IOffsetAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IPayloadAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IPositionIncrementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\ITermAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\ITypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\OffsetAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\PayloadAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\PositionIncrementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\TermAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\TypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\TokenFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\TokenStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\WhitespaceAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\WhitespaceTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\WordlistLoader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\AbstractField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\CompressionTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\DateField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\DateTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\Document.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\Field.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\Fieldable.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\FieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\FieldSelectorResult.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\LoadFirstFieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\MapFieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\NumberTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\NumericField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\SetBasedFieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\AbstractAllTermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\AllTermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\BufferedDeletes.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ByteBlockPool.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ByteSliceReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ByteSliceWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CharBlockPool.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CheckIndex.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CompoundFileReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CompoundFileWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ConcurrentMergeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CorruptIndexException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DefaultSkipListReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DefaultSkipListWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DirectoryReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumers.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumersPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumersPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldProcessor.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldProcessorPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldProcessorPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocInverter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocInverterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocInverterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocumentsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocumentsWriterThreadState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldInfos.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldInvertState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldReaderException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldSortedTermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldsReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FilterIndexReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsDocsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsDocsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsFieldsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsFieldsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsPositionsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsPositionsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsTermsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsTermsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxFieldMergeState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxTermsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxTermsWriterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxTermsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexCommit.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexDeletionPolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexFileDeleter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexFileNameFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexFileNames.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IntBlockPool.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocEndConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocEndConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocEndConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\KeepOnlyLastCommitDeletionPolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\LogByteSizeMergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\LogDocMergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\LogMergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MergeDocIDRemapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MergeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultiLevelSkipListReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultiLevelSkipListWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultipleTermPositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultiReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\NormsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\NormsWriterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\NormsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ParallelReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\Payload.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\PositionBasedTermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\RawPostingList.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ReadOnlyDirectoryReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ReadOnlySegmentReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ReusableStringReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentInfos.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentMergeInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentMergeQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentMerger.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermPositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermPositionVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentWriteState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SerialMergeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SnapshotDeletionPolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SortedTermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\StaleReaderException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\StoredFieldsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\StoredFieldsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\Term.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermBuffer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermFreqVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermInfosReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermInfosWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermPositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermPositionVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHash.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorEntry.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorEntryFreqSortedComparator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorOffsetInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsTermsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsTermsWriterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsTermsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\LucenePackage.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\LZOCompressor.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\INLSException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\Message.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\MessageImpl.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\NLS.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\CharStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\FastCharStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\MultiFieldQueryParser.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\ParseException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\QueryParser.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\QueryParserConstants.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\QueryParserTokenManager.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\Token.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\TokenMgrError.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanClause.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanScorer2.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\CachingSpanFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\CachingWrapperFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Collector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ComplexExplanation.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ConjunctionScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ConstantScoreQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DefaultSimilarity.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DisjunctionMaxQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DisjunctionMaxScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DisjunctionSumScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DocIdSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DocIdSetIterator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ExactPhraseScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Explanation.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCacheImpl.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCacheRangeFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCacheTermsFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldComparator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldComparatorSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldDoc.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldDocSortedHitQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldValueHitQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Filter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredDocIdSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredDocIdSetIterator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilterManager.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ByteFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\CustomScoreProvider.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\CustomScoreQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\DocValues.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\FieldCacheSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\FieldScoreQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\FloatFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\IntFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\OrdFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ReverseOrdFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ShortFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ValueSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ValueSourceQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FuzzyQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FuzzyTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\HitQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\IndexSearcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MatchAllDocsQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiPhraseQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiSearcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiTermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiTermQueryWrapperFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\NumericRangeFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\NumericRangeQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ParallelMultiSearcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\AveragePayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\MaxPayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\MinPayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadNearQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadSpanUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadTermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhrasePositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhraseQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhraseQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhraseScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PositiveScoresOnlyCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PrefixFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PrefixQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PrefixTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Query.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\QueryTermVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\QueryWrapperFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ReqExclScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ReqOptSumScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ScoreCachingWrappingScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ScoreDoc.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Scorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Searchable.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Searcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Similarity.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SimilarityDelegator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SingleTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SloppyPhraseScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Sort.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SortField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SpanFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SpanFilterResult.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SpanQueryFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\FieldMaskingSpanQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\NearSpansOrdered.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\NearSpansUnordered.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanFirstQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanNearQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanNotQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanOrQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\Spans.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanTermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanWeight.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\TermSpans.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermRangeFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermRangeQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermRangeTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TimeLimitingCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopDocsCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopFieldCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopFieldDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopScoreDocCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Weight.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\WildcardQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\WildcardTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\AlreadyClosedException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\BufferedIndexInput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\BufferedIndexOutput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\CheckSumIndexInput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\CheckSumIndexOutput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\Directory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\FileSwitchDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\FSDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\FSLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\IndexInput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\IndexOutput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\Lock.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockObtainFailedException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockReleaseFailedException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockStressTest.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockVerifyServer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\MMapDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NativeFSLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NIOFSDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NoLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NoSuchDirectoryException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMFile.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMInputStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMOutputStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\SimpleFSDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\SimpleFSLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\SingleInstanceLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\VerifyingLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\AppSettings.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\AttributeImplItem.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\BitSetSupport.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\BuildType.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Character.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\CloseableThreadLocalProfiler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\CollectionsHelper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compare.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\ConcurrentDictionary.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\Func.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\ISet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\SetFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\SortedSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\ThreadLocal.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\WrappedHashSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\CRC32.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Cryptography.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Deflater.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Double.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\EquatableList.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\FileSupport.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\GeneralKeyedCollection.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\HashMap.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\IChecksum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Inflater.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\IThreadRunnable.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Number.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\OS.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\SharpZipLib.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Single.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\TextSupport.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\ThreadClass.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\ThreadLock.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\WeakDictionary.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ArrayUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Attribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\AttributeSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\AverageGuessMemoryModel.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\BitUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\BitVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Cache\Cache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Cache\SimpleLRUCache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Cache\SimpleMapCache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\CloseableThreadLocal.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Constants.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\DocIdBitSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\FieldCacheSanityChecker.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\IAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\IdentityDictionary.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\IndexableBinaryStringTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\MapOfSets.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\MemoryModel.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\NumericUtils.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\OpenBitSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\OpenBitSetDISI.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\OpenBitSetIterator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\PriorityQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\RamUsageEstimator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ReaderUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ScorerDocQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SimpleStringInterner.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SmallFloat.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SortedVIntList.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SorterTemplate.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\StringHelper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\StringInterner.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ToStringUtils.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\UnicodeUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Version.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Documentation\ManifestResourceResolver.cs" />\r
-    <Compile Include="Mono.Documentation\XmlDocUtils.cs" />\r
-    <Compile Include="Mono.Utilities\colorizer.cs" />\r
-    <Compile Include="Mono.Utilities\LRUCache.cs" />\r
-    <Compile Include="Monodoc.Ecma\EcmaDesc.cs" />\r
-    <Compile Include="Monodoc.Ecma\EcmaUrlParser.cs" />\r
-    <Compile Include="Monodoc.Ecma\EcmaUrlTokenizer.cs" />\r
-    <Compile Include="Monodoc\cache.cs" />\r
-    <Compile Include="Monodoc\caches\FileCache.cs" />\r
-    <Compile Include="Monodoc\caches\NullCache.cs" />\r
-    <Compile Include="Monodoc\generator.cs" />\r
-    <Compile Include="Monodoc\generators\html\Addin2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Ecma2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Ecmaspec2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Error2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Idem.cs" />\r
-    <Compile Include="Monodoc\generators\html\Man2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\MonoBook2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Toc2Html.cs" />\r
-    <Compile Include="Monodoc\generators\HtmlGenerator.cs" />\r
-    <Compile Include="Monodoc\generators\RawGenerator.cs" />\r
-    <Compile Include="Monodoc\HelpSource.cs" />\r
-    <Compile Include="Monodoc\HelpSource_Legacy.cs" />\r
-    <Compile Include="Monodoc\index.cs" />\r
-    <Compile Include="Monodoc\Node.cs" />\r
-    <Compile Include="Monodoc\Node_Legacy.cs" />\r
-    <Compile Include="Monodoc\Provider.cs" />\r
-    <Compile Include="Monodoc\providers\addins-provider.cs" />\r
-    <Compile Include="Monodoc\providers\EcmaDoc.cs" />\r
-    <Compile Include="Monodoc\providers\ecma-provider.cs" />\r
-    <Compile Include="Monodoc\providers\ecmaspec-provider.cs" />\r
-    <Compile Include="Monodoc\providers\ecmauncompiled-provider.cs" />\r
-    <Compile Include="Monodoc\providers\error-provider.cs" />\r
-    <Compile Include="Monodoc\providers\man-provider.cs" />\r
-    <Compile Include="Monodoc\providers\xhtml-provider.cs" />\r
-    <Compile Include="Monodoc\RootTree.cs" />\r
-    <Compile Include="Monodoc\RootTree_Legacy.cs" />\r
-    <Compile Include="Monodoc\SearchableDocument.cs" />\r
-    <Compile Include="Monodoc\SearchableIndex.cs" />\r
-    <Compile Include="Monodoc\settings.cs" />\r
-    <Compile Include="Monodoc\settings_Legacy.cs" />\r
-    <Compile Include="Monodoc\storage.cs" />\r
-    <Compile Include="Monodoc\storage\NullStorage.cs" />\r
-    <Compile Include="Monodoc\storage\UncompiledDocStorage.cs" />\r
-    <Compile Include="Monodoc\storage\ZipStorage.cs" />\r
-    <Compile Include="Monodoc\Tree.cs" />\r
-    <Compile Include="Monodoc\TypeUtils.cs" />\r
-  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_4_0.csproj">\r
-      <Project>{D7EC98B8-2158-4304-9E84-D19D50CE16E8}</Project>\r
-      <Name>ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_0.csproj">\r
-      <Project>{9D657157-DCA0-45BF-BB67-1FFB3CD8823A}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">\r
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../../docs/monodoc.xml">\r
-      <LogicalName>monodoc.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/base.css">\r
-      <LogicalName>base.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/ecmaspec-html-css.xsl">\r
-      <LogicalName>ecmaspec-html-css.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/ecmaspec-html.xsl">\r
-      <LogicalName>ecmaspec-html.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/ecmaspec.css">\r
-      <LogicalName>ecmaspec.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/helper.js">\r
-      <LogicalName>helper.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/home.html">\r
-      <LogicalName>home.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/creativecommons.png">\r
-      <LogicalName>creativecommons.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/Lminus.gif">\r
-      <LogicalName>Lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/Lplus.gif">\r
-      <LogicalName>Lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-html-format.xsl">\r
-      <LogicalName>mdoc-html-format.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-html-utils.xsl">\r
-      <LogicalName>mdoc-html-utils.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-sections-css.xsl">\r
-      <LogicalName>mdoc-sections-css.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-sections.xsl">\r
-      <LogicalName>mdoc-sections.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma-css.xsl">\r
-      <LogicalName>mono-ecma-css.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma-impl.xsl">\r
-      <LogicalName>mono-ecma-impl.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma.css">\r
-      <LogicalName>mono-ecma.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma.xsl">\r
-      <LogicalName>mono-ecma.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/toc-html.xsl">\r
-      <LogicalName>toc-html.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/bc_bg.png">\r
-      <LogicalName>bc_bg.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/bc_separator.png">\r
-      <LogicalName>bc_separator.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/error.png">\r
-      <LogicalName>error.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/hatch.png">\r
-      <LogicalName>hatch.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/headerbg.png">\r
-      <LogicalName>headerbg.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/help.png">\r
-      <LogicalName>help.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/house.png">\r
-      <LogicalName>house.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/members.png">\r
-      <LogicalName>members.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/namespace.png">\r
-      <LogicalName>namespace.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privclass.png">\r
-      <LogicalName>privclass.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privdelegate.png">\r
-      <LogicalName>privdelegate.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privenumeration.png">\r
-      <LogicalName>privenumeration.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privevent.png">\r
-      <LogicalName>privevent.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privextension.png">\r
-      <LogicalName>privextension.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privfield.png">\r
-      <LogicalName>privfield.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privinterface.png">\r
-      <LogicalName>privinterface.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privmethod.png">\r
-      <LogicalName>privmethod.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privproperty.png">\r
-      <LogicalName>privproperty.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privstructure.png">\r
-      <LogicalName>privstructure.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protclass.png">\r
-      <LogicalName>protclass.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protdelegate.png">\r
-      <LogicalName>protdelegate.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protenumeration.png">\r
-      <LogicalName>protenumeration.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protevent.png">\r
-      <LogicalName>protevent.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protextension.png">\r
-      <LogicalName>protextension.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protfield.png">\r
-      <LogicalName>protfield.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protinterface.png">\r
-      <LogicalName>protinterface.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protmethod.png">\r
-      <LogicalName>protmethod.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protproperty.png">\r
-      <LogicalName>protproperty.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protstructure.png">\r
-      <LogicalName>protstructure.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubclass.png">\r
-      <LogicalName>pubclass.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubdelegate.png">\r
-      <LogicalName>pubdelegate.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubenumeration.png">\r
-      <LogicalName>pubenumeration.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubevent.png">\r
-      <LogicalName>pubevent.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubextension.png">\r
-      <LogicalName>pubextension.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubfield.png">\r
-      <LogicalName>pubfield.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubinterface.png">\r
-      <LogicalName>pubinterface.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubmethod.png">\r
-      <LogicalName>pubmethod.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubproperty.png">\r
-      <LogicalName>pubproperty.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubstructure.png">\r
-      <LogicalName>pubstructure.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/reference.png">\r
-      <LogicalName>reference.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/treebg.png">\r
-      <LogicalName>treebg.png</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-</Project>\r
-\r
diff --git a/mcs/class/monodoc/monodoc-tests-net_4_0.csproj b/mcs/class/monodoc/monodoc-tests-net_4_0.csproj
deleted file mode 100644 (file)
index 13da934..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EB85CDE6-49AC-451D-93EC-8EC4A67A3586}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>618,612,672,809,1699</NoWarn>\r
-    <OutputPath>bin\Debug\monodoc-tests-net_4_0</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>monodoc_test_net_4_0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>618,612,672,809,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;LEGACY_MODE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>618,612,672,809,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>LEGACY_MODE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Monodoc.Ecma\EcmaUrlTests.cs" />\r
-    <Compile Include="Test\Monodoc.Generators\AvoidCDataTextReaderTests.cs" />\r
-    <Compile Include="Test\Monodoc.Generators\RawGeneratorTests.cs" />\r
-    <Compile Include="Test\Monodoc\EcmaDocTests.cs" />\r
-    <Compile Include="Test\Monodoc\HelpSourceTests.cs" />\r
-    <Compile Include="Test\Monodoc\NodeTest.cs" />\r
-    <Compile Include="Test\Monodoc\RootTreeTest.cs" />\r
-    <Compile Include="Test\Monodoc\SettingsTest.cs" />\r
-    <Compile Include="Test\Monodoc\TreeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">\r
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>\r
-      <Name>corlib\corlib-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\monodoc\monodoc-net_4_0.csproj">\r
-      <Project>{2AA19B52-F8DE-4112-9930-7BE4DF293A75}</Project>\r
-      <Name>monodoc\monodoc-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">\r
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>\r
-      <Name>System\System-net_4_0-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">\r
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>\r
-      <Name>System.XML\System.Xml-net_4_0-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-
diff --git a/mcs/errors/CS0165-51-lib.cs b/mcs/errors/CS0165-51-lib.cs
new file mode 100644 (file)
index 0000000..3576576
--- /dev/null
@@ -0,0 +1,4 @@
+public struct S<T> where T : class
+{
+    private T t;
+}
diff --git a/mcs/errors/CS1993-corlib.cs b/mcs/errors/CS1993-corlib.cs
new file mode 100644 (file)
index 0000000..2e5128b
--- /dev/null
@@ -0,0 +1,64 @@
+//
+// The minimal mscorlib implementation
+//
+
+namespace System
+{
+       public partial class Object {}
+
+       public partial struct Byte {}
+       public partial struct Int16 {}
+       public partial struct Int32 {}
+       public partial struct Int64 {}
+       public partial struct Single {}
+       public partial struct Double{}
+       public partial struct Char {}
+       public partial struct Boolean {}
+       public partial struct SByte {}
+       public partial struct UInt16 {}
+       public partial struct UInt32 {}
+       public partial struct UInt64 {}
+       public partial struct IntPtr {}
+       public partial struct UIntPtr {}
+       public partial struct Decimal { }
+       public partial class String { }
+       public partial class Delegate {}
+       public partial class MulticastDelegate {}
+       public partial class Array {}
+       public partial class Exception {}
+       public partial class Type {}
+       public partial class ValueType {}
+       public partial class Enum {}
+       public partial class Attribute {}
+       public partial struct Void {}
+       public partial class ParamArrayAttribute {}
+       public partial class DefaultMemberAttribute {}
+       public partial struct RuntimeTypeHandle {}
+       public partial struct RuntimeFieldHandle {}
+
+       public partial interface IDisposable {}
+
+       public delegate void Action ();
+}
+       
+namespace System.Runtime.InteropServices
+{
+       public partial class OutAttribute {}
+}
+               
+
+namespace System.Collections
+{
+       public partial interface IEnumerable {}
+       public partial interface IEnumerator {}
+}
+
+namespace System.Reflection
+{
+       public partial class DefaultMemberAttribute {}
+}
+
+namespace System.Runtime.CompilerServices
+{
+       public class ExtensionAttribute : Attribute {}
+}
index 95ce7d7c3caf2e9e54b000b12d9739a95c3d05db..e809a14da445035d3509d1785fc9cedb36f0eb72 100644 (file)
@@ -22,7 +22,7 @@ DISTFILES = \
 
 TEST_SUPPORT_FILES = \
        CS0012-lib.dll CS0012-2-lib.dll CS0012-3-lib.dll CS0012-4-lib.dll CS0012-5-lib.dll CS0012-6-lib.dll CS0012-9-lib.dll CS0012-10-lib.dll CS0012-11-lib.dll CS0012-12-lib.dll CS0012-13-lib.dll CS0012-14-lib.dll CS0012-15-lib.dll CS0012-16-lib.dll CS0012-17-lib.dll CS0012-18-lib.dll CS0012-21-lib.dll CS0012-22-lib.dll CS0012-23-lib.dll CS0012-24-lib.dll CS0019-71-lib.dll CS0029-26-lib.dll \
-       CS0103-2-lib.dll CS0118-2-lib.dll CS0122-8-lib.dll CS0122-10-lib.dll CS0122-14-lib.dll CS0122-15-lib.dll CS0122-19-lib.dll CS0122-35-lib.dll CS0122-36-lib.dll CS0143-lib.dll CS0144-3-lib.dll CS0165-19-lib.dll \
+       CS0103-2-lib.dll CS0118-2-lib.dll CS0122-8-lib.dll CS0122-10-lib.dll CS0122-14-lib.dll CS0122-15-lib.dll CS0122-19-lib.dll CS0122-35-lib.dll CS0122-36-lib.dll CS0143-lib.dll CS0144-3-lib.dll CS0165-19-lib.dll CS0165-51-lib.dll \
        CS0205-3-lib.dll CS0246-29-lib.dll CS0229-3-lib.dll CS0229-4-lib.dll CS0266-25-lib.dll \
        CS0315-2-lib.dll \
        CS0425-7-lib.dll CS0433-lib.dll CS0433-2-lib.dll \
diff --git a/mcs/errors/cs0103-15.cs b/mcs/errors/cs0103-15.cs
new file mode 100644 (file)
index 0000000..b244844
--- /dev/null
@@ -0,0 +1,10 @@
+// CS0103: The name `List' does not exist in the current context
+// Line: 8
+
+class X
+{
+       public static void Main ()
+       {
+               var r = nameof (List<int2>);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs0103-16.cs b/mcs/errors/cs0103-16.cs
new file mode 100644 (file)
index 0000000..da73c33
--- /dev/null
@@ -0,0 +1,10 @@
+// CS0103: The name `nameof' does not exist in the current context
+// Line: 8
+
+static class C
+{
+       static void Main ()
+       {
+               string s = nameof (nameof);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs0117-9.cs b/mcs/errors/cs0117-9.cs
new file mode 100644 (file)
index 0000000..c10ddc0
--- /dev/null
@@ -0,0 +1,12 @@
+// CS0117: `System.Console' does not contain a definition for `WriteLINE'
+// Line: 10
+
+using System;
+
+public class Test
+{
+       public static void Main ()
+       {
+               var x = nameof (Console.WriteLINE);
+       }
+}
diff --git a/mcs/errors/cs0122-37.cs b/mcs/errors/cs0122-37.cs
new file mode 100644 (file)
index 0000000..7c39f7f
--- /dev/null
@@ -0,0 +1,18 @@
+// CS0122: `Test.Method' is inaccessible due to its protection level
+// Line: 17
+
+public class Test
+{
+       protected void Method ()
+       {
+       }
+
+       private void Method (int i)
+       {
+       }
+}
+
+public class C
+{
+       string str = nameof (Test.Method);
+}
\ No newline at end of file
diff --git a/mcs/errors/cs0165-51.cs b/mcs/errors/cs0165-51.cs
new file mode 100644 (file)
index 0000000..bce82c6
--- /dev/null
@@ -0,0 +1,14 @@
+// CS0165: Use of unassigned local variable `s'
+// Line: 12
+// Compiler options: -r:CS0165-51-lib.dll
+
+using System;
+
+class C<T> where T : class
+{
+       public static void Foo ()
+       {
+           S<T> s;
+           Console.WriteLine (s);
+       }
+}
diff --git a/mcs/errors/cs0426-4.cs b/mcs/errors/cs0426-4.cs
deleted file mode 100644 (file)
index 85024f7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-// CS0426: The nested type `WriteLINE' does not exist in the type `System.Console'
-// Line: 10
-
-using System;
-
-public class Test
-{
-       public static void Main ()
-       {
-               var x = nameof (Console.WriteLINE);
-       }
-}
diff --git a/mcs/errors/cs1001-9.cs b/mcs/errors/cs1001-9.cs
deleted file mode 100644 (file)
index 989f314..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-// CS1001: Identifier expected
-// Line: 8
-
-class X
-{
-       public static void Main ()
-       {
-               var r = nameof (List<int2>);
-       }
-}
\ No newline at end of file
diff --git a/mcs/errors/cs1031-2.cs b/mcs/errors/cs1031-2.cs
new file mode 100644 (file)
index 0000000..28f11a1
--- /dev/null
@@ -0,0 +1,13 @@
+// CS1031: Type expected
+// Line: 8
+
+using System;
+
+class M
+{
+       public static void Main ()
+       {
+               Type t = typeof (this);
+       }
+}
+
diff --git a/mcs/errors/cs1061-16.cs b/mcs/errors/cs1061-16.cs
new file mode 100644 (file)
index 0000000..e5aae11
--- /dev/null
@@ -0,0 +1,23 @@
+// CS1061: Type `A' does not contain a definition for `Extension' and no extension method `Extension' of type `A' could be found. Are you missing an assembly reference?
+// Line: 21
+
+public class A
+{
+}
+
+static class X
+{
+       public static string Extension (this int a)
+       {
+               return null;
+       }
+}
+
+public static class Test
+{
+       public static void Main ()
+       {
+               A a = null;
+               var x = nameof (a.Extension);
+       }
+}
diff --git a/mcs/errors/cs1061-17.cs b/mcs/errors/cs1061-17.cs
new file mode 100644 (file)
index 0000000..1e17496
--- /dev/null
@@ -0,0 +1,17 @@
+// CS1061: Type `int' does not contain a definition for `Foo' and no extension method `Foo' of type `int' could be found. Are you missing an assembly reference?
+// Line: 11
+
+using System;
+
+static class C
+{
+       static void Main ()
+       {
+               int i = 1;
+               Action a = i.Foo;
+       }
+
+       static void Foo (this string s)
+       {
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs1644-48.cs b/mcs/errors/cs1644-48.cs
new file mode 100644 (file)
index 0000000..c93162f
--- /dev/null
@@ -0,0 +1,11 @@
+// CS1644: Feature `nameof operator' cannot be used because it is not part of the C# 5.0 language specification
+// Line: 9
+// Compiler options: -langversion:5
+
+class C
+{
+       public static void Main ()
+       {
+               var res = nameof (C.Main);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs1928-2.cs b/mcs/errors/cs1928-2.cs
deleted file mode 100644 (file)
index f5cefeb..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// CS1928: Type `System.Collections.IList' does not contain a member `Frobnicate' and the best extension method overload `Extensions.Frobnicate<Test>(this Test)' has some invalid arguments
-// Line: 20
-
-using System;
-using System.Collections;
-
-static class Extensions
-{
-       public static void Frobnicate<T> (this T foo) where T : IList
-       {
-       }
-}
-
-public class Test
-{
-       IList mFoo;
-
-       void Frobnicate ()
-       {
-               mFoo.Frobnicate<Test> ();
-       }
-}
diff --git a/mcs/errors/cs1928-3.cs b/mcs/errors/cs1928-3.cs
deleted file mode 100644 (file)
index 0eee7b2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// CS1928: Type `int' does not contain a member `Foo' and the best extension method overload `S.Foo(this uint)' has some invalid arguments
-// Line: 15
-
-static class S
-{
-       public static void Foo (this uint i)
-       {
-       }
-}
-
-class B
-{
-       static void Main ()
-       {
-               55.Foo ();
-       }
-}
diff --git a/mcs/errors/cs1929-2.cs b/mcs/errors/cs1929-2.cs
new file mode 100644 (file)
index 0000000..9982fef
--- /dev/null
@@ -0,0 +1,22 @@
+// CS1929: Type `System.Collections.IList' does not contain a member `Frobnicate' and the best extension method overload `Extensions.Frobnicate<Test>(this Test)' requires an instance of type `Test'
+// Line: 20
+
+using System;
+using System.Collections;
+
+static class Extensions
+{
+       public static void Frobnicate<T> (this T foo) where T : IList
+       {
+       }
+}
+
+public class Test
+{
+       IList mFoo;
+
+       void Frobnicate ()
+       {
+               mFoo.Frobnicate<Test> ();
+       }
+}
diff --git a/mcs/errors/cs1929-3.cs b/mcs/errors/cs1929-3.cs
new file mode 100644 (file)
index 0000000..c385ca8
--- /dev/null
@@ -0,0 +1,17 @@
+// CS1929: Type `int' does not contain a member `Foo' and the best extension method overload `S.Foo(this uint)' requires an instance of type `uint'
+// Line: 15
+
+static class S
+{
+       public static void Foo (this uint i)
+       {
+       }
+}
+
+class B
+{
+       static void Main ()
+       {
+               55.Foo ();
+       }
+}
index 6358f368f434bdce6108107f107379cfe9795aa8..4679492a1fe59334fbf36671d34b2d0d0ca6aa02 100644 (file)
@@ -1,4 +1,4 @@
-// CS1929: Extension method instance type `int' cannot be converted to `string'
+// CS1929: Type `int' does not contain a member `Check' and the best extension method overload `C.Check(this string)' requires an instance of type `string'
 // Line: 12
 
 static class C
index 42e0254b514a5803cb9fa729379b435c19ed6d2d..e93ee681886591fb57bef21fcd13bdba88693099 100644 (file)
@@ -1,6 +1,6 @@
 // CS1993: Cannot find compiler required types for asynchronous functions support. Are you targeting the wrong framework version?
 // Line: 38
-// Compiler options: -sdk:2
+// Compiler options: -nostdlib CS1993-corlib.cs
 
 using System.Threading.Tasks;
 
diff --git a/mcs/errors/cs7003-5.cs b/mcs/errors/cs7003-5.cs
new file mode 100644 (file)
index 0000000..854fc97
--- /dev/null
@@ -0,0 +1,15 @@
+// CS7003: Unbound generic name is not valid in this context
+// Line: 14
+
+class A<T>
+{
+       public class B
+       {
+               public int Foo;
+       }
+}
+
+class X
+{
+       string s = nameof (A<>.B);
+}
diff --git a/mcs/errors/cs7003-6.cs b/mcs/errors/cs7003-6.cs
new file mode 100644 (file)
index 0000000..7c6fe68
--- /dev/null
@@ -0,0 +1,10 @@
+// CS7003: Unbound generic name is not valid in this context
+// Line: 8
+
+class C
+{
+    static void Main ()
+    {
+               System.Action<>.Combine ();
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs7003-7.cs b/mcs/errors/cs7003-7.cs
new file mode 100644 (file)
index 0000000..e7bdd50
--- /dev/null
@@ -0,0 +1,14 @@
+// CS7003: Unbound generic name is not valid in this context
+// Line: 12
+
+static class C
+{
+       static void Foo<T> ()
+       {
+       }
+
+       static void Main ()
+       {
+               string s = nameof (Foo<>);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs7003-8.cs b/mcs/errors/cs7003-8.cs
new file mode 100644 (file)
index 0000000..04d8b2c
--- /dev/null
@@ -0,0 +1,14 @@
+// CS7003: Unbound generic name is not valid in this context
+// Line: 12
+
+static class C
+{
+       static void Foo<T> ()
+       {
+       }
+
+       static void Main ()
+       {
+               string s = nameof (C.Foo<>);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs7048.cs b/mcs/errors/cs7048.cs
new file mode 100644 (file)
index 0000000..398c32e
--- /dev/null
@@ -0,0 +1,26 @@
+// CS7048: First argument of a security attribute `CustomSecurityAttribute' must be a valid SecurityAction
+// Line: 20
+
+using System.Security;
+using System.Security.Permissions;
+
+public class CustomSecurityAttribute : CodeAccessSecurityAttribute
+{
+       public CustomSecurityAttribute ()
+               : base (SecurityAction.Demand)
+       {
+       }
+
+       public override IPermission CreatePermission()
+       {
+               return null;
+       }
+}
+
+[CustomSecurity]
+class X
+{
+       public static void Main ()
+       {
+       }
+}
diff --git a/mcs/errors/cs8071-2.cs b/mcs/errors/cs8071-2.cs
deleted file mode 100644 (file)
index 6bade94..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-// CS8071: Type arguments are not allowed in the nameof operator
-// Line: 10
-
-using SCGL = System.Collections.Generic.List<int>;
-
-class X
-{
-       public static int Main ()
-       {
-               var x = nameof (SCGL.Contains);
-               return 0;
-       }
-}
\ No newline at end of file
diff --git a/mcs/errors/cs8071.cs b/mcs/errors/cs8071.cs
deleted file mode 100644 (file)
index 4c0ead2..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-// CS8071: Type arguments are not allowed in the nameof operator
-// Line: 16
-
-class G<T>
-{
-       class N
-       {
-               public int Foo;
-       }
-}
-
-class Test
-{
-       public static void Main ()
-       {
-               var n = nameof (G<int>.N.Foo);
-       }
-}
diff --git a/mcs/errors/cs8081-2.cs b/mcs/errors/cs8081-2.cs
new file mode 100644 (file)
index 0000000..dcc1583
--- /dev/null
@@ -0,0 +1,10 @@
+// CS8081: Expression does not have a name
+// Line: 8
+
+class C
+{
+       void Foo ()
+       {
+               string s = nameof (this);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs8081.cs b/mcs/errors/cs8081.cs
new file mode 100644 (file)
index 0000000..366b932
--- /dev/null
@@ -0,0 +1,10 @@
+// CS8081: Expression does not have a name
+// Line: 8
+
+class C
+{
+       static void Main ()
+       {
+               string s = nameof (Main ());
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs8082.cs b/mcs/errors/cs8082.cs
new file mode 100644 (file)
index 0000000..70afa6b
--- /dev/null
@@ -0,0 +1,11 @@
+// CS8082: An argument to nameof operator cannot include sub-expression
+// Line: 9
+
+class C
+{
+       void Foo ()
+       {
+               object o = null;
+               var s = nameof (o.ToString ().Equals);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs8083.cs b/mcs/errors/cs8083.cs
new file mode 100644 (file)
index 0000000..26b90c8
--- /dev/null
@@ -0,0 +1,10 @@
+// CS8083: An alias-qualified name is not an expression
+// Line: 8
+
+class C
+{
+       static void Main ()
+       {
+               string s = nameof (global::C);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs8084-2.cs b/mcs/errors/cs8084-2.cs
new file mode 100644 (file)
index 0000000..8a5b004
--- /dev/null
@@ -0,0 +1,14 @@
+// CS8084: An argument to nameof operator cannot be method group with type arguments
+// Line: 12
+
+static class C
+{
+       static void Foo<T> ()
+       {
+       }
+
+       static void Main ()
+       {
+               string s = nameof (C.Foo<int>);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs8084.cs b/mcs/errors/cs8084.cs
new file mode 100644 (file)
index 0000000..c5861b5
--- /dev/null
@@ -0,0 +1,14 @@
+// CS8084: An argument to nameof operator cannot be method group with type arguments
+// Line: 12
+
+static class C
+{
+       static void Foo<T> ()
+       {
+       }
+
+       static void Main ()
+       {
+               string s = nameof (Foo<int>);
+       }
+}
\ No newline at end of file
index 797319f62552402040a5b338524748fd257a1e80..46cac378e67921acedb2cfaaff9d407be4f24df3 100644 (file)
@@ -145,7 +145,7 @@ namespace Mono.CSharp
 
                        public bool ProbingMode { get; set; }
 
-                       protected override void Error_TypeDoesNotContainDefinition (ResolveContext rc, TypeSpec type, string name)
+                       public override void Error_TypeDoesNotContainDefinition (ResolveContext rc, TypeSpec type, string name)
                        {
                                Error_OperatorCannotBeApplied (rc, type);
                        }
index f05e513ef4a366aa559a640b26d5d31676c2456c..4ab296b200a9004592a9be019373c594fcad5815 100644 (file)
@@ -832,9 +832,9 @@ namespace Mono.CSharp {
                /// </summary>
                bool IsSecurityActionValid ()
                {
-                       SecurityAction action = GetSecurityActionValue ();
+                       Constant c = null;
+                       var action = GetSecurityActionValue (ref c);
                        bool for_assembly = Target == AttributeTargets.Assembly || Target == AttributeTargets.Module;
-                       var c = (Constant)pos_args [0].Expr;
 
                        switch (action) {
 #pragma warning disable 618
@@ -855,6 +855,10 @@ namespace Mono.CSharp {
                                        return true;
                                break;
 #pragma warning restore 618
+                       case null:
+                               Report.Error (7048, loc, "First argument of a security attribute `{0}' must be a valid SecurityAction",
+                                       Type.GetSignatureForError ());
+                               return false;
 
                        default:
                                Report.Error (7049, c.Location, "Security attribute `{0}' has an invalid SecurityAction value `{1}'",
@@ -876,9 +880,25 @@ namespace Mono.CSharp {
                        return false;
                }
 
-               System.Security.Permissions.SecurityAction GetSecurityActionValue ()
+               SecurityAction? GetSecurityActionValue (ref Constant value)
                {
-                       return (SecurityAction) ((Constant) pos_args[0].Expr).GetValue ();
+                       if (pos_args == null) {
+                               var predefined = context.Module.PredefinedAttributes;
+
+                               //
+                               // BCL defines System.Security.Permissions.HostProtectionAttribute with parameterless
+                               // contructor which should not be valid but it's already part of the framework
+                               //
+                               if (Type == predefined.HostProtection.TypeSpec) {
+                                       value = new IntConstant (context.Module.Compiler.BuiltinTypes, (int)SecurityAction.LinkDemand, loc);
+                                       return SecurityAction.LinkDemand;
+                               }
+
+                               return null;
+                       }
+
+                       value = (Constant) pos_args [0].Expr;
+                       return (SecurityAction) value.GetValue ();
                }
 
                /// <summary>
@@ -888,9 +908,14 @@ namespace Mono.CSharp {
                public void ExtractSecurityPermissionSet (MethodSpec ctor, ref SecurityType permissions)
                {
 #if STATIC
-                       object[] values = new object[pos_args.Count];
-                       for (int i = 0; i < values.Length; ++i)
-                               values[i] = ((Constant) pos_args[i].Expr).GetValue ();
+                       object[] values;
+                       if (pos_args != null) {
+                               values = new object[pos_args.Count];
+                               for (int i = 0; i < values.Length; ++i)
+                                       values[i] = ((Constant) pos_args[i].Expr).GetValue ();
+                       } else {
+                               values = null;
+                       }
 
                        PropertyInfo[] prop;
                        object[] prop_values;
@@ -1679,6 +1704,7 @@ namespace Mono.CSharp {
                public readonly PredefinedDebuggerBrowsableAttribute DebuggerBrowsable;
                public readonly PredefinedAttribute DebuggerStepThrough;
                public readonly PredefinedDebuggableAttribute Debuggable;
+               public readonly PredefinedAttribute HostProtection;
 
                // New in .NET 3.5
                public readonly PredefinedAttribute Extension;
@@ -1733,6 +1759,7 @@ namespace Mono.CSharp {
                        DefaultParameterValue = new PredefinedAttribute (module, "System.Runtime.InteropServices", "DefaultParameterValueAttribute");
                        OptionalParameter = new PredefinedAttribute (module, "System.Runtime.InteropServices", "OptionalAttribute");
                        UnverifiableCode = new PredefinedAttribute (module, "System.Security", "UnverifiableCodeAttribute");
+                       HostProtection = new PredefinedAttribute (module, "System.Security.Permissions", "HostProtectionAttribute");
 
                        DefaultCharset = new PredefinedAttribute (module, "System.Runtime.InteropServices", "DefaultCharSetAttribute");
                        TypeForwarder = new PredefinedAttribute (module, "System.Runtime.CompilerServices", "TypeForwardedToAttribute");
index 37e1667db6f7fbf1fa13a1af2e48ef512a96829c..9c841a2140fadfae8c2b9bb4665d818590b08063 100644 (file)
@@ -452,7 +452,7 @@ namespace Mono.CSharp
                                return tc.GetSignatureForError ();
                        }
 
-                       public ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity)
+                       public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                        {
                                return null;
                        }
@@ -1298,7 +1298,7 @@ namespace Mono.CSharp
                                CreateMetadataName (sb);
                                TypeBuilder = Module.CreateBuilder (sb.ToString (), TypeAttr, type_size);
                        } else {
-                               TypeBuilder = parent_def.TypeBuilder.DefineNestedType (MemberName.Basename, TypeAttr, null, type_size);
+                               TypeBuilder = parent_def.TypeBuilder.DefineNestedType (FilterNestedName (MemberName.Basename), TypeAttr, null, type_size);
                        }
 
                        if (DeclaringAssembly.Importer != null)
@@ -1328,6 +1328,18 @@ namespace Mono.CSharp
                        return true;
                }
 
+               public static string FilterNestedName (string name)
+               {
+                       //
+                       // SRE API does not handle namespaces and types separately but
+                       // determine that from '.' in name. That's problematic because 
+                       // dot is valid character for type name. By replacing any '.'
+                       // in name we avoid any ambiguities and never emit metadata
+                       // namespace for nested types
+                       //
+                       return name.Replace ('.', '_');
+               }
+
                string[] CreateTypeParameters (TypeParameters parentAllTypeParameters)
                {
                        string[] names;
index 3504302d589d0e44fd642fe987eea93c51fe1b5f..749c4efcb8a4c99e70920f64be7d008a068e2d51 100644 (file)
@@ -142,7 +142,7 @@ namespace Mono.CSharp {
                        }
 
                        if (targs != null) {
-                               if (!targs.Resolve (rc))
+                               if (!targs.Resolve (rc, true))
                                        return null;
                        }
 
index ea7e7bfbf2e97b725c69a1da6fb78dd963287f8c..050dd83490f32849fde3ec477cfee0f848c8de34 100644 (file)
@@ -2144,6 +2144,11 @@ namespace Mono.CSharp {
                        this.name = name;
                }
 
+               static void Error_MethodGroupWithTypeArguments (ResolveContext rc, Location loc)
+               {
+                       rc.Report.Error (8084, loc, "An argument to nameof operator cannot be method group with type arguments");
+               }
+
                protected override Expression DoResolve (ResolveContext rc)
                {
                        throw new NotSupportedException ();
@@ -2158,66 +2163,81 @@ namespace Mono.CSharp {
                                if (rc.Module.Compiler.Settings.Version < LanguageVersion.V_6)
                                        rc.Report.FeatureIsNotAvailable (rc.Module.Compiler, Location, "nameof operator");
 
-                               if (sn.HasTypeArguments) {
-                                       // TODO: csc compatible but unhelpful error message
-                                       rc.Report.Error (1001, loc, "Identifier expected");
-                                       return true;
+                               var res = sn.LookupNameExpression (rc, MemberLookupRestrictions.IgnoreAmbiguity | MemberLookupRestrictions.NameOfExcluded);
+                               if (sn.HasTypeArguments && res is MethodGroupExpr) {
+                                       Error_MethodGroupWithTypeArguments (rc, expr.Location);
                                }
 
-                               sn.LookupNameExpression (rc, MemberLookupRestrictions.IgnoreArity | MemberLookupRestrictions.IgnoreAmbiguity);
                                return true;
                        }
 
                        var ma = expr as MemberAccess;
                        if (ma != null) {
-                               FullNamedExpression fne = ma.LeftExpression as ATypeNameExpression;
-                               if (fne == null) {
-                                       var qam = ma as QualifiedAliasMember;
-                                       if (qam == null)
-                                               return false;
-
-                                       fne = qam.CreateExpressionFromAlias (rc);
-                                       if (fne == null)
-                                               return true;
-                               }
+                               var lexpr = ma.LeftExpression;
 
-                               Value = ma.Name;
+                               var res = ma.LookupNameExpression (rc, MemberLookupRestrictions.IgnoreAmbiguity);
+
+                               if (res == null) {
+                                       return false;
+                               }
 
                                if (rc.Module.Compiler.Settings.Version < LanguageVersion.V_6)
                                        rc.Report.FeatureIsNotAvailable (rc.Module.Compiler, Location, "nameof operator");
 
-                               if (ma.HasTypeArguments) {
-                                       // TODO: csc compatible but unhelpful error message
-                                       rc.Report.Error (1001, loc, "Identifier expected");
-                                       return true;
-                               }
-                                       
-                               var left = fne.ResolveAsTypeOrNamespace (rc, true);
-                               if (left == null)
-                                       return true;
-
-                               var ns = left as NamespaceExpression;
-                               if (ns != null) {
-                                       FullNamedExpression retval = ns.LookupTypeOrNamespace (rc, ma.Name, 0, LookupMode.NameOf, loc);
-                                       if (retval == null)
-                                               ns.Error_NamespaceDoesNotExist (rc, ma.Name, 0);
-
-                                       return true;
+                               if (ma is QualifiedAliasMember) {
+                                       rc.Report.Error (8083, loc, "An alias-qualified name is not an expression");
+                                       return false;
                                }
 
-                               if (left.Type.IsGenericOrParentIsGeneric && left.Type.GetDefinition () != left.Type) {
-                                       rc.Report.Error (8071, loc, "Type arguments are not allowed in the nameof operator");
+                               if (!IsLeftExpressionValid (lexpr)) {
+                                       rc.Report.Error (8082, lexpr.Location, "An argument to nameof operator cannot include sub-expression");
+                                       return false;
                                }
 
-                               var mexpr = MemberLookup (rc, false, left.Type, ma.Name, 0, MemberLookupRestrictions.IgnoreArity | MemberLookupRestrictions.IgnoreAmbiguity, loc);
-                               if (mexpr == null) {
-                                       ma.Error_IdentifierNotFound (rc, left.Type);
-                                       return true;
+                               var mg = res as MethodGroupExpr;
+                               if (mg != null) {
+                                       var emg = res as ExtensionMethodGroupExpr;
+                                       if (emg != null && !emg.ResolveNameOf (rc, ma)) {
+                                               return true;
+                                       }
+
+                                       if (!mg.HasAccessibleCandidate (rc)) {
+                                               ErrorIsInaccesible (rc, ma.GetSignatureForError (), loc);
+                                       }
+
+                                       if (ma.HasTypeArguments) {
+                                               Error_MethodGroupWithTypeArguments (rc, ma.Location);
+                                       }
                                }
 
+                               Value = ma.Name;
                                return true;
                        }
 
+                       rc.Report.Error (8081, loc, "Expression does not have a name");
+                       return false;
+               }
+
+               static bool IsLeftExpressionValid (Expression expr)
+               {
+                       if (expr is SimpleName)
+                               return true;
+
+                       if (expr is This)
+                               return true;
+
+                       if (expr is NamespaceExpression)
+                               return true;
+
+                       if (expr is TypeExpr)
+                               return true;
+
+                       var ma = expr as MemberAccess;
+                       if (ma != null) {
+                               // TODO: Will conditional access be allowed?
+                               return IsLeftExpressionValid (ma.LeftExpression);
+                       }
+
                        return false;
                }
 
@@ -2231,7 +2251,6 @@ namespace Mono.CSharp {
                        var arg = args [0];
                        var res = ResolveArgumentExpression (rc, arg.Expr);
                        if (!res) {
-                               name.Error_NameDoesNotExist (rc);
                                return null;
                        }
 
index b41d8c472771ec04e567e305606099e003cf6e63..88e523700706480b073713dc308dcdc7b8a31625 100644 (file)
@@ -22,8 +22,7 @@ namespace Mono.CSharp
        {
                Normal = 0,
                Probing = 1,
-               IgnoreAccessibility = 2,
-               NameOf = 3
+               IgnoreAccessibility = 2
        }
 
        //
@@ -56,7 +55,7 @@ namespace Mono.CSharp
 
                string GetSignatureForError ();
 
-               ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity);
+               ExtensionMethodCandidates LookupExtensionMethod (string name, int arity);
                FullNamedExpression LookupNamespaceOrType (string name, int arity, LookupMode mode, Location loc);
                FullNamedExpression LookupNamespaceAlias (string name);
        }
@@ -425,9 +424,9 @@ namespace Mono.CSharp
                        return MemberContext.GetSignatureForError ();
                }
 
-               public ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity)
+               public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                {
-                       return MemberContext.LookupExtensionMethod (extensionType, name, arity);
+                       return MemberContext.LookupExtensionMethod (name, arity);
                }
 
                public FullNamedExpression LookupNamespaceOrType (string name, int arity, LookupMode mode, Location loc)
index b4225915bf25a56929360737f5572f71b0b81dbc..16f79e22c3c8ca4a1ec8ec5922e5d5d3b231f7b3 100644 (file)
@@ -889,7 +889,7 @@ named_argument
 
 named_argument_expr
        : expression_or_error
-       | declaration_expression
+//     | declaration_expression
        ;
        
 opt_named_modifier
@@ -5929,6 +5929,7 @@ switch_label
                Error_SyntaxError (yyToken);
                $$ = new SwitchLabel ((Expression) $2, GetLocation ($1));
          }
+/*       
        | CASE pattern_expr_invocation COLON
          {
                if (lang_version != LanguageVersion.Experimental)
@@ -5939,6 +5940,7 @@ switch_label
                };
                lbag.AddLocation ($$, GetLocation ($3));
          }
+*/
        | DEFAULT_COLON
          {
                $$ = new SwitchLabel (null, GetLocation ($1));
index b3f8b32a707631b938fb8d86fc6e7c859d3ff05f..1c8a107636b60477cd56243979661df73f5d4515 100644 (file)
@@ -1035,6 +1035,7 @@ namespace Mono.CSharp
                                                case Token.BYTE:
                                                case Token.DECIMAL:
                                                case Token.BOOL:
+                                               case Token.STRING:
                                                        return Token.OPEN_PARENS_CAST;
                                                }
                                        }
index 99476d291c7b671047ac0329a843ce900327812b..16f8bcb38360495b313d3f6b1c3a3ea7583f2d0c 100644 (file)
@@ -670,13 +670,13 @@ namespace Mono.CSharp {
                // Does extension methods look up to find a method which matches name and extensionType.
                // Search starts from this namespace and continues hierarchically up to top level.
                //
-               public ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity)
+               public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                {
                        var m = Parent;
                        do {
                                var ns = m as NamespaceContainer;
                                if (ns != null)
-                                       return ns.LookupExtensionMethod (this, extensionType, name, arity, 0);
+                                       return ns.LookupExtensionMethod (this, name, arity, 0);
 
                                m = m.Parent;
                        } while (m != null);
index b50e65e007777bd2a87ce765ce12071da9188ab8..844c04e5771a7aeb4eb23dcbc5773abb5d076ca7 100644 (file)
@@ -649,7 +649,8 @@ namespace Mono.CSharp {
                        var invoke = Delegate.GetInvokeMethod (target_type);
 
                        Arguments arguments = CreateDelegateMethodArguments (ec, invoke.Parameters, invoke.Parameters.Types, mg.Location);
-                       return mg.OverloadResolve (ec, ref arguments, null, OverloadResolver.Restrictions.CovariantDelegate | OverloadResolver.Restrictions.ProbingOnly) != null;
+                       mg = mg.OverloadResolve (ec, ref arguments, null, OverloadResolver.Restrictions.CovariantDelegate | OverloadResolver.Restrictions.ProbingOnly);
+                       return mg != null && Delegate.IsTypeCovariant (ec, mg.BestCandidateReturnType, invoke.ReturnType);
                }
 
                #region IErrorHandler Members
index 35fe5852930447dcc8cbf3095a34f319638fa32e..adf6ea082d007b971c433a99e4b258aa7c0ba882 100644 (file)
@@ -695,7 +695,7 @@ namespace Mono.CSharp
                        return host.GetSignatureForError ();
                }
 
-               public ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity)
+               public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                {
                        return null;
                }
index 8a9a0c87de2eb00488f65b94a1ea4b0ec348405d..33fb4555363aa6a795a0b2f0d45ba65d46b5170f 100644 (file)
@@ -787,7 +787,7 @@ namespace Mono.CSharp
 
                        if (member != null && member.HasTypeArguments) {
                                TypeArguments ta = member.TypeArguments;
-                               if (ta.Resolve (ec)) {
+                               if (ta.Resolve (ec, false)) {
                                        var targs = new ArrayInitializer (ta.Count, loc);
                                        foreach (TypeSpec t in ta.Arguments)
                                                targs.Add (new TypeOf (t, loc));
index 387bac8617f12ea1f6450ca2177212c22ce33673..80e13f33aae8b64561f0d344190bc94dfc741f76 100644 (file)
@@ -345,7 +345,7 @@ namespace Mono.CSharp {
                                exprType, name);
                }
 
-               protected virtual void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
+               public virtual void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
                {
                        Error_TypeDoesNotContainDefinition (ec, loc, type, name);
                }
@@ -819,7 +819,8 @@ namespace Mono.CSharp {
                        ReadAccess = 1 << 3,
                        EmptyArguments = 1 << 4,
                        IgnoreArity = 1 << 5,
-                       IgnoreAmbiguity = 1 << 6
+                       IgnoreAmbiguity = 1 << 6,
+                       NameOfExcluded = 1 << 7,
                }
 
                //
@@ -2521,13 +2522,13 @@ namespace Mono.CSharp {
                }
 
                protected ATypeNameExpression (string name, int arity, Location l)
-                       : this (name, new UnboundTypeArguments (arity), l)
+                       : this (name, new UnboundTypeArguments (arity, l), l)
                {
                }
 
                #region Properties
 
-               protected int Arity {
+               public int Arity {
                        get {
                                return targs == null ? 0 : targs.Count;
                        }
@@ -2563,11 +2564,6 @@ namespace Mono.CSharp {
                                (targs == null || targs.Equals (atne.targs));
                }
 
-               protected void Error_OpenGenericTypeIsNotAllowed (IMemberContext mc)
-               {
-                       mc.Module.Compiler.Report.Error (7003, Location, "Unbound generic name is not valid in this context");
-               }
-
                public override int GetHashCode ()
                {
                        return Name.GetHashCode ();
@@ -2703,8 +2699,7 @@ namespace Mono.CSharp {
                                                return ct;
                                        }
 
-                                       if (!allowUnboundTypeArguments)
-                                               Error_OpenGenericTypeIsNotAllowed (mc);
+                                       targs.Resolve (mc, allowUnboundTypeArguments);
 
                                        return new GenericOpenTypeExpr (fne.Type, loc);
                                }
@@ -2839,7 +2834,7 @@ namespace Mono.CSharp {
                                        me = me.ResolveMemberAccess (rc, null, null);
 
                                        if (Arity > 0) {
-                                               targs.Resolve (rc);
+                                               targs.Resolve (rc, false);
                                                me.SetTypeArguments (rc, targs);
                                        }
 
@@ -2863,13 +2858,13 @@ namespace Mono.CSharp {
                                var mg = NamespaceContainer.LookupStaticUsings (rc, Name, Arity, loc);
                                if (mg != null) {
                                        if (Arity > 0) {
-                                               targs.Resolve (rc);
+                                               targs.Resolve (rc, false);
                                                mg.SetTypeArguments (rc, targs);
                                        }
                                        return mg;
                                }
 
-                               if (Name == "nameof")
+                               if ((restrictions & MemberLookupRestrictions.NameOfExcluded) == 0 && Name == "nameof")
                                        return new NameOf (this);
 
                                if (errorMode) {
@@ -3130,7 +3125,7 @@ namespace Mono.CSharp {
                        return this;
                }
 
-               public void Error_NamespaceDoesNotExist (IMemberContext ctx, string name, int arity)
+               public void Error_NamespaceDoesNotExist (IMemberContext ctx, string name, int arity, Location loc)
                {
                        var retval = Namespace.LookupType (ctx, name, arity, LookupMode.IgnoreAccessibility, loc);
                        if (retval != null) {
@@ -3726,13 +3721,44 @@ namespace Mono.CSharp {
 
                        int arity = type_arguments == null ? 0 : type_arguments.Count;
 
-                       candidates = candidates.Container.LookupExtensionMethod (candidates.Context, ExtensionExpression.Type, Name, arity, candidates.LookupIndex);
+                       candidates = candidates.Container.LookupExtensionMethod (candidates.Context, Name, arity, candidates.LookupIndex);
                        if (candidates == null)
                                return null;
 
                        return candidates.Methods.Cast<MemberSpec> ().ToList ();
                }
 
+               public static bool IsExtensionTypeCompatible (TypeSpec argType, TypeSpec extensionType)
+               {
+                       //
+                       // Indentity, implicit reference or boxing conversion must exist for the extension parameter
+                       //
+                       // LAMESPEC: or implicit type parameter conversion
+                       //
+                       return argType == extensionType ||
+                               TypeSpecComparer.IsEqual (argType, extensionType) ||
+                               Convert.ImplicitReferenceConversionExists (argType, extensionType, false) ||
+                               Convert.ImplicitBoxingConversion (null, argType, extensionType) != null;
+               }
+
+               public bool ResolveNameOf (ResolveContext rc, MemberAccess ma)
+               {
+                       ExtensionExpression = ExtensionExpression.Resolve (rc);
+                       if (ExtensionExpression == null)
+                               return false;
+
+                       var argType = ExtensionExpression.Type;
+                       foreach (MethodSpec candidate in Candidates) {
+                               if (ExtensionMethodGroupExpr.IsExtensionTypeCompatible (argType, candidate.Parameters.ExtensionMethodType))
+                                       return true;
+                       }
+
+                       // TODO: Scan full hierarchy
+
+                       ma.Error_TypeDoesNotContainDefinition (rc, argType, ma.Name);
+                       return false;
+               }
+
                public override MethodGroupExpr LookupExtensionMethod (ResolveContext rc)
                {
                        // We are already here
@@ -3785,14 +3811,15 @@ namespace Mono.CSharp {
                bool OverloadResolver.IErrorHandler.ArgumentMismatch (ResolveContext rc, MemberSpec best, Argument arg, int index)
                {
                        rc.Report.SymbolRelatedToPreviousError (best);
-                       rc.Report.Error (1928, loc,
-                               "Type `{0}' does not contain a member `{1}' and the best extension method overload `{2}' has some invalid arguments",
-                               queried_type.GetSignatureForError (), Name, best.GetSignatureForError ());
 
                        if (index == 0) {
                                rc.Report.Error (1929, loc,
-                                       "Extension method instance type `{0}' cannot be converted to `{1}'",
-                                       arg.Type.GetSignatureForError (), ((MethodSpec)best).Parameters.ExtensionMethodType.GetSignatureForError ());
+                                       "Type `{0}' does not contain a member `{1}' and the best extension method overload `{2}' requires an instance of type `{3}'",
+                                       queried_type.GetSignatureForError (), Name, best.GetSignatureForError (), ((MethodSpec)best).Parameters.ExtensionMethodType.GetSignatureForError ());
+                       } else {
+                               rc.Report.Error (1928, loc,
+                                       "Type `{0}' does not contain a member `{1}' and the best extension method overload `{2}' has some invalid arguments",
+                                       queried_type.GetSignatureForError (), Name, best.GetSignatureForError ());
                        }
 
                        return true;
@@ -4000,6 +4027,16 @@ namespace Mono.CSharp {
                                Name, target.GetSignatureForError ());
                }
 
+               public bool HasAccessibleCandidate (ResolveContext rc)
+               {
+                       foreach (var candidate in Candidates) {
+                               if (candidate.IsAccessible (rc))
+                                       return true;
+                       }
+
+                       return false;
+               }
+
                public static bool IsExtensionMethodArgument (Expression expr)
                {
                        //
@@ -4149,7 +4186,7 @@ namespace Mono.CSharp {
                                return null;
 
                        int arity = type_arguments == null ? 0 : type_arguments.Count;
-                       var methods = rc.LookupExtensionMethod (InstanceExpression.Type, Methods[0].Name, arity);
+                       var methods = rc.LookupExtensionMethod (Methods[0].Name, arity);
                        if (methods == null)
                                return null;
 
@@ -4618,8 +4655,17 @@ namespace Mono.CSharp {
                        //
                        // Tie-breaking rules are applied only for equivalent parameter types
                        //
-                       if (!are_equivalent)
+                       if (!are_equivalent) {
+                               //
+                               // LAMESPEC: A candidate with less default parameters is still better when there
+                               // is no better expression conversion
+                               //
+                               if (candidate_pd.Count < best_pd.Count && !candidate_params && best_pd.FixedParameters [j].HasDefaultValue) {
+                                       return true;
+                               }
+
                                return false;
+                       }
 
                        //
                        // If candidate is applicable in its normal form and best has a params array and is applicable
@@ -5060,15 +5106,7 @@ namespace Mono.CSharp {
                                score = 1;
                                if (!params_expanded_form) {
                                        if (a.IsExtensionType) {
-                                               //
-                                               // Indentity, implicit reference or boxing conversion must exist for the extension parameter
-                                               //
-                                               // LAMESPEC: or implicit type parameter conversion
-                                               //
-                                               var at = a.Type;
-                                               if (at == pt || TypeSpecComparer.IsEqual (at, pt) ||
-                                                       Convert.ImplicitReferenceConversionExists (at, pt, false) ||
-                                                       Convert.ImplicitBoxingConversion (null, at, pt) != null) {
+                                               if (ExtensionMethodGroupExpr.IsExtensionTypeCompatible (a.Type, pt)) {
                                                        score = 0;
                                                        continue;
                                                }
@@ -5804,7 +5842,14 @@ namespace Mono.CSharp {
                                        continue;
 
                                if ((restrictions & Restrictions.CovariantDelegate) != 0 && !Delegate.IsTypeCovariant (ec, a.Expr.Type, pt)) {
-                                       custom_errors.NoArgumentMatch (ec, member);
+                                       if (a.IsExtensionType) {
+                                               // TODO: Should report better message type, something similar to CS1928/1929 instead of
+                                               // CS1061 but that still better than confusing CS0123
+                                               var ma = new MemberAccess (a.Expr, member.Name, loc);
+                                               ma.Error_TypeDoesNotContainDefinition (ec, a.Expr.Type, ma.Name);
+                                       } else {
+                                               custom_errors.NoArgumentMatch (ec, member);
+                                       }
                                        return false;
                                }
 
index 4a5cddb992f723927ef1fd460f625272b4f9dc56..e152fe4d0c6a4c2c4f3825ed73a1ddc7b2021368 100644 (file)
@@ -6212,9 +6212,11 @@ namespace Mono.CSharp
                                } else if ((conv = Convert.ImplicitConversion (ec, false_expr, true_type, loc)) != null) {
                                        false_expr = conv;
                                } else {
-                                       ec.Report.Error (173, true_expr.Location,
-                                               "Type of conditional expression cannot be determined because there is no implicit conversion between `{0}' and `{1}'",
-                                               true_type.GetSignatureForError (), false_type.GetSignatureForError ());
+                                       if (false_type != InternalType.ErrorType) {
+                                               ec.Report.Error (173, true_expr.Location,
+                                                       "Type of conditional expression cannot be determined because there is no implicit conversion between `{0}' and `{1}'",
+                                                       true_type.GetSignatureForError (), false_type.GetSignatureForError ());
+                                       }
                                        return null;
                                }
                        }
@@ -8923,7 +8925,7 @@ namespace Mono.CSharp
                }
        }
 
-       public class RefValueExpr : ShimExpression, IAssignMethod
+       public class RefValueExpr : ShimExpression, IAssignMethod, IMemoryLocation
        {
                FullNamedExpression texpr;
 
@@ -8945,6 +8947,12 @@ namespace Mono.CSharp
                        return false;
                }
 
+               public void AddressOf (EmitContext ec, AddressOp mode)
+               {
+                       expr.Emit (ec);
+                       ec.Emit (OpCodes.Refanyval, type);
+               }
+
                protected override Expression DoResolve (ResolveContext rc)
                {
                        expr = expr.Resolve (rc);
@@ -8953,7 +8961,7 @@ namespace Mono.CSharp
                                return null;
 
                        expr = Convert.ImplicitConversionRequired (rc, expr, rc.Module.PredefinedTypes.TypedReference.Resolve (), loc);
-                       eclass = ExprClass.Value;
+                       eclass = ExprClass.Variable;
                        return this;
                }
 
@@ -9658,12 +9666,16 @@ namespace Mono.CSharp
                                var retval = ns.LookupTypeOrNamespace (rc, Name, Arity, LookupMode.Normal, loc);
 
                                if (retval == null) {
-                                       ns.Error_NamespaceDoesNotExist (rc, Name, Arity);
+                                       ns.Error_NamespaceDoesNotExist (rc, Name, Arity, loc);
                                        return null;
                                }
 
-                               if (HasTypeArguments)
-                                       return new GenericTypeExpr (retval.Type, targs, loc);
+                               if (Arity > 0) {
+                                       if (HasTypeArguments)
+                                               return new GenericTypeExpr (retval.Type, targs, loc);
+
+                                       targs.Resolve (rc, false);
+                               }
 
                                return retval;
                        }
@@ -9708,11 +9720,11 @@ namespace Mono.CSharp
                                        // Try to look for extension method when member lookup failed
                                        //
                                        if (MethodGroupExpr.IsExtensionMethodArgument (expr)) {
-                                               var methods = rc.LookupExtensionMethod (expr_type, Name, lookup_arity);
+                                               var methods = rc.LookupExtensionMethod (Name, lookup_arity);
                                                if (methods != null) {
                                                        var emg = new ExtensionMethodGroupExpr (methods, expr, loc);
                                                        if (HasTypeArguments) {
-                                                               if (!targs.Resolve (rc))
+                                                               if (!targs.Resolve (rc, false))
                                                                        return null;
 
                                                                emg.SetTypeArguments (rc, targs);
@@ -9791,7 +9803,7 @@ namespace Mono.CSharp
                        me = me.ResolveMemberAccess (rc, expr, sn);
 
                        if (Arity > 0) {
-                               if (!targs.Resolve (rc))
+                               if (!targs.Resolve (rc, false))
                                        return null;
 
                                me.SetTypeArguments (rc, targs);
@@ -9818,15 +9830,14 @@ namespace Mono.CSharp
                                FullNamedExpression retval = ns.LookupTypeOrNamespace (rc, Name, Arity, LookupMode.Normal, loc);
 
                                if (retval == null) {
-                                       ns.Error_NamespaceDoesNotExist (rc, Name, Arity);
+                                       ns.Error_NamespaceDoesNotExist (rc, Name, Arity, loc);
                                } else if (Arity > 0) {
                                        if (HasTypeArguments) {
                                                retval = new GenericTypeExpr (retval.Type, targs, loc);
                                                if (retval.ResolveAsType (rc) == null)
                                                        return null;
                                        } else {
-                                               if (!allowUnboundTypeArguments)
-                                                       Error_OpenGenericTypeIsNotAllowed (rc);
+                                               targs.Resolve (rc, allowUnboundTypeArguments);
 
                                                retval = new GenericOpenTypeExpr (retval.Type, loc);
                                        }
@@ -9887,8 +9898,7 @@ namespace Mono.CSharp
                                if (HasTypeArguments) {
                                        texpr = new GenericTypeExpr (nested, targs, loc);
                                } else {
-                                       if (!allowUnboundTypeArguments || expr_resolved is GenericTypeExpr) // && HasTypeArguments
-                                               Error_OpenGenericTypeIsNotAllowed (rc);
+                                       targs.Resolve (rc, allowUnboundTypeArguments && !(expr_resolved is GenericTypeExpr));
 
                                        texpr = new GenericOpenTypeExpr (nested, loc);
                                }
@@ -9928,7 +9938,7 @@ namespace Mono.CSharp
                        base.Error_InvalidExpressionStatement (report, LeftExpression.Location);
                }
 
-               protected override void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
+               public override void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
                {
                        if (ec.Module.Compiler.Settings.Version > LanguageVersion.ISO_2 && !ec.IsRuntimeBinder && MethodGroupExpr.IsExtensionMethodArgument (expr)) {
                                ec.Report.SymbolRelatedToPreviousError (type);
@@ -10429,6 +10439,11 @@ namespace Mono.CSharp
                        ea.FlowAnalysis (fc);
                }
 
+               public override bool HasConditionalAccess ()
+               {
+                       return ConditionalAccess || ea.Expr.HasConditionalAccess ();
+               }
+
                //
                // Load the array arguments into the stack.
                //
@@ -11687,7 +11702,7 @@ namespace Mono.CSharp
                        {
                        }
 
-                       protected override void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
+                       public override void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
                        {
                                if (TypeManager.HasElementType (type))
                                        return;
@@ -11770,6 +11785,11 @@ namespace Mono.CSharp
                        var init = rc.CurrentInitializerVariable;
                        var type = init.Type;
 
+                       if (type.IsArray) {
+                               target = new ArrayAccess (new ElementAccess (init, args, loc), loc);
+                               return true;
+                       }
+
                        var indexers = MemberCache.FindMembers (type, MemberCache.IndexerNameAlias, false);
                        if (indexers == null && type.BuiltinType != BuiltinTypeSpec.Type.Dynamic) {
                                ElementAccess.Error_CannotApplyIndexing (rc, type, loc);
index 3531af044f3bc39543000501a647a96f409e8b7a..824b5c781cd35c1ae8594baccd1240de36f31eda 100644 (file)
@@ -425,7 +425,7 @@ namespace Mono.CSharp
                        }
                        
                        // Create nested fixed buffer container
-                       string name = String.Format ("<{0}>__FixedBuffer{1}", Name, GlobalCounter++);
+                       string name = String.Format ("<{0}>__FixedBuffer{1}", TypeDefinition.FilterNestedName (Name), GlobalCounter++);
                        fixed_buffer_type = Parent.TypeBuilder.DefineNestedType (name,
                                TypeAttributes.NestedPublic | TypeAttributes.Sealed | TypeAttributes.BeforeFieldInit,
                                Compiler.BuiltinTypes.ValueType.GetMetaInfo ());
index 183250cde8bf01f673318052672c0e1b67efa68d..da30a3e5b907570cd2453f3c40761e43935c5f29 100644 (file)
@@ -105,7 +105,7 @@ namespace Mono.CSharp
                        return struct_info.GetStructField (name);
                }
 
-               public static TypeInfo GetTypeInfo (TypeSpec type)
+               public static TypeInfo GetTypeInfo (TypeSpec type, IMemberContext context)
                {
                        if (!type.IsStruct)
                                return simple_type;
@@ -114,7 +114,7 @@ namespace Mono.CSharp
                        if (type_hash.TryGetValue (type, out info))
                                return info;
 
-                       var struct_info = StructInfo.GetStructInfo (type);
+                       var struct_info = StructInfo.GetStructInfo (type, context);
                        if (struct_info != null) {
                                info = new TypeInfo (struct_info, 0);
                        } else {
@@ -184,11 +184,11 @@ namespace Mono.CSharp
                        //
                        // We only need one instance per type
                        //
-                       StructInfo (TypeSpec type)
+                       StructInfo (TypeSpec type, IMemberContext context)
                        {
                                field_type_hash.Add (type, this);
 
-                               fields = MemberCache.GetAllFieldsForDefiniteAssignment (type);
+                               fields = MemberCache.GetAllFieldsForDefiniteAssignment (type, context);
 
                                struct_field_hash = new Dictionary<string, TypeInfo> ();
                                field_hash = new Dictionary<string, int> (fields.Count);
@@ -202,7 +202,7 @@ namespace Mono.CSharp
                                        var field = fields [i];
 
                                        if (field.MemberType.IsStruct)
-                                               sinfo [i] = GetStructInfo (field.MemberType);
+                                               sinfo [i] = GetStructInfo (field.MemberType, context);
 
                                        if (sinfo [i] == null)
                                                field_hash.Add (field.Name, ++Length);
@@ -260,7 +260,7 @@ namespace Mono.CSharp
                                return null;
                        }
 
-                       public static StructInfo GetStructInfo (TypeSpec type)
+                       public static StructInfo GetStructInfo (TypeSpec type, IMemberContext context)
                        {
                                if (type.BuiltinType > 0)
                                        return null;
@@ -269,7 +269,7 @@ namespace Mono.CSharp
                                if (field_type_hash.TryGetValue (type, out info))
                                        return info;
 
-                               return new StructInfo (type);
+                               return new StructInfo (type, context);
                        }
                }
        }
@@ -305,11 +305,11 @@ namespace Mono.CSharp
 
                VariableInfo[] sub_info;
 
-               VariableInfo (string name, TypeSpec type, int offset)
+               VariableInfo (string name, TypeSpec type, int offset, IMemberContext context)
                {
                        this.Name = name;
                        this.Offset = offset;
-                       this.TypeInfo = TypeInfo.GetTypeInfo (type);
+                       this.TypeInfo = TypeInfo.GetTypeInfo (type, context);
 
                        Length = TypeInfo.TotalLength;
 
@@ -343,14 +343,14 @@ namespace Mono.CSharp
 
                public static VariableInfo Create (BlockContext bc, LocalVariable variable)
                {
-                       var info = new VariableInfo (variable.Name, variable.Type, bc.AssignmentInfoOffset);
+                       var info = new VariableInfo (variable.Name, variable.Type, bc.AssignmentInfoOffset, bc);
                        bc.AssignmentInfoOffset += info.Length;
                        return info;
                }
 
                public static VariableInfo Create (BlockContext bc, Parameter parameter)
                {
-                       var info = new VariableInfo (parameter.Name, parameter.Type, bc.AssignmentInfoOffset) {
+                       var info = new VariableInfo (parameter.Name, parameter.Type, bc.AssignmentInfoOffset, bc) {
                                IsParameter = true
                        };
 
index f549432b29ab1330142ff0291f4bf4b8eacda448..304f0e52b0afd8bb2dbfa595c3545e3a35b08653 100644 (file)
@@ -2186,7 +2186,7 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Resolve the type arguments.
                /// </summary>
-               public virtual bool Resolve (IMemberContext ec)
+               public virtual bool Resolve (IMemberContext ec, bool allowUnbound)
                {
                        if (atypes != null)
                            return true;
@@ -2239,9 +2239,12 @@ namespace Mono.CSharp {
 
        public class UnboundTypeArguments : TypeArguments
        {
-               public UnboundTypeArguments (int arity)
+               Location loc;
+
+               public UnboundTypeArguments (int arity, Location loc)
                        : base (new FullNamedExpression[arity])
                {
+                       this.loc = loc;
                }
 
                public override bool IsEmpty {
@@ -2250,8 +2253,12 @@ namespace Mono.CSharp {
                        }
                }
 
-               public override bool Resolve (IMemberContext ec)
+               public override bool Resolve (IMemberContext mc, bool allowUnbound)
                {
+                       if (!allowUnbound) {
+                               mc.Module.Compiler.Report.Error (7003, loc, "Unbound generic name is not valid in this context");
+                       }
+
                        // Nothing to be resolved
                        return true;
                }
@@ -2437,7 +2444,7 @@ namespace Mono.CSharp {
                        if (eclass != ExprClass.Unresolved)
                                return type;
 
-                       if (!args.Resolve (mc))
+                       if (!args.Resolve (mc, allowUnboundTypeArguments))
                                return null;
 
                        TypeSpec[] atypes = args.Arguments;
index da339fa873deb3bbf4daf7ed4dadc7973a52d31a..7f19c2d89b35524f73e49b9b00c4029326fb4276 100644 (file)
@@ -64,7 +64,7 @@ namespace Mono.CSharp.Linq
                        {
                        }
 
-                       protected override void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
+                       public override void Error_TypeDoesNotContainDefinition (ResolveContext ec, TypeSpec type, string name)
                        {
                                ec.Report.Error (1935, loc, "An implementation of `{0}' query expression pattern could not be found. " +
                                        "Are you missing `System.Linq' using directive or `System.Core.dll' assembly reference?",
diff --git a/mcs/mcs/mcs-net_4_0.csproj b/mcs/mcs/mcs-net_4_0.csproj
deleted file mode 100644 (file)
index c24aede..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../class/lib/build</OutputPath>\r
-    <DefineConstants>STATIC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <NoStdLib>true</NoStdLib>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>mscorlib</RootNamespace>\r
-    <AssemblyName>mcs</AssemblyName>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-    <StartupObject>\r
-    </StartupObject>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>STATIC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../class/lib/build,./../class/lib/net_4_0</AdditionalLibPaths>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>STATIC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../class/lib/build,./../class/lib/net_4_0</AdditionalLibPaths>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-   <Compile Include="AssemblyInfo.cs" />
-   <Compile Include="anonymous.cs" />
-   <Compile Include="argument.cs" />
-   <Compile Include="assign.cs" />
-   <Compile Include="assembly.cs" />
-   <Compile Include="attribute.cs" />
-   <Compile Include="cs-tokenizer.cs" />
-   <Compile Include="cfold.cs" />
-   <Compile Include="class.cs" />
-   <Compile Include="codegen.cs" />
-   <Compile Include="complete.cs" />
-   <Compile Include="const.cs" />
-   <Compile Include="constant.cs" />
-   <Compile Include="convert.cs" />
-   <Compile Include="context.cs" />
-   <Compile Include="decl.cs" />
-   <Compile Include="delegate.cs" />
-   <Compile Include="doc.cs" />
-   <Compile Include="driver.cs" />
-   <Compile Include="dynamic.cs" />
-   <Compile Include="ecore.cs" />
-   <Compile Include="enum.cs" />
-   <Compile Include="eval.cs" />
-   <Compile Include="expression.cs" />
-   <Compile Include="field.cs" />
-   <Compile Include="flowanalysis.cs" />
-   <Compile Include="generic.cs" />
-   <Compile Include="import.cs" />
-   <Compile Include="iterators.cs" />
-   <Compile Include="ikvm.cs" />
-   <Compile Include="lambda.cs" />
-   <Compile Include="linq.cs" />
-   <Compile Include="literal.cs" />
-   <Compile Include="location.cs" />
-   <Compile Include="membercache.cs" />
-   <Compile Include="method.cs" />
-   <Compile Include="modifiers.cs" />
-   <Compile Include="namespace.cs" />
-   <Compile Include="nullable.cs" />
-   <Compile Include="parameter.cs" />
-   <Compile Include="pending.cs" />
-   <Compile Include="property.cs" />
-   <Compile Include="reflection.cs" />
-   <Compile Include="report.cs" />
-   <Compile Include="settings.cs" />
-   <Compile Include="module.cs" />
-   <Compile Include="statement.cs" />
-   <Compile Include="support.cs" />
-   <Compile Include="typemanager.cs" />
-   <Compile Include="typespec.cs" />
-   <Compile Include="visit.cs" />
-   <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
-   <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
-   <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />
-   <Compile Include="..\class\corlib\Mono.Security.Cryptography\CryptoConvert.cs" />
-   <Compile Include="..\build\common\Consts.cs" />
-   <Compile Include="..\tools\monop\outline.cs" />
-   <Compile Include="..\class\IKVM.Reflection\*.cs" />
-   <Compile Include="..\class\IKVM.Reflection\Emit\*.cs" />
-   <Compile Include="..\class\IKVM.Reflection\Metadata\*.cs" />
-   <Compile Include="..\class\IKVM.Reflection\Reader\*.cs" />
-   <Compile Include="..\class\IKVM.Reflection\Writer\*.cs" />
-   <Compile Include="..\class\IKVM.Reflection\Impl\CryptoHack.cs" />
-   <Compile Include="..\class\IKVM.Reflection\Impl\ITypeOwner.cs" />
-   <Compile Include="..\class\IKVM.Reflection\Impl\SymbolSupport.cs" />
-   <Compile Include="cs-parser.cs" />
-\r
-  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>$(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\cs-parser.jay > $(ProjectDir)\cs-parser.cs\r
-</PreBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\class\\lib\build\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\class\\lib\build\System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\class\\lib\build\System.Xml.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  \r
-</Project>\r
-
index 3837af2c2d8779e36d7cb82a064f3f5fbaeeb0e6..042a15b6533c3b23c227e08269ec551e427ae0ef 100644 (file)
@@ -686,9 +686,10 @@ namespace Mono.CSharp {
                        throw new NotImplementedException (member.GetType ().ToString ());
                }
 
-               public static List<FieldSpec> GetAllFieldsForDefiniteAssignment (TypeSpec container)
+               public static List<FieldSpec> GetAllFieldsForDefiniteAssignment (TypeSpec container, IMemberContext context)
                {
                        List<FieldSpec> fields = null;
+                       bool imported = container.MemberDefinition.IsImported;
                        foreach (var entry in container.MemberCache.member_hash) {
                                foreach (var name_entry in entry.Value) {
                                        if (name_entry.Kind != MemberKind.Field)
@@ -704,13 +705,7 @@ namespace Mono.CSharp {
                                                continue;
 
                                        var fs = (FieldSpec) name_entry;
-
-                                       //
-                                       // LAMESPEC: Very bizzare hack, definitive assignment is not done
-                                       // for imported non-public reference fields except array. No idea what the
-                                       // actual csc rule is
-                                       //
-                                       if (!fs.IsPublic && container.MemberDefinition.IsImported && (!fs.MemberType.IsArray && TypeSpec.IsReferenceType (fs.MemberType)))
+                                       if (imported && ShouldIgnoreFieldForDefiniteAssignment (fs, context))
                                                continue;
 
                                        //if ((fs.Modifiers & (Modifiers.BACKING_FIELD) != 0)
@@ -727,6 +722,29 @@ namespace Mono.CSharp {
                        return fields ?? new List<FieldSpec> (0);
                }
 
+               static bool ShouldIgnoreFieldForDefiniteAssignment (FieldSpec fs, IMemberContext context)
+               {
+                       //
+                       // LAMESPEC: This mimics csc quirk where definitive assignment is not done
+                       // for all kinds of imported non-public struct fields
+                       //
+                       var mod = fs.Modifiers;
+                       if ((mod & Modifiers.PRIVATE) == 0 && ((mod & Modifiers.INTERNAL) != 0 && fs.DeclaringType.MemberDefinition.IsInternalAsPublic (context.Module.DeclaringAssembly)))
+                               return false;
+
+                       //
+                       // Ignore reference type fields except when type is an array or type parameter
+                       //
+                       var type = fs.MemberType;
+                       switch (type.Kind) {
+                       case MemberKind.ArrayType:
+                       case MemberKind.TypeParameter:
+                               return false;
+                       default:
+                               return TypeSpec.IsReferenceType (type);
+                       }
+               }
+
                public static IList<MemberSpec> GetCompletitionMembers (IMemberContext ctx, TypeSpec container, string name)
                {
                        var matches = new List<MemberSpec> ();
index f5ca0a818a4480e5080a67945f414dca21fd4a2e..29d8c7981046ac6b12ab3b0587995d36b40e5404 100644 (file)
@@ -70,6 +70,9 @@ namespace Mono.CSharp {
                        List<string> res = null;
 
                        foreach (var ns in all_namespaces) {
+                               if (ns.Key.Length == 0)
+                                       continue;
+
                                var methods = ns.Value.LookupExtensionMethod (ctx, name, arity);
                                if (methods != null) {
                                        if (res == null)
@@ -249,7 +252,7 @@ namespace Mono.CSharp {
                                return null;
 
                        foreach (var ts in found) {
-                               if (ts.Arity == arity || mode == LookupMode.NameOf) {
+                               if (ts.Arity == arity) {
                                        if (best == null) {
                                                if ((ts.Modifiers & Modifiers.INTERNAL) != 0 && !ts.MemberDefinition.IsInternalAsPublic (ctx.Module.DeclaringAssembly) && mode != LookupMode.IgnoreAccessibility)
                                                        continue;
@@ -870,7 +873,7 @@ namespace Mono.CSharp {
                        base.EmitContainer ();
                }
 
-               public ExtensionMethodCandidates LookupExtensionMethod (IMemberContext invocationContext, TypeSpec extensionType, string name, int arity, int position)
+               public ExtensionMethodCandidates LookupExtensionMethod (IMemberContext invocationContext, string name, int arity, int position)
                {
                        //
                        // Here we try to resume the search for extension method at the point
@@ -1499,7 +1502,7 @@ namespace Mono.CSharp {
                                throw new NotImplementedException ();
                        }
 
-                       public ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity)
+                       public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                        {
                                return null;
                        }
index 0f863a7bcf1c016f89a4588e49d6f427a5d7c676..661142822f802a9f55ed7560eb510ca5c30c1f50 100644 (file)
@@ -108,7 +108,7 @@ namespace Mono.CSharp {
                        throw new NotImplementedException ();
                }
 
-               public ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity)
+               public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                {
                        throw new NotImplementedException ();
                }
index 0113915bcacda5bb7b257c28fa147575a69e6854..fe0910186fe43ff3478be0db86d691b9c471a492 100644 (file)
@@ -21,23 +21,9 @@ EXTRA_DISTFILES = \
 
 CLEAN_FILES = $(RESX_RES)
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 include ../../../build/library.make
 
 $(the_lib): $(RESX_RES)
 
 $(RESX_RES): %.resources: %.resx
        $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index 7cfc1e3bab77840ebd9c327ba388e73d01ce0143..e89d705e83c32e0d5cff7b929c38995ea8a9baf3 100644 (file)
@@ -123,34 +123,36 @@ namespace NUnit.ConsoleRunner
 \r
                                Console.WriteLine();\r
 \r
-                               string xmlOutput = CreateXmlOutput( result );\r
-                       \r
-                               if (options.xmlConsole)\r
-                               {\r
-                                       Console.WriteLine(xmlOutput);\r
-                               }\r
-                               else\r
-                               {\r
-                                       try\r
+                               if (result != null) {\r
+                                       string xmlOutput = CreateXmlOutput( result );\r
+\r
+                                       if (options.xmlConsole)\r
                                        {\r
-                                               //CreateSummaryDocument(xmlOutput, transformReader );\r
-                                               XmlResultTransform xform = new XmlResultTransform( transformReader );\r
-                                               xform.Transform( new StringReader( xmlOutput ), Console.Out );\r
+                                               Console.WriteLine(xmlOutput);\r
                                        }\r
-                                       catch( Exception ex )\r
+                                       else\r
                                        {\r
-                                               Console.WriteLine( "Error: {0}", ex.Message );\r
-                                               return TRANSFORM_ERROR;\r
+                                               try\r
+                                               {\r
+                                                       //CreateSummaryDocument(xmlOutput, transformReader );\r
+                                                       XmlResultTransform xform = new XmlResultTransform( transformReader );\r
+                                                       xform.Transform( new StringReader( xmlOutput ), Console.Out );\r
+                                               }\r
+                                               catch( Exception ex )\r
+                                               {\r
+                                                       Console.WriteLine( "Error: {0}", ex.Message );\r
+                                                       return TRANSFORM_ERROR;\r
+                                               }\r
                                        }\r
-                               }\r
 \r
-                               // Write xml output here\r
-                               string xmlResultFile = options.xml == null || options.xml == string.Empty\r
-                                       ? "TestResult.xml" : options.xml;\r
+                                       // Write xml output here\r
+                                       string xmlResultFile = options.xml == null || options.xml == string.Empty\r
+                                               ? "TestResult.xml" : options.xml;\r
 \r
-                               using ( StreamWriter writer = new StreamWriter( xmlResultFile ) ) \r
-                               {\r
-                                       writer.Write(xmlOutput);\r
+                                       using ( StreamWriter writer = new StreamWriter( xmlResultFile ) )\r
+                                       {\r
+                                               writer.Write(xmlOutput);\r
+                                       }\r
                                }\r
 \r
                                //if ( testRunner != null )\r
index 3b0d5ce3d87b1b0bfcc7b736990cce8535c95112..52fe21bf61bd20ba7b9146cb190bff2faef5d5d3 100644 (file)
@@ -13,18 +13,4 @@ NO_TEST = yo
 
 EXTRA_DISTFILES = nunit-console.csproj nunit-console_VS2005.csproj
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index c20d787be81c40924e6eedb308d761983cc3747c..ac3b0146fbfb99fc9f9ecb04302b6c3fed65fd3d 100644 (file)
@@ -8,20 +8,6 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LOCAL_MCS_FLAGS= -r:nunit.framework.dll -r:nunit.core.interfaces.dll -r:System.dll /d:StronglyNamedAssembly -warn:1
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = nunit.core.dll.csproj nunit.core.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index d6f4602ce84c3adebae1f735829ea0a47e86d106..e9ddcc79faffa2990629eb1ecd221fb850e39243 100644 (file)
@@ -8,20 +8,6 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = nunit.core.interfaces.dll.csproj nunit.core.interfaces.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index cd09dc556fc6c6b2fbb2ad2378670d49bfbc5474..48f8ccf8f6fddb1a8a87d0838ab0c888fb9cefad 100644 (file)
@@ -11,22 +11,8 @@ LIB_MCS_FLAGS = \
        /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
        nunit.core.extensions.dll.csproj \
        nunit.core.extensions.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index c49a5f487d9332aa34605f88fa3f055385e420cf..81d6b15439d091dc1e5fd4e99e4d3d3e2bd97b1d 100644 (file)
@@ -8,22 +8,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LIB_MCS_FLAGS = -debug /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
        nunit.framework.extensions.dll.csproj \
        nunit.framework.extensions.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index f00adfacfb98f33dd2f569a19b85a780b3580f8a..157b0b4d5783cf517eb9e8d38508d7df8bc08e95 100644 (file)
@@ -9,22 +9,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LIB_MCS_FLAGS = /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly -warn:1
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
        nunit.framework.dll.csproj \
        nunit.framework.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index b459c284ad6a14a5c4a6e7f4a398de42932cc351..b9769c4777d6576f992949c24bf4e893ec3df3bd 100644 (file)
@@ -8,22 +8,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
        nunit.mocks.csproj \
        nunit.mocks_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-       $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-       cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-       rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
index 522c78d44d3a5bf071627e38969deeb155c3cf5f..78c861799e457b89a86b4bb72037340c539eacd5 100644 (file)
@@ -61,7 +61,7 @@ build-compiler-lib:
        cd ../class/Mono.CSharp && $(MAKE) NO_DIR_CHECK=yes
 
 qcheck: build-compiler-lib qcheck2
-       
+
 qcheck2:
        $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log -il:ver-il-$(PROFILE).xml $(DEFINES) $(TOPTIONS)
 
index 2f5ea10ae8f4ecd1b3a4ce2e527d11fb98871ef9..45d03a328a7594325bb797c3cfc42f5aca1b1c24 100644 (file)
@@ -160,6 +160,11 @@ public class ConditionalParsing
                var x = 1 > 0  ? table[5, 1] : 0;
        }
 
+       void Test_20 ()
+       {
+               var t = (Object)string.Empty;
+       }
+
        static void Helper<T> (T arg)
        {
        }
diff --git a/mcs/tests/gtest-626.cs b/mcs/tests/gtest-626.cs
new file mode 100644 (file)
index 0000000..045028d
--- /dev/null
@@ -0,0 +1,30 @@
+using System;
+
+class Program
+{
+       public class Foo
+       {
+               public static bool MG (Foo t)
+               {
+                       return false;
+               }
+       }
+
+       public class Bar<T>
+       {
+               public static Bar<T> Create (Func<T, bool> a)
+               {
+                       return null;
+               }
+
+               public static Bar<T> Create (Func<T, double> a, Func<T, bool> b = null)
+               {
+                       throw new ApplicationException ();
+               }
+       }
+
+       static void Main ()
+       {
+               var x = Bar<Foo>.Create (Foo.MG);
+       }
+}
diff --git a/mcs/tests/gtest-627.cs b/mcs/tests/gtest-627.cs
new file mode 100644 (file)
index 0000000..7ac0117
--- /dev/null
@@ -0,0 +1,19 @@
+using System;
+
+class X
+{
+       public static U Foo<U> (double? value, Func<double?, U> f, int dv = 0)
+       {
+               throw new ApplicationException ();
+       }
+
+       public static U Foo<T, U> (T? source, Func<T, U> f) where T : struct
+       {
+               return default (U);
+       }
+
+       static void Main (string[] args)
+       {
+               Foo (default (double?), v => v / 100);
+       }
+}
diff --git a/mcs/tests/gtest-628.cs b/mcs/tests/gtest-628.cs
new file mode 100644 (file)
index 0000000..c57e536
--- /dev/null
@@ -0,0 +1,20 @@
+using System;
+using System.Threading;
+
+class Impl<T> where T : class
+{
+       public static object CompareExchangeImpl (TypedReference tr, object value, object comparand)
+       {
+               return Interlocked.CompareExchange (ref __refvalue(tr, T), (T) value, (T) comparand);
+       }
+}
+
+class X
+{
+       public static void Main ()
+       {
+               var obj = "obj";
+               var tr = __makeref (obj);
+               Impl<string>.CompareExchangeImpl (tr, "foo", null);
+       }
+}
\ No newline at end of file
diff --git a/mcs/tests/gtest-named-06.cs b/mcs/tests/gtest-named-06.cs
new file mode 100644 (file)
index 0000000..e9b2de5
--- /dev/null
@@ -0,0 +1,18 @@
+// parser test
+
+class X
+{
+       public static int T1 (int seconds)
+       {
+               return T1_Foo (value: seconds * 1000);
+       }
+
+       public static int T1_Foo (int value = 0)
+       {
+               return value;
+       }
+
+       public static void Main ()
+       {
+       }
+}
\ No newline at end of file
index 52d3b1e9d97ca5d10a9aa0beeccb6f81db5546ea..58f3f1c37bf3e40d1c5d30473c6ba6ac998c52ba 100644 (file)
@@ -1,4 +1,4 @@
-// Compiler options: -r:../class/lib/net_2_0/Mono.Cecil.dll
+// Compiler options: -r:../class/lib/net_4_5/Mono.Cecil.dll
 
 using System;
 using System.IO;
index ded27a937455cbf8888124ffdca65add3ab251fb..495fec55c4849c571ba576e12184062e5a16911d 100644 (file)
@@ -1,4 +1,4 @@
-// Compiler options: -r:../class/lib/net_2_0/Mono.Cecil.dll
+// Compiler options: -r:../class/lib/net_4_5/Mono.Cecil.dll
 
 using System;
 using Mono.Cecil;
diff --git a/mcs/tests/test-910.cs b/mcs/tests/test-910.cs
new file mode 100644 (file)
index 0000000..0cbdf42
--- /dev/null
@@ -0,0 +1,10 @@
+using System.Security;
+using System.Security.Permissions;
+
+[HostProtection]
+class X
+{
+       public static void Main ()
+       {
+       }
+}
diff --git a/mcs/tests/test-async-76.cs b/mcs/tests/test-async-76.cs
new file mode 100644 (file)
index 0000000..5fa226a
--- /dev/null
@@ -0,0 +1,42 @@
+// Compiler options: -r:../class/lib/net_4_5/Mono.Cecil.dll
+
+using System;
+using System.Threading.Tasks;
+using Mono.Cecil;
+
+namespace N
+{
+       class C
+       {
+       }
+
+       interface I<T>
+       {
+               void Foo (T t);
+       }
+
+       class X : I<C>
+       {
+               async void I<C>.Foo (C c)
+               {
+                       await Task.Delay (1);
+               }
+
+               public static void Main ()
+               {
+                       var assembly = AssemblyDefinition.ReadAssembly (typeof (X).Assembly.Location);
+                       foreach (var t in assembly.MainModule.Types) {
+                               PrintType (t, 0);
+                       }
+               }
+               static void PrintType (TypeDefinition td, int indent)
+               {
+                       if (td.IsNested && !string.IsNullOrEmpty (td.Namespace))
+                               throw new ApplicationException ("BROKEN NESTED TYPE:");
+                       Console.WriteLine ("{2} Namespace: {0} Name: {1}", td.Namespace, td.Name, new string (' ', indent * 4));
+                       foreach (var tn in td.NestedTypes)
+                               PrintType (tn, indent + 1);
+               }
+       }
+}
\ No newline at end of file
index 81cfc1f1a0677ced6ff340681692a54f7c9688a4..9078ff7caaa4814263d2c234eba8ba3ec388bb1a 100644 (file)
@@ -30,9 +30,9 @@ class DeclarationExpression
                if (r2 != 8)
                        return 6;
 
-               Out2 (str: "b", v: out var o5);
-               if (o5 != 9)
-                       return 7;
+//             Out2 (str: "b", v: out var o5);
+//             if (o5 != 9)
+//                     return 7;
 
                Out3 (out var o6 = 9m);
                if (o6.GetType () != typeof (decimal))
diff --git a/mcs/tests/test-dictinit-03.cs b/mcs/tests/test-dictinit-03.cs
new file mode 100644 (file)
index 0000000..6b44ec0
--- /dev/null
@@ -0,0 +1,22 @@
+using System;
+
+class C
+{
+       int[,] a = new int [2, 3];
+
+       static int Main ()
+       {
+               var res = new C { a = { [1, 1] = 11, [0, 2] = 2} };
+               if (res.a [1, 1] != 11)
+                       return 1;
+
+               if (res.a [1, 2] != 0)
+                       return 2;
+
+               if (res.a [0, 2] != 2)
+                       return 3;
+
+               Console.WriteLine ("ok");
+               return 0;
+       }
+}
\ No newline at end of file
diff --git a/mcs/tests/test-named-09.cs b/mcs/tests/test-named-09.cs
new file mode 100644 (file)
index 0000000..a44dca3
--- /dev/null
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+class X
+{
+       public static int Main ()
+       {
+               switch (nameof (Dictionary<int,int>.Add)) {
+                       case nameof (List<int>.Equals):
+                               return 1;
+                       case nameof(List<int>.Add):
+                               return 0;
+                       default:
+                               return 2;
+               }               
+       }
+}
\ No newline at end of file
index a8bb677416f23572491dd13f8c180ed132bbbec0..7cdecb1e1e64efd80e7ed17ea66d777beeb288ad 100644 (file)
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using SCG = System.Collections.Generic;
-//using SCGL = System.Collections.Generic.List<>;
+using SCGL = System.Collections.Generic.List<string>;
 
 class A<T>
 {
@@ -75,7 +75,7 @@ class X
                if (nameof (Action) != "Action")
                        return 10;
 
-               if (nameof (List) != "List")
+               if (nameof (List<bool>) != "List")
                        return 11;
 
                if (nameof (GenMethod) != "GenMethod")
@@ -95,7 +95,7 @@ class X
                if (nameof (Console.WriteLine) != "WriteLine")
                        return 3;
 
-               if (nameof (System.Collections.Generic.List) != "List")
+               if (nameof (System.Collections.Generic.List<long>) != "List")
                        return 4;
 
                if (nameof (System.Collections) != "Collections")
@@ -104,10 +104,10 @@ class X
                if (nameof (X.GenMethod) != "GenMethod")
                        return 6;
 
-               if (nameof (A<>.B) != "B")
+               if (nameof (A<char>.B) != "B")
                        return 7;
 
-               if (nameof (A<>.B.Foo) != "Foo")
+               if (nameof (A<ushort>.B.Foo) != "Foo")
                        return 7;
 
                return 0;
@@ -118,11 +118,11 @@ class X
                if (nameof (global::System.Int32) != "Int32")
                        return 1;
 
-               if (nameof (SCG.List) != "List")
+               if (nameof (SCG.List<short>) != "List")
                        return 2;
 
-//             if (nameof (SCGL.Contains) != "Contains")
-//                     return 3;
+               if (nameof (SCGL.Contains) != "Contains")
+                       return 3;
 
                return 0;
        }
diff --git a/mcs/tests/test-nameof-05.cs b/mcs/tests/test-nameof-05.cs
new file mode 100644 (file)
index 0000000..765c4d2
--- /dev/null
@@ -0,0 +1,39 @@
+using System;
+
+public class A
+{
+}
+
+namespace N1
+{
+       public static class X
+       {
+               public static string Extension (this A a, long x)
+               {
+                       return null;
+               }
+               
+               public static string Extension (this A a, int x)
+               {
+                       return null;
+               }
+       }
+}
+
+namespace N2
+{
+       using N1;
+       
+       public class Program
+       {
+               public static int Main ()
+               {
+                       A a = null;
+                       const string n = nameof (a.Extension);
+                       if (n != "Extension")
+                               return 1;
+
+                       return 0;
+               }
+       }
+}
\ No newline at end of file
index e8d9cfffbf118c708687b337c40dff73a0d9b587..ecbc6019059105b87a997e1ee08f830545102d92 100644 (file)
@@ -24,6 +24,11 @@ class C
                if (v3 != 724)
                        return 3;
 
+               string[] ar3 = null;
+               var v4 = ar3?[0].Length;
+               if (v4 != null)
+                       return 4;
+
 // TODO: Disabled for now?
 //        arr? [0] += 2;
                return 0;
index 3b54b840acf9088d8058fadcd5d97a863badf19e..335f075e997d785da861d1ce380f73d072d4801f 100644 (file)
@@ -15,8 +15,8 @@ class RecursiveNamedPattern
                if (Switch_1 (1) != 1)
                        return 3;
 
-               if (Switch_1 (new C1 ()) != 3)
-                       return 4;
+//             if (Switch_1 (new C1 ()) != 3)
+//                     return 4;
 
                if (Switch_1 ((byte?) 1) != 1)
                        return 5;
@@ -36,10 +36,10 @@ class RecursiveNamedPattern
                switch (o) {
                        case 1:
                                return 1;
-                       case C1 (3):
-                               return 2;
-                       case C1 (2):
-                               return 3;
+//                     case C1 (3):
+//                             return 2;
+//                     case C1 (2):
+//                             return 3;
                        case null:
                                return 4;
                        default:
index 4ef8057f0a4de050bc9a5e700a51c6528ea95e4b..e7038d641327950b794318e2d7557898dc9b5f96 100644 (file)
         <size>7</size>\r
       </method>\r
     </type>\r
-    <type name="Qux`2+GetEnumerator&gt;c__Iterator0[X,V]">\r
+    <type name="Qux`2[X,V]">\r
+      <method name="System.Collections.Generic.IEnumerator`1[V] GetEnumerator()" attrs="486">\r
+        <size>15</size>\r
+      </method>\r
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">\r
+        <size>15</size>\r
+      </method>\r
+    </type>\r
+    <type name="Qux`2+&lt;System_Collections_IEnumerable_GetEnumerator&gt;c__Iterator0[X,V]">\r
+      <method name="Boolean MoveNext()" attrs="486">\r
+        <size>26</size>\r
+      </method>\r
       <method name="System.Object System.Collections.Generic.IEnumerator&lt;object&gt;.get_Current()" attrs="2529">\r
         <size>14</size>\r
       </method>\r
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">\r
         <size>14</size>\r
       </method>\r
-      <method name="Boolean MoveNext()" attrs="486">\r
-        <size>26</size>\r
-      </method>\r
       <method name="Void Dispose()" attrs="486">\r
         <size>1</size>\r
       </method>\r
         <size>7</size>\r
       </method>\r
     </type>\r
-    <type name="Qux`2[X,V]">\r
-      <method name="System.Collections.Generic.IEnumerator`1[V] GetEnumerator()" attrs="486">\r
-        <size>15</size>\r
-      </method>\r
-      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">\r
-        <size>15</size>\r
-      </method>\r
-    </type>\r
   </test>\r
   <test name="gtest-272.cs">\r
     <type name="Handler`1[T]">\r
         <size>7</size>\r
       </method>\r
     </type>\r
-    <type name="Test+GetEnumerator&gt;c__Iterator0">\r
+    <type name="Test">\r
+      <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">\r
+        <size>15</size>\r
+      </method>\r
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+    <type name="Test+&lt;System_Collections_Generic_IEnumerable&lt;int&gt;_GetEnumerator&gt;c__Iterator0">\r
+      <method name="Boolean MoveNext()" attrs="486">\r
+        <size>26</size>\r
+      </method>\r
       <method name="Int32 System.Collections.Generic.IEnumerator&lt;int&gt;.get_Current()" attrs="2529">\r
         <size>14</size>\r
       </method>\r
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">\r
         <size>19</size>\r
       </method>\r
-      <method name="Boolean MoveNext()" attrs="486">\r
-        <size>26</size>\r
-      </method>\r
       <method name="Void Dispose()" attrs="486">\r
         <size>1</size>\r
       </method>\r
         <size>7</size>\r
       </method>\r
     </type>\r
-    <type name="Test">\r
-      <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">\r
-        <size>15</size>\r
-      </method>\r
-      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">\r
-        <size>7</size>\r
-      </method>\r
-    </type>\r
   </test>\r
   <test name="gtest-303.cs">\r
     <type name="test.BaseClass">\r
       <method name="Void Test_19(Int32[,])" attrs="129">\r
         <size>11</size>\r
       </method>\r
+      <method name="Void Test_20()" attrs="129">\r
+        <size>8</size>\r
+      </method>\r
     </type>\r
   </test>\r
   <test name="gtest-410.cs">\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="gtest-626.cs">\r
+    <type name="Program">\r
+      <method name="Void Main()" attrs="145">\r
+        <size>37</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+    <type name="Program+Foo">\r
+      <method name="Boolean MG(Foo)" attrs="150">\r
+        <size>10</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+    <type name="Program+Bar`1[T]">\r
+      <method name="Bar`1 Create(System.Func`2[T,System.Boolean])" attrs="150">\r
+        <size>10</size>\r
+      </method>\r
+      <method name="Bar`1 Create(System.Func`2[T,System.Double], System.Func`2[T,System.Boolean])" attrs="150">\r
+        <size>7</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
+  <test name="gtest-627.cs">\r
+    <type name="X">\r
+      <method name="U Foo[U](System.Nullable`1[System.Double], System.Func`2[System.Nullable`1[System.Double],U], Int32)" attrs="150">\r
+        <size>7</size>\r
+      </method>\r
+      <method name="U Foo[T,U](System.Nullable`1[T], System.Func`2[T,U])" attrs="150">\r
+        <size>18</size>\r
+      </method>\r
+      <method name="Void Main(System.String[])" attrs="145">\r
+        <size>46</size>\r
+      </method>\r
+      <method name="Double &lt;Main&gt;m__0(Double)" attrs="145">\r
+        <size>19</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
+  <test name="gtest-628.cs">\r
+    <type name="Impl`1[T]">\r
+      <method name="System.Object CompareExchangeImpl(System.TypedReference, System.Object, System.Object)" attrs="150">\r
+        <size>37</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+    <type name="X">\r
+      <method name="Void Main()" attrs="150">\r
+        <size>29</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="gtest-anontype-01.cs">\r
     <type name="Test">\r
       <method name="Int32 Main()" attrs="150">\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="gtest-named-06.cs">\r
+    <type name="X">\r
+      <method name="Int32 T1(Int32)" attrs="150">\r
+        <size>21</size>\r
+      </method>\r
+      <method name="Int32 T1_Foo(Int32)" attrs="150">\r
+        <size>10</size>\r
+      </method>\r
+      <method name="Void Main()" attrs="150">\r
+        <size>2</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="gtest-optional-01.cs">\r
     <type name="C">\r
       <method name="Void TestA(Int32)" attrs="150">\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="test-910.cs">\r
+    <type name="X">\r
+      <method name="Void Main()" attrs="150">\r
+        <size>2</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="test-92.cs">\r
     <type name="Outer">\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>285</size>\r
       </method>\r
     </type>\r
-    <type name="A+async&gt;c__async0">\r
-      <method name="Void MoveNext()" attrs="486">\r
-        <size>61</size>\r
-      </method>\r
-    </type>\r
     <type name="D">\r
       <method name="System.Threading.Tasks.Task M()" attrs="129">\r
         <size>33</size>\r
         <size>13</size>\r
       </method>\r
     </type>\r
-    <type name="A+async&gt;c__async0">\r
-      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">\r
-        <size>13</size>\r
-      </method>\r
-    </type>\r
     <type name="D+&lt;M&gt;c__async0">\r
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">\r
         <size>13</size>\r
         <size>2</size>\r
       </method>\r
     </type>\r
+    <type name="A+&lt;Iasync_async&gt;c__async0">\r
+      <method name="Void MoveNext()" attrs="486">\r
+        <size>61</size>\r
+      </method>\r
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">\r
+        <size>13</size>\r
+      </method>\r
+    </type>\r
   </test>\r
   <test name="test-async-23.cs">\r
     <type name="MyContext">\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="test-async-76.cs">\r
+    <type name="N.C">\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+    <type name="N.X">\r
+      <method name="Void N.I&lt;N.C&gt;.Foo(N.C)" attrs="481">\r
+        <size>27</size>\r
+      </method>\r
+      <method name="Void Main()" attrs="150">\r
+        <size>99</size>\r
+      </method>\r
+      <method name="Void PrintType(Mono.Cecil.TypeDefinition, Int32)" attrs="145">\r
+        <size>138</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+    <type name="N.X+&lt;N_I&lt;N_C&gt;_Foo&gt;c__async0">\r
+      <method name="Void MoveNext()" attrs="486">\r
+        <size>157</size>\r
+      </method>\r
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">\r
+        <size>13</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="test-cls-00.cs">\r
     <type name="CLSCLass_6">\r
       <method name="Void add_Disposed(Delegate)" attrs="2182">\r
   <test name="test-decl-expr-01.cs">\r
     <type name="DeclarationExpression">\r
       <method name="Int32 Main()" attrs="150">\r
-        <size>252</size>\r
+        <size>223</size>\r
       </method>\r
       <method name="Boolean Out(Int32 ByRef)" attrs="145">\r
         <size>13</size>\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="test-dictinit-03.cs">\r
+    <type name="C">\r
+      <method name="Int32 Main()" attrs="145">\r
+        <size>135</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>20</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="test-ex-filter-01.cs">\r
     <type name="X">\r
       <method name="Int32 Main()" attrs="150">\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="test-named-09.cs">\r
+    <type name="X">\r
+      <method name="Int32 Main()" attrs="150">\r
+        <size>11</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="test-nameof-01.cs">\r
     <type name="X">\r
       <method name="Int32 Main()" attrs="150">\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="test-nameof-05.cs">\r
+    <type name="A">\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+    <type name="N1.X">\r
+      <method name="System.String Extension(A, Int64)" attrs="150">\r
+        <size>10</size>\r
+      </method>\r
+      <method name="System.String Extension(A, Int32)" attrs="150">\r
+        <size>10</size>\r
+      </method>\r
+    </type>\r
+    <type name="N2.Program">\r
+      <method name="Int32 Main()" attrs="150">\r
+        <size>12</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="test-null-operator-01.cs">\r
     <type name="S">\r
       <method name="Int32 get_Prop()" attrs="2182">\r
     </type>\r
     <type name="C">\r
       <method name="Int32 TestArrayAccess()" attrs="145">\r
-        <size>206</size>\r
+        <size>263</size>\r
       </method>\r
       <method name="Int32 TestIndexerAccess()" attrs="145">\r
         <size>188</size>\r
   <test name="test-pattern-06.cs">\r
     <type name="RecursiveNamedPattern">\r
       <method name="Int32 Main()" attrs="150">\r
-        <size>182</size>\r
+        <size>159</size>\r
       </method>\r
       <method name="Int32 Switch_1(System.Object)" attrs="145">\r
-        <size>149</size>\r
+        <size>53</size>\r
       </method>\r
       <method name="Int32 Switch_2(C1)" attrs="145">\r
         <size>28</size>\r
index 3c0f45c251f553acca6aba16949642e98af57a00..540b056bdfee41735f18660d108ee6bc97764619 100644 (file)
@@ -53,11 +53,10 @@ net_2_0_dirs := \
        $(per_profile_dirs)
 
 build_SUBDIRS = gacutil security culevel
-net_2_0_SUBDIRS := $(basic_SUBDIRS) $(net_2_0_dirs)
 net_4_0_SUBDIRS := $(net_4_0_dirs) $(basic_SUBDIRS)
 net_4_5_SUBDIRS := $(net_4_0_SUBDIRS)
 
-SUBDIRS = $(basic_SUBDIRS) $(net_2_0_SUBDIRS)
+SUBDIRS = $(basic_SUBDIRS) $(net_2_0_dirs)
 DIST_SUBDIRS = $(SUBDIRS) $(net_4_0_dirs)
 
 include ../build/rules.make
diff --git a/mcs/tools/corcompare/mono-api-html/ApiChange.cs b/mcs/tools/corcompare/mono-api-html/ApiChange.cs
new file mode 100644 (file)
index 0000000..8cb1962
--- /dev/null
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml.Linq;
+
+namespace Xamarin.ApiDiff
+{
+       public class ApiChange
+       {
+               public string Header;
+               public StringBuilder Member = new StringBuilder ();
+               public bool Breaking;
+               public bool AnyChange;
+               public bool HasIgnoredChanges;
+
+               public ApiChange Append (string text)
+               {
+                       Member.Append (text);
+                       return this;
+               }
+
+               public ApiChange AppendAdded (string text, bool breaking = false)
+               {
+                       if (breaking)
+                               Member.Append ("<u>");
+                       if (State.Colorize)
+                               Member.Append (breaking ? "<font color='green'>" : "<font color='green'>");
+                       Member.Append (text);
+                       if (State.Colorize)
+                               Member.Append (breaking ? "</font>" : "</font>");
+                       if (breaking)
+                               Member.Append ("</u>");
+                       Breaking |= breaking;
+                       AnyChange = true;
+                       return this;
+               }
+
+               public ApiChange AppendRemoved (string text, bool breaking = true)
+               {
+                       Member.Append ("<s>");
+                       if (State.Colorize && breaking)
+                               Member.Append ("<font color='red'>");
+                       Member.Append (text);
+                       if (State.Colorize && breaking)
+                               Member.Append ("</font>");
+                       Member.Append ("</s>");
+                       Breaking |= breaking;
+                       AnyChange = true;
+                       return this;
+               }
+
+               public ApiChange AppendModified (string old, string @new, bool breaking = true)
+               {
+                       if (old.Length > 0)
+                               AppendRemoved (old, breaking);
+                       if (old.Length > 0 && @new.Length > 0)
+                               Append (" ");
+                       if (@new.Length > 0)
+                               AppendAdded (@new);
+                       Breaking |= breaking;
+                       AnyChange = true;
+                       return this;
+               }
+       }
+
+       public class ApiChanges : Dictionary<string, List<ApiChange>> {
+               public void Add (XElement source, XElement target, ApiChange change)
+               {
+                       if (!change.AnyChange) {
+                               // This is most likely because the rendering doesn't take into account something that's different (solution: fix rendering).
+                               if (!change.HasIgnoredChanges)
+                                       Console.WriteLine ("Comparison resulting in no changes (src: {2} dst: {3}) :\n{0}\n{1}\n\n", source.ToString (), target.ToString (), source.GetMethodAttributes (), target.GetMethodAttributes ());
+                               return;
+                       }
+
+                       List<ApiChange> list;
+                       if (!TryGetValue (change.Header, out list)) {
+                               list = new List<ApiChange> ();
+                               base.Add (change.Header, list);
+                       }
+                       list.Add (change);
+               }
+       }
+}
+
index fb326624ba5dfe312dd8fc557b53e6cf7a836285..69454e1184c84e8296a1145188c0998846838587 100644 (file)
@@ -79,6 +79,7 @@ namespace Xamarin.ApiDiff {
                public  static  bool    IgnoreAddedPropertySetters  { get; set; }
 
                public static bool Lax;
+               public static bool Colorize = true;
        }
 
        class Program {
@@ -118,6 +119,7 @@ namespace Xamarin.ApiDiff {
                                { "ignore-changes-virtual", "Ignore changing non-`virtual` to `virtual` or adding `override`.",
                                        v => State.IgnoreVirtualChanges = v != null
                                },
+                               { "c|colorize:", "Colorize HTML output", v => State.Colorize = string.IsNullOrEmpty (v) ? true : bool.Parse (v) },
                                { "x|lax", "Ignore duplicate XML entries", v => State.Lax = true }
                        };
 
index e083c270850df8f96da78d13da5e07fed71c5394..ff5326d9c8b083d253fc422c48db45e90a1ca2b3 100644 (file)
@@ -25,6 +25,7 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.Xml.Linq;
 
 namespace Xamarin.ApiDiff {
@@ -61,7 +62,7 @@ namespace Xamarin.ApiDiff {
                        // one assembly per xml file
                }
 
-               public override void Modified (XElement source, XElement target)
+               public override void Modified (XElement source, XElement target, ApiChanges diff)
                {
                        SourceAssembly = source.GetAttribute ("name");
                        TargetAssembly = target.GetAttribute ("name");
index d96613c3e8ac69fe3a1a121e84fc4c7b6d0ed700..87680c0295009035d7e90ca19559a132e853567e 100644 (file)
@@ -74,8 +74,12 @@ namespace Xamarin.ApiDiff {
                                return;
                        Output.WriteLine ("<h3>New Type {0}.{1}</h3>", State.Namespace, name);
                        Output.WriteLine ("<pre>");
+                       if (State.Colorize)
+                               Output.WriteLine ("<font color='green'>");
                        State.Indent = 0;
                        AddedInner (target);
+                       if (State.Colorize)
+                               Output.WriteLine ("</font>");
                        Output.WriteLine ("</pre>");
                }
 
@@ -196,7 +200,7 @@ namespace Xamarin.ApiDiff {
                        Indent ().WriteLine ("}");
                }
 
-               public override void Modified (XElement source, XElement target)
+               public override void Modified (XElement source, XElement target, ApiChanges diff)
                {
                        // hack - there could be changes that we're not monitoring (e.g. attributes properties)
                        var output = Output;
index 3cf678f7fffe4e28b26e1279ebc5d4ca6765999c..8c692a03a9a47c2d3feab700bf81997ff3cc692e 100644 (file)
@@ -35,7 +35,7 @@ namespace Xamarin.ApiDiff {
        public abstract class Comparer {
 
                protected List<XElement> removed = new List<XElement> ();
-               protected List<XElement> obsoleted = new List<XElement> ();
+               protected ApiChanges modified = new ApiChanges ();
 
                public TextWriter Output {
                        get { return State.Output; }
@@ -49,10 +49,10 @@ namespace Xamarin.ApiDiff {
                }
 
                public abstract void Added (XElement target);
-               public abstract void Modified (XElement source, XElement target);
+               public abstract void Modified (XElement source, XElement target, ApiChanges changes);
                public abstract void Removed (XElement source);
 
-               public virtual bool Equals (XElement source, XElement target)
+               public virtual bool Equals (XElement source, XElement target, ApiChanges changes)
                {
                        return XNode.DeepEquals (source, target);
                }
@@ -62,6 +62,7 @@ namespace Xamarin.ApiDiff {
                public virtual void Compare (IEnumerable<XElement> source, IEnumerable<XElement> target)
                {
                        removed.Clear ();
+                       modified.Clear ();
 
                        foreach (var s in source) {
                                SetContext (s);
@@ -73,11 +74,11 @@ namespace Xamarin.ApiDiff {
                                } else {
                                        t.Remove ();
                                        // possibly modified
-                                       if (Equals (s, t))
+                                       if (Equals (s, t, modified))
                                                continue;
 
                                        // still in target so will be part of Added
-                                       Modified (s, t);
+                                       Modified (s, t, modified);
                                }
                        }
                        // delayed, that way we show "Modified", "Added" and then "Removed"
index 66dfeb004375965a77add19d7abd98754e5e53a5..9bd837e241fe94065b70d30a15c2d6acc82bdfb6 100644 (file)
@@ -32,6 +32,7 @@ using System.Xml.Linq;
 
 namespace Xamarin.ApiDiff {
 
+       // MethodComparer inherits from this one
        public class ConstructorComparer : MemberComparer {
 
                public override string GroupName {
@@ -47,6 +48,39 @@ namespace Xamarin.ApiDiff {
                        return (e.Attribute ("name").Value == Source.Attribute ("name").Value);
                }
 
+               void RenderReturnType (XElement source, XElement target, ApiChange change)
+               {
+                       var srcType = source.GetTypeName ("returntype");
+                       var tgtType = target.GetTypeName ("returntype");
+
+                       if (srcType != tgtType) {
+                               change.AppendModified (srcType, tgtType, true);
+                               change.Append (" ");
+                       } else if (srcType != null) {
+                               // ctor don't have a return type
+                               change.Append (srcType);
+                               change.Append (" ");
+                       }
+               }
+
+               public override bool Equals (XElement source, XElement target, ApiChanges changes)
+               {
+                       if (base.Equals (source, target, changes))
+                               return true;
+                               
+                       var change = new ApiChange ();
+                       change.Header = "Modified " + GroupName;
+                       RenderMethodAttributes (source, target, change);
+                       RenderReturnType (source, target, change);
+                       RenderName (source, target, change);
+                       RenderGenericParameters (source, target, change);
+                       RenderParameters (source, target, change);
+
+                       changes.Add (source, target, change);
+
+                       return false;
+               }
+
                public override string GetDescription (XElement e)
                {
                        var sb = new StringBuilder ();
index c7d1e8bc8860c1f3c9cbe252095d6f5eabf32a71..693f16f534263891fb927f04406eb61e8c65fbd0 100644 (file)
@@ -40,9 +40,31 @@ namespace Xamarin.ApiDiff {
                        get { return "event"; }
                }
 
+               public override bool Equals (XElement source, XElement target, ApiChanges changes)
+               {
+                       if (base.Equals (source, target, changes))
+                               return true;
+
+                       var change = new ApiChange ();
+                       change.Header = "Modified " + GroupName;
+                       change.Append ("public event ");
+
+                       var srcEventType = source.GetTypeName ("eventtype");
+                       var tgtEventType = target.GetTypeName ("eventtype");
+
+                       if (srcEventType != tgtEventType) {
+                               change.AppendModified (srcEventType, tgtEventType, true);
+                       } else {
+                               change.Append (srcEventType);
+                       }
+                       change.Append (" ");
+                       change.Append (source.GetAttribute ("name")).Append (";");
+                       return false;
+               }
+
                public override string GetDescription (XElement e)
                {
-                       StringBuilder sb = GetObsoleteMessage (e);
+                       StringBuilder sb = new StringBuilder ();
                        // TODO: attribs
                        sb.Append ("public event ");
                        sb.Append (e.GetTypeName ("eventtype")).Append (' ');
index 0916ed5396386d4d323d55acbe90e1534599744b..c8a6e0a777262a1b43807f0decb5a5a58d315484 100644 (file)
@@ -43,6 +43,96 @@ namespace Xamarin.ApiDiff {
                        get { return "field"; }
                }
 
+               void RenderFieldAttributes (FieldAttributes source, FieldAttributes target, ApiChange change)
+               {
+                       // the visibility values are the same for MethodAttributes and FieldAttributes, so just use the same method.
+                       RenderVisibility ((MethodAttributes) source, (MethodAttributes) target, change);
+                       // same for the static flag
+                       RenderStatic ((MethodAttributes) source, (MethodAttributes) target, change);
+
+                       var srcLiteral = (source & FieldAttributes.Literal) != 0;
+                       var tgtLiteral = (target & FieldAttributes.Literal) != 0;
+
+                       if (srcLiteral) {
+                               if (tgtLiteral) {
+                                       change.Append ("const ");
+                               } else {
+                                       change.AppendRemoved ("const", true).Append (" ");
+                               }
+                       } else if (tgtLiteral) {
+                               change.AppendAdded ("const", true).Append (" ");
+                       }
+
+                       var srcInitOnly = (source & FieldAttributes.InitOnly) != 0;
+                       var tgtInitOnly = (target & FieldAttributes.InitOnly) != 0;
+                       if (srcInitOnly) {
+                               if (tgtInitOnly) {
+                                       change.Append ("readonly ");
+                               } else {
+                                       change.AppendRemoved ("readonly", false).Append (" ");
+                               }
+                       } else if (tgtInitOnly) {
+                               change.AppendAdded ("readonly", true).Append (" ");
+                       }
+               }
+
+               public override bool Equals (XElement source, XElement target, ApiChanges changes)
+               {
+                       if (base.Equals (source, target, changes))
+                               return true;
+
+                       var name = source.GetAttribute ("name");
+                       var srcValue = source.GetAttribute ("value");
+                       var tgtValue = target.GetAttribute ("value");
+                       var change = new ApiChange ();
+                       change.Header = "Modified " + GroupName;
+
+                       if (State.BaseType == "System.Enum") {
+                               change.Append (name).Append (" = ");
+                               if (srcValue != tgtValue) {
+                                       change.AppendModified (srcValue, tgtValue, true);
+                               } else {
+                                       change.Append (srcValue);
+                               }
+                       } else {
+                               RenderFieldAttributes (source.GetFieldAttributes (), target.GetFieldAttributes (), change);
+
+                               var srcType = source.GetTypeName ("fieldtype");
+                               var tgtType = target.GetTypeName ("fieldtype");
+
+                               if (srcType != tgtType) {
+                                       change.AppendModified (srcType, tgtType, true);
+                               } else {
+                                       change.Append (srcType);
+                               }
+                               change.Append (" ");
+                               change.Append (name);
+
+                               if (srcType == "string" && srcValue != null)
+                                       srcValue = "\"" + srcValue + "\"";
+
+                               if (tgtType == "string" && tgtValue != null)
+                                       tgtValue = "\"" + tgtValue + "\"";
+
+                               if (srcValue != tgtValue) {
+                                       change.Append (" = ");
+                                       if (srcValue == null)
+                                               srcValue = "null";
+                                       if (tgtValue == null)
+                                               tgtValue = "null";
+                                       change.AppendModified (srcValue, tgtValue, true);
+                               } else if (srcValue != null) {
+                                       change.Append (" = ");
+                                       change.Append (srcValue);
+                               }
+                               change.Append (";");
+                       }
+
+                       changes.Add (source, target, change);
+
+                       return false;
+               }
+
                public override string GetDescription (XElement e)
                {
                        var sb = new StringBuilder ();
@@ -87,19 +177,25 @@ namespace Xamarin.ApiDiff {
                public override void BeforeAdding (IEnumerable<XElement> list)
                {
                        first = true;
-                       if (State.BaseType == "System.Enum")
+                       if (State.BaseType == "System.Enum") {
                                Output.WriteLine ("<p>Added value{0}:</p><pre>", list.Count () > 1 ? "s" : String.Empty);
-                       else
+                               if (State.Colorize)
+                                       Output.Write ("<font color='green'>");
+                       } else {
                                base.BeforeAdding (list);
+                       }
                }
 
                public override void BeforeRemoving (IEnumerable<XElement> list)
                {
                        first = true;
-                       if (State.BaseType == "System.Enum")
+                       if (State.BaseType == "System.Enum") {
                                Output.WriteLine ("<p>Removed value{0}:</p><pre>", list.Count () > 1 ? "s" : String.Empty);
-                       else
+                               if (State.Colorize)
+                                       Output.Write ("<font color='red'>");
+                       } else {
                                base.BeforeRemoving (list);
+                       }
                }
        }
 }
\ No newline at end of file
index 91afedc48145ec59c204318ec5f8db56c0bdb00f..8769785c47819f7ae5ed11cd3f283e8549f11c76 100644 (file)
 //
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Xml.Linq;
 
 namespace Xamarin.ApiDiff {
 
        public static class Helper {
-
                public static bool IsTrue (this XElement self, string name)
                {
                        return (self.GetAttribute (name) == "true");
@@ -67,6 +69,28 @@ namespace Xamarin.ApiDiff {
                        return null;
                }
 
+               public static IEnumerable<XElement> Descendants (this XElement self, params string[] names)
+               {
+                       XElement el = self;
+                       if (el == null)
+                               return null;
+
+                       for (int i = 0; i < names.Length - 1; i++) {
+                               el = el.Element (names [i]);
+                               if (el == null)
+                                       return null;
+                       }
+                       return el.Elements (names [names.Length - 1]);
+               }
+
+               public static List<XElement> DescendantList (this XElement self, params string[] names)
+               {
+                       var descendants = self.Descendants (names);
+                       if (descendants == null)
+                               return null;
+                       return descendants.ToList ();
+               }
+
                // make it beautiful (.NET -> C#)
                public static string GetTypeName (this XElement self, string name)
                {
@@ -153,11 +177,31 @@ namespace Xamarin.ApiDiff {
                                return "ushort";
                        case "System.Char":
                                return "char";
+                       case "System.nint":
+                               return "nint";
+                       case "System.nuint":
+                               return "uint";
+                       case "System.nfloat":
+                               return "nfloat";
+                       case "System.IntPtr":
+                               return "IntPtr";
                        default:
                                if (type.StartsWith (State.Namespace, StringComparison.Ordinal))
                                        type = type.Substring (State.Namespace.Length + 1);
                                return type;
                        }
                }
+
+               public static MethodAttributes GetMethodAttributes (this XElement element)
+               {
+                       var srcAttribs = element.Attribute ("attrib");
+                       return (MethodAttributes) (srcAttribs != null ? Int32.Parse (srcAttribs.Value) : 0);
+               }
+
+               public static FieldAttributes GetFieldAttributes (this XElement element)
+               {
+                       var srcAttribs = element.Attribute ("attrib");
+                       return (FieldAttributes) (srcAttribs != null ? Int32.Parse (srcAttribs.Value) : 0);
+               }
        }
 }
\ No newline at end of file
index 839de88a4a2698620c7ab4102d77a74878728682..e21273873cbdebf325c8e73780b3d73ca372ffd9 100644 (file)
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Xml.Linq;
 
@@ -75,7 +76,7 @@ namespace Xamarin.ApiDiff {
                public override void Compare (IEnumerable<XElement> source, IEnumerable<XElement> target)
                {
                        removed.Clear ();
-                       obsoleted.Clear ();
+                       modified.Clear ();
 
                        foreach (var s in source) {
                                SetContext (s);
@@ -85,40 +86,21 @@ namespace Xamarin.ApiDiff {
                                        // not in target, it was removed
                                        removed.Add (s);
                                } else {
+                                       t.Remove ();
                                        // possibly modified
-                                       if (Equals (s, t)) {
-                                               if (IsNowObsoleted (s, t)) {
-                                                       obsoleted.Add (t);
-                                               }
-                                               t.Remove ();
+                                       if (Equals (s, t, modified))
                                                continue;
-                                       }
 
-                                       // still in target so will be part of Added
-                                       removed.Add (s);
-                                       Modified (s, t);
+                                       Modified (s, t, modified);
                                }
                        }
                        // delayed, that way we show "Modified", "Added" and then "Removed"
                        Remove (removed);
 
+                       Modify (modified);
+
                        // remaining == newly added in target
                        Add (target);
-
-                       // obsolete (considering as added, they were not obsolete before, wrt regex)
-                       bool o = false;
-                       foreach (var item in obsoleted) {
-                               SetContext (item);
-                               if (State.IgnoreAdded.Any (re => re.IsMatch (GetDescription (item))))
-                                       continue;
-                               if (!o) {
-                                       BeforeObsoleting (obsoleted);
-                                       o = true;
-                               }
-                               Obsoleted (item);
-                       }
-                       if (o)
-                               AfterObsoleting ();
                }
 
                void Add (IEnumerable<XElement> elements)
@@ -138,6 +120,20 @@ namespace Xamarin.ApiDiff {
                                AfterAdding ();
                }
 
+               void Modify (ApiChanges modified)
+               {
+                       foreach (var changes in modified) {
+                               Output.WriteLine ("<p>{0}:</p>", changes.Key);
+                               Output.WriteLine ("<pre>");
+                               foreach (var element in changes.Value) {
+                                       foreach (var line in element.Member.ToString ().Split ('\n'))
+                                               Output.WriteLine ("\t{0}", line);
+
+                               }
+                               Output.WriteLine ("</pre>");
+                       }
+               }
+
                void Remove (IEnumerable<XElement> elements)
                {
                        bool r = false;
@@ -154,7 +150,7 @@ namespace Xamarin.ApiDiff {
                        if (r)
                                AfterRemoving ();
                }
-
+                       
                public abstract string GetDescription (XElement e);
 
                protected StringBuilder GetObsoleteMessage (XElement e)
@@ -172,44 +168,23 @@ namespace Xamarin.ApiDiff {
                        return sb;
                }
 
-               public override bool Equals (XElement source, XElement target)
+               public override bool Equals (XElement source, XElement target, ApiChanges changes)
                {
-                       if (base.Equals (source, target))
-                               return true;
-
-                       string sourceDescription = GetDescription (source);
-                       string targetDescription = GetDescription (target);
-
-                       return CheckVirtualChanges (sourceDescription, targetDescription) ||
-                               (State.IgnoreAddedPropertySetters &&
-                                       CheckVirtualChanges (sourceDescription, targetDescription.Replace (" set; ", " ")));
-               }
+                       RenderAttributes (source, target, changes);
 
-               static bool CheckVirtualChanges (string sourceDescription, string targetDescription)
-               {
-                       return (sourceDescription == targetDescription) ||
-                               // *adding* virtual or override to target is acceptable; *removing* them is NOT
-                               (State.IgnoreVirtualChanges &&
-                                       // non-virtual to virtual is fine
-                                       (sourceDescription == targetDescription.Replace ("virtual ", "")) ||
-                                       // non-virtual to override is fine
-                                       (sourceDescription == targetDescription.Replace ("override ", "")) ||
-                                       // virtual to override is fine
-                                       (sourceDescription.Replace (" virtual ", " override ") == targetDescription));
-               }
+                       // We don't want to compare attributes.
+                       RemoveAttributes (source);
+                       RemoveAttributes (target);
 
-               bool IsNowObsoleted (XElement source, XElement target)
-               {
-                       var s = GetObsoleteMessage (source).ToString ();
-                       var t = GetObsoleteMessage (target).ToString ();
-                       // true if it was no [Obsolete] in the source but now is [Obsolete] in the target
-                       return (s.Length == 0 && t.Length > 0);
+                       return base.Equals (source, target, changes);
                }
 
                public virtual void BeforeAdding (IEnumerable<XElement> list)
                {
                        first = true;
                        Output.WriteLine ("<p>Added {0}:</p><pre>", list.Count () > 1 ? GroupName : ElementName);
+                       if (State.Colorize)
+                               Output.Write ("<font color='green'>");
                }
 
                public override void Added (XElement target)
@@ -223,32 +198,21 @@ namespace Xamarin.ApiDiff {
 
                public virtual void AfterAdding ()
                {
+                       if (State.Colorize)
+                               Output.Write ("</font>");
                        Output.WriteLine ("</pre>");
                }
 
-               public virtual void BeforeObsoleting (IEnumerable<XElement> list)
-               {
-                       Output.WriteLine ("<p>Obsoleted {0}:</p><pre>", list.Count () > 1 ? GroupName : ElementName);
-               }
-
-               public void Obsoleted (XElement target)
-               {
-                       Indent ().WriteLine ("\t{0}{1}{2}", GetObsoleteMessage (target), GetDescription (target), Environment.NewLine);
-               }
-
-               public virtual void AfterObsoleting ()
-               {
-                       Output.WriteLine ("</pre>");
-               }
-
-               public override void Modified (XElement source, XElement target)
+               public override void Modified (XElement source, XElement target, ApiChanges change)
                {
                }
 
                public virtual void BeforeRemoving (IEnumerable<XElement> list)
                {
                        first = true;
-                       Output.WriteLine ("<p>Removed {0}:</p><pre>", list.Count () > 1 ? GroupName : ElementName);
+                       Output.WriteLine ("<p>Removed {0}:</p>\n<pre>", list.Count () > 1 ? GroupName : ElementName);
+                       if (State.Colorize)
+                               Output.Write ("<font color='red'>");
                }
 
                public override void Removed (XElement source)
@@ -262,7 +226,334 @@ namespace Xamarin.ApiDiff {
 
                public virtual void AfterRemoving ()
                {
+                       if (State.Colorize)
+                               Output.Write ("</font>");
                        Output.WriteLine ("</pre>");
                }
+
+               protected void RenderGenericParameters (XElement source, XElement target, ApiChange change)
+               {
+                       var src = source.DescendantList ("generic-parameters", "generic-parameter");
+                       var tgt = target.DescendantList ("generic-parameters", "generic-parameter");
+                       var srcCount = src == null ? 0 : src.Count;
+                       var tgtCount = tgt == null ? 0 : tgt.Count;
+
+                       if (srcCount == 0 && tgtCount == 0)
+                               return;
+
+                       change.Append ("&lt;");
+                       for (int i = 0; i < Math.Max (srcCount, tgtCount); i++) {
+                               if (i > 0)
+                                       change.Append (", ");
+                               if (i >= srcCount) {
+                                       change.AppendAdded (tgt [i].GetTypeName ("name"), true);
+                               } else if (i >= tgtCount) {
+                                       change.AppendRemoved (src [i].GetTypeName ("name"), true);
+                               } else {
+                                       var srcName = src [i].GetTypeName ("name");
+                                       var tgtName = tgt [i].GetTypeName ("name");
+
+                                       if (srcName != tgtName) {
+                                               change.AppendModified (srcName, tgtName, true);
+                                       } else {
+                                               change.Append (srcName);
+                                       }
+                                       }
+                               }
+                       change.Append ("&gt;");
+               }
+
+               protected string FormatValue (string type, string value)
+               {
+                       if (value == null)
+                               return "null";
+
+                       if (type == "string")
+                               return "\"" + value + "\"";
+                       else if (type == "bool") {
+                               switch (value) {
+                               case "True":
+                                       return "true";
+                               case "False":
+                                       return "false";
+                               default:
+                                       return value;
+                               }
+                       }
+
+                       return value;
+               }
+
+               protected void RenderParameters (XElement source, XElement target, ApiChange change)
+               {
+                       var src = source.DescendantList ("parameters", "parameter");
+                       var tgt = target.DescendantList ("parameters", "parameter");
+                       var srcCount = src == null ? 0 : src.Count;
+                       var tgtCount = tgt == null ? 0 : tgt.Count;
+
+                       change.Append (" (");
+                       for (int i = 0; i < Math.Max (srcCount, tgtCount); i++) {
+                               if (i > 0)
+                                       change.Append (", ");
+
+                               if (i >= srcCount) {
+                                       change.AppendAdded (tgt [i].GetTypeName ("type") + " " + tgt [i].GetAttribute ("name"), true);
+                               } else if (i >= tgtCount) {
+                                       change.AppendRemoved (src [i].GetTypeName ("type") + " " + src [i].GetAttribute ("name"), true);
+                               } else {
+                                       var paramSourceType = src [i].GetTypeName ("type");
+                                       var paramTargetType = tgt [i].GetTypeName ("type");
+
+                                       var paramSourceName = src [i].GetAttribute ("name");
+                                       var paramTargetName = tgt [i].GetAttribute ("name");
+
+                                       if (paramSourceType != paramTargetType) {
+                                               change.AppendModified (paramSourceType, paramTargetType, true);
+                                       } else {
+                                               change.Append (paramSourceType);
+                                       }
+                                       change.Append (" ");
+                                       if (paramSourceName != paramTargetName) {
+                                               change.AppendModified (paramSourceName, paramTargetName, false);
+                                       } else {
+                                               change.Append (paramSourceName);
+                                       }
+
+                                       var optSource = src [i].Attribute ("optional");
+                                       var optTarget = tgt [i].Attribute ("optional");
+                                       var srcValue = FormatValue (paramSourceType, src [i].GetAttribute ("defaultValue"));
+                                       var tgtValue = FormatValue (paramTargetType, tgt [i].GetAttribute ("defaultValue"));
+
+                                       if (optSource != null) {
+                                               if (optTarget != null) {
+                                                       change.Append (" = ");
+                                                       if (srcValue != tgtValue) {
+                                                               change.AppendModified (srcValue, tgtValue, false);
+                                                       } else {
+                                                               change.Append (tgtValue);
+                                                       }
+                                               } else {
+                                                       change.AppendRemoved (" = " + srcValue);
+                                               }
+                                       } else {
+                                               if (optTarget != null)
+                                                       change.AppendAdded (" = " + tgtValue);
+                                       }
+                               }
+                       }
+
+                       change.Append (")");
+
+                       // Ignore any parameter name changes if requested.
+                       if (State.IgnoreParameterNameChanges && !change.Breaking) {
+                               change.AnyChange = false;
+                               change.HasIgnoredChanges = true;
+                       }
+               }
+
+               void RenderVTable (MethodAttributes source, MethodAttributes target, ApiChange change)
+               {
+                       var srcAbstract = (source & MethodAttributes.Abstract) == MethodAttributes.Abstract;
+                       var tgtAbstract = (target & MethodAttributes.Abstract) == MethodAttributes.Abstract;
+                       var srcFinal = (source & MethodAttributes.Final) == MethodAttributes.Final;
+                       var tgtFinal = (target & MethodAttributes.Final) == MethodAttributes.Final;
+                       var srcVirtual = (source & MethodAttributes.Virtual) == MethodAttributes.Virtual;
+                       var tgtVirtual = (target & MethodAttributes.Virtual) == MethodAttributes.Virtual;
+                       var srcOverride = (source & MethodAttributes.VtableLayoutMask) != MethodAttributes.NewSlot;
+                       var tgtOverride = (target & MethodAttributes.VtableLayoutMask) != MethodAttributes.NewSlot;
+
+                       var srcWord = srcVirtual ? (srcOverride ? "override" : "virtual") : string.Empty;
+                       var tgtWord = tgtVirtual ? (tgtOverride ? "override" : "virtual") : string.Empty;
+                       var breaking = srcWord.Length > 0 && tgtWord.Length == 0;
+
+                       if (srcAbstract) {
+                               if (tgtAbstract) {
+                                       change.Append ("abstract ");
+                               } else if (tgtVirtual) {
+                                       change.AppendModified ("abstract", tgtWord, false).Append (" ");
+                               } else {
+                                       change.AppendRemoved ("abstract").Append (" ");
+                               }
+                       } else {
+                               if (tgtAbstract) {
+                                       change.AppendAdded ("abstract", true).Append (" ");
+                               } else if (srcWord != tgtWord) {
+                                       if (!tgtFinal)
+                                               change.AppendModified (srcWord, tgtWord, breaking).Append (" ");
+                               } else if (tgtWord.Length > 0) {
+                                       change.Append (tgtWord).Append (" ");
+                               } else if (srcWord.Length > 0) {
+                                       change.AppendRemoved (srcWord, breaking).Append (" ");
+                               }
+                       }
+
+                       if (srcFinal) {
+                               if (tgtFinal) {
+                                       change.Append ("final ");
+                               } else {
+                                       change.AppendRemoved ("final", false).Append (" "); // removing 'final' is not a breaking change.
+                               }
+                       } else {
+                               if (tgtFinal && srcVirtual) {
+                                       change.AppendModified ("virtual", "final", true).Append (" "); // adding 'final' is a breaking change if the member was virtual
+                               }
+                       }
+
+                       if (!srcVirtual && !srcFinal && tgtVirtual && tgtFinal) {
+                               // existing member implements a member from a new interface
+                               // this would show up as 'virtual final', which is redundant, so show nothing at all.
+                               change.HasIgnoredChanges = true;
+                       }
+
+                       // Ignore non-breaking virtual changes.
+                       if (State.IgnoreVirtualChanges && !change.Breaking) {
+                               change.AnyChange = false;
+                               change.HasIgnoredChanges = true;
+                       }
+               }
+
+               protected string GetVisibility (MethodAttributes attr)
+               {
+                       switch (attr) {
+                       case MethodAttributes.Private:
+                       case MethodAttributes.PrivateScope:
+                               return "private";
+                       case MethodAttributes.Assembly:
+                               return "internal";
+                       case MethodAttributes.FamANDAssem:
+                               return "private internal";
+                       case MethodAttributes.FamORAssem:
+                               return "protected"; // customers don't care about 'internal';
+                       case MethodAttributes.Family:
+                               return "protected";
+                       case MethodAttributes.Public:
+                               return "public";
+                       default:
+                               throw new NotImplementedException ();
+                       }
+               }
+
+               protected void RenderVisibility (MethodAttributes source, MethodAttributes target, ApiChange diff)
+               {
+                       source = source & MethodAttributes.MemberAccessMask;
+                       target = target & MethodAttributes.MemberAccessMask;
+
+                       if (source == target) {
+                               diff.Append (GetVisibility (target));
+                       } else {
+                               var breaking = false;
+                               switch (source) {
+                               case MethodAttributes.Private:
+                               case MethodAttributes.Assembly:
+                               case MethodAttributes.FamANDAssem:
+                                       break; // these are not publicly visible, thus not breaking
+                               case MethodAttributes.FamORAssem:
+                               case MethodAttributes.Family:
+                                       switch (target) {
+                                       case MethodAttributes.Public:
+                                               // to public is not a breaking change
+                                               break;
+                                       case MethodAttributes.Family:
+                                       case MethodAttributes.FamORAssem:
+                                               // not a breaking change, but should still show up in diff
+                                               break;
+                                       default:
+                                               // anything else is a breaking change
+                                               breaking = true;
+                                               break;
+                                       }
+                                       break;
+                               case MethodAttributes.Public:
+                               default:
+                                       // any change from public is breaking.
+                                       breaking = true;
+                                       break;
+                               }
+
+                               diff.AppendModified (GetVisibility (source), GetVisibility (target), breaking);
+                       }
+                       diff.Append (" ");
+               }
+
+               protected void RenderStatic (MethodAttributes src, MethodAttributes tgt, ApiChange diff)
+               {
+                       var srcStatic = (src & MethodAttributes.Static) == MethodAttributes.Static;
+                       var tgtStatic = (tgt & MethodAttributes.Static) == MethodAttributes.Static;
+
+                       if (srcStatic != tgtStatic) {
+                               if (srcStatic) {
+                                       diff.AppendRemoved ("static", true).Append (" ");
+                               } else {
+                                       diff.AppendAdded ("static", true).Append (" ");
+                               }
+                       }
+               }
+
+               protected void RenderMethodAttributes (MethodAttributes src, MethodAttributes tgt, ApiChange diff)
+               {
+                       RenderStatic (src, tgt, diff);
+                       RenderVisibility (src & MethodAttributes.MemberAccessMask, tgt & MethodAttributes.MemberAccessMask, diff);
+                       RenderVTable (src, tgt, diff);
+               }
+
+               protected void RenderMethodAttributes (XElement source, XElement target, ApiChange diff)
+               {
+                       RenderMethodAttributes (source.GetMethodAttributes (), target.GetMethodAttributes (), diff);
+               }
+
+               protected void RemoveAttributes (XElement element)
+               {
+                       var srcAttributes = element.Element ("attributes");
+                       if (srcAttributes != null)
+                               srcAttributes.Remove ();
+
+                       foreach (var el in element.Elements ())
+                               RemoveAttributes (el);
+               }
+
+               protected void RenderAttributes (XElement source, XElement target, ApiChanges changes)
+               {
+                       var srcObsolete = source.GetObsoleteMessage ();
+                       var tgtObsolete = target.GetObsoleteMessage ();
+
+                       if (srcObsolete == tgtObsolete)
+                               return; // nothing changed
+
+                       if (srcObsolete == null) {
+                               if (tgtObsolete == null)
+                                       return; // neither is obsolete
+                               var change = new ApiChange ();
+                               change.Header = "Obsoleted " + GroupName;
+                               if (State.Colorize)
+                                       change.Append ("<font color='gray'>");
+                               change.Append ("[Obsolete (");
+                               if (tgtObsolete != string.Empty)
+                                       change.Append ("\"").Append (tgtObsolete).Append ("\"");
+                               change.Append ("]\n");
+                               change.Append (GetDescription (target));
+                               if (State.Colorize)
+                                       change.Append ("</font>");
+                               change.AnyChange = true;
+                               changes.Add (source, target, change);
+                       } else if (tgtObsolete == null) {
+                               // Made non-obsolete. Do we care to report this?
+                       } else {
+                               // Obsolete message changed. Do we care to report this?
+                       }
+               }
+
+               protected void RenderName (XElement source, XElement target, ApiChange change)
+               {
+                       var name = target.GetAttribute ("name");
+                       // show the constructor as it would be defined in C#
+                       name = name.Replace (".ctor", State.Type);
+
+                       var p = name.IndexOf ('(');
+                       if (p >= 0)
+                               name = name.Substring (0, p);
+
+                       change.Append (name);
+               }
+
        }
 }
index 427df66e6eb9cef2350288359f7226862dfe28ea..258374c6b9dc45230a4d715e6d5d1ce4c56c68a4 100644 (file)
@@ -25,6 +25,7 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
@@ -68,7 +69,7 @@ namespace Xamarin.ApiDiff {
                        Output.WriteLine ();
                }
 
-               public override void Modified (XElement source, XElement target)
+               public override void Modified (XElement source, XElement target, ApiChanges differences)
                {
                        var output = Output;
                        State.Output = new StringWriter ();
index 4a5f34fd2ec8978d0b94cf5788e4f03ec1be8bca..4fbd864d994a858fd0b151698bb74c134d2e4637 100644 (file)
@@ -25,6 +25,7 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
 using System.Xml.Linq;
@@ -49,30 +50,146 @@ namespace Xamarin.ApiDiff {
                        return e.GetAttribute ("params") == Source.GetAttribute ("params");
                }
 
-               public override string GetDescription (XElement e)
+               void GetAccessors (XElement element, out XElement getter, out XElement setter)
                {
-                       string name = e.Attribute ("name").Value;
-                       string ptype = e.GetTypeName ("ptype");
+                       var methods = element.Element ("methods");
+
+                       getter = null;
+                       setter = null;
+
+                       if (methods == null)
+                               return;
+                               
+                       foreach (var m in methods.Elements ("method")) {
+                               var n = m.GetAttribute ("name");
+                               if (n.StartsWith ("get_", StringComparison.Ordinal)) {
+                                       getter = m;
+                               } else if (n.StartsWith ("set_", StringComparison.Ordinal)) {
+                                       setter = m;
+                               }
+                       }
+               }
+
+               MethodAttributes GetMethodAttributes (XElement getter, XElement setter)
+               {
+                       if (getter == null)
+                               return setter.GetMethodAttributes ();
+                       else if (setter == null)
+                               return getter.GetMethodAttributes ();
+
+                       var gAttr = getter.GetMethodAttributes ();
+                       var sAttr = setter.GetMethodAttributes ();
+                       var g = gAttr & MethodAttributes.MemberAccessMask;
+                       var s = sAttr & MethodAttributes.MemberAccessMask;
+                       // Visibility is ordered numerically (higher value = more visible).
+                       // We want the most visible.
+                       var visibility = (MethodAttributes) Math.Max ((int) g, (int) s);
+                       // Do a bitwise or with the rest of the flags
+                       var g_no_visibility = gAttr & ~MethodAttributes.MemberAccessMask;
+                       var s_no_visibility = sAttr & ~MethodAttributes.MemberAccessMask;
+                       return g_no_visibility | s_no_visibility | visibility;
+               }
+
+               void RenderPropertyType (XElement source, XElement target, ApiChange change)
+               {
+                       var srcType = source.GetTypeName ("ptype");
+                       var tgtType = target.GetTypeName ("ptype");
+
+                       if (srcType == tgtType) {
+                               change.Append (tgtType);
+                       } else {
+                               change.AppendModified (srcType, tgtType, true);
+                       }
+                       change.Append (" ");
+               }
+
+               void RenderAccessors (XElement srcGetter, XElement tgtGetter, XElement srcSetter, XElement tgtSetter, ApiChange change)
+               {
+                       // FIXME: this doesn't render changes in the accessor visibility (a protected setter can become public for instance).
+                       change.Append (" {");
+                       if (tgtGetter != null) {
+                               if (srcGetter != null) {
+                                       change.Append (" ").Append ("get;");
+                               } else {
+                                       change.Append (" ").AppendAdded ("get;");
+                               }
+                       } else if (srcGetter != null) {
+                               change.Append (" ").AppendRemoved ("get;");
+                       }
+
+                       if (tgtSetter != null) {
+                               if (srcSetter != null) {
+                                       change.Append (" ").Append ("set;");
+                               } else {
+                                       change.Append (" ").AppendAdded ("set;");
+                               }
+                       } else if (srcSetter != null) {
+                               change.Append (" ").AppendRemoved ("set;");
+                       }
+
+                       change.Append (" }");
+
+                       // Ignore added property setters if asked to
+                       if (srcSetter == null && tgtSetter != null && State.IgnoreAddedPropertySetters && !change.Breaking) {
+                               change.AnyChange = false;
+                               change.HasIgnoredChanges = true;
+                       }
+               }
+
+               public override bool Equals (XElement source, XElement target, ApiChanges changes)
+               {
+                       if (base.Equals (source, target, changes))
+                               return true;
+
+                       XElement srcGetter, srcSetter;
+                       XElement tgtGetter, tgtSetter;
+                       GetAccessors (source, out srcGetter, out srcSetter);
+                       GetAccessors (target, out tgtGetter, out tgtSetter);
+
+                       var change = new ApiChange ();
+                       change.Header = "Modified " + GroupName;
+                       RenderMethodAttributes (GetMethodAttributes (srcGetter, srcSetter), GetMethodAttributes (tgtGetter, tgtSetter), change);
+                       RenderPropertyType (source, target, change);
+                       RenderName (source, target, change);
+                       RenderGenericParameters (source, target, change);
+                       RenderAccessors (srcGetter, tgtGetter, srcSetter, tgtSetter, change);
+
+                       changes.Add (source, target, change);
+
+                       return false;
+               }
+
+               void GetProperties (XElement e, out bool @virtual, out bool @override, out bool @static, out bool getter, out bool setter, out bool family)
+               {
+                       @virtual = @override = @static = getter = setter = family = false;
 
-                       bool virt = false;
-                       bool over = false;
-                       bool stat = false;
-                       bool getter = false;
-                       bool setter = false;
-                       bool family = false;
                        var methods = e.Element ("methods");
                        if (methods != null) {
                                foreach (var m in methods.Elements ("method")) {
-                                       virt |= m.IsTrue ("virtual");
-                                       stat |= m.IsTrue ("static");
+                                       @virtual |= m.IsTrue ("virtual");
+                                       @static |= m.IsTrue ("static");
                                        var n = m.GetAttribute ("name");
                                        getter |= n.StartsWith ("get_", StringComparison.Ordinal);
                                        setter |= n.StartsWith ("set_", StringComparison.Ordinal);
                                        var attribs = (MethodAttributes) Int32.Parse (m.GetAttribute ("attrib"));
                                        family = ((attribs & MethodAttributes.Public) != MethodAttributes.Public);
-                                       over |= (attribs & MethodAttributes.VtableLayoutMask) == 0;
+                                       @override |= (attribs & MethodAttributes.NewSlot) == 0;
                                }
                        }
+               }
+
+               public override string GetDescription (XElement e)
+               {
+                       string name = e.Attribute ("name").Value;
+                       string ptype = e.GetTypeName ("ptype");
+
+                       bool virt = false;
+                       bool over = false;
+                       bool stat = false;
+                       bool getter = false;
+                       bool setter = false;
+                       bool family = false;
+                       GetProperties (e, out virt, out over, out stat, out getter, out setter, out family);
 
                        var sb = new StringBuilder ();
 
index 989dde67477262cba0c8ce3cb6fd348cf786bdf7..286a4d0192abb6da70e1a5d641ede92457b022f4 100644 (file)
@@ -19,7 +19,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <Commandlineparameters>/Developer/MonoTouch/Source/monotouch/tools/apidiff/references/monotouch.xml /Developer/MonoTouch/Source/monotouch/tools/apidiff/temp/monotouch.xml</Commandlineparameters>
+    <Commandlineparameters>/Developer/MonoTouch/Source/monotouch/tools/apidiff/references/compat/monotouch.xml /Developer/MonoTouch/Source/monotouch/tools/apidiff/temp/compat/monotouch.xml -i INSObjectProtocol /tmp/diff.html</Commandlineparameters>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -52,6 +52,7 @@
     <Compile Include="..\..\..\class\Mono.Options\Mono.Options\Options.cs">
       <Link>Options.cs</Link>
     </Compile>
+    <Compile Include="ApiChange.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
index 9e047cd103192e5d458ed88ddd65f6248dc1e57e..2450c069400bc162aa937dd231ef84613a29ba21 100644 (file)
@@ -6,7 +6,7 @@ PROGRAM = resgen.exe
 
 CLEAN_FILES = resgen.exe
 
-INSTALL_PROFILE := $(filter net_2_0 net_4_5, $(PROFILE))
+INSTALL_PROFILE := $(filter net_4_5, $(PROFILE))
 ifndef INSTALL_PROFILE
 NO_INSTALL = yes
 endif
diff --git a/mcs/tools/symbolicate/LocationProvider.cs b/mcs/tools/symbolicate/LocationProvider.cs
new file mode 100644 (file)
index 0000000..634915c
--- /dev/null
@@ -0,0 +1,144 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Diagnostics;
+using System.Collections.Generic;
+using Mono.Cecil;
+using Mono.CompilerServices.SymbolWriter;
+
+namespace Symbolicate
+{
+       struct Location {
+               public string FileName;
+               public int Line;
+       }
+
+       class LocationProvider {
+               class AssemblyLocationProvider {
+                       AssemblyDefinition assembly;
+                       MonoSymbolFile symbolFile;
+
+                       public AssemblyLocationProvider (AssemblyDefinition assembly, MonoSymbolFile symbolFile)
+                       {
+                               this.assembly = assembly;
+                               this.symbolFile = symbolFile;
+                       }
+
+                       public bool TryGetLocation (string methodFullName, string[] methodParamsTypes, int ilOffset, out Location location)
+                       {
+                               location = default (Location);
+                               if (symbolFile == null)
+                                       return false;
+
+                               var typeNameEnd = methodFullName.LastIndexOf (".");
+                               var typeName = methodFullName.Substring (0, typeNameEnd);
+                               var methodName = methodFullName.Substring (typeNameEnd + 1, methodFullName.Length - typeNameEnd - 1);
+
+                               var type = assembly.MainModule.Types.FirstOrDefault (t => t.FullName == typeName);
+                               if (type == null)
+                                       return false;
+
+                               var method = type.Methods.FirstOrDefault (m => {
+                                       if (m.Name != methodName)
+                                               return false;
+
+                                       if (m.Parameters.Count != methodParamsTypes.Length)
+                                               return false;
+
+                                       for (var i = 0; i < methodParamsTypes.Length; i++) {
+                                               var paramType = m.Parameters[i].ParameterType;
+                                               if (paramType.Name != methodParamsTypes[i])
+                                                       return false;
+                                       }
+
+                                       return true;
+                               });
+
+                               if (method == null)
+                                       return false;
+
+                               var methodSymbol = symbolFile.Methods [method.MetadataToken.RID-1];
+
+                               foreach (var lineNumber in methodSymbol.GetLineNumberTable ().LineNumbers) {
+                                       if (lineNumber.Offset < ilOffset)
+                                               continue;
+
+                                       location.FileName = symbolFile.Sources [lineNumber.File-1].FileName;
+                                       location.Line = lineNumber.Row;
+                                       return true;
+                               }
+
+                               return false;
+                       }
+               }
+
+               Dictionary<string, AssemblyLocationProvider> assemblies;
+               HashSet<string> directories;
+
+               public LocationProvider () {
+                       assemblies = new Dictionary<string, AssemblyLocationProvider> ();
+                       directories = new HashSet<string> ();
+               }
+
+               public void AddAssembly (string assemblyPath)
+               {
+                       assemblyPath = Path.GetFullPath (assemblyPath);
+                       if (assemblies.ContainsKey (assemblyPath))
+                               return;
+
+                       if (!File.Exists (assemblyPath))
+                               throw new ArgumentException ("assemblyPath does not exist: "+ assemblyPath);
+
+                       var assembly = AssemblyDefinition.ReadAssembly (assemblyPath);
+                       MonoSymbolFile symbolFile = null;
+
+                       var symbolPath = assemblyPath + ".mdb";
+                       if (!File.Exists (symbolPath))
+                               Debug.WriteLine (".mdb file was not found for " + assemblyPath);
+                       else
+                               symbolFile = MonoSymbolFile.ReadSymbolFile (assemblyPath + ".mdb");
+
+                       assemblies.Add (assemblyPath, new AssemblyLocationProvider (assembly, symbolFile));
+
+                       directories.Add (Path.GetDirectoryName (assemblyPath));
+
+                       foreach (var assemblyRef in assembly.MainModule.AssemblyReferences) {
+                               string refPath = null;
+                               foreach (var dir in directories) {
+                                       refPath = Path.Combine (dir, assemblyRef.Name);
+                                       if (File.Exists (refPath))
+                                               break;
+                                       refPath = Path.Combine (dir, assemblyRef.Name + ".dll");
+                                       if (File.Exists (refPath))
+                                               break;
+                                       refPath = Path.Combine (dir, assemblyRef.Name + ".exe");
+                                       if (File.Exists (refPath))
+                                               break;
+                                       refPath = null;
+                               }
+                               if (refPath != null)
+                                       AddAssembly (refPath);
+                       }
+               }
+
+               public void AddDirectory (string directory)
+               {
+                       if (Directory.Exists (directory))
+                               throw new ArgumentException ("Directory " + directory + " does not exist.");
+
+                       directories.Add (directory);
+               }
+
+               public bool TryGetLocation (string methodName, string[] methodParams, int ilOffset, out Location location)
+               {
+                       location = default (Location);
+                       foreach (var assembly in assemblies.Values) {
+                               if (assembly.TryGetLocation (methodName, methodParams, ilOffset, out location))
+                                       return true;
+                       }
+
+                       return false;
+               }
+       }
+}
+
diff --git a/mcs/tools/symbolicate/Makefile b/mcs/tools/symbolicate/Makefile
new file mode 100644 (file)
index 0000000..bd6f970
--- /dev/null
@@ -0,0 +1,12 @@
+thisdir = tools/symbolicate
+SUBDIRS =
+include ../../build/rules.make
+
+PROGRAM = symbolicate.exe
+
+LOCAL_MCS_FLAGS = \
+       /r:Mono.Cecil.dll       \
+       /r:Mono.CompilerServices.SymbolWriter.dll \
+       /r:System.Xml
+
+include ../../build/executable.make
diff --git a/mcs/tools/symbolicate/symbolicate.cs b/mcs/tools/symbolicate/symbolicate.cs
new file mode 100644 (file)
index 0000000..5df3b51
--- /dev/null
@@ -0,0 +1,69 @@
+using System;
+using System.IO;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace Symbolicate
+{
+       public class Program
+       {
+               static Regex regex = new Regex (@"\w*at (?<MethodName>.+) \((?<MethodParams>.*)\) \[0x(?<IL>.+)\] in <filename unknown>:0");
+
+               public static int Main (String[] args)
+               {
+                       if (args.Length < 2) {
+                               Console.Error.WriteLine ("Usage: symbolicate <assembly path> <input file> [lookup directories]");
+                               return 1;
+                       }
+
+                       var assemblyPath = args [0];
+                       var inputFile = args [1];
+
+                       var locProvider = new LocationProvider ();
+
+                       for (var i = 2; i < args.Length; i++)
+                               locProvider.AddDirectory (args [i]);
+
+                       locProvider.AddAssembly (assemblyPath);
+
+                       using (StreamReader r = new StreamReader (inputFile)) {
+                           for (var line = r.ReadLine (); line != null; line = r.ReadLine ()) {
+                                       line = SymbolicateLine (line, locProvider);
+                                       Console.WriteLine (line);
+                           }
+                       }
+
+                       return 0;
+               }
+
+               static string SymbolicateLine (string line, LocationProvider locProvider)
+               {
+                       var match = regex.Match (line);
+                       if (!match.Success)
+                               return line;
+
+                       var methodName = match.Groups ["MethodName"].Value;
+                       var methodParams = ParseParametersTypes (match.Groups ["MethodParams"].Value);
+                       var ilOffset = int.Parse (match.Groups ["IL"].Value, NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+
+                       Location location;
+                       if (!locProvider.TryGetLocation (methodName, methodParams, ilOffset, out location))
+                               return line;
+
+                       return line.Replace ("<filename unknown>:0", string.Format ("{0}:{1}", location.FileName, location.Line));
+               }
+
+               static string[] ParseParametersTypes (string parameters)
+               {
+                       if (string.IsNullOrEmpty (parameters))
+                               return new string [0];
+
+                       var paramsArray = parameters.Split (',');
+                       var paramsTypes = new string [paramsArray.Length];
+                       for (var i = 0; i < paramsArray.Length; i++)
+                               paramsTypes [i] = paramsArray [i].Trim ().Split (new char[]{' '}, 2)[0];
+
+                       return paramsTypes;
+               }
+       }
+}
\ No newline at end of file
diff --git a/mcs/tools/symbolicate/symbolicate.exe.sources b/mcs/tools/symbolicate/symbolicate.exe.sources
new file mode 100644 (file)
index 0000000..968d028
--- /dev/null
@@ -0,0 +1,2 @@
+symbolicate.cs
+LocationProvider.cs
\ No newline at end of file
index 033cf4fede9c4bc5e0b977cdb646cbb62e8c6d92..0538de0894ce06cc07b74e9d5cce06d554a53592 100644 (file)
@@ -25,24 +25,10 @@ copy-targets: copy-targets-$(XBUILD_VERSION)
 
 clean-targets: clean-targets-$(XBUILD_VERSION)
 
-XBUILD_2_0_PROFILE_DIR=$(topdir)/class/lib/net_2_0
-XBUILD_3_5_PROFILE_DIR=$(topdir)/class/lib/net_3_5
 XBUILD_4_0_PROFILE_DIR=$(topdir)/class/lib/net_4_5
 XBUILD_12_0_PROFILE_DIR=$(topdir)/class/lib/xbuild_12
 XBUILD_14_0_PROFILE_DIR=$(topdir)/class/lib/xbuild_14
 
-copy-targets-2.0:
-       cp $(XBUILD_DATA_DIR)/2.0/Microsoft.Common.targets $(XBUILD_2_0_PROFILE_DIR)
-       cp $(XBUILD_DATA_DIR)/2.0/Microsoft.Common.tasks $(XBUILD_2_0_PROFILE_DIR)
-       cp $(XBUILD_DATA_DIR)/2.0/Microsoft.CSharp.targets $(XBUILD_2_0_PROFILE_DIR)
-       cp $(XBUILD_DATA_DIR)/Microsoft.VisualBasic.targets $(XBUILD_2_0_PROFILE_DIR)
-
-copy-targets-3.5:
-       cp $(XBUILD_DATA_DIR)/3.5/Microsoft.Common.targets $(XBUILD_3_5_PROFILE_DIR)
-       cp $(XBUILD_DATA_DIR)/3.5/Microsoft.Common.tasks $(XBUILD_3_5_PROFILE_DIR)
-       cp $(XBUILD_DATA_DIR)/3.5/Microsoft.CSharp.targets $(XBUILD_3_5_PROFILE_DIR)
-       cp $(XBUILD_DATA_DIR)/Microsoft.VisualBasic.targets $(XBUILD_3_5_PROFILE_DIR)
-
 copy-targets-4.0:
        cp $(XBUILD_DATA_DIR)/4.0/Microsoft.Common.targets $(XBUILD_4_0_PROFILE_DIR)
        cp $(XBUILD_DATA_DIR)/4.0/Microsoft.Common.tasks $(XBUILD_4_0_PROFILE_DIR)
@@ -61,18 +47,6 @@ copy-targets-14.0:
        cp $(XBUILD_DATA_DIR)/14.0/Microsoft.CSharp.targets $(XBUILD_14_0_PROFILE_DIR)
        cp $(XBUILD_DATA_DIR)/Microsoft.VisualBasic.targets $(XBUILD_14_0_PROFILE_DIR)
 
-clean-targets-2.0:
-       rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.Common.targets
-       rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.Common.tasks
-       rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.CSharp.targets
-       rm -f $(XBUILD_2_0_PROFILE_DIR)/Microsoft.VisualBasic.targets
-
-clean-targets-3.5:
-       rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.Common.targets
-       rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.Common.tasks
-       rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.CSharp.targets
-       rm -f $(XBUILD_3_5_PROFILE_DIR)/Microsoft.VisualBasic.targets
-
 clean-targets-4.0:
        rm -f $(XBUILD_4_0_PROFILE_DIR)/Microsoft.Common.targets
        rm -f $(XBUILD_4_0_PROFILE_DIR)/Microsoft.Common.tasks
@@ -92,18 +66,8 @@ clean-targets-14.0:
        rm -f $(XBUILD_14_0_PROFILE_DIR)/Microsoft.VisualBasic.targets
 
 #allow tests to find older versions of libs and targets
-ifneq (2.0, $(XBUILD_VERSION))
-TEST_MONO_PATH := $(topdir)/class/lib/net_2_0
-copy-targets: copy-targets-2.0
-clean-targets: clean-targets-2.0
-ifneq (3.5, $(XBUILD_VERSION))
-TEST_MONO_PATH := $(topdir)/class/lib/net_3_5$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)
-copy-targets: copy-targets-3.5
-clean-targets: clean-targets-3.5
 ifneq (4.0, $(XBUILD_VERSION))
 TEST_MONO_PATH := $(topdir)/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)
 copy-targets: copy-targets-4.0
 clean-targets: clean-targets-4.0
 endif
-endif
-endif
index 0b7337d05d58d864bab0ac2234c817e2d461988f..90d0b58121953c611c1d46ac1ed0874de9d53043 100644 (file)
@@ -4,6 +4,9 @@
 
 %ifnarch %ix86 x86_64
 %define llvm no
+%endif
+
+%ifnarch %ix86 x86_64 s390x
 %define sgen no
 %endif
 
@@ -16,10 +19,14 @@ Version:        @VERSION@
 Release:        0
 Source0:        mono-%{version}.tar.bz2
 BuildRequires:  bison
+%if 0%{?suse_version}
 BuildRequires:  fdupes
+BuildRequires:  xorg-x11-libX11-devel
+%else
+BuildRequires: libX11-devel
+%endif
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
-BuildRequires:  xorg-x11-libX11-devel
 BuildRequires:  zlib-devel
 %ifnarch ia64
 BuildRequires:  valgrind-devel
@@ -48,7 +55,9 @@ Conflicts:      banshee < 1.0
 Conflicts:      f-spot < 0.4
 Conflicts:      helix-banshee < 1.0
 Conflicts:      mono-addins < 0.3.1
+%if 0%{?suse_version}
 Recommends:     libgdiplus0 >= 2.6
+%endif
 %if %llvm == yes
 Recommends:     libmono-llvm0 = %{version}-%{release}
 %endif
@@ -92,6 +101,7 @@ export CFLAGS=" $RPM_OPT_FLAGS -fno-strict-aliasing"
 export PATH=/opt/novell/llvm-mono/bin:$PATH
 %endif
 %configure \
+  --target=%{_host} \
   --with-sgen=%{sgen} \
 %if %llvm == yes
   --enable-loadedllvm \
@@ -104,6 +114,7 @@ export PATH=/opt/novell/llvm-mono/bin:$PATH
   --with-moonlight=no
 #make # We are not -jN safe! %{?jobs:-j%jobs}
 # We are now !
+make get-monolite-latest
 make %{?_smp_mflags}
 
 %install
@@ -130,7 +141,9 @@ rm -f %buildroot%_prefix/lib/mono/2.0/cilc.exe*
 ln -s . %buildroot%_prefix%_prefix
 RPM_BUILD_ROOT=%buildroot%_prefix /usr/lib/rpm/brp-compress
 rm %buildroot%_prefix%_prefix
+%if 0%{?suse_version}
 %fdupes %buildroot%_prefix
+%endif
 %find_lang mcs
 
 %clean
index 55b506006ff2f082aae755e3fb4e6cba42f0c5f6..d4d25a254f980587bae505a5fd4deefa6d6a4749 100644 (file)
@@ -123,7 +123,7 @@ enum {
        PPC_TRAP_GE_UN = 16 + PPC_TRAP_EQ
 };
 
-#define ppc_emit32(c,x) do { *((guint32 *) (c)) = GUINT32_TO_BE (x); (c) = (gpointer)((guint8 *)(c) + sizeof (guint32));} while (0)
+#define ppc_emit32(c,x) do { *((guint32 *) (c)) = (guint32) (x); (c) = (gpointer)((guint8 *)(c) + sizeof (guint32));} while (0)
 
 #define ppc_is_imm16(val) ((((val)>> 15) == 0) || (((val)>> 15) == -1))
 #define ppc_is_uimm16(val) ((glong)(val) >= 0L && (glong)(val) <= 65535L)
@@ -806,11 +806,15 @@ my and Ximian's copyright to this code. ;)
                }       \
        } G_STMT_END
 
+#if _CALL_ELF == 2
+#define ppc_load_func(c,D,V)         ppc_load_sequence ((c), (D), (V))
+#else
 #define ppc_load_func(c,D,v) G_STMT_START { \
-               ppc_load_sequence ((c), ppc_r11, (guint64)(gsize)(v));  \
-               ppc_ldptr ((c), ppc_r2, sizeof (gpointer), ppc_r11);    \
-               ppc_ldptr ((c), (D), 0, ppc_r11);       \
+               ppc_load_sequence ((c), ppc_r12, (guint64)(gsize)(v));  \
+               ppc_ldptr ((c), ppc_r2, sizeof (gpointer), ppc_r12);    \
+               ppc_ldptr ((c), (D), 0, ppc_r12);       \
        } G_STMT_END
+#endif
 
 #define ppc_load_multiple_regs(c,D,d,A) G_STMT_START { \
                int __i, __o = (d);                     \
index a8889040a3c5f18e3dbbb8ea72b27dfed2d0728d..272d0c5990bf3957968d015c601ed503a0b394f7 100644 (file)
@@ -1,7 +1,2 @@
-
-AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
-
-noinst_LTLIBRARIES = libmonoarch-sparc.la
-
-libmonoarch_sparc_la_SOURCES = tramp.c sparc-codegen.h
+EXTRA_DIST = sparc-codegen.h
 
diff --git a/mono/arch/sparc/tramp.c b/mono/arch/sparc/tramp.c
deleted file mode 100644 (file)
index 19c0a78..0000000
+++ /dev/null
@@ -1,1080 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Create trampolines to invoke arbitrary functions.
- * 
- * Copyright (C) Ximian Inc.
- *
- * Authors: Paolo Molaro (lupus@ximian.com)
- *          Jeffrey Stedfast <fejj@ximian.com>
- *         Mark Crichton <crichton@gimp.org>
- *
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <string.h>
-#include "sparc-codegen.h"
-#include "mono/metadata/class.h"
-#include "mono/metadata/tabledefs.h"
-#include "mono/interpreter/interp.h"
-#include "mono/metadata/appdomain.h"
-#include "mono/metadata/debug-helpers.h"
-#include "mono/metadata/marshal.h"
-
-
-#define ARG_SIZE       sizeof (stackval)
-#define PROLOG_INS 1
-#define CALL_INS 3  /* Max 3.  1 for the jmpl and 1 for the nop and 1 for the possible unimp */
-#define EPILOG_INS 2
-#define FLOAT_REGS 32
-#define OUT_REGS 6
-#define LOCAL_REGS 8
-#define SLOT_SIZE sizeof(gpointer)
-#if SPARCV9
-#define MINIMAL_STACK_SIZE 22
-#define BIAS 2047
-#define FRAME_ALIGN 16
-#else
-#define MINIMAL_STACK_SIZE 23
-#define BIAS 0
-#define FRAME_ALIGN 8
-#endif
-
-#define NOT_IMPL(x) g_error("FIXME: %s", x);
-/*#define DEBUG(a) a*/
-#define DEBUG(a)
-
-/* Some assembly... */
-#ifdef __GNUC__
-#define flushi(addr)    __asm__ __volatile__ ("flush %0"::"r"(addr):"memory")
-#else
-static void flushi(void *addr)
-{
-    asm("flush %i0");
-}
-#endif
-
-static char*
-sig_to_name (MonoMethodSignature *sig, const char *prefix)
-{
-        int i;
-        char *result;
-        GString *res = g_string_new ("");
-       char *p;
-
-        if (prefix) {
-                g_string_append (res, prefix);
-                g_string_append_c (res, '_');
-        }
-
-        mono_type_get_desc (res, sig->ret, TRUE);
-
-        for (i = 0; i < sig->param_count; ++i) {
-                g_string_append_c (res, '_');
-                mono_type_get_desc (res, sig->params [i], TRUE);
-        }
-        result = res->str;
-       p = result;
-       /* remove chars Sun's asssembler doesn't like */
-       while (*p != '\0') {
-               if (*p == '.' || *p == '/')
-                       *p = '_';
-               else if (*p == '&')
-                       *p = '$';
-               else if (*p == '[' || *p == ']')
-                       *p = 'X';
-               p++;
-       }
-        g_string_free (res, FALSE);
-        return result;
-}
-
-static void
-sparc_disassemble_code (guint32 *code_buffer, guint32 *p, const char *id)
-{
-       guchar *cp;
-       FILE *ofd;
-
-       if (!(ofd = fopen ("/tmp/test.s", "w")))
-               g_assert_not_reached();
-
-       fprintf (ofd, "%s:\n", id);
-
-       for (cp = (guchar *)code_buffer; cp < (guchar *)p; cp++)
-               fprintf (ofd, ".byte %d\n", *cp);
-
-       fclose (ofd);
-
-#ifdef __GNUC__
-       system ("as /tmp/test.s -o /tmp/test.o;objdump -d /tmp/test.o");
-#else
-       /* this assumes we are using Sun tools as we aren't GCC */
-#if SPARCV9
-       system ("as -xarch=v9 /tmp/test.s -o /tmp/test.o;dis /tmp/test.o");
-#else
-       system ("as /tmp/test.s -o /tmp/test.o;dis /tmp/test.o");
-#endif
-#endif
-}
-
-
-static void
-add_general (guint *gr, guint *stack_size, guint *code_size, gboolean simple)
-{
-       if (simple) {
-               if (*gr >= OUT_REGS) {
-                       *stack_size += SLOT_SIZE;
-                       *code_size += 12;
-               } else {
-                       *code_size += 4;
-               }
-       } else {
-               if (*gr >= OUT_REGS - 1) {
-                       *stack_size += 8 + (*stack_size % 8); /* ???64 */
-                       *code_size += 16;
-               } else {
-                       *code_size += 16;
-               }
-               (*gr)++;
-       }
-       (*gr)++;
-}
-
-static void
-calculate_sizes (MonoMethodSignature *sig, guint *stack_size, guint *code_size,
-                gboolean string_ctor, gboolean *use_memcpy)
-{
-       guint i, fr, gr;
-       guint32 simpletype;
-       
-       fr = gr = 0;
-       *stack_size = MINIMAL_STACK_SIZE * SLOT_SIZE;
-       *code_size = (PROLOG_INS + CALL_INS + EPILOG_INS) * 4;
-       
-       /* function arguments */
-       if (sig->hasthis)
-               add_general (&gr, stack_size, code_size, TRUE);
-       
-       for (i = 0; i < sig->param_count; i++) {
-               if (sig->params[i]->byref) {
-                       add_general (&gr, stack_size, code_size, TRUE);
-                       continue;
-               }
-               simpletype = sig->params[i]->type;
-       enum_calc_size:
-               switch (simpletype) {
-               case MONO_TYPE_R4:
-#if SPARCV9
-                       (*code_size) += 4; /* for the fdtos */
-#else
-                       (*code_size) += 12;
-                       (*stack_size) += 4;
-#endif
-               case MONO_TYPE_BOOLEAN:
-               case MONO_TYPE_CHAR:
-               case MONO_TYPE_I1:
-               case MONO_TYPE_U1:
-               case MONO_TYPE_I2:
-               case MONO_TYPE_U2:
-               case MONO_TYPE_I4:
-               case MONO_TYPE_U4:
-               case MONO_TYPE_I:
-               case MONO_TYPE_U:
-               case MONO_TYPE_PTR:
-               case MONO_TYPE_CLASS:
-               case MONO_TYPE_OBJECT:
-               case MONO_TYPE_STRING:
-               case MONO_TYPE_SZARRAY:
-                       add_general (&gr, stack_size, code_size, TRUE);
-                       break;
-               case MONO_TYPE_VALUETYPE: {
-                       gint size;
-                       guint32 align;
-                       if (sig->params[i]->data.klass->enumtype) {
-                               simpletype = sig->params[i]->data.klass->enum_basetype->type;
-                               goto enum_calc_size;
-                       }
-                       size = mono_class_native_size (sig->params[i]->data.klass, &align);
-#if SPARCV9
-                       if (size != 4) {
-#else
-                       if (1) {
-#endif
-                               DEBUG(fprintf(stderr, "copy %d byte struct on stack\n", size));
-                               *use_memcpy = TRUE;
-                               *code_size += 8*4;
-
-                               *stack_size = (*stack_size + (align - 1)) & (~(align -1));
-                               *stack_size += (size + 3) & (~3);
-                               if (gr > OUT_REGS) {
-                                       *code_size += 4;
-                                       *stack_size += 4;
-                               }
-                       } else {
-                               add_general (&gr, stack_size, code_size, TRUE); 
-#if SPARCV9
-                               *code_size += 8;
-#else
-                               *code_size += 4;
-#endif
-                       }
-                       break;
-               }
-               case MONO_TYPE_I8:
-               case MONO_TYPE_R8:
-                       add_general (&gr, stack_size, code_size, FALSE);
-                       break;
-               default:
-                       g_error ("Can't trampoline 0x%x", sig->params[i]->type);
-               }
-       }
-       
-       /* function return value */
-       if (sig->ret->byref || string_ctor) {
-               *code_size += 8;
-       } else {
-               simpletype = sig->ret->type;
-       enum_retvalue:
-               switch (simpletype) {
-               case MONO_TYPE_BOOLEAN:
-               case MONO_TYPE_I1:
-               case MONO_TYPE_U1:
-               case MONO_TYPE_I2:
-               case MONO_TYPE_U2:
-               case MONO_TYPE_CHAR:
-               case MONO_TYPE_I4:
-               case MONO_TYPE_U4:
-               case MONO_TYPE_I:
-               case MONO_TYPE_U:
-               case MONO_TYPE_CLASS:
-               case MONO_TYPE_OBJECT:
-               case MONO_TYPE_PTR:
-               case MONO_TYPE_STRING:
-               case MONO_TYPE_R4:
-               case MONO_TYPE_R8:
-               case MONO_TYPE_SZARRAY:
-               case MONO_TYPE_ARRAY:
-                       *code_size += 8;
-                       break;
-               case MONO_TYPE_I8:
-                       *code_size += 12;
-                       break;
-               case MONO_TYPE_VALUETYPE: {
-                       gint size;
-                       if (sig->ret->data.klass->enumtype) {
-                               simpletype = sig->ret->data.klass->enum_basetype->type;
-                               goto enum_retvalue;
-                       }
-                       size = mono_class_native_size (sig->ret->data.klass, NULL);
-#if SPARCV9
-                       if (size <= 32)
-                               *code_size += 8 + (size + 7) / 2;
-                       else
-                               *code_size += 8;
-#else
-                       *code_size += 8;
-#endif
-                       break;
-               }
-               case MONO_TYPE_VOID:
-                       break;
-               default:
-                       g_error ("Can't handle as return value 0x%x", sig->ret->type);
-               }
-       }
-       
-       if (*use_memcpy) {
-               *stack_size += 8;
-               *code_size += 24;
-               if (sig->hasthis) {
-                       *stack_size += SLOT_SIZE;
-                       *code_size += 4;
-               }
-       }
-       
-       *stack_size = (*stack_size + (FRAME_ALIGN - 1)) & (~(FRAME_ALIGN -1));
-}      
-       
-static inline guint32 *
-emit_epilog (guint32 *p, MonoMethodSignature *sig, guint stack_size)
-{
-       int ret_offset = 8;
-
-       /*
-        * Standard epilog.
-        * 8 may be 12 when returning structures (to skip unimp opcode).
-        */
-#if !SPARCV9
-       if (sig != NULL && !sig->ret->byref && sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->data.klass->enumtype)
-               ret_offset = 12;
-#endif
-       sparc_jmpl_imm (p, sparc_i7, ret_offset, sparc_zero);
-       sparc_restore (p, sparc_zero, sparc_zero, sparc_zero);
-       
-       return p;
-}
-
-static inline guint32 *
-emit_prolog (guint32 *p, MonoMethodSignature *sig, guint stack_size)
-{
-       /* yes kids, it is this simple! */
-       sparc_save_imm (p, sparc_sp, -stack_size, sparc_sp);
-       return p;
-}
-
-#if SPARCV9
-#define sparc_st_ptr(a,b,c,d) sparc_stx(a,b,c,d)
-#define sparc_st_imm_ptr(a,b,c,d) sparc_stx_imm(a,b,c,d)
-#define sparc_ld_ptr(a,b,c,d) sparc_ldx(a,b,c,d)
-#define sparc_ld_imm_ptr(a,b,c,d) sparc_ldx_imm(a,b,c,d)
-#else
-#define sparc_st_ptr(a,b,c,d) sparc_st(a,b,c,d)
-#define sparc_st_imm_ptr(a,b,c,d) sparc_st_imm(a,b,c,d)
-#define sparc_ld_ptr(a,b,c,d) sparc_ld(a,b,c,d)
-#define sparc_ld_imm_ptr(a,b,c,d) sparc_ld_imm(a,b,c,d)
-#endif
-
-/* synonyms for when values are really widened scalar values */
-#define sparc_st_imm_word sparc_st_imm_ptr
-
-#define ARG_BASE sparc_i3 /* pointer to args in i3 */
-#define SAVE_PTR_IN_GENERIC_REGISTER \
-              if (gr < OUT_REGS) { \
-                      sparc_ld_imm_ptr (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr); \
-                      gr++; \
-              } else { \
-                     sparc_ld_imm_ptr (p, ARG_BASE, i*ARG_SIZE, sparc_l0); \
-                     sparc_st_imm_ptr (p, sparc_l0, sparc_sp, stack_par_pos); \
-                     stack_par_pos += SLOT_SIZE; \
-              }
-
-#if SPARCV9
-/* This is a half hearted attempt at coping with structs by value - the 
-   actual convention is complicated when floats & doubles are involved as
-   you end up with fields in different registers on/off the stack.
-   It will take more time to get right... */
-static guint32 *
-v9_struct_arg(guint32 *p, int arg_index, MonoClass *klass, int size, guint *p_gr)
-{
-       MonoMarshalType *info = mono_marshal_load_type_info (klass);
-       int off = 0;
-       int index = 0;
-        guint gr = *p_gr;
-       sparc_ld_imm_ptr (p, ARG_BASE, arg_index*ARG_SIZE, sparc_l0);
-       if (size > 8) {
-               if (info->fields [index].field->type->type == MONO_TYPE_R8) {
-                       sparc_lddf_imm (p, sparc_l0, 0, sparc_f0 + 2 * gr);
-                       index++;
-               }
-               else {
-                       sparc_ldx_imm (p, sparc_l0, 0, sparc_o0 + gr);
-                       index++; /* FIXME could be multiple fields in one register */
-               }
-               gr++;
-               size -= 8;
-               off = 8;
-       }
-       if (size > 0) {
-               if (info->fields [index].field->type->type == MONO_TYPE_R8) {
-                       sparc_lddf_imm (p, sparc_l0, off, sparc_f0 + 2 * gr);
-                       index++;
-               }
-               else {
-                       /* will load extra garbage off end of short structs ... */
-                       sparc_ldx_imm (p, sparc_l0, off, sparc_o0 + gr);
-               }
-               gr++;
-       } 
-        *p_gr = gr;
-       return p;
-}
-#endif
-
-static inline guint32*
-emit_save_parameters (guint32 *p, MonoMethodSignature *sig, guint stack_size,
-                     gboolean use_memcpy)
-{
-       guint i, fr, gr, stack_par_pos, struct_pos, cur_struct_pos;
-       guint32 simpletype;
-
-       fr = gr = 0;
-       stack_par_pos = MINIMAL_STACK_SIZE * SLOT_SIZE + BIAS;
-
-       if (sig->hasthis) {
-               if (use_memcpy) {
-                       /* we don't need to save a thing. */
-               } else 
-                       sparc_mov_reg_reg (p, sparc_i2, sparc_o0);
-               gr ++;
-       }
-
-       if (use_memcpy) {
-               cur_struct_pos = struct_pos = stack_par_pos;
-               for (i = 0; i < sig->param_count; i++) {
-                       if (sig->params[i]->byref)
-                               continue;
-                       if (sig->params[i]->type == MONO_TYPE_VALUETYPE &&
-                           !sig->params[i]->data.klass->enumtype) {
-                               gint size;
-                               guint32 align;
-                               
-                               size = mono_class_native_size (sig->params[i]->data.klass, &align);
-#if SPARCV9
-                               if (size != 4) {
-#else
-                               if (1) {
-#endif
-                                       /* Add alignment */
-                                       stack_par_pos = (stack_par_pos + (align - 1)) & (~(align - 1));
-                                       /* need to call memcpy here */
-                                       sparc_add_imm (p, 0, sparc_sp, stack_par_pos, sparc_o0);
-                                       sparc_ld_imm_ptr (p, sparc_i3, i*16, sparc_o1);
-                                       sparc_set (p, (guint32)size, sparc_o2);
-                                       sparc_set_ptr (p, (void *)memmove, sparc_l0);
-                                       sparc_jmpl_imm (p, sparc_l0, 0, sparc_callsite);
-                                       sparc_nop (p);
-                                       stack_par_pos += (size + (SLOT_SIZE - 1)) & (~(SLOT_SIZE - 1));
-                               }
-                       }
-               }
-       }
-
-       if (sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->byref) {
-               MonoClass *klass = sig->ret->data.klass;
-               if (!klass->enumtype) {
-                       gint size = mono_class_native_size (klass, NULL);
-
-                       DEBUG(fprintf(stderr, "retval value type size: %d\n", size));
-#if SPARCV9
-                       if (size > 32) {
-#else
-                       {
-#endif
-                               /* pass on buffer in interp.c to called function */
-                               sparc_ld_imm_ptr (p, sparc_i1, 0, sparc_l0);
-                               sparc_st_imm_ptr (p, sparc_l0, sparc_sp, 64);
-                       }
-               }
-       }
-
-       DEBUG(fprintf(stderr, "%s\n", sig_to_name(sig, FALSE)));
-
-       for (i = 0; i < sig->param_count; i++) {
-               if (sig->params[i]->byref) {
-                       SAVE_PTR_IN_GENERIC_REGISTER;
-                       continue;
-               }
-               simpletype = sig->params[i]->type;
-       enum_calc_size:
-               switch (simpletype) {
-               case MONO_TYPE_BOOLEAN:
-                case MONO_TYPE_I1:
-                case MONO_TYPE_U1:
-                case MONO_TYPE_I2:
-                case MONO_TYPE_U2:
-                case MONO_TYPE_CHAR:
-                case MONO_TYPE_I4:
-                case MONO_TYPE_U4:
-                        if (gr < OUT_REGS) {
-                                sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr);
-                                gr++;
-                        } else {
-                                sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_l0);
-                                sparc_st_imm_word (p, sparc_l0, sparc_sp, stack_par_pos);
-                                stack_par_pos += SLOT_SIZE;
-                        }
-                        break;
-
-               case MONO_TYPE_R4:
-#if SPARCV9
-                       sparc_lddf_imm (p, ARG_BASE, i*ARG_SIZE, sparc_f30); /* fix using this fixed reg */
-                       sparc_fdtos(p, sparc_f30, sparc_f0 + 2 * gr + 1);
-                       gr++;
-                       break;
-#else
-                       /* Convert from double to single */
-                       sparc_lddf_imm (p, ARG_BASE, i*ARG_SIZE, sparc_f0);
-                       sparc_fdtos (p, sparc_f0, sparc_f0);
-
-                       /*
-                        * FIXME: Is there an easier way to do an
-                        * freg->ireg move ?
-                        */
-                       sparc_stf_imm (p, sparc_f0, sparc_sp, stack_par_pos);
-
-                       if (gr < OUT_REGS) {
-                               sparc_ld_imm (p, sparc_sp, stack_par_pos, sparc_o0 + gr);
-                               gr++;
-                       } else {
-                               sparc_ldf_imm (p, sparc_sp, stack_par_pos, sparc_f0);
-                               sparc_stf_imm (p, sparc_f0, sparc_sp, stack_par_pos);
-                               stack_par_pos += SLOT_SIZE;
-                       }
-                       break;
-#endif
-
-                case MONO_TYPE_I:
-                case MONO_TYPE_U:
-                case MONO_TYPE_PTR:
-                case MONO_TYPE_CLASS:
-                case MONO_TYPE_OBJECT:
-                case MONO_TYPE_STRING:
-                case MONO_TYPE_SZARRAY:
-                       SAVE_PTR_IN_GENERIC_REGISTER;
-                       break;
-               case MONO_TYPE_VALUETYPE: {
-                       gint size;
-                       guint32 align;
-                       MonoClass *klass = sig->params[i]->data.klass;
-                       if (klass->enumtype) {
-                               simpletype = klass->enum_basetype->type;
-                               goto enum_calc_size;
-                       }
-                       size = mono_class_native_size (klass, &align);
-#if SPARCV9
-                       if (size <= 16) {
-                               if (gr < OUT_REGS) {
-                                       p = v9_struct_arg(p, i, klass, size, &gr);
-                               } else {
-                                       sparc_ld_imm_ptr (p, ARG_BASE, i*ARG_SIZE, sparc_l0);
-                                       sparc_ld_imm (p, sparc_l0, 0, sparc_l0);
-                                       sparc_st_imm_word (p, sparc_l0, sparc_sp, stack_par_pos);
-                                       stack_par_pos += SLOT_SIZE;
-                               }
-                               break;
-                       }
-#else
-                       /* 
-                        * FIXME: The 32bit ABI docs do not mention that small
-                        * structures are passed in registers.
-                        */
-
-                       /*
-                       if (size == 4) {
-                               if (gr < OUT_REGS) {
-                                       sparc_ld_imm_ptr (p, ARG_BASE, i*ARG_SIZE, sparc_l0);
-                                       sparc_ld_imm (p, sparc_l0, 0, sparc_o0 + gr);
-                                       gr++;
-                               } else {
-                                       sparc_ld_imm_ptr (p, ARG_BASE, i*ARG_SIZE, sparc_l0);
-                                       sparc_ld_imm (p, sparc_l0, 0, sparc_l0);
-                                       sparc_st_imm_word (p, sparc_l0, sparc_sp, stack_par_pos);
-                                       stack_par_pos += SLOT_SIZE;
-                               }
-                               break;
-                       }
-                       */
-#endif
-
-                       cur_struct_pos = (cur_struct_pos + (align - 1)) & (~(align - 1));
-                       if (gr < OUT_REGS) {
-                               sparc_add_imm (p, 0, sparc_sp,
-                                              cur_struct_pos, sparc_o0 + gr);
-                               gr ++;
-                       } else {
-                               sparc_ld_imm_ptr (p, sparc_sp,
-                                                 cur_struct_pos,
-                                                 sparc_l1);
-                               sparc_st_imm_ptr (p, sparc_l1,
-                                                 sparc_sp,
-                                                 stack_par_pos);
-                       }
-                       cur_struct_pos += (size + (SLOT_SIZE - 1)) & (~(SLOT_SIZE - 1));
-                       break;
-               }
-
-#if SPARCV9
-               case MONO_TYPE_I8:
-                       if (gr < OUT_REGS) {
-                               sparc_ldx_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr);
-                               gr++;
-                       } else {
-                               sparc_ldx_imm (p, ARG_BASE, i*ARG_SIZE, sparc_l0);
-                               sparc_stx_imm (p, sparc_l0, sparc_sp, stack_par_pos);
-                               stack_par_pos += SLOT_SIZE;
-                       }
-                       break;
-               case MONO_TYPE_R8:
-                       sparc_lddf_imm (p, ARG_BASE, i*ARG_SIZE, sparc_f0 + 2 * i);
-                       break;
-#else
-               case MONO_TYPE_I8:
-               case MONO_TYPE_R8:
-                       if (gr < (OUT_REGS - 1)) {
-                               sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr);
-                               gr ++;
-                               
-                               sparc_ld_imm (p, ARG_BASE, 
-                                             (i*ARG_SIZE) + 4,
-                                             sparc_o0 + gr);
-                               gr ++;
-                       } else if (gr == (OUT_REGS - 1)) {
-                               /* Split register/stack */
-                               sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr);
-                               gr ++;
-
-                               sparc_ld_imm (p, ARG_BASE, (i*ARG_SIZE) + 4, sparc_l0);
-                               sparc_st_imm (p, sparc_l0, sparc_sp, stack_par_pos);
-                               stack_par_pos += SLOT_SIZE;
-                       } else {
-                               sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_l0);
-                               sparc_st_imm (p, sparc_l0, sparc_sp, stack_par_pos);
-                               stack_par_pos += SLOT_SIZE;
-
-                               sparc_ld_imm (p, ARG_BASE, (i*ARG_SIZE) + 4, sparc_l0);
-                               sparc_st_imm (p, sparc_l0, sparc_sp, stack_par_pos);
-                               stack_par_pos += SLOT_SIZE;
-                       }
-                       break;
-#endif
-               default:
-                       g_error ("Can't trampoline 0x%x", sig->params[i]->type);
-               }
-       }
-
-       g_assert ((stack_par_pos - BIAS) <= stack_size);
-
-       return p;
-}
-
-static inline guint32 *
-alloc_code_memory (guint code_size)
-{
-       guint32 *p;
-
-       p = g_malloc(code_size);
-
-       return p;
-}
-
-static inline guint32 *
-emit_call_and_store_retval (guint32 *p, MonoMethodSignature *sig,
-                           guint stack_size, gboolean string_ctor)
-{
-       guint32 simpletype;
-
-       /* call "callme" */
-       sparc_jmpl_imm (p, sparc_i0, 0, sparc_callsite);
-       sparc_nop (p);
-#if !SPARCV9
-       if (sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->data.klass->enumtype) {
-               int size = mono_class_native_size (sig->ret->data.klass, NULL);
-               sparc_unimp (p, size & 4095);
-       }
-#endif
-
-       /* get return value */
-       if (sig->ret->byref || string_ctor) {
-               sparc_st_ptr (p, sparc_o0, sparc_i1, 0);
-       } else {
-               simpletype = sig->ret->type;
-       enum_retval:
-               switch (simpletype) {
-               case MONO_TYPE_BOOLEAN:
-                case MONO_TYPE_I1:
-                case MONO_TYPE_U1:
-                        sparc_stb (p, sparc_o0, sparc_i1, 0);
-                        break;
-                case MONO_TYPE_CHAR:
-                case MONO_TYPE_I2:
-                case MONO_TYPE_U2:
-                        sparc_sth (p, sparc_o0, sparc_i1, 0);
-                        break;
-                case MONO_TYPE_I4:
-                case MONO_TYPE_U4:
-                        sparc_st (p, sparc_o0, sparc_i1, 0);
-                        break;
-                case MONO_TYPE_I:
-                case MONO_TYPE_U:
-                case MONO_TYPE_CLASS:
-                case MONO_TYPE_OBJECT:
-                case MONO_TYPE_SZARRAY:
-                case MONO_TYPE_ARRAY:
-                case MONO_TYPE_STRING:
-                case MONO_TYPE_PTR:
-                        sparc_st_ptr (p, sparc_o0, sparc_i1, 0);
-                        break;
-                case MONO_TYPE_R4:
-                        sparc_stf (p, sparc_f0, sparc_i1, 0);
-                        break;
-                case MONO_TYPE_R8:
-                        sparc_stdf (p, sparc_f0, sparc_i1, 0);
-                        break;
-                case MONO_TYPE_I8:
-#if SPARCV9
-                        sparc_stx (p, sparc_o0, sparc_i1, 0);
-#else
-                        sparc_std (p, sparc_o0, sparc_i1, 0);
-#endif
-                        break;
-                case MONO_TYPE_VALUETYPE: {
-                       gint size;
-                        if (sig->ret->data.klass->enumtype) {
-                                simpletype = sig->ret->data.klass->enum_basetype->type;
-                                goto enum_retval;
-                        }
-#if SPARCV9
-                       size = mono_class_native_size (sig->ret->data.klass, NULL);
-                       if (size <= 32) {
-                               int n_regs = size / 8;
-                               int j;
-                               sparc_ldx_imm (p, sparc_i1, 0, sparc_i1);
-                               /* wrong if there are floating values in the struct... */
-                               for (j = 0; j < n_regs; j++) {
-                                       sparc_stx_imm (p, sparc_o0 + j, sparc_i1, j * 8);
-                               }
-                               size -= n_regs * 8;
-                               if (size > 0) {
-                                       int last_reg = sparc_o0 + n_regs;
-                                       /* get value right aligned in register */
-                                       sparc_srlx_imm(p, last_reg, 64 - 8 * size, last_reg);
-                                       if ((size & 1) != 0) {
-                                               sparc_stb_imm (p, last_reg, sparc_i1, n_regs * 8 + size - 1);
-                                               size--;
-                                               if (size > 0)
-                                                       sparc_srlx_imm(p, last_reg, 8, last_reg);
-                                       }
-                                       if ((size & 2) != 0) {
-                                               sparc_sth_imm (p, last_reg, sparc_i1, n_regs * 8 + size - 2);
-                                               size -= 2;
-                                               if (size > 0)
-                                                       sparc_srlx_imm(p, last_reg, 16, last_reg);
-                                       }
-                                       if ((size & 4) != 0)
-                                               sparc_st_imm (p, last_reg, sparc_i1, n_regs * 8);
-                               }
-                       }
-#endif
-               }
-                case MONO_TYPE_VOID:
-                        break;
-                default:
-                        g_error ("Can't handle as return value 0x%x", sig->ret->type);
-               }
-       }
-       return p;
-}
-
-MonoPIFunc
-mono_arch_create_trampoline (MonoMethodSignature *sig, gboolean string_ctor)
-{
-       guint32 *p, *code_buffer;
-       guint stack_size, code_size, i;
-       gboolean use_memcpy = FALSE;
-       static GHashTable *cache = NULL;
-       MonoPIFunc res;
-
-       if (!cache)
-               cache = g_hash_table_new ((GHashFunc)mono_signature_hash,
-                                (GCompareFunc)mono_metadata_signature_equal);
-       
-       if ((res = (MonoPIFunc)g_hash_table_lookup(cache, sig)))
-               return res;
-
-       calculate_sizes (sig, &stack_size, &code_size, 
-                        string_ctor, &use_memcpy);
-
-       p = code_buffer = alloc_code_memory (code_size);
-       p = emit_prolog (p, sig, stack_size);
-       p = emit_save_parameters (p, sig, stack_size, use_memcpy);
-       p = emit_call_and_store_retval (p, sig, stack_size, string_ctor);
-       /* we don't return structs here so pass in NULL as signature */
-       p = emit_epilog (p, NULL, stack_size);
-
-       g_assert(p <= code_buffer + (code_size / 4));
-       
-       DEBUG(sparc_disassemble_code (code_buffer, p, sig_to_name(sig, NULL)));
-
-       /* So here's the deal...
-        * UltraSPARC will flush a whole cache line at a time
-        * BUT, older SPARCs won't.
-        * So, be compatable and flush dwords at a time...
-        */
-
-       for (i = 0; i < ((p - code_buffer)/2); i++)
-               flushi((code_buffer + (i*8)));
-
-       g_hash_table_insert(cache, sig, code_buffer);
-
-       return (MonoPIFunc)code_buffer;
-}
-
-#define MINV_POS (MINIMAL_STACK_SIZE * SLOT_SIZE + BIAS)
-
-void *
-mono_arch_create_method_pointer (MonoMethod *method)
-{
-       MonoMethodSignature *sig;
-       MonoJitInfo *ji;
-       guint stack_size, code_size, stackval_arg_pos, local_pos;
-       guint i, local_start, reg_param = 0, stack_param, cpos, vt_cur;
-       guint32 align = 0;
-       guint32 *p, *code_buffer;
-       gint *vtbuf;
-       gint32 simpletype;
-
-       code_size = 1024; /* these should be calculated... */
-       stack_size = 1024;
-       stack_param = 0;
-
-       sig = method->signature;
-
-       p = code_buffer = g_malloc (code_size);
-
-       DEBUG(fprintf(stderr, "Delegate [start emiting] %s\n", method->name));
-       DEBUG(fprintf(stderr, "%s\n", sig_to_name(sig, FALSE)));
-
-       p = emit_prolog (p, sig, stack_size);
-
-       /* fill MonoInvocation */
-       sparc_st_imm_ptr (p, sparc_g0, sparc_sp,
-                 (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, ex)));
-       sparc_st_imm_ptr (p, sparc_g0, sparc_sp,
-                 (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, ex_handler)));
-       sparc_st_imm_ptr (p, sparc_g0, sparc_sp,
-                 (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, parent)));
-
-       sparc_set_ptr (p, (void *)method, sparc_l0);
-       sparc_st_imm_ptr (p, sparc_l0, sparc_sp,
-                 (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, method)));
-
-       stackval_arg_pos = MINV_POS + sizeof (MonoInvocation);
-       local_start = local_pos = stackval_arg_pos + (sig->param_count + 1) * sizeof (stackval);
-
-       if (sig->hasthis) {
-               sparc_st_imm_ptr (p, sparc_i0, sparc_sp,
-                         (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, obj)));
-               reg_param = 1;
-       } 
-
-       if (sig->param_count) {
-               gint save_count = MIN (OUT_REGS, sig->param_count + sig->hasthis);
-               for (i = reg_param; i < save_count; i++) {
-                       sparc_st_imm_ptr (p, sparc_i0 + i, sparc_sp, local_pos);
-                       local_pos += SLOT_SIZE;
-               }
-       }
-
-       /* prepare space for valuetypes */
-        vt_cur = local_pos;
-        vtbuf = alloca (sizeof(int)*sig->param_count);
-        cpos = 0;
-        for (i = 0; i < sig->param_count; i++) {
-                MonoType *type = sig->params [i];
-                vtbuf [i] = -1;
-                if (!sig->params[i]->byref && type->type == MONO_TYPE_VALUETYPE) {
-                        MonoClass *klass = type->data.klass;
-                        gint size;
-                       
-                        if (klass->enumtype)
-                                continue;
-                        size = mono_class_native_size (klass, &align);
-                        cpos += align - 1;
-                        cpos &= ~(align - 1);
-                        vtbuf [i] = cpos;
-                        cpos += size;
-                }
-        }
-        cpos += SLOT_SIZE - 1;
-        cpos &= ~(SLOT_SIZE - 1);
-       
-       local_pos += cpos;
-       
-       /* set MonoInvocation::stack_args */
-       sparc_add_imm (p, 0, sparc_sp, stackval_arg_pos, sparc_l0);
-       sparc_st_imm_ptr (p, sparc_l0, sparc_sp,
-                 (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, stack_args)));
-
-       /* add stackval arguments */
-       for (i=0; i < sig->param_count; i++) {
-               int stack_offset;
-               int type;
-               if (reg_param < OUT_REGS) {
-                       stack_offset = local_start + i * SLOT_SIZE;
-                       reg_param++;
-               } else {
-                       stack_offset = stack_size + 8 + stack_param;
-                       stack_param++;
-               }
-
-               if (!sig->params[i]->byref) {
-                       type = sig->params[i]->type;
-               enum_arg:
-                       switch (type) {
-                       case MONO_TYPE_I8:
-                       case MONO_TYPE_U8:
-                       case MONO_TYPE_I:
-                       case MONO_TYPE_U:
-                       case MONO_TYPE_STRING:
-                       case MONO_TYPE_OBJECT:
-                       case MONO_TYPE_CLASS:
-                       case MONO_TYPE_SZARRAY:
-                       case MONO_TYPE_PTR:
-                       case MONO_TYPE_R8:
-                               break;
-                       case MONO_TYPE_I4:
-                       case MONO_TYPE_U4:
-                               stack_offset += SLOT_SIZE - 4;
-                               break;
-                       case MONO_TYPE_CHAR:
-                       case MONO_TYPE_I2:
-                       case MONO_TYPE_U2:
-                               stack_offset += SLOT_SIZE - 2;
-                               break;
-                       case MONO_TYPE_I1:
-                       case MONO_TYPE_U1:
-                       case MONO_TYPE_BOOLEAN:
-                               stack_offset += SLOT_SIZE - 1;
-                               break;
-                       case MONO_TYPE_VALUETYPE:
-                               if (sig->params[i]->data.klass->enumtype) {
-                                       type = sig->params[i]->data.klass->enum_basetype->type;
-                                       goto enum_arg;
-                               }
-                               g_assert(vtbuf[i] >= 0);
-                               break;
-                       default:
-                               g_error ("can not cope with delegate arg type %d", type);
-                       }
-               }
-       
-               sparc_add_imm (p, 0, sparc_sp, stack_offset, sparc_o2);
-
-               if (vtbuf[i] >= 0) {
-                       sparc_add_imm (p, 0, sparc_sp, vt_cur, sparc_o1);
-                       sparc_st_imm_ptr (p, sparc_o1, sparc_sp, stackval_arg_pos);
-                       sparc_add_imm (p, 0, sparc_sp, stackval_arg_pos, 
-                                      sparc_o1);
-                       sparc_ld_imm_ptr (p, sparc_o2, 0, sparc_o2);
-                       vt_cur += vtbuf[i];
-               } else {
-                       sparc_add_imm (p, 0, sparc_sp, stackval_arg_pos, 
-                                      sparc_o1);
-               }
-
-               sparc_set_ptr (p, (void *)sig->params[i], sparc_o0);
-               sparc_set (p, (guint32)sig->pinvoke, sparc_o3);
-
-               /* YOU make the CALL! */
-               sparc_set_ptr (p, (void *)stackval_from_data, sparc_l0);
-               sparc_jmpl_imm (p, sparc_l0, 0, sparc_callsite);
-               sparc_nop (p);
-                stackval_arg_pos += sizeof(stackval);
-       }
-
-       /* return value storage */
-       /* Align to dword */
-       stackval_arg_pos = (stackval_arg_pos + (8 - 1)) & (~(8 -1));
-       if (sig->param_count) {
-               sparc_add_imm (p, 0, sparc_sp, stackval_arg_pos, sparc_l0);
-       }
-       if (!sig->ret->byref && sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->data.klass->enumtype) {
-#if !SPARCV9
-               /* pass on callers buffer */
-               sparc_ld_imm_ptr (p, sparc_fp, 64, sparc_l1);
-               sparc_st_imm_ptr (p, sparc_l1, sparc_l0, 0);
-#else
-               sparc_add_imm (p, 0, sparc_l0, sizeof(stackval), sparc_l1);
-               sparc_st_imm_ptr (p, sparc_l1, sparc_l0, 0);
-#endif
-       }
-
-       sparc_st_imm_ptr (p, sparc_l0, sparc_sp,
-                 (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, retval)));
-
-       /* call ves_exec_method */
-       sparc_add_imm (p, 0, sparc_sp, MINV_POS, sparc_o0);
-       sparc_set_ptr (p, (void *)ves_exec_method, sparc_l0);
-       sparc_jmpl_imm (p, sparc_l0, 0, sparc_callsite);
-       sparc_nop (p);
-
-       /* move retval from stackval to proper place (r3/r4/...) */
-        if (sig->ret->byref) {
-               sparc_ld_imm_ptr (p, sparc_sp, stackval_arg_pos, sparc_i0 );
-        } else {
-        enum_retvalue:
-                switch (sig->ret->type) {
-                case MONO_TYPE_VOID:
-                        break;
-                case MONO_TYPE_BOOLEAN:
-                case MONO_TYPE_I1:
-                case MONO_TYPE_U1:
-                case MONO_TYPE_I2:
-                case MONO_TYPE_U2:
-                case MONO_TYPE_I4:
-                case MONO_TYPE_U4:
-                        sparc_ld_imm (p, sparc_sp, stackval_arg_pos, sparc_i0);
-                        break;
-                case MONO_TYPE_I:
-                case MONO_TYPE_U:
-                case MONO_TYPE_OBJECT:
-               case MONO_TYPE_STRING:
-                case MONO_TYPE_CLASS:
-                        sparc_ld_imm_ptr (p, sparc_sp, stackval_arg_pos, sparc_i0);
-                        break;
-                case MONO_TYPE_I8:
-                case MONO_TYPE_U8:
-#if SPARCV9
-                        sparc_ldx_imm (p, sparc_sp, stackval_arg_pos, sparc_i0);
-#else
-                        sparc_ld_imm (p, sparc_sp, stackval_arg_pos, sparc_i0);
-                        sparc_ld_imm (p, sparc_sp, stackval_arg_pos + 4, sparc_i1);
-#endif
-                        break;
-                case MONO_TYPE_R4:
-                        sparc_lddf_imm (p, sparc_sp, stackval_arg_pos, sparc_f0);
-                       sparc_fdtos(p, sparc_f0, sparc_f0);
-                        break;
-                case MONO_TYPE_R8:
-                        sparc_lddf_imm (p, sparc_sp, stackval_arg_pos, sparc_f0);
-                        break;
-                case MONO_TYPE_VALUETYPE: {
-                       gint size;
-                       gint reg = sparc_i0;
-                        if (sig->ret->data.klass->enumtype) {
-                                simpletype = sig->ret->data.klass->enum_basetype->type;
-                                goto enum_retvalue;
-                        }
-#if SPARCV9
-                        size = mono_class_native_size (sig->ret->data.klass, NULL);
-                        sparc_ldx_imm (p, sparc_sp, stackval_arg_pos, sparc_l0);
-                       if (size <= 16) {
-                               gint off = 0;
-                               if (size >= 8) {
-                                       sparc_ldx_imm (p, sparc_l0, 0, reg);
-                                       size -= 8;
-                                       off += 8;
-                                       reg++;
-                               }
-                               if (size > 0)
-                                       sparc_ldx_imm (p, sparc_l0, off, reg);
-                       } else
-                               NOT_IMPL("value type as ret val from delegate");
-#endif
-                        break;
-               }
-                default: 
-                       g_error ("Type 0x%x not handled yet in thunk creation",
-                                sig->ret->type);
-                        break;
-                }
-        }
-
-       p = emit_epilog (p, sig, stack_size);
-
-       for (i = 0; i < ((p - code_buffer)/2); i++)
-               flushi((code_buffer + (i*8)));
-       
-       ji = g_new0 (MonoJitInfo, 1);
-        ji->method = method;
-        ji->code_size = p - code_buffer;
-       ji->code_start = code_buffer;
-       
-       mono_jit_info_table_add (mono_get_root_domain (), ji);
-
-       DEBUG(sparc_disassemble_code (code_buffer, p, method->name));
-
-       DEBUG(fprintf(stderr, "Delegate [end emiting] %s\n", method->name));
-
-       return ji->code_start;
-}
index 5e706fb7280252ca41d3d5c07e66274ad333a435..dbad6679487498411ed28f0931687ced575fb910 100644 (file)
@@ -42,6 +42,7 @@
 #include <mono/io-layer/process-private.h>
 
 #include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-proclib.h>
 #undef DEBUG_REFS
 
 #if 0
@@ -286,12 +287,12 @@ wapi_init (void)
 
        wapi_processes_init ();
 
-       /* Using g_atexit here instead of an explicit function call in
+       /* Using atexit here instead of an explicit function call in
         * a cleanup routine lets us cope when a third-party library
         * calls exit (eg if an X client loses the connection to its
         * server.)
         */
-       g_atexit (handle_cleanup);
+       mono_atexit (handle_cleanup);
 }
 
 void
@@ -1818,8 +1819,6 @@ static void _wapi_handle_check_share_by_pid (struct _WapiFileShare *share_info)
 void _wapi_handle_check_share (struct _WapiFileShare *share_info, int fd)
 {
        gboolean found = FALSE, proc_fds = FALSE;
-       pid_t self = _wapi_getpid ();
-       int pid;
        int thr_ret, i;
        
        /* Prevents entries from expiring under us if we remove this
index 335484ae676054522cb7b99975e7a95947ba7dfc..cb83933ec1d79c7a666b0fa31d888506321853c5 100644 (file)
@@ -148,7 +148,6 @@ common_sources = \
        mono-debug.h            \
        mono-debug.c            \
        mono-debug-debugger.h   \
-       mono-debug-debugger.c   \
        mono-endian.c           \
        mono-endian.h           \
        mono-hash.h             \
@@ -174,6 +173,8 @@ common_sources = \
        profiler-private.h      \
        rand.h                  \
        rand.c                  \
+       remoting.h              \
+       remoting.c              \
        runtime.c               \
        security.c              \
        security.h              \
@@ -249,8 +250,9 @@ sgen_sources = \
        sgen-major-copy-object.h \
        sgen-minor-copy-object.h \
        sgen-copy-object.h \
-       sgen-major-scan-object.h \
+       sgen-marksweep-scan-object-concurrent.h \
        sgen-minor-scan-object.h \
+       sgen-marksweep-drain-gray-stack.h       \
        sgen-protocol.h         \
        sgen-scan-object.h      \
        sgen-nursery-allocator.c        \
index c40af5a98f562911e5dd024c548c7faf35504e46..7f67e33128d2b637d49f73b7d8f3929e890db812 100644 (file)
@@ -78,7 +78,7 @@
  * Changes which are already detected at runtime, like the addition
  * of icalls, do not require an increment.
  */
-#define MONO_CORLIB_VERSION 111
+#define MONO_CORLIB_VERSION 113
 
 typedef struct
 {
index 570d502189aa884a7471f0e3663b72020f926ea4..93853e594c1860a881bb3fabfbf4c485565b33eb 100644 (file)
@@ -72,10 +72,6 @@ static guint32 mono_field_resolve_flags (MonoClassField *field);
 static void mono_class_setup_vtable_full (MonoClass *class, GList *in_setup);
 static void mono_generic_class_setup_parent (MonoClass *klass, MonoClass *gklass);
 
-
-void (*mono_debugger_class_init_func) (MonoClass *klass) = NULL;
-
-
 /*
 We use gclass recording to allow recursive system f types to be referenced by a parent.
 
@@ -2152,12 +2148,18 @@ mono_class_setup_methods (MonoClass *class)
                MonoMethodSignature *sig;
                int count_generic = 0, first_generic = 0;
                int method_num = 0;
+               gboolean jagged_ctor = FALSE;
 
                count = 3 + (class->rank > 1? 2: 1);
 
                mono_class_setup_interfaces (class, &error);
                g_assert (mono_error_ok (&error)); /*FIXME can this fail for array types?*/
 
+               if (class->rank == 1 && class->element_class->rank) {
+                       jagged_ctor = TRUE;
+                       class->method.count ++;
+               }
+
                if (class->interface_count) {
                        count_generic = generic_array_methods (class);
                        first_generic = count;
@@ -2186,6 +2188,19 @@ mono_class_setup_methods (MonoClass *class)
                        amethod = create_array_method (class, ".ctor", sig);
                        methods [method_num++] = amethod;
                }
+
+               if (jagged_ctor) {
+                       /* Jagged arrays have an extra ctor in .net which creates an array of arrays */
+                       sig = mono_metadata_signature_alloc (class->image, class->rank + 1);
+                       sig->ret = &mono_defaults.void_class->byval_arg;
+                       sig->pinvoke = TRUE;
+                       sig->hasthis = TRUE;
+                       for (i = 0; i < class->rank + 1; ++i)
+                               sig->params [i] = &mono_defaults.int32_class->byval_arg;
+                       amethod = create_array_method (class, ".ctor", sig);
+                       methods [method_num++] = amethod;
+               }
+
                /* element Get (idx11, [idx2, ...]) */
                sig = mono_metadata_signature_alloc (class->image, class->rank);
                sig->ret = &class->element_class->byval_arg;
@@ -5246,9 +5261,6 @@ mono_class_init (MonoClass *class)
 
        mono_loader_unlock ();
 
-       if (mono_debugger_class_init_func)
-               mono_debugger_class_init_func (class);
-
        return class->exception_type == MONO_EXCEPTION_NONE;
 }
 
index dffba190e31ed5d3113c5705f6e8dcf8d4b8f670..1de9a002e0a9f9a76717d5e013b48248bd5b6ec6 100644 (file)
@@ -35,6 +35,7 @@
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/threadpool.h>
 #include <mono/utils/mono-signal-handler.h>
+#include <mono/utils/mono-proclib.h>
 
 /* On solaris, curses.h must come before both termios.h and term.h */
 #ifdef HAVE_CURSES_H
@@ -502,7 +503,7 @@ ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardow
                if (teardown != NULL)
                        teardown_str = mono_string_to_utf8 (teardown);
 
-               atexit (tty_teardown);
+               mono_atexit (tty_teardown);
        }
 
        return TRUE;
index 51f54a65d1e0a5dec42b515466d1380e00a26037..c251ff9d99c64d92c6859ae76474027da4d8f18b 100755 (executable)
@@ -130,7 +130,7 @@ static const MonoRuntimeInfo supported_runtimes[] = {
 
 
 /* The stable runtime version */
-#define DEFAULT_RUNTIME_VERSION "v2.0.50727"
+#define DEFAULT_RUNTIME_VERSION "v4.0.30319"
 
 /* Callbacks installed by the JIT */
 static MonoCreateDomainFunc create_domain_hook;
@@ -139,9 +139,6 @@ static MonoFreeDomainFunc free_domain_hook;
 /* AOT cache configuration */
 static MonoAotCacheConfig aot_cache_config;
 
-/* This is intentionally not in the header file, so people don't misuse it. */
-extern void _mono_debug_init_corlib (MonoDomain *domain);
-
 static void
 get_runtimes_from_exe (const char *exe_file, MonoImage **exe_image, const MonoRuntimeInfo** runtimes);
 
@@ -836,8 +833,6 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
        mono_defaults.customattribute_data_class = mono_class_from_name (
                mono_defaults.corlib, "System.Reflection", "CustomAttributeData");
 
-       /* these are initialized lazily when COM features are used */
-
        mono_class_init (mono_defaults.array_class);
        mono_defaults.generic_nullable_class = mono_class_from_name (
                mono_defaults.corlib, "System", "Nullable`1");
@@ -848,8 +843,6 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
 
        domain->friendly_name = g_path_get_basename (filename);
 
-       _mono_debug_init_corlib (domain);
-
        return domain;
 }
 
index 7b8836363f8a2a769b980d2a063e7d4567c398b2..79032578afaf8b7b5a5ffa4c2ff7f677ad7cabb7 100644 (file)
 #include <mono/utils/gc_wrapper.h>
 
 typedef struct {
-       int minor_gc_count;
-       int major_gc_count;
-       long long minor_gc_time;
-       long long major_gc_time;
-       long long major_gc_time_concurrent;
+       guint minor_gc_count;
+       guint major_gc_count;
+       guint64 minor_gc_time;
+       guint64 major_gc_time;
+       guint64 major_gc_time_concurrent;
 } GCStats;
 
 #define mono_domain_finalizers_lock(domain) mono_mutex_lock (&(domain)->finalizable_objects_hash_lock);
index 4e025385b766151c779ad1f45f1e5341234c4d5d..921898a444205a0219307176555414c0c18597fc 100644 (file)
@@ -1149,12 +1149,11 @@ mono_gc_init (void)
        MONO_GC_REGISTER_ROOT_FIXED (gc_handles [HANDLE_NORMAL].entries);
        MONO_GC_REGISTER_ROOT_FIXED (gc_handles [HANDLE_PINNED].entries);
 
-       mono_counters_register ("Created object count", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &mono_stats.new_object_count);
-       mono_counters_register ("Minor GC collections", MONO_COUNTER_GC | MONO_COUNTER_INT, &gc_stats.minor_gc_count);
-       mono_counters_register ("Major GC collections", MONO_COUNTER_GC | MONO_COUNTER_INT, &gc_stats.major_gc_count);
-       mono_counters_register ("Minor GC time", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &gc_stats.minor_gc_time);
-       mono_counters_register ("Major GC time", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &gc_stats.major_gc_time);
-       mono_counters_register ("Major GC time concurrent", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &gc_stats.major_gc_time_concurrent);
+       mono_counters_register ("Minor GC collections", MONO_COUNTER_GC | MONO_COUNTER_UINT, &gc_stats.minor_gc_count);
+       mono_counters_register ("Major GC collections", MONO_COUNTER_GC | MONO_COUNTER_UINT, &gc_stats.major_gc_count);
+       mono_counters_register ("Minor GC time", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &gc_stats.minor_gc_time);
+       mono_counters_register ("Major GC time", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &gc_stats.major_gc_time);
+       mono_counters_register ("Major GC time concurrent", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &gc_stats.major_gc_time_concurrent);
 
        mono_gc_base_init ();
 
index e3241865924fdf0a556d48d22c0d07aed1920b10..e91e9e99d2625170e122505c043bfd5226ec5c4d 100644 (file)
@@ -2843,6 +2843,18 @@ ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this, MonoAr
                for (i = 0; i < pcount; ++i)
                        lengths [i] = *(int32_t*) ((char*)mono_array_get (params, gpointer, i) + sizeof (MonoObject));
 
+               if (m->klass->rank == 1 && sig->param_count == 2 && m->klass->element_class->rank) {
+                       /* This is a ctor for jagged arrays. MS creates an array of arrays. */
+                       MonoArray *arr = mono_array_new_full (mono_object_domain (params), m->klass, lengths, NULL);
+
+                       for (i = 0; i < mono_array_length (arr); ++i) {
+                               MonoArray *subarray = mono_array_new_full (mono_object_domain (params), m->klass->element_class, &lengths [1], NULL);
+
+                               mono_array_setref_fast (arr, i, subarray);
+                       }
+                       return (MonoObject*)arr;
+               }
+
                if (m->klass->rank == pcount) {
                        /* Only lengths provided. */
                        lower_bounds = NULL;
index 5ee8be3031a7f7eee68c2ce152d8cfb4a81175b4..adb955b4699e59c874d3aa2a929fdd1a6cad0fae 100644 (file)
@@ -36,6 +36,7 @@
 #include "mono/metadata/attrdefs.h"
 #include "mono/metadata/gc-internal.h"
 #include "mono/metadata/cominterop.h"
+#include "mono/metadata/remoting.h"
 #include "mono/metadata/reflection-internals.h"
 #include "mono/utils/mono-counters.h"
 #include "mono/utils/mono-tls.h"
 #define OPDEF(a,b,c,d,e,f,g,h,i,j) \
        a = i,
 
-typedef enum {
-       MONO_MARSHAL_NONE,                      /* No marshalling needed */
-       MONO_MARSHAL_COPY,                      /* Can be copied by value to the new domain */
-       MONO_MARSHAL_COPY_OUT,          /* out parameter that needs to be copied back to the original instance */
-       MONO_MARSHAL_SERIALIZE          /* Value needs to be serialized into the new domain */
-} MonoXDomainMarshalType;
-
 enum {
 #include "mono/cil/opcode.def"
        LAST = 0xff
 };
 #undef OPDEF
 
-struct _MonoRemotingMethods {
-       MonoMethod *invoke;
-       MonoMethod *invoke_with_check;
-       MonoMethod *xdomain_invoke;
-       MonoMethod *xdomain_dispatch;
-};
-
-typedef struct _MonoRemotingMethods MonoRemotingMethods;
-
 /* 
  * This mutex protects the various marshalling related caches in MonoImage
  * and a few other data structures static to this file.
@@ -143,27 +128,6 @@ mono_delegate_begin_invoke (MonoDelegate *delegate, gpointer *params);
 static MonoObject *
 mono_delegate_end_invoke (MonoDelegate *delegate, gpointer *params);
 
-static void
-mono_marshal_xdomain_copy_out_value (MonoObject *src, MonoObject *dst);
-
-static gint32
-mono_marshal_set_domain_by_id (gint32 id, MonoBoolean push);
-
-static gboolean
-mono_marshal_check_domain_image (gint32 domain_id, MonoImage *image);
-
-#ifndef DISABLE_REMOTING
-static MonoObject *
-mono_remoting_wrapper (MonoMethod *method, gpointer *params);
-
-MONO_API void
-mono_upgrade_remote_class_wrapper (MonoReflectionType *rtype, MonoTransparentProxy *tproxy);
-
-#endif
-
-static MonoReflectionType *
-type_from_handle (MonoType *handle);
-
 static void
 mono_marshal_set_last_error_windows (int error);
 
@@ -274,22 +238,14 @@ mono_marshal_init (void)
                register_icall (mono_struct_delete_old, "mono_struct_delete_old", "void ptr ptr", FALSE);
                register_icall (mono_delegate_begin_invoke, "mono_delegate_begin_invoke", "object object ptr", FALSE);
                register_icall (mono_delegate_end_invoke, "mono_delegate_end_invoke", "object object ptr", FALSE);
-               register_icall (mono_marshal_xdomain_copy_value, "mono_marshal_xdomain_copy_value", "object object", FALSE);
-               register_icall (mono_marshal_xdomain_copy_out_value, "mono_marshal_xdomain_copy_out_value", "void object object", FALSE);
-               register_icall (mono_marshal_set_domain_by_id, "mono_marshal_set_domain_by_id", "int32 int32 int32", FALSE);
-               register_icall (mono_marshal_check_domain_image, "mono_marshal_check_domain_image", "int32 int32 ptr", FALSE);
                register_icall (mono_compile_method, "mono_compile_method", "ptr ptr", FALSE);
                register_icall (mono_context_get, "mono_context_get", "object", FALSE);
                register_icall (mono_context_set, "mono_context_set", "void object", FALSE);
-               register_icall (type_from_handle, "type_from_handle", "object ptr", FALSE);
                register_icall (mono_gc_wbarrier_generic_nostore, "wb_generic", "void ptr", FALSE);
                register_icall (mono_gchandle_get_target, "mono_gchandle_get_target", "object int32", TRUE);
 
-#ifndef DISABLE_REMOTING
-               register_icall (mono_remoting_wrapper, "mono_remoting_wrapper", "object ptr ptr", FALSE);
-               register_icall (mono_upgrade_remote_class_wrapper, "mono_upgrade_remote_class_wrapper", "void object object", FALSE);
-#endif
                mono_cominterop_init ();
+               mono_remoting_init ();
        }
 }
 
@@ -304,42 +260,17 @@ mono_marshal_cleanup (void)
        marshal_mutex_initialized = FALSE;
 }
 
-#ifndef DISABLE_REMOTING
-static MonoClass *byte_array_class;
-static MonoMethod *method_rs_serialize, *method_rs_deserialize, *method_exc_fixexc, *method_rs_appdomain_target;
-static MonoMethod *method_set_call_context, *method_needs_context_sink, *method_rs_serialize_exc;
-
-static void
-mono_remoting_marshal_init (void)
+void
+mono_marshal_lock_internal (void)
 {
-       MonoClass *klass;
-
-       static gboolean module_initialized = FALSE;
-
-       if (!module_initialized) {
-               klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting", "RemotingServices");
-               method_rs_serialize = mono_class_get_method_from_name (klass, "SerializeCallData", -1);
-               method_rs_deserialize = mono_class_get_method_from_name (klass, "DeserializeCallData", -1);
-               method_rs_serialize_exc = mono_class_get_method_from_name (klass, "SerializeExceptionData", -1);
-       
-               klass = mono_defaults.real_proxy_class;
-               method_rs_appdomain_target = mono_class_get_method_from_name (klass, "GetAppDomainTarget", -1);
-       
-               klass = mono_defaults.exception_class;
-               method_exc_fixexc = mono_class_get_method_from_name (klass, "FixRemotingException", -1);
-       
-               byte_array_class = mono_array_class_get (mono_defaults.byte_class, 1);
-       
-               klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Messaging", "CallContext");
-               method_set_call_context = mono_class_get_method_from_name (klass, "SetCurrentCallContext", -1);
-       
-               klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Contexts", "Context");
-               method_needs_context_sink = mono_class_get_method_from_name (klass, "get_NeedsContextSink", -1);
+       mono_marshal_lock ();
+}
 
-               module_initialized = TRUE;
-       }
+void
+mono_marshal_unlock_internal (void)
+{
+       mono_marshal_unlock ();
 }
-#endif
 
 gpointer
 mono_delegate_to_ftnptr (MonoDelegate *delegate)
@@ -1082,57 +1013,6 @@ mono_string_new_len_wrapper (const char *text, guint length)
 }
 
 #ifndef DISABLE_JIT
-#ifndef DISABLE_REMOTING
-static int
-mono_mb_emit_proxy_check (MonoMethodBuilder *mb, int branch_code)
-{
-       int pos;
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoObject, vtable));
-       mono_mb_emit_byte (mb, CEE_LDIND_I);
-       mono_mb_emit_icon (mb, MONO_STRUCT_OFFSET (MonoVTable, klass));
-       mono_mb_emit_byte (mb, CEE_ADD);
-       mono_mb_emit_byte (mb, CEE_LDIND_I);
-       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
-       mono_mb_emit_byte (mb, CEE_MONO_CLASSCONST);
-       mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.transparent_proxy_class));
-       pos = mono_mb_emit_branch (mb, branch_code);
-       return pos;
-}
-
-static int
-mono_mb_emit_xdomain_check (MonoMethodBuilder *mb, int branch_code)
-{
-       int pos;
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, target_domain_id));
-       mono_mb_emit_byte (mb, CEE_LDIND_I4);
-       mono_mb_emit_icon (mb, -1);
-       pos = mono_mb_emit_branch (mb, branch_code);
-       return pos;
-}
-
-static int
-mono_mb_emit_contextbound_check (MonoMethodBuilder *mb, int branch_code)
-{
-       static int offset = -1;
-       static guint8 mask;
-
-       if (offset < 0)
-               mono_marshal_find_bitfield_offset (MonoClass, contextbound, &offset, &mask);
-
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, remote_class));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRemoteClass, proxy_class));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_ldflda (mb, offset);
-       mono_mb_emit_byte (mb, CEE_LDIND_U1);
-       mono_mb_emit_icon (mb, mask);
-       mono_mb_emit_byte (mb, CEE_AND);
-       mono_mb_emit_icon (mb, 0);
-       return mono_mb_emit_branch (mb, branch_code);
-}
-#endif /* DISABLE_REMOTING */
 
 /*
  * mono_mb_emit_exception_marshal_directive:
@@ -2165,6 +2045,12 @@ mono_marshal_emit_thread_interrupt_checkpoint (MonoMethodBuilder *mb)
        emit_thread_interrupt_checkpoint (mb);
 }
 
+void
+mono_marshal_emit_thread_force_interrupt_checkpoint (MonoMethodBuilder *mb)
+{
+       emit_thread_force_interrupt_checkpoint (mb);
+}
+
 #endif /* DISABLE_JIT */
 
 static MonoAsyncResult *
@@ -2229,7 +2115,7 @@ mono_delegate_begin_invoke (MonoDelegate *delegate, gpointer *params)
 
 #ifndef DISABLE_JIT
 
-static int
+int
 mono_mb_emit_save_args (MonoMethodBuilder *mb, MonoMethodSignature *sig, gboolean save_this)
 {
        int i, params_var, tmp_var;
@@ -2475,22 +2361,6 @@ get_cache (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func)
        return *var;
 }
 
-static GHashTable*
-get_cache_full (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func, GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func)
-{
-       if (!(*var)) {
-               mono_marshal_lock ();
-               if (!(*var)) {
-                       GHashTable *cache = 
-                               g_hash_table_new_full (hash_func, equal_func, key_destroy_func, value_destroy_func);
-                       mono_memory_barrier ();
-                       *var = cache;
-               }
-               mono_marshal_unlock ();
-       }
-       return *var;
-}
-
 GHashTable*
 mono_marshal_get_cache (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func)
 {
@@ -2513,7 +2383,7 @@ mono_marshal_find_in_cache (GHashTable *cache, gpointer key)
  *
  *   Create a MonoMethod from MB, set INFO as wrapper info.
  */
-static MonoMethod*
+MonoMethod*
 mono_mb_create (MonoMethodBuilder *mb, MonoMethodSignature *sig,
                                int max_stack, WrapperInfo *info)
 {
@@ -2526,7 +2396,7 @@ mono_mb_create (MonoMethodBuilder *mb, MonoMethodSignature *sig,
 }
 
 /* Create the method from the builder and place it in the cache */
-static MonoMethod*
+MonoMethod*
 mono_mb_create_and_cache_full (GHashTable *cache, gpointer key,
                                                           MonoMethodBuilder *mb, MonoMethodSignature *sig,
                                                           int max_stack, WrapperInfo *info, gboolean *out_found)
@@ -2571,78 +2441,6 @@ mono_mb_create_and_cache (GHashTable *cache, gpointer key,
        return mono_mb_create_and_cache_full (cache, key, mb, sig, max_stack, NULL, NULL);
 }
 
-static inline MonoMethod*
-mono_marshal_remoting_find_in_cache (MonoMethod *method, int wrapper_type)
-{
-       MonoMethod *res = NULL;
-       MonoRemotingMethods *wrps;
-
-       mono_marshal_lock ();
-       if (method->klass->image->remoting_invoke_cache)
-               wrps = g_hash_table_lookup (method->klass->image->remoting_invoke_cache, method);
-       else
-               wrps = NULL;
-
-       if (wrps) {
-               switch (wrapper_type) {
-               case MONO_WRAPPER_REMOTING_INVOKE: res = wrps->invoke; break;
-               case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: res = wrps->invoke_with_check; break;
-               case MONO_WRAPPER_XDOMAIN_INVOKE: res = wrps->xdomain_invoke; break;
-               case MONO_WRAPPER_XDOMAIN_DISPATCH: res = wrps->xdomain_dispatch; break;
-               }
-       }
-       
-       /* it is important to do the unlock after the load from wrps, since in
-        * mono_remoting_mb_create_and_cache () we drop the marshal lock to be able
-        * to take the loader lock and some other thread may set the fields.
-        */
-       mono_marshal_unlock ();
-       return res;
-}
-
-/* Create the method from the builder and place it in the cache */
-static inline MonoMethod*
-mono_remoting_mb_create_and_cache (MonoMethod *key, MonoMethodBuilder *mb, 
-                                                               MonoMethodSignature *sig, int max_stack)
-{
-       MonoMethod **res = NULL;
-       MonoRemotingMethods *wrps;
-       GHashTable *cache = get_cache_full (&key->klass->image->remoting_invoke_cache, mono_aligned_addr_hash, NULL, NULL, g_free);
-
-       mono_marshal_lock ();
-       wrps = g_hash_table_lookup (cache, key);
-       if (!wrps) {
-               wrps = g_new0 (MonoRemotingMethods, 1);
-               g_hash_table_insert (cache, key, wrps);
-       }
-
-       switch (mb->method->wrapper_type) {
-       case MONO_WRAPPER_REMOTING_INVOKE: res = &wrps->invoke; break;
-       case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: res = &wrps->invoke_with_check; break;
-       case MONO_WRAPPER_XDOMAIN_INVOKE: res = &wrps->xdomain_invoke; break;
-       case MONO_WRAPPER_XDOMAIN_DISPATCH: res = &wrps->xdomain_dispatch; break;
-       default: g_assert_not_reached (); break;
-       }
-       mono_marshal_unlock ();
-
-       if (*res == NULL) {
-               MonoMethod *newm;
-               newm = mono_mb_create_method (mb, sig, max_stack);
-
-               mono_marshal_lock ();
-               if (!*res) {
-                       *res = newm;
-                       mono_marshal_set_wrapper_info (*res, key);
-                       mono_marshal_unlock ();
-               } else {
-                       mono_marshal_unlock ();
-                       mono_free_method (newm);
-               }
-       }
-
-       return *res;
-}              
-
 MonoMethod *
 mono_marshal_method_from_wrapper (MonoMethod *wrapper)
 {
@@ -2721,7 +2519,7 @@ mono_marshal_set_wrapper_info (MonoMethod *method, gpointer data)
        datav [1] = data;
 }
 
-static WrapperInfo*
+WrapperInfo*
 mono_wrapper_info_create (MonoMethodBuilder *mb, WrapperSubtype subtype)
 {
        WrapperInfo *info;
@@ -3037,7 +2835,7 @@ mono_delegate_end_invoke (MonoDelegate *delegate, gpointer *params)
 
 #ifndef DISABLE_JIT
 
-static void
+void
 mono_mb_emit_restore_result (MonoMethodBuilder *mb, MonoType *return_type)
 {
        MonoType *t = mono_type_get_underlying_type (return_type);
@@ -3178,2712 +2976,1111 @@ mono_marshal_get_delegate_end_invoke (MonoMethod *method)
        return res;
 }
 
-#ifndef DISABLE_REMOTING
-
-static MonoObject *
-mono_remoting_wrapper (MonoMethod *method, gpointer *params)
+typedef struct
 {
-       MonoMethodMessage *msg;
-       MonoTransparentProxy *this;
-       MonoObject *res, *exc;
-       MonoArray *out_args;
-
-       this = *((MonoTransparentProxy **)params [0]);
-
-       g_assert (this);
-       g_assert (((MonoObject *)this)->vtable->klass == mono_defaults.transparent_proxy_class);
-       
-       /* skip the this pointer */
-       params++;
-
-       if (mono_class_is_contextbound (this->remote_class->proxy_class) && this->rp->context == (MonoObject *) mono_context_get ())
-       {
-               int i;
-               MonoMethodSignature *sig = mono_method_signature (method);
-               int count = sig->param_count;
-               gpointer* mparams = (gpointer*) alloca(count*sizeof(gpointer));
-
-               for (i=0; i<count; i++) {
-                       MonoClass *class = mono_class_from_mono_type (sig->params [i]);
-                       if (class->valuetype) {
-                               if (sig->params [i]->byref) {
-                                       mparams[i] = *((gpointer *)params [i]);
-                               } else {
-                                       /* runtime_invoke expects a boxed instance */
-                                       if (mono_class_is_nullable (mono_class_from_mono_type (sig->params [i])))
-                                               mparams[i] = mono_nullable_box (params [i], class);
-                                       else
-                                               mparams[i] = params [i];
-                               }
-                       } else {
-                               mparams[i] = *((gpointer**)params [i]);
-                       }
-               }
+       MonoMethodSignature *sig;
+       MonoMethod *method;
+} SignatureMethodPair;
 
-               return mono_runtime_invoke (method, method->klass->valuetype? mono_object_unbox ((MonoObject*)this): this, mparams, NULL);
-       }
+static guint
+signature_method_pair_hash (gconstpointer data)
+{
+       SignatureMethodPair *pair = (SignatureMethodPair*)data;
 
-       msg = mono_method_call_message_new (method, params, NULL, NULL, NULL);
+       return mono_signature_hash (pair->sig) ^ mono_aligned_addr_hash (pair->method);
+}
 
-       res = mono_remoting_invoke ((MonoObject *)this->rp, msg, &exc, &out_args);
+static gboolean
+signature_method_pair_equal (SignatureMethodPair *pair1, SignatureMethodPair *pair2)
+{
+       return mono_metadata_signature_equal (pair1->sig, pair2->sig) && (pair1->method == pair2->method);
+}
 
-       if (exc)
-               mono_raise_exception ((MonoException *)exc);
+static gboolean
+signature_method_pair_matches_method (gpointer key, gpointer value, gpointer user_data)
+{
+       SignatureMethodPair *pair = (SignatureMethodPair*)key;
+       MonoMethod *method = (MonoMethod*)user_data;
 
-       mono_method_return_message_restore (method, params, out_args);
+       return pair->method == method;
+}
 
-       return res;
-} 
+static void
+free_signature_method_pair (SignatureMethodPair *pair)
+{
+       g_free (pair);
+}
 
-MonoMethod *
-mono_marshal_get_remoting_invoke (MonoMethod *method)
+static MonoMethod *
+mono_marshal_get_delegate_invoke_internal (MonoMethod *method, gboolean callvirt, gboolean static_method_with_first_arg_bound, MonoMethod *target_method)
 {
-       MonoMethodSignature *sig;
+       MonoMethodSignature *sig, *static_sig, *invoke_sig;
+       int i;
        MonoMethodBuilder *mb;
        MonoMethod *res;
-       int params_var;
+       GHashTable *cache;
+       gpointer cache_key = NULL;
+       SignatureMethodPair key;
+       SignatureMethodPair *new_key;
+       int local_prev, local_target;
+       int pos0;
+       char *name;
+       MonoClass *target_class = NULL;
+       gboolean closed_over_null = FALSE;
+       MonoGenericContext *ctx = NULL;
+       MonoGenericContainer *container = NULL;
+       MonoMethod *orig_method = NULL;
+       WrapperInfo *info;
+       WrapperSubtype subtype = WRAPPER_SUBTYPE_NONE;
+       gboolean found;
 
-       g_assert (method);
+       g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
+                 !strcmp (method->name, "Invoke"));
 
-       if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE || method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE)
-               return method;
+       invoke_sig = sig = mono_signature_no_pinvoke (method);
 
-       /* this seems to be the best plase to put this, as all remoting invokes seem to get filtered through here */
-#ifndef DISABLE_COM
-       if (mono_class_is_com_object (method->klass) || method->klass == mono_class_get_com_object_class ()) {
-               MonoVTable *vtable = mono_class_vtable (mono_domain_get (), method->klass);
-               g_assert (vtable); /*FIXME do proper error handling*/
+       /*
+        * If the delegate target is null, and the target method is not static, a virtual 
+        * call is made to that method with the first delegate argument as this. This is 
+        * a non-documented .NET feature.
+        */
+       if (callvirt) {
+               subtype = WRAPPER_SUBTYPE_DELEGATE_INVOKE_VIRTUAL;
+               if (target_method->is_inflated) {
+                       MonoType *target_type;
 
-               if (!mono_vtable_is_remote (vtable)) {
-                       return mono_cominterop_get_invoke (method);
+                       g_assert (method->signature->hasthis);
+                       target_type = mono_class_inflate_generic_type (method->signature->params [0],
+                               mono_method_get_context (method));
+                       target_class = mono_class_from_mono_type (target_type);
+               } else {
+                       target_class = target_method->klass;
                }
-       }
-#endif
 
-       sig = mono_signature_no_pinvoke (method);
-
-       /* we cant remote methods without this pointer */
-       if (!sig->hasthis)
-               return method;
-
-       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_REMOTING_INVOKE)))
-               return res;
+               closed_over_null = sig->param_count == mono_method_signature (target_method)->param_count;
+       }
 
-       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_REMOTING_INVOKE);
+       if (static_method_with_first_arg_bound) {
+               subtype = WRAPPER_SUBTYPE_DELEGATE_INVOKE_BOUND;
+               g_assert (!callvirt);
+               invoke_sig = mono_method_signature (target_method);
+       }
 
-#ifndef DISABLE_JIT
-       mb->method->save_lmf = 1;
+       /*
+        * For generic delegates, create a generic wrapper, and return an instance to help AOT.
+        */
+       if (method->is_inflated && subtype == WRAPPER_SUBTYPE_NONE) {
+               orig_method = method;
+               ctx = &((MonoMethodInflated*)method)->context;
+               method = ((MonoMethodInflated*)method)->declaring;
 
-       params_var = mono_mb_emit_save_args (mb, sig, TRUE);
+               container = mono_method_get_generic_container (method);
+               if (!container)
+                       container = method->klass->generic_container;
+               g_assert (container);
 
-       mono_mb_emit_ptr (mb, method);
-       mono_mb_emit_ldloc (mb, params_var);
-       mono_mb_emit_icall (mb, mono_remoting_wrapper);
-       emit_thread_interrupt_checkpoint (mb);
-
-       if (sig->ret->type == MONO_TYPE_VOID) {
-               mono_mb_emit_byte (mb, CEE_POP);
-               mono_mb_emit_byte (mb, CEE_RET);
-       } else {
-                mono_mb_emit_restore_result (mb, sig->ret);
-       }
-#endif
-
-       res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
-       mono_mb_free (mb);
-
-       return res;
-}
-
-#endif /* DISABLE_REMOTING */
-
-
-/* mono_get_xdomain_marshal_type()
- * Returns the kind of marshalling that a type needs for cross domain calls.
- */
-static MonoXDomainMarshalType
-mono_get_xdomain_marshal_type (MonoType *t)
-{
-       switch (t->type) {
-       case MONO_TYPE_VOID:
-               g_assert_not_reached ();
-               break;
-       case MONO_TYPE_U1:
-       case MONO_TYPE_I1:
-       case MONO_TYPE_BOOLEAN:
-       case MONO_TYPE_U2:
-       case MONO_TYPE_I2:
-       case MONO_TYPE_CHAR:
-       case MONO_TYPE_U4:
-       case MONO_TYPE_I4:
-       case MONO_TYPE_I8:
-       case MONO_TYPE_U8:
-       case MONO_TYPE_R4:
-       case MONO_TYPE_R8:
-               return MONO_MARSHAL_NONE;
-       case MONO_TYPE_STRING:
-               return MONO_MARSHAL_COPY;
-       case MONO_TYPE_ARRAY:
-       case MONO_TYPE_SZARRAY: {
-               MonoClass *elem_class = mono_class_from_mono_type (t)->element_class;
-               if (mono_get_xdomain_marshal_type (&(elem_class->byval_arg)) != MONO_MARSHAL_SERIALIZE)
-                       return MONO_MARSHAL_COPY;
-               break;
-       }
-       }
-
-       return MONO_MARSHAL_SERIALIZE;
-}
-
-
-/* mono_marshal_xdomain_copy_value
- * Makes a copy of "val" suitable for the current domain.
- */
-MonoObject *
-mono_marshal_xdomain_copy_value (MonoObject *val)
-{
-       MonoDomain *domain;
-       if (val == NULL) return NULL;
-
-       domain = mono_domain_get ();
-
-       switch (mono_object_class (val)->byval_arg.type) {
-       case MONO_TYPE_VOID:
-               g_assert_not_reached ();
-               break;
-       case MONO_TYPE_U1:
-       case MONO_TYPE_I1:
-       case MONO_TYPE_BOOLEAN:
-       case MONO_TYPE_U2:
-       case MONO_TYPE_I2:
-       case MONO_TYPE_CHAR:
-       case MONO_TYPE_U4:
-       case MONO_TYPE_I4:
-       case MONO_TYPE_I8:
-       case MONO_TYPE_U8:
-       case MONO_TYPE_R4:
-       case MONO_TYPE_R8: {
-               return mono_value_box (domain, mono_object_class (val), ((char*)val) + sizeof(MonoObject));
-       }
-       case MONO_TYPE_STRING: {
-               MonoString *str = (MonoString *) val;
-               return (MonoObject *) mono_string_new_utf16 (domain, mono_string_chars (str), mono_string_length (str));
-       }
-       case MONO_TYPE_ARRAY:
-       case MONO_TYPE_SZARRAY: {
-               MonoArray *acopy;
-               MonoXDomainMarshalType mt = mono_get_xdomain_marshal_type (&(mono_object_class (val)->element_class->byval_arg));
-               if (mt == MONO_MARSHAL_SERIALIZE) return NULL;
-               acopy = mono_array_clone_in_domain (domain, (MonoArray *) val);
-               if (mt == MONO_MARSHAL_COPY) {
-                       int i, len = mono_array_length (acopy);
-                       for (i = 0; i < len; i++) {
-                               MonoObject *item = mono_array_get (acopy, gpointer, i);
-                               mono_array_setref (acopy, i, mono_marshal_xdomain_copy_value (item));
-                       }
-               }
-               return (MonoObject *) acopy;
-       }
-       }
-
-       if (mono_object_class (val) == mono_defaults.stringbuilder_class) {
-               MonoStringBuilder *oldsb = (MonoStringBuilder *) val;
-               MonoStringBuilder *newsb = (MonoStringBuilder *) mono_object_new (domain, mono_defaults.stringbuilder_class);
-               MONO_OBJECT_SETREF (newsb, str, mono_string_new_utf16 (domain, mono_string_chars (oldsb->str), mono_string_length (oldsb->str)));
-               newsb->length = oldsb->length;
-               newsb->max_capacity = (gint32)0x7fffffff;
-               return (MonoObject *) newsb;
-       }
-       return NULL;
-}
-
-/* mono_marshal_xdomain_copy_out_value()
- * Copies the contents of the src instance into the dst instance. src and dst
- * must have the same type, and if they are arrays, the same size.
- */
-static void
-mono_marshal_xdomain_copy_out_value (MonoObject *src, MonoObject *dst)
-{
-       if (src == NULL || dst == NULL) return;
-       
-       g_assert (mono_object_class (src) == mono_object_class (dst));
-
-       switch (mono_object_class (src)->byval_arg.type) {
-       case MONO_TYPE_ARRAY:
-       case MONO_TYPE_SZARRAY: {
-               int mt = mono_get_xdomain_marshal_type (&(mono_object_class (src)->element_class->byval_arg));
-               if (mt == MONO_MARSHAL_SERIALIZE) return;
-               if (mt == MONO_MARSHAL_COPY) {
-                       int i, len = mono_array_length ((MonoArray *)dst);
-                       for (i = 0; i < len; i++) {
-                               MonoObject *item = mono_array_get ((MonoArray *)src, gpointer, i);
-                               mono_array_setref ((MonoArray *)dst, i, mono_marshal_xdomain_copy_value (item));
-                       }
-               } else {
-                       mono_array_full_copy ((MonoArray *)src, (MonoArray *)dst);
-               }
-               return;
-       }
-       }
-
-       if (mono_object_class (src) == mono_defaults.stringbuilder_class) {
-               MonoStringBuilder *src_sb = (MonoStringBuilder *) src;
-               MonoStringBuilder *dst_sb = (MonoStringBuilder *) dst;
-       
-               MONO_OBJECT_SETREF (dst_sb, str, mono_string_new_utf16 (mono_object_domain (dst), mono_string_chars (src_sb->str), mono_string_length (src_sb->str)));
-               dst_sb->cached_str = NULL;
-               dst_sb->length = src_sb->length;
-       }
-}
-
-
-#if !(defined (DISABLE_JIT) || defined (DISABLE_REMOTING))
-
-static void
-mono_marshal_emit_xdomain_copy_value (MonoMethodBuilder *mb, MonoClass *pclass)
-{
-       mono_mb_emit_icall (mb, mono_marshal_xdomain_copy_value);
-       mono_mb_emit_op (mb, CEE_CASTCLASS, pclass);
-}
-
-static void
-mono_marshal_emit_xdomain_copy_out_value (MonoMethodBuilder *mb, MonoClass *pclass)
-{
-       mono_mb_emit_icall (mb, mono_marshal_xdomain_copy_out_value);
-}
-#endif
-
-#ifndef DISABLE_REMOTING
-/* mono_marshal_supports_fast_xdomain()
- * Returns TRUE if the method can use the fast xdomain wrapper.
- */
-static gboolean
-mono_marshal_supports_fast_xdomain (MonoMethod *method)
-{
-       return !mono_class_is_contextbound (method->klass) &&
-                  !((method->flags & METHOD_ATTRIBUTE_SPECIAL_NAME) && (strcmp (".ctor", method->name) == 0));
-}
-#endif
-
-static gint32
-mono_marshal_set_domain_by_id (gint32 id, MonoBoolean push)
-{
-       MonoDomain *current_domain = mono_domain_get ();
-       MonoDomain *domain = mono_domain_get_by_id (id);
-
-       if (!domain || !mono_domain_set (domain, FALSE))        
-               mono_raise_exception (mono_get_exception_appdomain_unloaded ());
-
-       if (push)
-               mono_thread_push_appdomain_ref (domain);
-       else
-               mono_thread_pop_appdomain_ref ();
-
-       return current_domain->domain_id;
-}
-
-#if !(defined (DISABLE_JIT) || defined (DISABLE_REMOTING))
-static void
-mono_marshal_emit_switch_domain (MonoMethodBuilder *mb)
-{
-       mono_mb_emit_icall (mb, mono_marshal_set_domain_by_id);
-}
-
-/* mono_marshal_emit_load_domain_method ()
- * Loads into the stack a pointer to the code of the provided method for
- * the current domain.
- */
-static void
-mono_marshal_emit_load_domain_method (MonoMethodBuilder *mb, MonoMethod *method)
-{
-       /* We need a pointer to the method for the running domain (not the domain
-        * that compiles the method).
-        */
-       mono_mb_emit_ptr (mb, method);
-       mono_mb_emit_icall (mb, mono_compile_method);
-}
-#endif
-
-/* mono_marshal_check_domain_image ()
- * Returns TRUE if the image is loaded in the specified
- * application domain.
- */
-static gboolean
-mono_marshal_check_domain_image (gint32 domain_id, MonoImage *image)
-{
-       MonoAssembly* ass;
-       GSList *tmp;
-       
-       MonoDomain *domain = mono_domain_get_by_id (domain_id);
-       if (!domain)
-               return FALSE;
-       
-       mono_domain_assemblies_lock (domain);
-       for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               ass = tmp->data;
-               if (ass->image == image)
-                       break;
-       }
-       mono_domain_assemblies_unlock (domain);
-       
-       return tmp != NULL;
-}
-
-#ifndef DISABLE_REMOTING
-
-/* mono_marshal_get_xappdomain_dispatch ()
- * Generates a method that dispatches a method call from another domain into
- * the current domain.
- */
-static MonoMethod *
-mono_marshal_get_xappdomain_dispatch (MonoMethod *method, int *marshal_types, int complex_count, int complex_out_count, int ret_marshal_type)
-{
-       MonoMethodSignature *sig, *csig;
-       MonoMethodBuilder *mb;
-       MonoMethod *res;
-       int i, j, param_index, copy_locals_base;
-       MonoClass *ret_class = NULL;
-       int loc_array=0, loc_return=0, loc_serialized_exc=0;
-       MonoExceptionClause *main_clause;
-       int pos, pos_leave;
-       gboolean copy_return;
-
-       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_XDOMAIN_DISPATCH)))
-               return res;
-
-       sig = mono_method_signature (method);
-       copy_return = (sig->ret->type != MONO_TYPE_VOID && ret_marshal_type != MONO_MARSHAL_SERIALIZE);
-
-       j = 0;
-       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3 + sig->param_count - complex_count);
-       csig->params [j++] = &mono_defaults.object_class->byval_arg;
-       csig->params [j++] = &byte_array_class->this_arg;
-       csig->params [j++] = &byte_array_class->this_arg;
-       for (i = 0; i < sig->param_count; i++) {
-               if (marshal_types [i] != MONO_MARSHAL_SERIALIZE)
-                       csig->params [j++] = sig->params [i];
-       }
-       if (copy_return)
-               csig->ret = sig->ret;
-       else
-               csig->ret = &mono_defaults.void_class->byval_arg;
-       csig->pinvoke = 1;
-       csig->hasthis = FALSE;
-
-       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_XDOMAIN_DISPATCH);
-       mb->method->save_lmf = 1;
-
-#ifndef DISABLE_JIT
-       /* Locals */
-
-       loc_serialized_exc = mono_mb_add_local (mb, &byte_array_class->byval_arg);
-       if (complex_count > 0)
-               loc_array = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-       if (sig->ret->type != MONO_TYPE_VOID) {
-               loc_return = mono_mb_add_local (mb, sig->ret);
-               ret_class = mono_class_from_mono_type (sig->ret);
-       }
-
-       /* try */
-
-       main_clause = mono_image_alloc0 (method->klass->image, sizeof (MonoExceptionClause));
-       main_clause->try_offset = mono_mb_get_label (mb);
-
-       /* Clean the call context */
-
-       mono_mb_emit_byte (mb, CEE_LDNULL);
-       mono_mb_emit_managed_call (mb, method_set_call_context, NULL);
-       mono_mb_emit_byte (mb, CEE_POP);
-
-       /* Deserialize call data */
-
-       mono_mb_emit_ldarg (mb, 1);
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_byte (mb, CEE_DUP);
-       pos = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
-       
-       mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
-       mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
-       
-       if (complex_count > 0)
-               mono_mb_emit_stloc (mb, loc_array);
-       else
-               mono_mb_emit_byte (mb, CEE_POP);
-
-       mono_mb_patch_short_branch (mb, pos);
-
-       /* Get the target object */
-       
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_managed_call (mb, method_rs_appdomain_target, NULL);
-
-       /* Load the arguments */
-       
-       copy_locals_base = mb->locals;
-       param_index = 3;        // Index of the first non-serialized parameter of this wrapper
-       j = 0;
-       for (i = 0; i < sig->param_count; i++) {
-               MonoType *pt = sig->params [i];
-               MonoClass *pclass = mono_class_from_mono_type (pt);
-               switch (marshal_types [i]) {
-               case MONO_MARSHAL_SERIALIZE: {
-                       /* take the value from the serialized array */
-                       mono_mb_emit_ldloc (mb, loc_array);
-                       mono_mb_emit_icon (mb, j++);
-                       if (pt->byref) {
-                               if (pclass->valuetype) {
-                                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
-                                       mono_mb_emit_op (mb, CEE_UNBOX, pclass);
-                               } else {
-                                       mono_mb_emit_op (mb, CEE_LDELEMA, pclass);
-                               }
-                       } else {
-                               if (pclass->valuetype) {
-                                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
-                                       mono_mb_emit_op (mb, CEE_UNBOX, pclass);
-                                       mono_mb_emit_op (mb, CEE_LDOBJ, pclass);
-                               } else {
-                                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
-                                       if (pclass != mono_defaults.object_class) {
-                                               mono_mb_emit_op (mb, CEE_CASTCLASS, pclass);
-                                       }
-                               }
-                       }
-                       break;
-               }
-               case MONO_MARSHAL_COPY_OUT: {
-                       /* Keep a local copy of the value since we need to copy it back after the call */
-                       int copy_local = mono_mb_add_local (mb, &(pclass->byval_arg));
-                       mono_mb_emit_ldarg (mb, param_index++);
-                       mono_marshal_emit_xdomain_copy_value (mb, pclass);
-                       mono_mb_emit_byte (mb, CEE_DUP);
-                       mono_mb_emit_stloc (mb, copy_local);
-                       break;
-               }
-               case MONO_MARSHAL_COPY: {
-                       mono_mb_emit_ldarg (mb, param_index);
-                       if (pt->byref) {
-                               mono_mb_emit_byte (mb, CEE_DUP);
-                               mono_mb_emit_byte (mb, CEE_DUP);
-                               mono_mb_emit_byte (mb, CEE_LDIND_REF);
-                               mono_marshal_emit_xdomain_copy_value (mb, pclass);
-                               mono_mb_emit_byte (mb, CEE_STIND_REF);
-                       } else {
-                               mono_marshal_emit_xdomain_copy_value (mb, pclass);
-                       }
-                       param_index++;
-                       break;
-               }
-               case MONO_MARSHAL_NONE:
-                       mono_mb_emit_ldarg (mb, param_index++);
-                       break;
-               }
-       }
-
-       /* Make the call to the real object */
-
-       emit_thread_force_interrupt_checkpoint (mb);
-       
-       mono_mb_emit_op (mb, CEE_CALLVIRT, method);
-
-       if (sig->ret->type != MONO_TYPE_VOID)
-               mono_mb_emit_stloc (mb, loc_return);
-
-       /* copy back MONO_MARSHAL_COPY_OUT parameters */
-
-       j = 0;
-       param_index = 3;
-       for (i = 0; i < sig->param_count; i++) {
-               if (marshal_types [i] == MONO_MARSHAL_SERIALIZE) continue;
-               if (marshal_types [i] == MONO_MARSHAL_COPY_OUT) {
-                       mono_mb_emit_ldloc (mb, copy_locals_base + (j++));
-                       mono_mb_emit_ldarg (mb, param_index);
-                       mono_marshal_emit_xdomain_copy_out_value (mb, mono_class_from_mono_type (sig->params [i]));
-               }
-               param_index++;
-       }
-
-       /* Serialize the return values */
-       
-       if (complex_out_count > 0) {
-               /* Reset parameters in the array that don't need to be serialized back */
-               j = 0;
-               for (i = 0; i < sig->param_count; i++) {
-                       if (marshal_types[i] != MONO_MARSHAL_SERIALIZE) continue;
-                       if (!sig->params [i]->byref) {
-                               mono_mb_emit_ldloc (mb, loc_array);
-                               mono_mb_emit_icon (mb, j);
-                               mono_mb_emit_byte (mb, CEE_LDNULL);
-                               mono_mb_emit_byte (mb, CEE_STELEM_REF);
-                       }
-                       j++;
-               }
-       
-               /* Add the return value to the array */
-       
-               if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
-                       mono_mb_emit_ldloc (mb, loc_array);
-                       mono_mb_emit_icon (mb, complex_count);  /* The array has an additional slot to hold the ret value */
-                       mono_mb_emit_ldloc (mb, loc_return);
-
-                       g_assert (ret_class); /*FIXME properly fail here*/
-                       if (ret_class->valuetype) {
-                               mono_mb_emit_op (mb, CEE_BOX, ret_class);
-                       }
-                       mono_mb_emit_byte (mb, CEE_STELEM_REF);
-               }
-       
-               /* Serialize */
-       
-               mono_mb_emit_ldarg (mb, 1);
-               mono_mb_emit_ldloc (mb, loc_array);
-               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
-               mono_mb_emit_byte (mb, CEE_STIND_REF);
-       } else if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
-               mono_mb_emit_ldarg (mb, 1);
-               mono_mb_emit_ldloc (mb, loc_return);
-               if (ret_class->valuetype) {
-                       mono_mb_emit_op (mb, CEE_BOX, ret_class);
-               }
-               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
-               mono_mb_emit_byte (mb, CEE_STIND_REF);
-       } else {
-               mono_mb_emit_ldarg (mb, 1);
-               mono_mb_emit_byte (mb, CEE_LDNULL);
-               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
-               mono_mb_emit_byte (mb, CEE_STIND_REF);
-       }
-
-       mono_mb_emit_ldarg (mb, 2);
-       mono_mb_emit_byte (mb, CEE_LDNULL);
-       mono_mb_emit_byte (mb, CEE_STIND_REF);
-       pos_leave = mono_mb_emit_branch (mb, CEE_LEAVE);
-
-       /* Main exception catch */
-       main_clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
-       main_clause->try_len = mono_mb_get_pos (mb) - main_clause->try_offset;
-       main_clause->data.catch_class = mono_defaults.object_class;
-       
-       /* handler code */
-       main_clause->handler_offset = mono_mb_get_label (mb);
-       mono_mb_emit_managed_call (mb, method_rs_serialize_exc, NULL);
-       mono_mb_emit_stloc (mb, loc_serialized_exc);
-       mono_mb_emit_ldarg (mb, 2);
-       mono_mb_emit_ldloc (mb, loc_serialized_exc);
-       mono_mb_emit_byte (mb, CEE_STIND_REF);
-       mono_mb_emit_branch (mb, CEE_LEAVE);
-       main_clause->handler_len = mono_mb_get_pos (mb) - main_clause->handler_offset;
-       /* end catch */
-
-       mono_mb_patch_branch (mb, pos_leave);
-       
-       if (copy_return)
-               mono_mb_emit_ldloc (mb, loc_return);
-
-       mono_mb_emit_byte (mb, CEE_RET);
-
-       mono_mb_set_clauses (mb, 1, main_clause);
-#endif
-
-       res = mono_remoting_mb_create_and_cache (method, mb, csig, csig->param_count + 16);
-       mono_mb_free (mb);
-
-       return res;
-}
-
-/* mono_marshal_get_xappdomain_invoke ()
- * Generates a fast remoting wrapper for cross app domain calls.
- */
-MonoMethod *
-mono_marshal_get_xappdomain_invoke (MonoMethod *method)
-{
-       MonoMethodSignature *sig;
-       MonoMethodBuilder *mb;
-       MonoMethod *res;
-       int i, j, complex_count, complex_out_count, copy_locals_base;
-       int *marshal_types;
-       MonoClass *ret_class = NULL;
-       MonoMethod *xdomain_method;
-       int ret_marshal_type = MONO_MARSHAL_NONE;
-       int loc_array=0, loc_serialized_data=-1, loc_real_proxy;
-       int loc_old_domainid, loc_domainid, loc_return=0, loc_serialized_exc=0, loc_context;
-       int pos, pos_dispatch, pos_noex;
-       gboolean copy_return = FALSE;
-
-       g_assert (method);
-       
-       if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE || method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE)
-               return method;
-
-       /* we cant remote methods without this pointer */
-       if (!mono_method_signature (method)->hasthis)
-               return method;
-
-       if (!mono_marshal_supports_fast_xdomain (method))
-               return mono_marshal_get_remoting_invoke (method);
-       
-       mono_remoting_marshal_init ();
-
-       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_XDOMAIN_INVOKE)))
-               return res;
-       
-       sig = mono_signature_no_pinvoke (method);
-
-       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_XDOMAIN_INVOKE);
-       mb->method->save_lmf = 1;
-
-       /* Count the number of parameters that need to be serialized */
-
-       marshal_types = alloca (sizeof (int) * sig->param_count);
-       complex_count = complex_out_count = 0;
-       for (i = 0; i < sig->param_count; i++) {
-               MonoType *ptype = sig->params[i];
-               int mt = mono_get_xdomain_marshal_type (ptype);
-               
-               /* If the [Out] attribute is applied to a parameter that can be internally copied,
-                * the copy will be made by reusing the original object instance
-                */
-               if ((ptype->attrs & PARAM_ATTRIBUTE_OUT) != 0 && mt == MONO_MARSHAL_COPY && !ptype->byref)
-                       mt = MONO_MARSHAL_COPY_OUT;
-               else if (mt == MONO_MARSHAL_SERIALIZE) {
-                       complex_count++;
-                       if (ptype->byref) complex_out_count++;
-               }
-               marshal_types [i] = mt;
-       }
-
-       if (sig->ret->type != MONO_TYPE_VOID) {
-               ret_marshal_type = mono_get_xdomain_marshal_type (sig->ret);
-               ret_class = mono_class_from_mono_type (sig->ret);
-               copy_return = ret_marshal_type != MONO_MARSHAL_SERIALIZE;
-       }
-       
-       /* Locals */
-
-#ifndef DISABLE_JIT
-       if (complex_count > 0)
-               loc_array = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-       loc_serialized_data = mono_mb_add_local (mb, &byte_array_class->byval_arg);
-       loc_real_proxy = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-       if (copy_return)
-               loc_return = mono_mb_add_local (mb, sig->ret);
-       loc_old_domainid = mono_mb_add_local (mb, &mono_defaults.int32_class->byval_arg);
-       loc_domainid = mono_mb_add_local (mb, &mono_defaults.int32_class->byval_arg);
-       loc_serialized_exc = mono_mb_add_local (mb, &byte_array_class->byval_arg);
-       loc_context = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-
-       /* Save thread domain data */
-
-       mono_mb_emit_icall (mb, mono_context_get);
-       mono_mb_emit_byte (mb, CEE_DUP);
-       mono_mb_emit_stloc (mb, loc_context);
-
-       /* If the thread is not running in the default context, it needs to go
-        * through the whole remoting sink, since the context is going to change
-        */
-       mono_mb_emit_managed_call (mb, method_needs_context_sink, NULL);
-       pos = mono_mb_emit_short_branch (mb, CEE_BRTRUE_S);
-       
-       /* Another case in which the fast path can't be used: when the target domain
-        * has a different image for the same assembly.
-        */
-
-       /* Get the target domain id */
-
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_byte (mb, CEE_DUP);
-       mono_mb_emit_stloc (mb, loc_real_proxy);
-
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, target_domain_id));
-       mono_mb_emit_byte (mb, CEE_LDIND_I4);
-       mono_mb_emit_stloc (mb, loc_domainid);
-
-       /* Check if the target domain has the same image for the required assembly */
-
-       mono_mb_emit_ldloc (mb, loc_domainid);
-       mono_mb_emit_ptr (mb, method->klass->image);
-       mono_mb_emit_icall (mb, mono_marshal_check_domain_image);
-       pos_dispatch = mono_mb_emit_short_branch (mb, CEE_BRTRUE_S);
-
-       /* Use the whole remoting sink to dispatch this message */
-
-       mono_mb_patch_short_branch (mb, pos);
-
-       mono_mb_emit_ldarg (mb, 0);
-       for (i = 0; i < sig->param_count; i++)
-               mono_mb_emit_ldarg (mb, i + 1);
-       
-       mono_mb_emit_managed_call (mb, mono_marshal_get_remoting_invoke (method), NULL);
-       mono_mb_emit_byte (mb, CEE_RET);
-       mono_mb_patch_short_branch (mb, pos_dispatch);
-
-       /* Create the array that will hold the parameters to be serialized */
-
-       if (complex_count > 0) {
-               mono_mb_emit_icon (mb, (ret_marshal_type == MONO_MARSHAL_SERIALIZE && complex_out_count > 0) ? complex_count + 1 : complex_count);      /* +1 for the return type */
-               mono_mb_emit_op (mb, CEE_NEWARR, mono_defaults.object_class);
-       
-               j = 0;
-               for (i = 0; i < sig->param_count; i++) {
-                       MonoClass *pclass;
-                       if (marshal_types [i] != MONO_MARSHAL_SERIALIZE) continue;
-                       pclass = mono_class_from_mono_type (sig->params[i]);
-                       mono_mb_emit_byte (mb, CEE_DUP);
-                       mono_mb_emit_icon (mb, j);
-                       mono_mb_emit_ldarg (mb, i + 1);         /* 0=this */
-                       if (sig->params[i]->byref) {
-                               if (pclass->valuetype)
-                                       mono_mb_emit_op (mb, CEE_LDOBJ, pclass);
-                               else
-                                       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-                       }
-                       if (pclass->valuetype)
-                               mono_mb_emit_op (mb, CEE_BOX, pclass);
-                       mono_mb_emit_byte (mb, CEE_STELEM_REF);
-                       j++;
-               }
-               mono_mb_emit_stloc (mb, loc_array);
-
-               /* Serialize parameters */
-       
-               mono_mb_emit_ldloc (mb, loc_array);
-               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
-               mono_mb_emit_stloc (mb, loc_serialized_data);
-       } else {
-               mono_mb_emit_byte (mb, CEE_LDNULL);
-               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
-               mono_mb_emit_stloc (mb, loc_serialized_data);
-       }
-
-       /* switch domain */
-
-       mono_mb_emit_ldloc (mb, loc_domainid);
-       mono_mb_emit_byte (mb, CEE_LDC_I4_1);
-       mono_marshal_emit_switch_domain (mb);
-       mono_mb_emit_stloc (mb, loc_old_domainid);
-
-       /* Load the arguments */
-       
-       mono_mb_emit_ldloc (mb, loc_real_proxy);
-       mono_mb_emit_ldloc_addr (mb, loc_serialized_data);
-       mono_mb_emit_ldloc_addr (mb, loc_serialized_exc);
-
-       copy_locals_base = mb->locals;
-       for (i = 0; i < sig->param_count; i++) {
-               switch (marshal_types [i]) {
-               case MONO_MARSHAL_SERIALIZE:
-                       continue;
-               case MONO_MARSHAL_COPY: {
-                       mono_mb_emit_ldarg (mb, i+1);
-                       if (sig->params [i]->byref) {
-                               /* make a local copy of the byref parameter. The real parameter
-                                * will be updated after the xdomain call
-                                */
-                               MonoClass *pclass = mono_class_from_mono_type (sig->params [i]);
-                               int copy_local = mono_mb_add_local (mb, &(pclass->byval_arg));
-                               mono_mb_emit_byte (mb, CEE_LDIND_REF);
-                               mono_mb_emit_stloc (mb, copy_local);
-                               mono_mb_emit_ldloc_addr (mb, copy_local);
-                       }
-                       break;
-               }
-               case MONO_MARSHAL_COPY_OUT:
-               case MONO_MARSHAL_NONE:
-                       mono_mb_emit_ldarg (mb, i+1);
-                       break;
-               }
-       }
-
-       /* Make the call to the invoke wrapper in the target domain */
-
-       xdomain_method = mono_marshal_get_xappdomain_dispatch (method, marshal_types, complex_count, complex_out_count, ret_marshal_type);
-       mono_marshal_emit_load_domain_method (mb, xdomain_method);
-       mono_mb_emit_calli (mb, mono_method_signature (xdomain_method));
-
-       if (copy_return)
-               mono_mb_emit_stloc (mb, loc_return);
-
-       /* Switch domain */
-
-       mono_mb_emit_ldloc (mb, loc_old_domainid);
-       mono_mb_emit_byte (mb, CEE_LDC_I4_0);
-       mono_marshal_emit_switch_domain (mb);
-       mono_mb_emit_byte (mb, CEE_POP);
-       
-       /* Restore thread domain data */
-       
-       mono_mb_emit_ldloc (mb, loc_context);
-       mono_mb_emit_icall (mb, mono_context_set);
-       
-       /* if (loc_serialized_exc != null) ... */
-
-       mono_mb_emit_ldloc (mb, loc_serialized_exc);
-       pos_noex = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
-
-       mono_mb_emit_ldloc (mb, loc_serialized_exc);
-       mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
-       mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
-       mono_mb_emit_op (mb, CEE_CASTCLASS, mono_defaults.exception_class);
-       mono_mb_emit_managed_call (mb, method_exc_fixexc, NULL);
-       mono_mb_emit_byte (mb, CEE_THROW);
-       mono_mb_patch_short_branch (mb, pos_noex);
-
-       /* copy back non-serialized output parameters */
-
-       j = 0;
-       for (i = 0; i < sig->param_count; i++) {
-               if (!sig->params [i]->byref || marshal_types [i] != MONO_MARSHAL_COPY) continue;
-               mono_mb_emit_ldarg (mb, i + 1);
-               mono_mb_emit_ldloc (mb, copy_locals_base + (j++));
-               mono_marshal_emit_xdomain_copy_value (mb, mono_class_from_mono_type (sig->params [i]));
-               mono_mb_emit_byte (mb, CEE_STIND_REF);
-       }
-
-       /* Deserialize out parameters */
-
-       if (complex_out_count > 0) {
-               mono_mb_emit_ldloc (mb, loc_serialized_data);
-               mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
-               mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
-               mono_mb_emit_stloc (mb, loc_array);
-       
-               /* Copy back output parameters and return type */
-               
-               j = 0;
-               for (i = 0; i < sig->param_count; i++) {
-                       if (marshal_types [i] != MONO_MARSHAL_SERIALIZE) continue;
-                       if (sig->params[i]->byref) {
-                               MonoClass *pclass = mono_class_from_mono_type (sig->params [i]);
-                               mono_mb_emit_ldarg (mb, i + 1);
-                               mono_mb_emit_ldloc (mb, loc_array);
-                               mono_mb_emit_icon (mb, j);
-                               mono_mb_emit_byte (mb, CEE_LDELEM_REF);
-                               if (pclass->valuetype) {
-                                       mono_mb_emit_op (mb, CEE_UNBOX, pclass);
-                                       mono_mb_emit_op (mb, CEE_LDOBJ, pclass);
-                                       mono_mb_emit_op (mb, CEE_STOBJ, pclass);
-                               } else {
-                                       if (pclass != mono_defaults.object_class)
-                                               mono_mb_emit_op (mb, CEE_CASTCLASS, pclass);
-                                       mono_mb_emit_byte (mb, CEE_STIND_REF);
-                               }
-                       }
-                       j++;
-               }
-       
-               if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
-                       mono_mb_emit_ldloc (mb, loc_array);
-                       mono_mb_emit_icon (mb, complex_count);
-                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
-                       if (ret_class->valuetype) {
-                               mono_mb_emit_op (mb, CEE_UNBOX, ret_class);
-                               mono_mb_emit_op (mb, CEE_LDOBJ, ret_class);
-                       }
-               }
-       } else if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
-               mono_mb_emit_ldloc (mb, loc_serialized_data);
-               mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
-               mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
-               if (ret_class->valuetype) {
-                       mono_mb_emit_op (mb, CEE_UNBOX, ret_class);
-                       mono_mb_emit_op (mb, CEE_LDOBJ, ret_class);
-               } else if (ret_class != mono_defaults.object_class) {
-                       mono_mb_emit_op (mb, CEE_CASTCLASS, ret_class);
-               }
-       } else {
-               mono_mb_emit_ldloc (mb, loc_serialized_data);
-               mono_mb_emit_byte (mb, CEE_DUP);
-               pos = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
-               mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
-       
-               mono_mb_patch_short_branch (mb, pos);
-               mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
-               mono_mb_emit_byte (mb, CEE_POP);
-       }
-
-       if (copy_return) {
-               mono_mb_emit_ldloc (mb, loc_return);
-               if (ret_marshal_type == MONO_MARSHAL_COPY)
-                       mono_marshal_emit_xdomain_copy_value (mb, ret_class);
-       }
-
-       mono_mb_emit_byte (mb, CEE_RET);
-#endif /* DISABLE_JIT */
-
-       res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
-       mono_mb_free (mb);
-
-       return res;
-}
-
-MonoMethod *
-mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTarget target_type)
-{
-       if (target_type == MONO_REMOTING_TARGET_APPDOMAIN) {
-               return mono_marshal_get_xappdomain_invoke (method);
-       } else if (target_type == MONO_REMOTING_TARGET_COMINTEROP) {
-#ifndef DISABLE_COM
-               return mono_cominterop_get_invoke (method);
-#else
-               g_assert_not_reached ();
-#endif
-       } else {
-               return mono_marshal_get_remoting_invoke (method);
-       }
-       /* Not erached */
-       return NULL;
-}
-
-G_GNUC_UNUSED static gpointer
-mono_marshal_load_remoting_wrapper (MonoRealProxy *rp, MonoMethod *method)
-{
-       if (rp->target_domain_id != -1)
-               return mono_compile_method (mono_marshal_get_xappdomain_invoke (method));
-       else
-               return mono_compile_method (mono_marshal_get_remoting_invoke (method));
-}
-
-MonoMethod *
-mono_marshal_get_remoting_invoke_with_check (MonoMethod *method)
-{
-       MonoMethodSignature *sig;
-       MonoMethodBuilder *mb;
-       MonoMethod *res, *native;
-       int i, pos, pos_rem;
-
-       g_assert (method);
-
-       if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)
-               return method;
-
-       /* we cant remote methods without this pointer */
-       g_assert (mono_method_signature (method)->hasthis);
-
-       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)))
-               return res;
-
-       sig = mono_signature_no_pinvoke (method);
-       
-       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK);
-
-#ifndef DISABLE_JIT
-       for (i = 0; i <= sig->param_count; i++)
-               mono_mb_emit_ldarg (mb, i);
-       
-       mono_mb_emit_ldarg (mb, 0);
-       pos = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
-
-       if (mono_marshal_supports_fast_xdomain (method)) {
-               mono_mb_emit_ldarg (mb, 0);
-               pos_rem = mono_mb_emit_xdomain_check (mb, CEE_BEQ);
-               
-               /* wrapper for cross app domain calls */
-               native = mono_marshal_get_xappdomain_invoke (method);
-               mono_mb_emit_managed_call (mb, native, mono_method_signature (native));
-               mono_mb_emit_byte (mb, CEE_RET);
-               
-               mono_mb_patch_branch (mb, pos_rem);
-       }
-       /* wrapper for normal remote calls */
-       native = mono_marshal_get_remoting_invoke (method);
-       mono_mb_emit_managed_call (mb, native, mono_method_signature (native));
-       mono_mb_emit_byte (mb, CEE_RET);
-
-       /* not a proxy */
-       mono_mb_patch_branch (mb, pos);
-       mono_mb_emit_managed_call (mb, method, mono_method_signature (method));
-       mono_mb_emit_byte (mb, CEE_RET);
-#endif
-
-       res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
-       mono_mb_free (mb);
-
-       return res;
-}
-
-#endif /* DISABLE_REMOTING */
-
-typedef struct
-{
-       MonoMethodSignature *sig;
-       MonoMethod *method;
-} SignatureMethodPair;
-
-static guint
-signature_method_pair_hash (gconstpointer data)
-{
-       SignatureMethodPair *pair = (SignatureMethodPair*)data;
-
-       return mono_signature_hash (pair->sig) ^ mono_aligned_addr_hash (pair->method);
-}
-
-static gboolean
-signature_method_pair_equal (SignatureMethodPair *pair1, SignatureMethodPair *pair2)
-{
-       return mono_metadata_signature_equal (pair1->sig, pair2->sig) && (pair1->method == pair2->method);
-}
-
-static gboolean
-signature_method_pair_matches_method (gpointer key, gpointer value, gpointer user_data)
-{
-       SignatureMethodPair *pair = (SignatureMethodPair*)key;
-       MonoMethod *method = (MonoMethod*)user_data;
-
-       return pair->method == method;
-}
-
-static void
-free_signature_method_pair (SignatureMethodPair *pair)
-{
-       g_free (pair);
-}
-
-static MonoMethod *
-mono_marshal_get_delegate_invoke_internal (MonoMethod *method, gboolean callvirt, gboolean static_method_with_first_arg_bound, MonoMethod *target_method)
-{
-       MonoMethodSignature *sig, *static_sig, *invoke_sig;
-       int i;
-       MonoMethodBuilder *mb;
-       MonoMethod *res;
-       GHashTable *cache;
-       gpointer cache_key = NULL;
-       SignatureMethodPair key;
-       SignatureMethodPair *new_key;
-       int local_prev, local_target;
-       int pos0;
-       char *name;
-       MonoClass *target_class = NULL;
-       gboolean closed_over_null = FALSE;
-       MonoGenericContext *ctx = NULL;
-       MonoGenericContainer *container = NULL;
-       MonoMethod *orig_method = NULL;
-       WrapperInfo *info;
-       WrapperSubtype subtype = WRAPPER_SUBTYPE_NONE;
-       gboolean found;
-
-       g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
-                 !strcmp (method->name, "Invoke"));
-
-       invoke_sig = sig = mono_signature_no_pinvoke (method);
-
-       /*
-        * If the delegate target is null, and the target method is not static, a virtual 
-        * call is made to that method with the first delegate argument as this. This is 
-        * a non-documented .NET feature.
-        */
-       if (callvirt) {
-               subtype = WRAPPER_SUBTYPE_DELEGATE_INVOKE_VIRTUAL;
-               if (target_method->is_inflated) {
-                       MonoType *target_type;
-
-                       g_assert (method->signature->hasthis);
-                       target_type = mono_class_inflate_generic_type (method->signature->params [0],
-                               mono_method_get_context (method));
-                       target_class = mono_class_from_mono_type (target_type);
-               } else {
-                       target_class = target_method->klass;
-               }
-
-               closed_over_null = sig->param_count == mono_method_signature (target_method)->param_count;
-       }
-
-       if (static_method_with_first_arg_bound) {
-               subtype = WRAPPER_SUBTYPE_DELEGATE_INVOKE_BOUND;
-               g_assert (!callvirt);
-               invoke_sig = mono_method_signature (target_method);
-       }
-
-       /*
-        * For generic delegates, create a generic wrapper, and return an instance to help AOT.
-        */
-       if (method->is_inflated && subtype == WRAPPER_SUBTYPE_NONE) {
-               orig_method = method;
-               ctx = &((MonoMethodInflated*)method)->context;
-               method = ((MonoMethodInflated*)method)->declaring;
-
-               container = mono_method_get_generic_container (method);
-               if (!container)
-                       container = method->klass->generic_container;
-               g_assert (container);
-
-               invoke_sig = sig = mono_signature_no_pinvoke (method);
-       }
-
-       /*
-        * Check cache
-        */
-       if (ctx) {
-               cache = get_cache (&method->klass->image->delegate_invoke_generic_cache, mono_aligned_addr_hash, NULL);
-               res = check_generic_delegate_wrapper_cache (cache, orig_method, method, ctx);
-               if (res)
-                       return res;
-               cache_key = method->klass;
-       } else if (static_method_with_first_arg_bound) {
-               cache = get_cache (&method->klass->image->delegate_bound_static_invoke_cache,
-                                                  (GHashFunc)mono_signature_hash, 
-                                                  (GCompareFunc)mono_metadata_signature_equal);
-               /*
-                * The wrapper is based on sig+invoke_sig, but sig can be derived from invoke_sig.
-                */
-               res = mono_marshal_find_in_cache (cache, invoke_sig);
-               if (res)
-                       return res;
-               cache_key = invoke_sig;
-       } else if (callvirt) {
-               GHashTable **cache_ptr;
-
-               cache_ptr = &method->klass->image->delegate_abstract_invoke_cache;
-
-               /* We need to cache the signature+method pair */
-               mono_marshal_lock ();
-               if (!*cache_ptr)
-                       *cache_ptr = g_hash_table_new_full (signature_method_pair_hash, (GEqualFunc)signature_method_pair_equal, (GDestroyNotify)free_signature_method_pair, NULL);
-               cache = *cache_ptr;
-               key.sig = invoke_sig;
-               key.method = target_method;
-               res = g_hash_table_lookup (cache, &key);
-               mono_marshal_unlock ();
-               if (res)
-                       return res;
-       } else {
-               cache = get_cache (&method->klass->image->delegate_invoke_cache,
-                                                  (GHashFunc)mono_signature_hash, 
-                                                  (GCompareFunc)mono_metadata_signature_equal);
-               res = mono_marshal_find_in_cache (cache, sig);
-               if (res)
-                       return res;
-               cache_key = sig;
-       }
-
-       static_sig = signature_dup (method->klass->image, sig);
-       static_sig->hasthis = 0;
-       if (!static_method_with_first_arg_bound)
-               invoke_sig = static_sig;
-
-       if (static_method_with_first_arg_bound)
-               name = mono_signature_to_name (invoke_sig, "invoke_bound");
-       else if (closed_over_null)
-               name = mono_signature_to_name (invoke_sig, "invoke_closed_over_null");
-       else if (callvirt)
-               name = mono_signature_to_name (invoke_sig, "invoke_callvirt");
-       else
-               name = mono_signature_to_name (invoke_sig, "invoke");
-       if (ctx)
-               mb = mono_mb_new (method->klass, name, MONO_WRAPPER_DELEGATE_INVOKE);
-       else
-               mb = mono_mb_new (get_wrapper_target_class (method->klass->image), name, MONO_WRAPPER_DELEGATE_INVOKE);
-       g_free (name);
-
-#ifndef DISABLE_JIT
-       /* allocate local 0 (object) */
-       local_target = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-       local_prev = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-
-       g_assert (sig->hasthis);
-       
-       /*
-        * if (prev != null)
-         *     prev.Invoke( args .. );
-        * return this.<target>( args .. );
-         */
-       
-       /* this wrapper can be used in unmanaged-managed transitions */
-       emit_thread_interrupt_checkpoint (mb);
-       
-       /* get this->prev */
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoMulticastDelegate, prev));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_stloc (mb, local_prev);
-       mono_mb_emit_ldloc (mb, local_prev);
-
-       /* if prev != null */
-       pos0 = mono_mb_emit_branch (mb, CEE_BRFALSE);
-
-       /* then recurse */
-
-       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
-       mono_mb_emit_byte (mb, CEE_MONO_NOT_TAKEN);
-
-       mono_mb_emit_ldloc (mb, local_prev);
-       for (i = 0; i < sig->param_count; i++)
-               mono_mb_emit_ldarg (mb, i + 1);
-       if (ctx)
-               mono_mb_emit_op (mb, CEE_CALLVIRT, mono_class_inflate_generic_method (method, &container->context));
-       else
-               mono_mb_emit_op (mb, CEE_CALLVIRT, method);
-       if (sig->ret->type != MONO_TYPE_VOID)
-               mono_mb_emit_byte (mb, CEE_POP);
-
-       /* continued or prev == null */
-       mono_mb_patch_branch (mb, pos0);
-
-       /* get this->target */
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoDelegate, target));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_stloc (mb, local_target);
-
-       /*static methods with bound first arg can have null target and still be bound*/
-       if (!static_method_with_first_arg_bound) {
-               /* if target != null */
-               mono_mb_emit_ldloc (mb, local_target);
-               pos0 = mono_mb_emit_branch (mb, CEE_BRFALSE);
-
-               /* then call this->method_ptr nonstatic */
-               if (callvirt) {
-                       // FIXME:
-                       mono_mb_emit_exception_full (mb, "System", "NotImplementedException", "");
-               } else {
-                       mono_mb_emit_ldloc (mb, local_target);
-                       for (i = 0; i < sig->param_count; ++i)
-                               mono_mb_emit_ldarg (mb, i + 1);
-                       mono_mb_emit_ldarg (mb, 0);
-                       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoDelegate, method_ptr));
-                       mono_mb_emit_byte (mb, CEE_LDIND_I );
-                       mono_mb_emit_op (mb, CEE_CALLI, sig);
-
-                       mono_mb_emit_byte (mb, CEE_RET);
-               }
-       
-               /* else [target == null] call this->method_ptr static */
-               mono_mb_patch_branch (mb, pos0);
-       }
-
-       if (callvirt) {
-               if (!closed_over_null) {
-                       mono_mb_emit_ldarg (mb, 1);
-                       mono_mb_emit_op (mb, CEE_CASTCLASS, target_class);
-                       for (i = 1; i < sig->param_count; ++i)
-                               mono_mb_emit_ldarg (mb, i + 1);
-                       mono_mb_emit_op (mb, CEE_CALLVIRT, target_method);
-               } else {
-                       mono_mb_emit_byte (mb, CEE_LDNULL);
-                       for (i = 0; i < sig->param_count; ++i)
-                               mono_mb_emit_ldarg (mb, i + 1);
-                       mono_mb_emit_op (mb, CEE_CALL, target_method);
-               }
-       } else {
-               if (static_method_with_first_arg_bound) {
-                       mono_mb_emit_ldloc (mb, local_target);
-                       if (!MONO_TYPE_IS_REFERENCE (invoke_sig->params[0]))
-                               mono_mb_emit_op (mb, CEE_UNBOX_ANY, mono_class_from_mono_type (invoke_sig->params[0]));
-               }
-               for (i = 0; i < sig->param_count; ++i)
-                       mono_mb_emit_ldarg (mb, i + 1);
-               mono_mb_emit_ldarg (mb, 0);
-               mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoDelegate, method_ptr));
-               mono_mb_emit_byte (mb, CEE_LDIND_I );
-               mono_mb_emit_op (mb, CEE_CALLI, invoke_sig);
-       }
-
-       mono_mb_emit_byte (mb, CEE_RET);
-
-       mb->skip_visibility = 1;
-#endif /* DISABLE_JIT */
-
-       if (ctx) {
-               MonoMethod *def;
-
-               def = mono_mb_create_and_cache (cache, cache_key, mb, sig, sig->param_count + 16);
-               res = cache_generic_delegate_wrapper (cache, orig_method, def, ctx);
-       } else if (callvirt) {
-               new_key = g_new0 (SignatureMethodPair, 1);
-               *new_key = key;
-
-               info = mono_wrapper_info_create (mb, subtype);
-
-               res = mono_mb_create_and_cache_full (cache, new_key, mb, sig, sig->param_count + 16, info, &found);
-               if (found)
-                       g_free (new_key);
-       } else {
-               info = mono_wrapper_info_create (mb, subtype);
-
-               res = mono_mb_create_and_cache_full (cache, cache_key, mb, sig, sig->param_count + 16, info, NULL);
-       }
-       mono_mb_free (mb);
-
-       return res;     
-}
-
-/*
- * the returned method invokes all methods in a multicast delegate.
- */
-MonoMethod *
-mono_marshal_get_delegate_invoke (MonoMethod *method, MonoDelegate *del)
-{
-       gboolean callvirt = FALSE;
-       gboolean static_method_with_first_arg_bound = FALSE;
-       MonoMethod *target_method = NULL;
-       MonoMethodSignature *sig;
-
-       sig = mono_signature_no_pinvoke (method);
-
-       if (del && !del->target && del->method && mono_method_signature (del->method)->hasthis) {
-               callvirt = TRUE;
-               target_method = del->method;
-       }
-
-       if (del && del->method && mono_method_signature (del->method)->param_count == sig->param_count + 1 && (del->method->flags & METHOD_ATTRIBUTE_STATIC)) {
-               static_method_with_first_arg_bound = TRUE;
-               target_method = del->method;
-       }
-
-       return mono_marshal_get_delegate_invoke_internal (method, callvirt, static_method_with_first_arg_bound, target_method);
-}
-
-/*
- * signature_dup_add_this:
- *
- *  Make a copy of @sig, adding an explicit this argument.
- */
-static MonoMethodSignature*
-signature_dup_add_this (MonoImage *image, MonoMethodSignature *sig, MonoClass *klass)
-{
-       MonoMethodSignature *res;
-       int i;
-
-       res = mono_metadata_signature_alloc (image, sig->param_count + 1);
-       memcpy (res, sig, MONO_SIZEOF_METHOD_SIGNATURE);
-       res->param_count = sig->param_count + 1;
-       res->hasthis = FALSE;
-       for (i = sig->param_count - 1; i >= 0; i --)
-               res->params [i + 1] = sig->params [i];
-       res->params [0] = klass->valuetype ? &klass->this_arg : &klass->byval_arg;
-
-       return res;
-}
-
-typedef struct {
-       MonoMethodSignature *ctor_sig;
-       MonoMethodSignature *sig;
-} CtorSigPair;
-
-/* protected by the marshal lock, contains CtorSigPair pointers */
-static GSList *strsig_list = NULL;
-
-static MonoMethodSignature *
-lookup_string_ctor_signature (MonoMethodSignature *sig)
-{
-       MonoMethodSignature *callsig;
-       CtorSigPair *cs;
-       GSList *item;
-
-       mono_marshal_lock ();
-       callsig = NULL;
-       for (item = strsig_list; item; item = item->next) {
-               cs = item->data;
-               /* mono_metadata_signature_equal () is safe to call with the marshal lock
-                * because it is lock-free.
-                */
-               if (mono_metadata_signature_equal (sig, cs->ctor_sig)) {
-                       callsig = cs->sig;
-                       break;
-               }
-       }
-       mono_marshal_unlock ();
-       return callsig;
-}
-
-static MonoMethodSignature *
-add_string_ctor_signature (MonoMethod *method)
-{
-       MonoMethodSignature *callsig;
-       CtorSigPair *cs;
-
-       callsig = signature_dup (method->klass->image, mono_method_signature (method));
-       callsig->ret = &mono_defaults.string_class->byval_arg;
-       cs = g_new (CtorSigPair, 1);
-       cs->sig = callsig;
-       cs->ctor_sig = mono_method_signature (method);
-
-       mono_marshal_lock ();
-       strsig_list = g_slist_prepend (strsig_list, cs);
-       mono_marshal_unlock ();
-       return callsig;
-}
-
-/*
- * mono_marshal_get_string_ctor_signature:
- *
- *   Return the modified signature used by string ctors (they return the newly created
- * string).
- */
-MonoMethodSignature*
-mono_marshal_get_string_ctor_signature (MonoMethod *method)
-{
-       MonoMethodSignature *sig = lookup_string_ctor_signature (mono_method_signature (method));
-       if (!sig)
-               sig = add_string_ctor_signature (method);
-
-       return sig;
-}
-
-static MonoType*
-get_runtime_invoke_type (MonoType *t, gboolean ret)
-{
-       if (t->byref) {
-               if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t)))
-                       return t;
-               /* Can't share this with 'I' as that needs another indirection */
-               return &mono_defaults.int_class->this_arg;
-       }
-
-       if (MONO_TYPE_IS_REFERENCE (t))
-               return &mono_defaults.object_class->byval_arg;
-
-       if (ret)
-               /* The result needs to be boxed */
-               return t;
-
-handle_enum:
-       switch (t->type) {
-               /* Can't share these as the argument needs to be loaded using sign/zero extension */
-               /*
-       case MONO_TYPE_U1:
-               return &mono_defaults.sbyte_class->byval_arg;
-       case MONO_TYPE_U2:
-               return &mono_defaults.int16_class->byval_arg;
-       case MONO_TYPE_U4:
-               return &mono_defaults.int32_class->byval_arg;
-               */
-       case MONO_TYPE_U8:
-               return &mono_defaults.int64_class->byval_arg;
-       case MONO_TYPE_BOOLEAN:
-               return &mono_defaults.byte_class->byval_arg;
-       case MONO_TYPE_CHAR:
-               return &mono_defaults.uint16_class->byval_arg;
-       case MONO_TYPE_U:
-       case MONO_TYPE_PTR:
-               return &mono_defaults.int_class->byval_arg;
-       case MONO_TYPE_VALUETYPE:
-               if (t->data.klass->enumtype) {
-                       t = mono_class_enum_basetype (t->data.klass);
-                       goto handle_enum;
-               }
-               return t;
-       default:
-               return t;
-       }
-}
-
-/*
- * mono_marshal_get_runtime_invoke_sig:
- *
- *   Return a common signature used for sharing runtime invoke wrappers.
- */
-static MonoMethodSignature*
-mono_marshal_get_runtime_invoke_sig (MonoMethodSignature *sig)
-{
-       MonoMethodSignature *res = mono_metadata_signature_dup (sig);
-       int i;
-
-       res->generic_param_count = 0;
-       res->ret = get_runtime_invoke_type (sig->ret, TRUE);
-       for (i = 0; i < res->param_count; ++i)
-               res->params [i] = get_runtime_invoke_type (sig->params [i], FALSE);
-
-       return res;
-}
-
-static gboolean
-runtime_invoke_signature_equal (MonoMethodSignature *sig1, MonoMethodSignature *sig2)
-{
-       /* Can't share wrappers which return a vtype since it needs to be boxed */
-       if (sig1->ret != sig2->ret && !(MONO_TYPE_IS_REFERENCE (sig1->ret) && MONO_TYPE_IS_REFERENCE (sig2->ret)) && !mono_metadata_type_equal (sig1->ret, sig2->ret))
-               return FALSE;
-       else
-               return mono_metadata_signature_equal (sig1, sig2);
-}
-
-#ifndef DISABLE_JIT
-
-/*
- * emit_invoke_call:
- *
- *   Emit the call to the wrapper method from a runtime invoke wrapper.
- */
-static void
-emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
-                                 MonoMethodSignature *sig, MonoMethodSignature *callsig,
-                                 int loc_res,
-                                 gboolean virtual, gboolean need_direct_wrapper)
-{
-       static MonoString *string_dummy = NULL;
-       int i;
-       int *tmp_nullable_locals;
-       gboolean void_ret = FALSE;
-
-       /* to make it work with our special string constructors */
-       if (!string_dummy) {
-               MONO_GC_REGISTER_ROOT_SINGLE (string_dummy);
-               string_dummy = mono_string_new_wrapper ("dummy");
-       }
-
-       if (virtual) {
-               g_assert (sig->hasthis);
-               g_assert (method->flags & METHOD_ATTRIBUTE_VIRTUAL);
-       }
-
-       if (sig->hasthis) {
-               if (method->string_ctor) {
-                       if (mono_gc_is_moving ()) {
-                               mono_mb_emit_ptr (mb, &string_dummy);
-                               mono_mb_emit_byte (mb, CEE_LDIND_REF);
-                       } else {
-                               mono_mb_emit_ptr (mb, string_dummy);
-                       }
-               } else {
-                       mono_mb_emit_ldarg (mb, 0);
-               }
-       }
-
-       tmp_nullable_locals = g_new0 (int, sig->param_count);
-
-       for (i = 0; i < sig->param_count; i++) {
-               MonoType *t = sig->params [i];
-               int type;
-
-               mono_mb_emit_ldarg (mb, 1);
-               if (i) {
-                       mono_mb_emit_icon (mb, sizeof (gpointer) * i);
-                       mono_mb_emit_byte (mb, CEE_ADD);
-               }
-
-               if (t->byref) {
-                       mono_mb_emit_byte (mb, CEE_LDIND_I);
-                       /* A Nullable<T> type don't have a boxed form, it's either null or a boxed T.
-                        * So to make this work we unbox it to a local variablee and push a reference to that.
-                        */
-                       if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t))) {
-                               tmp_nullable_locals [i] = mono_mb_add_local (mb, &mono_class_from_mono_type (t)->byval_arg);
-
-                               mono_mb_emit_op (mb, CEE_UNBOX_ANY, mono_class_from_mono_type (t));
-                               mono_mb_emit_stloc (mb, tmp_nullable_locals [i]);
-                               mono_mb_emit_ldloc_addr (mb, tmp_nullable_locals [i]);
-                       }
-                       continue;
-               }
-
-               /*FIXME 'this doesn't handle generic enums. Shouldn't we?*/
-               type = sig->params [i]->type;
-handle_enum:
-               switch (type) {
-               case MONO_TYPE_I1:
-               case MONO_TYPE_BOOLEAN:
-               case MONO_TYPE_U1:
-               case MONO_TYPE_I2:
-               case MONO_TYPE_U2:
-               case MONO_TYPE_CHAR:
-               case MONO_TYPE_I:
-               case MONO_TYPE_U:
-               case MONO_TYPE_I4:
-               case MONO_TYPE_U4:
-               case MONO_TYPE_R4:
-               case MONO_TYPE_R8:
-               case MONO_TYPE_I8:
-               case MONO_TYPE_U8:
-                       mono_mb_emit_byte (mb, CEE_LDIND_I);
-                       mono_mb_emit_byte (mb, mono_type_to_ldind (sig->params [i]));
-                       break;
-               case MONO_TYPE_STRING:
-               case MONO_TYPE_CLASS:  
-               case MONO_TYPE_ARRAY:
-               case MONO_TYPE_PTR:
-               case MONO_TYPE_SZARRAY:
-               case MONO_TYPE_OBJECT:
-                       mono_mb_emit_byte (mb, mono_type_to_ldind (sig->params [i]));
-                       break;
-               case MONO_TYPE_GENERICINST:
-                       if (!mono_type_generic_inst_is_valuetype (sig->params [i])) {
-                               mono_mb_emit_byte (mb, mono_type_to_ldind (sig->params [i]));
-                               break;
-                       }
-
-                       /* fall through */
-               case MONO_TYPE_VALUETYPE:
-                       if (type == MONO_TYPE_VALUETYPE && t->data.klass->enumtype) {
-                               type = mono_class_enum_basetype (t->data.klass)->type;
-                               goto handle_enum;
-                       }
-                       mono_mb_emit_byte (mb, CEE_LDIND_I);
-                       if (mono_class_is_nullable (mono_class_from_mono_type (sig->params [i]))) {
-                               /* Need to convert a boxed vtype to an mp to a Nullable struct */
-                               mono_mb_emit_op (mb, CEE_UNBOX, mono_class_from_mono_type (sig->params [i]));
-                               mono_mb_emit_op (mb, CEE_LDOBJ, mono_class_from_mono_type (sig->params [i]));
-                       } else {
-                               mono_mb_emit_op (mb, CEE_LDOBJ, mono_class_from_mono_type (sig->params [i]));
-                       }
-                       break;
-               default:
-                       g_assert_not_reached ();
-               }
-       }
-       
-       if (virtual) {
-               mono_mb_emit_op (mb, CEE_CALLVIRT, method);
-       } else if (need_direct_wrapper) {
-               mono_mb_emit_op (mb, CEE_CALL, method);
-       } else {
-               mono_mb_emit_ldarg (mb, 3);
-               mono_mb_emit_calli (mb, callsig);
-       }
-
-       if (sig->ret->byref) {
-               /* fixme: */
-               g_assert_not_reached ();
-       }
-
-       switch (sig->ret->type) {
-       case MONO_TYPE_VOID:
-               if (!method->string_ctor)
-                       void_ret = TRUE;
-               break;
-       case MONO_TYPE_BOOLEAN:
-       case MONO_TYPE_CHAR:
-       case MONO_TYPE_I1:
-       case MONO_TYPE_U1:
-       case MONO_TYPE_I2:
-       case MONO_TYPE_U2:
-       case MONO_TYPE_I4:
-       case MONO_TYPE_U4:
-       case MONO_TYPE_I:
-       case MONO_TYPE_U:
-       case MONO_TYPE_R4:
-       case MONO_TYPE_R8:
-       case MONO_TYPE_I8:
-       case MONO_TYPE_U8:
-       case MONO_TYPE_VALUETYPE:
-       case MONO_TYPE_TYPEDBYREF:
-       case MONO_TYPE_GENERICINST:
-               /* box value types */
-               mono_mb_emit_op (mb, CEE_BOX, mono_class_from_mono_type (sig->ret));
-               break;
-       case MONO_TYPE_STRING:
-       case MONO_TYPE_CLASS:  
-       case MONO_TYPE_ARRAY:
-       case MONO_TYPE_SZARRAY:
-       case MONO_TYPE_OBJECT:
-               /* nothing to do */
-               break;
-       case MONO_TYPE_PTR:
-               /* The result is an IntPtr */
-               mono_mb_emit_op (mb, CEE_BOX, mono_defaults.int_class);
-               break;
-       default:
-               g_assert_not_reached ();
-       }
-
-       if (!void_ret)
-               mono_mb_emit_stloc (mb, loc_res);
-
-       /* Convert back nullable-byref arguments */
-       for (i = 0; i < sig->param_count; i++) {
-               MonoType *t = sig->params [i];
-
-               /* 
-                * Box the result and put it back into the array, the caller will have
-                * to obtain it from there.
-                */
-               if (t->byref && t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t))) {
-                       mono_mb_emit_ldarg (mb, 1);                     
-                       mono_mb_emit_icon (mb, sizeof (gpointer) * i);
-                       mono_mb_emit_byte (mb, CEE_ADD);
-
-                       mono_mb_emit_ldloc (mb, tmp_nullable_locals [i]);
-                       mono_mb_emit_op (mb, CEE_BOX, mono_class_from_mono_type (t));
-
-                       mono_mb_emit_byte (mb, CEE_STIND_REF);
-               }
-       }
-
-       g_free (tmp_nullable_locals);
-}
-
-static void
-emit_runtime_invoke_body (MonoMethodBuilder *mb, MonoClass *target_klass, MonoMethod *method,
-                                                 MonoMethodSignature *sig, MonoMethodSignature *callsig,
-                                                 gboolean virtual, gboolean need_direct_wrapper)
-{
-       gint32 labels [16];
-       MonoExceptionClause *clause;
-       int loc_res, loc_exc;
-
-       /* The wrapper looks like this:
-        *
-        * <interrupt check>
-        * if (exc) {
-        *       try {
-        *         return <call>
-        *       } catch (Exception e) {
-        *     *exc = e;
-        *   }
-        * } else {
-        *     return <call>
-        * }
-        */
-
-       /* allocate local 0 (object) tmp */
-       loc_res = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-       /* allocate local 1 (object) exc */
-       loc_exc = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-
-       /* *exc is assumed to be initialized to NULL by the caller */
-
-       mono_mb_emit_byte (mb, CEE_LDARG_2);
-       labels [0] = mono_mb_emit_branch (mb, CEE_BRFALSE);
-
-       /*
-        * if (exc) case
-        */
-       labels [1] = mono_mb_get_label (mb);
-       emit_thread_force_interrupt_checkpoint (mb);
-       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
-
-       labels [2] = mono_mb_emit_branch (mb, CEE_LEAVE);
-
-       /* Add a try clause around the call */
-       clause = mono_image_alloc0 (target_klass->image, sizeof (MonoExceptionClause));
-       clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
-       clause->data.catch_class = mono_defaults.exception_class;
-       clause->try_offset = labels [1];
-       clause->try_len = mono_mb_get_label (mb) - labels [1];
-
-       clause->handler_offset = mono_mb_get_label (mb);
-
-       /* handler code */
-       mono_mb_emit_stloc (mb, loc_exc);       
-       mono_mb_emit_byte (mb, CEE_LDARG_2);
-       mono_mb_emit_ldloc (mb, loc_exc);
-       mono_mb_emit_byte (mb, CEE_STIND_REF);
-
-       mono_mb_emit_branch (mb, CEE_LEAVE);
-
-       clause->handler_len = mono_mb_get_pos (mb) - clause->handler_offset;
-
-       mono_mb_set_clauses (mb, 1, clause);
-
-       mono_mb_patch_branch (mb, labels [2]);
-       mono_mb_emit_ldloc (mb, loc_res);
-       mono_mb_emit_byte (mb, CEE_RET);
+               invoke_sig = sig = mono_signature_no_pinvoke (method);
+       }
 
        /*
-        * if (!exc) case
-        */
-       mono_mb_patch_branch (mb, labels [0]);
-       emit_thread_force_interrupt_checkpoint (mb);
-       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
-
-       mono_mb_emit_ldloc (mb, 0);
-       mono_mb_emit_byte (mb, CEE_RET);
-}
-#endif
-
-/*
- * generates IL code for the runtime invoke function 
- * MonoObject *runtime_invoke (MonoObject *this, void **params, MonoObject **exc, void* method)
- *
- * we also catch exceptions if exc != null
- * If VIRTUAL is TRUE, then METHOD is invoked virtually on THIS. This is useful since
- * it means that the compiled code for METHOD does not have to be looked up 
- * before calling the runtime invoke wrapper. In this case, the wrapper ignores
- * its METHOD argument.
- */
-MonoMethod *
-mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual)
-{
-       MonoMethodSignature *sig, *csig, *callsig;
-       MonoMethodBuilder *mb;
-       GHashTable *cache = NULL;
-       MonoClass *target_klass;
-       MonoMethod *res = NULL;
-       static MonoMethodSignature *cctor_signature = NULL;
-       static MonoMethodSignature *finalize_signature = NULL;
-       char *name;
-       const char *param_names [16];
-       gboolean need_direct_wrapper = FALSE;
-       WrapperInfo *info;
-
-       g_assert (method);
-
-       if (!cctor_signature) {
-               cctor_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
-               cctor_signature->ret = &mono_defaults.void_class->byval_arg;
-       }
-       if (!finalize_signature) {
-               finalize_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
-               finalize_signature->ret = &mono_defaults.void_class->byval_arg;
-               finalize_signature->hasthis = 1;
-       }
-
-       if (virtual)
-               need_direct_wrapper = TRUE;
-
-       /* 
-        * Use a separate cache indexed by methods to speed things up and to avoid the
-        * boundless mempool growth caused by the signature_dup stuff below.
+        * Check cache
         */
-       if (virtual)
-               cache = get_cache (&method->klass->image->runtime_invoke_vcall_cache, mono_aligned_addr_hash, NULL);
-       else
-               cache = get_cache (&method->klass->image->runtime_invoke_direct_cache, mono_aligned_addr_hash, NULL);
-       res = mono_marshal_find_in_cache (cache, method);
-       if (res)
-               return res;
-               
-       if (method->klass->rank && (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
-               (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)) {
-               /* 
-                * Array Get/Set/Address methods. The JIT implements them using inline code
-                * so we need to create an invoke wrapper which calls the method directly.
-                */
-               need_direct_wrapper = TRUE;
-       }
-               
-       if (method->string_ctor) {
-               callsig = lookup_string_ctor_signature (mono_method_signature (method));
-               if (!callsig)
-                       callsig = add_string_ctor_signature (method);
-               /* Can't share this as we push a string as this */
-               need_direct_wrapper = TRUE;
-       } else {
-               if (method_is_dynamic (method))
-                       callsig = signature_dup (method->klass->image, mono_method_signature (method));
-               else
-                       callsig = mono_method_signature (method);
-       }
-
-       target_klass = get_wrapper_target_class (method->klass->image);
-
-       /* Try to share wrappers for non-corlib methods with simple signatures */
-       if (mono_metadata_signature_equal (callsig, cctor_signature)) {
-               callsig = cctor_signature;
-               target_klass = mono_defaults.object_class;
-       } else if (mono_metadata_signature_equal (callsig, finalize_signature)) {
-               callsig = finalize_signature;
-               target_klass = mono_defaults.object_class;
-       }
-
-       if (need_direct_wrapper) {
-               /* Already searched at the start */
-       } else {
-               MonoMethodSignature *tmp_sig;
-
-               callsig = mono_marshal_get_runtime_invoke_sig (callsig);
-
-               if (method->klass->valuetype && mono_method_signature (method)->hasthis)
-                       /* These have a different csig */
-                       cache = get_cache (&target_klass->image->runtime_invoke_vtype_cache,
-                                                          (GHashFunc)mono_signature_hash,
-                                                          (GCompareFunc)runtime_invoke_signature_equal);
-               else
-                       cache = get_cache (&target_klass->image->runtime_invoke_cache,
-                                                          (GHashFunc)mono_signature_hash,
-                                                          (GCompareFunc)runtime_invoke_signature_equal);
-
-               /* from mono_marshal_find_in_cache */
-               mono_marshal_lock ();
-               res = g_hash_table_lookup (cache, callsig);
-               mono_marshal_unlock ();
-
-               if (res) {
-                       g_free (callsig);
+       if (ctx) {
+               cache = get_cache (&method->klass->image->delegate_invoke_generic_cache, mono_aligned_addr_hash, NULL);
+               res = check_generic_delegate_wrapper_cache (cache, orig_method, method, ctx);
+               if (res)
                        return res;
-               }
-
-               /* Make a copy of the signature from the image mempool */
-               tmp_sig = callsig;
-               callsig = mono_metadata_signature_dup_full (target_klass->image, callsig);
-               g_free (tmp_sig);
-       }
-       
-       sig = mono_method_signature (method);
-
-       csig = mono_metadata_signature_alloc (target_klass->image, 4);
-
-       csig->ret = &mono_defaults.object_class->byval_arg;
-       if (method->klass->valuetype && mono_method_signature (method)->hasthis)
-               csig->params [0] = get_runtime_invoke_type (&method->klass->this_arg, FALSE);
-       else
-               csig->params [0] = &mono_defaults.object_class->byval_arg;
-       csig->params [1] = &mono_defaults.int_class->byval_arg;
-       csig->params [2] = &mono_defaults.int_class->byval_arg;
-       csig->params [3] = &mono_defaults.int_class->byval_arg;
-       csig->pinvoke = 1;
-#if TARGET_WIN32
-       /* This is called from runtime code so it has to be cdecl */
-       csig->call_convention = MONO_CALL_C;
-#endif
-
-       name = mono_signature_to_name (callsig, virtual ? "runtime_invoke_virtual" : "runtime_invoke");
-       mb = mono_mb_new (target_klass, name,  MONO_WRAPPER_RUNTIME_INVOKE);
-       g_free (name);
-
-#ifndef DISABLE_JIT
-       param_names [0] = "this";
-       param_names [1] = "params";
-       param_names [2] = "exc";
-       param_names [3] = "method";
-       mono_mb_set_param_names (mb, param_names);
+               cache_key = method->klass;
+       } else if (static_method_with_first_arg_bound) {
+               cache = get_cache (&method->klass->image->delegate_bound_static_invoke_cache,
+                                                  (GHashFunc)mono_signature_hash, 
+                                                  (GCompareFunc)mono_metadata_signature_equal);
+               /*
+                * The wrapper is based on sig+invoke_sig, but sig can be derived from invoke_sig.
+                */
+               res = mono_marshal_find_in_cache (cache, invoke_sig);
+               if (res)
+                       return res;
+               cache_key = invoke_sig;
+       } else if (callvirt) {
+               GHashTable **cache_ptr;
 
-       emit_runtime_invoke_body (mb, target_klass, method, sig, callsig, virtual, need_direct_wrapper);
-#endif
+               cache_ptr = &method->klass->image->delegate_abstract_invoke_cache;
 
-       if (need_direct_wrapper) {
-#ifndef DISABLE_JIT
-               mb->skip_visibility = 1;
-#endif
-               info = mono_wrapper_info_create (mb, virtual ? WRAPPER_SUBTYPE_RUNTIME_INVOKE_VIRTUAL : WRAPPER_SUBTYPE_RUNTIME_INVOKE_DIRECT);
-               info->d.runtime_invoke.method = method;
-               res = mono_mb_create_and_cache_full (cache, method, mb, csig, sig->param_count + 16, info, NULL);
-       } else {
-               /* taken from mono_mb_create_and_cache */
+               /* We need to cache the signature+method pair */
                mono_marshal_lock ();
-               res = g_hash_table_lookup (cache, callsig);
+               if (!*cache_ptr)
+                       *cache_ptr = g_hash_table_new_full (signature_method_pair_hash, (GEqualFunc)signature_method_pair_equal, (GDestroyNotify)free_signature_method_pair, NULL);
+               cache = *cache_ptr;
+               key.sig = invoke_sig;
+               key.method = target_method;
+               res = g_hash_table_lookup (cache, &key);
                mono_marshal_unlock ();
-
-               info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_RUNTIME_INVOKE_NORMAL);
-               info->d.runtime_invoke.sig = callsig;
-
-               /* Somebody may have created it before us */
-               if (!res) {
-                       MonoMethod *newm;
-                       newm = mono_mb_create (mb, csig, sig->param_count + 16, info);
-
-                       mono_marshal_lock ();
-                       res = g_hash_table_lookup (cache, callsig);
-                       if (!res) {
-                               res = newm;
-                               g_hash_table_insert (cache, callsig, res);
-                               /* Can't insert it into wrapper_hash since the key is a signature */
-                               g_hash_table_insert (method->klass->image->runtime_invoke_direct_cache, method, res);
-                       } else {
-                               mono_free_method (newm);
-                       }
-                       mono_marshal_unlock ();
-               }
-
-               /* end mono_mb_create_and_cache */
+               if (res)
+                       return res;
+       } else {
+               cache = get_cache (&method->klass->image->delegate_invoke_cache,
+                                                  (GHashFunc)mono_signature_hash, 
+                                                  (GCompareFunc)mono_metadata_signature_equal);
+               res = mono_marshal_find_in_cache (cache, sig);
+               if (res)
+                       return res;
+               cache_key = sig;
        }
 
-       mono_mb_free (mb);
-
-       return res;     
-}
-
-/*
- * mono_marshal_get_runtime_invoke_dynamic:
- *
- *   Return a method which can be used to invoke managed methods from native code
- * dynamically.
- * The signature of the returned method is given by RuntimeInvokeDynamicFunction:
- * void runtime_invoke (void *args, MonoObject **exc, void *compiled_method)
- * ARGS should point to an architecture specific structure containing 
- * the arguments and space for the return value.
- * The other arguments are the same as for runtime_invoke (), except that
- * ARGS should contain the this argument too.
- * This wrapper serves the same purpose as the runtime-invoke wrappers, but there
- * is only one copy of it, which is useful in full-aot.
- * The wrapper info for the wrapper is a WrapperInfo structure.
- */
-MonoMethod*
-mono_marshal_get_runtime_invoke_dynamic (void)
-{
-       static MonoMethod *method;
-       MonoMethodSignature *csig;
-       MonoExceptionClause *clause;
-       MonoMethodBuilder *mb;
-       int pos, posna;
-       char *name;
-       WrapperInfo *info;
-
-       if (method)
-               return method;
-
-       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
-
-       csig->ret = &mono_defaults.void_class->byval_arg;
-       csig->params [0] = &mono_defaults.int_class->byval_arg;
-       csig->params [1] = &mono_defaults.int_class->byval_arg;
-       csig->params [2] = &mono_defaults.int_class->byval_arg;
-       csig->params [3] = &mono_defaults.int_class->byval_arg;
+       static_sig = signature_dup (method->klass->image, sig);
+       static_sig->hasthis = 0;
+       if (!static_method_with_first_arg_bound)
+               invoke_sig = static_sig;
 
-       name = g_strdup ("runtime_invoke_dynamic");
-       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_RUNTIME_INVOKE);
+       if (static_method_with_first_arg_bound)
+               name = mono_signature_to_name (invoke_sig, "invoke_bound");
+       else if (closed_over_null)
+               name = mono_signature_to_name (invoke_sig, "invoke_closed_over_null");
+       else if (callvirt)
+               name = mono_signature_to_name (invoke_sig, "invoke_callvirt");
+       else
+               name = mono_signature_to_name (invoke_sig, "invoke");
+       if (ctx)
+               mb = mono_mb_new (method->klass, name, MONO_WRAPPER_DELEGATE_INVOKE);
+       else
+               mb = mono_mb_new (get_wrapper_target_class (method->klass->image), name, MONO_WRAPPER_DELEGATE_INVOKE);
        g_free (name);
 
 #ifndef DISABLE_JIT
-       /* allocate local 0 (object) tmp */
-       mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-       /* allocate local 1 (object) exc */
-       mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-
-       /* cond set *exc to null */
-       mono_mb_emit_byte (mb, CEE_LDARG_1);
-       mono_mb_emit_byte (mb, CEE_BRFALSE_S);
-       mono_mb_emit_byte (mb, 3);      
-       mono_mb_emit_byte (mb, CEE_LDARG_1);
-       mono_mb_emit_byte (mb, CEE_LDNULL);
-       mono_mb_emit_byte (mb, CEE_STIND_REF);
-
-       emit_thread_force_interrupt_checkpoint (mb);
-
-       mono_mb_emit_byte (mb, CEE_LDARG_0);
-       mono_mb_emit_byte (mb, CEE_LDARG_2);
-       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
-       mono_mb_emit_byte (mb, CEE_MONO_DYN_CALL);
+       /* allocate local 0 (object) */
+       local_target = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+       local_prev = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
 
-       pos = mono_mb_emit_branch (mb, CEE_LEAVE);
+       g_assert (sig->hasthis);
+       
+       /*
+        * if (prev != null)
+         *     prev.Invoke( args .. );
+        * return this.<target>( args .. );
+         */
+       
+       /* this wrapper can be used in unmanaged-managed transitions */
+       emit_thread_interrupt_checkpoint (mb);
+       
+       /* get this->prev */
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoMulticastDelegate, prev));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_stloc (mb, local_prev);
+       mono_mb_emit_ldloc (mb, local_prev);
 
-       clause = mono_image_alloc0 (mono_defaults.corlib, sizeof (MonoExceptionClause));
-       clause->flags = MONO_EXCEPTION_CLAUSE_FILTER;
-       clause->try_len = mono_mb_get_label (mb);
+       /* if prev != null */
+       pos0 = mono_mb_emit_branch (mb, CEE_BRFALSE);
 
-       /* filter code */
-       clause->data.filter_offset = mono_mb_get_label (mb);
-       
-       mono_mb_emit_byte (mb, CEE_POP);
-       mono_mb_emit_byte (mb, CEE_LDARG_1);
-       mono_mb_emit_byte (mb, CEE_LDC_I4_0);
-       mono_mb_emit_byte (mb, CEE_PREFIX1);
-       mono_mb_emit_byte (mb, CEE_CGT_UN);
-       mono_mb_emit_byte (mb, CEE_PREFIX1);
-       mono_mb_emit_byte (mb, CEE_ENDFILTER);
+       /* then recurse */
 
-       clause->handler_offset = mono_mb_get_label (mb);
+       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+       mono_mb_emit_byte (mb, CEE_MONO_NOT_TAKEN);
 
-       /* handler code */
-       /* store exception */
-       mono_mb_emit_stloc (mb, 1);
-       
-       mono_mb_emit_byte (mb, CEE_LDARG_1);
-       mono_mb_emit_ldloc (mb, 1);
-       mono_mb_emit_byte (mb, CEE_STIND_REF);
+       mono_mb_emit_ldloc (mb, local_prev);
+       for (i = 0; i < sig->param_count; i++)
+               mono_mb_emit_ldarg (mb, i + 1);
+       if (ctx)
+               mono_mb_emit_op (mb, CEE_CALLVIRT, mono_class_inflate_generic_method (method, &container->context));
+       else
+               mono_mb_emit_op (mb, CEE_CALLVIRT, method);
+       if (sig->ret->type != MONO_TYPE_VOID)
+               mono_mb_emit_byte (mb, CEE_POP);
 
-       mono_mb_emit_byte (mb, CEE_LDNULL);
-       mono_mb_emit_stloc (mb, 0);
+       /* continued or prev == null */
+       mono_mb_patch_branch (mb, pos0);
 
-       /* Check for the abort exception */
-       mono_mb_emit_ldloc (mb, 1);
-       mono_mb_emit_op (mb, CEE_ISINST, mono_defaults.threadabortexception_class);
-       posna = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
+       /* get this->target */
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoDelegate, target));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_stloc (mb, local_target);
 
-       /* Delay the abort exception */
-       mono_mb_emit_icall (mb, ves_icall_System_Threading_Thread_ResetAbort);
+       /*static methods with bound first arg can have null target and still be bound*/
+       if (!static_method_with_first_arg_bound) {
+               /* if target != null */
+               mono_mb_emit_ldloc (mb, local_target);
+               pos0 = mono_mb_emit_branch (mb, CEE_BRFALSE);
 
-       mono_mb_patch_short_branch (mb, posna);
-       mono_mb_emit_branch (mb, CEE_LEAVE);
+               /* then call this->method_ptr nonstatic */
+               if (callvirt) {
+                       // FIXME:
+                       mono_mb_emit_exception_full (mb, "System", "NotImplementedException", "");
+               } else {
+                       mono_mb_emit_ldloc (mb, local_target);
+                       for (i = 0; i < sig->param_count; ++i)
+                               mono_mb_emit_ldarg (mb, i + 1);
+                       mono_mb_emit_ldarg (mb, 0);
+                       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoDelegate, method_ptr));
+                       mono_mb_emit_byte (mb, CEE_LDIND_I );
+                       mono_mb_emit_op (mb, CEE_CALLI, sig);
 
-       clause->handler_len = mono_mb_get_pos (mb) - clause->handler_offset;
+                       mono_mb_emit_byte (mb, CEE_RET);
+               }
+       
+               /* else [target == null] call this->method_ptr static */
+               mono_mb_patch_branch (mb, pos0);
+       }
 
-       mono_mb_set_clauses (mb, 1, clause);
+       if (callvirt) {
+               if (!closed_over_null) {
+                       mono_mb_emit_ldarg (mb, 1);
+                       mono_mb_emit_op (mb, CEE_CASTCLASS, target_class);
+                       for (i = 1; i < sig->param_count; ++i)
+                               mono_mb_emit_ldarg (mb, i + 1);
+                       mono_mb_emit_op (mb, CEE_CALLVIRT, target_method);
+               } else {
+                       mono_mb_emit_byte (mb, CEE_LDNULL);
+                       for (i = 0; i < sig->param_count; ++i)
+                               mono_mb_emit_ldarg (mb, i + 1);
+                       mono_mb_emit_op (mb, CEE_CALL, target_method);
+               }
+       } else {
+               if (static_method_with_first_arg_bound) {
+                       mono_mb_emit_ldloc (mb, local_target);
+                       if (!MONO_TYPE_IS_REFERENCE (invoke_sig->params[0]))
+                               mono_mb_emit_op (mb, CEE_UNBOX_ANY, mono_class_from_mono_type (invoke_sig->params[0]));
+               }
+               for (i = 0; i < sig->param_count; ++i)
+                       mono_mb_emit_ldarg (mb, i + 1);
+               mono_mb_emit_ldarg (mb, 0);
+               mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoDelegate, method_ptr));
+               mono_mb_emit_byte (mb, CEE_LDIND_I );
+               mono_mb_emit_op (mb, CEE_CALLI, invoke_sig);
+       }
 
-       /* return result */
-       mono_mb_patch_branch (mb, pos);
-       //mono_mb_emit_ldloc (mb, 0);
        mono_mb_emit_byte (mb, CEE_RET);
+
+       mb->skip_visibility = 1;
 #endif /* DISABLE_JIT */
 
-       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_RUNTIME_INVOKE_DYNAMIC);
+       if (ctx) {
+               MonoMethod *def;
 
-       mono_marshal_lock ();
-       /* double-checked locking */
-       if (!method)
-               method = mono_mb_create (mb, csig, 16, info);
+               def = mono_mb_create_and_cache (cache, cache_key, mb, sig, sig->param_count + 16);
+               res = cache_generic_delegate_wrapper (cache, orig_method, def, ctx);
+       } else if (callvirt) {
+               new_key = g_new0 (SignatureMethodPair, 1);
+               *new_key = key;
 
-       mono_marshal_unlock ();
+               info = mono_wrapper_info_create (mb, subtype);
 
+               res = mono_mb_create_and_cache_full (cache, new_key, mb, sig, sig->param_count + 16, info, &found);
+               if (found)
+                       g_free (new_key);
+       } else {
+               info = mono_wrapper_info_create (mb, subtype);
+
+               res = mono_mb_create_and_cache_full (cache, cache_key, mb, sig, sig->param_count + 16, info, NULL);
+       }
        mono_mb_free (mb);
 
-       return method;
+       return res;     
 }
 
-#ifndef DISABLE_JIT
-static void
-mono_mb_emit_auto_layout_exception (MonoMethodBuilder *mb, MonoClass *klass)
+/*
+ * the returned method invokes all methods in a multicast delegate.
+ */
+MonoMethod *
+mono_marshal_get_delegate_invoke (MonoMethod *method, MonoDelegate *del)
 {
-       char *msg = g_strdup_printf ("The type `%s.%s' layout needs to be Sequential or Explicit",
-                                    klass->name_space, klass->name);
+       gboolean callvirt = FALSE;
+       gboolean static_method_with_first_arg_bound = FALSE;
+       MonoMethod *target_method = NULL;
+       MonoMethodSignature *sig;
 
-       mono_mb_emit_exception_marshal_directive (mb, msg);
+       sig = mono_signature_no_pinvoke (method);
+
+       if (del && !del->target && del->method && mono_method_signature (del->method)->hasthis) {
+               callvirt = TRUE;
+               target_method = del->method;
+       }
+
+       if (del && del->method && mono_method_signature (del->method)->param_count == sig->param_count + 1 && (del->method->flags & METHOD_ATTRIBUTE_STATIC)) {
+               static_method_with_first_arg_bound = TRUE;
+               target_method = del->method;
+       }
+
+       return mono_marshal_get_delegate_invoke_internal (method, callvirt, static_method_with_first_arg_bound, target_method);
 }
-#endif
 
-#ifndef DISABLE_REMOTING
 /*
- * mono_marshal_get_ldfld_remote_wrapper:
- * @klass: The return type
+ * signature_dup_add_this:
  *
- * This method generates a wrapper for calling mono_load_remote_field_new.
- * The return type is ignored for now, as mono_load_remote_field_new () always
- * returns an object. In the future, to optimize some codepaths, we might
- * call a different function that takes a pointer to a valuetype, instead.
+ *  Make a copy of @sig, adding an explicit this argument.
  */
-MonoMethod *
-mono_marshal_get_ldfld_remote_wrapper (MonoClass *klass)
+static MonoMethodSignature*
+signature_dup_add_this (MonoImage *image, MonoMethodSignature *sig, MonoClass *klass)
 {
-       MonoMethodSignature *sig, *csig;
-       MonoMethodBuilder *mb;
-       MonoMethod *res;
-       static MonoMethod* cached = NULL;
+       MonoMethodSignature *res;
+       int i;
+
+       res = mono_metadata_signature_alloc (image, sig->param_count + 1);
+       memcpy (res, sig, MONO_SIZEOF_METHOD_SIGNATURE);
+       res->param_count = sig->param_count + 1;
+       res->hasthis = FALSE;
+       for (i = sig->param_count - 1; i >= 0; i --)
+               res->params [i + 1] = sig->params [i];
+       res->params [0] = klass->valuetype ? &klass->this_arg : &klass->byval_arg;
+
+       return res;
+}
+
+typedef struct {
+       MonoMethodSignature *ctor_sig;
+       MonoMethodSignature *sig;
+} CtorSigPair;
+
+/* protected by the marshal lock, contains CtorSigPair pointers */
+static GSList *strsig_list = NULL;
+
+static MonoMethodSignature *
+lookup_string_ctor_signature (MonoMethodSignature *sig)
+{
+       MonoMethodSignature *callsig;
+       CtorSigPair *cs;
+       GSList *item;
 
        mono_marshal_lock ();
-       if (cached) {
-               mono_marshal_unlock ();
-               return cached;
+       callsig = NULL;
+       for (item = strsig_list; item; item = item->next) {
+               cs = item->data;
+               /* mono_metadata_signature_equal () is safe to call with the marshal lock
+                * because it is lock-free.
+                */
+               if (mono_metadata_signature_equal (sig, cs->ctor_sig)) {
+                       callsig = cs->sig;
+                       break;
+               }
        }
        mono_marshal_unlock ();
+       return callsig;
+}
 
-       mb = mono_mb_new_no_dup_name (mono_defaults.object_class, "__mono_load_remote_field_new_wrapper", MONO_WRAPPER_LDFLD_REMOTE);
+static MonoMethodSignature *
+add_string_ctor_signature (MonoMethod *method)
+{
+       MonoMethodSignature *callsig;
+       CtorSigPair *cs;
 
-       mb->method->save_lmf = 1;
+       callsig = signature_dup (method->klass->image, mono_method_signature (method));
+       callsig->ret = &mono_defaults.string_class->byval_arg;
+       cs = g_new (CtorSigPair, 1);
+       cs->sig = callsig;
+       cs->ctor_sig = mono_method_signature (method);
 
-       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
-       sig->params [0] = &mono_defaults.object_class->byval_arg;
-       sig->params [1] = &mono_defaults.int_class->byval_arg;
-       sig->params [2] = &mono_defaults.int_class->byval_arg;
-       sig->ret = &mono_defaults.object_class->byval_arg;
+       mono_marshal_lock ();
+       strsig_list = g_slist_prepend (strsig_list, cs);
+       mono_marshal_unlock ();
+       return callsig;
+}
 
-#ifndef DISABLE_JIT
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldarg (mb, 1);
-       mono_mb_emit_ldarg (mb, 2);
+/*
+ * mono_marshal_get_string_ctor_signature:
+ *
+ *   Return the modified signature used by string ctors (they return the newly created
+ * string).
+ */
+MonoMethodSignature*
+mono_marshal_get_string_ctor_signature (MonoMethod *method)
+{
+       MonoMethodSignature *sig = lookup_string_ctor_signature (mono_method_signature (method));
+       if (!sig)
+               sig = add_string_ctor_signature (method);
 
-       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
-       csig->params [0] = &mono_defaults.object_class->byval_arg;
-       csig->params [1] = &mono_defaults.int_class->byval_arg;
-       csig->params [2] = &mono_defaults.int_class->byval_arg;
-       csig->ret = &mono_defaults.object_class->byval_arg;
-       csig->pinvoke = 1;
+       return sig;
+}
 
-       mono_mb_emit_native_call (mb, csig, mono_load_remote_field_new);
-       emit_thread_interrupt_checkpoint (mb);
+static MonoType*
+get_runtime_invoke_type (MonoType *t, gboolean ret)
+{
+       if (t->byref) {
+               if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t)))
+                       return t;
+               /* Can't share this with 'I' as that needs another indirection */
+               return &mono_defaults.int_class->this_arg;
+       }
 
-       mono_mb_emit_byte (mb, CEE_RET);
-#endif
+       if (MONO_TYPE_IS_REFERENCE (t))
+               return &mono_defaults.object_class->byval_arg;
 
-       mono_marshal_lock ();
-       res = cached;
-       mono_marshal_unlock ();
-       if (!res) {
-               MonoMethod *newm;
-               newm = mono_mb_create (mb, sig, 4, NULL);
-               mono_marshal_lock ();
-               res = cached;
-               if (!res) {
-                       res = newm;
-                       cached = res;
-                       mono_marshal_unlock ();
-               } else {
-                       mono_marshal_unlock ();
-                       mono_free_method (newm);
+       if (ret)
+               /* The result needs to be boxed */
+               return t;
+
+handle_enum:
+       switch (t->type) {
+               /* Can't share these as the argument needs to be loaded using sign/zero extension */
+               /*
+       case MONO_TYPE_U1:
+               return &mono_defaults.sbyte_class->byval_arg;
+       case MONO_TYPE_U2:
+               return &mono_defaults.int16_class->byval_arg;
+       case MONO_TYPE_U4:
+               return &mono_defaults.int32_class->byval_arg;
+               */
+       case MONO_TYPE_U8:
+               return &mono_defaults.int64_class->byval_arg;
+       case MONO_TYPE_BOOLEAN:
+               return &mono_defaults.byte_class->byval_arg;
+       case MONO_TYPE_CHAR:
+               return &mono_defaults.uint16_class->byval_arg;
+       case MONO_TYPE_U:
+       case MONO_TYPE_PTR:
+               return &mono_defaults.int_class->byval_arg;
+       case MONO_TYPE_VALUETYPE:
+               if (t->data.klass->enumtype) {
+                       t = mono_class_enum_basetype (t->data.klass);
+                       goto handle_enum;
                }
+               return t;
+       default:
+               return t;
        }
-       mono_mb_free (mb);
+}
+
+/*
+ * mono_marshal_get_runtime_invoke_sig:
+ *
+ *   Return a common signature used for sharing runtime invoke wrappers.
+ */
+static MonoMethodSignature*
+mono_marshal_get_runtime_invoke_sig (MonoMethodSignature *sig)
+{
+       MonoMethodSignature *res = mono_metadata_signature_dup (sig);
+       int i;
+
+       res->generic_param_count = 0;
+       res->ret = get_runtime_invoke_type (sig->ret, TRUE);
+       for (i = 0; i < res->param_count; ++i)
+               res->params [i] = get_runtime_invoke_type (sig->params [i], FALSE);
 
        return res;
 }
 
+static gboolean
+runtime_invoke_signature_equal (MonoMethodSignature *sig1, MonoMethodSignature *sig2)
+{
+       /* Can't share wrappers which return a vtype since it needs to be boxed */
+       if (sig1->ret != sig2->ret && !(MONO_TYPE_IS_REFERENCE (sig1->ret) && MONO_TYPE_IS_REFERENCE (sig2->ret)) && !mono_metadata_type_equal (sig1->ret, sig2->ret))
+               return FALSE;
+       else
+               return mono_metadata_signature_equal (sig1, sig2);
+}
+
+#ifndef DISABLE_JIT
+
 /*
- * mono_marshal_get_ldfld_wrapper:
- * @type: the type of the field
+ * emit_invoke_call:
  *
- * This method generates a function which can be use to load a field with type
- * @type from an object. The generated function has the following signature:
- * <@type> ldfld_wrapper (MonoObject *this, MonoClass *class, MonoClassField *field, int offset)
+ *   Emit the call to the wrapper method from a runtime invoke wrapper.
  */
-MonoMethod *
-mono_marshal_get_ldfld_wrapper (MonoType *type)
+static void
+emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
+                                 MonoMethodSignature *sig, MonoMethodSignature *callsig,
+                                 int loc_res,
+                                 gboolean virtual, gboolean need_direct_wrapper)
 {
-       MonoMethodSignature *sig;
-       MonoMethodBuilder *mb;
-       MonoMethod *res;
-       MonoClass *klass;
-       GHashTable *cache;
-       WrapperInfo *info;
-       char *name;
-       int t, pos0, pos1 = 0;
+       static MonoString *string_dummy = NULL;
+       int i;
+       int *tmp_nullable_locals;
+       gboolean void_ret = FALSE;
 
-       type = mono_type_get_underlying_type (type);
+       /* to make it work with our special string constructors */
+       if (!string_dummy) {
+               MONO_GC_REGISTER_ROOT_SINGLE (string_dummy);
+               string_dummy = mono_string_new_wrapper ("dummy");
+       }
 
-       t = type->type;
+       if (virtual) {
+               g_assert (sig->hasthis);
+               g_assert (method->flags & METHOD_ATTRIBUTE_VIRTUAL);
+       }
 
-       if (!type->byref) {
-               if (type->type == MONO_TYPE_SZARRAY) {
-                       klass = mono_defaults.array_class;
-               } else if (type->type == MONO_TYPE_VALUETYPE) {
-                       klass = type->data.klass;
-               } else if (t == MONO_TYPE_OBJECT || t == MONO_TYPE_CLASS || t == MONO_TYPE_STRING) {
-                       klass = mono_defaults.object_class;
-               } else if (t == MONO_TYPE_PTR || t == MONO_TYPE_FNPTR) {
-                       klass = mono_defaults.int_class;
-               } else if (t == MONO_TYPE_GENERICINST) {
-                       if (mono_type_generic_inst_is_valuetype (type))
-                               klass = mono_class_from_mono_type (type);
-                       else
-                               klass = mono_defaults.object_class;
+       if (sig->hasthis) {
+               if (method->string_ctor) {
+                       if (mono_gc_is_moving ()) {
+                               mono_mb_emit_ptr (mb, &string_dummy);
+                               mono_mb_emit_byte (mb, CEE_LDIND_REF);
+                       } else {
+                               mono_mb_emit_ptr (mb, string_dummy);
+                       }
                } else {
-                       klass = mono_class_from_mono_type (type);                       
+                       mono_mb_emit_ldarg (mb, 0);
                }
-       } else {
-               klass = mono_defaults.int_class;
        }
 
-       cache = get_cache (&klass->image->ldfld_wrapper_cache, mono_aligned_addr_hash, NULL);
-       if ((res = mono_marshal_find_in_cache (cache, klass)))
-               return res;
-
-       /* we add the %p pointer value of klass because class names are not unique */
-       name = g_strdup_printf ("__ldfld_wrapper_%p_%s.%s", klass, klass->name_space, klass->name); 
-       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_LDFLD);
-       g_free (name);
-
-       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
-       sig->params [0] = &mono_defaults.object_class->byval_arg;
-       sig->params [1] = &mono_defaults.int_class->byval_arg;
-       sig->params [2] = &mono_defaults.int_class->byval_arg;
-       sig->params [3] = &mono_defaults.int_class->byval_arg;
-       sig->ret = &klass->byval_arg;
+       tmp_nullable_locals = g_new0 (int, sig->param_count);
 
-#ifndef DISABLE_JIT
-       mono_mb_emit_ldarg (mb, 0);
-       pos0 = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+       for (i = 0; i < sig->param_count; i++) {
+               MonoType *t = sig->params [i];
+               int type;
 
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldarg (mb, 1);
-       mono_mb_emit_ldarg (mb, 2);
+               mono_mb_emit_ldarg (mb, 1);
+               if (i) {
+                       mono_mb_emit_icon (mb, sizeof (gpointer) * i);
+                       mono_mb_emit_byte (mb, CEE_ADD);
+               }
 
-       mono_mb_emit_managed_call (mb, mono_marshal_get_ldfld_remote_wrapper (klass), NULL);
+               if (t->byref) {
+                       mono_mb_emit_byte (mb, CEE_LDIND_I);
+                       /* A Nullable<T> type don't have a boxed form, it's either null or a boxed T.
+                        * So to make this work we unbox it to a local variablee and push a reference to that.
+                        */
+                       if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t))) {
+                               tmp_nullable_locals [i] = mono_mb_add_local (mb, &mono_class_from_mono_type (t)->byval_arg);
 
-       /*
-       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
-       csig->params [0] = &mono_defaults.object_class->byval_arg;
-       csig->params [1] = &mono_defaults.int_class->byval_arg;
-       csig->params [2] = &mono_defaults.int_class->byval_arg;
-       csig->ret = &klass->this_arg;
-       csig->pinvoke = 1;
+                               mono_mb_emit_op (mb, CEE_UNBOX_ANY, mono_class_from_mono_type (t));
+                               mono_mb_emit_stloc (mb, tmp_nullable_locals [i]);
+                               mono_mb_emit_ldloc_addr (mb, tmp_nullable_locals [i]);
+                       }
+                       continue;
+               }
 
-       mono_mb_emit_native_call (mb, csig, mono_load_remote_field_new);
-       emit_thread_interrupt_checkpoint (mb);
-       */
+               /*FIXME 'this doesn't handle generic enums. Shouldn't we?*/
+               type = sig->params [i]->type;
+handle_enum:
+               switch (type) {
+               case MONO_TYPE_I1:
+               case MONO_TYPE_BOOLEAN:
+               case MONO_TYPE_U1:
+               case MONO_TYPE_I2:
+               case MONO_TYPE_U2:
+               case MONO_TYPE_CHAR:
+               case MONO_TYPE_I:
+               case MONO_TYPE_U:
+               case MONO_TYPE_I4:
+               case MONO_TYPE_U4:
+               case MONO_TYPE_R4:
+               case MONO_TYPE_R8:
+               case MONO_TYPE_I8:
+               case MONO_TYPE_U8:
+                       mono_mb_emit_byte (mb, CEE_LDIND_I);
+                       mono_mb_emit_byte (mb, mono_type_to_ldind (sig->params [i]));
+                       break;
+               case MONO_TYPE_STRING:
+               case MONO_TYPE_CLASS:  
+               case MONO_TYPE_ARRAY:
+               case MONO_TYPE_PTR:
+               case MONO_TYPE_SZARRAY:
+               case MONO_TYPE_OBJECT:
+                       mono_mb_emit_byte (mb, mono_type_to_ldind (sig->params [i]));
+                       break;
+               case MONO_TYPE_GENERICINST:
+                       if (!mono_type_generic_inst_is_valuetype (sig->params [i])) {
+                               mono_mb_emit_byte (mb, mono_type_to_ldind (sig->params [i]));
+                               break;
+                       }
 
-       if (klass->valuetype) {
-               mono_mb_emit_op (mb, CEE_UNBOX, klass);
-               pos1 = mono_mb_emit_branch (mb, CEE_BR);
+                       /* fall through */
+               case MONO_TYPE_VALUETYPE:
+                       if (type == MONO_TYPE_VALUETYPE && t->data.klass->enumtype) {
+                               type = mono_class_enum_basetype (t->data.klass)->type;
+                               goto handle_enum;
+                       }
+                       mono_mb_emit_byte (mb, CEE_LDIND_I);
+                       if (mono_class_is_nullable (mono_class_from_mono_type (sig->params [i]))) {
+                               /* Need to convert a boxed vtype to an mp to a Nullable struct */
+                               mono_mb_emit_op (mb, CEE_UNBOX, mono_class_from_mono_type (sig->params [i]));
+                               mono_mb_emit_op (mb, CEE_LDOBJ, mono_class_from_mono_type (sig->params [i]));
+                       } else {
+                               mono_mb_emit_op (mb, CEE_LDOBJ, mono_class_from_mono_type (sig->params [i]));
+                       }
+                       break;
+               default:
+                       g_assert_not_reached ();
+               }
+       }
+       
+       if (virtual) {
+               mono_mb_emit_op (mb, CEE_CALLVIRT, method);
+       } else if (need_direct_wrapper) {
+               mono_mb_emit_op (mb, CEE_CALL, method);
        } else {
-               mono_mb_emit_byte (mb, CEE_RET);
+               mono_mb_emit_ldarg (mb, 3);
+               mono_mb_emit_calli (mb, callsig);
        }
 
+       if (sig->ret->byref) {
+               /* fixme: */
+               g_assert_not_reached ();
+       }
 
-       mono_mb_patch_branch (mb, pos0);
-
-       mono_mb_emit_ldarg (mb, 0);
-        mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
-        mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
-       mono_mb_emit_ldarg (mb, 3);
-       mono_mb_emit_byte (mb, CEE_ADD);
-
-       if (klass->valuetype)
-               mono_mb_patch_branch (mb, pos1);
-
-       switch (t) {
-       case MONO_TYPE_I1:
-       case MONO_TYPE_U1:
+       switch (sig->ret->type) {
+       case MONO_TYPE_VOID:
+               if (!method->string_ctor)
+                       void_ret = TRUE;
+               break;
        case MONO_TYPE_BOOLEAN:
        case MONO_TYPE_CHAR:
+       case MONO_TYPE_I1:
+       case MONO_TYPE_U1:
        case MONO_TYPE_I2:
        case MONO_TYPE_U2:
        case MONO_TYPE_I4:
        case MONO_TYPE_U4:
-       case MONO_TYPE_I8:
-       case MONO_TYPE_U8:
+       case MONO_TYPE_I:
+       case MONO_TYPE_U:
        case MONO_TYPE_R4:
        case MONO_TYPE_R8:
+       case MONO_TYPE_I8:
+       case MONO_TYPE_U8:
+       case MONO_TYPE_VALUETYPE:
+       case MONO_TYPE_TYPEDBYREF:
+       case MONO_TYPE_GENERICINST:
+               /* box value types */
+               mono_mb_emit_op (mb, CEE_BOX, mono_class_from_mono_type (sig->ret));
+               break;
+       case MONO_TYPE_STRING:
+       case MONO_TYPE_CLASS:  
        case MONO_TYPE_ARRAY:
        case MONO_TYPE_SZARRAY:
        case MONO_TYPE_OBJECT:
-       case MONO_TYPE_CLASS:
-       case MONO_TYPE_STRING:
-       case MONO_TYPE_I:
-       case MONO_TYPE_U:
-       case MONO_TYPE_PTR:
-       case MONO_TYPE_FNPTR:
-               mono_mb_emit_byte (mb, mono_type_to_ldind (type));
-               break;
-       case MONO_TYPE_VALUETYPE:
-               g_assert (!klass->enumtype);
-               mono_mb_emit_op (mb, CEE_LDOBJ, klass);
-               break;
-       case MONO_TYPE_GENERICINST:
-               if (mono_type_generic_inst_is_valuetype (type)) {
-                       mono_mb_emit_op (mb, CEE_LDOBJ, klass);
-               } else {
-                       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-               }
+               /* nothing to do */
                break;
-       case MONO_TYPE_VAR:
-       case MONO_TYPE_MVAR:
-               mono_mb_emit_op (mb, CEE_LDOBJ, klass);
+       case MONO_TYPE_PTR:
+               /* The result is an IntPtr */
+               mono_mb_emit_op (mb, CEE_BOX, mono_defaults.int_class);
                break;
        default:
-               g_warning ("type %x not implemented", type->type);
                g_assert_not_reached ();
        }
 
-       mono_mb_emit_byte (mb, CEE_RET);
-#endif /* DISABLE_JIT */
+       if (!void_ret)
+               mono_mb_emit_stloc (mb, loc_res);
 
-       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
-       info->d.proxy.klass = klass;
-       res = mono_mb_create_and_cache_full (cache, klass,
-                                                                                mb, sig, sig->param_count + 16, info, NULL);
-       mono_mb_free (mb);
-       
-       return res;
-}
+       /* Convert back nullable-byref arguments */
+       for (i = 0; i < sig->param_count; i++) {
+               MonoType *t = sig->params [i];
 
-/*
- * mono_marshal_get_ldflda_wrapper:
- * @type: the type of the field
- *
- * This method generates a function which can be used to load a field address
- * from an object. The generated function has the following signature:
- * gpointer ldflda_wrapper (MonoObject *this, MonoClass *class, MonoClassField *field, int offset);
- */
-MonoMethod *
-mono_marshal_get_ldflda_wrapper (MonoType *type)
-{
-       MonoMethodSignature *sig;
-       MonoMethodBuilder *mb;
-       MonoMethod *res;
-       MonoClass *klass;
-       GHashTable *cache;
-       WrapperInfo *info;
-       char *name;
-       int t, pos0, pos1, pos2, pos3;
+               /* 
+                * Box the result and put it back into the array, the caller will have
+                * to obtain it from there.
+                */
+               if (t->byref && t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t))) {
+                       mono_mb_emit_ldarg (mb, 1);                     
+                       mono_mb_emit_icon (mb, sizeof (gpointer) * i);
+                       mono_mb_emit_byte (mb, CEE_ADD);
 
-       type = mono_type_get_underlying_type (type);
-       t = type->type;
+                       mono_mb_emit_ldloc (mb, tmp_nullable_locals [i]);
+                       mono_mb_emit_op (mb, CEE_BOX, mono_class_from_mono_type (t));
 
-       if (!type->byref) {
-               if (type->type == MONO_TYPE_SZARRAY) {
-                       klass = mono_defaults.array_class;
-               } else if (type->type == MONO_TYPE_VALUETYPE) {
-                       klass = type->data.klass;
-               } else if (t == MONO_TYPE_OBJECT || t == MONO_TYPE_CLASS || t == MONO_TYPE_STRING ||
-                          t == MONO_TYPE_CLASS) { 
-                       klass = mono_defaults.object_class;
-               } else if (t == MONO_TYPE_PTR || t == MONO_TYPE_FNPTR) {
-                       klass = mono_defaults.int_class;
-               } else if (t == MONO_TYPE_GENERICINST) {
-                       if (mono_type_generic_inst_is_valuetype (type))
-                               klass = mono_class_from_mono_type (type);
-                       else
-                               klass = mono_defaults.object_class;
-               } else {
-                       klass = mono_class_from_mono_type (type);                       
+                       mono_mb_emit_byte (mb, CEE_STIND_REF);
                }
-       } else {
-               klass = mono_defaults.int_class;
        }
 
-       cache = get_cache (&klass->image->ldflda_wrapper_cache, mono_aligned_addr_hash, NULL);
-       if ((res = mono_marshal_find_in_cache (cache, klass)))
-               return res;
+       g_free (tmp_nullable_locals);
+}
+
+static void
+emit_runtime_invoke_body (MonoMethodBuilder *mb, MonoClass *target_klass, MonoMethod *method,
+                                                 MonoMethodSignature *sig, MonoMethodSignature *callsig,
+                                                 gboolean virtual, gboolean need_direct_wrapper)
+{
+       gint32 labels [16];
+       MonoExceptionClause *clause;
+       int loc_res, loc_exc;
+
+       /* The wrapper looks like this:
+        *
+        * <interrupt check>
+        * if (exc) {
+        *       try {
+        *         return <call>
+        *       } catch (Exception e) {
+        *     *exc = e;
+        *   }
+        * } else {
+        *     return <call>
+        * }
+        */
+
+       /* allocate local 0 (object) tmp */
+       loc_res = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+       /* allocate local 1 (object) exc */
+       loc_exc = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
 
-       /* we add the %p pointer value of klass because class names are not unique */
-       name = g_strdup_printf ("__ldflda_wrapper_%p_%s.%s", klass, klass->name_space, klass->name); 
-       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_LDFLDA);
-       g_free (name);
+       /* *exc is assumed to be initialized to NULL by the caller */
 
-       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
-       sig->params [0] = &mono_defaults.object_class->byval_arg;
-       sig->params [1] = &mono_defaults.int_class->byval_arg;
-       sig->params [2] = &mono_defaults.int_class->byval_arg;
-       sig->params [3] = &mono_defaults.int_class->byval_arg;
-       sig->ret = &mono_defaults.int_class->byval_arg;
+       mono_mb_emit_byte (mb, CEE_LDARG_2);
+       labels [0] = mono_mb_emit_branch (mb, CEE_BRFALSE);
 
-#ifndef DISABLE_JIT
-       /* if typeof (this) != transparent_proxy goto pos0 */
-       mono_mb_emit_ldarg (mb, 0);
-       pos0 = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+       /*
+        * if (exc) case
+        */
+       labels [1] = mono_mb_get_label (mb);
+       emit_thread_force_interrupt_checkpoint (mb);
+       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
 
-       /* if same_appdomain goto pos1 */
-       mono_mb_emit_ldarg (mb, 0);
-       pos1 = mono_mb_emit_xdomain_check (mb, CEE_BEQ);
+       labels [2] = mono_mb_emit_branch (mb, CEE_LEAVE);
 
-       mono_mb_emit_exception_full (mb, "System", "InvalidOperationException", "Attempt to load field address from object in another appdomain.");
+       /* Add a try clause around the call */
+       clause = mono_image_alloc0 (target_klass->image, sizeof (MonoExceptionClause));
+       clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
+       clause->data.catch_class = mono_defaults.exception_class;
+       clause->try_offset = labels [1];
+       clause->try_len = mono_mb_get_label (mb) - labels [1];
 
-       /* same app domain */
-       mono_mb_patch_branch (mb, pos1);
+       clause->handler_offset = mono_mb_get_label (mb);
 
-       /* if typeof (this) != contextbound goto pos2 */
-       mono_mb_emit_ldarg (mb, 0);
-       pos2 = mono_mb_emit_contextbound_check (mb, CEE_BEQ);
+       /* handler code */
+       mono_mb_emit_stloc (mb, loc_exc);       
+       mono_mb_emit_byte (mb, CEE_LDARG_2);
+       mono_mb_emit_ldloc (mb, loc_exc);
+       mono_mb_emit_byte (mb, CEE_STIND_REF);
 
-       /* if this->rp->context == mono_context_get goto pos3 */
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, context));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_icall (mb, mono_context_get);
-       pos3 = mono_mb_emit_branch (mb, CEE_BEQ);
+       mono_mb_emit_branch (mb, CEE_LEAVE);
 
-       mono_mb_emit_exception_full (mb, "System", "InvalidOperationException", "Attempt to load field address from object in another context.");
+       clause->handler_len = mono_mb_get_pos (mb) - clause->handler_offset;
 
-       mono_mb_patch_branch (mb, pos2);
-       mono_mb_patch_branch (mb, pos3);
+       mono_mb_set_clauses (mb, 1, clause);
 
-       /* return the address of the field from this->rp->unwrapped_server */
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, unwrapped_server));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
-       mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
-       mono_mb_emit_ldarg (mb, 3);
-       mono_mb_emit_byte (mb, CEE_ADD);
+       mono_mb_patch_branch (mb, labels [2]);
+       mono_mb_emit_ldloc (mb, loc_res);
        mono_mb_emit_byte (mb, CEE_RET);
 
-       /* not a proxy: return the address of the field directly */
-       mono_mb_patch_branch (mb, pos0);
-
-       mono_mb_emit_ldarg (mb, 0);
-        mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
-        mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
-       mono_mb_emit_ldarg (mb, 3);
-       mono_mb_emit_byte (mb, CEE_ADD);
+       /*
+        * if (!exc) case
+        */
+       mono_mb_patch_branch (mb, labels [0]);
+       emit_thread_force_interrupt_checkpoint (mb);
+       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
 
+       mono_mb_emit_ldloc (mb, 0);
        mono_mb_emit_byte (mb, CEE_RET);
-#endif
-
-       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
-       info->d.proxy.klass = klass;
-       res = mono_mb_create_and_cache_full (cache, klass,
-                                                                                mb, sig, sig->param_count + 16,
-                                                                                info, NULL);
-       mono_mb_free (mb);
-       
-       return res;
 }
+#endif
 
 /*
- * mono_marshal_get_stfld_remote_wrapper:
- * klass: The type of the field
+ * generates IL code for the runtime invoke function 
+ * MonoObject *runtime_invoke (MonoObject *this, void **params, MonoObject **exc, void* method)
  *
- *  This function generates a wrapper for calling mono_store_remote_field_new
- * with the appropriate signature.
- * Similarly to mono_marshal_get_ldfld_remote_wrapper () this doesn't depend on the
- * klass argument anymore.
+ * we also catch exceptions if exc != null
+ * If VIRTUAL is TRUE, then METHOD is invoked virtually on THIS. This is useful since
+ * it means that the compiled code for METHOD does not have to be looked up 
+ * before calling the runtime invoke wrapper. In this case, the wrapper ignores
+ * its METHOD argument.
  */
 MonoMethod *
-mono_marshal_get_stfld_remote_wrapper (MonoClass *klass)
+mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual)
 {
-       MonoMethodSignature *sig, *csig;
+       MonoMethodSignature *sig, *csig, *callsig;
        MonoMethodBuilder *mb;
-       MonoMethod *res;
-       static MonoMethod *cached = NULL;
+       GHashTable *cache = NULL;
+       MonoClass *target_klass;
+       MonoMethod *res = NULL;
+       static MonoMethodSignature *cctor_signature = NULL;
+       static MonoMethodSignature *finalize_signature = NULL;
+       char *name;
+       const char *param_names [16];
+       gboolean need_direct_wrapper = FALSE;
+       WrapperInfo *info;
 
-       mono_marshal_lock ();
-       if (cached) {
-               mono_marshal_unlock ();
-               return cached;
+       g_assert (method);
+
+       if (!cctor_signature) {
+               cctor_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
+               cctor_signature->ret = &mono_defaults.void_class->byval_arg;
+       }
+       if (!finalize_signature) {
+               finalize_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
+               finalize_signature->ret = &mono_defaults.void_class->byval_arg;
+               finalize_signature->hasthis = 1;
        }
-       mono_marshal_unlock ();
 
-       mb = mono_mb_new_no_dup_name (mono_defaults.object_class, "__mono_store_remote_field_new_wrapper", MONO_WRAPPER_STFLD_REMOTE);
+       if (virtual)
+               need_direct_wrapper = TRUE;
 
-       mb->method->save_lmf = 1;
+       /* 
+        * Use a separate cache indexed by methods to speed things up and to avoid the
+        * boundless mempool growth caused by the signature_dup stuff below.
+        */
+       if (virtual)
+               cache = get_cache (&method->klass->image->runtime_invoke_vcall_cache, mono_aligned_addr_hash, NULL);
+       else
+               cache = get_cache (&method->klass->image->runtime_invoke_direct_cache, mono_aligned_addr_hash, NULL);
+       res = mono_marshal_find_in_cache (cache, method);
+       if (res)
+               return res;
+               
+       if (method->klass->rank && (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
+               (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)) {
+               /* 
+                * Array Get/Set/Address methods. The JIT implements them using inline code
+                * so we need to create an invoke wrapper which calls the method directly.
+                */
+               need_direct_wrapper = TRUE;
+       }
+               
+       if (method->string_ctor) {
+               callsig = lookup_string_ctor_signature (mono_method_signature (method));
+               if (!callsig)
+                       callsig = add_string_ctor_signature (method);
+               /* Can't share this as we push a string as this */
+               need_direct_wrapper = TRUE;
+       } else {
+               if (method_is_dynamic (method))
+                       callsig = signature_dup (method->klass->image, mono_method_signature (method));
+               else
+                       callsig = mono_method_signature (method);
+       }
 
-       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
-       sig->params [0] = &mono_defaults.object_class->byval_arg;
-       sig->params [1] = &mono_defaults.int_class->byval_arg;
-       sig->params [2] = &mono_defaults.int_class->byval_arg;
-       sig->params [3] = &mono_defaults.object_class->byval_arg;
-       sig->ret = &mono_defaults.void_class->byval_arg;
+       target_klass = get_wrapper_target_class (method->klass->image);
 
-#ifndef DISABLE_JIT
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldarg (mb, 1);
-       mono_mb_emit_ldarg (mb, 2);
-       mono_mb_emit_ldarg (mb, 3);
+       /* Try to share wrappers for non-corlib methods with simple signatures */
+       if (mono_metadata_signature_equal (callsig, cctor_signature)) {
+               callsig = cctor_signature;
+               target_klass = mono_defaults.object_class;
+       } else if (mono_metadata_signature_equal (callsig, finalize_signature)) {
+               callsig = finalize_signature;
+               target_klass = mono_defaults.object_class;
+       }
 
-       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
-       csig->params [0] = &mono_defaults.object_class->byval_arg;
+       if (need_direct_wrapper) {
+               /* Already searched at the start */
+       } else {
+               MonoMethodSignature *tmp_sig;
+
+               callsig = mono_marshal_get_runtime_invoke_sig (callsig);
+
+               if (method->klass->valuetype && mono_method_signature (method)->hasthis)
+                       /* These have a different csig */
+                       cache = get_cache (&target_klass->image->runtime_invoke_vtype_cache,
+                                                          (GHashFunc)mono_signature_hash,
+                                                          (GCompareFunc)runtime_invoke_signature_equal);
+               else
+                       cache = get_cache (&target_klass->image->runtime_invoke_cache,
+                                                          (GHashFunc)mono_signature_hash,
+                                                          (GCompareFunc)runtime_invoke_signature_equal);
+
+               /* from mono_marshal_find_in_cache */
+               mono_marshal_lock ();
+               res = g_hash_table_lookup (cache, callsig);
+               mono_marshal_unlock ();
+
+               if (res) {
+                       g_free (callsig);
+                       return res;
+               }
+
+               /* Make a copy of the signature from the image mempool */
+               tmp_sig = callsig;
+               callsig = mono_metadata_signature_dup_full (target_klass->image, callsig);
+               g_free (tmp_sig);
+       }
+       
+       sig = mono_method_signature (method);
+
+       csig = mono_metadata_signature_alloc (target_klass->image, 4);
+
+       csig->ret = &mono_defaults.object_class->byval_arg;
+       if (method->klass->valuetype && mono_method_signature (method)->hasthis)
+               csig->params [0] = get_runtime_invoke_type (&method->klass->this_arg, FALSE);
+       else
+               csig->params [0] = &mono_defaults.object_class->byval_arg;
        csig->params [1] = &mono_defaults.int_class->byval_arg;
        csig->params [2] = &mono_defaults.int_class->byval_arg;
-       csig->params [3] = &mono_defaults.object_class->byval_arg;
-       csig->ret = &mono_defaults.void_class->byval_arg;
+       csig->params [3] = &mono_defaults.int_class->byval_arg;
        csig->pinvoke = 1;
+#if TARGET_WIN32
+       /* This is called from runtime code so it has to be cdecl */
+       csig->call_convention = MONO_CALL_C;
+#endif
 
-       mono_mb_emit_native_call (mb, csig, mono_store_remote_field_new);
-       emit_thread_interrupt_checkpoint (mb);
+       name = mono_signature_to_name (callsig, virtual ? "runtime_invoke_virtual" : "runtime_invoke");
+       mb = mono_mb_new (target_klass, name,  MONO_WRAPPER_RUNTIME_INVOKE);
+       g_free (name);
 
-       mono_mb_emit_byte (mb, CEE_RET);
+#ifndef DISABLE_JIT
+       param_names [0] = "this";
+       param_names [1] = "params";
+       param_names [2] = "exc";
+       param_names [3] = "method";
+       mono_mb_set_param_names (mb, param_names);
+
+       emit_runtime_invoke_body (mb, target_klass, method, sig, callsig, virtual, need_direct_wrapper);
 #endif
 
-       mono_marshal_lock ();
-       res = cached;
-       mono_marshal_unlock ();
-       if (!res) {
-               MonoMethod *newm;
-               newm = mono_mb_create (mb, sig, 6, NULL);
+       if (need_direct_wrapper) {
+#ifndef DISABLE_JIT
+               mb->skip_visibility = 1;
+#endif
+               info = mono_wrapper_info_create (mb, virtual ? WRAPPER_SUBTYPE_RUNTIME_INVOKE_VIRTUAL : WRAPPER_SUBTYPE_RUNTIME_INVOKE_DIRECT);
+               info->d.runtime_invoke.method = method;
+               res = mono_mb_create_and_cache_full (cache, method, mb, csig, sig->param_count + 16, info, NULL);
+       } else {
+               /* taken from mono_mb_create_and_cache */
                mono_marshal_lock ();
-               res = cached;
+               res = g_hash_table_lookup (cache, callsig);
+               mono_marshal_unlock ();
+
+               info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_RUNTIME_INVOKE_NORMAL);
+               info->d.runtime_invoke.sig = callsig;
+
+               /* Somebody may have created it before us */
                if (!res) {
-                       res = newm;
-                       cached = res;
-                       mono_marshal_unlock ();
-               } else {
+                       MonoMethod *newm;
+                       newm = mono_mb_create (mb, csig, sig->param_count + 16, info);
+
+                       mono_marshal_lock ();
+                       res = g_hash_table_lookup (cache, callsig);
+                       if (!res) {
+                               res = newm;
+                               g_hash_table_insert (cache, callsig, res);
+                               /* Can't insert it into wrapper_hash since the key is a signature */
+                               g_hash_table_insert (method->klass->image->runtime_invoke_direct_cache, method, res);
+                       } else {
+                               mono_free_method (newm);
+                       }
                        mono_marshal_unlock ();
-                       mono_free_method (newm);
                }
+
+               /* end mono_mb_create_and_cache */
        }
+
        mono_mb_free (mb);
-       
-       return res;
+
+       return res;     
 }
 
 /*
- * mono_marshal_get_stfld_wrapper:
- * @type: the type of the field
+ * mono_marshal_get_runtime_invoke_dynamic:
  *
- * This method generates a function which can be use to store a field with type
- * @type. The generated function has the following signature:
- * void stfld_wrapper (MonoObject *this, MonoClass *class, MonoClassField *field, int offset, <@type> val)
+ *   Return a method which can be used to invoke managed methods from native code
+ * dynamically.
+ * The signature of the returned method is given by RuntimeInvokeDynamicFunction:
+ * void runtime_invoke (void *args, MonoObject **exc, void *compiled_method)
+ * ARGS should point to an architecture specific structure containing 
+ * the arguments and space for the return value.
+ * The other arguments are the same as for runtime_invoke (), except that
+ * ARGS should contain the this argument too.
+ * This wrapper serves the same purpose as the runtime-invoke wrappers, but there
+ * is only one copy of it, which is useful in full-aot.
+ * The wrapper info for the wrapper is a WrapperInfo structure.
  */
-MonoMethod *
-mono_marshal_get_stfld_wrapper (MonoType *type)
+MonoMethod*
+mono_marshal_get_runtime_invoke_dynamic (void)
 {
-       MonoMethodSignature *sig;
+       static MonoMethod *method;
+       MonoMethodSignature *csig;
+       MonoExceptionClause *clause;
        MonoMethodBuilder *mb;
-       MonoMethod *res;
-       MonoClass *klass;
-       GHashTable *cache;
-       WrapperInfo *info;
+       int pos, posna;
        char *name;
-       int t, pos;
+       WrapperInfo *info;
 
-       type = mono_type_get_underlying_type (type);
-       t = type->type;
+       if (method)
+               return method;
 
-       if (!type->byref) {
-               if (type->type == MONO_TYPE_SZARRAY) {
-                       klass = mono_defaults.array_class;
-               } else if (type->type == MONO_TYPE_VALUETYPE) {
-                       klass = type->data.klass;
-               } else if (t == MONO_TYPE_OBJECT || t == MONO_TYPE_CLASS || t == MONO_TYPE_STRING) {
-                       klass = mono_defaults.object_class;
-               } else if (t == MONO_TYPE_PTR || t == MONO_TYPE_FNPTR) {
-                       klass = mono_defaults.int_class;
-               } else if (t == MONO_TYPE_GENERICINST) {
-                       if (mono_type_generic_inst_is_valuetype (type))
-                               klass = mono_class_from_mono_type (type);
-                       else
-                               klass = mono_defaults.object_class;
-               } else {
-                       klass = mono_class_from_mono_type (type);                       
-               }
-       } else {
-               klass = mono_defaults.int_class;
-       }
+       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
 
-       cache = get_cache (&klass->image->stfld_wrapper_cache, mono_aligned_addr_hash, NULL);
-       if ((res = mono_marshal_find_in_cache (cache, klass)))
-               return res;
+       csig->ret = &mono_defaults.void_class->byval_arg;
+       csig->params [0] = &mono_defaults.int_class->byval_arg;
+       csig->params [1] = &mono_defaults.int_class->byval_arg;
+       csig->params [2] = &mono_defaults.int_class->byval_arg;
+       csig->params [3] = &mono_defaults.int_class->byval_arg;
 
-       /* we add the %p pointer value of klass because class names are not unique */
-       name = g_strdup_printf ("__stfld_wrapper_%p_%s.%s", klass, klass->name_space, klass->name); 
-       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_STFLD);
+       name = g_strdup ("runtime_invoke_dynamic");
+       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_RUNTIME_INVOKE);
        g_free (name);
 
-       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 5);
-       sig->params [0] = &mono_defaults.object_class->byval_arg;
-       sig->params [1] = &mono_defaults.int_class->byval_arg;
-       sig->params [2] = &mono_defaults.int_class->byval_arg;
-       sig->params [3] = &mono_defaults.int_class->byval_arg;
-       sig->params [4] = &klass->byval_arg;
-       sig->ret = &mono_defaults.void_class->byval_arg;
-
 #ifndef DISABLE_JIT
-       mono_mb_emit_ldarg (mb, 0);
-       pos = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+       /* allocate local 0 (object) tmp */
+       mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+       /* allocate local 1 (object) exc */
+       mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
 
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldarg (mb, 1);
-       mono_mb_emit_ldarg (mb, 2);
-       mono_mb_emit_ldarg (mb, 4);
-       if (klass->valuetype)
-               mono_mb_emit_op (mb, CEE_BOX, klass);
+       /* cond set *exc to null */
+       mono_mb_emit_byte (mb, CEE_LDARG_1);
+       mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+       mono_mb_emit_byte (mb, 3);      
+       mono_mb_emit_byte (mb, CEE_LDARG_1);
+       mono_mb_emit_byte (mb, CEE_LDNULL);
+       mono_mb_emit_byte (mb, CEE_STIND_REF);
 
-       mono_mb_emit_managed_call (mb, mono_marshal_get_stfld_remote_wrapper (klass), NULL);
+       emit_thread_force_interrupt_checkpoint (mb);
 
-       mono_mb_emit_byte (mb, CEE_RET);
+       mono_mb_emit_byte (mb, CEE_LDARG_0);
+       mono_mb_emit_byte (mb, CEE_LDARG_2);
+       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+       mono_mb_emit_byte (mb, CEE_MONO_DYN_CALL);
 
-       mono_mb_patch_branch (mb, pos);
+       pos = mono_mb_emit_branch (mb, CEE_LEAVE);
 
-       mono_mb_emit_ldarg (mb, 0);
-        mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
-        mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
-       mono_mb_emit_ldarg (mb, 3);
-       mono_mb_emit_byte (mb, CEE_ADD);
-       mono_mb_emit_ldarg (mb, 4);
+       clause = mono_image_alloc0 (mono_defaults.corlib, sizeof (MonoExceptionClause));
+       clause->flags = MONO_EXCEPTION_CLAUSE_FILTER;
+       clause->try_len = mono_mb_get_label (mb);
 
-       switch (t) {
-       case MONO_TYPE_I1:
-       case MONO_TYPE_U1:
-       case MONO_TYPE_BOOLEAN:
-       case MONO_TYPE_CHAR:
-       case MONO_TYPE_I2:
-       case MONO_TYPE_U2:
-       case MONO_TYPE_I4:
-       case MONO_TYPE_U4:
-       case MONO_TYPE_I8:
-       case MONO_TYPE_U8:
-       case MONO_TYPE_R4:
-       case MONO_TYPE_R8:
-       case MONO_TYPE_ARRAY:
-       case MONO_TYPE_SZARRAY:
-       case MONO_TYPE_OBJECT:
-       case MONO_TYPE_CLASS:
-       case MONO_TYPE_STRING:
-       case MONO_TYPE_I:
-       case MONO_TYPE_U:
-       case MONO_TYPE_PTR:
-       case MONO_TYPE_FNPTR:
-               mono_mb_emit_byte (mb, mono_type_to_stind (type));
-               break;
-       case MONO_TYPE_VALUETYPE:
-               g_assert (!klass->enumtype);
-               mono_mb_emit_op (mb, CEE_STOBJ, klass);
-               break;
-       case MONO_TYPE_GENERICINST:
-       case MONO_TYPE_VAR:
-       case MONO_TYPE_MVAR:
-               mono_mb_emit_op (mb, CEE_STOBJ, klass);
-               break;
-       default:
-               g_warning ("type %x not implemented", type->type);
-               g_assert_not_reached ();
-       }
+       /* filter code */
+       clause->data.filter_offset = mono_mb_get_label (mb);
+       
+       mono_mb_emit_byte (mb, CEE_POP);
+       mono_mb_emit_byte (mb, CEE_LDARG_1);
+       mono_mb_emit_byte (mb, CEE_LDC_I4_0);
+       mono_mb_emit_byte (mb, CEE_PREFIX1);
+       mono_mb_emit_byte (mb, CEE_CGT_UN);
+       mono_mb_emit_byte (mb, CEE_PREFIX1);
+       mono_mb_emit_byte (mb, CEE_ENDFILTER);
+
+       clause->handler_offset = mono_mb_get_label (mb);
+
+       /* handler code */
+       /* store exception */
+       mono_mb_emit_stloc (mb, 1);
+       
+       mono_mb_emit_byte (mb, CEE_LDARG_1);
+       mono_mb_emit_ldloc (mb, 1);
+       mono_mb_emit_byte (mb, CEE_STIND_REF);
+
+       mono_mb_emit_byte (mb, CEE_LDNULL);
+       mono_mb_emit_stloc (mb, 0);
+
+       /* Check for the abort exception */
+       mono_mb_emit_ldloc (mb, 1);
+       mono_mb_emit_op (mb, CEE_ISINST, mono_defaults.threadabortexception_class);
+       posna = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
+
+       /* Delay the abort exception */
+       mono_mb_emit_icall (mb, ves_icall_System_Threading_Thread_ResetAbort);
+
+       mono_mb_patch_short_branch (mb, posna);
+       mono_mb_emit_branch (mb, CEE_LEAVE);
+
+       clause->handler_len = mono_mb_get_pos (mb) - clause->handler_offset;
+
+       mono_mb_set_clauses (mb, 1, clause);
 
+       /* return result */
+       mono_mb_patch_branch (mb, pos);
+       //mono_mb_emit_ldloc (mb, 0);
        mono_mb_emit_byte (mb, CEE_RET);
-#endif
+#endif /* DISABLE_JIT */
+
+       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_RUNTIME_INVOKE_DYNAMIC);
+
+       mono_marshal_lock ();
+       /* double-checked locking */
+       if (!method)
+               method = mono_mb_create (mb, csig, 16, info);
+
+       mono_marshal_unlock ();
 
-       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
-       info->d.proxy.klass = klass;
-       res = mono_mb_create_and_cache_full (cache, klass,
-                                                                                mb, sig, sig->param_count + 16,
-                                                                                info, NULL);
        mono_mb_free (mb);
-       
-       return res;
+
+       return method;
 }
-#endif /* DISABLE_REMOTING */
+
+#ifndef DISABLE_JIT
+static void
+mono_mb_emit_auto_layout_exception (MonoMethodBuilder *mb, MonoClass *klass)
+{
+       char *msg = g_strdup_printf ("The type `%s.%s' layout needs to be Sequential or Explicit",
+                                    klass->name_space, klass->name);
+
+       mono_mb_emit_exception_marshal_directive (mb, msg);
+}
+#endif
 
 /*
  * generates IL code for the icall wrapper (the generated method
@@ -9760,18 +7957,6 @@ mono_marshal_get_vtfixup_ftnptr (MonoImage *image, guint32 token, guint16 type)
        return mono_compile_method (method);
 }
 
-static MonoReflectionType *
-type_from_handle (MonoType *handle)
-{
-       MonoDomain *domain = mono_domain_get (); 
-       MonoClass *klass = mono_class_from_mono_type (handle);
-
-       MONO_ARCH_SAVE_REGS;
-
-       mono_class_init (klass);
-       return mono_type_get_object (domain, handle);
-}
-
 /*
  * This does the equivalent of mono_object_castclass_with_cache.
  * The wrapper info for the wrapper is a WrapperInfo structure.
@@ -10177,100 +8362,6 @@ mono_marshal_get_castclass (MonoClass *klass)
        return res;
 }
 
-#ifndef DISABLE_REMOTING
-MonoMethod *
-mono_marshal_get_proxy_cancast (MonoClass *klass)
-{
-       static MonoMethodSignature *isint_sig = NULL;
-       GHashTable *cache;
-       MonoMethod *res;
-       WrapperInfo *info;
-       int pos_failed, pos_end;
-       char *name, *klass_name;
-       MonoMethod *can_cast_to;
-       MonoMethodDesc *desc;
-       MonoMethodBuilder *mb;
-
-       cache = get_cache (&klass->image->proxy_isinst_cache, mono_aligned_addr_hash, NULL);
-       if ((res = mono_marshal_find_in_cache (cache, klass)))
-               return res;
-
-       if (!isint_sig) {
-               isint_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 1);
-               isint_sig->params [0] = &mono_defaults.object_class->byval_arg;
-               isint_sig->ret = &mono_defaults.object_class->byval_arg;
-               isint_sig->pinvoke = 0;
-       }
-
-       klass_name = mono_type_full_name (&klass->byval_arg);
-       name = g_strdup_printf ("__proxy_isinst_wrapper_%s", klass_name); 
-       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_PROXY_ISINST);
-       g_free (klass_name);
-       g_free (name);
-       
-       mb->method->save_lmf = 1;
-
-#ifndef DISABLE_JIT
-       /* get the real proxy from the transparent proxy*/
-       mono_mb_emit_ldarg (mb, 0);
-       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
-       mono_mb_emit_byte (mb, CEE_LDIND_REF);
-       
-       /* get the reflection type from the type handle */
-       mono_mb_emit_ptr (mb, &klass->byval_arg);
-       mono_mb_emit_icall (mb, type_from_handle);
-       
-       mono_mb_emit_ldarg (mb, 0);
-       
-       /* make the call to CanCastTo (type, ob) */
-       desc = mono_method_desc_new ("IRemotingTypeInfo:CanCastTo", FALSE);
-       can_cast_to = mono_method_desc_search_in_class (desc, mono_defaults.iremotingtypeinfo_class);
-       g_assert (can_cast_to);
-       mono_method_desc_free (desc);
-       mono_mb_emit_op (mb, CEE_CALLVIRT, can_cast_to);
-       
-       pos_failed = mono_mb_emit_branch (mb, CEE_BRFALSE);
-
-       /* Upgrade the proxy vtable by calling: mono_upgrade_remote_class_wrapper (type, ob)*/
-       mono_mb_emit_ptr (mb, &klass->byval_arg);
-       mono_mb_emit_icall (mb, type_from_handle);
-       mono_mb_emit_ldarg (mb, 0);
-       
-       mono_mb_emit_icall (mb, mono_upgrade_remote_class_wrapper);
-       emit_thread_interrupt_checkpoint (mb);
-       
-       mono_mb_emit_ldarg (mb, 0);
-       pos_end = mono_mb_emit_branch (mb, CEE_BR);
-       
-       /* fail */
-       
-       mono_mb_patch_branch (mb, pos_failed);
-       mono_mb_emit_byte (mb, CEE_LDNULL);
-       
-       /* the end */
-       
-       mono_mb_patch_branch (mb, pos_end);
-       mono_mb_emit_byte (mb, CEE_RET);
-#endif
-
-       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
-       info->d.proxy.klass = klass;
-       res = mono_mb_create_and_cache_full (cache, klass, mb, isint_sig, isint_sig->param_count + 16, info, NULL);
-       mono_mb_free (mb);
-
-       return res;
-}
-
-void
-mono_upgrade_remote_class_wrapper (MonoReflectionType *rtype, MonoTransparentProxy *tproxy)
-{
-       MonoClass *klass;
-       MonoDomain *domain = ((MonoObject*)tproxy)->vtable->domain;
-       klass = mono_class_from_mono_type (rtype->type);
-       mono_upgrade_remote_class (domain, (MonoObject*)tproxy, klass);
-}
-#endif /*DISABLE_REMOTING */
-
 /**
  * mono_marshal_get_struct_to_ptr:
  * @klass:
index 3ba8addbda74dfdc724f7cb4120e7bab4c0a879b..eb10aebac1f40742b17cdd28b1cc1357a9445772 100644 (file)
@@ -18,6 +18,7 @@
 #include <mono/metadata/opcodes.h>
 #include <mono/metadata/reflection.h>
 #include <mono/metadata/method-builder.h>
+#include <mono/metadata/remoting.h>
 
 #define mono_marshal_find_bitfield_offset(type, elem, byte_offset, bitmask) \
        do { \
@@ -289,6 +290,9 @@ mono_type_to_stind (MonoType *type) MONO_INTERNAL;
 MonoMethod *
 mono_marshal_method_from_wrapper (MonoMethod *wrapper) MONO_INTERNAL;
 
+WrapperInfo*
+mono_wrapper_info_create (MonoMethodBuilder *mb, WrapperSubtype subtype) MONO_INTERNAL;
+
 void
 mono_marshal_set_wrapper_info (MonoMethod *method, gpointer data) MONO_INTERNAL;
 
@@ -392,6 +396,12 @@ mono_marshal_free_dynamic_wrappers (MonoMethod *method) MONO_INTERNAL;
 void
 mono_marshal_free_inflated_wrappers (MonoMethod *method) MONO_INTERNAL;
 
+void
+mono_marshal_lock_internal (void) MONO_INTERNAL;
+
+void
+mono_marshal_unlock_internal (void) MONO_INTERNAL;
+
 /* marshaling internal calls */
 
 void * 
@@ -552,7 +562,7 @@ mono_marshal_find_nonzero_bit_offset (guint8 *buf, int len, int *byte_offset, gu
 MonoMethodSignature*
 mono_signature_no_pinvoke (MonoMethod *method) MONO_INTERNAL;
 
-/* Called from cominterop.c */
+/* Called from cominterop.c/remoting.c */
 
 void
 mono_marshal_emit_native_wrapper (MonoImage *image, MonoMethodBuilder *mb, MonoMethodSignature *sig, MonoMethodPInvoke *piinfo, MonoMarshalSpec **mspecs, gpointer func, gboolean aot, gboolean check_exceptions, gboolean func_param) MONO_INTERNAL;
@@ -573,46 +583,29 @@ mono_mb_create_and_cache (GHashTable *cache, gpointer key,
 void
 mono_marshal_emit_thread_interrupt_checkpoint (MonoMethodBuilder *mb) MONO_INTERNAL;
 
+void
+mono_marshal_emit_thread_force_interrupt_checkpoint (MonoMethodBuilder *mb) MONO_INTERNAL;
+
 void
 mono_marshal_use_aot_wrappers (gboolean use) MONO_INTERNAL;
 
 MonoObject *
 mono_marshal_xdomain_copy_value (MonoObject *val) MONO_INTERNAL;
 
+int
+mono_mb_emit_save_args (MonoMethodBuilder *mb, MonoMethodSignature *sig, gboolean save_this) MONO_INTERNAL;
 
-#ifndef DISABLE_REMOTING
-
-MonoMethod *
-mono_marshal_get_remoting_invoke (MonoMethod *method) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_xappdomain_invoke (MonoMethod *method) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTarget target_type) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_remoting_invoke_with_check (MonoMethod *method) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_stfld_wrapper (MonoType *type) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_ldfld_wrapper (MonoType *type) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_ldflda_wrapper (MonoType *type) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_ldfld_remote_wrapper (MonoClass *klass) MONO_INTERNAL;
-
-MonoMethod *
-mono_marshal_get_stfld_remote_wrapper (MonoClass *klass) MONO_INTERNAL;
+void
+mono_mb_emit_restore_result (MonoMethodBuilder *mb, MonoType *return_type) MONO_INTERNAL;
 
-MonoMethod *
-mono_marshal_get_proxy_cancast (MonoClass *klass) MONO_INTERNAL;
+MonoMethod*
+mono_mb_create (MonoMethodBuilder *mb, MonoMethodSignature *sig,
+                               int max_stack, WrapperInfo *info) MONO_INTERNAL;
 
-#endif
+MonoMethod*
+mono_mb_create_and_cache_full (GHashTable *cache, gpointer key,
+                                                          MonoMethodBuilder *mb, MonoMethodSignature *sig,
+                                                          int max_stack, WrapperInfo *info, gboolean *out_found) MONO_INTERNAL;
 
 G_END_DECLS
 
index dbf38777a71a60d855b036988160fe0c921dc724..f02703a31fa2b41e83600a8099d668f944931f13 100644 (file)
@@ -29,6 +29,8 @@
  */
 
 #define MEM_ALIGN 8
+#define ALIGN_SIZE(s)  (((s) + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1))
+#define SIZEOF_MEM_POOL        (ALIGN_SIZE (sizeof (MonoMemPool)))
 
 #if MONO_SMALL_CONFIG
 #define MONO_MEMPOOL_PAGESIZE 4096
@@ -91,8 +93,8 @@ mono_mempool_new_size (int initial_size)
        pool = g_malloc (initial_size);
 
        pool->next = NULL;
-       pool->pos = (guint8*)pool + sizeof (MonoMemPool);
-       pool->end = pool->pos + initial_size - sizeof (MonoMemPool);
+       pool->pos = (guint8*)pool + SIZEOF_MEM_POOL;
+       pool->end = pool->pos + initial_size - SIZEOF_MEM_POOL;
        pool->d.allocated = pool->size = initial_size;
        total_bytes_allocated += initial_size;
        return pool;
@@ -165,8 +167,8 @@ mono_mempool_empty (MonoMemPool *pool)
 
        pool->allocated = 0;
 #else
-       pool->pos = (guint8*)pool + sizeof (MonoMemPool);
-       pool->end = pool->pos + pool->size - sizeof (MonoMemPool);
+       pool->pos = (guint8*)pool + SIZEOF_MEM_POOL;
+       pool->end = pool->pos + pool->size - SIZEOF_MEM_POOL;
 #endif
 }
 
@@ -239,7 +241,7 @@ static int
 get_next_size (MonoMemPool *pool, int size)
 {
        int target = pool->next? pool->next->size: pool->size;
-       size += sizeof (MonoMemPool);
+       size += SIZEOF_MEM_POOL;
        /* increase the size */
        target += target / 2;
        while (target < size) {
@@ -264,8 +266,8 @@ gpointer
 mono_mempool_alloc (MonoMemPool *pool, guint size)
 {
        gpointer rval;
-       
-       size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
+
+       size = ALIGN_SIZE (size);
 
 #ifdef MALLOC_ALLOCATION
        {
@@ -291,25 +293,25 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
        if (G_UNLIKELY (pool->pos >= pool->end)) {
                pool->pos -= size;
                if (size >= 4096) {
-                       MonoMemPool *np = g_malloc (sizeof (MonoMemPool) + size);
+                       MonoMemPool *np = g_malloc (SIZEOF_MEM_POOL + size);
                        np->next = pool->next;
                        pool->next = np;
-                       np->pos = (guint8*)np + sizeof (MonoMemPool);
-                       np->size = sizeof (MonoMemPool) + size;
-                       np->end = np->pos + np->size - sizeof (MonoMemPool);
-                       pool->d.allocated += sizeof (MonoMemPool) + size;
-                       total_bytes_allocated += sizeof (MonoMemPool) + size;
-                       return (guint8*)np + sizeof (MonoMemPool);
+                       np->pos = (guint8*)np + SIZEOF_MEM_POOL;
+                       np->size = SIZEOF_MEM_POOL + size;
+                       np->end = np->pos + np->size - SIZEOF_MEM_POOL;
+                       pool->d.allocated += SIZEOF_MEM_POOL + size;
+                       total_bytes_allocated += SIZEOF_MEM_POOL + size;
+                       return (guint8*)np + SIZEOF_MEM_POOL;
                } else {
                        int new_size = get_next_size (pool, size);
                        MonoMemPool *np = g_malloc (new_size);
                        np->next = pool->next;
                        pool->next = np;
-                       pool->pos = (guint8*)np + sizeof (MonoMemPool);
-                       np->pos = (guint8*)np + sizeof (MonoMemPool);
+                       pool->pos = (guint8*)np + SIZEOF_MEM_POOL;
+                       np->pos = (guint8*)np + SIZEOF_MEM_POOL;
                        np->size = new_size;
                        np->end = np->pos;
-                       pool->end = pool->pos + new_size - sizeof (MonoMemPool);
+                       pool->end = pool->pos + new_size - SIZEOF_MEM_POOL;
                        pool->d.allocated += new_size;
                        total_bytes_allocated += new_size;
 
@@ -335,7 +337,7 @@ mono_mempool_alloc0 (MonoMemPool *pool, guint size)
 #ifdef MALLOC_ALLOCATION
        rval = mono_mempool_alloc (pool, size);
 #else
-       size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
+       size = ALIGN_SIZE (size);
 
        rval = pool->pos;
        pool->pos = (guint8*)rval + size;
diff --git a/mono/metadata/mono-debug-debugger.c b/mono/metadata/mono-debug-debugger.c
deleted file mode 100644 (file)
index 8168b2c..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * mono-debug-debugger.c: 
- *
- * Author:
- *     Mono Project (http://www.mono-project.com)
- *
- * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
- * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mono/metadata/assembly.h>
-#include <mono/metadata/metadata.h>
-#include <mono/metadata/tabledefs.h>
-#include <mono/metadata/tokentype.h>
-#include <mono/metadata/appdomain.h>
-#include <mono/metadata/gc-internal.h>
-#include <mono/metadata/threads.h>
-#include <mono/metadata/gc-internal.h>
-#include <mono/metadata/object-internals.h>
-#include <mono/metadata/class-internals.h>
-#include <mono/metadata/domain-internals.h>
-#include <mono/metadata/exception.h>
-#include <mono/metadata/mono-debug.h>
-#include <mono/metadata/mono-debug-debugger.h>
-#include <mono/metadata/mono-endian.h>
-
-static guint32 debugger_lock_level = 0;
-static mono_mutex_t debugger_lock_mutex;
-
-typedef struct
-{
-       guint32 index;
-       MonoMethod *method;
-       MonoDebugMethodAddressList *address_list;
-} MethodBreakpointInfo;
-
-static int initialized = 0;
-
-void
-mono_debugger_lock (void)
-{
-       g_assert (initialized);
-       mono_mutex_lock (&debugger_lock_mutex);
-       debugger_lock_level++;
-}
-
-void
-mono_debugger_unlock (void)
-{
-       g_assert (initialized);
-       debugger_lock_level--;
-       mono_mutex_unlock (&debugger_lock_mutex);
-}
-
-void
-mono_debugger_initialize ()
-{
-       mono_mutex_init_recursive (&debugger_lock_mutex);
-       initialized = 1;
-}
-
-/*
- * Debugger breakpoint interface.
- *
- * This interface is used to insert breakpoints on methods which are not yet JITed.
- * The debugging code keeps a list of all such breakpoints and automatically inserts the
- * breakpoint when the method is JITed.
- */
-
-static GPtrArray *method_breakpoints = NULL;
-
-MonoDebugMethodAddressList *
-mono_debugger_insert_method_breakpoint (MonoMethod *method, guint64 index)
-{
-       MethodBreakpointInfo *info;
-
-       info = g_new0 (MethodBreakpointInfo, 1);
-       info->method = method;
-       info->index = index;
-
-       info->address_list = mono_debug_lookup_method_addresses (method);
-
-       if (!method_breakpoints)
-               method_breakpoints = g_ptr_array_new ();
-
-       g_ptr_array_add (method_breakpoints, info);
-
-       return info->address_list;
-}
-
-int
-mono_debugger_remove_method_breakpoint (guint64 index)
-{
-       int i;
-
-       if (!method_breakpoints)
-               return 0;
-
-       for (i = 0; i < method_breakpoints->len; i++) {
-               MethodBreakpointInfo *info = g_ptr_array_index (method_breakpoints, i);
-
-               if (info->index != index)
-                       continue;
-
-               g_ptr_array_remove (method_breakpoints, info);
-               g_free (info->address_list);
-               g_free (info);
-               return 1;
-       }
-
-       return 0;
-}
index b8d13b6eec20ed2ced812ec530cd9369879ebcd3..c61a504be1520b33f9cd145da218e55a5cda4b10 100644 (file)
@@ -20,10 +20,4 @@ void            mono_debugger_unlock                        (void) MONO_INTERNAL
 gchar *
 mono_debugger_check_runtime_version (const char *filename) MONO_INTERNAL;
 
-MonoDebugMethodAddressList *
-mono_debugger_insert_method_breakpoint (MonoMethod *method, guint64 idx) MONO_INTERNAL;
-
-int
-mono_debugger_remove_method_breakpoint (guint64 index) MONO_INTERNAL;
-
 #endif /* __MONO_DEBUG_DEBUGGER_H__ */
index 5e5173f93234ccfcf34c9b0c509001e57f71a71d..1cfc8cf65f4c7be36104774704accb98545064ac 100644 (file)
 #include <mono/metadata/mono-debug-debugger.h>
 #include <mono/metadata/mono-endian.h>
 #include <mono/metadata/gc-internal.h>
+#include <mono/metadata/mempool.h>
 #include <string.h>
 
-#define DATA_TABLE_CHUNK_SIZE          (16384-sizeof (MonoDebugDataChunk))
-
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 
 #if NO_UNALIGNED_ACCESS
-#define RETURN_UNALIGNED(type, addr) \
-       { \
-               type val; \
-               memcpy(&val, p + offset, sizeof(val)); \
-               return val; \
-       }
 #define WRITE_UNALIGNED(type, addr, val) \
        memcpy(addr, &val, sizeof(type))
 #define READ_UNALIGNED(type, addr, val) \
        memcpy(&val, addr, sizeof(type))
 #else
-#define RETURN_UNALIGNED(type, addr) \
-       return *(type*)(p + offset);
 #define WRITE_UNALIGNED(type, addr, val) \
        (*(type *)(addr) = (val))
 #define READ_UNALIGNED(type, addr, val) \
        val = (*(type *)(addr))
 #endif
 
-typedef enum {
-       MONO_DEBUG_DATA_ITEM_UNKNOWN            = 0,
-       MONO_DEBUG_DATA_ITEM_CLASS,
-       MONO_DEBUG_DATA_ITEM_METHOD,
-       MONO_DEBUG_DATA_ITEM_DELEGATE_TRAMPOLINE
-} MonoDebugDataItemType;
-
-typedef struct _MonoDebugDataChunk MonoDebugDataChunk;
-
-struct _MonoDebugDataChunk {
-       guint32 total_size;
-       guint32 allocated_size;
-       guint32 current_offset;
-       guint32 dummy;
-       MonoDebugDataChunk *next;
-       guint8 data [MONO_ZERO_LEN_ARRAY];
-};
-
+/* This contains per-domain info */
 struct _MonoDebugDataTable {
-       gint32 domain;
-       gint32 _dummy; /* alignment for next field. */
-       MonoDebugDataChunk *first_chunk;
-       MonoDebugDataChunk *current_chunk;
-       GHashTable *method_hash;
+       MonoMemPool *mp;
        GHashTable *method_address_hash;
 };
 
-typedef struct {
-       const gchar *method_name;
-       const gchar *obsolete_cil_code;
-       guint32 wrapper_type;
-} MonoDebugWrapperData;
-
-typedef struct {
-       guint32 size;
-       guint32 symfile_id;
-       guint32 domain_id;
-       guint32 method_id;
-       MonoDebugWrapperData *wrapper_data;
-       MonoMethod *method;
-       GSList *address_list;
-} MonoDebugMethodHeader;
-
+/* This contains JIT debugging information about a method in serialized format */
 struct _MonoDebugMethodAddress {
-       MonoDebugMethodHeader header;
        const guint8 *code_start;
-       const guint8 *wrapper_addr;
        guint32 code_size;
        guint8 data [MONO_ZERO_LEN_ARRAY];
 };
 
-struct _MonoDebugClassEntry {
-       guint32 size;
-       guint8 data [MONO_ZERO_LEN_ARRAY];
-};
-
-typedef struct {
-       gpointer code;
-       guint32 size;
-} MonoDebugDelegateTrampolineEntry;
-
-static MonoSymbolTable *mono_symbol_table = NULL;
 static MonoDebugFormat mono_debug_format = MONO_DEBUG_FORMAT_NONE;
-static gint32 mono_debug_debugger_version = 5;
 
 static gboolean mono_debug_initialized = FALSE;
-static GHashTable *mono_debug_handles = NULL;
+/* Maps MonoImage -> MonoMonoDebugHandle */
+static GHashTable *mono_debug_handles;
+/* Maps MonoDomain -> MonoDataTable */
+static GHashTable *data_table_hash;
+
+static mono_mutex_t debugger_lock_mutex;
 
-static GHashTable *data_table_hash = NULL;
-static int next_symbol_file_id = 0;
+static int initialized = 0;
+static gboolean is_attached = FALSE;
 
 static MonoDebugHandle     *mono_debug_open_image      (MonoImage *image, const guint8 *raw_contents, int size);
 
-static MonoDebugHandle     *_mono_debug_get_image      (MonoImage *image);
+static MonoDebugHandle     *mono_debug_get_image      (MonoImage *image);
 static void                 mono_debug_add_assembly    (MonoAssembly *assembly,
                                                        gpointer user_data);
-static void                 mono_debug_add_type        (MonoClass *klass);
 
 static MonoDebugHandle     *open_symfile_from_bundle   (MonoImage *image);
 
-void _mono_debug_init_corlib (MonoDomain *domain);
-
-extern void (*mono_debugger_class_init_func) (MonoClass *klass);
-
 static MonoDebugDataTable *
 create_data_table (MonoDomain *domain)
 {
        MonoDebugDataTable *table;
-       MonoDebugDataChunk *chunk;
 
        table = g_new0 (MonoDebugDataTable, 1);
-       table->domain = domain ? mono_domain_get_id (domain) : -1;
 
+       table->mp = mono_mempool_new ();
        table->method_address_hash = g_hash_table_new (NULL, NULL);
-       table->method_hash = g_hash_table_new (NULL, NULL);
 
-       chunk = g_malloc0 (sizeof (MonoDebugDataChunk) + DATA_TABLE_CHUNK_SIZE);
-       chunk->total_size = DATA_TABLE_CHUNK_SIZE;
-
-       table->first_chunk = table->current_chunk = chunk;
-
-       if (domain) {
-               mono_debug_list_add (&mono_symbol_table->data_tables, table);
+       if (domain)
                g_hash_table_insert (data_table_hash, domain, table);
-       }
 
        return table;
 }
 
-static void
-free_header_data (gpointer key, gpointer value, gpointer user_data)
-{
-       MonoDebugMethodHeader *header = (MonoDebugMethodHeader*)value;
-
-       if (header->wrapper_data) {
-               g_free ((gpointer)header->wrapper_data->method_name);
-               g_free (header->wrapper_data);
-       }
-       g_slist_free (header->address_list);
-}
-
 static void
 free_data_table (MonoDebugDataTable *table)
 {
-       MonoDebugDataChunk *chunk, *next_chunk;
-
-       g_hash_table_foreach (table->method_hash, free_header_data, NULL);
-       g_hash_table_destroy (table->method_hash);
+       mono_mempool_destroy (table->mp);
        g_hash_table_destroy (table->method_address_hash);
 
-       table->method_hash = NULL;
-       table->method_address_hash = NULL;
-
-       chunk = table->first_chunk;
-       while (chunk) {
-               next_chunk = chunk->next;
-               g_free (chunk);
-               chunk = next_chunk;
-       }
-
-       table->first_chunk = table->current_chunk = NULL;
-       mono_debug_list_remove (&mono_symbol_table->data_tables, table);
        g_free (table);
 }
 
@@ -209,9 +114,7 @@ free_debug_handle (MonoDebugHandle *handle)
        if (handle->symfile)
                mono_debug_close_mono_symbol_file (handle->symfile);
        /* decrease the refcount added with mono_image_addref () */
-       free_data_table (handle->type_table);
        mono_image_close (handle->image);
-       g_free (handle->image_file);
        g_free (handle);
 }
 
@@ -229,53 +132,24 @@ mono_debug_init (MonoDebugFormat format)
        if (format == MONO_DEBUG_FORMAT_DEBUGGER)
                g_error ("The mdb debugger is no longer supported.");
 
-
        mono_debug_initialized = TRUE;
        mono_debug_format = format;
 
-       /*
-        * This must be called before mono_debugger_initialize(), because the
-        * latter registers GC roots.
-        */
-       mono_gc_base_init ();
-
        mono_debugger_initialize ();
 
        mono_debugger_lock ();
 
-       mono_symbol_table = g_new0 (MonoSymbolTable, 1);
-       mono_symbol_table->magic = MONO_DEBUGGER_MAGIC;
-       mono_symbol_table->version = MONO_DEBUGGER_MAJOR_VERSION;
-       mono_symbol_table->total_size = sizeof (MonoSymbolTable);
-
        mono_debug_handles = g_hash_table_new_full
                (NULL, NULL, NULL, (GDestroyNotify) free_debug_handle);
 
        data_table_hash = g_hash_table_new_full (
                NULL, NULL, NULL, (GDestroyNotify) free_data_table);
 
-       /* FIXME this is a disgusting hack. Kill it */
-       mono_debugger_class_init_func = mono_debug_add_type;
        mono_install_assembly_load_hook (mono_debug_add_assembly, NULL);
 
-       mono_symbol_table->global_data_table = create_data_table (NULL);
-
        mono_debugger_unlock ();
 }
 
-/*
- * INTERNAL USE ONLY !
- * FIXME this can have a decent name and exist in an internal header
- */
-void
-_mono_debug_init_corlib (MonoDomain *domain)
-{
-       if (!mono_debug_initialized)
-               return;
-
-       mono_symbol_table->corlib = mono_debug_open_image (mono_defaults.corlib, NULL, 0);
-}
-
 void
 mono_debug_open_image_from_memory (MonoImage *image, const guint8 *raw_contents, int size)
 {
@@ -296,14 +170,6 @@ mono_debug_cleanup (void)
                g_hash_table_destroy (data_table_hash);
                data_table_hash = NULL;
        }
-
-       if (mono_symbol_table) {
-               if (mono_symbol_table->global_data_table)
-                       free_data_table (mono_symbol_table->global_data_table);
-
-               g_free (mono_symbol_table);
-               mono_symbol_table = NULL;
-       }
 }
 
 void
@@ -348,7 +214,7 @@ mono_debug_domain_unload (MonoDomain *domain)
  * LOCKING: Assumes the debug lock is held.
  */
 static MonoDebugHandle *
-_mono_debug_get_image (MonoImage *image)
+mono_debug_get_image (MonoImage *image)
 {
        return g_hash_table_lookup (mono_debug_handles, image);
 }
@@ -363,13 +229,12 @@ mono_debug_close_image (MonoImage *image)
 
        mono_debugger_lock ();
 
-       handle = _mono_debug_get_image (image);
+       handle = mono_debug_get_image (image);
        if (!handle) {
                mono_debugger_unlock ();
                return;
        }
 
-       mono_debug_list_remove (&mono_symbol_table->symbol_files, handle);
        g_hash_table_remove (mono_debug_handles, image);
 
        mono_debugger_unlock ();
@@ -385,26 +250,20 @@ mono_debug_open_image (MonoImage *image, const guint8 *raw_contents, int size)
 
        mono_debugger_lock ();
 
-       handle = _mono_debug_get_image (image);
+       handle = mono_debug_get_image (image);
        if (handle != NULL) {
                mono_debugger_unlock ();
                return handle;
        }
 
        handle = g_new0 (MonoDebugHandle, 1);
-       handle->index = ++next_symbol_file_id;
 
        handle->image = image;
        mono_image_addref (image);
-       handle->image_file = g_strdup (mono_image_get_filename (image));
-
-       handle->type_table = create_data_table (NULL);
 
        handle->symfile = mono_debug_open_mono_symbols (
                handle, raw_contents, size, FALSE);
 
-       mono_debug_list_add (&mono_symbol_table->symbol_files, handle);
-
        g_hash_table_insert (mono_debug_handles, image, handle);
 
        mono_debugger_unlock ();
@@ -426,51 +285,6 @@ mono_debug_add_assembly (MonoAssembly *assembly, gpointer user_data)
        mono_debugger_unlock ();
 }
 
-static guint8 *
-allocate_data_item (MonoDebugDataTable *table, MonoDebugDataItemType type, guint32 size)
-{
-       guint32 chunk_size;
-       guint8 *data;
-
-       size = ALIGN_TO (size, sizeof (gpointer));
-
-       if (size + 16 < DATA_TABLE_CHUNK_SIZE)
-               chunk_size = DATA_TABLE_CHUNK_SIZE;
-       else
-               chunk_size = size + 16;
-
-       g_assert (table->current_chunk->current_offset == table->current_chunk->allocated_size);
-
-       if (table->current_chunk->allocated_size + size + 8 >= table->current_chunk->total_size) {
-               MonoDebugDataChunk *new_chunk;
-
-               new_chunk = g_malloc0 (sizeof (MonoDebugDataChunk) + chunk_size);
-               new_chunk->total_size = chunk_size;
-
-               table->current_chunk->next = new_chunk;
-               table->current_chunk = new_chunk;
-       }
-
-       data = &table->current_chunk->data [table->current_chunk->allocated_size];
-       table->current_chunk->allocated_size += size + 8;
-
-       * ((guint32 *) data) = size;
-       data += 4;
-       * ((guint32 *) data) = type;
-       data += 4;
-       return data;
-}
-
-static void
-write_data_item (MonoDebugDataTable *table, const guint8 *data)
-{
-       MonoDebugDataChunk *current_chunk = table->current_chunk;
-       guint32 size = * ((guint32 *) (data - 8));
-
-       g_assert (current_chunk->current_offset + size + 8 == current_chunk->allocated_size);
-       current_chunk->current_offset = current_chunk->allocated_size;
-}
-
 struct LookupMethodData
 {
        MonoDebugMethodInfo *minfo;
@@ -491,7 +305,7 @@ lookup_method_func (gpointer key, gpointer value, gpointer user_data)
 }
 
 static MonoDebugMethodInfo *
-_mono_debug_lookup_method (MonoMethod *method)
+mono_debug_lookup_method_internal (MonoMethod *method)
 {
        struct LookupMethodData data;
 
@@ -518,7 +332,7 @@ mono_debug_lookup_method (MonoMethod *method)
        MonoDebugMethodInfo *minfo;
 
        mono_debugger_lock ();
-       minfo = _mono_debug_lookup_method (method);
+       minfo = mono_debug_lookup_method_internal (method);
        mono_debugger_unlock ();
        return minfo;
 }
@@ -572,31 +386,20 @@ write_variable (MonoDebugVarInfo *var, guint8 *ptr, guint8 **rptr)
 MonoDebugMethodAddress *
 mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDomain *domain)
 {
-       MonoMethod *declaring;
        MonoDebugDataTable *table;
-       MonoDebugMethodHeader *header;
        MonoDebugMethodAddress *address;
        MonoDebugMethodInfo *minfo;
        MonoDebugHandle *handle;
        guint8 buffer [BUFSIZ];
        guint8 *ptr, *oldptr;
        guint32 i, size, total_size, max_size;
-       gboolean is_wrapper = FALSE;
 
        mono_debugger_lock ();
 
        table = lookup_data_table (domain);
 
-       handle = _mono_debug_get_image (method->klass->image);
-       minfo = _mono_debug_lookup_method (method);
-
-       if (!minfo || (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
-           (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
-           (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
-           (method->flags & METHOD_ATTRIBUTE_ABSTRACT) ||
-           (method->wrapper_type != MONO_WRAPPER_NONE)) {
-               is_wrapper = TRUE;
-       }
+       handle = mono_debug_get_image (method->klass->image);
+       minfo = mono_debug_lookup_method_internal (method);
 
        max_size = (5 * 5) + 1 + (10 * jit->num_line_numbers) +
                (25 + sizeof (gpointer)) * (1 + jit->num_params + jit->num_locals);
@@ -642,16 +445,9 @@ mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDoma
        if (method_is_dynamic (method)) {
                address = g_malloc0 (total_size);
        } else {
-               address = (MonoDebugMethodAddress *) allocate_data_item (
-                                 table, MONO_DEBUG_DATA_ITEM_METHOD, total_size);
+               address = mono_mempool_alloc (table->mp, total_size);
        }
 
-       address->header.size = total_size;
-       address->header.symfile_id = handle ? handle->index : 0;
-       address->header.domain_id = mono_domain_get_id (domain);
-       address->header.method_id = is_wrapper ? 0 : minfo->index;
-       address->header.method = method;
-
        address->code_start = jit->code_start;
        address->code_size = jit->code_size;
 
@@ -659,32 +455,8 @@ mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDoma
        if (max_size > BUFSIZ)
                g_free (oldptr);
 
-       declaring = method->is_inflated ? ((MonoMethodInflated *) method)->declaring : method;
-       header = g_hash_table_lookup (table->method_hash, declaring);
-
-       if (!header) {
-               header = &address->header;
-               g_hash_table_insert (table->method_hash, declaring, header);
-
-               if (is_wrapper) {
-                       MonoDebugWrapperData *wrapper;
-
-                       header->wrapper_data = wrapper = g_new0 (MonoDebugWrapperData, 1);
-
-                       wrapper->wrapper_type = method->wrapper_type;
-                       wrapper->method_name = mono_method_full_name (declaring, TRUE);
-                       wrapper->obsolete_cil_code = "";
-               }
-       } else {
-               address->header.wrapper_data = header->wrapper_data;
-               header->address_list = g_slist_prepend (header->address_list, address);
-       }
-
        g_hash_table_insert (table->method_address_hash, method, address);
 
-       if (!method_is_dynamic (method))
-               write_data_item (table, (guint8 *) address);
-
        mono_debugger_unlock ();
        return address;
 }
@@ -692,9 +464,7 @@ mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDoma
 void
 mono_debug_remove_method (MonoMethod *method, MonoDomain *domain)
 {
-       MonoMethod *declaring;
        MonoDebugDataTable *table;
-       MonoDebugMethodHeader *header;
        MonoDebugMethodAddress *address;
 
        if (!mono_debug_initialized)
@@ -706,19 +476,9 @@ mono_debug_remove_method (MonoMethod *method, MonoDomain *domain)
 
        table = lookup_data_table (domain);
 
-       declaring = method->is_inflated ? ((MonoMethodInflated *) method)->declaring : method;
-       g_hash_table_remove (table->method_hash, declaring);
-
        address = g_hash_table_lookup (table->method_address_hash, method);
-       if (address) {
-               header = &address->header;
-
-               if (header->wrapper_data) {
-                       g_free ((char*)header->wrapper_data->method_name);
-                       g_free (header->wrapper_data);
-               }
+       if (address)
                g_free (address);
-       }
 
        g_hash_table_remove (table->method_address_hash, method);
 
@@ -728,22 +488,6 @@ mono_debug_remove_method (MonoMethod *method, MonoDomain *domain)
 void
 mono_debug_add_delegate_trampoline (gpointer code, int size)
 {
-       MonoDebugDelegateTrampolineEntry *entry;
-
-       if (!mono_debug_initialized)
-               return;
-
-       mono_debugger_lock ();
-
-       entry = (MonoDebugDelegateTrampolineEntry *) allocate_data_item (
-               mono_symbol_table->global_data_table, MONO_DEBUG_DATA_ITEM_DELEGATE_TRAMPOLINE,
-               sizeof (MonoDebugDelegateTrampolineEntry));
-       entry->code = code;
-       entry->size = size;
-
-       write_data_item (mono_symbol_table->global_data_table, (guint8 *) entry);
-
-       mono_debugger_unlock ();
 }
 
 static inline guint32
@@ -825,7 +569,6 @@ mono_debug_read_method (MonoDebugMethodAddress *address)
        jit = g_new0 (MonoDebugMethodJitInfo, 1);
        jit->code_start = address->code_start;
        jit->code_size = address->code_size;
-       jit->wrapper_addr = address->wrapper_addr;
 
        ptr = (guint8 *) &address->data;
 
@@ -866,63 +609,6 @@ mono_debug_read_method (MonoDebugMethodAddress *address)
        return jit;
 }
 
-static void
-mono_debug_add_type (MonoClass *klass)
-{
-       MonoDebugHandle *handle;
-       MonoDebugClassEntry *entry;
-       guint8 buffer [BUFSIZ];
-       guint8 *ptr, *oldptr;
-       guint32 size, total_size, max_size;
-       int base_offset = 0;
-
-       if (klass->generic_class || klass->rank ||
-           (klass->byval_arg.type == MONO_TYPE_VAR) || (klass->byval_arg.type == MONO_TYPE_MVAR))
-               return;
-
-       mono_debugger_lock ();
-
-       handle = _mono_debug_get_image (klass->image);
-       if (!handle) {
-               mono_debugger_unlock ();
-               return;
-       }
-
-       max_size = 12 + sizeof (gpointer);
-       if (max_size > BUFSIZ)
-               ptr = oldptr = g_malloc (max_size);
-       else
-               ptr = oldptr = buffer;
-
-       if (klass->valuetype)
-               base_offset = - (int)(sizeof (MonoObject));
-
-       write_leb128 (klass->type_token, ptr, &ptr);
-       write_leb128 (klass->instance_size + base_offset, ptr, &ptr);
-       WRITE_UNALIGNED (gpointer, ptr, klass);
-       ptr += sizeof (gpointer);
-
-       size = ptr - oldptr;
-       g_assert (size < max_size);
-       total_size = size + sizeof (MonoDebugClassEntry);
-
-       g_assert (total_size + 9 < DATA_TABLE_CHUNK_SIZE);
-
-       entry = (MonoDebugClassEntry *) allocate_data_item (
-               handle->type_table, MONO_DEBUG_DATA_ITEM_CLASS, total_size);
-
-       entry->size = total_size;
-
-       memcpy (&entry->data, oldptr, size);
-
-       write_data_item (handle->type_table, (guint8 *) entry);
-
-       if (max_size > BUFSIZ)
-               g_free (oldptr);
-
-       mono_debugger_unlock ();
-}
-
 static MonoDebugMethodJitInfo *
 find_method (MonoMethod *method, MonoDomain *domain)
 {
@@ -952,71 +638,11 @@ mono_debug_find_method (MonoMethod *method, MonoDomain *domain)
        return res;
 }
 
-struct LookupMethodAddressData
-{
-       MonoMethod *method;
-       MonoDebugMethodHeader *result;
-};
-
-static void
-lookup_method_address_func (gpointer key, gpointer value, gpointer user_data)
-{
-       MonoDebugDataTable *table = (MonoDebugDataTable *) value;
-       struct LookupMethodAddressData *data = (struct LookupMethodAddressData *) user_data;
-       MonoDebugMethodHeader *header;
-
-       header = g_hash_table_lookup (table->method_hash, data->method);
-       if (header)
-               data->result = header;
-}
-
 MonoDebugMethodAddressList *
 mono_debug_lookup_method_addresses (MonoMethod *method)
 {
-       MonoDebugMethodAddressList *info;
-       MonoDebugMethodHeader *header = NULL;
-       struct LookupMethodAddressData data;
-       MonoMethod *declaring;
-       int count, size;
-       GSList *list;
-       guint8 *ptr;
-
-       g_assert ((mono_debug_debugger_version == 4) || (mono_debug_debugger_version == 5));
-
-       mono_debugger_lock ();
-
-       declaring = method->is_inflated ? ((MonoMethodInflated *) method)->declaring : method;
-
-       data.method = declaring;
-       data.result = NULL;
-
-       g_hash_table_foreach (data_table_hash, lookup_method_address_func, &data);
-       header = data.result;
-
-       if (!header) {
-               mono_debugger_unlock ();
-               return NULL;
-       }
-
-       count = g_slist_length (header->address_list) + 1;
-       size = sizeof (MonoDebugMethodAddressList) + count * sizeof (gpointer);
-
-       info = g_malloc0 (size);
-       info->size = size;
-       info->count = count;
-
-       ptr = info->data;
-
-       WRITE_UNALIGNED (gpointer, ptr, header);
-       ptr += sizeof (gpointer);
-
-       for (list = header->address_list; list; list = list->next) {
-               WRITE_UNALIGNED (gpointer, ptr, list->data);
-               ptr += sizeof (gpointer);
-       }
-
-       mono_debugger_unlock ();
-       return info;
+       g_assert_not_reached ();
+       return NULL;
 }
 
 static gint32
@@ -1085,7 +711,7 @@ mono_debug_lookup_source_location (MonoMethod *method, guint32 address, MonoDoma
                return NULL;
 
        mono_debugger_lock ();
-       minfo = _mono_debug_lookup_method (method);
+       minfo = mono_debug_lookup_method_internal (method);
        if (!minfo || !minfo->handle || !minfo->handle->symfile || !mono_debug_symfile_is_loaded (minfo->handle->symfile)) {
                mono_debugger_unlock ();
                return NULL;
@@ -1118,7 +744,7 @@ mono_debug_lookup_locals (MonoMethod *method)
                return NULL;
 
        mono_debugger_lock ();
-       minfo = _mono_debug_lookup_method (method);
+       minfo = mono_debug_lookup_method_internal (method);
        if (!minfo || !minfo->handle || !minfo->handle->symfile || !mono_debug_symfile_is_loaded (minfo->handle->symfile)) {
                mono_debugger_unlock ();
                return NULL;
@@ -1191,39 +817,6 @@ mono_debug_print_stack_frame (MonoMethod *method, guint32 native_offset, MonoDom
        return res;
 }
 
-void
-mono_debug_list_add (MonoDebugList **list, gconstpointer data)
-{
-       MonoDebugList *element, **ptr;
-
-       element = g_new0 (MonoDebugList, 1);
-       element->data = data;
-
-       for (ptr = list; *ptr; ptr = &(*ptr)->next)
-               ;
-
-       *ptr = element;
-}
-
-void
-mono_debug_list_remove (MonoDebugList **list, gconstpointer data)
-{
-       MonoDebugList **ptr;
-       MonoDebugList *next;
-
-       for (ptr = list; *ptr; ptr = &(*ptr)->next) {
-               if ((*ptr)->data != data)
-                       continue;
-
-               next = (*ptr)->next;
-               g_free ((*ptr));
-               *ptr = next;
-               break;
-       }
-}
-
-static gboolean is_attached = FALSE;
-
 void
 mono_set_is_debugger_attached (gboolean attached)
 {
@@ -1279,6 +872,27 @@ open_symfile_from_bundle (MonoImage *image)
        return NULL;
 }
 
+void
+mono_debugger_lock (void)
+{
+       g_assert (initialized);
+       mono_mutex_lock (&debugger_lock_mutex);
+}
+
+void
+mono_debugger_unlock (void)
+{
+       g_assert (initialized);
+       mono_mutex_unlock (&debugger_lock_mutex);
+}
+
+void
+mono_debugger_initialize ()
+{
+       mono_mutex_init_recursive (&debugger_lock_mutex);
+       initialized = 1;
+}
+
 /**
  * mono_debug_enabled:
  *
index 2106a6f3e5e884456c0bed773f68005118266527..839ae2c547f00a2ea1a8f37cc956c9a95bbf5843 100644 (file)
@@ -149,9 +149,6 @@ struct _MonoDebugVarInfo {
 #define MONO_DEBUGGER_MINOR_VERSION                    6
 #define MONO_DEBUGGER_MAGIC                            0x7aff65af4253d427ULL
 
-MONO_API void mono_debug_list_add (MonoDebugList **list, const void* data);
-MONO_API void mono_debug_list_remove (MonoDebugList **list, const void* data);
-
 MONO_API void mono_debug_init (MonoDebugFormat format);
 MONO_API void mono_debug_open_image_from_memory (MonoImage *image, const mono_byte *raw_contents, int size);
 MONO_API void mono_debug_cleanup (void);
index c9dfc05d3a44c75bf21991febafc1ce7e556633b..7c95c69a29faa9fdf0b42979d581a6895da1e773 100644 (file)
@@ -912,7 +912,7 @@ mono_mem_counter (ImplVtable *vtable, MonoBoolean only_value, MonoCounterSample
        sample->counterType = predef_counters [predef_categories [CATEGORY_MONO_MEM].first_counter + id].type;
        switch (id) {
        case COUNTER_MEM_NUM_OBJECTS:
-               sample->rawValue = mono_stats.new_object_count;
+               sample->rawValue = 0;
                return TRUE;
        case COUNTER_MEM_PHYS_TOTAL:
                sample->rawValue = mono_determine_physical_ram_size ();;
index 0e24c963d0c84b0bf5110eb3c89bf04b0db10299..11bb021a36f609702de4cd6d494c7017b22ed56d 100644 (file)
@@ -380,6 +380,7 @@ typedef struct {
        MonoObject obj;
        gint32 il_offset;
        gint32 native_offset;
+       gint64 method_address;
        MonoReflectionMethod *method;
        MonoString *filename;
        gint32 line;
index b9abf073f057b6bff0a1ddf21a1464150c2f24b9..8a7a582fa49ca38d2bd03ac07b377726997e23ce 100644 (file)
@@ -1851,6 +1851,27 @@ mono_class_try_get_vtable (MonoDomain *domain, MonoClass *class)
        return NULL;
 }
 
+static gpointer*
+alloc_vtable (MonoDomain *domain, size_t vtable_size, size_t imt_table_bytes)
+{
+       size_t alloc_offset;
+
+       /*
+        * We want the pointer to the MonoVTable aligned to 8 bytes because SGen uses three
+        * address bits.  The IMT has an odd number of entries, however, so on 32 bits the
+        * alignment will be off.  In that case we allocate 4 more bytes and skip over them.
+        */
+       if (sizeof (gpointer) == 4 && (imt_table_bytes & 7)) {
+               g_assert ((imt_table_bytes & 7) == 4);
+               vtable_size += 4;
+               alloc_offset = 4;
+       } else {
+               alloc_offset = 0;
+       }
+
+       return (gpointer*) ((char*)mono_domain_alloc0 (domain, vtable_size) + alloc_offset);
+}
+
 static MonoVTable *
 mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *class, gboolean raise_on_error)
 {
@@ -1859,7 +1880,7 @@ mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *class, gboolean
        MonoClassField *field;
        char *t;
        int i, vtable_slots;
-       int imt_table_bytes = 0;
+       size_t imt_table_bytes;
        int gc_bits;
        guint32 vtable_size, class_size;
        guint32 cindex;
@@ -1934,26 +1955,26 @@ mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *class, gboolean
                vtable_slots++;
 
        if (ARCH_USE_IMT) {
-               vtable_size = MONO_SIZEOF_VTABLE + vtable_slots * sizeof (gpointer);
                if (class->interface_offsets_count) {
                        imt_table_bytes = sizeof (gpointer) * (MONO_IMT_SIZE);
-                       vtable_size += sizeof (gpointer) * (MONO_IMT_SIZE);
                        mono_stats.imt_number_of_tables++;
-                       mono_stats.imt_tables_size += (sizeof (gpointer) * MONO_IMT_SIZE);
+                       mono_stats.imt_tables_size += imt_table_bytes;
+               } else {
+                       imt_table_bytes = 0;
                }
        } else {
-               vtable_size = sizeof (gpointer) * (class->max_interface_id + 1) +
-                       MONO_SIZEOF_VTABLE + vtable_slots * sizeof (gpointer);
+               imt_table_bytes = sizeof (gpointer) * (class->max_interface_id + 1);
        }
 
+       vtable_size = imt_table_bytes + MONO_SIZEOF_VTABLE + vtable_slots * sizeof (gpointer);
+
        mono_stats.used_class_count++;
        mono_stats.class_vtable_size += vtable_size;
-       interface_offsets = mono_domain_alloc0 (domain, vtable_size);
 
-       if (ARCH_USE_IMT)
-               vt = (MonoVTable*) ((char*)interface_offsets + imt_table_bytes);
-       else
-               vt = (MonoVTable*) (interface_offsets + class->max_interface_id + 1);
+       interface_offsets = alloc_vtable (domain, vtable_size, imt_table_bytes);
+       vt = (MonoVTable*) ((char*)interface_offsets + imt_table_bytes);
+       g_assert (!((gsize)vt & 7));
+
        vt->klass = class;
        vt->rank = class->rank;
        vt->domain = domain;
@@ -2220,6 +2241,7 @@ mono_class_proxy_vtable (MonoDomain *domain, MonoRemoteClass *remote_class, Mono
        gpointer *interface_offsets;
        uint8_t *bitmap;
        int bsize;
+       size_t imt_table_bytes;
        
 #ifdef COMPRESSED_INTERFACE_BITMAP
        int bcsize;
@@ -2266,22 +2288,21 @@ mono_class_proxy_vtable (MonoDomain *domain, MonoRemoteClass *remote_class, Mono
        }
 
        if (ARCH_USE_IMT) {
+               imt_table_bytes = sizeof (gpointer) * MONO_IMT_SIZE;
                mono_stats.imt_number_of_tables++;
-               mono_stats.imt_tables_size += (sizeof (gpointer) * MONO_IMT_SIZE);
-               vtsize = sizeof (gpointer) * (MONO_IMT_SIZE) +
-                       MONO_SIZEOF_VTABLE + class->vtable_size * sizeof (gpointer);
+               mono_stats.imt_tables_size += imt_table_bytes;
        } else {
-               vtsize = sizeof (gpointer) * (max_interface_id + 1) +
-                       MONO_SIZEOF_VTABLE + class->vtable_size * sizeof (gpointer);
+               imt_table_bytes = sizeof (gpointer) * (max_interface_id + 1);
        }
 
+       vtsize = imt_table_bytes + MONO_SIZEOF_VTABLE + class->vtable_size * sizeof (gpointer);
+
        mono_stats.class_vtable_size += vtsize + extra_interface_vtsize;
 
-       interface_offsets = mono_domain_alloc0 (domain, vtsize + extra_interface_vtsize);
-       if (ARCH_USE_IMT)
-               pvt = (MonoVTable*) (interface_offsets + MONO_IMT_SIZE);
-       else
-               pvt = (MonoVTable*) (interface_offsets + max_interface_id + 1);
+       interface_offsets = alloc_vtable (domain, vtsize + extra_interface_vtsize, imt_table_bytes);
+       pvt = (MonoVTable*) ((char*)interface_offsets + imt_table_bytes);
+       g_assert (!((gsize)pvt & 7));
+
        memcpy (pvt, vt, MONO_SIZEOF_VTABLE + class->vtable_size * sizeof (gpointer));
 
        pvt->klass = mono_defaults.transparent_proxy_class;
@@ -4368,7 +4389,6 @@ static inline void *
 mono_object_allocate (size_t size, MonoVTable *vtable)
 {
        MonoObject *o;
-       mono_stats.new_object_count++;
        ALLOC_OBJECT (o, vtable, size);
 
        return o;
@@ -4385,7 +4405,6 @@ static inline void *
 mono_object_allocate_ptrfree (size_t size, MonoVTable *vtable)
 {
        MonoObject *o;
-       mono_stats.new_object_count++;
        ALLOC_PTRFREE (o, vtable, size);
        return o;
 }
@@ -4395,7 +4414,6 @@ mono_object_allocate_spec (size_t size, MonoVTable *vtable)
 {
        void *o;
        ALLOC_TYPED (o, size, vtable);
-       mono_stats.new_object_count++;
 
        return o;
 }
@@ -4879,7 +4897,6 @@ mono_array_new_full (MonoDomain *domain, MonoClass *array_class, uintptr_t *leng
        else
                o = mono_gc_alloc_vector (vtable, byte_len, len);
        array = (MonoArray*)o;
-       mono_stats.new_object_count++;
 
        bounds = array->bounds;
 #endif
@@ -4964,7 +4981,6 @@ mono_array_new_specific (MonoVTable *vtable, uintptr_t n)
 #else
        o = mono_gc_alloc_vector (vtable, byte_len, n);
        ao = (MonoArray*)o;
-       mono_stats.new_object_count++;
 #endif
 
        if (G_UNLIKELY (profile_allocs))
diff --git a/mono/metadata/remoting.c b/mono/metadata/remoting.c
new file mode 100644 (file)
index 0000000..df77ff8
--- /dev/null
@@ -0,0 +1,2001 @@
+/*
+ * remoting.c: Remoting support
+ * 
+ * Copyright 2002-2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
+ * Copyright 2011-2014 Xamarin, Inc (http://www.xamarin.com)
+ *
+ */
+
+#include "config.h"
+
+#include "mono/metadata/remoting.h"
+#include "mono/metadata/marshal.h"
+#include "mono/metadata/abi-details.h"
+#include "mono/metadata/cominterop.h"
+#include "mono/metadata/tabledefs.h"
+#include "mono/metadata/exception.h"
+#include "mono/metadata/debug-helpers.h"
+
+typedef enum {
+       MONO_MARSHAL_NONE,                      /* No marshalling needed */
+       MONO_MARSHAL_COPY,                      /* Can be copied by value to the new domain */
+       MONO_MARSHAL_COPY_OUT,          /* out parameter that needs to be copied back to the original instance */
+       MONO_MARSHAL_SERIALIZE          /* Value needs to be serialized into the new domain */
+} MonoXDomainMarshalType;
+
+#ifndef DISABLE_REMOTING
+
+#define OPDEF(a,b,c,d,e,f,g,h,i,j) \
+       a = i,
+
+enum {
+#include "mono/cil/opcode.def"
+       LAST = 0xff
+};
+#undef OPDEF
+
+struct _MonoRemotingMethods {
+       MonoMethod *invoke;
+       MonoMethod *invoke_with_check;
+       MonoMethod *xdomain_invoke;
+       MonoMethod *xdomain_dispatch;
+};
+
+typedef struct _MonoRemotingMethods MonoRemotingMethods;
+
+static MonoObject *
+mono_remoting_wrapper (MonoMethod *method, gpointer *params);
+
+static gint32
+mono_marshal_set_domain_by_id (gint32 id, MonoBoolean push);
+
+static gboolean
+mono_marshal_check_domain_image (gint32 domain_id, MonoImage *image);
+
+MONO_API void
+mono_upgrade_remote_class_wrapper (MonoReflectionType *rtype, MonoTransparentProxy *tproxy);
+
+static MonoXDomainMarshalType
+mono_get_xdomain_marshal_type (MonoType *t);
+
+static void
+mono_marshal_xdomain_copy_out_value (MonoObject *src, MonoObject *dst);
+
+static MonoReflectionType *
+type_from_handle (MonoType *handle);
+
+static mono_mutex_t remoting_mutex;
+static gboolean remoting_mutex_inited;
+
+static MonoClass *byte_array_class;
+static MonoMethod *method_rs_serialize, *method_rs_deserialize, *method_exc_fixexc, *method_rs_appdomain_target;
+static MonoMethod *method_set_call_context, *method_needs_context_sink, *method_rs_serialize_exc;
+
+static void
+register_icall (gpointer func, const char *name, const char *sigstr, gboolean save)
+{
+       MonoMethodSignature *sig = mono_create_icall_signature (sigstr);
+
+       mono_register_jit_icall (func, name, sig, save);
+}
+
+static inline void
+remoting_lock (void)
+{
+       g_assert (remoting_mutex_inited);
+       mono_mutex_lock (&remoting_mutex);
+}
+
+static inline void
+remoting_unlock (void)
+{
+       g_assert (remoting_mutex_inited);
+       mono_mutex_unlock (&remoting_mutex);
+}
+
+/*
+ * Return the hash table pointed to by VAR, lazily creating it if neccesary.
+ */
+static GHashTable*
+get_cache (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func)
+{
+       if (!(*var)) {
+               remoting_lock ();
+               if (!(*var)) {
+                       GHashTable *cache = 
+                               g_hash_table_new (hash_func, equal_func);
+                       mono_memory_barrier ();
+                       *var = cache;
+               }
+               remoting_unlock ();
+       }
+       return *var;
+}
+
+static GHashTable*
+get_cache_full (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func, GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func)
+{
+       if (!(*var)) {
+               remoting_lock ();
+               if (!(*var)) {
+                       GHashTable *cache = 
+                               g_hash_table_new_full (hash_func, equal_func, key_destroy_func, value_destroy_func);
+                       mono_memory_barrier ();
+                       *var = cache;
+               }
+               remoting_unlock ();
+       }
+       return *var;
+}
+
+void
+mono_remoting_init (void)
+{
+       mono_mutex_init (&remoting_mutex);
+       remoting_mutex_inited = TRUE;
+}
+
+static void
+mono_remoting_marshal_init (void)
+{
+       MonoClass *klass;
+
+       static gboolean module_initialized = FALSE;
+
+       if (module_initialized)
+               return;
+
+       klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting", "RemotingServices");
+       method_rs_serialize = mono_class_get_method_from_name (klass, "SerializeCallData", -1);
+       method_rs_deserialize = mono_class_get_method_from_name (klass, "DeserializeCallData", -1);
+       method_rs_serialize_exc = mono_class_get_method_from_name (klass, "SerializeExceptionData", -1);
+       
+       klass = mono_defaults.real_proxy_class;
+       method_rs_appdomain_target = mono_class_get_method_from_name (klass, "GetAppDomainTarget", -1);
+       
+       klass = mono_defaults.exception_class;
+       method_exc_fixexc = mono_class_get_method_from_name (klass, "FixRemotingException", -1);
+       
+       byte_array_class = mono_array_class_get (mono_defaults.byte_class, 1);
+       
+       klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Messaging", "CallContext");
+       method_set_call_context = mono_class_get_method_from_name (klass, "SetCurrentCallContext", -1);
+       
+       klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Contexts", "Context");
+       method_needs_context_sink = mono_class_get_method_from_name (klass, "get_NeedsContextSink", -1);
+
+       register_icall (type_from_handle, "type_from_handle", "object ptr", FALSE);
+       register_icall (mono_marshal_set_domain_by_id, "mono_marshal_set_domain_by_id", "int32 int32 int32", FALSE);
+       register_icall (mono_marshal_check_domain_image, "mono_marshal_check_domain_image", "int32 int32 ptr", FALSE);
+       register_icall (mono_marshal_xdomain_copy_value, "mono_marshal_xdomain_copy_value", "object object", FALSE);
+       register_icall (mono_marshal_xdomain_copy_out_value, "mono_marshal_xdomain_copy_out_value", "void object object", FALSE);
+       register_icall (mono_remoting_wrapper, "mono_remoting_wrapper", "object ptr ptr", FALSE);
+       register_icall (mono_upgrade_remote_class_wrapper, "mono_upgrade_remote_class_wrapper", "void object object", FALSE);
+
+       module_initialized = TRUE;
+}
+
+static MonoReflectionType *
+type_from_handle (MonoType *handle)
+{
+       MonoDomain *domain = mono_domain_get (); 
+       MonoClass *klass = mono_class_from_mono_type (handle);
+
+       MONO_ARCH_SAVE_REGS;
+
+       mono_class_init (klass);
+       return mono_type_get_object (domain, handle);
+}
+
+#ifndef DISABLE_JIT
+static int
+mono_mb_emit_proxy_check (MonoMethodBuilder *mb, int branch_code)
+{
+       int pos;
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoObject, vtable));
+       mono_mb_emit_byte (mb, CEE_LDIND_I);
+       mono_mb_emit_icon (mb, MONO_STRUCT_OFFSET (MonoVTable, klass));
+       mono_mb_emit_byte (mb, CEE_ADD);
+       mono_mb_emit_byte (mb, CEE_LDIND_I);
+       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+       mono_mb_emit_byte (mb, CEE_MONO_CLASSCONST);
+       mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.transparent_proxy_class));
+       pos = mono_mb_emit_branch (mb, branch_code);
+       return pos;
+}
+
+static int
+mono_mb_emit_xdomain_check (MonoMethodBuilder *mb, int branch_code)
+{
+       int pos;
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, target_domain_id));
+       mono_mb_emit_byte (mb, CEE_LDIND_I4);
+       mono_mb_emit_icon (mb, -1);
+       pos = mono_mb_emit_branch (mb, branch_code);
+       return pos;
+}
+
+static int
+mono_mb_emit_contextbound_check (MonoMethodBuilder *mb, int branch_code)
+{
+       static int offset = -1;
+       static guint8 mask;
+
+       if (offset < 0)
+               mono_marshal_find_bitfield_offset (MonoClass, contextbound, &offset, &mask);
+
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, remote_class));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRemoteClass, proxy_class));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_ldflda (mb, offset);
+       mono_mb_emit_byte (mb, CEE_LDIND_U1);
+       mono_mb_emit_icon (mb, mask);
+       mono_mb_emit_byte (mb, CEE_AND);
+       mono_mb_emit_icon (mb, 0);
+       return mono_mb_emit_branch (mb, branch_code);
+}
+#endif /* !DISABLE_JIT */
+
+static inline MonoMethod*
+mono_marshal_remoting_find_in_cache (MonoMethod *method, int wrapper_type)
+{
+       MonoMethod *res = NULL;
+       MonoRemotingMethods *wrps;
+
+       mono_marshal_lock_internal ();
+       if (method->klass->image->remoting_invoke_cache)
+               wrps = g_hash_table_lookup (method->klass->image->remoting_invoke_cache, method);
+       else
+               wrps = NULL;
+
+       if (wrps) {
+               switch (wrapper_type) {
+               case MONO_WRAPPER_REMOTING_INVOKE: res = wrps->invoke; break;
+               case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: res = wrps->invoke_with_check; break;
+               case MONO_WRAPPER_XDOMAIN_INVOKE: res = wrps->xdomain_invoke; break;
+               case MONO_WRAPPER_XDOMAIN_DISPATCH: res = wrps->xdomain_dispatch; break;
+               }
+       }
+       
+       /* it is important to do the unlock after the load from wrps, since in
+        * mono_remoting_mb_create_and_cache () we drop the marshal lock to be able
+        * to take the loader lock and some other thread may set the fields.
+        */
+       mono_marshal_unlock_internal ();
+       return res;
+}
+
+/* Create the method from the builder and place it in the cache */
+static inline MonoMethod*
+mono_remoting_mb_create_and_cache (MonoMethod *key, MonoMethodBuilder *mb, 
+                                                               MonoMethodSignature *sig, int max_stack)
+{
+       MonoMethod **res = NULL;
+       MonoRemotingMethods *wrps;
+       GHashTable *cache = get_cache_full (&key->klass->image->remoting_invoke_cache, mono_aligned_addr_hash, NULL, NULL, g_free);
+
+       mono_marshal_lock_internal ();
+       wrps = g_hash_table_lookup (cache, key);
+       if (!wrps) {
+               wrps = g_new0 (MonoRemotingMethods, 1);
+               g_hash_table_insert (cache, key, wrps);
+       }
+
+       switch (mb->method->wrapper_type) {
+       case MONO_WRAPPER_REMOTING_INVOKE: res = &wrps->invoke; break;
+       case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: res = &wrps->invoke_with_check; break;
+       case MONO_WRAPPER_XDOMAIN_INVOKE: res = &wrps->xdomain_invoke; break;
+       case MONO_WRAPPER_XDOMAIN_DISPATCH: res = &wrps->xdomain_dispatch; break;
+       default: g_assert_not_reached (); break;
+       }
+       mono_marshal_unlock_internal ();
+
+       if (*res == NULL) {
+               MonoMethod *newm;
+               newm = mono_mb_create_method (mb, sig, max_stack);
+
+               mono_marshal_lock_internal ();
+               if (!*res) {
+                       *res = newm;
+                       mono_marshal_set_wrapper_info (*res, key);
+                       mono_marshal_unlock_internal ();
+               } else {
+                       mono_marshal_unlock_internal ();
+                       mono_free_method (newm);
+               }
+       }
+
+       return *res;
+}              
+
+static MonoObject *
+mono_remoting_wrapper (MonoMethod *method, gpointer *params)
+{
+       MonoMethodMessage *msg;
+       MonoTransparentProxy *this;
+       MonoObject *res, *exc;
+       MonoArray *out_args;
+
+       this = *((MonoTransparentProxy **)params [0]);
+
+       g_assert (this);
+       g_assert (((MonoObject *)this)->vtable->klass == mono_defaults.transparent_proxy_class);
+       
+       /* skip the this pointer */
+       params++;
+
+       if (mono_class_is_contextbound (this->remote_class->proxy_class) && this->rp->context == (MonoObject *) mono_context_get ())
+       {
+               int i;
+               MonoMethodSignature *sig = mono_method_signature (method);
+               int count = sig->param_count;
+               gpointer* mparams = (gpointer*) alloca(count*sizeof(gpointer));
+
+               for (i=0; i<count; i++) {
+                       MonoClass *class = mono_class_from_mono_type (sig->params [i]);
+                       if (class->valuetype) {
+                               if (sig->params [i]->byref) {
+                                       mparams[i] = *((gpointer *)params [i]);
+                               } else {
+                                       /* runtime_invoke expects a boxed instance */
+                                       if (mono_class_is_nullable (mono_class_from_mono_type (sig->params [i])))
+                                               mparams[i] = mono_nullable_box (params [i], class);
+                                       else
+                                               mparams[i] = params [i];
+                               }
+                       } else {
+                               mparams[i] = *((gpointer**)params [i]);
+                       }
+               }
+
+               return mono_runtime_invoke (method, method->klass->valuetype? mono_object_unbox ((MonoObject*)this): this, mparams, NULL);
+       }
+
+       msg = mono_method_call_message_new (method, params, NULL, NULL, NULL);
+
+       res = mono_remoting_invoke ((MonoObject *)this->rp, msg, &exc, &out_args);
+
+       if (exc)
+               mono_raise_exception ((MonoException *)exc);
+
+       mono_method_return_message_restore (method, params, out_args);
+
+       return res;
+} 
+
+MonoMethod *
+mono_marshal_get_remoting_invoke (MonoMethod *method)
+{
+       MonoMethodSignature *sig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       int params_var;
+
+       g_assert (method);
+
+       if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE || method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE)
+               return method;
+
+       /* this seems to be the best plase to put this, as all remoting invokes seem to get filtered through here */
+#ifndef DISABLE_COM
+       if (mono_class_is_com_object (method->klass) || method->klass == mono_class_get_com_object_class ()) {
+               MonoVTable *vtable = mono_class_vtable (mono_domain_get (), method->klass);
+               g_assert (vtable); /*FIXME do proper error handling*/
+
+               if (!mono_vtable_is_remote (vtable)) {
+                       return mono_cominterop_get_invoke (method);
+               }
+       }
+#endif
+
+       sig = mono_signature_no_pinvoke (method);
+
+       /* we cant remote methods without this pointer */
+       if (!sig->hasthis)
+               return method;
+
+       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_REMOTING_INVOKE)))
+               return res;
+
+       mono_remoting_marshal_init ();
+
+       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_REMOTING_INVOKE);
+
+#ifndef DISABLE_JIT
+       mb->method->save_lmf = 1;
+
+       params_var = mono_mb_emit_save_args (mb, sig, TRUE);
+
+       mono_mb_emit_ptr (mb, method);
+       mono_mb_emit_ldloc (mb, params_var);
+       mono_mb_emit_icall (mb, mono_remoting_wrapper);
+       mono_marshal_emit_thread_interrupt_checkpoint (mb);
+
+       if (sig->ret->type == MONO_TYPE_VOID) {
+               mono_mb_emit_byte (mb, CEE_POP);
+               mono_mb_emit_byte (mb, CEE_RET);
+       } else {
+                mono_mb_emit_restore_result (mb, sig->ret);
+       }
+#endif
+
+       res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
+       mono_mb_free (mb);
+
+       return res;
+}
+
+/* mono_marshal_xdomain_copy_out_value()
+ * Copies the contents of the src instance into the dst instance. src and dst
+ * must have the same type, and if they are arrays, the same size.
+ */
+static void
+mono_marshal_xdomain_copy_out_value (MonoObject *src, MonoObject *dst)
+{
+       if (src == NULL || dst == NULL) return;
+       
+       g_assert (mono_object_class (src) == mono_object_class (dst));
+
+       switch (mono_object_class (src)->byval_arg.type) {
+       case MONO_TYPE_ARRAY:
+       case MONO_TYPE_SZARRAY: {
+               int mt = mono_get_xdomain_marshal_type (&(mono_object_class (src)->element_class->byval_arg));
+               if (mt == MONO_MARSHAL_SERIALIZE) return;
+               if (mt == MONO_MARSHAL_COPY) {
+                       int i, len = mono_array_length ((MonoArray *)dst);
+                       for (i = 0; i < len; i++) {
+                               MonoObject *item = mono_array_get ((MonoArray *)src, gpointer, i);
+                               mono_array_setref ((MonoArray *)dst, i, mono_marshal_xdomain_copy_value (item));
+                       }
+               } else {
+                       mono_array_full_copy ((MonoArray *)src, (MonoArray *)dst);
+               }
+               return;
+       }
+       }
+
+       if (mono_object_class (src) == mono_defaults.stringbuilder_class) {
+               MonoStringBuilder *src_sb = (MonoStringBuilder *) src;
+               MonoStringBuilder *dst_sb = (MonoStringBuilder *) dst;
+       
+               MONO_OBJECT_SETREF (dst_sb, str, mono_string_new_utf16 (mono_object_domain (dst), mono_string_chars (src_sb->str), mono_string_length (src_sb->str)));
+               dst_sb->cached_str = NULL;
+               dst_sb->length = src_sb->length;
+       }
+}
+
+
+#if !defined (DISABLE_JIT)
+static void
+mono_marshal_emit_xdomain_copy_value (MonoMethodBuilder *mb, MonoClass *pclass)
+{
+       mono_mb_emit_icall (mb, mono_marshal_xdomain_copy_value);
+       mono_mb_emit_op (mb, CEE_CASTCLASS, pclass);
+}
+
+static void
+mono_marshal_emit_xdomain_copy_out_value (MonoMethodBuilder *mb, MonoClass *pclass)
+{
+       mono_mb_emit_icall (mb, mono_marshal_xdomain_copy_out_value);
+}
+#endif
+
+/* mono_marshal_supports_fast_xdomain()
+ * Returns TRUE if the method can use the fast xdomain wrapper.
+ */
+static gboolean
+mono_marshal_supports_fast_xdomain (MonoMethod *method)
+{
+       return !mono_class_is_contextbound (method->klass) &&
+                  !((method->flags & METHOD_ATTRIBUTE_SPECIAL_NAME) && (strcmp (".ctor", method->name) == 0));
+}
+
+static gint32
+mono_marshal_set_domain_by_id (gint32 id, MonoBoolean push)
+{
+       MonoDomain *current_domain = mono_domain_get ();
+       MonoDomain *domain = mono_domain_get_by_id (id);
+
+       if (!domain || !mono_domain_set (domain, FALSE))        
+               mono_raise_exception (mono_get_exception_appdomain_unloaded ());
+
+       if (push)
+               mono_thread_push_appdomain_ref (domain);
+       else
+               mono_thread_pop_appdomain_ref ();
+
+       return current_domain->domain_id;
+}
+
+#if !defined (DISABLE_JIT)
+static void
+mono_marshal_emit_switch_domain (MonoMethodBuilder *mb)
+{
+       mono_mb_emit_icall (mb, mono_marshal_set_domain_by_id);
+}
+
+/* mono_marshal_emit_load_domain_method ()
+ * Loads into the stack a pointer to the code of the provided method for
+ * the current domain.
+ */
+static void
+mono_marshal_emit_load_domain_method (MonoMethodBuilder *mb, MonoMethod *method)
+{
+       /* We need a pointer to the method for the running domain (not the domain
+        * that compiles the method).
+        */
+       mono_mb_emit_ptr (mb, method);
+       mono_mb_emit_icall (mb, mono_compile_method);
+}
+#endif
+
+/* mono_marshal_check_domain_image ()
+ * Returns TRUE if the image is loaded in the specified
+ * application domain.
+ */
+static gboolean
+mono_marshal_check_domain_image (gint32 domain_id, MonoImage *image)
+{
+       MonoAssembly* ass;
+       GSList *tmp;
+       
+       MonoDomain *domain = mono_domain_get_by_id (domain_id);
+       if (!domain)
+               return FALSE;
+       
+       mono_domain_assemblies_lock (domain);
+       for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
+               ass = tmp->data;
+               if (ass->image == image)
+                       break;
+       }
+       mono_domain_assemblies_unlock (domain);
+       
+       return tmp != NULL;
+}
+
+/* mono_marshal_get_xappdomain_dispatch ()
+ * Generates a method that dispatches a method call from another domain into
+ * the current domain.
+ */
+static MonoMethod *
+mono_marshal_get_xappdomain_dispatch (MonoMethod *method, int *marshal_types, int complex_count, int complex_out_count, int ret_marshal_type)
+{
+       MonoMethodSignature *sig, *csig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       int i, j, param_index, copy_locals_base;
+       MonoClass *ret_class = NULL;
+       int loc_array=0, loc_return=0, loc_serialized_exc=0;
+       MonoExceptionClause *main_clause;
+       int pos, pos_leave;
+       gboolean copy_return;
+
+       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_XDOMAIN_DISPATCH)))
+               return res;
+
+       sig = mono_method_signature (method);
+       copy_return = (sig->ret->type != MONO_TYPE_VOID && ret_marshal_type != MONO_MARSHAL_SERIALIZE);
+
+       j = 0;
+       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3 + sig->param_count - complex_count);
+       csig->params [j++] = &mono_defaults.object_class->byval_arg;
+       csig->params [j++] = &byte_array_class->this_arg;
+       csig->params [j++] = &byte_array_class->this_arg;
+       for (i = 0; i < sig->param_count; i++) {
+               if (marshal_types [i] != MONO_MARSHAL_SERIALIZE)
+                       csig->params [j++] = sig->params [i];
+       }
+       if (copy_return)
+               csig->ret = sig->ret;
+       else
+               csig->ret = &mono_defaults.void_class->byval_arg;
+       csig->pinvoke = 1;
+       csig->hasthis = FALSE;
+
+       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_XDOMAIN_DISPATCH);
+       mb->method->save_lmf = 1;
+
+#ifndef DISABLE_JIT
+       /* Locals */
+
+       loc_serialized_exc = mono_mb_add_local (mb, &byte_array_class->byval_arg);
+       if (complex_count > 0)
+               loc_array = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+       if (sig->ret->type != MONO_TYPE_VOID) {
+               loc_return = mono_mb_add_local (mb, sig->ret);
+               ret_class = mono_class_from_mono_type (sig->ret);
+       }
+
+       /* try */
+
+       main_clause = mono_image_alloc0 (method->klass->image, sizeof (MonoExceptionClause));
+       main_clause->try_offset = mono_mb_get_label (mb);
+
+       /* Clean the call context */
+
+       mono_mb_emit_byte (mb, CEE_LDNULL);
+       mono_mb_emit_managed_call (mb, method_set_call_context, NULL);
+       mono_mb_emit_byte (mb, CEE_POP);
+
+       /* Deserialize call data */
+
+       mono_mb_emit_ldarg (mb, 1);
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_byte (mb, CEE_DUP);
+       pos = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
+       
+       mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+       mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+       
+       if (complex_count > 0)
+               mono_mb_emit_stloc (mb, loc_array);
+       else
+               mono_mb_emit_byte (mb, CEE_POP);
+
+       mono_mb_patch_short_branch (mb, pos);
+
+       /* Get the target object */
+       
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_managed_call (mb, method_rs_appdomain_target, NULL);
+
+       /* Load the arguments */
+       
+       copy_locals_base = mb->locals;
+       param_index = 3;        // Index of the first non-serialized parameter of this wrapper
+       j = 0;
+       for (i = 0; i < sig->param_count; i++) {
+               MonoType *pt = sig->params [i];
+               MonoClass *pclass = mono_class_from_mono_type (pt);
+               switch (marshal_types [i]) {
+               case MONO_MARSHAL_SERIALIZE: {
+                       /* take the value from the serialized array */
+                       mono_mb_emit_ldloc (mb, loc_array);
+                       mono_mb_emit_icon (mb, j++);
+                       if (pt->byref) {
+                               if (pclass->valuetype) {
+                                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+                                       mono_mb_emit_op (mb, CEE_UNBOX, pclass);
+                               } else {
+                                       mono_mb_emit_op (mb, CEE_LDELEMA, pclass);
+                               }
+                       } else {
+                               if (pclass->valuetype) {
+                                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+                                       mono_mb_emit_op (mb, CEE_UNBOX, pclass);
+                                       mono_mb_emit_op (mb, CEE_LDOBJ, pclass);
+                               } else {
+                                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+                                       if (pclass != mono_defaults.object_class) {
+                                               mono_mb_emit_op (mb, CEE_CASTCLASS, pclass);
+                                       }
+                               }
+                       }
+                       break;
+               }
+               case MONO_MARSHAL_COPY_OUT: {
+                       /* Keep a local copy of the value since we need to copy it back after the call */
+                       int copy_local = mono_mb_add_local (mb, &(pclass->byval_arg));
+                       mono_mb_emit_ldarg (mb, param_index++);
+                       mono_marshal_emit_xdomain_copy_value (mb, pclass);
+                       mono_mb_emit_byte (mb, CEE_DUP);
+                       mono_mb_emit_stloc (mb, copy_local);
+                       break;
+               }
+               case MONO_MARSHAL_COPY: {
+                       mono_mb_emit_ldarg (mb, param_index);
+                       if (pt->byref) {
+                               mono_mb_emit_byte (mb, CEE_DUP);
+                               mono_mb_emit_byte (mb, CEE_DUP);
+                               mono_mb_emit_byte (mb, CEE_LDIND_REF);
+                               mono_marshal_emit_xdomain_copy_value (mb, pclass);
+                               mono_mb_emit_byte (mb, CEE_STIND_REF);
+                       } else {
+                               mono_marshal_emit_xdomain_copy_value (mb, pclass);
+                       }
+                       param_index++;
+                       break;
+               }
+               case MONO_MARSHAL_NONE:
+                       mono_mb_emit_ldarg (mb, param_index++);
+                       break;
+               }
+       }
+
+       /* Make the call to the real object */
+
+       mono_marshal_emit_thread_force_interrupt_checkpoint (mb);
+       
+       mono_mb_emit_op (mb, CEE_CALLVIRT, method);
+
+       if (sig->ret->type != MONO_TYPE_VOID)
+               mono_mb_emit_stloc (mb, loc_return);
+
+       /* copy back MONO_MARSHAL_COPY_OUT parameters */
+
+       j = 0;
+       param_index = 3;
+       for (i = 0; i < sig->param_count; i++) {
+               if (marshal_types [i] == MONO_MARSHAL_SERIALIZE) continue;
+               if (marshal_types [i] == MONO_MARSHAL_COPY_OUT) {
+                       mono_mb_emit_ldloc (mb, copy_locals_base + (j++));
+                       mono_mb_emit_ldarg (mb, param_index);
+                       mono_marshal_emit_xdomain_copy_out_value (mb, mono_class_from_mono_type (sig->params [i]));
+               }
+               param_index++;
+       }
+
+       /* Serialize the return values */
+       
+       if (complex_out_count > 0) {
+               /* Reset parameters in the array that don't need to be serialized back */
+               j = 0;
+               for (i = 0; i < sig->param_count; i++) {
+                       if (marshal_types[i] != MONO_MARSHAL_SERIALIZE) continue;
+                       if (!sig->params [i]->byref) {
+                               mono_mb_emit_ldloc (mb, loc_array);
+                               mono_mb_emit_icon (mb, j);
+                               mono_mb_emit_byte (mb, CEE_LDNULL);
+                               mono_mb_emit_byte (mb, CEE_STELEM_REF);
+                       }
+                       j++;
+               }
+       
+               /* Add the return value to the array */
+       
+               if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+                       mono_mb_emit_ldloc (mb, loc_array);
+                       mono_mb_emit_icon (mb, complex_count);  /* The array has an additional slot to hold the ret value */
+                       mono_mb_emit_ldloc (mb, loc_return);
+
+                       g_assert (ret_class); /*FIXME properly fail here*/
+                       if (ret_class->valuetype) {
+                               mono_mb_emit_op (mb, CEE_BOX, ret_class);
+                       }
+                       mono_mb_emit_byte (mb, CEE_STELEM_REF);
+               }
+       
+               /* Serialize */
+       
+               mono_mb_emit_ldarg (mb, 1);
+               mono_mb_emit_ldloc (mb, loc_array);
+               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+               mono_mb_emit_byte (mb, CEE_STIND_REF);
+       } else if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+               mono_mb_emit_ldarg (mb, 1);
+               mono_mb_emit_ldloc (mb, loc_return);
+               if (ret_class->valuetype) {
+                       mono_mb_emit_op (mb, CEE_BOX, ret_class);
+               }
+               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+               mono_mb_emit_byte (mb, CEE_STIND_REF);
+       } else {
+               mono_mb_emit_ldarg (mb, 1);
+               mono_mb_emit_byte (mb, CEE_LDNULL);
+               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+               mono_mb_emit_byte (mb, CEE_STIND_REF);
+       }
+
+       mono_mb_emit_ldarg (mb, 2);
+       mono_mb_emit_byte (mb, CEE_LDNULL);
+       mono_mb_emit_byte (mb, CEE_STIND_REF);
+       pos_leave = mono_mb_emit_branch (mb, CEE_LEAVE);
+
+       /* Main exception catch */
+       main_clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
+       main_clause->try_len = mono_mb_get_pos (mb) - main_clause->try_offset;
+       main_clause->data.catch_class = mono_defaults.object_class;
+       
+       /* handler code */
+       main_clause->handler_offset = mono_mb_get_label (mb);
+       mono_mb_emit_managed_call (mb, method_rs_serialize_exc, NULL);
+       mono_mb_emit_stloc (mb, loc_serialized_exc);
+       mono_mb_emit_ldarg (mb, 2);
+       mono_mb_emit_ldloc (mb, loc_serialized_exc);
+       mono_mb_emit_byte (mb, CEE_STIND_REF);
+       mono_mb_emit_branch (mb, CEE_LEAVE);
+       main_clause->handler_len = mono_mb_get_pos (mb) - main_clause->handler_offset;
+       /* end catch */
+
+       mono_mb_patch_branch (mb, pos_leave);
+       
+       if (copy_return)
+               mono_mb_emit_ldloc (mb, loc_return);
+
+       mono_mb_emit_byte (mb, CEE_RET);
+
+       mono_mb_set_clauses (mb, 1, main_clause);
+#endif
+
+       res = mono_remoting_mb_create_and_cache (method, mb, csig, csig->param_count + 16);
+       mono_mb_free (mb);
+
+       return res;
+}
+
+/* mono_marshal_get_xappdomain_invoke ()
+ * Generates a fast remoting wrapper for cross app domain calls.
+ */
+MonoMethod *
+mono_marshal_get_xappdomain_invoke (MonoMethod *method)
+{
+       MonoMethodSignature *sig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       int i, j, complex_count, complex_out_count, copy_locals_base;
+       int *marshal_types;
+       MonoClass *ret_class = NULL;
+       MonoMethod *xdomain_method;
+       int ret_marshal_type = MONO_MARSHAL_NONE;
+       int loc_array=0, loc_serialized_data=-1, loc_real_proxy;
+       int loc_old_domainid, loc_domainid, loc_return=0, loc_serialized_exc=0, loc_context;
+       int pos, pos_dispatch, pos_noex;
+       gboolean copy_return = FALSE;
+
+       g_assert (method);
+       
+       if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE || method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE)
+               return method;
+
+       /* we cant remote methods without this pointer */
+       if (!mono_method_signature (method)->hasthis)
+               return method;
+
+       mono_remoting_marshal_init ();
+
+       if (!mono_marshal_supports_fast_xdomain (method))
+               return mono_marshal_get_remoting_invoke (method);
+       
+       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_XDOMAIN_INVOKE)))
+               return res;
+       
+       sig = mono_signature_no_pinvoke (method);
+
+       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_XDOMAIN_INVOKE);
+       mb->method->save_lmf = 1;
+
+       /* Count the number of parameters that need to be serialized */
+
+       marshal_types = alloca (sizeof (int) * sig->param_count);
+       complex_count = complex_out_count = 0;
+       for (i = 0; i < sig->param_count; i++) {
+               MonoType *ptype = sig->params[i];
+               int mt = mono_get_xdomain_marshal_type (ptype);
+               
+               /* If the [Out] attribute is applied to a parameter that can be internally copied,
+                * the copy will be made by reusing the original object instance
+                */
+               if ((ptype->attrs & PARAM_ATTRIBUTE_OUT) != 0 && mt == MONO_MARSHAL_COPY && !ptype->byref)
+                       mt = MONO_MARSHAL_COPY_OUT;
+               else if (mt == MONO_MARSHAL_SERIALIZE) {
+                       complex_count++;
+                       if (ptype->byref) complex_out_count++;
+               }
+               marshal_types [i] = mt;
+       }
+
+       if (sig->ret->type != MONO_TYPE_VOID) {
+               ret_marshal_type = mono_get_xdomain_marshal_type (sig->ret);
+               ret_class = mono_class_from_mono_type (sig->ret);
+               copy_return = ret_marshal_type != MONO_MARSHAL_SERIALIZE;
+       }
+       
+       /* Locals */
+
+#ifndef DISABLE_JIT
+       if (complex_count > 0)
+               loc_array = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+       loc_serialized_data = mono_mb_add_local (mb, &byte_array_class->byval_arg);
+       loc_real_proxy = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+       if (copy_return)
+               loc_return = mono_mb_add_local (mb, sig->ret);
+       loc_old_domainid = mono_mb_add_local (mb, &mono_defaults.int32_class->byval_arg);
+       loc_domainid = mono_mb_add_local (mb, &mono_defaults.int32_class->byval_arg);
+       loc_serialized_exc = mono_mb_add_local (mb, &byte_array_class->byval_arg);
+       loc_context = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+
+       /* Save thread domain data */
+
+       mono_mb_emit_icall (mb, mono_context_get);
+       mono_mb_emit_byte (mb, CEE_DUP);
+       mono_mb_emit_stloc (mb, loc_context);
+
+       /* If the thread is not running in the default context, it needs to go
+        * through the whole remoting sink, since the context is going to change
+        */
+       mono_mb_emit_managed_call (mb, method_needs_context_sink, NULL);
+       pos = mono_mb_emit_short_branch (mb, CEE_BRTRUE_S);
+       
+       /* Another case in which the fast path can't be used: when the target domain
+        * has a different image for the same assembly.
+        */
+
+       /* Get the target domain id */
+
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_byte (mb, CEE_DUP);
+       mono_mb_emit_stloc (mb, loc_real_proxy);
+
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, target_domain_id));
+       mono_mb_emit_byte (mb, CEE_LDIND_I4);
+       mono_mb_emit_stloc (mb, loc_domainid);
+
+       /* Check if the target domain has the same image for the required assembly */
+
+       mono_mb_emit_ldloc (mb, loc_domainid);
+       mono_mb_emit_ptr (mb, method->klass->image);
+       mono_mb_emit_icall (mb, mono_marshal_check_domain_image);
+       pos_dispatch = mono_mb_emit_short_branch (mb, CEE_BRTRUE_S);
+
+       /* Use the whole remoting sink to dispatch this message */
+
+       mono_mb_patch_short_branch (mb, pos);
+
+       mono_mb_emit_ldarg (mb, 0);
+       for (i = 0; i < sig->param_count; i++)
+               mono_mb_emit_ldarg (mb, i + 1);
+       
+       mono_mb_emit_managed_call (mb, mono_marshal_get_remoting_invoke (method), NULL);
+       mono_mb_emit_byte (mb, CEE_RET);
+       mono_mb_patch_short_branch (mb, pos_dispatch);
+
+       /* Create the array that will hold the parameters to be serialized */
+
+       if (complex_count > 0) {
+               mono_mb_emit_icon (mb, (ret_marshal_type == MONO_MARSHAL_SERIALIZE && complex_out_count > 0) ? complex_count + 1 : complex_count);      /* +1 for the return type */
+               mono_mb_emit_op (mb, CEE_NEWARR, mono_defaults.object_class);
+       
+               j = 0;
+               for (i = 0; i < sig->param_count; i++) {
+                       MonoClass *pclass;
+                       if (marshal_types [i] != MONO_MARSHAL_SERIALIZE) continue;
+                       pclass = mono_class_from_mono_type (sig->params[i]);
+                       mono_mb_emit_byte (mb, CEE_DUP);
+                       mono_mb_emit_icon (mb, j);
+                       mono_mb_emit_ldarg (mb, i + 1);         /* 0=this */
+                       if (sig->params[i]->byref) {
+                               if (pclass->valuetype)
+                                       mono_mb_emit_op (mb, CEE_LDOBJ, pclass);
+                               else
+                                       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+                       }
+                       if (pclass->valuetype)
+                               mono_mb_emit_op (mb, CEE_BOX, pclass);
+                       mono_mb_emit_byte (mb, CEE_STELEM_REF);
+                       j++;
+               }
+               mono_mb_emit_stloc (mb, loc_array);
+
+               /* Serialize parameters */
+       
+               mono_mb_emit_ldloc (mb, loc_array);
+               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+               mono_mb_emit_stloc (mb, loc_serialized_data);
+       } else {
+               mono_mb_emit_byte (mb, CEE_LDNULL);
+               mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+               mono_mb_emit_stloc (mb, loc_serialized_data);
+       }
+
+       /* switch domain */
+
+       mono_mb_emit_ldloc (mb, loc_domainid);
+       mono_mb_emit_byte (mb, CEE_LDC_I4_1);
+       mono_marshal_emit_switch_domain (mb);
+       mono_mb_emit_stloc (mb, loc_old_domainid);
+
+       /* Load the arguments */
+       
+       mono_mb_emit_ldloc (mb, loc_real_proxy);
+       mono_mb_emit_ldloc_addr (mb, loc_serialized_data);
+       mono_mb_emit_ldloc_addr (mb, loc_serialized_exc);
+
+       copy_locals_base = mb->locals;
+       for (i = 0; i < sig->param_count; i++) {
+               switch (marshal_types [i]) {
+               case MONO_MARSHAL_SERIALIZE:
+                       continue;
+               case MONO_MARSHAL_COPY: {
+                       mono_mb_emit_ldarg (mb, i+1);
+                       if (sig->params [i]->byref) {
+                               /* make a local copy of the byref parameter. The real parameter
+                                * will be updated after the xdomain call
+                                */
+                               MonoClass *pclass = mono_class_from_mono_type (sig->params [i]);
+                               int copy_local = mono_mb_add_local (mb, &(pclass->byval_arg));
+                               mono_mb_emit_byte (mb, CEE_LDIND_REF);
+                               mono_mb_emit_stloc (mb, copy_local);
+                               mono_mb_emit_ldloc_addr (mb, copy_local);
+                       }
+                       break;
+               }
+               case MONO_MARSHAL_COPY_OUT:
+               case MONO_MARSHAL_NONE:
+                       mono_mb_emit_ldarg (mb, i+1);
+                       break;
+               }
+       }
+
+       /* Make the call to the invoke wrapper in the target domain */
+
+       xdomain_method = mono_marshal_get_xappdomain_dispatch (method, marshal_types, complex_count, complex_out_count, ret_marshal_type);
+       mono_marshal_emit_load_domain_method (mb, xdomain_method);
+       mono_mb_emit_calli (mb, mono_method_signature (xdomain_method));
+
+       if (copy_return)
+               mono_mb_emit_stloc (mb, loc_return);
+
+       /* Switch domain */
+
+       mono_mb_emit_ldloc (mb, loc_old_domainid);
+       mono_mb_emit_byte (mb, CEE_LDC_I4_0);
+       mono_marshal_emit_switch_domain (mb);
+       mono_mb_emit_byte (mb, CEE_POP);
+       
+       /* Restore thread domain data */
+       
+       mono_mb_emit_ldloc (mb, loc_context);
+       mono_mb_emit_icall (mb, mono_context_set);
+       
+       /* if (loc_serialized_exc != null) ... */
+
+       mono_mb_emit_ldloc (mb, loc_serialized_exc);
+       pos_noex = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
+
+       mono_mb_emit_ldloc (mb, loc_serialized_exc);
+       mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+       mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+       mono_mb_emit_op (mb, CEE_CASTCLASS, mono_defaults.exception_class);
+       mono_mb_emit_managed_call (mb, method_exc_fixexc, NULL);
+       mono_mb_emit_byte (mb, CEE_THROW);
+       mono_mb_patch_short_branch (mb, pos_noex);
+
+       /* copy back non-serialized output parameters */
+
+       j = 0;
+       for (i = 0; i < sig->param_count; i++) {
+               if (!sig->params [i]->byref || marshal_types [i] != MONO_MARSHAL_COPY) continue;
+               mono_mb_emit_ldarg (mb, i + 1);
+               mono_mb_emit_ldloc (mb, copy_locals_base + (j++));
+               mono_marshal_emit_xdomain_copy_value (mb, mono_class_from_mono_type (sig->params [i]));
+               mono_mb_emit_byte (mb, CEE_STIND_REF);
+       }
+
+       /* Deserialize out parameters */
+
+       if (complex_out_count > 0) {
+               mono_mb_emit_ldloc (mb, loc_serialized_data);
+               mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+               mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+               mono_mb_emit_stloc (mb, loc_array);
+       
+               /* Copy back output parameters and return type */
+               
+               j = 0;
+               for (i = 0; i < sig->param_count; i++) {
+                       if (marshal_types [i] != MONO_MARSHAL_SERIALIZE) continue;
+                       if (sig->params[i]->byref) {
+                               MonoClass *pclass = mono_class_from_mono_type (sig->params [i]);
+                               mono_mb_emit_ldarg (mb, i + 1);
+                               mono_mb_emit_ldloc (mb, loc_array);
+                               mono_mb_emit_icon (mb, j);
+                               mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+                               if (pclass->valuetype) {
+                                       mono_mb_emit_op (mb, CEE_UNBOX, pclass);
+                                       mono_mb_emit_op (mb, CEE_LDOBJ, pclass);
+                                       mono_mb_emit_op (mb, CEE_STOBJ, pclass);
+                               } else {
+                                       if (pclass != mono_defaults.object_class)
+                                               mono_mb_emit_op (mb, CEE_CASTCLASS, pclass);
+                                       mono_mb_emit_byte (mb, CEE_STIND_REF);
+                               }
+                       }
+                       j++;
+               }
+       
+               if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+                       mono_mb_emit_ldloc (mb, loc_array);
+                       mono_mb_emit_icon (mb, complex_count);
+                       mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+                       if (ret_class->valuetype) {
+                               mono_mb_emit_op (mb, CEE_UNBOX, ret_class);
+                               mono_mb_emit_op (mb, CEE_LDOBJ, ret_class);
+                       }
+               }
+       } else if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+               mono_mb_emit_ldloc (mb, loc_serialized_data);
+               mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+               mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+               if (ret_class->valuetype) {
+                       mono_mb_emit_op (mb, CEE_UNBOX, ret_class);
+                       mono_mb_emit_op (mb, CEE_LDOBJ, ret_class);
+               } else if (ret_class != mono_defaults.object_class) {
+                       mono_mb_emit_op (mb, CEE_CASTCLASS, ret_class);
+               }
+       } else {
+               mono_mb_emit_ldloc (mb, loc_serialized_data);
+               mono_mb_emit_byte (mb, CEE_DUP);
+               pos = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
+               mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+       
+               mono_mb_patch_short_branch (mb, pos);
+               mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+               mono_mb_emit_byte (mb, CEE_POP);
+       }
+
+       if (copy_return) {
+               mono_mb_emit_ldloc (mb, loc_return);
+               if (ret_marshal_type == MONO_MARSHAL_COPY)
+                       mono_marshal_emit_xdomain_copy_value (mb, ret_class);
+       }
+
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif /* DISABLE_JIT */
+
+       res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
+       mono_mb_free (mb);
+
+       return res;
+}
+
+MonoMethod *
+mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTarget target_type)
+{
+       if (target_type == MONO_REMOTING_TARGET_APPDOMAIN) {
+               return mono_marshal_get_xappdomain_invoke (method);
+       } else if (target_type == MONO_REMOTING_TARGET_COMINTEROP) {
+#ifndef DISABLE_COM
+               return mono_cominterop_get_invoke (method);
+#else
+               g_assert_not_reached ();
+#endif
+       } else {
+               return mono_marshal_get_remoting_invoke (method);
+       }
+       /* Not erached */
+       return NULL;
+}
+
+G_GNUC_UNUSED static gpointer
+mono_marshal_load_remoting_wrapper (MonoRealProxy *rp, MonoMethod *method)
+{
+       if (rp->target_domain_id != -1)
+               return mono_compile_method (mono_marshal_get_xappdomain_invoke (method));
+       else
+               return mono_compile_method (mono_marshal_get_remoting_invoke (method));
+}
+
+MonoMethod *
+mono_marshal_get_remoting_invoke_with_check (MonoMethod *method)
+{
+       MonoMethodSignature *sig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res, *native;
+       int i, pos, pos_rem;
+
+       g_assert (method);
+
+       if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)
+               return method;
+
+       /* we cant remote methods without this pointer */
+       g_assert (mono_method_signature (method)->hasthis);
+
+       if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)))
+               return res;
+
+       sig = mono_signature_no_pinvoke (method);
+       
+       mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK);
+
+#ifndef DISABLE_JIT
+       for (i = 0; i <= sig->param_count; i++)
+               mono_mb_emit_ldarg (mb, i);
+       
+       mono_mb_emit_ldarg (mb, 0);
+       pos = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+
+       if (mono_marshal_supports_fast_xdomain (method)) {
+               mono_mb_emit_ldarg (mb, 0);
+               pos_rem = mono_mb_emit_xdomain_check (mb, CEE_BEQ);
+               
+               /* wrapper for cross app domain calls */
+               native = mono_marshal_get_xappdomain_invoke (method);
+               mono_mb_emit_managed_call (mb, native, mono_method_signature (native));
+               mono_mb_emit_byte (mb, CEE_RET);
+               
+               mono_mb_patch_branch (mb, pos_rem);
+       }
+       /* wrapper for normal remote calls */
+       native = mono_marshal_get_remoting_invoke (method);
+       mono_mb_emit_managed_call (mb, native, mono_method_signature (native));
+       mono_mb_emit_byte (mb, CEE_RET);
+
+       /* not a proxy */
+       mono_mb_patch_branch (mb, pos);
+       mono_mb_emit_managed_call (mb, method, mono_method_signature (method));
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif
+
+       res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
+       mono_mb_free (mb);
+
+       return res;
+}
+
+/*
+ * mono_marshal_get_ldfld_remote_wrapper:
+ * @klass: The return type
+ *
+ * This method generates a wrapper for calling mono_load_remote_field_new.
+ * The return type is ignored for now, as mono_load_remote_field_new () always
+ * returns an object. In the future, to optimize some codepaths, we might
+ * call a different function that takes a pointer to a valuetype, instead.
+ */
+MonoMethod *
+mono_marshal_get_ldfld_remote_wrapper (MonoClass *klass)
+{
+       MonoMethodSignature *sig, *csig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       static MonoMethod* cached = NULL;
+
+       mono_marshal_lock_internal ();
+       if (cached) {
+               mono_marshal_unlock_internal ();
+               return cached;
+       }
+       mono_marshal_unlock_internal ();
+
+       mb = mono_mb_new_no_dup_name (mono_defaults.object_class, "__mono_load_remote_field_new_wrapper", MONO_WRAPPER_LDFLD_REMOTE);
+
+       mb->method->save_lmf = 1;
+
+       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
+       sig->params [0] = &mono_defaults.object_class->byval_arg;
+       sig->params [1] = &mono_defaults.int_class->byval_arg;
+       sig->params [2] = &mono_defaults.int_class->byval_arg;
+       sig->ret = &mono_defaults.object_class->byval_arg;
+
+#ifndef DISABLE_JIT
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldarg (mb, 1);
+       mono_mb_emit_ldarg (mb, 2);
+
+       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
+       csig->params [0] = &mono_defaults.object_class->byval_arg;
+       csig->params [1] = &mono_defaults.int_class->byval_arg;
+       csig->params [2] = &mono_defaults.int_class->byval_arg;
+       csig->ret = &mono_defaults.object_class->byval_arg;
+       csig->pinvoke = 1;
+
+       mono_mb_emit_native_call (mb, csig, mono_load_remote_field_new);
+       mono_marshal_emit_thread_interrupt_checkpoint (mb);
+
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif
+
+       mono_marshal_lock_internal ();
+       res = cached;
+       mono_marshal_unlock_internal ();
+       if (!res) {
+               MonoMethod *newm;
+               newm = mono_mb_create (mb, sig, 4, NULL);
+               mono_marshal_lock_internal ();
+               res = cached;
+               if (!res) {
+                       res = newm;
+                       cached = res;
+                       mono_marshal_unlock_internal ();
+               } else {
+                       mono_marshal_unlock_internal ();
+                       mono_free_method (newm);
+               }
+       }
+       mono_mb_free (mb);
+
+       return res;
+}
+
+/*
+ * mono_marshal_get_ldfld_wrapper:
+ * @type: the type of the field
+ *
+ * This method generates a function which can be use to load a field with type
+ * @type from an object. The generated function has the following signature:
+ * <@type> ldfld_wrapper (MonoObject *this, MonoClass *class, MonoClassField *field, int offset)
+ */
+MonoMethod *
+mono_marshal_get_ldfld_wrapper (MonoType *type)
+{
+       MonoMethodSignature *sig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       MonoClass *klass;
+       GHashTable *cache;
+       WrapperInfo *info;
+       char *name;
+       int t, pos0, pos1 = 0;
+
+       type = mono_type_get_underlying_type (type);
+
+       t = type->type;
+
+       if (!type->byref) {
+               if (type->type == MONO_TYPE_SZARRAY) {
+                       klass = mono_defaults.array_class;
+               } else if (type->type == MONO_TYPE_VALUETYPE) {
+                       klass = type->data.klass;
+               } else if (t == MONO_TYPE_OBJECT || t == MONO_TYPE_CLASS || t == MONO_TYPE_STRING) {
+                       klass = mono_defaults.object_class;
+               } else if (t == MONO_TYPE_PTR || t == MONO_TYPE_FNPTR) {
+                       klass = mono_defaults.int_class;
+               } else if (t == MONO_TYPE_GENERICINST) {
+                       if (mono_type_generic_inst_is_valuetype (type))
+                               klass = mono_class_from_mono_type (type);
+                       else
+                               klass = mono_defaults.object_class;
+               } else {
+                       klass = mono_class_from_mono_type (type);                       
+               }
+       } else {
+               klass = mono_defaults.int_class;
+       }
+
+       cache = get_cache (&klass->image->ldfld_wrapper_cache, mono_aligned_addr_hash, NULL);
+       if ((res = mono_marshal_find_in_cache (cache, klass)))
+               return res;
+
+       /* we add the %p pointer value of klass because class names are not unique */
+       name = g_strdup_printf ("__ldfld_wrapper_%p_%s.%s", klass, klass->name_space, klass->name); 
+       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_LDFLD);
+       g_free (name);
+
+       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
+       sig->params [0] = &mono_defaults.object_class->byval_arg;
+       sig->params [1] = &mono_defaults.int_class->byval_arg;
+       sig->params [2] = &mono_defaults.int_class->byval_arg;
+       sig->params [3] = &mono_defaults.int_class->byval_arg;
+       sig->ret = &klass->byval_arg;
+
+#ifndef DISABLE_JIT
+       mono_mb_emit_ldarg (mb, 0);
+       pos0 = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldarg (mb, 1);
+       mono_mb_emit_ldarg (mb, 2);
+
+       mono_mb_emit_managed_call (mb, mono_marshal_get_ldfld_remote_wrapper (klass), NULL);
+
+       /*
+       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
+       csig->params [0] = &mono_defaults.object_class->byval_arg;
+       csig->params [1] = &mono_defaults.int_class->byval_arg;
+       csig->params [2] = &mono_defaults.int_class->byval_arg;
+       csig->ret = &klass->this_arg;
+       csig->pinvoke = 1;
+
+       mono_mb_emit_native_call (mb, csig, mono_load_remote_field_new);
+       mono_marshal_emit_thread_interrupt_checkpoint (mb);
+       */
+
+       if (klass->valuetype) {
+               mono_mb_emit_op (mb, CEE_UNBOX, klass);
+               pos1 = mono_mb_emit_branch (mb, CEE_BR);
+       } else {
+               mono_mb_emit_byte (mb, CEE_RET);
+       }
+
+       mono_mb_patch_branch (mb, pos0);
+
+       mono_mb_emit_ldarg (mb, 0);
+        mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+        mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+       mono_mb_emit_ldarg (mb, 3);
+       mono_mb_emit_byte (mb, CEE_ADD);
+
+       if (klass->valuetype)
+               mono_mb_patch_branch (mb, pos1);
+
+       switch (t) {
+       case MONO_TYPE_I1:
+       case MONO_TYPE_U1:
+       case MONO_TYPE_BOOLEAN:
+       case MONO_TYPE_CHAR:
+       case MONO_TYPE_I2:
+       case MONO_TYPE_U2:
+       case MONO_TYPE_I4:
+       case MONO_TYPE_U4:
+       case MONO_TYPE_I8:
+       case MONO_TYPE_U8:
+       case MONO_TYPE_R4:
+       case MONO_TYPE_R8:
+       case MONO_TYPE_ARRAY:
+       case MONO_TYPE_SZARRAY:
+       case MONO_TYPE_OBJECT:
+       case MONO_TYPE_CLASS:
+       case MONO_TYPE_STRING:
+       case MONO_TYPE_I:
+       case MONO_TYPE_U:
+       case MONO_TYPE_PTR:
+       case MONO_TYPE_FNPTR:
+               mono_mb_emit_byte (mb, mono_type_to_ldind (type));
+               break;
+       case MONO_TYPE_VALUETYPE:
+               g_assert (!klass->enumtype);
+               mono_mb_emit_op (mb, CEE_LDOBJ, klass);
+               break;
+       case MONO_TYPE_GENERICINST:
+               if (mono_type_generic_inst_is_valuetype (type)) {
+                       mono_mb_emit_op (mb, CEE_LDOBJ, klass);
+               } else {
+                       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+               }
+               break;
+       case MONO_TYPE_VAR:
+       case MONO_TYPE_MVAR:
+               mono_mb_emit_op (mb, CEE_LDOBJ, klass);
+               break;
+       default:
+               g_warning ("type %x not implemented", type->type);
+               g_assert_not_reached ();
+       }
+
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif /* DISABLE_JIT */
+
+       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
+       info->d.proxy.klass = klass;
+       res = mono_mb_create_and_cache_full (cache, klass,
+                                                                                mb, sig, sig->param_count + 16, info, NULL);
+       mono_mb_free (mb);
+       
+       return res;
+}
+
+/*
+ * mono_marshal_get_ldflda_wrapper:
+ * @type: the type of the field
+ *
+ * This method generates a function which can be used to load a field address
+ * from an object. The generated function has the following signature:
+ * gpointer ldflda_wrapper (MonoObject *this, MonoClass *class, MonoClassField *field, int offset);
+ */
+MonoMethod *
+mono_marshal_get_ldflda_wrapper (MonoType *type)
+{
+       MonoMethodSignature *sig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       MonoClass *klass;
+       GHashTable *cache;
+       WrapperInfo *info;
+       char *name;
+       int t, pos0, pos1, pos2, pos3;
+
+       type = mono_type_get_underlying_type (type);
+       t = type->type;
+
+       if (!type->byref) {
+               if (type->type == MONO_TYPE_SZARRAY) {
+                       klass = mono_defaults.array_class;
+               } else if (type->type == MONO_TYPE_VALUETYPE) {
+                       klass = type->data.klass;
+               } else if (t == MONO_TYPE_OBJECT || t == MONO_TYPE_CLASS || t == MONO_TYPE_STRING ||
+                          t == MONO_TYPE_CLASS) { 
+                       klass = mono_defaults.object_class;
+               } else if (t == MONO_TYPE_PTR || t == MONO_TYPE_FNPTR) {
+                       klass = mono_defaults.int_class;
+               } else if (t == MONO_TYPE_GENERICINST) {
+                       if (mono_type_generic_inst_is_valuetype (type))
+                               klass = mono_class_from_mono_type (type);
+                       else
+                               klass = mono_defaults.object_class;
+               } else {
+                       klass = mono_class_from_mono_type (type);                       
+               }
+       } else {
+               klass = mono_defaults.int_class;
+       }
+
+       cache = get_cache (&klass->image->ldflda_wrapper_cache, mono_aligned_addr_hash, NULL);
+       if ((res = mono_marshal_find_in_cache (cache, klass)))
+               return res;
+
+       /* we add the %p pointer value of klass because class names are not unique */
+       name = g_strdup_printf ("__ldflda_wrapper_%p_%s.%s", klass, klass->name_space, klass->name); 
+       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_LDFLDA);
+       g_free (name);
+
+       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
+       sig->params [0] = &mono_defaults.object_class->byval_arg;
+       sig->params [1] = &mono_defaults.int_class->byval_arg;
+       sig->params [2] = &mono_defaults.int_class->byval_arg;
+       sig->params [3] = &mono_defaults.int_class->byval_arg;
+       sig->ret = &mono_defaults.int_class->byval_arg;
+
+#ifndef DISABLE_JIT
+       /* if typeof (this) != transparent_proxy goto pos0 */
+       mono_mb_emit_ldarg (mb, 0);
+       pos0 = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+
+       /* if same_appdomain goto pos1 */
+       mono_mb_emit_ldarg (mb, 0);
+       pos1 = mono_mb_emit_xdomain_check (mb, CEE_BEQ);
+
+       mono_mb_emit_exception_full (mb, "System", "InvalidOperationException", "Attempt to load field address from object in another appdomain.");
+
+       /* same app domain */
+       mono_mb_patch_branch (mb, pos1);
+
+       /* if typeof (this) != contextbound goto pos2 */
+       mono_mb_emit_ldarg (mb, 0);
+       pos2 = mono_mb_emit_contextbound_check (mb, CEE_BEQ);
+
+       /* if this->rp->context == mono_context_get goto pos3 */
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, context));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_icall (mb, mono_context_get);
+       pos3 = mono_mb_emit_branch (mb, CEE_BEQ);
+
+       mono_mb_emit_exception_full (mb, "System", "InvalidOperationException", "Attempt to load field address from object in another context.");
+
+       mono_mb_patch_branch (mb, pos2);
+       mono_mb_patch_branch (mb, pos3);
+
+       /* return the address of the field from this->rp->unwrapped_server */
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoRealProxy, unwrapped_server));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+       mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+       mono_mb_emit_ldarg (mb, 3);
+       mono_mb_emit_byte (mb, CEE_ADD);
+       mono_mb_emit_byte (mb, CEE_RET);
+
+       /* not a proxy: return the address of the field directly */
+       mono_mb_patch_branch (mb, pos0);
+
+       mono_mb_emit_ldarg (mb, 0);
+        mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+        mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+       mono_mb_emit_ldarg (mb, 3);
+       mono_mb_emit_byte (mb, CEE_ADD);
+
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif
+
+       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
+       info->d.proxy.klass = klass;
+       res = mono_mb_create_and_cache_full (cache, klass,
+                                                                                mb, sig, sig->param_count + 16,
+                                                                                info, NULL);
+       mono_mb_free (mb);
+       
+       return res;
+}
+
+/*
+ * mono_marshal_get_stfld_remote_wrapper:
+ * klass: The type of the field
+ *
+ *  This function generates a wrapper for calling mono_store_remote_field_new
+ * with the appropriate signature.
+ * Similarly to mono_marshal_get_ldfld_remote_wrapper () this doesn't depend on the
+ * klass argument anymore.
+ */
+MonoMethod *
+mono_marshal_get_stfld_remote_wrapper (MonoClass *klass)
+{
+       MonoMethodSignature *sig, *csig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       static MonoMethod *cached = NULL;
+
+       mono_marshal_lock_internal ();
+       if (cached) {
+               mono_marshal_unlock_internal ();
+               return cached;
+       }
+       mono_marshal_unlock_internal ();
+
+       mb = mono_mb_new_no_dup_name (mono_defaults.object_class, "__mono_store_remote_field_new_wrapper", MONO_WRAPPER_STFLD_REMOTE);
+
+       mb->method->save_lmf = 1;
+
+       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
+       sig->params [0] = &mono_defaults.object_class->byval_arg;
+       sig->params [1] = &mono_defaults.int_class->byval_arg;
+       sig->params [2] = &mono_defaults.int_class->byval_arg;
+       sig->params [3] = &mono_defaults.object_class->byval_arg;
+       sig->ret = &mono_defaults.void_class->byval_arg;
+
+#ifndef DISABLE_JIT
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldarg (mb, 1);
+       mono_mb_emit_ldarg (mb, 2);
+       mono_mb_emit_ldarg (mb, 3);
+
+       csig = mono_metadata_signature_alloc (mono_defaults.corlib, 4);
+       csig->params [0] = &mono_defaults.object_class->byval_arg;
+       csig->params [1] = &mono_defaults.int_class->byval_arg;
+       csig->params [2] = &mono_defaults.int_class->byval_arg;
+       csig->params [3] = &mono_defaults.object_class->byval_arg;
+       csig->ret = &mono_defaults.void_class->byval_arg;
+       csig->pinvoke = 1;
+
+       mono_mb_emit_native_call (mb, csig, mono_store_remote_field_new);
+       mono_marshal_emit_thread_interrupt_checkpoint (mb);
+
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif
+
+       mono_marshal_lock_internal ();
+       res = cached;
+       mono_marshal_unlock_internal ();
+       if (!res) {
+               MonoMethod *newm;
+               newm = mono_mb_create (mb, sig, 6, NULL);
+               mono_marshal_lock_internal ();
+               res = cached;
+               if (!res) {
+                       res = newm;
+                       cached = res;
+                       mono_marshal_unlock_internal ();
+               } else {
+                       mono_marshal_unlock_internal ();
+                       mono_free_method (newm);
+               }
+       }
+       mono_mb_free (mb);
+       
+       return res;
+}
+
+/*
+ * mono_marshal_get_stfld_wrapper:
+ * @type: the type of the field
+ *
+ * This method generates a function which can be use to store a field with type
+ * @type. The generated function has the following signature:
+ * void stfld_wrapper (MonoObject *this, MonoClass *class, MonoClassField *field, int offset, <@type> val)
+ */
+MonoMethod *
+mono_marshal_get_stfld_wrapper (MonoType *type)
+{
+       MonoMethodSignature *sig;
+       MonoMethodBuilder *mb;
+       MonoMethod *res;
+       MonoClass *klass;
+       GHashTable *cache;
+       WrapperInfo *info;
+       char *name;
+       int t, pos;
+
+       type = mono_type_get_underlying_type (type);
+       t = type->type;
+
+       if (!type->byref) {
+               if (type->type == MONO_TYPE_SZARRAY) {
+                       klass = mono_defaults.array_class;
+               } else if (type->type == MONO_TYPE_VALUETYPE) {
+                       klass = type->data.klass;
+               } else if (t == MONO_TYPE_OBJECT || t == MONO_TYPE_CLASS || t == MONO_TYPE_STRING) {
+                       klass = mono_defaults.object_class;
+               } else if (t == MONO_TYPE_PTR || t == MONO_TYPE_FNPTR) {
+                       klass = mono_defaults.int_class;
+               } else if (t == MONO_TYPE_GENERICINST) {
+                       if (mono_type_generic_inst_is_valuetype (type))
+                               klass = mono_class_from_mono_type (type);
+                       else
+                               klass = mono_defaults.object_class;
+               } else {
+                       klass = mono_class_from_mono_type (type);                       
+               }
+       } else {
+               klass = mono_defaults.int_class;
+       }
+
+       cache = get_cache (&klass->image->stfld_wrapper_cache, mono_aligned_addr_hash, NULL);
+       if ((res = mono_marshal_find_in_cache (cache, klass)))
+               return res;
+
+       /* we add the %p pointer value of klass because class names are not unique */
+       name = g_strdup_printf ("__stfld_wrapper_%p_%s.%s", klass, klass->name_space, klass->name); 
+       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_STFLD);
+       g_free (name);
+
+       sig = mono_metadata_signature_alloc (mono_defaults.corlib, 5);
+       sig->params [0] = &mono_defaults.object_class->byval_arg;
+       sig->params [1] = &mono_defaults.int_class->byval_arg;
+       sig->params [2] = &mono_defaults.int_class->byval_arg;
+       sig->params [3] = &mono_defaults.int_class->byval_arg;
+       sig->params [4] = &klass->byval_arg;
+       sig->ret = &mono_defaults.void_class->byval_arg;
+
+#ifndef DISABLE_JIT
+       mono_mb_emit_ldarg (mb, 0);
+       pos = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldarg (mb, 1);
+       mono_mb_emit_ldarg (mb, 2);
+       mono_mb_emit_ldarg (mb, 4);
+       if (klass->valuetype)
+               mono_mb_emit_op (mb, CEE_BOX, klass);
+
+       mono_mb_emit_managed_call (mb, mono_marshal_get_stfld_remote_wrapper (klass), NULL);
+
+       mono_mb_emit_byte (mb, CEE_RET);
+
+       mono_mb_patch_branch (mb, pos);
+
+       mono_mb_emit_ldarg (mb, 0);
+        mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+        mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+       mono_mb_emit_ldarg (mb, 3);
+       mono_mb_emit_byte (mb, CEE_ADD);
+       mono_mb_emit_ldarg (mb, 4);
+
+       switch (t) {
+       case MONO_TYPE_I1:
+       case MONO_TYPE_U1:
+       case MONO_TYPE_BOOLEAN:
+       case MONO_TYPE_CHAR:
+       case MONO_TYPE_I2:
+       case MONO_TYPE_U2:
+       case MONO_TYPE_I4:
+       case MONO_TYPE_U4:
+       case MONO_TYPE_I8:
+       case MONO_TYPE_U8:
+       case MONO_TYPE_R4:
+       case MONO_TYPE_R8:
+       case MONO_TYPE_ARRAY:
+       case MONO_TYPE_SZARRAY:
+       case MONO_TYPE_OBJECT:
+       case MONO_TYPE_CLASS:
+       case MONO_TYPE_STRING:
+       case MONO_TYPE_I:
+       case MONO_TYPE_U:
+       case MONO_TYPE_PTR:
+       case MONO_TYPE_FNPTR:
+               mono_mb_emit_byte (mb, mono_type_to_stind (type));
+               break;
+       case MONO_TYPE_VALUETYPE:
+               g_assert (!klass->enumtype);
+               mono_mb_emit_op (mb, CEE_STOBJ, klass);
+               break;
+       case MONO_TYPE_GENERICINST:
+       case MONO_TYPE_VAR:
+       case MONO_TYPE_MVAR:
+               mono_mb_emit_op (mb, CEE_STOBJ, klass);
+               break;
+       default:
+               g_warning ("type %x not implemented", type->type);
+               g_assert_not_reached ();
+       }
+
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif
+
+       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
+       info->d.proxy.klass = klass;
+       res = mono_mb_create_and_cache_full (cache, klass,
+                                                                                mb, sig, sig->param_count + 16,
+                                                                                info, NULL);
+       mono_mb_free (mb);
+       
+       return res;
+}
+
+MonoMethod *
+mono_marshal_get_proxy_cancast (MonoClass *klass)
+{
+       static MonoMethodSignature *isint_sig = NULL;
+       GHashTable *cache;
+       MonoMethod *res;
+       WrapperInfo *info;
+       int pos_failed, pos_end;
+       char *name, *klass_name;
+       MonoMethod *can_cast_to;
+       MonoMethodDesc *desc;
+       MonoMethodBuilder *mb;
+
+       cache = get_cache (&klass->image->proxy_isinst_cache, mono_aligned_addr_hash, NULL);
+       if ((res = mono_marshal_find_in_cache (cache, klass)))
+               return res;
+
+       if (!isint_sig) {
+               isint_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 1);
+               isint_sig->params [0] = &mono_defaults.object_class->byval_arg;
+               isint_sig->ret = &mono_defaults.object_class->byval_arg;
+               isint_sig->pinvoke = 0;
+       }
+
+       klass_name = mono_type_full_name (&klass->byval_arg);
+       name = g_strdup_printf ("__proxy_isinst_wrapper_%s", klass_name); 
+       mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_PROXY_ISINST);
+       g_free (klass_name);
+       g_free (name);
+       
+       mb->method->save_lmf = 1;
+
+#ifndef DISABLE_JIT
+       /* get the real proxy from the transparent proxy*/
+       mono_mb_emit_ldarg (mb, 0);
+       mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoTransparentProxy, rp));
+       mono_mb_emit_byte (mb, CEE_LDIND_REF);
+       
+       /* get the reflection type from the type handle */
+       mono_mb_emit_ptr (mb, &klass->byval_arg);
+       mono_mb_emit_icall (mb, type_from_handle);
+       
+       mono_mb_emit_ldarg (mb, 0);
+       
+       /* make the call to CanCastTo (type, ob) */
+       desc = mono_method_desc_new ("IRemotingTypeInfo:CanCastTo", FALSE);
+       can_cast_to = mono_method_desc_search_in_class (desc, mono_defaults.iremotingtypeinfo_class);
+       g_assert (can_cast_to);
+       mono_method_desc_free (desc);
+       mono_mb_emit_op (mb, CEE_CALLVIRT, can_cast_to);
+       
+       pos_failed = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+       /* Upgrade the proxy vtable by calling: mono_upgrade_remote_class_wrapper (type, ob)*/
+       mono_mb_emit_ptr (mb, &klass->byval_arg);
+       mono_mb_emit_icall (mb, type_from_handle);
+       mono_mb_emit_ldarg (mb, 0);
+       
+       mono_mb_emit_icall (mb, mono_upgrade_remote_class_wrapper);
+       mono_marshal_emit_thread_interrupt_checkpoint (mb);
+       
+       mono_mb_emit_ldarg (mb, 0);
+       pos_end = mono_mb_emit_branch (mb, CEE_BR);
+       
+       /* fail */
+       
+       mono_mb_patch_branch (mb, pos_failed);
+       mono_mb_emit_byte (mb, CEE_LDNULL);
+       
+       /* the end */
+       
+       mono_mb_patch_branch (mb, pos_end);
+       mono_mb_emit_byte (mb, CEE_RET);
+#endif
+
+       info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE);
+       info->d.proxy.klass = klass;
+       res = mono_mb_create_and_cache_full (cache, klass, mb, isint_sig, isint_sig->param_count + 16, info, NULL);
+       mono_mb_free (mb);
+
+       return res;
+}
+
+void
+mono_upgrade_remote_class_wrapper (MonoReflectionType *rtype, MonoTransparentProxy *tproxy)
+{
+       MonoClass *klass;
+       MonoDomain *domain = ((MonoObject*)tproxy)->vtable->domain;
+       klass = mono_class_from_mono_type (rtype->type);
+       mono_upgrade_remote_class (domain, (MonoObject*)tproxy, klass);
+}
+
+#else /* DISABLE_REMOTING */
+
+void
+mono_remoting_init (void)
+{
+}
+
+#endif /* DISABLE_REMOTING */
+
+/* mono_get_xdomain_marshal_type()
+ * Returns the kind of marshalling that a type needs for cross domain calls.
+ */
+static MonoXDomainMarshalType
+mono_get_xdomain_marshal_type (MonoType *t)
+{
+       switch (t->type) {
+       case MONO_TYPE_VOID:
+               g_assert_not_reached ();
+               break;
+       case MONO_TYPE_U1:
+       case MONO_TYPE_I1:
+       case MONO_TYPE_BOOLEAN:
+       case MONO_TYPE_U2:
+       case MONO_TYPE_I2:
+       case MONO_TYPE_CHAR:
+       case MONO_TYPE_U4:
+       case MONO_TYPE_I4:
+       case MONO_TYPE_I8:
+       case MONO_TYPE_U8:
+       case MONO_TYPE_R4:
+       case MONO_TYPE_R8:
+               return MONO_MARSHAL_NONE;
+       case MONO_TYPE_STRING:
+               return MONO_MARSHAL_COPY;
+       case MONO_TYPE_ARRAY:
+       case MONO_TYPE_SZARRAY: {
+               MonoClass *elem_class = mono_class_from_mono_type (t)->element_class;
+               if (mono_get_xdomain_marshal_type (&(elem_class->byval_arg)) != MONO_MARSHAL_SERIALIZE)
+                       return MONO_MARSHAL_COPY;
+               break;
+       }
+       }
+
+       return MONO_MARSHAL_SERIALIZE;
+}
+
+/* mono_marshal_xdomain_copy_value
+ * Makes a copy of "val" suitable for the current domain.
+ */
+MonoObject *
+mono_marshal_xdomain_copy_value (MonoObject *val)
+{
+       MonoDomain *domain;
+       if (val == NULL) return NULL;
+
+       domain = mono_domain_get ();
+
+       switch (mono_object_class (val)->byval_arg.type) {
+       case MONO_TYPE_VOID:
+               g_assert_not_reached ();
+               break;
+       case MONO_TYPE_U1:
+       case MONO_TYPE_I1:
+       case MONO_TYPE_BOOLEAN:
+       case MONO_TYPE_U2:
+       case MONO_TYPE_I2:
+       case MONO_TYPE_CHAR:
+       case MONO_TYPE_U4:
+       case MONO_TYPE_I4:
+       case MONO_TYPE_I8:
+       case MONO_TYPE_U8:
+       case MONO_TYPE_R4:
+       case MONO_TYPE_R8: {
+               return mono_value_box (domain, mono_object_class (val), ((char*)val) + sizeof(MonoObject));
+       }
+       case MONO_TYPE_STRING: {
+               MonoString *str = (MonoString *) val;
+               return (MonoObject *) mono_string_new_utf16 (domain, mono_string_chars (str), mono_string_length (str));
+       }
+       case MONO_TYPE_ARRAY:
+       case MONO_TYPE_SZARRAY: {
+               MonoArray *acopy;
+               MonoXDomainMarshalType mt = mono_get_xdomain_marshal_type (&(mono_object_class (val)->element_class->byval_arg));
+               if (mt == MONO_MARSHAL_SERIALIZE) return NULL;
+               acopy = mono_array_clone_in_domain (domain, (MonoArray *) val);
+               if (mt == MONO_MARSHAL_COPY) {
+                       int i, len = mono_array_length (acopy);
+                       for (i = 0; i < len; i++) {
+                               MonoObject *item = mono_array_get (acopy, gpointer, i);
+                               mono_array_setref (acopy, i, mono_marshal_xdomain_copy_value (item));
+                       }
+               }
+               return (MonoObject *) acopy;
+       }
+       }
+
+       if (mono_object_class (val) == mono_defaults.stringbuilder_class) {
+               MonoStringBuilder *oldsb = (MonoStringBuilder *) val;
+               MonoStringBuilder *newsb = (MonoStringBuilder *) mono_object_new (domain, mono_defaults.stringbuilder_class);
+               MONO_OBJECT_SETREF (newsb, str, mono_string_new_utf16 (domain, mono_string_chars (oldsb->str), mono_string_length (oldsb->str)));
+               newsb->length = oldsb->length;
+               newsb->max_capacity = (gint32)0x7fffffff;
+               return (MonoObject *) newsb;
+       }
+       return NULL;
+}
diff --git a/mono/metadata/remoting.h b/mono/metadata/remoting.h
new file mode 100644 (file)
index 0000000..24f4c80
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * remoting.h: Remoting support
+ *
+ * (C) 2014 Xamarin, Inc.  http://www.xamarin.com
+ *
+ */
+
+#ifndef __MONO_REMOTING_H__
+#define __MONO_REMOTING_H__
+
+#include "config.h"
+#include <mono/metadata/class.h>
+#include <mono/metadata/object-internals.h>
+#include <mono/metadata/class-internals.h>
+
+void mono_remoting_init (void) MONO_INTERNAL;
+
+#ifndef DISABLE_REMOTING
+
+MonoMethod *
+mono_marshal_get_remoting_invoke (MonoMethod *method) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_xappdomain_invoke (MonoMethod *method) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTarget target_type) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_remoting_invoke_with_check (MonoMethod *method) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_stfld_wrapper (MonoType *type) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_ldfld_wrapper (MonoType *type) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_ldflda_wrapper (MonoType *type) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_ldfld_remote_wrapper (MonoClass *klass) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_stfld_remote_wrapper (MonoClass *klass) MONO_INTERNAL;
+
+MonoMethod *
+mono_marshal_get_proxy_cancast (MonoClass *klass) MONO_INTERNAL;
+
+#endif
+
+#endif
index 368388a5dab2fe5bf006844ac910be56d92811bc..d04f757ec48866d77dbbf8c3850e92f17ecc9b02 100644 (file)
@@ -51,7 +51,6 @@
 
 #define ALIGN_UP               SGEN_ALIGN_UP
 #define ALLOC_ALIGN            SGEN_ALLOC_ALIGN
-#define ALLOC_ALIGN_BITS       SGEN_ALLOC_ALIGN_BITS
 #define MAX_SMALL_OBJ_SIZE     SGEN_MAX_SMALL_OBJ_SIZE
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 
@@ -68,9 +67,9 @@ enum {
 static gboolean use_managed_allocator = TRUE;
 
 #ifdef HEAVY_STATISTICS
-static long long stat_objects_alloced = 0;
-static long long stat_bytes_alloced = 0;
-static long long stat_bytes_alloced_los = 0;
+static guint64 stat_objects_alloced = 0;
+static guint64 stat_bytes_alloced = 0;
+static guint64 stat_bytes_alloced_los = 0;
 
 #endif
 
@@ -188,8 +187,8 @@ mono_gc_alloc_obj_nolock (MonoVTable *vtable, size_t size)
        /* FIXME: handle OOM */
        void **p;
        char *new_next;
-       TLAB_ACCESS_INIT;
        size_t real_size = size;
+       TLAB_ACCESS_INIT;
        
        CANARIFY_SIZE(size);
 
@@ -379,8 +378,8 @@ mono_gc_try_alloc_obj_nolock (MonoVTable *vtable, size_t size)
 {
        void **p;
        char *new_next;
-       TLAB_ACCESS_INIT;
        size_t real_size = size;
+       TLAB_ACCESS_INIT;
 
        CANARIFY_SIZE(size);
 
@@ -1214,9 +1213,9 @@ sgen_has_managed_allocator (void)
 void
 sgen_alloc_init_heavy_stats (void)
 {
-       mono_counters_register ("# objects allocated", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_objects_alloced);     
-       mono_counters_register ("bytes allocated", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_bytes_alloced);
-       mono_counters_register ("bytes allocated in LOS", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_bytes_alloced_los);
+       mono_counters_register ("# objects allocated", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_objects_alloced);    
+       mono_counters_register ("bytes allocated", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_bytes_alloced);
+       mono_counters_register ("bytes allocated in LOS", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_bytes_alloced_los);
 }
 #endif
 
index 420dc96e47d64a32daae9252133c0ff82f336693..410ba6aab0a0435b0e61a4f1cdded22bc4e2ad62 100644 (file)
                ((a)[__i]) = (gpointer) UCONTEXT_REG_Rn((ctx), __i);    \
        } while (0)
 
+/* MS_BLOCK_SIZE must be a multiple of the system pagesize, which for some
+   archs is 64k.  */
+#if defined(TARGET_POWERPC64) && _CALL_ELF == 2
+#define ARCH_MIN_MS_BLOCK_SIZE (64*1024)
+#define ARCH_MIN_MS_BLOCK_SIZE_SHIFT   16
+#endif
+
 #elif defined(TARGET_ARM)
 
 #define REDZONE_SIZE   0
index 10524efe7b03dcf400a7c0c9c60e278d8da2b8df..99cae37adbd09872581b57d1b41e6e314e3ffed9 100644 (file)
@@ -52,23 +52,23 @@ guint8 *sgen_cardtable;
 static gboolean need_mod_union;
 
 #ifdef HEAVY_STATISTICS
-long long marked_cards;
-long long scanned_cards;
-long long scanned_objects;
-long long remarked_cards;
+guint64 marked_cards;
+guint64 scanned_cards;
+guint64 scanned_objects;
+guint64 remarked_cards;
 
-static long long los_marked_cards;
-static long long large_objects;
-static long long bloby_objects;
-static long long los_array_cards;
-static long long los_array_remsets;
+static guint64 los_marked_cards;
+static guint64 large_objects;
+static guint64 bloby_objects;
+static guint64 los_array_cards;
+static guint64 los_array_remsets;
 
 #endif
-static long long major_card_scan_time;
-static long long los_card_scan_time;
+static guint64 major_card_scan_time;
+static guint64 los_card_scan_time;
 
-static long long last_major_scan_time;
-static long long last_los_scan_time;
+static guint64 last_major_scan_time;
+static guint64 last_los_scan_time;
 
 static void sgen_card_tables_collect_stats (gboolean begin);
 
@@ -753,19 +753,19 @@ sgen_card_table_init (SgenRemeberedSet *remset)
 #endif
 
 #ifdef HEAVY_STATISTICS
-       mono_counters_register ("marked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &marked_cards);
-       mono_counters_register ("scanned cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &scanned_cards);
-       mono_counters_register ("remarked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &remarked_cards);
-
-       mono_counters_register ("los marked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_marked_cards);
-       mono_counters_register ("los array cards scanned ", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_array_cards);
-       mono_counters_register ("los array remsets", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_array_remsets);
-       mono_counters_register ("cardtable scanned objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &scanned_objects);
-       mono_counters_register ("cardtable large objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &large_objects);
-       mono_counters_register ("cardtable bloby objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &bloby_objects);
+       mono_counters_register ("marked cards", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &marked_cards);
+       mono_counters_register ("scanned cards", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &scanned_cards);
+       mono_counters_register ("remarked cards", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &remarked_cards);
+
+       mono_counters_register ("los marked cards", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &los_marked_cards);
+       mono_counters_register ("los array cards scanned ", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &los_array_cards);
+       mono_counters_register ("los array remsets", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &los_array_remsets);
+       mono_counters_register ("cardtable scanned objects", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &scanned_objects);
+       mono_counters_register ("cardtable large objects", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &large_objects);
+       mono_counters_register ("cardtable bloby objects", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &bloby_objects);
 #endif
-       mono_counters_register ("cardtable major scan time", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &major_card_scan_time);
-       mono_counters_register ("cardtable los scan time", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &los_card_scan_time);
+       mono_counters_register ("cardtable major scan time", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &major_card_scan_time);
+       mono_counters_register ("cardtable los scan time", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &los_card_scan_time);
 
 
        remset->wbarrier_set_field = sgen_card_table_wbarrier_set_field;
index b76ffd49829b413f43118e6e881e34a1823181f9..b74830f8f6db570e4448a5ea1c267225b10d5b3b 100644 (file)
 
 #if SIZEOF_VOID_P == 4
 typedef guint32 mword;
-#define MWORD_MAX_VALUE ((uint32_t) 0xffffffff)
 #else
 typedef guint64 mword;
-#define MWORD_MAX_VALUE (G_MAXUINT64)
 #endif
 
 
@@ -153,12 +151,9 @@ typedef guint64 mword;
 #define SGEN_SCAN_START_SIZE (4096*2)
 
 /*
- * Objects bigger then this go into the large object space.  This size
- * has a few constraints.  It must fit into the major heap, which in
- * the case of the copying collector means that it must fit into a
- * pinned chunk.  It must also play well with the GC descriptors, some
- * of which (DESC_TYPE_RUN_LENGTH, DESC_TYPE_SMALL_BITMAP) encode the
- * object size.
+ * Objects bigger then this go into the large object space.  This size has a few
+ * constraints.  At least two of them must fit into a major heap block.  It must also play
+ * well with the run length GC descriptor, which encodes the object size.
  */
 #define SGEN_MAX_SMALL_OBJ_SIZE 8000
 
index 21331c18f0605a54fab15a1215c080eb6184a74c..c5589f672e80036859a28a37e14c29db8b8dee15 100644 (file)
 
 #include "mono/utils/mono-compiler.h"
 
-extern long long stat_copy_object_called_nursery;
-extern long long stat_objects_copied_nursery;
+extern guint64 stat_copy_object_called_nursery;
+extern guint64 stat_objects_copied_nursery;
 
-extern long long stat_nursery_copy_object_failed_from_space;
-extern long long stat_nursery_copy_object_failed_forwarded;
-extern long long stat_nursery_copy_object_failed_pinned;
+extern guint64 stat_nursery_copy_object_failed_from_space;
+extern guint64 stat_nursery_copy_object_failed_forwarded;
+extern guint64 stat_nursery_copy_object_failed_pinned;
 
-extern long long stat_slots_allocated_in_vain;
+extern guint64 stat_slots_allocated_in_vain;
 
 /*
+ * Copies an object and enqueues it if a queue is given.
+ *
  * This function can be used even if the vtable of obj is not valid
  * anymore, which is the case in the parallel collector.
  */
@@ -77,15 +79,20 @@ copy_object_no_checks (void *obj, SgenGrayQueue *queue)
        MonoVTable *vt = ((MonoObject*)obj)->vtable;
        gboolean has_references = SGEN_VTABLE_HAS_REFERENCES (vt);
        mword objsize = SGEN_ALIGN_UP (sgen_par_object_get_size (vt, (MonoObject*)obj));
+       /* FIXME: Does this not mark the newly allocated object? */
        char *destination = COLLECTOR_SERIAL_ALLOC_FOR_PROMOTION (vt, obj, objsize, has_references);
 
        if (G_UNLIKELY (!destination)) {
+               /* FIXME: Is this path ever tested? */
                collector_pin_object (obj, queue);
                sgen_set_pinned_from_failed_allocation (objsize);
                return obj;
        }
 
-       par_copy_object_no_checks (destination, vt, obj, objsize, has_references ? queue : NULL);
+       if (!has_references)
+               queue = NULL;
+
+       par_copy_object_no_checks (destination, vt, obj, objsize, queue);
        /* FIXME: mark mod union cards if necessary */
 
        /* set the forwarding pointer */
index 8989c9e930edb7bbaef8b6b61a596478a9b27f45..580f7c185e37d6711429ce6c8c14c21ff50cf026 100644 (file)
@@ -131,7 +131,7 @@ describe_pointer (char *ptr, gboolean need_setup)
        desc = ((GCVTable*)vtable)->desc;
        printf ("Descriptor: %lx\n", (long)desc);
 
-       type = desc & 0x7;
+       type = desc & DESC_TYPE_MASK;
        printf ("Descriptor type: %d (%s)\n", type, descriptor_types [type]);
 
        size = sgen_safe_object_get_size ((MonoObject*)ptr);
index 6da8f7290d9316d930e1320d7ff2dba0ce5a8b85..de452becccb6b2e312fb525095992f08253cad72 100644 (file)
@@ -60,7 +60,8 @@ static int user_descriptors_next = 0;
 static void *all_ref_root_descrs [32];
 
 #ifdef HEAVY_STATISTICS
-static long long stat_scanned_count_per_descriptor [DESC_TYPE_MAX];
+static guint64 stat_scanned_count_per_descriptor [DESC_TYPE_MAX];
+static guint64 stat_copied_count_per_descriptor [DESC_TYPE_MAX];
 #endif
 
 static int
@@ -121,7 +122,7 @@ sgen_get_complex_descriptor (mword desc)
 void*
 mono_gc_make_descr_for_string (gsize *bitmap, int numbits)
 {
-       return (void*) DESC_TYPE_RUN_LENGTH;
+       return (void*)SGEN_DESC_STRING;
 }
 
 void*
@@ -145,14 +146,23 @@ mono_gc_make_descr_for_object (gsize *bitmap, int numbits, size_t obj_size)
 
        if (first_set < 0) {
                SGEN_LOG (6, "Ptrfree descriptor %p, size: %zd", (void*)desc, stored_size);
-               if (stored_size <= MAX_RUNLEN_OBJECT_SIZE)
-                       return (void*)(DESC_TYPE_RUN_LENGTH | stored_size);
+               if (stored_size <= MAX_RUNLEN_OBJECT_SIZE && stored_size <= SGEN_MAX_SMALL_OBJ_SIZE)
+                       return (void*)(DESC_TYPE_SMALL_PTRFREE | stored_size);
                return (void*)DESC_TYPE_COMPLEX_PTRFREE;
        }
 
        g_assert (!(stored_size & 0x7));
 
-       if (stored_size <= MAX_RUNLEN_OBJECT_SIZE) {
+       SGEN_ASSERT (5, stored_size == SGEN_ALIGN_UP (stored_size), "Size is not aligned");
+
+       /* we know the 2-word header is ptr-free */
+       if (last_set < BITMAP_NUM_BITS + OBJECT_HEADER_WORDS && stored_size <= SGEN_MAX_SMALL_OBJ_SIZE) {
+               desc = DESC_TYPE_BITMAP | ((*bitmap >> OBJECT_HEADER_WORDS) << LOW_TYPE_BITS);
+               SGEN_LOG (6, "Largebitmap descriptor %p, size: %zd, last set: %d", (void*)desc, stored_size, last_set);
+               return (void*) desc;
+       }
+
+       if (stored_size <= MAX_RUNLEN_OBJECT_SIZE && stored_size <= SGEN_MAX_SMALL_OBJ_SIZE) {
                /* check run-length encoding first: one byte offset, one byte number of pointers
                 * on 64 bit archs, we can have 3 runs, just one on 32.
                 * It may be better to use nibbles.
@@ -164,19 +174,6 @@ mono_gc_make_descr_for_object (gsize *bitmap, int numbits, size_t obj_size)
                }
        }
 
-       /* we know the 2-word header is ptr-free */
-       if (last_set < SMALL_BITMAP_SIZE + OBJECT_HEADER_WORDS && stored_size < (1 << SMALL_BITMAP_SHIFT)) {
-               desc = DESC_TYPE_SMALL_BITMAP | stored_size | ((*bitmap >> OBJECT_HEADER_WORDS) << SMALL_BITMAP_SHIFT);
-               SGEN_LOG (6, "Smallbitmap descriptor %p, size: %zd, last set: %d", (void*)desc, stored_size, last_set);
-               return (void*) desc;
-       }
-
-       /* we know the 2-word header is ptr-free */
-       if (last_set < LARGE_BITMAP_SIZE + OBJECT_HEADER_WORDS) {
-               desc = DESC_TYPE_LARGE_BITMAP | ((*bitmap >> OBJECT_HEADER_WORDS) << LOW_TYPE_BITS);
-               SGEN_LOG (6, "Largebitmap descriptor %p, size: %zd, last set: %d", (void*)desc, stored_size, last_set);
-               return (void*) desc;
-       }
        /* it's a complex object ... */
        desc = DESC_TYPE_COMPLEX | (alloc_complex_descriptor (bitmap, last_set + 1) << LOW_TYPE_BITS);
        return (void*) desc;
@@ -214,7 +211,7 @@ mono_gc_make_descr_for_array (int vector, gsize *elem_bitmap, int numbits, size_
                }
                /* FIXME: try run-len first */
                /* Note: we can't skip the object header here, because it's not present */
-               if (last_set < SMALL_BITMAP_SIZE) {
+               if (last_set < VECTOR_BITMAP_SIZE) {
                        return (void*)(desc | VECTOR_SUBTYPE_BITMAP | (*elem_bitmap << 16));
                }
        }
@@ -231,7 +228,7 @@ mono_gc_get_bitmap_for_descr (void *descr, int *numbits)
        mword d = (mword)descr;
        gsize *bitmap;
 
-       switch (d & 0x7) {
+       switch (d & DESC_TYPE_MASK) {
        case DESC_TYPE_RUN_LENGTH: {            
                int first_set = (d >> 16) & 0xff;
                int num_set = (d >> 24) & 0xff;
@@ -247,15 +244,7 @@ mono_gc_get_bitmap_for_descr (void *descr, int *numbits)
                return bitmap;
        }
 
-       case DESC_TYPE_SMALL_BITMAP:
-               bitmap = g_new0 (gsize, 1);
-
-               bitmap [0] = (d >> SMALL_BITMAP_SHIFT) << OBJECT_HEADER_WORDS;
-
-               *numbits = GC_BITS_PER_WORD;
-               return bitmap;
-
-       case DESC_TYPE_LARGE_BITMAP: {
+       case DESC_TYPE_BITMAP: {
                gsize bmap = (d >> LOW_TYPE_BITS) << OBJECT_HEADER_WORDS;
 
                bitmap = g_new0 (gsize, 1);
@@ -356,23 +345,39 @@ sgen_get_user_descriptor_func (mword desc)
 void
 sgen_descriptor_count_scanned_object (mword desc)
 {
-       int type = desc & 7;
+       int type = desc & DESC_TYPE_MASK;
        SGEN_ASSERT (0, type, "Descriptor type can't be zero");
        ++stat_scanned_count_per_descriptor [type - 1];
 }
+
+void
+sgen_descriptor_count_copied_object (mword desc)
+{
+       int type = desc & DESC_TYPE_MASK;
+       SGEN_ASSERT (0, type, "Descriptor type can't be zero");
+       ++stat_copied_count_per_descriptor [type - 1];
+}
 #endif
 
 void
 sgen_init_descriptors (void)
 {
 #ifdef HEAVY_STATISTICS
-       mono_counters_register ("# scanned RUN_LENGTH", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scanned_count_per_descriptor [DESC_TYPE_RUN_LENGTH - 1]);
-       mono_counters_register ("# scanned SMALL_BITMAP", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scanned_count_per_descriptor [DESC_TYPE_SMALL_BITMAP - 1]);
-       mono_counters_register ("# scanned COMPLEX", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scanned_count_per_descriptor [DESC_TYPE_COMPLEX - 1]);
-       mono_counters_register ("# scanned VECTOR", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scanned_count_per_descriptor [DESC_TYPE_VECTOR - 1]);
-       mono_counters_register ("# scanned LARGE_BITMAP", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scanned_count_per_descriptor [DESC_TYPE_LARGE_BITMAP - 1]);
-       mono_counters_register ("# scanned COMPLEX_ARR", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scanned_count_per_descriptor [DESC_TYPE_COMPLEX_ARR - 1]);
-       mono_counters_register ("# scanned COMPLEX_PTRFREE", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scanned_count_per_descriptor [DESC_TYPE_COMPLEX_PTRFREE - 1]);
+       mono_counters_register ("# scanned RUN_LENGTH", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scanned_count_per_descriptor [DESC_TYPE_RUN_LENGTH - 1]);
+       mono_counters_register ("# scanned SMALL_PTRFREE", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scanned_count_per_descriptor [DESC_TYPE_SMALL_PTRFREE - 1]);
+       mono_counters_register ("# scanned COMPLEX", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scanned_count_per_descriptor [DESC_TYPE_COMPLEX - 1]);
+       mono_counters_register ("# scanned VECTOR", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scanned_count_per_descriptor [DESC_TYPE_VECTOR - 1]);
+       mono_counters_register ("# scanned BITMAP", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scanned_count_per_descriptor [DESC_TYPE_BITMAP - 1]);
+       mono_counters_register ("# scanned COMPLEX_ARR", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scanned_count_per_descriptor [DESC_TYPE_COMPLEX_ARR - 1]);
+       mono_counters_register ("# scanned COMPLEX_PTRFREE", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scanned_count_per_descriptor [DESC_TYPE_COMPLEX_PTRFREE - 1]);
+
+       mono_counters_register ("# copied RUN_LENGTH", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copied_count_per_descriptor [DESC_TYPE_RUN_LENGTH - 1]);
+       mono_counters_register ("# copied SMALL_PTRFREE", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copied_count_per_descriptor [DESC_TYPE_SMALL_PTRFREE - 1]);
+       mono_counters_register ("# copied COMPLEX", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copied_count_per_descriptor [DESC_TYPE_COMPLEX - 1]);
+       mono_counters_register ("# copied VECTOR", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copied_count_per_descriptor [DESC_TYPE_VECTOR - 1]);
+       mono_counters_register ("# copied BITMAP", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copied_count_per_descriptor [DESC_TYPE_BITMAP - 1]);
+       mono_counters_register ("# copied COMPLEX_ARR", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copied_count_per_descriptor [DESC_TYPE_COMPLEX_ARR - 1]);
+       mono_counters_register ("# copied COMPLEX_PTRFREE", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copied_count_per_descriptor [DESC_TYPE_COMPLEX_PTRFREE - 1]);
 #endif
 }
 
index c06354dd95820cc933b215680774bdce3b5522ca..cd25ccb590561b1355515e9916741ddacf199cad 100644 (file)
  */
 #define OBJECT_HEADER_WORDS (sizeof(MonoObject)/sizeof(gpointer))
 #define LOW_TYPE_BITS 3
+#define DESC_TYPE_MASK ((1 << LOW_TYPE_BITS) - 1)
 #define MAX_RUNLEN_OBJECT_SIZE 0xFFFF
-#define SMALL_BITMAP_SHIFT 16
-#define SMALL_BITMAP_SIZE (GC_BITS_PER_WORD - SMALL_BITMAP_SHIFT)
 #define VECTOR_INFO_SHIFT 14
 #define VECTOR_KIND_SHIFT 13
 #define VECTOR_ELSIZE_SHIFT 3
-#define LARGE_BITMAP_SIZE (GC_BITS_PER_WORD - LOW_TYPE_BITS)
+#define VECTOR_BITMAP_SHIFT 16
+#define VECTOR_BITMAP_SIZE (GC_BITS_PER_WORD - VECTOR_BITMAP_SHIFT)
+#define BITMAP_NUM_BITS (GC_BITS_PER_WORD - LOW_TYPE_BITS)
 #define MAX_ELEMENT_SIZE 0x3ff
 #define VECTOR_SUBTYPE_PTRFREE (DESC_TYPE_V_PTRFREE << VECTOR_INFO_SHIFT)
 #define VECTOR_SUBTYPE_REFS    (DESC_TYPE_V_REFS << VECTOR_INFO_SHIFT)
-#define VECTOR_SUBTYPE_RUN_LEN (DESC_TYPE_V_RUN_LEN << VECTOR_INFO_SHIFT)
 #define VECTOR_SUBTYPE_BITMAP  (DESC_TYPE_V_BITMAP << VECTOR_INFO_SHIFT)
 
 #define VECTOR_KIND_SZARRAY  (DESC_TYPE_V_SZARRAY << VECTOR_KIND_SHIFT)
 #define VECTOR_KIND_ARRAY  (DESC_TYPE_V_ARRAY << VECTOR_KIND_SHIFT)
 
-/* objects are aligned to 8 bytes boundaries
+/*
+ * Objects are aligned to 8 bytes boundaries.
+ *
  * A descriptor is a pointer in MonoVTable, so 32 or 64 bits of size.
  * The low 3 bits define the type of the descriptor. The other bits
  * depend on the type.
+ *
+ * It's important to be able to quickly identify two properties of classes from their
+ * descriptors: whether they are small enough to live in the regular major heap (size <=
+ * SGEN_MAX_SMALL_OBJ_SIZE), and whether they contain references.
+ *
+ * To that end we have three descriptor types that only apply to small classes: RUN_LENGTH,
+ * BITMAP, and SMALL_PTRFREE.  We also have the type COMPLEX_PTRFREE, which applies to
+ * classes that are either not small or of unknown size (those being strings and arrays).
+ * The lowest two bits of the SMALL_PTRFREE and COMPLEX_PTRFREE tags are the same, so we can
+ * quickly check for references.
+ *
  * As a general rule the 13 remaining low bits define the size, either
  * of the whole object or of the elements in the arrays. While for objects
  * the size is already in bytes, for arrays we need to shift, because
  * will be allocated in the large object heap.
  * If we want 4-bytes alignment, we need to put vector and small bitmap
  * inside complex.
+ *
+ * We don't use 0 so that 0 isn't a valid GC descriptor.  No deep reason for this other than
+ * to be able to identify a non-inited descriptor for debugging.
  */
 enum {
-       /*
-        * We don't use 0 so that 0 isn't a valid GC descriptor.  No
-        * deep reason for this other than to be able to identify a
-        * non-inited descriptor for debugging.
-        *
-        * If an object contains no references, its GC descriptor is
-        * always DESC_TYPE_RUN_LENGTH, without a size, no exceptions.
-        * This is so that we can quickly check for that in
-        * copy_object_no_checks(), without having to fetch the
-        * object's class.
-        */
        DESC_TYPE_RUN_LENGTH = 1,   /* 16 bits aligned byte size | 1-3 (offset, numptr) bytes tuples */
-       DESC_TYPE_SMALL_BITMAP = 2, /* 16 bits aligned byte size | 16-48 bit bitmap */
-       DESC_TYPE_COMPLEX = 3,      /* index for bitmap into complex_descriptors */
-       DESC_TYPE_VECTOR = 4,       /* 10 bits element size | 1 bit kind | 2 bits desc | element desc */
-       DESC_TYPE_LARGE_BITMAP = 5, /* | 29-61 bitmap bits */
+       DESC_TYPE_BITMAP = 2,       /* | 29-61 bitmap bits */
+       DESC_TYPE_SMALL_PTRFREE = 3,
+       DESC_TYPE_MAX_SMALL_OBJ = 3,
+       DESC_TYPE_COMPLEX = 4,      /* index for bitmap into complex_descriptors */
+       DESC_TYPE_VECTOR = 5,       /* 10 bits element size | 1 bit kind | 2 bits desc | element desc */
        DESC_TYPE_COMPLEX_ARR = 6,  /* index for bitmap into complex_descriptors */
-       DESC_TYPE_COMPLEX_PTRFREE = 7, /*Nothing, used to encode large ptr objects. */
+       DESC_TYPE_COMPLEX_PTRFREE = 7, /* Nothing, used to encode large ptr objects and strings. */
        DESC_TYPE_MAX = 7,
-       /* values for array kind */
+
+       DESC_TYPE_PTRFREE_MASK = 3,
+       DESC_TYPE_PTRFREE_BITS = 3
+};
+
+/* values for array kind */
+enum {
        DESC_TYPE_V_SZARRAY = 0, /*vector with no bounds data */
        DESC_TYPE_V_ARRAY = 1, /* array with bounds data */
-       /* subtypes for arrays and vectors */
+};
+
+/* subtypes for arrays and vectors */
+enum {
        DESC_TYPE_V_PTRFREE = 0,/* there are no refs: keep first so it has a zero value  */
        DESC_TYPE_V_REFS,       /* all the array elements are refs */
        DESC_TYPE_V_RUN_LEN,    /* elements are run-length encoded as DESC_TYPE_RUN_LENGTH */
        DESC_TYPE_V_BITMAP      /* elements are as the bitmap in DESC_TYPE_SMALL_BITMAP */
 };
 
+#define SGEN_DESC_STRING       (DESC_TYPE_COMPLEX_PTRFREE | (1 << LOW_TYPE_BITS))
+
 /* Root bitmap descriptors are simpler: the lower three bits describe the type
  * and we either have 30/62 bitmap bits or nibble-based run-length,
  * or a complex descriptor, or a user defined marker function.
@@ -122,22 +139,20 @@ void sgen_init_descriptors (void) MONO_INTERNAL;
 
 #ifdef HEAVY_STATISTICS
 void sgen_descriptor_count_scanned_object (mword desc) MONO_INTERNAL;
+void sgen_descriptor_count_copied_object (mword desc) MONO_INTERNAL;
 #endif
 
 static inline gboolean
 sgen_gc_descr_has_references (mword desc)
 {
-       /*Both string and fixed size objects are encoded using a zero run RUN_LEN*/
-       if ((desc & 0xffff0007) == DESC_TYPE_RUN_LENGTH)
+       /* This covers SMALL_PTRFREE and COMPLEX_PTRFREE */
+       if ((desc & DESC_TYPE_PTRFREE_MASK) == DESC_TYPE_PTRFREE_BITS)
                return FALSE;
 
        /*The array is ptr-free*/
        if ((desc & 0xC007) == (DESC_TYPE_VECTOR | VECTOR_SUBTYPE_PTRFREE))
                return FALSE;
 
-       if ((desc & 0x7) == DESC_TYPE_COMPLEX_PTRFREE)
-               return FALSE;
-
        return TRUE;
 }
 
@@ -146,18 +161,10 @@ sgen_gc_descr_has_references (mword desc)
 #define SGEN_OBJECT_HAS_REFERENCES(o)  (SGEN_VTABLE_HAS_REFERENCES (SGEN_LOAD_VTABLE ((o))))
 
 /* helper macros to scan and traverse objects, macros because we resue them in many functions */
-#define OBJ_RUN_LEN_SIZE(size,desc,obj) do { \
-               (size) = ((desc) & 0xfff8);     \
-    } while (0)
-
-#define OBJ_BITMAP_SIZE(size,desc,obj) do { \
-               (size) = ((desc) & 0xfff8);     \
-    } while (0)
-
 #ifdef __GNUC__
-#define PREFETCH(addr) __builtin_prefetch ((addr))
+#define PREFETCH_READ(addr)    __builtin_prefetch ((addr), 0, 1)
 #else
-#define PREFETCH(addr)
+#define PREFETCH_READ(addr)
 #endif
 
 #if defined(__GNUC__) && SIZEOF_VOID_P==4
@@ -177,56 +184,42 @@ sgen_gc_descr_has_references (mword desc)
                        while (_objptr < _objptr_end) { \
                                HANDLE_PTR (_objptr, (obj));    \
                                _objptr++;      \
-                       }       \
+                       };      \
                }       \
        } while (0)
 
-#if defined(__GNUC__)
-#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
-               /* there are pointers */        \
-               void **_objptr = (void**)(obj); \
-               gsize _bmap = (desc) >> 16;     \
-               _objptr += OBJECT_HEADER_WORDS; \
-               do { \
-                       int _index = GNUC_BUILTIN_CTZ (_bmap);          \
-                       _objptr += _index; \
-                       _bmap >>= (_index + 1);                         \
-                       HANDLE_PTR (_objptr, (obj));            \
-                       _objptr ++;                                                     \
-               } while (_bmap);                                        \
-       } while (0)
-#else
-#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
-               /* there are pointers */        \
-               void **_objptr = (void**)(obj); \
-               gsize _bmap = (desc) >> 16;     \
-               _objptr += OBJECT_HEADER_WORDS; \
-               while (_bmap) {                                            \
-                       if ((_bmap & 1)) {                                                                 \
-                               HANDLE_PTR (_objptr, (obj));                               \
-                       }                                                                                                  \
-                       _bmap >>= 1;                                                                       \
-                       ++_objptr;                                                                                 \
-               }                                                                                                          \
-       } while (0)
-#endif
-
 /* a bitmap desc means that there are pointer references or we'd have
  * choosen run-length, instead: add an assert to check.
  */
-#define OBJ_LARGE_BITMAP_FOREACH_PTR(desc,obj) do {    \
+#ifdef __GNUC__
+#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {            \
+               /* there are pointers */                        \
+               void **_objptr = (void**)(obj);                 \
+               gsize _bmap = (desc) >> LOW_TYPE_BITS;          \
+               _objptr += OBJECT_HEADER_WORDS;                 \
+               do {                                            \
+                       int _index = GNUC_BUILTIN_CTZ (_bmap);  \
+                       _objptr += _index;                      \
+                       _bmap >>= (_index + 1);                 \
+                       HANDLE_PTR (_objptr, (obj));            \
+                       ++_objptr;                              \
+               } while (_bmap);                                \
+       } while (0)
+#else
+#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
                /* there are pointers */        \
                void **_objptr = (void**)(obj); \
                gsize _bmap = (desc) >> LOW_TYPE_BITS;  \
                _objptr += OBJECT_HEADER_WORDS; \
-               while (_bmap) { \
+               do {    \
                        if ((_bmap & 1)) {      \
                                HANDLE_PTR (_objptr, (obj));    \
                        }       \
                        _bmap >>= 1;    \
                        ++_objptr;      \
-               }       \
+               } while (_bmap);        \
        } while (0)
+#endif
 
 #define OBJ_COMPLEX_FOREACH_PTR(vt,obj)        do {    \
                /* there are pointers */        \
index 996394326835ae6a6316c95d0076a595de8cee00..686e0c6090920eeaf2af499b04a7bcacc5fa5475 100644 (file)
@@ -422,12 +422,12 @@ process_stage_entries (int num_entries, volatile gint32 *next_entry, StageEntry
 }
 
 #ifdef HEAVY_STATISTICS
-static long long stat_overflow_abort = 0;
-static long long stat_wait_for_processing = 0;
-static long long stat_increment_other_thread = 0;
-static long long stat_index_decremented = 0;
-static long long stat_entry_invalidated = 0;
-static long long stat_success = 0;
+static guint64 stat_overflow_abort = 0;
+static guint64 stat_wait_for_processing = 0;
+static guint64 stat_increment_other_thread = 0;
+static guint64 stat_index_decremented = 0;
+static guint64 stat_entry_invalidated = 0;
+static guint64 stat_success = 0;
 #endif
 
 static int
@@ -905,12 +905,12 @@ void
 sgen_init_fin_weak_hash (void)
 {
 #ifdef HEAVY_STATISTICS
-       mono_counters_register ("FinWeak Successes", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_success);
-       mono_counters_register ("FinWeak Overflow aborts", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_overflow_abort);
-       mono_counters_register ("FinWeak Wait for processing", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_wait_for_processing);
-       mono_counters_register ("FinWeak Increment other thread", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_increment_other_thread);
-       mono_counters_register ("FinWeak Index decremented", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_index_decremented);
-       mono_counters_register ("FinWeak Entry invalidated", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_entry_invalidated);
+       mono_counters_register ("FinWeak Successes", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_success);
+       mono_counters_register ("FinWeak Overflow aborts", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_overflow_abort);
+       mono_counters_register ("FinWeak Wait for processing", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_wait_for_processing);
+       mono_counters_register ("FinWeak Increment other thread", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_increment_other_thread);
+       mono_counters_register ("FinWeak Index decremented", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_index_decremented);
+       mono_counters_register ("FinWeak Entry invalidated", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_entry_invalidated);
 #endif
 }
 
index fb4c5aba3b41621f045f7d7bf8526141744ca97c..9969f92268693995053d24be30b06ff5d2669ba3 100644 (file)
@@ -293,23 +293,23 @@ static gboolean do_dump_nursery_content = FALSE;
 static gboolean enable_nursery_canaries = FALSE;
 
 #ifdef HEAVY_STATISTICS
-long long stat_objects_alloced_degraded = 0;
-long long stat_bytes_alloced_degraded = 0;
+guint64 stat_objects_alloced_degraded = 0;
+guint64 stat_bytes_alloced_degraded = 0;
 
-long long stat_copy_object_called_nursery = 0;
-long long stat_objects_copied_nursery = 0;
-long long stat_copy_object_called_major = 0;
-long long stat_objects_copied_major = 0;
+guint64 stat_copy_object_called_nursery = 0;
+guint64 stat_objects_copied_nursery = 0;
+guint64 stat_copy_object_called_major = 0;
+guint64 stat_objects_copied_major = 0;
 
-long long stat_scan_object_called_nursery = 0;
-long long stat_scan_object_called_major = 0;
+guint64 stat_scan_object_called_nursery = 0;
+guint64 stat_scan_object_called_major = 0;
 
-long long stat_slots_allocated_in_vain;
+guint64 stat_slots_allocated_in_vain;
 
-long long stat_nursery_copy_object_failed_from_space = 0;
-long long stat_nursery_copy_object_failed_forwarded = 0;
-long long stat_nursery_copy_object_failed_pinned = 0;
-long long stat_nursery_copy_object_failed_to_space = 0;
+guint64 stat_nursery_copy_object_failed_from_space = 0;
+guint64 stat_nursery_copy_object_failed_forwarded = 0;
+guint64 stat_nursery_copy_object_failed_pinned = 0;
+guint64 stat_nursery_copy_object_failed_to_space = 0;
 
 static int stat_wbarrier_add_to_global_remset = 0;
 static int stat_wbarrier_set_field = 0;
@@ -322,32 +322,32 @@ static int stat_wbarrier_value_copy = 0;
 static int stat_wbarrier_object_copy = 0;
 #endif
 
-static long long stat_pinned_objects = 0;
-
-static long long time_minor_pre_collection_fragment_clear = 0;
-static long long time_minor_pinning = 0;
-static long long time_minor_scan_remsets = 0;
-static long long time_minor_scan_pinned = 0;
-static long long time_minor_scan_registered_roots = 0;
-static long long time_minor_scan_thread_data = 0;
-static long long time_minor_finish_gray_stack = 0;
-static long long time_minor_fragment_creation = 0;
-
-static long long time_major_pre_collection_fragment_clear = 0;
-static long long time_major_pinning = 0;
-static long long time_major_scan_pinned = 0;
-static long long time_major_scan_registered_roots = 0;
-static long long time_major_scan_thread_data = 0;
-static long long time_major_scan_alloc_pinned = 0;
-static long long time_major_scan_finalized = 0;
-static long long time_major_scan_big_objects = 0;
-static long long time_major_finish_gray_stack = 0;
-static long long time_major_free_bigobjs = 0;
-static long long time_major_los_sweep = 0;
-static long long time_major_sweep = 0;
-static long long time_major_fragment_creation = 0;
-
-static long long time_max = 0;
+static guint64 stat_pinned_objects = 0;
+
+static guint64 time_minor_pre_collection_fragment_clear = 0;
+static guint64 time_minor_pinning = 0;
+static guint64 time_minor_scan_remsets = 0;
+static guint64 time_minor_scan_pinned = 0;
+static guint64 time_minor_scan_registered_roots = 0;
+static guint64 time_minor_scan_thread_data = 0;
+static guint64 time_minor_finish_gray_stack = 0;
+static guint64 time_minor_fragment_creation = 0;
+
+static guint64 time_major_pre_collection_fragment_clear = 0;
+static guint64 time_major_pinning = 0;
+static guint64 time_major_scan_pinned = 0;
+static guint64 time_major_scan_registered_roots = 0;
+static guint64 time_major_scan_thread_data = 0;
+static guint64 time_major_scan_alloc_pinned = 0;
+static guint64 time_major_scan_finalized = 0;
+static guint64 time_major_scan_big_objects = 0;
+static guint64 time_major_finish_gray_stack = 0;
+static guint64 time_major_free_bigobjs = 0;
+static guint64 time_major_los_sweep = 0;
+static guint64 time_major_sweep = 0;
+static guint64 time_major_fragment_creation = 0;
+
+static guint64 time_max = 0;
 
 static SGEN_TV_DECLARE (time_major_conc_collection_start);
 static SGEN_TV_DECLARE (time_major_conc_collection_end);
@@ -371,7 +371,6 @@ mono_gc_flush_info (void)
 #define TV_DECLARE SGEN_TV_DECLARE
 #define TV_GETTIME SGEN_TV_GETTIME
 #define TV_ELAPSED SGEN_TV_ELAPSED
-#define TV_ELAPSED_MS SGEN_TV_ELAPSED_MS
 
 SGEN_TV_DECLARE (sgen_init_timestamp);
 
@@ -382,7 +381,6 @@ NurseryClearPolicy nursery_clear_policy = CLEAR_AT_TLAB_CREATION;
 #define object_is_forwarded    SGEN_OBJECT_IS_FORWARDED
 #define object_is_pinned       SGEN_OBJECT_IS_PINNED
 #define pin_object             SGEN_PIN_OBJECT
-#define unpin_object           SGEN_UNPIN_OBJECT
 
 #define ptr_in_nursery sgen_ptr_in_nursery
 
@@ -429,10 +427,6 @@ static volatile mword lowest_heap_address = ~(mword)0;
 static volatile mword highest_heap_address = 0;
 
 LOCK_DECLARE (sgen_interruption_mutex);
-static LOCK_DECLARE (pin_queue_mutex);
-
-#define LOCK_PIN_QUEUE mono_mutex_lock (&pin_queue_mutex)
-#define UNLOCK_PIN_QUEUE mono_mutex_unlock (&pin_queue_mutex)
 
 typedef struct _FinalizeReadyEntry FinalizeReadyEntry;
 struct _FinalizeReadyEntry {
@@ -520,7 +514,6 @@ guint32 tlab_size = (1024 * 4);
 static MonoGCCallbacks gc_callbacks;
 
 #define ALLOC_ALIGN            SGEN_ALLOC_ALIGN
-#define ALLOC_ALIGN_BITS       SGEN_ALLOC_ALIGN_BITS
 
 #define ALIGN_UP               SGEN_ALIGN_UP
 
@@ -574,8 +567,6 @@ static int mark_ephemerons_in_range (ScanCopyContext ctx);
 static void clear_unreachable_ephemerons (ScanCopyContext ctx);
 static void null_ephemerons_for_domain (MonoDomain *domain);
 
-static gboolean major_update_or_finish_concurrent_collection (gboolean force_finish);
-
 SgenObjectOperations current_object_ops;
 SgenMajorCollector major_collector;
 SgenMinorCollector sgen_minor_collector;
@@ -829,6 +820,7 @@ mono_gc_clear_domain (MonoDomain * domain)
        sgen_restart_world (0, NULL);
 
        binary_protocol_domain_unload_end (domain);
+       binary_protocol_flush_buffers (FALSE);
 
        UNLOCK_GC;
 }
@@ -895,6 +887,9 @@ sgen_drain_gray_stack (int max_objs, ScanCopyContext ctx)
        ScanObjectFunc scan_func = ctx.scan_func;
        GrayQueue *queue = ctx.queue;
 
+       if (current_collection_generation == GENERATION_OLD && major_collector.drain_gray_stack)
+               return major_collector.drain_gray_stack (ctx);
+
        do {
                int i;
                for (i = 0; i != max_objs; ++i) {
@@ -1325,7 +1320,6 @@ precisely_scan_objects_from (void** start_root, void** end_root, char* n_start,
                        if ((desc & 1) && *start_root) {
                                copy_func (start_root, queue);
                                SGEN_LOG (9, "Overwrote root at %p with %p", start_root, *start_root);
-                               sgen_drain_gray_stack (-1, ctx);
                        }
                        desc >>= 1;
                        start_root++;
@@ -1343,7 +1337,6 @@ precisely_scan_objects_from (void** start_root, void** end_root, char* n_start,
                                if ((bmap & 1) && *objptr) {
                                        copy_func (objptr, queue);
                                        SGEN_LOG (9, "Overwrote root at %p with %p", objptr, *objptr);
-                                       sgen_drain_gray_stack (-1, ctx);
                                }
                                bmap >>= 1;
                                ++objptr;
@@ -1936,32 +1929,32 @@ init_stats (void)
        if (inited)
                return;
 
-       mono_counters_register ("Collection max time",  MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME | MONO_COUNTER_MONOTONIC, &time_max);
-
-       mono_counters_register ("Minor fragment clear", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_pre_collection_fragment_clear);
-       mono_counters_register ("Minor pinning", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_pinning);
-       mono_counters_register ("Minor scan remembered set", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_scan_remsets);
-       mono_counters_register ("Minor scan pinned", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_scan_pinned);
-       mono_counters_register ("Minor scan registered roots", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_scan_registered_roots);
-       mono_counters_register ("Minor scan thread data", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_scan_thread_data);
-       mono_counters_register ("Minor finish gray stack", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_finish_gray_stack);
-       mono_counters_register ("Minor fragment creation", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_minor_fragment_creation);
-
-       mono_counters_register ("Major fragment clear", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_pre_collection_fragment_clear);
-       mono_counters_register ("Major pinning", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_pinning);
-       mono_counters_register ("Major scan pinned", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_scan_pinned);
-       mono_counters_register ("Major scan registered roots", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_scan_registered_roots);
-       mono_counters_register ("Major scan thread data", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_scan_thread_data);
-       mono_counters_register ("Major scan alloc_pinned", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_scan_alloc_pinned);
-       mono_counters_register ("Major scan finalized", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_scan_finalized);
-       mono_counters_register ("Major scan big objects", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_scan_big_objects);
-       mono_counters_register ("Major finish gray stack", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_finish_gray_stack);
-       mono_counters_register ("Major free big objects", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_free_bigobjs);
-       mono_counters_register ("Major LOS sweep", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_los_sweep);
-       mono_counters_register ("Major sweep", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_sweep);
-       mono_counters_register ("Major fragment creation", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_major_fragment_creation);
-
-       mono_counters_register ("Number of pinned objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_pinned_objects);
+       mono_counters_register ("Collection max time",  MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME | MONO_COUNTER_MONOTONIC, &time_max);
+
+       mono_counters_register ("Minor fragment clear", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_pre_collection_fragment_clear);
+       mono_counters_register ("Minor pinning", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_pinning);
+       mono_counters_register ("Minor scan remembered set", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_scan_remsets);
+       mono_counters_register ("Minor scan pinned", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_scan_pinned);
+       mono_counters_register ("Minor scan registered roots", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_scan_registered_roots);
+       mono_counters_register ("Minor scan thread data", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_scan_thread_data);
+       mono_counters_register ("Minor finish gray stack", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_finish_gray_stack);
+       mono_counters_register ("Minor fragment creation", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_minor_fragment_creation);
+
+       mono_counters_register ("Major fragment clear", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_pre_collection_fragment_clear);
+       mono_counters_register ("Major pinning", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_pinning);
+       mono_counters_register ("Major scan pinned", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_pinned);
+       mono_counters_register ("Major scan registered roots", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_registered_roots);
+       mono_counters_register ("Major scan thread data", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_thread_data);
+       mono_counters_register ("Major scan alloc_pinned", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_alloc_pinned);
+       mono_counters_register ("Major scan finalized", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_finalized);
+       mono_counters_register ("Major scan big objects", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_big_objects);
+       mono_counters_register ("Major finish gray stack", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_finish_gray_stack);
+       mono_counters_register ("Major free big objects", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_free_bigobjs);
+       mono_counters_register ("Major LOS sweep", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_los_sweep);
+       mono_counters_register ("Major sweep", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_sweep);
+       mono_counters_register ("Major fragment creation", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_fragment_creation);
+
+       mono_counters_register ("Number of pinned objects", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_pinned_objects);
 
 #ifdef HEAVY_STATISTICS
        mono_counters_register ("WBarrier remember pointer", MONO_COUNTER_GC | MONO_COUNTER_INT, &stat_wbarrier_add_to_global_remset);
@@ -1974,23 +1967,23 @@ init_stats (void)
        mono_counters_register ("WBarrier value copy", MONO_COUNTER_GC | MONO_COUNTER_INT, &stat_wbarrier_value_copy);
        mono_counters_register ("WBarrier object copy", MONO_COUNTER_GC | MONO_COUNTER_INT, &stat_wbarrier_object_copy);
 
-       mono_counters_register ("# objects allocated degraded", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_objects_alloced_degraded);
-       mono_counters_register ("bytes allocated degraded", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_bytes_alloced_degraded);
+       mono_counters_register ("# objects allocated degraded", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_objects_alloced_degraded);
+       mono_counters_register ("bytes allocated degraded", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_bytes_alloced_degraded);
 
-       mono_counters_register ("# copy_object() called (nursery)", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_copy_object_called_nursery);
-       mono_counters_register ("# objects copied (nursery)", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_objects_copied_nursery);
-       mono_counters_register ("# copy_object() called (major)", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_copy_object_called_major);
-       mono_counters_register ("# objects copied (major)", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_objects_copied_major);
+       mono_counters_register ("# copy_object() called (nursery)", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copy_object_called_nursery);
+       mono_counters_register ("# objects copied (nursery)", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_objects_copied_nursery);
+       mono_counters_register ("# copy_object() called (major)", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_copy_object_called_major);
+       mono_counters_register ("# objects copied (major)", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_objects_copied_major);
 
-       mono_counters_register ("# scan_object() called (nursery)", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scan_object_called_nursery);
-       mono_counters_register ("# scan_object() called (major)", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_scan_object_called_major);
+       mono_counters_register ("# scan_object() called (nursery)", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scan_object_called_nursery);
+       mono_counters_register ("# scan_object() called (major)", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_scan_object_called_major);
 
-       mono_counters_register ("Slots allocated in vain", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_slots_allocated_in_vain);
+       mono_counters_register ("Slots allocated in vain", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_slots_allocated_in_vain);
 
-       mono_counters_register ("# nursery copy_object() failed from space", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_nursery_copy_object_failed_from_space);
-       mono_counters_register ("# nursery copy_object() failed forwarded", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_nursery_copy_object_failed_forwarded);
-       mono_counters_register ("# nursery copy_object() failed pinned", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_nursery_copy_object_failed_pinned);
-       mono_counters_register ("# nursery copy_object() failed to space", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_nursery_copy_object_failed_to_space);
+       mono_counters_register ("# nursery copy_object() failed from space", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_nursery_copy_object_failed_from_space);
+       mono_counters_register ("# nursery copy_object() failed forwarded", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_nursery_copy_object_failed_forwarded);
+       mono_counters_register ("# nursery copy_object() failed pinned", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_nursery_copy_object_failed_pinned);
+       mono_counters_register ("# nursery copy_object() failed to space", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_nursery_copy_object_failed_to_space);
 
        sgen_nursery_allocator_init_heavy_stats ();
        sgen_alloc_init_heavy_stats ();
@@ -2456,7 +2449,7 @@ collect_nursery (SgenGrayQueue *unpin_queue, gboolean finish_up_concurrent_mark)
        objects_pinned = 0;
 
        MONO_GC_END (GENERATION_NURSERY);
-       binary_protocol_collection_end (gc_stats.minor_gc_count - 1, GENERATION_NURSERY);
+       binary_protocol_collection_end (gc_stats.minor_gc_count - 1, GENERATION_NURSERY, 0, 0);
 
        if (check_nursery_objects_pinned && !sgen_minor_collector.is_split)
                sgen_check_nursery_objects_pinned (unpin_queue != NULL);
@@ -2802,6 +2795,7 @@ wait_for_workers_to_finish (void)
 static void
 major_finish_collection (const char *reason, size_t old_next_pin_slot, gboolean scan_mod_union, gboolean scan_whole_nursery)
 {
+       ScannedObjectCounts counts;
        LOSObject *bigobj, *prevbo;
        TV_DECLARE (atv);
        TV_DECLARE (btv);
@@ -2962,7 +2956,8 @@ major_finish_collection (const char *reason, size_t old_next_pin_slot, gboolean
        sgen_memgov_major_collection_end ();
        current_collection_generation = -1;
 
-       major_collector.finish_major_collection ();
+       memset (&counts, 0, sizeof (ScannedObjectCounts));
+       major_collector.finish_major_collection (&counts);
 
        g_assert (sgen_section_gray_queue_is_empty (sgen_workers_get_distribute_section_gray_queue ()));
 
@@ -2977,7 +2972,7 @@ major_finish_collection (const char *reason, size_t old_next_pin_slot, gboolean
        //consistency_check ();
 
        MONO_GC_END (GENERATION_OLD);
-       binary_protocol_collection_end (gc_stats.major_gc_count - 1, GENERATION_OLD);
+       binary_protocol_collection_end (gc_stats.major_gc_count - 1, GENERATION_OLD, counts.num_scanned_objects, counts.num_unique_scanned_objects);
 }
 
 static gboolean
@@ -3045,6 +3040,9 @@ major_start_concurrent_collection (const char *reason)
        current_collection_generation = -1;
 }
 
+/*
+ * Returns whether the major collection has finished.
+ */
 static gboolean
 major_should_finish_concurrent_collection (void)
 {
@@ -3061,7 +3059,7 @@ major_update_concurrent_collection (void)
        TV_GETTIME (total_start);
 
        MONO_GC_CONCURRENT_UPDATE_FINISH_BEGIN (GENERATION_OLD, major_collector.get_and_reset_num_major_objects_marked ());
-       binary_protocol_concurrent_update_finish ();
+       binary_protocol_concurrent_update ();
 
        major_collector.update_cardtable_mod_union ();
        sgen_los_update_cardtable_mod_union ();
@@ -3084,7 +3082,7 @@ major_finish_concurrent_collection (void)
        TV_GETTIME (total_start);
 
        MONO_GC_CONCURRENT_UPDATE_FINISH_BEGIN (GENERATION_OLD, major_collector.get_and_reset_num_major_objects_marked ());
-       binary_protocol_concurrent_update_finish ();
+       binary_protocol_concurrent_finish ();
 
        /*
         * The major collector can add global remsets which are processed in the finishing
@@ -4670,7 +4668,6 @@ mono_gc_base_init (void)
        mono_threads_init (&cb, sizeof (SgenThreadInfo));
 
        LOCK_INIT (sgen_interruption_mutex);
-       LOCK_INIT (pin_queue_mutex);
 
        if ((env = g_getenv (MONO_GC_PARAMS_NAME))) {
                opts = g_strsplit (env, ",", -1);
index 32e878d0fe86085388d755391cbe043ecd19d513..0e328097c7f1ed7ddc278278d9013f66bff51d0c 100644 (file)
@@ -67,7 +67,6 @@ NurseryClearPolicy sgen_get_nursery_clear_policy (void) MONO_INTERNAL;
 #define SGEN_TV_DECLARE(name) gint64 name
 #define SGEN_TV_GETTIME(tv) tv = mono_100ns_ticks ()
 #define SGEN_TV_ELAPSED(start,end) (int)((end-start))
-#define SGEN_TV_ELAPSED_MS(start,end) ((SGEN_TV_ELAPSED((start),(end)) + 5000) / 10000)
 
 #if !defined(__MACH__) && !MONO_MACH_ARCH_SUPPORTED && defined(HAVE_PTHREAD_KILL)
 #define SGEN_POSIX_STW 1
@@ -160,7 +159,6 @@ struct _GCMemSection {
                mono_mutex_lock (&gc_mutex);                    \
                MONO_GC_LOCKED ();                              \
        } while (0)
-#define TRYLOCK_GC (mono_mutex_trylock (&gc_mutex) == 0)
 #define UNLOCK_GC do { sgen_gc_unlock (); } while (0)
 
 extern LOCK_DECLARE (sgen_interruption_mutex);
@@ -190,10 +188,10 @@ extern LOCK_DECLARE (sgen_interruption_mutex);
 #endif
 
 #ifdef HEAVY_STATISTICS
-extern long long stat_objects_alloced_degraded;
-extern long long stat_bytes_alloced_degraded;
-extern long long stat_copy_object_called_major;
-extern long long stat_objects_copied_major;
+extern guint64 stat_objects_alloced_degraded;
+extern guint64 stat_bytes_alloced_degraded;
+extern guint64 stat_copy_object_called_major;
+extern guint64 stat_objects_copied_major;
 #endif
 
 #define SGEN_ASSERT(level, a, ...) do {        \
@@ -213,11 +211,6 @@ extern long long stat_objects_copied_major;
                        mono_gc_printf (gc_debug_file, format, ##__VA_ARGS__);  \
 } } while (0)
 
-#define SGEN_LOG_DO(level, fun) do {   \
-       if (G_UNLIKELY ((level) <= SGEN_MAX_DEBUG_LEVEL && (level) <= gc_debug_level)) {        \
-               fun;    \
-} } while (0)
-
 extern int gc_debug_level;
 extern FILE* gc_debug_file;
 
@@ -310,27 +303,37 @@ typedef struct {
        mword desc;
 } GCVTable;
 
-/* these bits are set in the object vtable: we could merge them since an object can be
- * either pinned or forwarded but not both.
- * We store them in the vtable slot because the bits are used in the sync block for
- * other purposes: if we merge them and alloc the sync blocks aligned to 8 bytes, we can change
+/*
+ * We use the lowest three bits in the vtable pointer of objects to tag whether they're
+ * forwarded, pinned, and/or cemented.  These are the valid states:
+ *
+ * | State            | bits |
+ * |------------------+------+
+ * | default          |  000 |
+ * | forwarded        |  001 |
+ * | pinned           |  010 |
+ * | pinned, cemented |  110 |
+ *
+ * We store them in the vtable slot because the bits are used in the sync block for other
+ * purposes: if we merge them and alloc the sync blocks aligned to 8 bytes, we can change
  * this and use bit 3 in the syncblock (with the lower two bits both set for forwarded, that
  * would be an invalid combination for the monitor and hash code).
- * The values are already shifted.
- * The forwarding address is stored in the sync block.
  */
 
-#define SGEN_VTABLE_BITS_MASK 0x3
-
 #include "sgen-tagged-pointer.h"
 
+#define SGEN_VTABLE_BITS_MASK  SGEN_TAGGED_POINTER_MASK
+
 #define SGEN_POINTER_IS_TAGGED_FORWARDED(p)    SGEN_POINTER_IS_TAGGED_1((p))
-#define SGEN_POINTER_TAG_FORWARDED(p)  SGEN_POINTER_TAG_1((p))
+#define SGEN_POINTER_TAG_FORWARDED(p)          SGEN_POINTER_TAG_1((p))
 
 #define SGEN_POINTER_IS_TAGGED_PINNED(p)       SGEN_POINTER_IS_TAGGED_2((p))
-#define SGEN_POINTER_TAG_PINNED(p)     SGEN_POINTER_TAG_2((p))
+#define SGEN_POINTER_TAG_PINNED(p)             SGEN_POINTER_TAG_2((p))
 
-#define SGEN_POINTER_UNTAG_VTABLE(p)   SGEN_POINTER_UNTAG_12((p))
+#define SGEN_POINTER_IS_TAGGED_CEMENTED(p)     SGEN_POINTER_IS_TAGGED_4((p))
+#define SGEN_POINTER_TAG_CEMENTED(p)           SGEN_POINTER_TAG_4((p))
+
+#define SGEN_POINTER_UNTAG_VTABLE(p)           SGEN_POINTER_UNTAG_ALL((p))
 
 /* returns NULL if not forwarded, or the forwarded address */
 #define SGEN_VTABLE_IS_FORWARDED(vtable) (SGEN_POINTER_IS_TAGGED_FORWARDED ((vtable)) ? SGEN_POINTER_UNTAG_VTABLE ((vtable)) : NULL)
@@ -339,6 +342,8 @@ typedef struct {
 #define SGEN_VTABLE_IS_PINNED(vtable) SGEN_POINTER_IS_TAGGED_PINNED ((vtable))
 #define SGEN_OBJECT_IS_PINNED(obj) (SGEN_VTABLE_IS_PINNED (((mword*)(obj))[0]))
 
+#define SGEN_OBJECT_IS_CEMENTED(obj) (SGEN_POINTER_IS_TAGGED_CEMENTED (((mword*)(obj))[0]))
+
 /* set the forwarded address fw_addr for object obj */
 #define SGEN_FORWARD_OBJECT(obj,fw_addr) do {                          \
                *(void**)(obj) = SGEN_POINTER_TAG_FORWARDED ((fw_addr));        \
@@ -346,15 +351,19 @@ typedef struct {
 #define SGEN_PIN_OBJECT(obj) do {      \
                *(void**)(obj) = SGEN_POINTER_TAG_PINNED (*(void**)(obj)); \
        } while (0)
+#define SGEN_CEMENT_OBJECT(obj) do {   \
+               *(void**)(obj) = SGEN_POINTER_TAG_CEMENTED (*(void**)(obj)); \
+       } while (0)
+/* Unpins and uncements */
 #define SGEN_UNPIN_OBJECT(obj) do {    \
-               *(void**)(obj) = SGEN_POINTER_UNTAG_2 (*(void**)(obj)); \
+               *(void**)(obj) = SGEN_POINTER_UNTAG_VTABLE (*(void**)(obj)); \
        } while (0)
 
 /*
  * Since we set bits in the vtable, use the macro to load it from the pointer to
  * an object that is potentially pinned.
  */
-#define SGEN_LOAD_VTABLE(addr) SGEN_POINTER_UNTAG_12 (*(void**)(addr))
+#define SGEN_LOAD_VTABLE(addr) SGEN_POINTER_UNTAG_ALL (*(void**)(addr))
 
 /*
 List of what each bit on of the vtable gc bits means. 
@@ -644,6 +653,12 @@ typedef enum {
        ITERATE_OBJECTS_SWEEP_ALL = ITERATE_OBJECTS_SWEEP | ITERATE_OBJECTS_NON_PINNED | ITERATE_OBJECTS_PINNED
 } IterateObjectsFlags;
 
+typedef struct
+{
+       size_t num_scanned_objects;
+       size_t num_unique_scanned_objects;
+} ScannedObjectCounts;
+
 typedef struct _SgenMajorCollector SgenMajorCollector;
 struct _SgenMajorCollector {
        size_t section_size;
@@ -689,7 +704,8 @@ struct _SgenMajorCollector {
        void (*start_nursery_collection) (void);
        void (*finish_nursery_collection) (void);
        void (*start_major_collection) (void);
-       void (*finish_major_collection) (void);
+       void (*finish_major_collection) (ScannedObjectCounts *counts);
+       gboolean (*drain_gray_stack) (ScanCopyContext ctx);
        void (*have_computed_minor_collection_allowance) (void);
        gboolean (*ptr_is_in_non_pinned_space) (char *ptr, char **start);
        gboolean (*obj_is_from_pinned_alloc) (char *obj);
@@ -775,7 +791,7 @@ static inline mword
 sgen_obj_get_descriptor (char *obj)
 {
        MonoVTable *vtable = ((MonoObject*)obj)->vtable;
-       SGEN_ASSERT (0, !SGEN_POINTER_IS_TAGGED_1_OR_2 (vtable), "Object can't be tagged");
+       SGEN_ASSERT (9, !SGEN_POINTER_IS_TAGGED_ANY (vtable), "Object can't be tagged");
        return sgen_vtable_get_descriptor (vtable);
 }
 
@@ -795,13 +811,14 @@ static inline mword
 sgen_par_object_get_size (MonoVTable *vtable, MonoObject* o)
 {
        mword descr = (mword)vtable->gc_descr;
-       mword type = descr & 0x7;
+       mword type = descr & DESC_TYPE_MASK;
 
-       if (type == DESC_TYPE_RUN_LENGTH || type == DESC_TYPE_SMALL_BITMAP) {
+       if (type == DESC_TYPE_RUN_LENGTH || type == DESC_TYPE_SMALL_PTRFREE) {
                mword size = descr & 0xfff8;
-               if (size == 0) /* This is used to encode a string */
-                       return offsetof (MonoString, chars) + 2 * mono_string_length_fast ((MonoString*) o) + 2;
+               SGEN_ASSERT (9, size >= sizeof (MonoObject), "Run length object size to small");
                return size;
+       } else if (descr == SGEN_DESC_STRING) {
+               return offsetof (MonoString, chars) + 2 * mono_string_length_fast ((MonoString*) o) + 2;
        } else if (type == DESC_TYPE_VECTOR) {
                int element_size = ((descr) >> VECTOR_ELSIZE_SHIFT) & MAX_ELEMENT_SIZE;
                MonoArray *array = (MonoArray*)o;
index 3a1da29784f834a519812339bf28ade40ee1513e..6407ef8928dd3ad9f8f44467b91d5ec63de5751b 100644 (file)
 #include "sgen-protocol.h"
 
 #ifdef HEAVY_STATISTICS
-unsigned long long stat_gray_queue_section_alloc;
-unsigned long long stat_gray_queue_section_free;
-unsigned long long stat_gray_queue_enqueue_fast_path;
-unsigned long long stat_gray_queue_dequeue_fast_path;
-unsigned long long stat_gray_queue_enqueue_slow_path;
-unsigned long long stat_gray_queue_dequeue_slow_path;
+guint64 stat_gray_queue_section_alloc;
+guint64 stat_gray_queue_section_free;
+guint64 stat_gray_queue_enqueue_fast_path;
+guint64 stat_gray_queue_dequeue_fast_path;
+guint64 stat_gray_queue_enqueue_slow_path;
+guint64 stat_gray_queue_dequeue_slow_path;
 #endif
 
 #define GRAY_QUEUE_LENGTH_LIMIT        64
@@ -99,7 +99,7 @@ sgen_gray_object_free_queue_section (GrayQueueSection *section)
 void
 sgen_gray_object_enqueue (SgenGrayQueue *queue, char *obj, mword desc)
 {
-       GrayQueueEntry entry = { obj, desc };
+       GrayQueueEntry entry = SGEN_GRAY_QUEUE_ENTRY (obj, desc);
 
        HEAVY_STAT (stat_gray_queue_enqueue_slow_path ++);
 
index 37ba2d8e65085b918ac6f81d4e62fcd956641d53..c51822c908ddf7c2ae3ea74ee3e38fb63d885fd2 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef __MONO_SGEN_GRAY_H__
 #define __MONO_SGEN_GRAY_H__
 
-#include "sgen-protocol.h"
+#include "metadata/sgen-protocol.h"
 
 /*
  * This gray queue has to be as optimized as possible, because it is in the core of
@@ -74,6 +74,8 @@ struct _GrayQueueEntry {
        mword desc;
 };
 
+#define SGEN_GRAY_QUEUE_ENTRY(obj,desc)        { (obj), (desc) }
+
 /*
  * This is a stack now instead of a queue, so the most recently added items are removed
  * first, improving cache locality, and keeping the stack size manageable.
@@ -124,12 +126,12 @@ struct _SgenSectionGrayQueue {
 #define GRAY_FIRST_CURSOR_POSITION(s) ((s)->entries)
 
 #ifdef HEAVY_STATISTICS
-extern unsigned long long stat_gray_queue_section_alloc;
-extern unsigned long long stat_gray_queue_section_free;
-extern unsigned long long stat_gray_queue_enqueue_fast_path;
-extern unsigned long long stat_gray_queue_dequeue_fast_path;
-extern unsigned long long stat_gray_queue_enqueue_slow_path;
-extern unsigned long long stat_gray_queue_dequeue_slow_path;
+extern guint64 stat_gray_queue_section_alloc;
+extern guint64 stat_gray_queue_section_free;
+extern guint64 stat_gray_queue_enqueue_fast_path;
+extern guint64 stat_gray_queue_dequeue_fast_path;
+extern guint64 stat_gray_queue_enqueue_slow_path;
+extern guint64 stat_gray_queue_dequeue_slow_path;
 #endif
 
 void sgen_init_gray_queues (void) MONO_INTERNAL;
@@ -155,6 +157,8 @@ gboolean sgen_section_gray_queue_is_empty (SgenSectionGrayQueue *queue) MONO_INT
 GrayQueueSection* sgen_section_gray_queue_dequeue (SgenSectionGrayQueue *queue) MONO_INTERNAL;
 void sgen_section_gray_queue_enqueue (SgenSectionGrayQueue *queue, GrayQueueSection *section) MONO_INTERNAL;
 
+gboolean sgen_gray_object_fill_prefetch (SgenGrayQueue *queue);
+
 static inline gboolean
 sgen_gray_object_queue_is_empty (SgenGrayQueue *queue)
 {
@@ -170,7 +174,7 @@ GRAY_OBJECT_ENQUEUE (SgenGrayQueue *queue, char* obj, mword desc)
        if (G_UNLIKELY (!queue->first || queue->cursor == GRAY_LAST_CURSOR_POSITION (queue->first))) {
                sgen_gray_object_enqueue (queue, obj, desc);
        } else {
-               GrayQueueEntry entry = { obj, desc };
+               GrayQueueEntry entry = SGEN_GRAY_QUEUE_ENTRY (obj, desc);
 
                HEAVY_STAT (stat_gray_queue_enqueue_fast_path ++);
 
@@ -187,7 +191,7 @@ GRAY_OBJECT_DEQUEUE (SgenGrayQueue *queue, char** obj, mword *desc)
 {
        GrayQueueEntry entry;
 #if SGEN_MAX_DEBUG_LEVEL >= 9
-       entry = sgen_gray_object_enqueue (queue);
+       entry = sgen_gray_object_dequeue (queue);
        *obj = entry.obj;
        *desc = entry.desc;
 #else
@@ -195,9 +199,6 @@ GRAY_OBJECT_DEQUEUE (SgenGrayQueue *queue, char** obj, mword *desc)
                HEAVY_STAT (stat_gray_queue_dequeue_fast_path ++);
 
                *obj = NULL;
-#ifdef SGEN_HEAVY_BINARY_PROTOCOL
-               binary_protocol_gray_dequeue (queue, queue->cursor, *obj);
-#endif
        } else if (G_UNLIKELY (queue->cursor == GRAY_FIRST_CURSOR_POSITION (queue->first))) {
                entry = sgen_gray_object_dequeue (queue);
                *obj = entry.obj;
index cebba4fae11c987f1edccd89e7a7c02a19900e8a..176a5634ade6aa9fe725ff34c330c55f590b7adc 100644 (file)
@@ -30,9 +30,9 @@
 #include <mono/utils/mono-counters.h>
 
 #ifdef HEAVY_STATISTICS
-static long long stat_lookups;
-static long long stat_lookup_iterations;
-static long long stat_lookup_max_iterations;
+static guint64 stat_lookups;
+static guint64 stat_lookup_iterations;
+static guint64 stat_lookup_max_iterations;
 #endif
 
 static void
@@ -82,7 +82,7 @@ lookup (SgenHashTable *hash_table, gpointer key, guint *_hash)
        guint hash;
        GEqualFunc equal = hash_table->equal_func;
 #ifdef HEAVY_STATISTICS
-       long long iterations = 0;
+       guint64 iterations = 0;
        ++stat_lookups;
 #endif
 
@@ -241,9 +241,9 @@ void
 sgen_init_hash_table (void)
 {
 #ifdef HEAVY_STATISTICS
-       mono_counters_register ("Hash table lookups", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_lookups);
-       mono_counters_register ("Hash table lookup iterations", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_lookup_iterations);
-       mono_counters_register ("Hash table lookup max iterations", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_lookup_max_iterations);
+       mono_counters_register ("Hash table lookups", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_lookups);
+       mono_counters_register ("Hash table lookup iterations", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_lookup_iterations);
+       mono_counters_register ("Hash table lookup max iterations", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_lookup_max_iterations);
 #endif
 }
 
index 8e823b055377b046c0ae574e46f0edc5f3d19b56..dc104a0a8cd2accf415b382e86590aada62b12be 100644 (file)
@@ -38,6 +38,7 @@
 #include "metadata/sgen-cardtable.h"
 #include "metadata/sgen-memory-governor.h"
 #include "utils/mono-mmap.h"
+#include "utils/mono-compiler.h"
 
 #define LOS_SECTION_SIZE       (1024 * 1024)
 
index e912be704c21dd8baa4635b845f33b9c635c07af..a4b10ff85df2967fd4a4ba18740a88d838c6cd9b 100644 (file)
@@ -29,7 +29,5 @@
 } while (0)
 
 #define COLLECTOR_SERIAL_ALLOC_FOR_PROMOTION sgen_minor_collector.alloc_for_promotion
-#define COLLECTOR_PARALLEL_ALLOC_FOR_PROMOTION sgen_minor_collector.par_alloc_for_promotion
-
 
 #include "sgen-copy-object.h"
diff --git a/mono/metadata/sgen-major-scan-object.h b/mono/metadata/sgen-major-scan-object.h
deleted file mode 100644 (file)
index 14b1131..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * sgen-major-scan-object.h: Object scanning in the major collectors.
- *
- * Copyright 2001-2003 Ximian, Inc
- * Copyright 2003-2010 Novell, Inc.
- * Copyright (C) 2012 Xamarin Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License 2.0 as published by the Free Software Foundation;
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License 2.0 along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-extern long long stat_scan_object_called_major;
-
-#ifdef FIXED_HEAP
-#define PREFETCH_DYNAMIC_HEAP(addr)
-#else
-#define PREFETCH_DYNAMIC_HEAP(addr)    PREFETCH ((addr))
-#endif
-
-#ifdef SCAN_FOR_CONCURRENT_MARK
-#define FOLLOW_OBJECT(addr)    (!sgen_ptr_in_nursery ((addr)))
-#define ALWAYS_ADD_TO_GLOBAL_REMSET    1
-#define CONCURRENT_NAME(x)     x ## _concurrent
-#else
-#define FOLLOW_OBJECT(addr)    1
-#define ALWAYS_ADD_TO_GLOBAL_REMSET    0
-#define CONCURRENT_NAME(x)     x
-#endif
-
-/*
- * FIXME: We use the same scanning function in the concurrent collector whether we scan
- * during the starting/finishing collection pause (with the world stopped) or from the
- * concurrent worker thread.
- *
- * As long as the world is stopped, we should just follow pointers into the nursery and
- * evict if possible.  In that case we also don't need the ALWAYS_ADD_TO_GLOBAL_REMSET case,
- * which only seems to make sense for when the world is stopped, in which case we only need
- * it because we don't follow into the nursery.
- */
-
-#undef HANDLE_PTR
-#define HANDLE_PTR(ptr,obj)    do {                                    \
-               void *__old = *(ptr);                                   \
-               SGEN_OBJECT_LAYOUT_STATISTICS_MARK_BITMAP ((obj), (ptr)); \
-               if (__old && FOLLOW_OBJECT (__old)) {                   \
-                       void *__copy;                                   \
-                       PREFETCH_DYNAMIC_HEAP (__old);                  \
-                       CONCURRENT_NAME (major_copy_or_mark_object) ((ptr), __old, queue); \
-                       __copy = *(ptr);                                \
-                       SGEN_COND_LOG (9, __old != __copy, "Overwrote field at %p with %p (was: %p)", (ptr), *(ptr), __old); \
-                       if (G_UNLIKELY (sgen_ptr_in_nursery (__copy) && !sgen_ptr_in_nursery ((ptr)))) \
-                               sgen_add_to_global_remset ((ptr), __copy);      \
-               } else {                                                \
-                       if (ALWAYS_ADD_TO_GLOBAL_REMSET && G_UNLIKELY (sgen_ptr_in_nursery (__old) && !sgen_ptr_in_nursery ((ptr)))) \
-                               sgen_add_to_global_remset ((ptr), __old); \
-               }                                                       \
-       } while (0)
-
-static void
-CONCURRENT_NAME (major_scan_object) (char *start, mword desc, SgenGrayQueue *queue)
-{
-       SGEN_OBJECT_LAYOUT_STATISTICS_DECLARE_BITMAP;
-
-#ifdef HEAVY_STATISTICS
-       sgen_descriptor_count_scanned_object (desc);
-#endif
-
-#define SCAN_OBJECT_PROTOCOL
-#include "sgen-scan-object.h"
-
-       SGEN_OBJECT_LAYOUT_STATISTICS_COMMIT_BITMAP;
-       HEAVY_STAT (++stat_scan_object_called_major);
-}
-
-#ifdef SCAN_FOR_CONCURRENT_MARK
-#ifdef SGEN_PARALLEL_MARK
-#error concurrent and parallel mark not supported yet
-#else
-static void
-CONCURRENT_NAME (major_scan_vtype) (char *start, mword desc, SgenGrayQueue *queue BINARY_PROTOCOL_ARG (size_t size))
-{
-       SGEN_OBJECT_LAYOUT_STATISTICS_DECLARE_BITMAP;
-
-       /* The descriptors include info about the MonoObject header as well */
-       start -= sizeof (MonoObject);
-
-#define SCAN_OBJECT_NOVTABLE
-#define SCAN_OBJECT_PROTOCOL
-#include "sgen-scan-object.h"
-
-       SGEN_OBJECT_LAYOUT_STATISTICS_COMMIT_BITMAP;
-}
-#endif
-#endif
-
-#undef PREFETCH_DYNAMIC_HEAP
-#undef FOLLOW_OBJECT
-#undef ALWAYS_ADD_TO_GLOBAL_REMSET
-#undef CONCURRENT_NAME
diff --git a/mono/metadata/sgen-marksweep-drain-gray-stack.h b/mono/metadata/sgen-marksweep-drain-gray-stack.h
new file mode 100644 (file)
index 0000000..da962a8
--- /dev/null
@@ -0,0 +1,248 @@
+/*
+ * sgen-marksweep-drain-gray-stack.h: The copy/mark and gray stack
+ *     draining functions of the M&S major collector.
+ *
+ * Copyright (C) 2014 Xamarin Inc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License 2.0 as published by the Free Software Foundation;
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License 2.0 along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * COPY_OR_MARK_FUNCTION_NAME must be defined to be the function name of the copy/mark
+ * function.
+ *
+ * SCAN_OBJECT_FUNCTION_NAME must be defined to be the function name of the object scanning
+ * function.
+ *
+ * DRAIN_GRAY_STACK_FUNCTION_NAME must be defined to be the function name of the gray stack
+ * draining function.
+ *
+ * Define COPY_OR_MARK_WITH_EVACUATION to support evacuation.
+ */
+
+/* Returns whether the object is still in the nursery. */
+static inline MONO_ALWAYS_INLINE gboolean
+COPY_OR_MARK_FUNCTION_NAME (void **ptr, void *obj, SgenGrayQueue *queue)
+{
+       MSBlockInfo *block;
+
+#ifdef HEAVY_STATISTICS
+       ++stat_optimized_copy;
+       {
+               char *forwarded;
+               mword desc;
+               if ((forwarded = SGEN_OBJECT_IS_FORWARDED (obj)))
+                       desc = sgen_obj_get_descriptor_safe (forwarded);
+               else
+                       desc = sgen_obj_get_descriptor_safe (obj);
+
+               sgen_descriptor_count_copied_object (desc);
+       }
+#endif
+
+       SGEN_ASSERT (9, obj, "null object from pointer %p", ptr);
+       SGEN_ASSERT (9, current_collection_generation == GENERATION_OLD, "old gen parallel allocator called from a %d collection", current_collection_generation);
+
+       if (sgen_ptr_in_nursery (obj)) {
+               int word, bit;
+               char *forwarded, *old_obj;
+               mword vtable_word = *(mword*)obj;
+
+               HEAVY_STAT (++stat_optimized_copy_nursery);
+
+#if SGEN_MAX_DEBUG_LEVEL >= 9
+               if (sgen_nursery_is_to_space (obj))
+                       SGEN_ASSERT (9, !SGEN_VTABLE_IS_PINNED (vtable_word) && !SGEN_VTABLE_IS_FORWARDED (vtable_word), "To-space object can't be pinned or forwarded.");
+#endif
+
+               if (SGEN_VTABLE_IS_PINNED (vtable_word)) {
+                       SGEN_ASSERT (9, !SGEN_VTABLE_IS_FORWARDED (vtable_word), "Cannot be both pinned and forwarded.");
+                       HEAVY_STAT (++stat_optimized_copy_nursery_pinned);
+                       return TRUE;
+               }
+               if ((forwarded = SGEN_VTABLE_IS_FORWARDED (vtable_word))) {
+                       HEAVY_STAT (++stat_optimized_copy_nursery_forwarded);
+                       *ptr = forwarded;
+                       return sgen_ptr_in_nursery (forwarded);
+               }
+
+               /* An object in the nursery To Space has already been copied and grayed. Nothing to do. */
+               if (sgen_nursery_is_to_space (obj))
+                       return TRUE;
+
+#ifdef COPY_OR_MARK_WITH_EVACUATION
+       do_copy_object:
+#endif
+               old_obj = obj;
+               obj = copy_object_no_checks (obj, queue);
+               if (G_UNLIKELY (old_obj == obj)) {
+                       /*
+                        * If we fail to evacuate an object we just stop doing it for a
+                        * given block size as all other will surely fail too.
+                        */
+                       /* FIXME: test this case somehow. */
+                       if (!sgen_ptr_in_nursery (obj)) {
+                               int size_index;
+                               block = MS_BLOCK_FOR_OBJ (obj);
+                               size_index = block->obj_size_index;
+                               evacuate_block_obj_sizes [size_index] = FALSE;
+                               MS_MARK_OBJECT_AND_ENQUEUE (obj, sgen_obj_get_descriptor (obj), block, queue);
+                               return FALSE;
+                       }
+                       return TRUE;
+               }
+               HEAVY_STAT (++stat_objects_copied_major);
+               *ptr = obj;
+
+               if (sgen_ptr_in_nursery (obj))
+                       return TRUE;
+
+               /*
+                * FIXME: See comment for copy_object_no_checks().  If
+                * we have that, we can let the allocation function
+                * give us the block info, too, and we won't have to
+                * re-fetch it.
+                *
+                * FIXME (2): We should rework this to avoid all those nursery checks.
+                */
+               /*
+                * For the split nursery allocator the object might
+                * still be in the nursery despite having being
+                * promoted, in which case we can't mark it.
+                */
+               block = MS_BLOCK_FOR_OBJ (obj);
+               MS_CALC_MARK_BIT (word, bit, obj);
+               SGEN_ASSERT (9, !MS_MARK_BIT (block, word, bit), "object %p already marked", obj);
+               MS_SET_MARK_BIT (block, word, bit);
+               binary_protocol_mark (obj, (gpointer)LOAD_VTABLE (obj), sgen_safe_object_get_size ((MonoObject*)obj));
+
+               return FALSE;
+       } else {
+               mword vtable_word = *(mword*)obj;
+               mword desc = sgen_vtable_get_descriptor ((MonoVTable*)vtable_word);
+               int type = desc & DESC_TYPE_MASK;
+
+               HEAVY_STAT (++stat_optimized_copy_major);
+
+#ifdef COPY_OR_MARK_WITH_EVACUATION
+               {
+                       char *forwarded;
+                       if ((forwarded = SGEN_VTABLE_IS_FORWARDED (vtable_word))) {
+                               HEAVY_STAT (++stat_optimized_copy_major_forwarded);
+                               *ptr = forwarded;
+                               SGEN_ASSERT (9, !sgen_ptr_in_nursery (forwarded), "Cannot be forwarded to nursery.");
+                               return FALSE;
+                       }
+               }
+#endif
+
+               if (type <= DESC_TYPE_MAX_SMALL_OBJ || SGEN_ALIGN_UP (sgen_safe_object_get_size ((MonoObject*)obj)) <= SGEN_MAX_SMALL_OBJ_SIZE) {
+#ifdef HEAVY_STATISTICS
+                       if (type <= DESC_TYPE_MAX_SMALL_OBJ)
+                               ++stat_optimized_copy_major_small_fast;
+                       else
+                               ++stat_optimized_copy_major_small_slow;
+#endif
+
+                       block = MS_BLOCK_FOR_OBJ (obj);
+
+#ifdef COPY_OR_MARK_WITH_EVACUATION
+                       {
+                               int size_index = block->obj_size_index;
+
+                               if (evacuate_block_obj_sizes [size_index] && !block->has_pinned) {
+                                       HEAVY_STAT (++stat_optimized_copy_major_small_evacuate);
+                                       if (block->is_to_space)
+                                               return FALSE;
+                                       goto do_copy_object;
+                               }
+                       }
+#endif
+
+                       MS_MARK_OBJECT_AND_ENQUEUE (obj, desc, block, queue);
+               } else {
+                       HEAVY_STAT (++stat_optimized_copy_major_large);
+
+                       if (sgen_los_object_is_pinned (obj))
+                               return FALSE;
+                       binary_protocol_pin (obj, (gpointer)SGEN_LOAD_VTABLE (obj), sgen_safe_object_get_size ((MonoObject*)obj));
+
+                       sgen_los_pin_object (obj);
+                       if (SGEN_OBJECT_HAS_REFERENCES (obj))
+                               GRAY_OBJECT_ENQUEUE (queue, obj, sgen_obj_get_descriptor (obj));
+               }
+               return FALSE;
+       }
+       return FALSE;
+}
+
+static void
+SCAN_OBJECT_FUNCTION_NAME (char *obj, mword desc, SgenGrayQueue *queue)
+{
+       char *start = obj;
+
+#ifdef HEAVY_STATISTICS
+       ++stat_optimized_major_scan;
+       if (!sgen_gc_descr_has_references (desc))
+               ++stat_optimized_major_scan_no_refs;
+       sgen_descriptor_count_scanned_object (desc);
+#endif
+#ifdef SGEN_HEAVY_BINARY_PROTOCOL
+       add_scanned_object (start);
+#endif
+
+       /* Now scan the object. */
+
+#undef HANDLE_PTR
+#define HANDLE_PTR(ptr,obj)    do {                                    \
+               void *__old = *(ptr);                                   \
+               binary_protocol_scan_process_reference ((obj), (ptr), __old); \
+               if (__old) {                                            \
+                       gboolean __still_in_nursery = COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
+                       if (G_UNLIKELY (__still_in_nursery && !sgen_ptr_in_nursery ((ptr)) && !SGEN_OBJECT_IS_CEMENTED (*(ptr)))) { \
+                               void *__copy = *(ptr);                  \
+                               sgen_add_to_global_remset ((ptr), __copy); \
+                       }                                               \
+               }                                                       \
+       } while (0)
+
+#define SCAN_OBJECT_PROTOCOL
+#include "sgen-scan-object.h"
+}
+
+static gboolean
+DRAIN_GRAY_STACK_FUNCTION_NAME (ScanCopyContext ctx)
+{
+       SgenGrayQueue *queue = ctx.queue;
+
+       SGEN_ASSERT (0, ctx.scan_func == major_scan_object_with_evacuation, "Wrong scan function");
+
+       for (;;) {
+               char *obj;
+               mword desc;
+
+               HEAVY_STAT (++stat_drain_loops);
+
+               GRAY_OBJECT_DEQUEUE (queue, &obj, &desc);
+               if (!obj)
+                       return TRUE;
+
+               SCAN_OBJECT_FUNCTION_NAME (obj, desc, ctx.queue);
+       }
+}
+
+#undef COPY_OR_MARK_FUNCTION_NAME
+#undef COPY_OR_MARK_WITH_EVACUATION
+#undef SCAN_OBJECT_FUNCTION_NAME
+#undef DRAIN_GRAY_STACK_FUNCTION_NAME
diff --git a/mono/metadata/sgen-marksweep-scan-object-concurrent.h b/mono/metadata/sgen-marksweep-scan-object-concurrent.h
new file mode 100644 (file)
index 0000000..7902104
--- /dev/null
@@ -0,0 +1,93 @@
+/*
+ * sgen-major-scan-object.h: Object scanning in the major collectors.
+ *
+ * Copyright 2001-2003 Ximian, Inc
+ * Copyright 2003-2010 Novell, Inc.
+ * Copyright (C) 2012 Xamarin Inc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License 2.0 as published by the Free Software Foundation;
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License 2.0 along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+extern guint64 stat_scan_object_called_major;
+
+/*
+ * FIXME: We use the same scanning function in the concurrent collector whether we scan
+ * during the starting/finishing collection pause (with the world stopped) or from the
+ * concurrent worker thread.
+ *
+ * As long as the world is stopped, we should just follow pointers into the nursery and
+ * evict if possible.  In that case we also don't need the ALWAYS_ADD_TO_GLOBAL_REMSET case,
+ * which only seems to make sense for when the world is stopped, in which case we only need
+ * it because we don't follow into the nursery.
+ */
+
+#undef HANDLE_PTR
+#define HANDLE_PTR(ptr,obj)    do {                                    \
+               void *__old = *(ptr);                                   \
+               SGEN_OBJECT_LAYOUT_STATISTICS_MARK_BITMAP ((obj), (ptr)); \
+               binary_protocol_scan_process_reference ((obj), (ptr), __old); \
+               if (__old && !sgen_ptr_in_nursery (__old)) {            \
+                       void *__copy;                                   \
+                       PREFETCH_READ (__old);                  \
+                       major_copy_or_mark_object_with_evacuation_concurrent ((ptr), __old, queue); \
+                       __copy = *(ptr);                                \
+                       SGEN_COND_LOG (9, __old != __copy, "Overwrote field at %p with %p (was: %p)", (ptr), *(ptr), __old); \
+                       if (G_UNLIKELY (sgen_ptr_in_nursery (__copy) && !sgen_ptr_in_nursery ((ptr)) && !SGEN_OBJECT_IS_CEMENTED (__copy))) \
+                               sgen_add_to_global_remset ((ptr), __copy);      \
+               } else {                                                \
+                       if (G_UNLIKELY (sgen_ptr_in_nursery (__old) && !sgen_ptr_in_nursery ((ptr)))) \
+                               sgen_add_to_global_remset ((ptr), __old); \
+               }                                                       \
+       } while (0)
+
+/* FIXME: Unify this with optimized code in sgen-marksweep.c. */
+
+static void
+major_scan_object_no_mark_concurrent (char *start, mword desc, SgenGrayQueue *queue)
+{
+       SGEN_OBJECT_LAYOUT_STATISTICS_DECLARE_BITMAP;
+
+#ifdef HEAVY_STATISTICS
+       sgen_descriptor_count_scanned_object (desc);
+#endif
+#ifdef SGEN_HEAVY_BINARY_PROTOCOL
+       add_scanned_object (start);
+#endif
+
+#define SCAN_OBJECT_PROTOCOL
+#include "sgen-scan-object.h"
+
+       SGEN_OBJECT_LAYOUT_STATISTICS_COMMIT_BITMAP;
+       HEAVY_STAT (++stat_scan_object_called_major);
+}
+
+static void
+major_scan_vtype_concurrent (char *start, mword desc, SgenGrayQueue *queue BINARY_PROTOCOL_ARG (size_t size))
+{
+       SGEN_OBJECT_LAYOUT_STATISTICS_DECLARE_BITMAP;
+
+#ifdef HEAVY_STATISTICS
+       /* FIXME: We're half scanning this object.  How do we account for that? */
+       //add_scanned_object (start);
+#endif
+
+       /* The descriptors include info about the MonoObject header as well */
+       start -= sizeof (MonoObject);
+
+#define SCAN_OBJECT_NOVTABLE
+#define SCAN_OBJECT_PROTOCOL
+#include "sgen-scan-object.h"
+
+       SGEN_OBJECT_LAYOUT_STATISTICS_COMMIT_BITMAP;
+}
index 8baa393c001163cf9b43af6896bc5d063c0eefea..1aaf2e43db18e8eeb693bcc6ef7d52b6f8c2e8fa 100644 (file)
 #include "metadata/sgen-pinning.h"
 #include "metadata/sgen-workers.h"
 
-#define SGEN_HAVE_CONCURRENT_MARK
-
-#define MS_BLOCK_SIZE  (16*1024)
-#define MS_BLOCK_SIZE_SHIFT    14
+#if defined(ARCH_MIN_MS_BLOCK_SIZE) && defined(ARCH_MIN_MS_BLOCK_SIZE_SHIFT)
+#define MS_BLOCK_SIZE  ARCH_MIN_MS_BLOCK_SIZE
+#define MS_BLOCK_SIZE_SHIFT    ARCH_MIN_MS_BLOCK_SIZE_SHIFT
+#else
+#define MS_BLOCK_SIZE_SHIFT     14      /* INT FASTENABLE */
+#define MS_BLOCK_SIZE           (1 << MS_BLOCK_SIZE_SHIFT)
+#endif
 #define MAJOR_SECTION_SIZE     MS_BLOCK_SIZE
 #define CARDS_PER_BLOCK (MS_BLOCK_SIZE / CARD_SIZE_IN_BYTES)
 
  * of a block is the MSBlockHeader, then opional padding, then come
  * the objects, so this must be >= sizeof (MSBlockHeader).
  */
-#define MS_BLOCK_SKIP  16
+#define MS_BLOCK_SKIP  ((sizeof (MSBlockHeader) + 15) & ~15)
 
 #define MS_BLOCK_FREE  (MS_BLOCK_SIZE - MS_BLOCK_SKIP)
 
 #define MS_NUM_MARK_WORDS      ((MS_BLOCK_SIZE / SGEN_ALLOC_ALIGN + sizeof (mword) * 8 - 1) / (sizeof (mword) * 8))
 
-#if SGEN_MAX_SMALL_OBJ_SIZE > MS_BLOCK_FREE / 2
-#error MAX_SMALL_OBJ_SIZE must be at most MS_BLOCK_FREE / 2
-#endif
-
 typedef struct _MSBlockInfo MSBlockInfo;
 struct _MSBlockInfo {
        int obj_size;
@@ -81,28 +80,25 @@ struct _MSBlockInfo {
        unsigned int has_pinned : 1;    /* means cannot evacuate */
        unsigned int is_to_space : 1;
        unsigned int swept : 1;
-       char *block;
        void **free_list;
        MSBlockInfo *next_free;
        size_t pin_queue_first_entry;
        size_t pin_queue_last_entry;
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        guint8 *cardtable_mod_union;
-#endif
        mword mark_words [MS_NUM_MARK_WORDS];
 };
 
-#define MS_BLOCK_FOR_BLOCK_INFO(b)     ((b)->block)
+#define MS_BLOCK_FOR_BLOCK_INFO(b)     ((char*)(b))
 
 #define MS_BLOCK_OBJ(b,i)              (MS_BLOCK_FOR_BLOCK_INFO(b) + MS_BLOCK_SKIP + (b)->obj_size * (i))
 #define MS_BLOCK_OBJ_FOR_SIZE(b,i,obj_size)            (MS_BLOCK_FOR_BLOCK_INFO(b) + MS_BLOCK_SKIP + (obj_size) * (i))
 #define MS_BLOCK_DATA_FOR_OBJ(o)       ((char*)((mword)(o) & ~(mword)(MS_BLOCK_SIZE - 1)))
 
 typedef struct {
-       MSBlockInfo *info;
+       MSBlockInfo info;
 } MSBlockHeader;
 
-#define MS_BLOCK_FOR_OBJ(o)            (((MSBlockHeader*)MS_BLOCK_DATA_FOR_OBJ ((o)))->info)
+#define MS_BLOCK_FOR_OBJ(o)            (&((MSBlockHeader*)MS_BLOCK_DATA_FOR_OBJ ((o)))->info)
 
 /* object index will always be small */
 #define MS_BLOCK_OBJ_INDEX(o,b)        ((int)(((char*)(o) - (MS_BLOCK_FOR_BLOCK_INFO(b) + MS_BLOCK_SKIP)) / (b)->obj_size))
@@ -121,25 +117,10 @@ typedef struct {
 
 #define MS_MARK_BIT(bl,w,b)    ((bl)->mark_words [(w)] & (ONE_P << (b)))
 #define MS_SET_MARK_BIT(bl,w,b)        ((bl)->mark_words [(w)] |= (ONE_P << (b)))
-#define MS_PAR_SET_MARK_BIT(was_marked,bl,w,b) do {                    \
-               mword __old = (bl)->mark_words [(w)];                   \
-               mword __bitmask = ONE_P << (b);                         \
-               if (__old & __bitmask) {                                \
-                       was_marked = TRUE;                              \
-                       break;                                          \
-               }                                                       \
-               if (SGEN_CAS_PTR ((gpointer*)&(bl)->mark_words [(w)],   \
-                                               (gpointer)(__old | __bitmask), \
-                                               (gpointer)__old) ==     \
-                               (gpointer)__old) {                      \
-                       was_marked = FALSE;                             \
-                       break;                                          \
-               }                                                       \
-       } while (1)
 
 #define MS_OBJ_ALLOCED(o,b)    (*(void**)(o) && (*(char**)(o) < MS_BLOCK_FOR_BLOCK_INFO (b) || *(char**)(o) >= MS_BLOCK_FOR_BLOCK_INFO (b) + MS_BLOCK_SIZE))
 
-#define MS_BLOCK_OBJ_SIZE_FACTOR       (sqrt (2.0))
+#define MS_BLOCK_OBJ_SIZE_FACTOR       (pow (2.0, 1.0 / 3))
 
 /*
  * This way we can lookup block object size indexes for sizes up to
@@ -158,17 +139,13 @@ static int fast_block_obj_size_indexes [MS_NUM_FAST_BLOCK_OBJ_SIZE_INDEXES];
 
 static gboolean *evacuate_block_obj_sizes;
 static float evacuation_threshold = 0.666f;
-#ifdef SGEN_HAVE_CONCURRENT_MARK
 static float concurrent_evacuation_threshold = 0.666f;
 static gboolean want_evacuation = FALSE;
-#endif
 
 static gboolean lazy_sweep = TRUE;
 static gboolean have_swept;
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
 static gboolean concurrent_mark;
-#endif
 
 #define BLOCK_IS_TAGGED_HAS_REFERENCES(bl)     SGEN_POINTER_IS_TAGGED_1 ((bl))
 #define BLOCK_TAG_HAS_REFERENCES(bl)           SGEN_POINTER_TAG_1 ((bl))
@@ -192,25 +169,41 @@ static size_t num_major_sections = 0;
 /* one free block list for each block object size */
 static MSBlockInfo **free_block_lists [MS_BLOCK_TYPE_MAX];
 
-static long long stat_major_blocks_alloced = 0;
-static long long stat_major_blocks_freed = 0;
-static long long stat_major_blocks_lazy_swept = 0;
-static long long stat_major_objects_evacuated = 0;
+static guint64 stat_major_blocks_alloced = 0;
+static guint64 stat_major_blocks_freed = 0;
+static guint64 stat_major_blocks_lazy_swept = 0;
+static guint64 stat_major_objects_evacuated = 0;
 
 #if SIZEOF_VOID_P != 8
-static long long stat_major_blocks_freed_ideal = 0;
-static long long stat_major_blocks_freed_less_ideal = 0;
-static long long stat_major_blocks_freed_individual = 0;
-static long long stat_major_blocks_alloced_less_ideal = 0;
+static guint64 stat_major_blocks_freed_ideal = 0;
+static guint64 stat_major_blocks_freed_less_ideal = 0;
+static guint64 stat_major_blocks_freed_individual = 0;
+static guint64 stat_major_blocks_alloced_less_ideal = 0;
 #endif
 
 #ifdef SGEN_COUNT_NUMBER_OF_MAJOR_OBJECTS_MARKED
-static long long num_major_objects_marked = 0;
+static guint64 num_major_objects_marked = 0;
 #define INC_NUM_MAJOR_OBJECTS_MARKED() (++num_major_objects_marked)
 #else
 #define INC_NUM_MAJOR_OBJECTS_MARKED()
 #endif
 
+#ifdef SGEN_HEAVY_BINARY_PROTOCOL
+static mono_mutex_t scanned_objects_list_lock;
+static SgenPointerQueue scanned_objects_list;
+
+static void
+add_scanned_object (void *ptr)
+{
+       if (!binary_protocol_is_enabled ())
+               return;
+
+       mono_mutex_lock (&scanned_objects_list_lock);
+       sgen_pointer_queue_add (&scanned_objects_list, ptr);
+       mono_mutex_unlock (&scanned_objects_list_lock);
+}
+#endif
+
 static void
 sweep_block (MSBlockInfo *block, gboolean during_major_collection);
 
@@ -415,7 +408,6 @@ ms_alloc_block (int size_index, gboolean pinned, gboolean has_references)
        int size = block_obj_sizes [size_index];
        int count = MS_BLOCK_FREE / size;
        MSBlockInfo *info;
-       MSBlockHeader *header;
        MSBlockInfo **free_blocks = FREE_BLOCKS (pinned, has_references);
        char *obj_start;
        int i;
@@ -423,7 +415,7 @@ ms_alloc_block (int size_index, gboolean pinned, gboolean has_references)
        if (!sgen_memgov_try_alloc_space (MS_BLOCK_SIZE, SPACE_MAJOR))
                return FALSE;
 
-       info = sgen_alloc_internal (INTERNAL_MEM_MS_BLOCK_INFO);
+       info = (MSBlockInfo*)ms_get_empty_block ();
 
        SGEN_ASSERT (9, count >= 2, "block with %d objects, it must hold at least 2", count);
 
@@ -440,13 +432,7 @@ ms_alloc_block (int size_index, gboolean pinned, gboolean has_references)
         */
        info->is_to_space = (sgen_get_current_collection_generation () == GENERATION_OLD);
        info->swept = 1;
-       info->block = ms_get_empty_block ();
-
-       header = (MSBlockHeader*) info->block;
-       header->info = info;
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        info->cardtable_mod_union = NULL;
-#endif
 
        update_heap_boundaries_for_block (info);
 
@@ -615,8 +601,6 @@ major_alloc_degraded (MonoVTable *vtable, size_t size)
        return obj;
 }
 
-#define MAJOR_OBJ_IS_IN_TO_SPACE(obj)  FALSE
-
 /*
  * obj is some object.  If it's not in the major heap (i.e. if it's in
  * the nursery or LOS), return FALSE.  Otherwise return whether it's
@@ -836,9 +820,9 @@ major_dump_heap (FILE *heap_dump_file)
 #define MS_MARK_OBJECT_AND_ENQUEUE_CHECKED(obj,desc,block,queue) do {  \
                int __word, __bit;                                      \
                MS_CALC_MARK_BIT (__word, __bit, (obj));                \
-               if (!MS_MARK_BIT ((block), __word, __bit) && MS_OBJ_ALLOCED ((obj), (block))) { \
+               if (!MS_MARK_BIT ((block), __word, __bit) && MS_OBJ_ALLOCED ((obj), (block))) { \
                        MS_SET_MARK_BIT ((block), __word, __bit);       \
-                       if ((block)->has_references)                    \
+                       if (sgen_gc_descr_has_references (desc))                        \
                                GRAY_OBJECT_ENQUEUE ((queue), (obj), (desc)); \
                        binary_protocol_mark ((obj), (gpointer)LOAD_VTABLE ((obj)), sgen_safe_object_get_size ((MonoObject*)(obj))); \
                        INC_NUM_MAJOR_OBJECTS_MARKED ();                \
@@ -847,23 +831,10 @@ major_dump_heap (FILE *heap_dump_file)
 #define MS_MARK_OBJECT_AND_ENQUEUE(obj,desc,block,queue) do {          \
                int __word, __bit;                                      \
                MS_CALC_MARK_BIT (__word, __bit, (obj));                \
-               SGEN_ASSERT (9, MS_OBJ_ALLOCED ((obj), (block)), "object %p not allocated", obj);       \
+               SGEN_ASSERT (9, MS_OBJ_ALLOCED ((obj), (block)), "object %p not allocated", obj); \
                if (!MS_MARK_BIT ((block), __word, __bit)) {            \
                        MS_SET_MARK_BIT ((block), __word, __bit);       \
-                       if ((block)->has_references)                    \
-                               GRAY_OBJECT_ENQUEUE ((queue), (obj), (desc)); \
-                       binary_protocol_mark ((obj), (gpointer)LOAD_VTABLE ((obj)), sgen_safe_object_get_size ((MonoObject*)(obj))); \
-                       INC_NUM_MAJOR_OBJECTS_MARKED ();                \
-               }                                                       \
-       } while (0)
-#define MS_PAR_MARK_OBJECT_AND_ENQUEUE(obj,desc,block,queue) do {      \
-               int __word, __bit;                                      \
-               gboolean __was_marked;                                  \
-               SGEN_ASSERT (9, MS_OBJ_ALLOCED ((obj), (block)), "object %p not allocated", obj);       \
-               MS_CALC_MARK_BIT (__word, __bit, (obj));                \
-               MS_PAR_SET_MARK_BIT (__was_marked, (block), __word, __bit); \
-               if (!__was_marked) {                                    \
-                       if ((block)->has_references)                    \
+                       if (sgen_gc_descr_has_references (desc))                        \
                                GRAY_OBJECT_ENQUEUE ((queue), (obj), (desc)); \
                        binary_protocol_mark ((obj), (gpointer)LOAD_VTABLE ((obj)), sgen_safe_object_get_size ((MonoObject*)(obj))); \
                        INC_NUM_MAJOR_OBJECTS_MARKED ();                \
@@ -875,10 +846,8 @@ pin_major_object (char *obj, SgenGrayQueue *queue)
 {
        MSBlockInfo *block;
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        if (concurrent_mark)
                g_assert_not_reached ();
-#endif
 
        block = MS_BLOCK_FOR_OBJ (obj);
        block->has_pinned = TRUE;
@@ -887,9 +856,8 @@ pin_major_object (char *obj, SgenGrayQueue *queue)
 
 #include "sgen-major-copy-object.h"
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
 static void
-major_copy_or_mark_object_concurrent (void **ptr, void *obj, SgenGrayQueue *queue)
+major_copy_or_mark_object_with_evacuation_concurrent (void **ptr, void *obj, SgenGrayQueue *queue)
 {
        SGEN_ASSERT (9, sgen_concurrent_collection_in_progress (), "Why are we scanning concurrently when there's no concurrent collection on?");
        SGEN_ASSERT (9, !sgen_workers_are_working () || sgen_is_worker_thread (mono_native_thread_id_get ()), "We must not scan from two threads at the same time!");
@@ -922,162 +890,83 @@ major_copy_or_mark_object_concurrent (void **ptr, void *obj, SgenGrayQueue *queu
                }
        }
 }
-#endif
 
-static void
-major_copy_or_mark_object (void **ptr, void *obj, SgenGrayQueue *queue)
+static long long
+major_get_and_reset_num_major_objects_marked (void)
 {
-       MSBlockInfo *block;
-
-       HEAVY_STAT (++stat_copy_object_called_major);
-
-       SGEN_ASSERT (9, !sgen_concurrent_collection_in_progress (), "Why are we scanning non-concurrently when there's a concurrent collection on?");
-
-       SGEN_ASSERT (9, obj, "null object from pointer %p", ptr);
-       SGEN_ASSERT (9, current_collection_generation == GENERATION_OLD, "old gen parallel allocator called from a %d collection", current_collection_generation);
-
-       if (sgen_ptr_in_nursery (obj)) {
-               int word, bit;
-               char *forwarded, *old_obj;
-
-               if ((forwarded = SGEN_OBJECT_IS_FORWARDED (obj))) {
-                       SGEN_UPDATE_REFERENCE (ptr, forwarded);
-                       return;
-               }
-               if (SGEN_OBJECT_IS_PINNED (obj))
-                       return;
-
-               /* An object in the nursery To Space has already been copied and grayed. Nothing to do. */
-               if (sgen_nursery_is_to_space (obj))
-                       return;
-
-               HEAVY_STAT (++stat_objects_copied_major);
-
-       do_copy_object:
-               old_obj = obj;
-               obj = copy_object_no_checks (obj, queue);
-               if (G_UNLIKELY (old_obj == obj)) {
-                       /*If we fail to evacuate an object we just stop doing it for a given block size as all other will surely fail too.*/
-                       if (!sgen_ptr_in_nursery (obj)) {
-                               int size_index;
-                               block = MS_BLOCK_FOR_OBJ (obj);
-                               size_index = block->obj_size_index;
-                               evacuate_block_obj_sizes [size_index] = FALSE;
-                               MS_MARK_OBJECT_AND_ENQUEUE (obj, sgen_obj_get_descriptor (obj), block, queue);
-                       }
-                       return;
-               }
-               SGEN_UPDATE_REFERENCE (ptr, obj);
-
-               /*
-                * FIXME: See comment for copy_object_no_checks().  If
-                * we have that, we can let the allocation function
-                * give us the block info, too, and we won't have to
-                * re-fetch it.
-                *
-                * FIXME (2): We should rework this to avoid all those nursery checks.
-                */
-               /*
-                * For the split nursery allocator the object might
-                * still be in the nursery despite having being
-                * promoted, in which case we can't mark it.
-                */
-               if (!sgen_ptr_in_nursery (obj)) {
-                       block = MS_BLOCK_FOR_OBJ (obj);
-                       MS_CALC_MARK_BIT (word, bit, obj);
-                       SGEN_ASSERT (9, !MS_MARK_BIT (block, word, bit), "object %p already marked", obj);
-                       MS_SET_MARK_BIT (block, word, bit);
-                       binary_protocol_mark (obj, (gpointer)LOAD_VTABLE (obj), sgen_safe_object_get_size ((MonoObject*)obj));
-               }
-       } else {
-               char *forwarded;
-               mword objsize;
+#ifdef SGEN_COUNT_NUMBER_OF_MAJOR_OBJECTS_MARKED
+       long long num = num_major_objects_marked;
+       num_major_objects_marked = 0;
+       return num;
+#else
+       return 0;
+#endif
+}
 
-               /*
-                * If we have don't have a fixed heap we cannot know
-                * whether an object is in the LOS or in the small
-                * object major heap without checking its size.  To do
-                * that, however, we need to know that we actually
-                * have a valid object, not a forwarding pointer, so
-                * we have to do this check first.
-                */
-               if ((forwarded = SGEN_OBJECT_IS_FORWARDED (obj))) {
-                       SGEN_UPDATE_REFERENCE (ptr, forwarded);
-                       return;
-               }
+#ifdef HEAVY_STATISTICS
+static guint64 stat_optimized_copy;
+static guint64 stat_optimized_copy_nursery;
+static guint64 stat_optimized_copy_nursery_forwarded;
+static guint64 stat_optimized_copy_nursery_pinned;
+static guint64 stat_optimized_copy_major;
+static guint64 stat_optimized_copy_major_small_fast;
+static guint64 stat_optimized_copy_major_small_slow;
+static guint64 stat_optimized_copy_major_large;
+static guint64 stat_optimized_copy_major_forwarded;
+static guint64 stat_optimized_copy_major_small_evacuate;
+static guint64 stat_optimized_major_scan;
+static guint64 stat_optimized_major_scan_no_refs;
+
+static guint64 stat_drain_prefetch_fills;
+static guint64 stat_drain_prefetch_fill_failures;
+static guint64 stat_drain_loops;
+#endif
 
-               objsize = SGEN_ALIGN_UP (sgen_safe_object_get_size ((MonoObject*)obj));
+static void major_scan_object_with_evacuation (char *start, mword desc, SgenGrayQueue *queue);
 
-               if (objsize <= SGEN_MAX_SMALL_OBJ_SIZE) {
-                       int size_index;
-                       gboolean evacuate;
-
-                       block = MS_BLOCK_FOR_OBJ (obj);
-                       size_index = block->obj_size_index;
-                       evacuate = evacuate_block_obj_sizes [size_index];
-
-                       if (evacuate && !block->has_pinned) {
-                               g_assert (!SGEN_OBJECT_IS_PINNED (obj));
-                               if (block->is_to_space)
-                                       return;
-                               HEAVY_STAT (++stat_major_objects_evacuated);
-                               goto do_copy_object;
-                       } else {
-                               MS_MARK_OBJECT_AND_ENQUEUE (obj, sgen_obj_get_descriptor (obj), block, queue);
-                       }
-               } else {
-                       if (sgen_los_object_is_pinned (obj))
-                               return;
-                       binary_protocol_pin (obj, (gpointer)SGEN_LOAD_VTABLE (obj), sgen_safe_object_get_size ((MonoObject*)obj));
+#define COPY_OR_MARK_FUNCTION_NAME     major_copy_or_mark_object_no_evacuation
+#define SCAN_OBJECT_FUNCTION_NAME      major_scan_object_no_evacuation
+#define DRAIN_GRAY_STACK_FUNCTION_NAME drain_gray_stack_no_evacuation
+#include "sgen-marksweep-drain-gray-stack.h"
 
-#ifdef ENABLE_DTRACE
-                       if (G_UNLIKELY (MONO_GC_OBJ_PINNED_ENABLED ())) {
-                               MonoVTable *vt = (MonoVTable*)SGEN_LOAD_VTABLE (obj);
-                               MONO_GC_OBJ_PINNED ((mword)obj, sgen_safe_object_get_size (obj), vt->klass->name_space, vt->klass->name, GENERATION_OLD);
-                       }
-#endif
+#define COPY_OR_MARK_WITH_EVACUATION
+#define COPY_OR_MARK_FUNCTION_NAME     major_copy_or_mark_object_with_evacuation
+#define SCAN_OBJECT_FUNCTION_NAME      major_scan_object_with_evacuation
+#define DRAIN_GRAY_STACK_FUNCTION_NAME drain_gray_stack_with_evacuation
+#include "sgen-marksweep-drain-gray-stack.h"
 
-                       sgen_los_pin_object (obj);
-                       if (SGEN_OBJECT_HAS_REFERENCES (obj))
-                               GRAY_OBJECT_ENQUEUE (queue, obj, sgen_obj_get_descriptor (obj));
+static gboolean
+drain_gray_stack (ScanCopyContext ctx)
+{
+       gboolean evacuation = FALSE;
+       int i;
+       for (i = 0; i < num_block_obj_sizes; ++i) {
+               if (evacuate_block_obj_sizes [i]) {
+                       evacuation = TRUE;
+                       break;
                }
        }
+
+       if (evacuation)
+               return drain_gray_stack_with_evacuation (ctx);
+       else
+               return drain_gray_stack_no_evacuation (ctx);
 }
 
+#include "sgen-marksweep-scan-object-concurrent.h"
+
 static void
 major_copy_or_mark_object_canonical (void **ptr, SgenGrayQueue *queue)
 {
-       major_copy_or_mark_object (ptr, *ptr, queue);
+       major_copy_or_mark_object_with_evacuation (ptr, *ptr, queue);
 }
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
 static void
 major_copy_or_mark_object_concurrent_canonical (void **ptr, SgenGrayQueue *queue)
 {
-       major_copy_or_mark_object_concurrent (ptr, *ptr, queue);
-}
-#endif
-
-static long long
-major_get_and_reset_num_major_objects_marked (void)
-{
-#ifdef SGEN_COUNT_NUMBER_OF_MAJOR_OBJECTS_MARKED
-       long long num = num_major_objects_marked;
-       num_major_objects_marked = 0;
-       return num;
-#else
-       return 0;
-#endif
+       major_copy_or_mark_object_with_evacuation_concurrent (ptr, *ptr, queue);
 }
 
-#include "sgen-major-scan-object.h"
-
-#ifdef SGEN_HAVE_CONCURRENT_MARK
-#define SCAN_FOR_CONCURRENT_MARK
-#include "sgen-major-scan-object.h"
-#undef SCAN_FOR_CONCURRENT_MARK
-#endif
-
 static void
 mark_pinned_objects_in_block (MSBlockInfo *block, SgenGrayQueue *queue)
 {
@@ -1213,10 +1102,8 @@ ms_sweep (void)
        int *slots_used = alloca (sizeof (int) * num_block_obj_sizes);
        int *num_blocks = alloca (sizeof (int) * num_block_obj_sizes);
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        mword total_evacuate_heap = 0;
        mword total_evacuate_saved = 0;
-#endif
 
        for (i = 0; i < num_block_obj_sizes; ++i)
                slots_available [i] = slots_used [i] = num_blocks [i] = 0;
@@ -1248,12 +1135,10 @@ ms_sweep (void)
 
                count = MS_BLOCK_FREE / block->obj_size;
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
                if (block->cardtable_mod_union) {
                        sgen_free_internal_dynamic (block->cardtable_mod_union, CARDS_PER_BLOCK, INTERNAL_MEM_CARDTABLE_MOD_UNION);
                        block->cardtable_mod_union = NULL;
                }
-#endif
 
                /* Count marked objects in the block */
                for (i = 0; i < MS_NUM_MARK_WORDS; ++i) {
@@ -1295,8 +1180,7 @@ ms_sweep (void)
                        DELETE_BLOCK_IN_FOREACH ();
 
                        binary_protocol_empty (MS_BLOCK_OBJ (block, 0), (char*)MS_BLOCK_OBJ (block, count) - (char*)MS_BLOCK_OBJ (block, 0));
-                       ms_free_block (block->block);
-                       sgen_free_internal (block, INTERNAL_MEM_MS_BLOCK_INFO);
+                       ms_free_block (block);
 
                        --num_major_sections;
                }
@@ -1314,19 +1198,15 @@ ms_sweep (void)
                } else {
                        evacuate_block_obj_sizes [i] = FALSE;
                }
-#ifdef SGEN_HAVE_CONCURRENT_MARK
                {
                        mword total_bytes = block_obj_sizes [i] * slots_available [i];
                        total_evacuate_heap += total_bytes;
                        if (evacuate_block_obj_sizes [i])
                                total_evacuate_saved += total_bytes - block_obj_sizes [i] * slots_used [i];
                }
-#endif
        }
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        want_evacuation = (float)total_evacuate_saved / (float)total_evacuate_heap > (1 - concurrent_evacuation_threshold);
-#endif
 
        have_swept = TRUE;
 }
@@ -1460,8 +1340,18 @@ major_start_major_collection (void)
 }
 
 static void
-major_finish_major_collection (void)
+major_finish_major_collection (ScannedObjectCounts *counts)
 {
+#ifdef SGEN_HEAVY_BINARY_PROTOCOL
+       if (binary_protocol_is_enabled ()) {
+               counts->num_scanned_objects = scanned_objects_list.next_slot;
+
+               sgen_pointer_queue_sort_uniq (&scanned_objects_list);
+               counts->num_unique_scanned_objects = scanned_objects_list.next_slot;
+
+               sgen_pointer_queue_clear (&scanned_objects_list);
+       }
+#endif
 }
 
 #if SIZEOF_VOID_P != 8
@@ -1731,10 +1621,10 @@ major_iterate_live_block_ranges (sgen_cardtable_block_callback callback)
 }
 
 #ifdef HEAVY_STATISTICS
-extern long long marked_cards;
-extern long long scanned_cards;
-extern long long scanned_objects;
-extern long long remarked_cards;
+extern guint64 marked_cards;
+extern guint64 scanned_cards;
+extern guint64 scanned_objects;
+extern guint64 remarked_cards;
 #endif
 
 #define CARD_WORDS_PER_BLOCK (CARDS_PER_BLOCK / SIZEOF_VOID_P)
@@ -1793,12 +1683,8 @@ major_scan_card_table (gboolean mod_union, SgenGrayQueue *queue)
        gboolean has_references;
        ScanObjectFunc scan_func = sgen_get_current_object_ops ()->scan_object;
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        if (!concurrent_mark)
                g_assert (!mod_union);
-#else
-       g_assert (!mod_union);
-#endif
 
        FOREACH_BLOCK_HAS_REFERENCES (block, has_references) {
                int block_obj_size;
@@ -1818,7 +1704,6 @@ major_scan_card_table (gboolean mod_union, SgenGrayQueue *queue)
                        char *obj, *end, *base;
 
                        if (mod_union) {
-#ifdef SGEN_HAVE_CONCURRENT_MARK
                                cards = block->cardtable_mod_union;
                                /*
                                 * This happens when the nursery
@@ -1828,7 +1713,6 @@ major_scan_card_table (gboolean mod_union, SgenGrayQueue *queue)
                                 */
                                if (!cards)
                                        continue;
-#endif
                        } else {
                        /*We can avoid the extra copy since the remark cardtable was cleaned before */
 #ifdef SGEN_HAVE_OVERLAPPING_CARDS
@@ -1844,6 +1728,8 @@ major_scan_card_table (gboolean mod_union, SgenGrayQueue *queue)
                        end = block_start + MS_BLOCK_SIZE;
                        base = sgen_card_table_align_pointer (obj);
 
+                       cards += MS_BLOCK_SKIP >> CARD_BITS;
+
                        while (obj < end) {
                                size_t card_offset;
 
@@ -1879,7 +1765,6 @@ major_scan_card_table (gboolean mod_union, SgenGrayQueue *queue)
                         * sizes, they won't overflow the cardtable overlap modulus.
                         */
                        if (mod_union) {
-#ifdef SGEN_HAVE_CONCURRENT_MARK
                                card_data = card_base = block->cardtable_mod_union;
                                /*
                                 * This happens when the nursery
@@ -1889,15 +1774,13 @@ major_scan_card_table (gboolean mod_union, SgenGrayQueue *queue)
                                 */
                                if (!card_data)
                                        continue;
-#else
-                               g_assert_not_reached ();
-                               card_data = NULL;
-#endif
                        } else {
                                card_data = card_base = sgen_card_table_get_card_scan_address ((mword)block_start);
                        }
                        card_data_end = card_data + CARDS_PER_BLOCK;
 
+                       card_data += MS_BLOCK_SKIP >> CARD_BITS;
+
                        for (card_data = initial_skip_card (card_data); card_data < card_data_end; ++card_data) { //card_data = skip_card (card_data + 1, card_data_end)) {
                                size_t index;
                                size_t idx = card_data - card_base;
@@ -1973,7 +1856,6 @@ major_count_cards (long long *num_total_cards, long long *num_marked_cards)
        *num_marked_cards = marked_cards;
 }
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
 static void
 update_cardtable_mod_union (void)
 {
@@ -1995,7 +1877,6 @@ major_get_cardtable_mod_union_for_object (char *obj)
        MSBlockInfo *block = MS_BLOCK_FOR_OBJ (obj);
        return &block->cardtable_mod_union [(obj - (char*)sgen_card_table_align_pointer (MS_BLOCK_FOR_BLOCK_INFO (block))) >> CARD_BITS];
 }
-#endif
 
 static void
 alloc_free_block_lists (MSBlockInfo ***lists)
@@ -2013,12 +1894,8 @@ post_param_init (SgenMajorCollector *collector)
        collector->sweeps_lazily = lazy_sweep;
 }
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
 static void
 sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurrent)
-#else // SGEN_HAVE_CONCURRENT_MARK
-#error unknown configuration
-#endif // SGEN_HAVE_CONCURRENT_MARK
 {
        int i;
 
@@ -2048,27 +1925,24 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        for (i = 0; i < MS_NUM_FAST_BLOCK_OBJ_SIZE_INDEXES * 8; ++i)
                g_assert (MS_BLOCK_OBJ_SIZE_INDEX (i) == ms_find_block_obj_size_index (i));
 
-       mono_counters_register ("# major blocks allocated", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_blocks_alloced);
-       mono_counters_register ("# major blocks freed", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_blocks_freed);
-       mono_counters_register ("# major blocks lazy swept", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_blocks_lazy_swept);
-       mono_counters_register ("# major objects evacuated", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_objects_evacuated);
+       mono_counters_register ("# major blocks allocated", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_alloced);
+       mono_counters_register ("# major blocks freed", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_freed);
+       mono_counters_register ("# major blocks lazy swept", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_lazy_swept);
+       mono_counters_register ("# major objects evacuated", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_objects_evacuated);
 #if SIZEOF_VOID_P != 8
-       mono_counters_register ("# major blocks freed ideally", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_blocks_freed_ideal);
-       mono_counters_register ("# major blocks freed less ideally", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_blocks_freed_less_ideal);
-       mono_counters_register ("# major blocks freed individually", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_blocks_freed_individual);
-       mono_counters_register ("# major blocks allocated less ideally", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_major_blocks_alloced_less_ideal);
+       mono_counters_register ("# major blocks freed ideally", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_freed_ideal);
+       mono_counters_register ("# major blocks freed less ideally", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_freed_less_ideal);
+       mono_counters_register ("# major blocks freed individually", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_freed_individual);
+       mono_counters_register ("# major blocks allocated less ideally", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_alloced_less_ideal);
 #endif
 
        collector->section_size = MAJOR_SECTION_SIZE;
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        concurrent_mark = is_concurrent;
        if (is_concurrent) {
                collector->is_concurrent = TRUE;
                collector->want_synchronous_collection = &want_evacuation;
-       } else
-#endif
-       {
+       } else {
                collector->is_concurrent = FALSE;
                collector->want_synchronous_collection = NULL;
        }
@@ -2091,12 +1965,10 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        collector->pin_major_object = pin_major_object;
        collector->scan_card_table = major_scan_card_table;
        collector->iterate_live_block_ranges = (void*)(void*) major_iterate_live_block_ranges;
-#ifdef SGEN_HAVE_CONCURRENT_MARK
        if (is_concurrent) {
                collector->update_cardtable_mod_union = update_cardtable_mod_union;
                collector->get_cardtable_mod_union_for_object = major_get_cardtable_mod_union_for_object;
        }
-#endif
        collector->init_to_space = major_init_to_space;
        collector->sweep = major_sweep;
        collector->check_scan_starts = major_check_scan_starts;
@@ -2119,20 +1991,46 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        collector->count_cards = major_count_cards;
 
        collector->major_ops.copy_or_mark_object = major_copy_or_mark_object_canonical;
-       collector->major_ops.scan_object = major_scan_object;
-#ifdef SGEN_HAVE_CONCURRENT_MARK
+       collector->major_ops.scan_object = major_scan_object_with_evacuation;
        if (is_concurrent) {
                collector->major_concurrent_ops.copy_or_mark_object = major_copy_or_mark_object_concurrent_canonical;
-               collector->major_concurrent_ops.scan_object = major_scan_object_concurrent;
+               collector->major_concurrent_ops.scan_object = major_scan_object_no_mark_concurrent;
                collector->major_concurrent_ops.scan_vtype = major_scan_vtype_concurrent;
        }
+
+#if !defined (FIXED_HEAP) && !defined (SGEN_PARALLEL_MARK)
+       /* FIXME: this will not work with evacuation or the split nursery. */
+       if (!is_concurrent)
+               collector->drain_gray_stack = drain_gray_stack;
+
+#ifdef HEAVY_STATISTICS
+       mono_counters_register ("Optimized copy", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy);
+       mono_counters_register ("Optimized copy nursery", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_nursery);
+       mono_counters_register ("Optimized copy nursery forwarded", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_nursery_forwarded);
+       mono_counters_register ("Optimized copy nursery pinned", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_nursery_pinned);
+       mono_counters_register ("Optimized copy major", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major);
+       mono_counters_register ("Optimized copy major small fast", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major_small_fast);
+       mono_counters_register ("Optimized copy major small slow", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major_small_slow);
+       mono_counters_register ("Optimized copy major large", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major_large);
+       mono_counters_register ("Optimized major scan", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_major_scan);
+       mono_counters_register ("Optimized major scan no refs", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_major_scan_no_refs);
+
+       mono_counters_register ("Gray stack drain loops", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_drain_loops);
+       mono_counters_register ("Gray stack prefetch fills", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_drain_prefetch_fills);
+       mono_counters_register ("Gray stack prefetch failures", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_drain_prefetch_fill_failures);
+#endif
 #endif
 
+#ifdef SGEN_HEAVY_BINARY_PROTOCOL
+       mono_mutex_init (&scanned_objects_list_lock);
+#endif
+
+       SGEN_ASSERT (0, SGEN_MAX_SMALL_OBJ_SIZE <= MS_BLOCK_FREE / 2, "MAX_SMALL_OBJ_SIZE must be at most MS_BLOCK_FREE / 2");
+
        /*cardtable requires major pages to be 8 cards aligned*/
        g_assert ((MS_BLOCK_SIZE % (8 * CARD_SIZE_IN_BYTES)) == 0);
 }
 
-#ifdef SGEN_HAVE_CONCURRENT_MARK
 void
 sgen_marksweep_init (SgenMajorCollector *collector)
 {
@@ -2144,6 +2042,5 @@ sgen_marksweep_conc_init (SgenMajorCollector *collector)
 {
        sgen_marksweep_init_internal (collector, TRUE);
 }
-#endif
 
 #endif
index efbb8c19fe492c55a4e7540aff8d19c5c9681e9f..f1061ee2c4732f2e50562f8cf79c91610bb13ac9 100644 (file)
@@ -22,7 +22,7 @@
 #define collector_pin_object(obj, queue) sgen_pin_object (obj, queue);
 #define COLLECTOR_SERIAL_ALLOC_FOR_PROMOTION alloc_for_promotion
 
-extern long long stat_nursery_copy_object_failed_to_space; /* from sgen-gc.c */
+extern guint64 stat_nursery_copy_object_failed_to_space; /* from sgen-gc.c */
 
 #include "mono/utils/mono-compiler.h"
 
@@ -136,7 +136,7 @@ SERIAL_COPY_OBJECT_FROM_OBJ (void **obj_slot, SgenGrayQueue *queue)
                HEAVY_STAT (++stat_nursery_copy_object_failed_forwarded);
                SGEN_UPDATE_REFERENCE (obj_slot, forwarded);
 #ifndef SGEN_SIMPLE_NURSERY
-               if (G_UNLIKELY (sgen_ptr_in_nursery (forwarded) && !sgen_ptr_in_nursery (obj_slot)))
+               if (G_UNLIKELY (sgen_ptr_in_nursery (forwarded) && !sgen_ptr_in_nursery (obj_slot) && !SGEN_OBJECT_IS_CEMENTED (forwarded)))
                        sgen_add_to_global_remset (obj_slot, forwarded);
 #endif
                return;
@@ -145,7 +145,7 @@ SERIAL_COPY_OBJECT_FROM_OBJ (void **obj_slot, SgenGrayQueue *queue)
                SGEN_ASSERT (9, ((MonoVTable*)SGEN_LOAD_VTABLE(obj))->gc_descr, "pinned object %p has no gc descriptor", obj);
                SGEN_LOG (9, " (pinned, no change)");
                HEAVY_STAT (++stat_nursery_copy_object_failed_pinned);
-               if (!sgen_ptr_in_nursery (obj_slot))
+               if (!sgen_ptr_in_nursery (obj_slot) && !SGEN_OBJECT_IS_CEMENTED (obj))
                        sgen_add_to_global_remset (obj_slot, obj);
                return;
        }
@@ -189,7 +189,7 @@ SERIAL_COPY_OBJECT_FROM_OBJ (void **obj_slot, SgenGrayQueue *queue)
                 * remsets will be overwritten.  Scanning objects at
                 * most once would be the icing on the cake.
                 */
-               if (!sgen_ptr_in_nursery (obj_slot))
+               if (!sgen_ptr_in_nursery (obj_slot) && !SGEN_OBJECT_IS_CEMENTED (obj))
                        sgen_add_to_global_remset (obj_slot, obj);
 
                return;
@@ -201,12 +201,12 @@ SERIAL_COPY_OBJECT_FROM_OBJ (void **obj_slot, SgenGrayQueue *queue)
        copy = copy_object_no_checks (obj, queue);
        SGEN_UPDATE_REFERENCE (obj_slot, copy);
 #ifndef SGEN_SIMPLE_NURSERY
-       if (G_UNLIKELY (sgen_ptr_in_nursery (copy) && !sgen_ptr_in_nursery (obj_slot)))
+       if (G_UNLIKELY (sgen_ptr_in_nursery (copy) && !sgen_ptr_in_nursery (obj_slot) && !SGEN_OBJECT_IS_CEMENTED (copy)))
                sgen_add_to_global_remset (obj_slot, copy);
 #else
        /* copy_object_no_checks () can return obj on OOM */
        if (G_UNLIKELY (obj == copy)) {
-               if (G_UNLIKELY (sgen_ptr_in_nursery (copy) && !sgen_ptr_in_nursery (obj_slot)))
+               if (G_UNLIKELY (sgen_ptr_in_nursery (copy) && !sgen_ptr_in_nursery (obj_slot) && !SGEN_OBJECT_IS_CEMENTED (copy)))
                        sgen_add_to_global_remset (obj_slot, copy);
        }
 #endif
index 3cff269a7da3d5bc65ceedcb658fe34461b2ad57..cd660cc9de277aaa4bae2e781b2edc1e47103a9b 100644 (file)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-extern long long stat_scan_object_called_nursery;
+extern guint64 stat_scan_object_called_nursery;
 
 #if defined(SGEN_SIMPLE_NURSERY)
 #define SERIAL_SCAN_OBJECT simple_nursery_serial_scan_object
@@ -38,6 +38,7 @@ extern long long stat_scan_object_called_nursery;
 #define HANDLE_PTR(ptr,obj)    do {    \
                void *__old = *(ptr);   \
                SGEN_OBJECT_LAYOUT_STATISTICS_MARK_BITMAP ((obj), (ptr)); \
+               binary_protocol_scan_process_reference ((obj), (ptr), __old); \
                if (__old) {    \
                        SERIAL_COPY_OBJECT_FROM_OBJ ((ptr), queue);     \
                        SGEN_COND_LOG (9, __old != *(ptr), "Overwrote field at %p with %p (was: %p)", (ptr), *(ptr), __old); \
@@ -53,6 +54,8 @@ SERIAL_SCAN_OBJECT (char *start, mword desc, SgenGrayQueue *queue)
        sgen_descriptor_count_scanned_object (desc);
 #endif
 
+       SGEN_ASSERT (9, sgen_get_current_collection_generation () == GENERATION_NURSERY, "Must not use minor scan during major collection.");
+
 #define SCAN_OBJECT_PROTOCOL
 #include "sgen-scan-object.h"
 
@@ -65,6 +68,8 @@ SERIAL_SCAN_VTYPE (char *start, mword desc, SgenGrayQueue *queue BINARY_PROTOCOL
 {
        SGEN_OBJECT_LAYOUT_STATISTICS_DECLARE_BITMAP;
 
+       SGEN_ASSERT (9, sgen_get_current_collection_generation () == GENERATION_NURSERY, "Must not use minor scan during major collection.");
+
        /* The descriptors include info about the MonoObject header as well */
        start -= sizeof (MonoObject);
 
index 55acf5137c38a9b740e1f4f2eb025ea779a10c36..8f4ee524f09a10465a07843f05590c4bf9b56853 100644 (file)
@@ -70,7 +70,7 @@ suspend_thread (SgenThreadInfo *info, void *context)
        if (context) {
                mono_sigctx_to_monoctx (context, &ctx);
                info->stopped_ip = MONO_CONTEXT_GET_IP (&ctx);
-               stack_start = MONO_CONTEXT_GET_SP (&ctx) - REDZONE_SIZE;
+               stack_start = (((guint8 *) MONO_CONTEXT_GET_SP (&ctx)) - REDZONE_SIZE);
        } else {
                info->stopped_ip = NULL;
                stack_start = NULL;
index 66d5c7d9b8365cabb9b0c9ea12a09926c7cb0dd1..dac7f8e48b840618a4bd03bac964b4f9ad163add 100644 (file)
@@ -293,6 +293,9 @@ sgen_cement_lookup_or_register (char *obj)
 
        ++hash [i].count;
        if (hash [i].count == SGEN_CEMENT_THRESHOLD) {
+               SGEN_ASSERT (9, SGEN_OBJECT_IS_PINNED (obj), "Can only cement pinned objects");
+               SGEN_CEMENT_OBJECT (obj);
+
                if (G_UNLIKELY (MONO_GC_OBJ_CEMENTED_ENABLED())) {
                        MonoVTable *vt G_GNUC_UNUSED = (MonoVTable*)SGEN_LOAD_VTABLE (obj);
                        MONO_GC_OBJ_CEMENTED ((mword)obj, sgen_safe_object_get_size ((MonoObject*)obj),
@@ -318,6 +321,8 @@ pin_from_hash (CementHashEntry *hash, gboolean has_been_reset)
 
                sgen_pin_stage_ptr (hash [i].obj);
                /* FIXME: do pin stats if enabled */
+
+               SGEN_CEMENT_OBJECT (hash [i].obj);
        }
 }
 
index 7ace7dfa4b68d598c76e95b8ff72e91485f5a447..e201e12751b3eb9b427a28262af9970ef84a4c8b 100644 (file)
@@ -17,6 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "utils/mono-compiler.h"
 #include "metadata/sgen-gc.h"
 #include "metadata/sgen-pointer-queue.h"
 
index 2dd42b90a9f56f10cccfa4ce3a93b09389476883..92e4fd189943a069cb6c3b20bd0682a8832dc67f 100644 (file)
@@ -331,17 +331,17 @@ binary_protocol_collection_force (int generation)
 void
 binary_protocol_collection_begin (int index, int generation)
 {
-       SGenProtocolCollection entry = { index, generation };
+       SGenProtocolCollectionBegin entry = { index, generation };
        binary_protocol_flush_buffers (FALSE);
-       protocol_entry (SGEN_PROTOCOL_COLLECTION_BEGIN, &entry, sizeof (SGenProtocolCollection));
+       protocol_entry (SGEN_PROTOCOL_COLLECTION_BEGIN, &entry, sizeof (SGenProtocolCollectionBegin));
 }
 
 void
-binary_protocol_collection_end (int index, int generation)
+binary_protocol_collection_end (int index, int generation, long long num_objects_scanned, long long num_unique_objects_scanned)
 {
-       SGenProtocolCollection entry = { index, generation };
+       SGenProtocolCollectionEnd entry = { index, generation, num_objects_scanned, num_unique_objects_scanned };
        binary_protocol_flush_buffers (FALSE);
-       protocol_entry (SGEN_PROTOCOL_COLLECTION_END, &entry, sizeof (SGenProtocolCollection));
+       protocol_entry (SGEN_PROTOCOL_COLLECTION_END, &entry, sizeof (SGenProtocolCollectionEnd));
 }
 
 void
@@ -351,9 +351,15 @@ binary_protocol_concurrent_start (void)
 }
 
 void
-binary_protocol_concurrent_update_finish (void)
+binary_protocol_concurrent_update (void)
 {
-       protocol_entry (SGEN_PROTOCOL_CONCURRENT_UPDATE_FINISH, NULL, 0);
+       protocol_entry (SGEN_PROTOCOL_CONCURRENT_UPDATE, NULL, 0);
+}
+
+void
+binary_protocol_concurrent_finish (void)
+{
+       protocol_entry (SGEN_PROTOCOL_CONCURRENT_FINISH, NULL, 0);
 }
 
 void
@@ -515,6 +521,13 @@ binary_protocol_scan_vtype_begin (gpointer obj, int size)
        protocol_entry (SGEN_PROTOCOL_SCAN_VTYPE_BEGIN, &entry, sizeof (SGenProtocolScanVTypeBegin));
 }
 
+void
+binary_protocol_scan_process_reference (gpointer obj, gpointer ptr, gpointer value)
+{
+       SGenProtocolScanProcessReference entry = { obj, ptr, value };
+       protocol_entry (SGEN_PROTOCOL_SCAN_PROCESS_REFERENCE, &entry, sizeof (SGenProtocolScanProcessReference));
+}
+
 void
 binary_protocol_wbarrier (gpointer ptr, gpointer value, gpointer value_vtable)
 {
index 234f54f5b612fed289d8e0750dccb6f4e9887164..fbf3df6412f11444ef469baf6be3497789731155 100644 (file)
@@ -30,7 +30,8 @@ enum {
        SGEN_PROTOCOL_COLLECTION_BEGIN,
        SGEN_PROTOCOL_COLLECTION_END,
        SGEN_PROTOCOL_CONCURRENT_START,
-       SGEN_PROTOCOL_CONCURRENT_UPDATE_FINISH,
+       SGEN_PROTOCOL_CONCURRENT_UPDATE,
+       SGEN_PROTOCOL_CONCURRENT_FINISH,
        SGEN_PROTOCOL_WORLD_STOPPING,
        SGEN_PROTOCOL_WORLD_STOPPED,
        SGEN_PROTOCOL_WORLD_RESTARTING,
@@ -42,6 +43,7 @@ enum {
        SGEN_PROTOCOL_MARK,
        SGEN_PROTOCOL_SCAN_BEGIN,
        SGEN_PROTOCOL_SCAN_VTYPE_BEGIN,
+       SGEN_PROTOCOL_SCAN_PROCESS_REFERENCE,
        SGEN_PROTOCOL_WBARRIER,
        SGEN_PROTOCOL_GLOBAL_REMSET,
        SGEN_PROTOCOL_PTR_UPDATE,
@@ -72,7 +74,13 @@ typedef struct {
 
 typedef struct {
        int index, generation;
-} SGenProtocolCollection;
+} SGenProtocolCollectionBegin;
+
+typedef struct {
+       int index, generation;
+       long long num_scanned_objects;
+       long long num_unique_scanned_objects;
+} SGenProtocolCollectionEnd;
 
 typedef struct {
        long long timestamp;
@@ -141,6 +149,12 @@ typedef struct {
        int size;
 } SGenProtocolScanVTypeBegin;
 
+typedef struct {
+       gpointer obj;
+       gpointer ptr;
+       gpointer value;
+} SGenProtocolScanProcessReference;
+
 typedef struct {
        gpointer ptr;
        gpointer value;
@@ -247,9 +261,10 @@ void binary_protocol_flush_buffers (gboolean force) MONO_INTERNAL;
 
 void binary_protocol_collection_force (int generation) MONO_INTERNAL;
 void binary_protocol_collection_begin (int index, int generation) MONO_INTERNAL;
-void binary_protocol_collection_end (int index, int generation) MONO_INTERNAL;
+void binary_protocol_collection_end (int index, int generation, long long num_objects_scanned, long long num_unique_objects_scanned) MONO_INTERNAL;
 void binary_protocol_concurrent_start (void) MONO_INTERNAL;
-void binary_protocol_concurrent_update_finish (void) MONO_INTERNAL;
+void binary_protocol_concurrent_update (void) MONO_INTERNAL;
+void binary_protocol_concurrent_finish (void) MONO_INTERNAL;
 void binary_protocol_world_stopping (long long timestamp) MONO_INTERNAL;
 void binary_protocol_world_stopped (long long timestamp, long long total_major_cards,
                long long marked_major_cards, long long total_los_cards, long long marked_los_cards) MONO_INTERNAL;
@@ -283,6 +298,7 @@ void binary_protocol_pin (gpointer obj, gpointer vtable, int size) MONO_INTERNAL
 void binary_protocol_mark (gpointer obj, gpointer vtable, int size) MONO_INTERNAL;
 void binary_protocol_scan_begin (gpointer obj, gpointer vtable, int size) MONO_INTERNAL;
 void binary_protocol_scan_vtype_begin (gpointer start, int size) MONO_INTERNAL;
+void binary_protocol_scan_process_reference (gpointer obj, gpointer ptr, gpointer value) MONO_INTERNAL;
 void binary_protocol_wbarrier (gpointer ptr, gpointer value, gpointer value_vtable) MONO_INTERNAL;
 void binary_protocol_global_remset (gpointer ptr, gpointer value, gpointer value_vtable) MONO_INTERNAL;
 void binary_protocol_ptr_update (gpointer ptr, gpointer old_value, gpointer new_value, gpointer vtable, int size) MONO_INTERNAL;
@@ -308,6 +324,7 @@ void binary_protocol_gray_dequeue (gpointer queue, gpointer cursor, gpointer val
 #define binary_protocol_mark(obj, vtable, size)
 #define binary_protocol_scan_begin(obj, vtable, size)
 #define binary_protocol_scan_vtype_begin(obj, size)
+#define binary_protocol_scan_process_reference(obj, ptr, value)
 #define binary_protocol_wbarrier(ptr, value, value_vtable)
 #define binary_protocol_global_remset(ptr, value, value_vtable)
 #define binary_protocol_ptr_update(ptr, old_value, new_value, vtable, size)
index ad569dda3595206fad7a2dd294c5040688b119c1..30c43fb2854f75c9de34be501b5ccb959c9d2288 100644 (file)
        binary_protocol_scan_vtype_begin (start + sizeof (MonoObject), size);
 #endif
 #endif
-       switch (desc & 0x7) {
+       switch (desc & DESC_TYPE_MASK) {
        case DESC_TYPE_RUN_LENGTH:
 #define SCAN OBJ_RUN_LEN_FOREACH_PTR (desc, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
-#undef SCAN
-               break;
-       case DESC_TYPE_SMALL_BITMAP:
-#define SCAN OBJ_BITMAP_FOREACH_PTR (desc, start)
-#ifndef SCAN_OBJECT_NOSCAN
-               SCAN;
-#endif
 #undef SCAN
                break;
        case DESC_TYPE_VECTOR:
@@ -75,8 +68,8 @@
 #endif
 #undef SCAN
                break;
-       case DESC_TYPE_LARGE_BITMAP:
-#define SCAN OBJ_LARGE_BITMAP_FOREACH_PTR (desc, start)
+       case DESC_TYPE_BITMAP:
+#define SCAN OBJ_BITMAP_FOREACH_PTR (desc, start)
 #ifndef SCAN_OBJECT_NOSCAN
                SCAN;
 #endif
 #undef SCAN
                break;
 #endif
+       case DESC_TYPE_SMALL_PTRFREE:
        case DESC_TYPE_COMPLEX_PTRFREE:
                /*Nothing to do*/
                break;
index 4d3bd9345f90b6746c54b5b87071a03d4b4a9a2b..eb6a50d9726cb6c44a2f6733da86c17ebd931e3e 100644 (file)
@@ -38,7 +38,6 @@
 #define TV_DECLARE SGEN_TV_DECLARE
 #define TV_GETTIME SGEN_TV_GETTIME
 #define TV_ELAPSED SGEN_TV_ELAPSED
-#define TV_ELAPSED_MS SGEN_TV_ELAPSED_MS
 
 inline static void*
 align_pointer (void *ptr)
@@ -202,8 +201,8 @@ count_cards (long long *major_total, long long *major_marked, long long *los_tot
 static TV_DECLARE (stop_world_time);
 static unsigned long max_pause_usec = 0;
 
-static long long time_stop_world;
-static long long time_restart_world;
+static guint64 time_stop_world;
+static guint64 time_restart_world;
 
 /* LOCKING: assumes the GC lock is held */
 int
@@ -328,8 +327,8 @@ sgen_restart_world (int generation, GGTimingInfo *timing)
 void
 sgen_init_stw (void)
 {
-       mono_counters_register ("World stop", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_stop_world);
-       mono_counters_register ("World restart", MONO_COUNTER_GC | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &time_restart_world);
+       mono_counters_register ("World stop", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_stop_world);
+       mono_counters_register ("World restart", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_restart_world);
 }
 
 #endif
index fc065f7f96b520ba494ec2ad197bb060981e64cf..3d63e94bfcd89bb3678b5c5bbae166e594a5ad34 100644 (file)
@@ -20,6 +20,8 @@
 #ifndef __MONO_SGEN_TAGGED_POINTER_H__
 #define __MONO_SGEN_TAGGED_POINTER_H__
 
+#define SGEN_TAGGED_POINTER_MASK       7
+
 #define SGEN_POINTER_IS_TAGGED_1(p)    ((mword)(p) & 1)
 #define SGEN_POINTER_TAG_1(p)          ((void*)((mword)(p) | 1))
 #define SGEN_POINTER_UNTAG_1(p)                ((void*)((mword)(p) & ~1))
 #define SGEN_POINTER_TAG_2(p)          ((void*)((mword)(p) | 2))
 #define SGEN_POINTER_UNTAG_2(p)                ((void*)((mword)(p) & ~2))
 
-#define SGEN_POINTER_IS_TAGGED_1_OR_2(p)       ((mword)(p) & 3)
-#define SGEN_POINTER_UNTAG_12(p)       ((void*)((mword)(p) & ~3))
+#define SGEN_POINTER_TAG_12(p)         ((mword)(p) & 3)
+#define SGEN_POINTER_SET_TAG_12(p,t)   ((void*)(((mword)(p) & ~3) | (t)))
+
+#define SGEN_POINTER_IS_TAGGED_4(p)    ((mword)(p) & 4)
+#define SGEN_POINTER_TAG_4(p)          ((void*)((mword)(p) | 4))
+#define SGEN_POINTER_UNTAG_4(p)                ((void*)((mword)(p) & ~4))
+
+#define SGEN_POINTER_UNTAG_24(p)       ((void*)((mword)(p) & ~6))
+
+#define SGEN_POINTER_IS_TAGGED_ANY(p)  ((mword)(p) & SGEN_TAGGED_POINTER_MASK)
+#define SGEN_POINTER_UNTAG_ALL(p)      ((void*)((mword)(p) & ~SGEN_TAGGED_POINTER_MASK))
 
 #endif
index 7d33e778c5bf91ef0ab5b75a3e78b08437555387..e74e3ad562e9d4f76d41a80bca8adff2cee2d31d 100644 (file)
@@ -73,10 +73,10 @@ static LOCK_DECLARE (workers_job_queue_mutex);
 static int workers_num_jobs_enqueued = 0;
 static volatile int workers_num_jobs_finished = 0;
 
-static long long stat_workers_stolen_from_self_lock;
-static long long stat_workers_stolen_from_self_no_lock;
-static long long stat_workers_stolen_from_others;
-static long long stat_workers_num_waited;
+static guint64 stat_workers_stolen_from_self_lock;
+static guint64 stat_workers_stolen_from_self_no_lock;
+static guint64 stat_workers_stolen_from_others;
+static guint64 stat_workers_num_waited;
 
 static gboolean
 set_state (State old_state, State new_state)
@@ -245,7 +245,7 @@ sgen_workers_enqueue_job (JobFunc func, void *data)
        mono_mutex_unlock (&workers_job_queue_mutex);
 
        if (workers_state.data.state != STATE_NURSERY_COLLECTION)
-               workers_signal_enqueue_work_if_necessary (num_entries);
+               workers_signal_enqueue_work_if_necessary (num_entries < workers_num ? num_entries : workers_num);
 }
 
 void
@@ -600,10 +600,10 @@ sgen_workers_init (int num_workers)
 
        sgen_register_fixed_internal_mem_type (INTERNAL_MEM_JOB_QUEUE_ENTRY, sizeof (JobQueueEntry));
 
-       mono_counters_register ("Stolen from self lock", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_workers_stolen_from_self_lock);
-       mono_counters_register ("Stolen from self no lock", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_workers_stolen_from_self_no_lock);
-       mono_counters_register ("Stolen from others", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_workers_stolen_from_others);
-       mono_counters_register ("# workers waited", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_workers_num_waited);
+       mono_counters_register ("Stolen from self lock", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_workers_stolen_from_self_lock);
+       mono_counters_register ("Stolen from self no lock", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_workers_stolen_from_self_no_lock);
+       mono_counters_register ("Stolen from others", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_workers_stolen_from_others);
+       mono_counters_register ("# workers waited", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_workers_num_waited);
 }
 
 /* only the GC thread is allowed to start and join workers */
index de4917ce08d41a7f879c0bcc5c0c9b89caa6f134..36a847d10b5f6f6d72cc5bfb9023b0b82f7840d3 100644 (file)
 
 #include <mono/metadata/gc-internal.h>
 
+#if defined(PLATFORM_ANDROID) && !defined(TARGET_ARM64)
+#define USE_TKILL_ON_ANDROID 1
+#endif
+
 #ifdef PLATFORM_ANDROID
 #include <errno.h>
 
+#ifdef USE_TKILL_ON_ANDROID
 extern int tkill (pid_t tid, int signal);
 #endif
+#endif
 
 /*#define THREAD_DEBUG(a) do { a; } while (0)*/
 #define THREAD_DEBUG(a)
@@ -4476,7 +4482,7 @@ mono_thread_kill (MonoInternalThread *thread, int signal)
 #  ifdef PTHREAD_POINTER_ID
        return pthread_kill ((gpointer)(gsize)(thread->tid), mono_thread_get_abort_signal ());
 #  else
-#    ifdef PLATFORM_ANDROID
+#    ifdef USE_TKILL_ON_ANDROID
        if (thread->android_tid != 0) {
                int  ret;
                int  old_errno = errno;
index d43605ce620c8c9e472e83debd2a1451ae4b5356..04ac59db62041e7e50868241a50d0ed18b4e8cf9 100755 (executable)
@@ -289,6 +289,7 @@ endif
 
 genmdesc_SOURCES = \
        mini.h          \
+       seq-points.h    \
        genmdesc.c      \
        helpers.c       \
        ../metadata/opcodes.c
@@ -375,6 +376,8 @@ endif
 
 common_sources = \
        mini.c                  \
+       seq-points.c    \
+       seq-points.h    \
        ir-emit.h               \
        method-to-ir.c          \
        decompose.c             \
index 44812084153173ded322f433b649682b9cae6fe0..283489f8d26dfafe23fa4ea3e3ba2906b7d57486 100644 (file)
@@ -52,6 +52,7 @@
 #include <mono/utils/mono-mmap.h>
 
 #include "mini.h"
+#include "seq-points.h"
 #include "image-writer.h"
 #include "dwarfwriter.h"
 #include "mini-gc.h"
 #define TV_GETTIME(tv) tv = mono_100ns_ticks ()
 #define TV_ELAPSED(start,end) (((end) - (start)) / 10)
 
-#ifdef TARGET_WIN32
-#define SHARED_EXT ".dll"
-#elif defined(__ppc__) && defined(TARGET_MACH)
-#define SHARED_EXT ".dylib"
-#elif defined(TARGET_MACH) && defined(TARGET_X86) && !defined(__native_client_codegen__)
-#define SHARED_EXT ".dylib"
-#elif defined(TARGET_MACH) && defined(TARGET_AMD64) && !defined(__native_client_codegen__)
-#define SHARED_EXT ".dylib"
-#else
-#define SHARED_EXT ".so"
-#endif
-
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 #define ALIGN_PTR_TO(ptr,align) (gpointer)((((gssize)(ptr)) + (align - 1)) & (~(align - 1)))
 #define ROUND_DOWN(VALUE,SIZE) ((VALUE) & ~((SIZE) - 1))
@@ -1934,14 +1923,14 @@ arch_emit_imt_thunk (MonoAotCompile *acfg, int offset, int *tramp_size)
        code = buf;
 
        /* Load the mscorlib got address */
-       ppc_ldptr (code, ppc_r11, sizeof (gpointer), ppc_r30);
+       ppc_ldptr (code, ppc_r12, sizeof (gpointer), ppc_r30);
        /* Load the parameter from the GOT */
        ppc_load (code, ppc_r0, offset * sizeof (gpointer));
-       ppc_ldptr_indexed (code, ppc_r11, ppc_r11, ppc_r0);
+       ppc_ldptr_indexed (code, ppc_r12, ppc_r12, ppc_r0);
 
        /* Load and check key */
        labels [1] = code;
-       ppc_ldptr (code, ppc_r0, 0, ppc_r11);
+       ppc_ldptr (code, ppc_r0, 0, ppc_r12);
        ppc_cmp (code, 0, sizeof (gpointer) == 8 ? 1 : 0, ppc_r0, MONO_ARCH_IMT_REG);
        labels [2] = code;
        ppc_bc (code, PPC_BR_TRUE, PPC_BR_EQ, 0);
@@ -1952,18 +1941,18 @@ arch_emit_imt_thunk (MonoAotCompile *acfg, int offset, int *tramp_size)
        ppc_bc (code, PPC_BR_TRUE, PPC_BR_EQ, 0);
 
        /* Loop footer */
-       ppc_addi (code, ppc_r11, ppc_r11, 2 * sizeof (gpointer));
+       ppc_addi (code, ppc_r12, ppc_r12, 2 * sizeof (gpointer));
        labels [4] = code;
        ppc_b (code, 0);
        mono_ppc_patch (labels [4], labels [1]);
 
        /* Match */
        mono_ppc_patch (labels [2], code);
-       ppc_ldptr (code, ppc_r11, sizeof (gpointer), ppc_r11);
-       /* r11 now contains the value of the vtable slot */
+       ppc_ldptr (code, ppc_r12, sizeof (gpointer), ppc_r12);
+       /* r12 now contains the value of the vtable slot */
        /* this is not a function descriptor on ppc64 */
-       ppc_ldptr (code, ppc_r11, 0, ppc_r11);
-       ppc_mtctr (code, ppc_r11);
+       ppc_ldptr (code, ppc_r12, 0, ppc_r12);
+       ppc_mtctr (code, ppc_r12);
        ppc_bcctr (code, PPC_BR_ALWAYS, 0);
 
        /* Fail */
@@ -5334,7 +5323,7 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg)
 {
        MonoMethod *method;
        int i, k, buf_size, method_index;
-       guint32 debug_info_size;
+       guint32 debug_info_size, seq_points_size;
        guint8 *code;
        MonoMethodHeader *header;
        guint8 *p, *buf, *debug_info;
@@ -5358,7 +5347,9 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg)
 
        seq_points = cfg->seq_point_info;
 
-       buf_size = header->num_clauses * 256 + debug_info_size + 2048 + (seq_points ? (seq_points->len * 128) : 0) + cfg->gc_map_size;
+       seq_points_size = seq_point_info_get_write_size (seq_points);
+
+       buf_size = header->num_clauses * 256 + debug_info_size + 2048 + seq_points_size + cfg->gc_map_size;
        p = buf = g_malloc (buf_size);
 
        use_unwind_ops = cfg->unwind_ops != NULL;
@@ -5386,6 +5377,15 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg)
                encode_value (table->num_holes, p, &p);
        }
 
+       if (jinfo->has_arch_eh_info) {
+               /*
+                * In AOT mode, the code length is calculated from the address of the previous method,
+                * which could include alignment padding, so calculating the start of the epilog as
+                * code_len - epilog_size is correct any more. Save the real code len as a workaround.
+                */
+               encode_value (jinfo->code_size, p, &p);
+       }
+
        /* Exception table */
        if (cfg->compile_llvm) {
                /*
@@ -5555,27 +5555,9 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg)
                }
        }
 
-       if (seq_points) {
-               int il_offset, native_offset, last_il_offset, last_native_offset, j;
-
-               encode_value (seq_points->len, p, &p);
-               last_il_offset = last_native_offset = 0;
-               for (i = 0; i < seq_points->len; ++i) {
-                       SeqPoint *sp = &seq_points->seq_points [i];
-                       il_offset = sp->il_offset;
-                       native_offset = sp->native_offset;
-                       encode_value (il_offset - last_il_offset, p, &p);
-                       encode_value (native_offset - last_native_offset, p, &p);
-                       last_il_offset = il_offset;
-                       last_native_offset = native_offset;
+       if (seq_points)
+               p += seq_point_info_write (seq_points, p);
 
-                       encode_value (sp->flags, p, &p);
-                       encode_value (sp->next_len, p, &p);
-                       for (j = 0; j < sp->next_len; ++j)
-                               encode_value (sp->next [j], p, &p);
-               }
-       }
-               
        g_assert (debug_info_size < buf_size);
 
        encode_value (debug_info_size, p, &p);
@@ -8641,7 +8623,7 @@ compile_asm (MonoAotCompile *acfg)
        if (acfg->aot_opts.outfile)
                outfile_name = g_strdup_printf ("%s", acfg->aot_opts.outfile);
        else
-               outfile_name = g_strdup_printf ("%s%s", acfg->image->name, SHARED_EXT);
+               outfile_name = g_strdup_printf ("%s%s", acfg->image->name, MONO_SOLIB_EXT);
 
        tmp_outfile_name = g_strdup_printf ("%s.tmp", outfile_name);
 
@@ -8661,7 +8643,7 @@ compile_asm (MonoAotCompile *acfg)
 
        g_free (command);
 
-       /*com = g_strdup_printf ("strip --strip-unneeded %s%s", acfg->image->name, SHARED_EXT);
+       /*com = g_strdup_printf ("strip --strip-unneeded %s%s", acfg->image->name, MONO_SOLIB_EXT);
        printf ("Stripping the binary: %s\n", com);
        system (com);
        g_free (com);*/
@@ -8858,7 +8840,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
                MonoDebugOptions *opt = mini_get_debug_options ();
 
                opt->mdb_optimizations = TRUE;
-               opt->gen_seq_points = TRUE;
+               opt->gen_seq_points_debug_data = TRUE;
 
                if (!mono_debug_enabled ()) {
                        aot_printerrf (acfg, "The soft-debug AOT option requires the --debug option.\n");
@@ -9012,7 +8994,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
                if (acfg->aot_opts.outfile)
                        outfile_name = g_strdup_printf ("%s", acfg->aot_opts.outfile);
                else
-                       outfile_name = g_strdup_printf ("%s%s", acfg->image->name, SHARED_EXT);
+                       outfile_name = g_strdup_printf ("%s%s", acfg->image->name, MONO_SOLIB_EXT);
 
                /* 
                 * Can't use g_file_open_tmp () as it will be deleted at exit, and
index 2b52021f649127795e0fcbec4b707a4c58d14d37..7158952a2ec6ca57bf03dc33978d6a317ef18b30 100644 (file)
@@ -58,6 +58,7 @@
 #include <mono/utils/mono-digest.h>
 
 #include "mini.h"
+#include "seq-points.h"
 #include "version.h"
 
 #ifndef DISABLE_AOT
 #define ENABLE_AOT_CACHE
 #endif
 
-#ifdef TARGET_WIN32
-#define SHARED_EXT ".dll"
-#elif ((defined(__ppc__) || defined(__powerpc__) || defined(__ppc64__)) || defined(__MACH__)) && !defined(__linux__)
-#define SHARED_EXT ".dylib"
-#elif defined(__APPLE__) && defined(TARGET_X86) && !defined(__native_client_codegen__)
-#define SHARED_EXT ".dylib"
-#else
-#define SHARED_EXT ".so"
-#endif
-
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 #define ALIGN_PTR_TO(ptr,align) (gpointer)((((gssize)(ptr)) + (align - 1)) & (~(align - 1)))
 #define ROUND_DOWN(VALUE,SIZE) ((VALUE) & ~((SIZE) - 1))
@@ -1444,7 +1435,7 @@ aot_cache_load_module (MonoAssembly *assembly, char **aot_name)
         */
        hash = get_aot_config_hash (assembly);
 
-       tmp2 = g_strdup_printf ("%s-%s%s", assembly->image->assembly_name, hash, SHARED_EXT);
+       tmp2 = g_strdup_printf ("%s-%s%s", assembly->image->assembly_name, hash, MONO_SOLIB_EXT);
        fname = g_build_filename (cache_dir, tmp2, NULL);
        *aot_name = fname;
        g_free (tmp2);
@@ -1772,13 +1763,21 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
                        sofile = aot_cache_load_module (assembly, &aot_name);
                if (!sofile) {
                        char *err;
-                       aot_name = g_strdup_printf ("%s%s", assembly->image->name, SHARED_EXT);
+                       aot_name = g_strdup_printf ("%s%s", assembly->image->name, MONO_SOLIB_EXT);
 
                        sofile = mono_dl_open (aot_name, MONO_DL_LAZY, &err);
 
                        if (!sofile) {
                                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module '%s' not found: %s\n", aot_name, err);
                                g_free (err);
+
+                               aot_name = g_strdup_printf ("%s/mono/aot-cache/%s/%s%s", mono_assembly_getrootdir(), ARCHITECTURE, g_path_get_basename (assembly->image->name), MONO_SOLIB_EXT);
+                               sofile = mono_dl_open (aot_name, MONO_DL_LAZY, &err);
+                               if (!sofile) {
+                                       mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module '%s' not found: %s\n", aot_name, err);
+                                       g_free (err);
+                               }
+
                        }
                }
        }
@@ -2585,18 +2584,22 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
        } else {
                num_holes = try_holes_info_size = 0;
        }
-       /* Exception table */
-       if (has_clauses)
-               num_clauses = decode_value (p, &p);
-       else
-               num_clauses = 0;
+
        if (has_arch_eh_jit_info) {
                flags |= JIT_INFO_HAS_ARCH_EH_INFO;
                arch_eh_jit_info_size = sizeof (MonoArchEHJitInfo);
+               /* Overwrite the original code_len which includes alignment padding */
+               code_len = decode_value (p, &p);
        } else {
                arch_eh_jit_info_size = 0;
        }
 
+       /* Exception table */
+       if (has_clauses)
+               num_clauses = decode_value (p, &p);
+       else
+               num_clauses = 0;
+
        if (from_llvm) {
                MonoJitExceptionInfo *clauses;
                GSList **nesting;
@@ -2768,30 +2771,8 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
 
        if (method && has_seq_points) {
                MonoSeqPointInfo *seq_points;
-               int il_offset, native_offset, last_il_offset, last_native_offset, j;
-
-               int len = decode_value (p, &p);
-
-               seq_points = g_malloc0 (sizeof (MonoSeqPointInfo) + (len - MONO_ZERO_LEN_ARRAY) * sizeof (SeqPoint));
-               seq_points->len = len;
-               last_il_offset = last_native_offset = 0;
-               for (i = 0; i < len; ++i) {
-                       SeqPoint *sp = &seq_points->seq_points [i];
-                       il_offset = last_il_offset + decode_value (p, &p);
-                       native_offset = last_native_offset + decode_value (p, &p);
 
-                       sp->il_offset = il_offset;
-                       sp->native_offset = native_offset;
-                       
-                       sp->flags = decode_value (p, &p);
-                       sp->next_len = decode_value (p, &p);
-                       sp->next = g_new (int, sp->next_len);
-                       for (j = 0; j < sp->next_len; ++j)
-                               sp->next [j] = decode_value (p, &p);
-
-                       last_il_offset = il_offset;
-                       last_native_offset = native_offset;
-               }
+               p += seq_point_info_read (&seq_points, p, FALSE);
 
                mono_domain_lock (domain);
                g_hash_table_insert (domain_jit_info (domain)->seq_points, method, seq_points);
index be535210a6dea30087ad4d73e79db65b9748ffb8..ca62b660056ade35cb649dc15c7534e421c09d1a 100755 (executable)
@@ -66,6 +66,7 @@ tailcall: len:120 clob:c
 br: len:6
 label: len:0
 seq_point: len:31 clob:c
+il_seq_point: len:0
 
 long_add: dest:i src1:i src2:i len:3 clob:1 nacl:6
 long_sub: dest:i src1:i src2:i len:3 clob:1 nacl:6
index b31b368ec78550d7442a76009225d42d64bf7873..1ff8af77acb46825fae0cfeb0afbca416ffb8cc7 100644 (file)
@@ -58,6 +58,7 @@ switch: src1:i len:12
 # See the comment in resume_from_signal_handler, we can't copy the fp regs from sigctx to MonoContext on linux,
 # since the corresponding sigctx structures are not well defined.
 seq_point: len:38 clob:c
+il_seq_point: len:0
 
 throw: src1:i len:24
 rethrow: src1:i len:20
index f45b72123aa931454a7c95a8cbee92bbc789791e..482deb0daeae095357de3381ce452a932cd82a1a 100644 (file)
@@ -58,6 +58,7 @@ switch: src1:i len:12
 # See the comment in resume_from_signal_handler, we can't copy the fp regs from sigctx to MonoContext on linux,
 # since the corresponding sigctx structures are not well defined.
 seq_point: len:38 clob:c
+il_seq_point: len:0
 
 throw: src1:i len:24
 rethrow: src1:i len:20
index 0fd87c8973fe25fbe5fb5339bb198131affb60db..8d3447a7ee1cd5cd46119fb8c7b578922d79a4f0 100644 (file)
@@ -60,6 +60,7 @@ call: dest:v clob:c len:20
 br: len:16
 switch: src1:i len:40
 seq_point: len:24
+il_seq_point: len:0
 
 int_conv_to_r_un: dest:f src1:i len:32
 throw: src1:i len:24
index 44a482aad1318791135dfa69c99f0fb5d5fb1070..ba2ec60d3e727b0a74beeffeeb2126607abed162 100644 (file)
@@ -50,6 +50,7 @@ nop: len:4
 relaxed_nop: len:4
 break: len:32
 seq_point: len:24
+il_seq_point: len:0
 jmp: len:108
 tailcall: len:120 clob:c
 call: dest:a clob:c len:16
index 114bc3cf3b14228052d6b8dcfa07cf59ced16139..dc6ac728ab435698dd1566cfae5513e96c9f5a36 100644 (file)
@@ -50,6 +50,7 @@ nop: len:4
 relaxed_nop: len:4
 break: len:40
 seq_point: len:48
+il_seq_point: len:0
 jmp: len:96
 call: dest:a clob:c len:36
 br: len:4
@@ -380,7 +381,7 @@ vcall2_membase: src1:b len:16 clob:c
 
 jump_table: dest:i len:20
 
-atomic_add_i4: src1:b src2:i dest:i len:20
-atomic_add_i8: src1:b src2:i dest:i len:20
+atomic_add_i4: src1:b src2:i dest:i len:28
+atomic_add_i8: src1:b src2:i dest:i len:28
 atomic_cas_i4: src1:b src2:i src3:i dest:i len:38
 atomic_cas_i8: src1:b src2:i src3:i dest:i len:38
index 2eee2e4e57de2513cea47bc74092da93ed3c6aa0..96c218de52b61ddab6d2d2e22cff21de4306015f 100644 (file)
@@ -174,6 +174,7 @@ s390_setf4ret: dest:f src1:f len:4
 sbb: dest:i src1:i src2:i len:6
 sbb_imm: dest:i src1:i len:14
 seq_point: len:54
+il_seq_point: len:0
 sext_i4: dest:i src1:i len:4
 zext_i4: dest:i src1:i len:4
 shl_imm: dest:i src1:i len:10
index ca87f2fba43975024ef370c2b354e99cd5665240..0a2be606ea1d9db4c39834e01b353c6be4a4edc5 100644 (file)
@@ -67,6 +67,7 @@ call: dest:a clob:c len:17
 tailcall: len:120 clob:c
 br: len:5
 seq_point: len:17
+il_seq_point: len:0
 
 int_beq: len:6
 int_bge: len:6
index 742b6e93d9df10da151e554ffda327953d4e7895..1565a8684f84b00d89fd5c28eed0368c2b96f339 100644 (file)
@@ -16,7 +16,6 @@
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/threads-types.h>
 
-#define _IN_THE_MONO_DEBUGGER
 #include <mono/metadata/mono-debug-debugger.h>
 
 #include <mono/utils/valgrind.h>
index 17a21bb6c5e457ef37df3688a6e667df331927ea..240f8419a4532cb81c55751c5b4f9965a4f7ac98 100644 (file)
@@ -84,6 +84,7 @@ int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
 #include <mono/utils/mono-threads.h>
 #include "debugger-agent.h"
 #include "mini.h"
+#include "seq-points.h"
 
 /*
 On iOS we can't use System.Environment.Exit () as it will do the wrong
@@ -289,7 +290,7 @@ typedef struct {
 #define HEADER_LENGTH 11
 
 #define MAJOR_VERSION 2
-#define MINOR_VERSION 37
+#define MINOR_VERSION 38
 
 typedef enum {
        CMD_SET_VM = 1,
@@ -514,7 +515,8 @@ typedef enum {
 typedef enum {
        CMD_STACK_FRAME_GET_VALUES = 1,
        CMD_STACK_FRAME_GET_THIS = 2,
-       CMD_STACK_FRAME_SET_VALUES = 3
+       CMD_STACK_FRAME_SET_VALUES = 3,
+       CMD_STACK_FRAME_GET_DOMAIN = 4,
 } CmdStackFrame;
 
 typedef enum {
@@ -994,6 +996,9 @@ mono_debugger_agent_init (void)
 
        mono_native_tls_alloc (&debugger_tls_id, NULL);
 
+       /* Needed by the hash_table_new_type () call below */
+       mono_gc_base_init ();
+
        thread_to_tls = mono_g_hash_table_new_type (NULL, NULL, MONO_HASH_KEY_GC);
        MONO_GC_REGISTER_ROOT_FIXED (thread_to_tls);
 
@@ -1026,7 +1031,7 @@ mono_debugger_agent_init (void)
        breakpoints_init ();
        suspend_init ();
 
-       mini_get_debug_options ()->gen_seq_points = TRUE;
+       mini_get_debug_options ()->gen_seq_points_debug_data = TRUE;
        /* 
         * This is needed because currently we don't handle liveness info.
         */
@@ -3141,24 +3146,6 @@ is_suspended (void)
        return count_threads_to_wait_for () == 0;
 }
 
-static MonoSeqPointInfo*
-get_seq_points (MonoDomain *domain, MonoMethod *method)
-{
-       MonoSeqPointInfo *seq_points;
-
-       mono_domain_lock (domain);
-       seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, method);
-       if (!seq_points && method->is_inflated) {
-               /* generic sharing + aot */
-               seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, mono_method_get_declaring_generic_method (method));
-               if (!seq_points)
-                       seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, mini_get_shared_method (method));
-       }
-       mono_domain_unlock (domain);
-
-       return seq_points;
-}
-
 static void
 no_seq_points_found (MonoMethod *method)
 {
@@ -3168,87 +3155,6 @@ no_seq_points_found (MonoMethod *method)
        printf ("Unable to find seq points for method '%s'.\n", mono_method_full_name (method, TRUE));
 }
 
-/*
- * find_next_seq_point_for_native_offset:
- *
- *   Find the first sequence point after NATIVE_OFFSET.
- */
-static SeqPoint*
-find_next_seq_point_for_native_offset (MonoDomain *domain, MonoMethod *method, gint32 native_offset, MonoSeqPointInfo **info)
-{
-       MonoSeqPointInfo *seq_points;
-       int i;
-
-       seq_points = get_seq_points (domain, method);
-       if (!seq_points) {
-               if (info)
-                       *info = NULL;
-               return NULL;
-       }
-       g_assert (seq_points);
-       if (info)
-               *info = seq_points;
-
-       for (i = 0; i < seq_points->len; ++i) {
-               if (seq_points->seq_points [i].native_offset >= native_offset)
-                       return &seq_points->seq_points [i];
-       }
-
-       return NULL;
-}
-
-/*
- * find_prev_seq_point_for_native_offset:
- *
- *   Find the first sequence point before NATIVE_OFFSET.
- */
-static SeqPoint*
-find_prev_seq_point_for_native_offset (MonoDomain *domain, MonoMethod *method, gint32 native_offset, MonoSeqPointInfo **info)
-{
-       MonoSeqPointInfo *seq_points;
-       int i;
-
-       seq_points = get_seq_points (domain, method);
-       if (info)
-               *info = seq_points;
-       if (!seq_points)
-               return NULL;
-
-       for (i = seq_points->len - 1; i >= 0; --i) {
-               if (seq_points->seq_points [i].native_offset <= native_offset)
-                       return &seq_points->seq_points [i];
-       }
-
-       return NULL;
-}
-
-/*
- * find_seq_point:
- *
- *   Find the sequence point corresponding to the IL offset IL_OFFSET, which
- * should be the location of a sequence point.
- */
-static G_GNUC_UNUSED SeqPoint*
-find_seq_point (MonoDomain *domain, MonoMethod *method, gint32 il_offset, MonoSeqPointInfo **info)
-{
-       MonoSeqPointInfo *seq_points;
-       int i;
-
-       *info = NULL;
-
-       seq_points = get_seq_points (domain, method);
-       if (!seq_points)
-               return NULL;
-       *info = seq_points;
-
-       for (i = 0; i < seq_points->len; ++i) {
-               if (seq_points->seq_points [i].il_offset == il_offset)
-                       return &seq_points->seq_points [i];
-       }
-
-       return NULL;
-}
-
 typedef struct {
        DebuggerTlsData *tls;
        GSList *frames;
@@ -3260,7 +3166,7 @@ process_frame (StackFrameInfo *info, MonoContext *ctx, gpointer user_data)
        ComputeFramesUserData *ud = user_data;
        StackFrame *frame;
        MonoMethod *method, *actual_method, *api_method;
-       SeqPoint *sp;
+       SeqPoint sp;
        int flags = 0;
 
        if (info->type != FRAME_TYPE_MANAGED) {
@@ -3288,9 +3194,8 @@ process_frame (StackFrameInfo *info, MonoContext *ctx, gpointer user_data)
        if (info->il_offset == -1) {
                /* mono_debug_il_offset_from_address () doesn't seem to be precise enough (#2092) */
                if (ud->frames == NULL) {
-                       sp = find_prev_seq_point_for_native_offset (info->domain, method, info->native_offset, NULL);
-                       if (sp)
-                               info->il_offset = sp->il_offset;
+                       if (find_prev_seq_point_for_native_offset (info->domain, method, info->native_offset, NULL, &sp))
+                               info->il_offset = sp.il_offset;
                }
                if (info->il_offset == -1)
                        info->il_offset = mono_debug_il_offset_from_address (method, info->domain, info->native_offset);
@@ -4282,7 +4187,6 @@ typedef struct {
        guint8 *ip;
        MonoJitInfo *ji;
        MonoDomain *domain;
-       SeqPoint *sp;
 } BreakpointInstance;
 
 /*
@@ -4327,38 +4231,44 @@ breakpoints_init (void)
 static void
 insert_breakpoint (MonoSeqPointInfo *seq_points, MonoDomain *domain, MonoJitInfo *ji, MonoBreakpoint *bp, MonoError *error)
 {
-       int i, count;
+       int count;
        BreakpointInstance *inst;
-       SeqPoint *sp = NULL;
+       SeqPointIterator it;
+       gboolean it_has_sp = FALSE;
 
        if (error)
                mono_error_init (error);
 
-       for (i = 0; i < seq_points->len; ++i) {
-               sp = &seq_points->seq_points [i];
-
-               if (sp->il_offset == bp->il_offset)
+       seq_point_iterator_init (&it, seq_points);
+       while (seq_point_iterator_next (&it)) {
+               if (it.seq_point.il_offset == bp->il_offset) {
+                       it_has_sp = TRUE;
                        break;
+               }
        }
 
-       if (i == seq_points->len) {
+       if (!it_has_sp) {
                /*
                 * The set of IL offsets with seq points doesn't completely match the
                 * info returned by CMD_METHOD_GET_DEBUG_INFO (#407).
                 */
-               for (i = 0; i < seq_points->len; ++i) {
-                       sp = &seq_points->seq_points [i];
-
-                       if (sp->il_offset != METHOD_ENTRY_IL_OFFSET && sp->il_offset != METHOD_EXIT_IL_OFFSET && sp->il_offset + 1 == bp->il_offset)
+               seq_point_iterator_init (&it, seq_points);
+               while (seq_point_iterator_next (&it)) {
+                       if (it.seq_point.il_offset != METHOD_ENTRY_IL_OFFSET &&
+                               it.seq_point.il_offset != METHOD_EXIT_IL_OFFSET &&
+                               it.seq_point.il_offset + 1 == bp->il_offset) {
+                               it_has_sp = TRUE;
                                break;
+                       }
                }
        }
 
-       if (i == seq_points->len) {
-               char *s = g_strdup_printf ("Unable to insert breakpoint at %s:%d, seq_points=%d\n", mono_method_full_name (jinfo_get_method (ji), TRUE), bp->il_offset, seq_points->len);
+       if (!it_has_sp) {
+               char *s = g_strdup_printf ("Unable to insert breakpoint at %s:%d", mono_method_full_name (jinfo_get_method (ji), TRUE), bp->il_offset);
 
-               for (i = 0; i < seq_points->len; ++i)
-                       DEBUG (1, fprintf (log_file, "%d\n", seq_points->seq_points [i].il_offset));
+               seq_point_iterator_init (&it, seq_points);
+               while (seq_point_iterator_next (&it))
+                       DEBUG (1, fprintf (log_file, "%d\n", it.seq_point.il_offset));
 
                if (error) {
                        mono_error_set_error (error, MONO_ERROR_GENERIC, "%s", s);
@@ -4373,9 +4283,9 @@ insert_breakpoint (MonoSeqPointInfo *seq_points, MonoDomain *domain, MonoJitInfo
        }
 
        inst = g_new0 (BreakpointInstance, 1);
-       inst->sp = sp;
-       inst->native_offset = sp->native_offset;
-       inst->ip = (guint8*)ji->code_start + sp->native_offset;
+       inst->il_offset = it.seq_point.il_offset;
+       inst->native_offset = it.seq_point.native_offset;
+       inst->ip = (guint8*)ji->code_start + it.seq_point.native_offset;
        inst->ji = ji;
        inst->domain = domain;
 
@@ -4390,7 +4300,7 @@ insert_breakpoint (MonoSeqPointInfo *seq_points, MonoDomain *domain, MonoJitInfo
        g_hash_table_insert (bp_locs, inst->ip, GINT_TO_POINTER (count + 1));
        dbg_unlock ();
 
-       if (sp->native_offset == SEQ_POINT_NATIVE_OFFSET_DEAD_CODE) {
+       if (it.seq_point.native_offset == SEQ_POINT_NATIVE_OFFSET_DEAD_CODE) {
                DEBUG (1, fprintf (log_file, "[dbg] Attempting to insert seq point at dead IL offset %d, ignoring.\n", (int)bp->il_offset));
        } else if (count == 0) {
 #ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
@@ -4400,7 +4310,7 @@ insert_breakpoint (MonoSeqPointInfo *seq_points, MonoDomain *domain, MonoJitInfo
 #endif
        }
 
-       DEBUG(1, fprintf (log_file, "[dbg] Inserted breakpoint at %s:0x%x [%p](%d).\n", mono_method_full_name (jinfo_get_method (ji), TRUE), (int)sp->il_offset, inst->ip, count));
+       DEBUG(1, fprintf (log_file, "[dbg] Inserted breakpoint at %s:0x%x [%p](%d).\n", mono_method_full_name (jinfo_get_method (ji), TRUE), (int)it.seq_point.il_offset, inst->ip, count));
 }
 
 static void
@@ -4772,7 +4682,8 @@ process_breakpoint_inner (DebuggerTlsData *tls)
        MonoContext *ctx = &tls->restore_ctx;
        MonoMethod *method;
        MonoSeqPointInfo *info;
-       SeqPoint *sp;
+       SeqPoint sp;
+       gboolean found_sp;
 
        // FIXME: Speed this up
 
@@ -4802,12 +4713,14 @@ process_breakpoint_inner (DebuggerTlsData *tls)
         * The ip points to the instruction causing the breakpoint event, which is after
         * the offset recorded in the seq point map, so find the prev seq point before ip.
         */
-       sp = find_prev_seq_point_for_native_offset (mono_domain_get (), method, native_offset, &info);
-       if (!sp)
+       found_sp = find_prev_seq_point_for_native_offset (mono_domain_get (), method, native_offset, &info, &sp);
+
+       if (!found_sp)
                no_seq_points_found (method);
-       g_assert (sp);
 
-       DEBUG(1, fprintf (log_file, "[%p] Breakpoint hit, method=%s, ip=%p, offset=0x%x, sp il offset=0x%x.\n", (gpointer)GetCurrentThreadId (), method->name, ip, native_offset, sp ? sp->il_offset : -1));
+       g_assert (found_sp);
+
+       DEBUG(1, fprintf (log_file, "[%p] Breakpoint hit, method=%s, ip=%p, offset=0x%x, sp il offset=0x%x.\n", (gpointer)GetCurrentThreadId (), method->name, ip, native_offset, sp.il_offset));
 
        bp = NULL;
        for (i = 0; i < breakpoints->len; ++i) {
@@ -4818,7 +4731,7 @@ process_breakpoint_inner (DebuggerTlsData *tls)
 
                for (j = 0; j < bp->children->len; ++j) {
                        inst = g_ptr_array_index (bp->children, j);
-                       if (inst->ji == ji && inst->sp == sp) {
+                       if (inst->ji == ji && inst->il_offset == sp.il_offset && inst->native_offset == sp.native_offset) {
                                if (bp->req->event_kind == EVENT_KIND_STEP) {
                                        g_ptr_array_add (ss_reqs_orig, bp->req);
                                } else {
@@ -4829,9 +4742,9 @@ process_breakpoint_inner (DebuggerTlsData *tls)
        }
        if (bp_reqs->len == 0 && ss_reqs_orig->len == 0) {
                /* Maybe a method entry/exit event */
-               if (sp->il_offset == METHOD_ENTRY_IL_OFFSET)
+               if (sp.il_offset == METHOD_ENTRY_IL_OFFSET)
                        kind = EVENT_KIND_METHOD_ENTRY;
-               else if (sp->il_offset == METHOD_EXIT_IL_OFFSET)
+               else if (sp.il_offset == METHOD_EXIT_IL_OFFSET)
                        kind = EVENT_KIND_METHOD_EXIT;
        }
 
@@ -4844,12 +4757,12 @@ process_breakpoint_inner (DebuggerTlsData *tls)
                if (mono_thread_internal_current () != ss_req->thread)
                        continue;
 
-               hit = ss_update (ss_req, ji, sp, tls, ctx);
+               hit = ss_update (ss_req, ji, &sp, tls, ctx);
                if (hit)
                        g_ptr_array_add (ss_reqs, req);
 
                /* Start single stepping again from the current sequence point */
-               ss_start (ss_req, method, sp, info, ctx, tls, FALSE);
+               ss_start (ss_req, method, &sp, info, ctx, tls, FALSE);
        }
        
        if (ss_reqs->len > 0)
@@ -5010,7 +4923,7 @@ process_single_step_inner (DebuggerTlsData *tls)
        GSList *events;
        MonoContext *ctx = &tls->restore_ctx;
        MonoMethod *method;
-       SeqPoint *sp;
+       SeqPoint sp;
        MonoSeqPointInfo *info;
 
        ip = MONO_CONTEXT_GET_IP (ctx);
@@ -5056,16 +4969,16 @@ process_single_step_inner (DebuggerTlsData *tls)
         * The ip points to the instruction causing the single step event, which is before
         * the offset recorded in the seq point map, so find the next seq point after ip.
         */
-       sp = find_next_seq_point_for_native_offset (domain, method, (guint8*)ip - (guint8*)ji->code_start, &info);
-       if (!sp)
+       if (!find_next_seq_point_for_native_offset (domain, method, (guint8*)ip - (guint8*)ji->code_start, &info, &sp))
                return;
-       il_offset = sp->il_offset;
 
-       if (!ss_update (ss_req, ji, sp, tls, ctx))
+       il_offset = sp.il_offset;
+
+       if (!ss_update (ss_req, ji, &sp, tls, ctx))
                return;
 
        /* Start single stepping again from the current sequence point */
-       ss_start (ss_req, method, sp, info, ctx, tls, FALSE);
+       ss_start (ss_req, method, &sp, info, ctx, tls, FALSE);
 
        if ((ss_req->filter & STEP_FILTER_STATIC_CTOR) &&
                (method->flags & METHOD_ATTRIBUTE_SPECIAL_NAME) &&
@@ -5239,10 +5152,12 @@ ss_stop (SingleStepReq *ss_req)
  * belong to the same thread as CTX.
  */
 static void
-ss_start (SingleStepReq *ss_req, MonoMethod *method, SeqPoint *sp, MonoSeqPointInfo *info, MonoContext *ctx, DebuggerTlsData *tls, gboolean step_to_catch)
+ss_start (SingleStepReq *ss_req, MonoMethod *method, SeqPointsp, MonoSeqPointInfo *info, MonoContext *ctx, DebuggerTlsData *tls, gboolean step_to_catch)
 {
        int i, j, frame_index;
        SeqPoint *next_sp;
+       SeqPoint local_sp;
+       gboolean found_sp;
        MonoBreakpoint *bp;
        gboolean enable_global = FALSE;
 
@@ -5275,7 +5190,8 @@ ss_start (SingleStepReq *ss_req, MonoMethod *method, SeqPoint *sp, MonoSeqPointI
                                StackFrame *frame = tls->frames [frame_index];
 
                                method = frame->method;
-                               sp = find_prev_seq_point_for_native_offset (frame->domain, frame->method, frame->native_offset, &info);
+                               found_sp = find_prev_seq_point_for_native_offset (frame->domain, frame->method, frame->native_offset, &info, &local_sp);
+                               sp = (found_sp)? &local_sp : NULL;
                                frame_index ++;
                                if (sp && sp->next_len != 0)
                                        break;
@@ -5289,7 +5205,8 @@ ss_start (SingleStepReq *ss_req, MonoMethod *method, SeqPoint *sp, MonoSeqPointI
                                        StackFrame *frame = tls->frames [frame_index];
 
                                        method = frame->method;
-                                       sp = find_prev_seq_point_for_native_offset (frame->domain, frame->method, frame->native_offset, &info);
+                                       found_sp = find_prev_seq_point_for_native_offset (frame->domain, frame->method, frame->native_offset, &info, &local_sp);
+                                       sp = (found_sp)? &local_sp : NULL;
                                        if (sp && sp->next_len != 0)
                                                break;
                                        sp = NULL;
@@ -5299,12 +5216,16 @@ ss_start (SingleStepReq *ss_req, MonoMethod *method, SeqPoint *sp, MonoSeqPointI
                }
 
                if (sp && sp->next_len > 0) {
-                       for (i = 0; i < sp->next_len; ++i) {
-                               next_sp = &info->seq_points [sp->next [i]];
+                       SeqPoint* next = g_new(SeqPoint, sp->next_len);
+
+                       seq_point_init_next (info, *sp, next);
+                       for (i = 0; i < sp->next_len; i++) {
+                               next_sp = &next[i];
 
                                bp = set_breakpoint (method, next_sp->il_offset, ss_req->req, NULL);
                                ss_req->bps = g_slist_append (ss_req->bps, bp);
                        }
+                       g_free (next);
                }
 
                if (ss_req->depth == STEP_DEPTH_OVER) {
@@ -5319,7 +5240,8 @@ ss_start (SingleStepReq *ss_req, MonoMethod *method, SeqPoint *sp, MonoSeqPointI
                                        for (j = 0; j < jinfo->num_clauses; ++j) {
                                                MonoJitExceptionInfo *ei = &jinfo->clauses [j];
 
-                                               sp = find_next_seq_point_for_native_offset (frame->domain, frame->method, (char*)ei->handler_start - (char*)jinfo->code_start, NULL);
+                                               found_sp = find_next_seq_point_for_native_offset (frame->domain, frame->method, (char*)ei->handler_start - (char*)jinfo->code_start, NULL, &local_sp);
+                                               sp = (found_sp)? &local_sp : NULL;
                                                if (sp) {
                                                        bp = set_breakpoint (frame->method, sp->il_offset, ss_req->req, NULL);
                                                        ss_req->bps = g_slist_append (ss_req->bps, bp);
@@ -5365,6 +5287,8 @@ ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, EventRequ
        DebuggerTlsData *tls;
        MonoSeqPointInfo *info = NULL;
        SeqPoint *sp = NULL;
+       SeqPoint local_sp;
+       gboolean found_sp;
        MonoMethod *method = NULL;
        MonoDebugMethodInfo *minfo;
        gboolean step_to_catch = FALSE;
@@ -5415,7 +5339,8 @@ ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, EventRequ
                 * Find the seq point corresponding to the landing site ip, which is the first seq
                 * point after ip.
                 */
-               sp = find_next_seq_point_for_native_offset (frame.domain, frame.method, frame.native_offset, &info);
+               found_sp = find_next_seq_point_for_native_offset (frame.domain, frame.method, frame.native_offset, &info, &local_sp);
+               sp = (found_sp)? &local_sp : NULL;
                if (!sp)
                        no_seq_points_found (frame.method);
                g_assert (sp);
@@ -5461,7 +5386,8 @@ ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, EventRequ
 
                        if (!method && frame->il_offset != -1) {
                                /* FIXME: Sort the table and use a binary search */
-                               sp = find_prev_seq_point_for_native_offset (frame->domain, frame->method, frame->native_offset, &info);
+                               found_sp = find_prev_seq_point_for_native_offset (frame->domain, frame->method, frame->native_offset, &info, &local_sp);
+                               sp = (found_sp)? &local_sp : NULL;
                                if (!sp)
                                        no_seq_points_found (frame->method);
                                g_assert (sp);
@@ -8852,9 +8778,9 @@ thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                MonoMethod *method;
                MonoDomain *domain;
                MonoSeqPointInfo *seq_points;
-               SeqPoint *sp = NULL;
+               SeqPoint sp;
+               gboolean found_sp;
                gint64 il_offset;
-               int i;
 
                method = decode_methodid (p, &p, end, &domain, &err);
                if (err)
@@ -8875,22 +8801,17 @@ thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                if (tls->frame_count == 0 || tls->frames [0]->actual_method != method)
                        return ERR_INVALID_ARGUMENT;
 
-               seq_points = get_seq_points (domain, method);
-               g_assert (seq_points);
+               found_sp = find_seq_point (domain, method, il_offset, &seq_points, &sp);
 
-               for (i = 0; i < seq_points->len; ++i) {
-                       sp = &seq_points->seq_points [i];
+               g_assert (seq_points);
 
-                       if (sp->il_offset == il_offset)
-                               break;
-               }
-               if (i == seq_points->len)
+               if (!found_sp)
                        return ERR_INVALID_ARGUMENT;
 
                // FIXME: Check that the ip change is safe
 
-               DEBUG (1, fprintf (log_file, "[dbg] Setting IP to %s:0x%0x(0x%0x)\n", tls->frames [0]->actual_method->name, (int)sp->il_offset, (int)sp->native_offset));
-               MONO_CONTEXT_SET_IP (&tls->restore_ctx, (guint8*)tls->frames [0]->ji->code_start + sp->native_offset);
+               DEBUG (1, fprintf (log_file, "[dbg] Setting IP to %s:0x%0x(0x%0x)\n", tls->frames [0]->actual_method->name, (int)sp.il_offset, (int)sp.native_offset));
+               MONO_CONTEXT_SET_IP (&tls->restore_ctx, (guint8*)tls->frames [0]->ji->code_start + sp.native_offset);
                break;
        }
        default:
@@ -9050,6 +8971,11 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                mono_metadata_free_mh (header);
                break;
        }
+       case CMD_STACK_FRAME_GET_DOMAIN: {
+               if (CHECK_PROTOCOL_VERSION (2, 38))
+                       buffer_add_domainid (buf, frame->domain);
+               break;
+       }
        default:
                return ERR_NOT_IMPLEMENTED;
        }
@@ -9418,7 +9344,8 @@ static const char* type_cmds_str[] = {
 static const char* stack_frame_cmds_str[] = {
        "GET_VALUES",
        "GET_THIS",
-       "SET_VALUES"
+       "SET_VALUES",
+       "GET_DOMAIN",
 };
 
 static const char* array_cmds_str[] = {
@@ -9797,4 +9724,3 @@ mono_debugger_agent_unhandled_exception (MonoException *exc)
 }
 
 #endif
-
index 02853d0856b9bfe6f8e2b2ef3981272db236535c..63129c264831da75319e36aa3a13de46000d20ff 100644 (file)
@@ -3,13 +3,6 @@
 
 #include "mini.h"
 
-/* IL offsets used to mark the sequence points belonging to method entry/exit events */
-#define METHOD_ENTRY_IL_OFFSET -1
-#define METHOD_EXIT_IL_OFFSET 0xffffff
-
-/* Native offset used to mark seq points in dead code */
-#define SEQ_POINT_NATIVE_OFFSET_DEAD_CODE -1
-
 void
 mono_debugger_agent_parse_options (char *options) MONO_INTERNAL;
 
index 76abae4a20b8b9e4e94d19feaf33fb255326c46f..ea3773486145df820845cd65c1b52b5e39dd3da9 100644 (file)
@@ -2002,7 +2002,7 @@ mono_main (int argc, char* argv[])
                        fprintf (stderr, "Corlib not in sync with this runtime: %s\n", error);
                        fprintf (stderr, "Loaded from: %s\n",
                                mono_defaults.corlib? mono_image_get_filename (mono_defaults.corlib): "unknown");
-                       fprintf (stderr, "Download a newer corlib or a newer runtime at http://www.go-mono.com/daily.\n");
+                       fprintf (stderr, "Download a newer corlib or a newer runtime at http://www.mono-project.com/download.\n");
                        exit (1);
                }
 
index 8ba3bf083d831c19cd13bb1354962a19b8b394da..2697bc0895bb37584f4bec26111aa6df869129ad 100644 (file)
@@ -381,18 +381,18 @@ mono_arch_get_throw_exception_generic (int size, MonoTrampInfo **info, int corli
 
                if (aot) {
                        code = mono_arch_emit_load_aotconst (start, code, &ji, MONO_PATCH_INFO_IMAGE, mono_defaults.corlib);
-                       ppc_mr (code, ppc_r3, ppc_r11);
+                       ppc_mr (code, ppc_r3, ppc_r12);
                        code = mono_arch_emit_load_aotconst (start, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_exception_from_token");
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
-                       ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r11);
-                       ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+                       ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r12);
+                       ppc_ldptr (code, ppc_r12, 0, ppc_r12);
 #endif
-                       ppc_mtctr (code, ppc_r11);
+                       ppc_mtctr (code, ppc_r12);
                        ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
                } else {
                        ppc_load (code, ppc_r3, (gulong)mono_defaults.corlib);
-                       ppc_load_func (code, ppc_r0, mono_exception_from_token);
-                       ppc_mtctr (code, ppc_r0);
+                       ppc_load_func (code, PPC_CALL_REG, mono_exception_from_token);
+                       ppc_mtctr (code, PPC_CALL_REG);
                        ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
                }
        }
@@ -420,14 +420,14 @@ mono_arch_get_throw_exception_generic (int size, MonoTrampInfo **info, int corli
                code = mono_arch_emit_load_got_addr (start, code, NULL, &ji);
                code = mono_arch_emit_load_aotconst (start, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_ppc_throw_exception");
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
-               ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r11);
-               ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+               ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r12);
+               ppc_ldptr (code, ppc_r12, 0, ppc_r12);
 #endif
-               ppc_mtctr (code, ppc_r11);
+               ppc_mtctr (code, ppc_r12);
                ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
        } else {
-               ppc_load_func (code, ppc_r0, mono_ppc_throw_exception);
-               ppc_mtctr (code, ppc_r0);
+               ppc_load_func (code, PPC_CALL_REG, mono_ppc_throw_exception);
+               ppc_mtctr (code, PPC_CALL_REG);
                ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
        }
        /* we should never reach this breakpoint */
index bc05005d01df7b59f324f642fd315180b22af035..9c2cfc932d53a468890e4d7ef0dda901adf41dcd 100644 (file)
@@ -33,8 +33,6 @@
 #define S390_THROWSTACK_ACCREGS                (S390_THROWSTACK_FLTREGS+(16*sizeof(gdouble)))
 #define S390_THROWSTACK_SIZE           (S390_THROWSTACK_ACCREGS+(16*sizeof(gint32)))
 
-#define S390_REG_SAVE_R13              (S390_REG_SAVE_OFFSET+(7*sizeof(gulong)))
-
 #define SZ_THROW       384
 
 #define setup_context(ctx)
@@ -361,8 +359,8 @@ mono_arch_get_throw_exception_generic (int size, MonoTrampInfo **info,
 
        if (info)
                *info = mono_tramp_info_create (corlib ? "throw_corlib_exception" 
-                                                                      : (rethrow ? "rethrow_exception" 
-                                                                      : "throw_exception"), 
+                                                      : (rethrow ? "rethrow_exception" 
+                                                      : "throw_exception"), 
                                                start, code - start, ji, unwind_ops);
 
        return start;
index c208c2a4b1211f5cd77af89b691867639dbcdfc6..aac45186598af0c3295e282aca2433512024e1e9 100644 (file)
@@ -302,8 +302,6 @@ alloc_dreg (MonoCompile *cfg, MonoStackType stack_type)
 
 #define NEW_JIT_ICALL_ADDRCONST(cfg,dest,name) NEW_AOTCONST ((cfg), (dest), MONO_PATCH_INFO_JIT_ICALL_ADDR, (name))
 
-#define GET_VARINFO_INST(cfg,num) ((cfg)->varinfo [(num)]->inst)
-
 #define NEW_VARLOAD(cfg,dest,var,vartype) do { \
         MONO_INST_NEW ((cfg), (dest), OP_MOVE); \
                (dest)->opcode = mono_type_to_regmove ((cfg), (vartype));  \
@@ -407,7 +405,7 @@ handle_gsharedvt_ldaddr (MonoCompile *cfg)
        } while (0)
 
 #define NEW_SEQ_POINT(cfg,dest,il_offset,intr_loc) do {         \
-       MONO_INST_NEW ((cfg), (dest), OP_SEQ_POINT); \
+       MONO_INST_NEW ((cfg), (dest), cfg->gen_seq_points_debug_data ? OP_SEQ_POINT : OP_IL_SEQ_POINT); \
        (dest)->inst_imm = (il_offset); \
        (dest)->flags = intr_loc ? MONO_INST_SINGLE_STEP_LOC : 0; \
        } while (0)
index 0d88d3cc26ad417efa1299f6b6cf52e9b741aa33..3e1a3554c836e6ce99c720541fbf0abed7fcc2c5 100755 (executable)
@@ -68,6 +68,7 @@
 #include "jit-icalls.h"
 #include "jit.h"
 #include "debugger-agent.h"
+#include "seq-points.h"
 
 #define BRANCH_COST 10
 #define INLINE_LENGTH_LIMIT 20
@@ -7135,7 +7136,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                seq_points = FALSE;
        }
 
-       if (cfg->gen_seq_points && cfg->method == method) {
+       if (cfg->gen_seq_points_debug_data && cfg->method == method) {
                minfo = mono_debug_lookup_method (method);
                if (minfo) {
                        int i, n_il_offsets;
@@ -10986,9 +10987,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        MONO_INST_NEW (cfg, ins, *ip);
                        --sp;
                        CHECK_OPSIZE (5);
-                       klass = mono_class_get_and_inflate_typespec_checked (image, read32 (ip + 1), generic_context, &cfg->error);
-                       CHECK_CFG_ERROR;
-                       mono_class_init (klass);
+                       klass = mini_get_class (method, read32 (ip + 1), generic_context);
+                       CHECK_TYPELOAD (klass);
 
                        context_used = mini_class_check_context_used (cfg, klass);
 
@@ -11026,9 +11026,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        MONO_INST_NEW (cfg, ins, *ip);
                        --sp;
                        CHECK_OPSIZE (5);
-                       klass = mono_class_get_and_inflate_typespec_checked (image, read32 (ip + 1), generic_context, &cfg->error);
-                       CHECK_CFG_ERROR;
-                       mono_class_init (klass);
+                       klass = mini_get_class (method, read32 (ip + 1), generic_context);
+                       CHECK_TYPELOAD (klass);
 
                        context_used = mini_class_check_context_used (cfg, klass);
 
@@ -12197,10 +12196,9 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 
                                        val = mono_type_size (type, &ialign);
                                } else {
-                                       MonoClass *klass = mono_class_get_and_inflate_typespec_checked (image, token, generic_context, &cfg->error);
-                                       CHECK_CFG_ERROR;
+                                       MonoClass *klass = mini_get_class (method, token, generic_context);
+                                       CHECK_TYPELOAD (klass);
 
-                                       mono_class_init (klass);
                                        val = mono_type_size (&klass->byval_arg, &ialign);
 
                                        if (mini_is_gsharedvt_klass (cfg, klass))
index 73a226cfd48e2afe4eb075c09fd765c8cc4efc1a..58e6ebecb8d28c6694e0e061a1e88d4e259e5153 100755 (executable)
@@ -4109,6 +4109,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_NOT_REACHED:
                case OP_NOT_NULL:
                        break;
+               case OP_IL_SEQ_POINT:
+                       mono_add_seq_point (cfg, bb, ins, code - cfg->native_code);
+                       break;
                case OP_SEQ_POINT: {
                        int i;
 
@@ -7690,14 +7693,11 @@ get_delegate_invoke_impl (gboolean has_target, guint32 param_count, guint32 *cod
                g_assert ((code - start) < 64);
        }
 
-       nacl_global_codeman_validate(&start, 64, &code);
-
-       mono_debug_add_delegate_trampoline (start, code - start);
+       nacl_global_codeman_validate (&start, 64, &code);
 
        if (code_len)
                *code_len = code - start;
 
-
        if (mono_jit_map_is_enabled ()) {
                char *buff;
                if (has_target)
index dc43eb731a2a1988db0316f52aeb5896327e4a74..f5c5282a5e540008f29bfeeb146cc8e8aa91170f 100755 (executable)
@@ -161,9 +161,6 @@ struct sigcontext {
  * reproduceable results for benchmarks */
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_RETREG1 X86_EAX
-#define MONO_ARCH_RETREG2 X86_EDX
-
 /*This is the max size of the locals area of a given frame. I think 1MB is a safe default for now*/
 #define MONO_ARCH_MAX_FRAME_SIZE 0x100000
 
index 9ccc982e37afa2a4c89b20cc93e05f4a08cf3f1a..343cb49b8dc00e45f9b9df396c6d3c2259a37ddd 100644 (file)
@@ -177,30 +177,7 @@ int mono_exc_esp_offset = 0;
 #define LDR_PC_VAL ((ARMCOND_AL << ARMCOND_SHIFT) | (1 << 26) | (0 << 22) | (1 << 20) | (15 << 12))
 #define IS_LDR_PC(val) (((val) & LDR_MASK) == LDR_PC_VAL)
 
-#define ADD_LR_PC_4 ((ARMCOND_AL << ARMCOND_SHIFT) | (1 << 25) | (1 << 23) | (ARMREG_PC << 16) | (ARMREG_LR << 12) | 4)
-#define MOV_LR_PC ((ARMCOND_AL << ARMCOND_SHIFT) | (1 << 24) | (0xa << 20) |  (ARMREG_LR << 12) | ARMREG_PC)
 //#define DEBUG_IMT 0
-/* A variant of ARM_LDR_IMM which can handle large offsets */
-#define ARM_LDR_IMM_GENERAL(code, dreg, basereg, offset, scratch_reg) do { \
-       if (arm_is_imm12 ((offset))) { \
-               ARM_LDR_IMM (code, (dreg), (basereg), (offset));        \
-       } else {                                                                                                \
-               g_assert ((scratch_reg) != (basereg));                                     \
-               code = mono_arm_emit_load_imm (code, (scratch_reg), (offset));  \
-               ARM_LDR_REG_REG (code, (dreg), (basereg), (scratch_reg));               \
-       }                                                                                                                                       \
-       } while (0)
-
-#define ARM_STR_IMM_GENERAL(code, dreg, basereg, offset, scratch_reg) do {     \
-       if (arm_is_imm12 ((offset))) { \
-               ARM_STR_IMM (code, (dreg), (basereg), (offset));        \
-       } else {                                                                                                \
-               g_assert ((scratch_reg) != (basereg));                                     \
-               code = mono_arm_emit_load_imm (code, (scratch_reg), (offset));  \
-               ARM_STR_REG_REG (code, (dreg), (basereg), (scratch_reg));               \
-       }                                                                                                                                       \
-       } while (0)
 
 #ifndef DISABLE_JIT
 static void mono_arch_compute_omit_fp (MonoCompile *cfg);
@@ -1116,8 +1093,6 @@ mono_arch_get_allocatable_int_vars (MonoCompile *cfg)
        return vars;
 }
 
-#define USE_EXTRA_TEMPS 0
-
 GList *
 mono_arch_get_global_int_regs (MonoCompile *cfg)
 {
@@ -4402,6 +4377,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_NOT_REACHED:
                case OP_NOT_NULL:
                        break;
+               case OP_IL_SEQ_POINT:
+                       mono_add_seq_point (cfg, bb, ins, code - cfg->native_code);
+                       break;
                case OP_SEQ_POINT: {
                        int i;
                        MonoInst *info_var = cfg->arch.seq_point_info_var;
index f22514b61ef3e58d2d6acbc1a1e4132e1ebc76c1..e9f99014610f583af56b77c37f17d56db7b02a56 100644 (file)
@@ -242,7 +242,6 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_EMULATE_DIV 1
 #define MONO_ARCH_EMULATE_CONV_R8_UN 1
 #define MONO_ARCH_EMULATE_MUL_OVF 1
-//#define MONO_ARCH_BIGMUL_INTRINS 1
 
 #define ARM_FIRST_ARG_REG 0
 #define ARM_LAST_ARG_REG 3
@@ -258,9 +257,6 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
 #define MONO_ARCH_HAVE_GENERALIZED_IMT_THUNK 1
 
-#define ARM_NUM_REG_ARGS (ARM_LAST_ARG_REG-ARM_FIRST_ARG_REG+1)
-#define ARM_NUM_REG_FPARGS 0
-
 #define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES 1
 #define MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS 1
 
index f4bdecb727a31a1b7c4598ea7bd658e5086e8f6b..cc603b8a9530467d8f9eb39dd46f2efbafd9cc9b 100644 (file)
@@ -686,6 +686,7 @@ mono_print_ins_index (int i, MonoInst *ins)
        case OP_GC_LIVENESS_USE:
                printf (" R%d", (int)ins->inst_c1);
                break;
+       case OP_IL_SEQ_POINT:
        case OP_SEQ_POINT:
                printf (" il: %x", (int)ins->inst_imm);
                break;
index 616ebc46bf363e6db420ffc14d4d0ce54be47bd8..0f17856c1fc73ebd4c49c5eb5bb3a680ecf47445 100644 (file)
@@ -52,6 +52,7 @@
 #include "mini.h"
 #include "trace.h"
 #include "debugger-agent.h"
+#include "seq-points.h"
 
 #ifndef MONO_ARCH_CONTEXT_DEF
 #define MONO_ARCH_CONTEXT_DEF
@@ -690,6 +691,7 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
                }
                else
                        MONO_OBJECT_SETREF (sf, method, mono_method_get_object (domain, method, NULL));
+               sf->method_address = (gint64) ji->code_start;
                sf->native_offset = (char *)ip - (char *)ji->code_start;
 
                /*
@@ -698,10 +700,15 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
                 * operation, so we shouldn't call this method twice.
                 */
                location = mono_debug_lookup_source_location (jinfo_get_method (ji), sf->native_offset, domain);
-               if (location)
+               if (location) {
                        sf->il_offset = location->il_offset;
-               else
-                       sf->il_offset = 0;
+               } else {
+                       SeqPoint sp;
+                       if (find_prev_seq_point_for_native_offset (domain, jinfo_get_method (ji), sf->native_offset, NULL, &sp))
+                               sf->il_offset = sp.il_offset;
+                       else
+                               sf->il_offset = 0;
+               }
 
                if (need_file_info) {
                        if (location && location->source_file) {
@@ -852,7 +859,15 @@ mono_walk_stack_full (MonoJitStackWalk func, MonoContext *start_ctx, MonoDomain
                        MonoDebugSourceLocation *source;
 
                        source = mono_debug_lookup_source_location (jinfo_get_method (frame.ji), frame.native_offset, domain);
-                       il_offset = source ? source->il_offset : -1;
+                       if (source) {
+                               il_offset = source->il_offset;
+                       } else {
+                               SeqPoint sp;
+                               if (find_prev_seq_point_for_native_offset (domain, jinfo_get_method (frame.ji), frame.native_offset, NULL, &sp))
+                                       il_offset = sp.il_offset;
+                               else
+                                       il_offset = -1;
+                       }
                        mono_debug_free_source_location (source);
                } else
                        il_offset = -1;
index 6c616a5f6f234db359eafe663c1173dce555000f..fddca9c6c346e7be93d95e0a204e6a679a28b2e7 100644 (file)
@@ -12,8 +12,8 @@
 #include "mini-gc.h"
 #include <mono/metadata/gc-internal.h>
 
-//#if 0
-#if defined(MONO_ARCH_GC_MAPS_SUPPORTED)
+#if 0
+//#if defined(MONO_ARCH_GC_MAPS_SUPPORTED)
 
 #include <mono/metadata/sgen-conf.h>
 #include <mono/metadata/gc-internal.h>
@@ -436,6 +436,13 @@ static int callee_saved_regs [] = { ARMREG_V1, ARMREG_V2, ARMREG_V3, ARMREG_V4,
 static int callee_saved_regs [] = { };
 #elif defined(TARGET_S390X)
 static int callee_saved_regs [] = { s390_r6, s390_r7, s390_r8, s390_r9, s390_r10, s390_r11, s390_r12, s390_r13, s390_r14 };
+#elif defined(TARGET_POWERPC64) && _CALL_ELF == 2
+static int callee_saved_regs [] = {
+  ppc_r13, ppc_r14, ppc_r15, ppc_r16,
+  ppc_r17, ppc_r18, ppc_r19, ppc_r20,
+  ppc_r21, ppc_r22, ppc_r23, ppc_r24,
+  ppc_r25, ppc_r26, ppc_r27, ppc_r28,
+  ppc_r29, ppc_r30, ppc_r31 };
 #elif defined(TARGET_POWERPC)
 static int callee_saved_regs [] = { ppc_r6, ppc_r7, ppc_r8, ppc_r9, ppc_r10, ppc_r11, ppc_r12, ppc_r13, ppc_r14 };
 #endif
index 15bb596d41418f5d683c71c98aaa276ea72ae6dc..928ccfbb5358ca1b265007fe5cd023ceb8545645 100644 (file)
@@ -41,9 +41,6 @@
 
 #define MONO_ARCH_CODE_ALIGNMENT 16
 
-#define MONO_ARCH_RETREG1 IA64_R8
-#define MONO_ARCH_FRETREG1 8
-
 #define MONO_ARCH_SIGNAL_STACK_SIZE SIGSTKSZ
 
 struct MonoLMF {
@@ -106,7 +103,6 @@ unw_dyn_region_info_t* mono_ia64_create_unwind_region (Ia64CodegenState *code);
 #define MONO_ARCH_EMULATE_LCONV_TO_R8_UN 1
 #define MONO_ARCH_EMULATE_FREM           1
 #define MONO_ARCH_EMULATE_MUL_DIV        1
-#define MONO_ARCH_EMULATE_LONG_MUL_OPTS  1
 #define MONO_ARCH_NEED_DIV_CHECK         1
 
 #define MONO_ARCH_HAVE_IS_INT_OVERFLOW 1
index 2aa6bd1d268e846a0a80db10d815b7e34718de00..277b4744a073964abae19a7f050016d450df3531 100644 (file)
@@ -3305,8 +3305,8 @@ emit_reserve_param_area (MonoCompile *cfg, guint8 *code)
        if (ppc_is_imm16 (-size)) {
                ppc_stwu (code, ppc_r0, -size, ppc_sp);
        } else {
-               ppc_load (code, ppc_r11, -size);
-               ppc_stwux (code, ppc_r0, ppc_sp, ppc_r11);
+               ppc_load (code, ppc_r12, -size);
+               ppc_stwux (code, ppc_r0, ppc_sp, ppc_r12);
        }
 #endif
        return code;
@@ -3327,8 +3327,8 @@ emit_unreserve_param_area (MonoCompile *cfg, guint8 *code)
        if (ppc_is_imm16 (size)) {
                ppc_stwu (code, ppc_r0, size, ppc_sp);
        } else {
-               ppc_load (code, ppc_r11, size);
-               ppc_stwux (code, ppc_r0, ppc_sp, ppc_r11);
+               ppc_load (code, ppc_r12, size);
+               ppc_stwux (code, ppc_r0, ppc_sp, ppc_r12);
        }
 #endif
        return code;
@@ -3394,6 +3394,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_NOT_REACHED:
                case OP_NOT_NULL:
                        break;
+               case OP_IL_SEQ_POINT:
+                       mono_add_seq_point (cfg, bb, ins, code - cfg->native_code);
+                       break;
                case OP_SEQ_POINT: {
                        if (ins->flags & MONO_INST_SINGLE_STEP_LOC) {
                                guint32 addr = (guint32)ss_trigger_page;
@@ -3719,8 +3722,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_DIV_IMM:
                        g_assert_not_reached ();
 #if 0
-                       ppc_load (code, ppc_r11, ins->inst_imm);
-                       ppc_divwod (code, ins->dreg, ins->sreg1, ppc_r11);
+                       ppc_load (code, ppc_r12, ins->inst_imm);
+                       ppc_divwod (code, ins->dreg, ins->sreg1, ppc_r12);
                        ppc_mfspr (code, ppc_r0, ppc_xer);
                        ppc_andisd (code, ppc_r0, ppc_r0, (1<<14));
                        /* FIXME: use OverflowException for 0x80000000/-1 */
index d8d769130c4fc049ec242d90b650e55040a17865..1d84ef867b0ef480a649fabe1337ac56d56a36dc 100644 (file)
@@ -231,7 +231,6 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_EMULATE_LCONV_TO_R4 1
 #define MONO_ARCH_EMULATE_LCONV_TO_R8_UN 1
 #define MONO_ARCH_EMULATE_FREM 1
-#define MONO_ARCH_BIGMUL_INTRINS 1
 #endif
 
 #if SIZEOF_REGISTER == 8
@@ -330,8 +329,6 @@ typedef struct {
 
 #undef DEBUG_EXCEPTIONS
 
-#define MONO_ZERO_REG          mips_zero
-
 #define        MONO_EMIT_NEW_MIPS_COND_EXC(cfg,cond,sr1,sr2,name) do { \
                 MonoInst *inst; \
                MONO_INST_NEW ((cfg), (inst), cond); \
index e667a4c08f5050f328c1637ebfe03f84674cd5a8..cc8323a1eb7739b75fe29cbad51f0f806e844aca 100644 (file)
@@ -37,6 +37,7 @@ MINI_OP(OP_LOCALLOC, "localloc", IREG, IREG, NONE)
 MINI_OP(OP_LOCALLOC_IMM, "localloc_imm", IREG, NONE, NONE)
 MINI_OP(OP_CHECK_THIS, "checkthis", NONE, IREG, NONE)
 MINI_OP(OP_SEQ_POINT, "seq_point", NONE, NONE, NONE)
+MINI_OP(OP_IL_SEQ_POINT, "il_seq_point", NONE, NONE, NONE)
 MINI_OP(OP_IMPLICIT_EXCEPTION, "implicit_exception", NONE, NONE, NONE)
 
 MINI_OP(OP_VOIDCALL,   "voidcall", NONE, NONE, NONE)
index 1889eeaeaeadc9886335e41ba718ab4ca98db723..880aaae653c9cc116aeb1d279d6aae47efc05cd3 100644 (file)
@@ -297,6 +297,9 @@ MONO_SIG_HANDLER_FUNC (static, sigusr1_signal_handler)
 #endif
 
 #ifdef SIGPROF
+
+static int profiling_signal_in_use;
+
 #if defined(__ia64__) || defined(__sparc__) || defined(sparc) || defined(__s390__) || defined(s390)
 
 MONO_SIG_HANDLER_FUNC (static, sigprof_signal_handler)
@@ -309,8 +312,6 @@ MONO_SIG_HANDLER_FUNC (static, sigprof_signal_handler)
 
 #else
 
-static int profiling_signal_in_use;
-
 static void
 per_thread_profiler_hit (void *ctx)
 {
@@ -395,6 +396,9 @@ MONO_SIG_HANDLER_FUNC (static, sigprof_signal_handler)
        if (mono_thread_info_get_small_id () == -1)
                return; //an non-attached thread got the signal
 
+       if (!mono_domain_get () || !mono_native_tls_get_value (mono_jit_tls_id))
+               return; //thread in the process of dettaching
+
        hp_save_index = mono_hazard_pointer_save_for_signal_handler ();
 
        /* If we can't consume a profiling request it means we're the initiator. */
@@ -721,7 +725,11 @@ mono_runtime_setup_stat_profiler (void)
 pid_t
 mono_runtime_syscall_fork ()
 {
-#if defined(SYS_fork)
+#if defined(PLATFORM_ANDROID)
+       /* SYS_fork is defined to be __NR_fork which is not defined in some ndk versions */
+       g_assert_not_reached ();
+       return 0;
+#elif defined(SYS_fork)
        return (pid_t) syscall (SYS_fork);
 #else
        g_assert_not_reached ();
index a7c83988da6bcf9b664fd42f7329e01923d9c913..907fe766c9c1219742d862bc1844896111d358b8 100644 (file)
@@ -104,11 +104,11 @@ offsets_from_pthread_key (guint32 key, int *offset2)
 /* FIXME: ensure the sc call preserves all but r3 */
 #define emit_darwing4_tls(code,dreg,key) do {\
                int off1 = 0x48 + key * sizeof (gpointer);      \
-               if ((dreg) != ppc_r3) ppc_mr ((code), ppc_r11, ppc_r3); \
+               if ((dreg) != ppc_r3) ppc_mr ((code), ppc_r12, ppc_r3); \
                ppc_li ((code), ppc_r0, 0x7FF2);        \
                ppc_sc ((code));        \
                ppc_lwz ((code), (dreg), off1, ppc_r3); \
-               if ((dreg) != ppc_r3) ppc_mr ((code), ppc_r3, ppc_r11); \
+               if ((dreg) != ppc_r3) ppc_mr ((code), ppc_r3, ppc_r12); \
        } while (0);
 
 #ifdef PPC_THREAD_PTR_REG
@@ -119,8 +119,8 @@ offsets_from_pthread_key (guint32 key, int *offset2)
                        ppc_ldptr ((code), (dreg), off1, PPC_THREAD_PTR_REG);   \
                } else { \
                        int off3 = (off2 + 1) > 1; \
-                       ppc_addis ((code), ppc_r11, PPC_THREAD_PTR_REG, off3); \
-                       ppc_ldptr ((code), (dreg), off1, ppc_r11);      \
+                       ppc_addis ((code), ppc_r12, PPC_THREAD_PTR_REG, off3); \
+                       ppc_ldptr ((code), (dreg), off1, ppc_r12);      \
                } \
        } while (0);
 #else
@@ -191,29 +191,29 @@ emit_memcpy (guint8 *code, int size, int dreg, int doffset, int sreg, int soffse
 
                ppc_load (code, ppc_r0, shifted);
                ppc_mtctr (code, ppc_r0);
-               //g_assert (sreg == ppc_r11);
-               ppc_addi (code, ppc_r12, dreg, (doffset - sizeof (gpointer)));
-               ppc_addi (code, ppc_r11, sreg, (soffset - sizeof (gpointer)));
+               //g_assert (sreg == ppc_r12);
+               ppc_addi (code, ppc_r11, dreg, (doffset - sizeof (gpointer)));
+               ppc_addi (code, ppc_r12, sreg, (soffset - sizeof (gpointer)));
                copy_loop_start = code;
-               ppc_ldptr_update (code, ppc_r0, (unsigned int)sizeof (gpointer), ppc_r11);
-               ppc_stptr_update (code, ppc_r0, (unsigned int)sizeof (gpointer), ppc_r12);
+               ppc_ldptr_update (code, ppc_r0, (unsigned int)sizeof (gpointer), ppc_r12);
+               ppc_stptr_update (code, ppc_r0, (unsigned int)sizeof (gpointer), ppc_r11);
                copy_loop_jump = code;
                ppc_bc (code, PPC_BR_DEC_CTR_NONZERO, 0, 0);
                ppc_patch (copy_loop_jump, copy_loop_start);
                size -= shifted * sizeof (gpointer);
                doffset = soffset = 0;
-               dreg = ppc_r12;
+               dreg = ppc_r11;
        }
 #ifdef __mono_ppc64__
        /* the hardware has multiple load/store units and the move is long
           enough to use more then one regiester, then use load/load/store/store
           to execute 2 instructions per cycle. */
-       if ((cpu_hw_caps & PPC_MULTIPLE_LS_UNITS) && (dreg != ppc_r12) && (sreg != ppc_r12)) { 
+       if ((cpu_hw_caps & PPC_MULTIPLE_LS_UNITS) && (dreg != ppc_r11) && (sreg != ppc_r11)) { 
                while (size >= 16) {
                        ppc_ldptr (code, ppc_r0, soffset, sreg);
-                       ppc_ldptr (code, ppc_r12, soffset+8, sreg);
+                       ppc_ldptr (code, ppc_r11, soffset+8, sreg);
                        ppc_stptr (code, ppc_r0, doffset, dreg);
-                       ppc_stptr (code, ppc_r12, doffset+8, dreg);
+                       ppc_stptr (code, ppc_r11, doffset+8, dreg);
                        size -= 16;
                        soffset += 16;
                        doffset += 16; 
@@ -227,12 +227,12 @@ emit_memcpy (guint8 *code, int size, int dreg, int doffset, int sreg, int soffse
                doffset += 8;
        }
 #else
-       if ((cpu_hw_caps & PPC_MULTIPLE_LS_UNITS) && (dreg != ppc_r12) && (sreg != ppc_r12)) { 
+       if ((cpu_hw_caps & PPC_MULTIPLE_LS_UNITS) && (dreg != ppc_r11) && (sreg != ppc_r11)) { 
                while (size >= 8) {
                        ppc_lwz (code, ppc_r0, soffset, sreg);
-                       ppc_lwz (code, ppc_r12, soffset+4, sreg);
+                       ppc_lwz (code, ppc_r11, soffset+4, sreg);
                        ppc_stw (code, ppc_r0, doffset, dreg);
-                       ppc_stw (code, ppc_r12, doffset+4, dreg);
+                       ppc_stw (code, ppc_r11, doffset+4, dreg);
                        size -= 8;
                        soffset += 8;
                        doffset += 8; 
@@ -744,7 +744,7 @@ mono_arch_get_global_int_regs (MonoCompile *cfg)
        for (i = 14; i < top; ++i) {
                /*
                 * Reserve r29 for holding the vtable address for virtual calls in AOT mode,
-                * since the trampolines can clobber r11.
+                * since the trampolines can clobber r12.
                 */
                if (!(cfg->compile_aot && i == 29))
                        regs = g_list_prepend (regs, GUINT_TO_POINTER (i));
@@ -1789,8 +1789,8 @@ mono_arch_instrument_prolog (MonoCompile *cfg, void *func, void *p, gboolean ena
 
        ppc_load_ptr (code, ppc_r3, cfg->method);
        ppc_li (code, ppc_r4, 0); /* NULL ebp for now */
-       ppc_load_func (code, ppc_r0, func);
-       ppc_mtlr (code, ppc_r0);
+       ppc_load_func (code, PPC_CALL_REG, func);
+       ppc_mtlr (code, PPC_CALL_REG);
        ppc_blrl (code);
        return code;
 }
@@ -1887,8 +1887,8 @@ mono_arch_instrument_epilog_full (MonoCompile *cfg, void *func, void *p, gboolea
        }
 
        ppc_load_ptr (code, ppc_r3, cfg->method);
-       ppc_load_func (code, ppc_r0, func);
-       ppc_mtlr (code, ppc_r0);
+       ppc_load_func (code, PPC_CALL_REG, func);
+       ppc_mtlr (code, PPC_CALL_REG);
        ppc_blrl (code);
 
        switch (save_mode) {
@@ -2822,14 +2822,14 @@ handle_thunk (int absolute, guchar *code, const guchar *target) {
 static void
 patch_ins (guint8 *code, guint32 ins)
 {
-       *(guint32*)code = GUINT32_TO_BE (ins);
+       *(guint32*)code = ins;
        mono_arch_flush_icache (code, 4);
 }
 
 void
 ppc_patch_full (guchar *code, const guchar *target, gboolean is_fd)
 {
-       guint32 ins = GUINT32_FROM_BE (*(guint32*)code);
+       guint32 ins = *(guint32*)code;
        guint32 prim = ins >> 26;
        guint32 ovf;
 
@@ -2912,7 +2912,13 @@ ppc_patch_full (guchar *code, const guchar *target, gboolean is_fd)
                        else
                                code -= 24;
                } else {
-                       if (ppc_is_load_op (seq [5]) || ppc_opcode (seq [5]) == 31) /* ld || lwz || mr */
+                       if (ppc_is_load_op (seq [5])
+#ifdef PPC_USES_FUNCTION_DESCRIPTOR
+                           /* With function descs we need to do more careful
+                              matches.  */
+                           || ppc_opcode (seq [5]) == 31 /* ld || lwz || mr */
+#endif
+                          )
                                branch_ins = seq + 8;
                        else
                                branch_ins = seq + 6;
@@ -2927,7 +2933,7 @@ ppc_patch_full (guchar *code, const guchar *target, gboolean is_fd)
 
                        if (!is_fd) {
                                guint8 *buf = (guint8*)&seq [5];
-                               ppc_mr (buf, ppc_r0, ppc_r11);
+                               ppc_mr (buf, PPC_CALL_REG, ppc_r12);
                                ppc_nop (buf);
                        }
                } else {
@@ -2936,8 +2942,12 @@ ppc_patch_full (guchar *code, const guchar *target, gboolean is_fd)
                }
 
                /* FIXME: make this thread safe */
-               /* FIXME: we're assuming we're using r11 here */
-               ppc_load_ptr_sequence (code, ppc_r11, target);
+#ifdef PPC_USES_FUNCTION_DESCRIPTOR
+               /* FIXME: we're assuming we're using r12 here */
+               ppc_load_ptr_sequence (code, ppc_r12, target);
+#else
+               ppc_load_ptr_sequence (code, PPC_CALL_REG, target);
+#endif
                mono_arch_flush_icache ((guint8*)seq, 28);
 #else
                guint32 *seq;
@@ -2952,8 +2962,8 @@ ppc_patch_full (guchar *code, const guchar *target, gboolean is_fd)
                g_assert ((seq [2] >> 26) == 31);
                g_assert (seq [3] == 0x4e800021 || seq [3] == 0x4e800020 || seq [3] == 0x4e800420);
                /* FIXME: make this thread safe */
-               ppc_lis (code, ppc_r0, (guint32)(target) >> 16);
-               ppc_ori (code, ppc_r0, ppc_r0, (guint32)(target) & 0xffff);
+               ppc_lis (code, PPC_CALL_REG, (guint32)(target) >> 16);
+               ppc_ori (code, PPC_CALL_REG, PPC_CALL_REG, (guint32)(target) & 0xffff);
                mono_arch_flush_icache (code - 8, 8);
 #endif
        } else {
@@ -3010,8 +3020,8 @@ emit_reserve_param_area (MonoCompile *cfg, guint8 *code)
        if (ppc_is_imm16 (-size)) {
                ppc_stptr_update (code, ppc_r0, -size, ppc_sp);
        } else {
-               ppc_load (code, ppc_r11, -size);
-               ppc_stptr_update_indexed (code, ppc_r0, ppc_sp, ppc_r11);
+               ppc_load (code, ppc_r12, -size);
+               ppc_stptr_update_indexed (code, ppc_r0, ppc_sp, ppc_r12);
        }
 
        return code;
@@ -3032,8 +3042,8 @@ emit_unreserve_param_area (MonoCompile *cfg, guint8 *code)
        if (ppc_is_imm16 (size)) {
                ppc_stptr_update (code, ppc_r0, size, ppc_sp);
        } else {
-               ppc_load (code, ppc_r11, size);
-               ppc_stptr_update_indexed (code, ppc_r0, ppc_sp, ppc_r11);
+               ppc_load (code, ppc_r12, size);
+               ppc_stptr_update_indexed (code, ppc_r0, ppc_sp, ppc_r12);
        }
 
        return code;
@@ -3094,6 +3104,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_NOT_REACHED:
                case OP_NOT_NULL:
                        break;
+               case OP_IL_SEQ_POINT:
+                       mono_add_seq_point (cfg, bb, ins, code - cfg->native_code);
+                       break;
                case OP_SEQ_POINT: {
                        int i;
 
@@ -3107,8 +3120,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                         * a breakpoint is hit will step to the next IL offset.
                         */
                        if (ins->flags & MONO_INST_SINGLE_STEP_LOC) {
-                               ppc_load (code, ppc_r11, (gsize)ss_trigger_page);
-                               ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+                               ppc_load (code, ppc_r12, (gsize)ss_trigger_page);
+                               ppc_ldptr (code, ppc_r12, 0, ppc_r12);
                        }
 
                        mono_add_seq_point (cfg, bb, ins, code - cfg->native_code);
@@ -3142,8 +3155,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_stb (code, ins->sreg1, ins->inst_offset, ins->inst_destbasereg);
                        } else {
                                if (ppc_is_imm32 (ins->inst_offset)) {
-                                       ppc_addis (code, ppc_r12, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
-                                       ppc_stb (code, ins->sreg1, ins->inst_offset, ppc_r12);
+                                       ppc_addis (code, ppc_r11, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
+                                       ppc_stb (code, ins->sreg1, ins->inst_offset, ppc_r11);
                                } else {
                                        ppc_load (code, ppc_r0, ins->inst_offset);
                                        ppc_stbx (code, ins->sreg1, ins->inst_destbasereg, ppc_r0);
@@ -3155,8 +3168,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_sth (code, ins->sreg1, ins->inst_offset, ins->inst_destbasereg);
                        } else {
                                if (ppc_is_imm32 (ins->inst_offset)) {
-                                       ppc_addis (code, ppc_r12, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
-                                       ppc_sth (code, ins->sreg1, ins->inst_offset, ppc_r12);
+                                       ppc_addis (code, ppc_r11, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
+                                       ppc_sth (code, ins->sreg1, ins->inst_offset, ppc_r11);
                                } else {
                                        ppc_load (code, ppc_r0, ins->inst_offset);
                                        ppc_sthx (code, ins->sreg1, ins->inst_destbasereg, ppc_r0);
@@ -3168,8 +3181,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_stptr (code, ins->sreg1, ins->inst_offset, ins->inst_destbasereg);
                        } else {
                                if (ppc_is_imm32 (ins->inst_offset)) {
-                                       ppc_addis (code, ppc_r12, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
-                                       ppc_stptr (code, ins->sreg1, ins->inst_offset, ppc_r12);
+                                       ppc_addis (code, ppc_r11, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
+                                       ppc_stptr (code, ins->sreg1, ins->inst_offset, ppc_r11);
                                } else {
                                        ppc_load (code, ppc_r0, ins->inst_offset);
                                        ppc_stptr_indexed (code, ins->sreg1, ins->inst_destbasereg, ppc_r0);
@@ -3371,8 +3384,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, 
                                             (gpointer)"mono_break");
                        if ((FORCE_INDIR_CALL || cfg->method->dynamic) && !cfg->compile_aot) {
-                               ppc_load_func (code, ppc_r0, 0);
-                               ppc_mtlr (code, ppc_r0);
+                               ppc_load_func (code, PPC_CALL_REG, 0);
+                               ppc_mtlr (code, PPC_CALL_REG);
                                ppc_blrl (code);
                        } else {
                                ppc_bl (code, 0);
@@ -3725,7 +3738,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                         */
                        g_assert (!cfg->method->save_lmf);
                        /*
-                        * Note: we can use ppc_r11 here because it is dead anyway:
+                        * Note: we can use ppc_r12 here because it is dead anyway:
                         * we're leaving the method.
                         */
                        if (1 || cfg->flags & MONO_CFG_HAS_CALLS) {
@@ -3733,26 +3746,26 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                if (ppc_is_imm16 (ret_offset)) {
                                        ppc_ldptr (code, ppc_r0, ret_offset, cfg->frame_reg);
                                } else {
-                                       ppc_load (code, ppc_r11, ret_offset);
-                                       ppc_ldptr_indexed (code, ppc_r0, cfg->frame_reg, ppc_r11);
+                                       ppc_load (code, ppc_r12, ret_offset);
+                                       ppc_ldptr_indexed (code, ppc_r0, cfg->frame_reg, ppc_r12);
                                }
                                ppc_mtlr (code, ppc_r0);
                        }
 
                        if (ppc_is_imm16 (cfg->stack_usage)) {
-                               ppc_addi (code, ppc_r11, cfg->frame_reg, cfg->stack_usage);
+                               ppc_addi (code, ppc_r12, cfg->frame_reg, cfg->stack_usage);
                        } else {
                                /* cfg->stack_usage is an int, so we can use
                                 * an addis/addi sequence here even in 64-bit.  */
-                               ppc_addis (code, ppc_r11, cfg->frame_reg, ppc_ha(cfg->stack_usage));
-                               ppc_addi (code, ppc_r11, ppc_r11, cfg->stack_usage);
+                               ppc_addis (code, ppc_r12, cfg->frame_reg, ppc_ha(cfg->stack_usage));
+                               ppc_addi (code, ppc_r12, ppc_r12, cfg->stack_usage);
                        }
                        if (!cfg->method->save_lmf) {
                                pos = 0;
                                for (i = 31; i >= 13; --i) {
                                        if (cfg->used_int_regs & (1 << i)) {
                                                pos += sizeof (gpointer);
-                                               ppc_ldptr (code, i, -pos, ppc_r11);
+                                               ppc_ldptr (code, i, -pos, ppc_r12);
                                        }
                                }
                        } else {
@@ -3761,27 +3774,27 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 
                        /* Copy arguments on the stack to our argument area */
                        if (call->stack_usage) {
-                               code = emit_memcpy (code, call->stack_usage, ppc_r11, PPC_STACK_PARAM_OFFSET, ppc_sp, PPC_STACK_PARAM_OFFSET);
-                               /* r11 was clobbered */
+                               code = emit_memcpy (code, call->stack_usage, ppc_r12, PPC_STACK_PARAM_OFFSET, ppc_sp, PPC_STACK_PARAM_OFFSET);
+                               /* r12 was clobbered */
                                g_assert (cfg->frame_reg == ppc_sp);
                                if (ppc_is_imm16 (cfg->stack_usage)) {
-                                       ppc_addi (code, ppc_r11, cfg->frame_reg, cfg->stack_usage);
+                                       ppc_addi (code, ppc_r12, cfg->frame_reg, cfg->stack_usage);
                                } else {
                                        /* cfg->stack_usage is an int, so we can use
                                         * an addis/addi sequence here even in 64-bit.  */
-                                       ppc_addis (code, ppc_r11, cfg->frame_reg, ppc_ha(cfg->stack_usage));
-                                       ppc_addi (code, ppc_r11, ppc_r11, cfg->stack_usage);
+                                       ppc_addis (code, ppc_r12, cfg->frame_reg, ppc_ha(cfg->stack_usage));
+                                       ppc_addi (code, ppc_r12, ppc_r12, cfg->stack_usage);
                                }
                        }
 
-                       ppc_mr (code, ppc_sp, ppc_r11);
+                       ppc_mr (code, ppc_sp, ppc_r12);
                        mono_add_patch_info (cfg, (guint8*) code - cfg->native_code, MONO_PATCH_INFO_METHOD_JUMP, call->method);
                        if (cfg->compile_aot) {
                                /* arch_emit_got_access () patches this */
                                ppc_load32 (code, ppc_r0, 0);
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
-                               ppc_ldptr_indexed (code, ppc_r11, ppc_r30, ppc_r0);
-                               ppc_ldptr (code, ppc_r0, 0, ppc_r11);
+                               ppc_ldptr_indexed (code, ppc_r12, ppc_r30, ppc_r0);
+                               ppc_ldptr (code, ppc_r0, 0, ppc_r12);
 #else
                                ppc_ldptr_indexed (code, ppc_r0, ppc_r30, ppc_r0);
 #endif
@@ -3819,8 +3832,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        else
                                mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_ABS, call->fptr);
                        if ((FORCE_INDIR_CALL || cfg->method->dynamic) && !cfg->compile_aot) {
-                               ppc_load_func (code, ppc_r0, 0);
-                               ppc_mtlr (code, ppc_r0);
+                               ppc_load_func (code, PPC_CALL_REG, 0);
+                               ppc_mtlr (code, PPC_CALL_REG);
                                ppc_blrl (code);
                        } else {
                                ppc_bl (code, 0);
@@ -3853,7 +3866,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_VCALL2_MEMBASE:
                case OP_VOIDCALL_MEMBASE:
                case OP_CALL_MEMBASE:
-                       if (cfg->compile_aot && ins->sreg1 == ppc_r11) {
+                       if (cfg->compile_aot && ins->sreg1 == ppc_r12) {
                                /* The trampolines clobber this */
                                ppc_mr (code, ppc_r29, ins->sreg1);
                                ppc_ldptr (code, ppc_r0, ins->inst_offset, ppc_r29);
@@ -3871,9 +3884,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        int alloca_waste = PPC_STACK_PARAM_OFFSET + cfg->param_area + 31;
                        int area_offset = alloca_waste;
                        area_offset &= ~31;
-                       ppc_addi (code, ppc_r11, ins->sreg1, alloca_waste + 31);
+                       ppc_addi (code, ppc_r12, ins->sreg1, alloca_waste + 31);
                        /* FIXME: should be calculated from MONO_ARCH_FRAME_ALIGNMENT */
-                       ppc_clear_right_imm (code, ppc_r11, ppc_r11, 4);
+                       ppc_clear_right_imm (code, ppc_r12, ppc_r12, 4);
                        /* use ctr to store the number of words to 0 if needed */
                        if (ins->flags & MONO_INST_INIT) {
                                /* we zero 4 bytes at a time:
@@ -3886,8 +3899,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_mtctr (code, ppc_r0);
                        }
                        ppc_ldptr (code, ppc_r0, 0, ppc_sp);
-                       ppc_neg (code, ppc_r11, ppc_r11);
-                       ppc_stptr_update_indexed (code, ppc_r0, ppc_sp, ppc_r11);
+                       ppc_neg (code, ppc_r12, ppc_r12);
+                       ppc_stptr_update_indexed (code, ppc_r0, ppc_sp, ppc_r12);
 
                        /* FIXME: make this loop work in 8 byte
                           increments on PPC64 */
@@ -3897,9 +3910,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                 * run at least once
                                 */
                                ppc_addi (code, ins->dreg, ppc_sp, (area_offset - 8));
-                               ppc_li (code, ppc_r11, 0);
+                               ppc_li (code, ppc_r12, 0);
                                zero_loop_start = code;
-                               ppc_stwu (code, ppc_r11, 4, ins->dreg);
+                               ppc_stwu (code, ppc_r12, 4, ins->dreg);
                                zero_loop_jump = code;
                                ppc_bc (code, PPC_BR_DEC_CTR_NONZERO, 0, 0);
                                ppc_patch (zero_loop_jump, zero_loop_start);
@@ -3913,8 +3926,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, 
                                             (gpointer)"mono_arch_throw_exception");
                        if ((FORCE_INDIR_CALL || cfg->method->dynamic) && !cfg->compile_aot) {
-                               ppc_load_func (code, ppc_r0, 0);
-                               ppc_mtlr (code, ppc_r0);
+                               ppc_load_func (code, PPC_CALL_REG, 0);
+                               ppc_mtlr (code, PPC_CALL_REG);
                                ppc_blrl (code);
                        } else {
                                ppc_bl (code, 0);
@@ -3927,8 +3940,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, 
                                             (gpointer)"mono_arch_rethrow_exception");
                        if ((FORCE_INDIR_CALL || cfg->method->dynamic) && !cfg->compile_aot) {
-                               ppc_load_func (code, ppc_r0, 0);
-                               ppc_mtlr (code, ppc_r0);
+                               ppc_load_func (code, PPC_CALL_REG, 0);
+                               ppc_mtlr (code, PPC_CALL_REG);
                                ppc_blrl (code);
                        } else {
                                ppc_bl (code, 0);
@@ -3943,8 +3956,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        if (ppc_is_imm16 (spvar->inst_offset)) {
                                ppc_stptr (code, ppc_r0, spvar->inst_offset, spvar->inst_basereg);
                        } else {
-                               ppc_load (code, ppc_r11, spvar->inst_offset);
-                               ppc_stptr_indexed (code, ppc_r0, ppc_r11, spvar->inst_basereg);
+                               ppc_load (code, ppc_r12, spvar->inst_offset);
+                               ppc_stptr_indexed (code, ppc_r0, ppc_r12, spvar->inst_basereg);
                        }
                        break;
                }
@@ -3957,8 +3970,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        if (ppc_is_imm16 (spvar->inst_offset)) {
                                ppc_ldptr (code, ppc_r0, spvar->inst_offset, spvar->inst_basereg);
                        } else {
-                               ppc_load (code, ppc_r11, spvar->inst_offset);
-                               ppc_ldptr_indexed (code, ppc_r0, spvar->inst_basereg, ppc_r11);
+                               ppc_load (code, ppc_r12, spvar->inst_offset);
+                               ppc_ldptr_indexed (code, ppc_r0, spvar->inst_basereg, ppc_r12);
                        }
                        ppc_mtlr (code, ppc_r0);
                        ppc_blr (code);
@@ -4064,11 +4077,11 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 
                        /* FIXME: Optimize this */
                        ppc_bl (code, 1);
-                       ppc_mflr (code, ppc_r11);
+                       ppc_mflr (code, ppc_r12);
                        ppc_b (code, 3);
                        *(double*)code = *(double*)ins->inst_p0;
                        code += 8;
-                       ppc_lfd (code, ins->dreg, 8, ppc_r11);
+                       ppc_lfd (code, ins->dreg, 8, ppc_r12);
                        break;
                case OP_R4CONST:
                        g_assert_not_reached ();
@@ -4078,8 +4091,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_stfd (code, ins->sreg1, ins->inst_offset, ins->inst_destbasereg);
                        } else {
                                if (ppc_is_imm32 (ins->inst_offset)) {
-                                       ppc_addis (code, ppc_r12, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
-                                       ppc_stfd (code, ins->sreg1, ins->inst_offset, ppc_r12);
+                                       ppc_addis (code, ppc_r11, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
+                                       ppc_stfd (code, ins->sreg1, ins->inst_offset, ppc_r11);
                                } else {
                                        ppc_load (code, ppc_r0, ins->inst_offset);
                                        ppc_stfdx (code, ins->sreg1, ins->inst_destbasereg, ppc_r0);
@@ -4091,8 +4104,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_lfd (code, ins->dreg, ins->inst_offset, ins->inst_basereg);
                        } else {
                                if (ppc_is_imm32 (ins->inst_offset)) {
-                                       ppc_addis (code, ppc_r12, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
-                                       ppc_lfd (code, ins->dreg, ins->inst_offset, ppc_r12);
+                                       ppc_addis (code, ppc_r11, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
+                                       ppc_lfd (code, ins->dreg, ins->inst_offset, ppc_r11);
                                } else {
                                        ppc_load (code, ppc_r0, ins->inst_offset);
                                        ppc_lfdx (code, ins->dreg, ins->inst_destbasereg, ppc_r0);
@@ -4105,8 +4118,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_stfs (code, ins->sreg1, ins->inst_offset, ins->inst_destbasereg);
                        } else {
                                if (ppc_is_imm32 (ins->inst_offset)) {
-                                       ppc_addis (code, ppc_r12, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
-                                       ppc_stfs (code, ins->sreg1, ins->inst_offset, ppc_r12);
+                                       ppc_addis (code, ppc_r11, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
+                                       ppc_stfs (code, ins->sreg1, ins->inst_offset, ppc_r11);
                                } else {
                                        ppc_load (code, ppc_r0, ins->inst_offset);
                                        ppc_stfsx (code, ins->sreg1, ins->inst_destbasereg, ppc_r0);
@@ -4118,8 +4131,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                ppc_lfs (code, ins->dreg, ins->inst_offset, ins->inst_basereg);
                        } else {
                                if (ppc_is_imm32 (ins->inst_offset)) {
-                                       ppc_addis (code, ppc_r12, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
-                                       ppc_lfs (code, ins->dreg, ins->inst_offset, ppc_r12);
+                                       ppc_addis (code, ppc_r11, ins->inst_destbasereg, ppc_ha(ins->inst_offset));
+                                       ppc_lfs (code, ins->dreg, ins->inst_offset, ppc_r11);
                                } else {
                                        ppc_load (code, ppc_r0, ins->inst_offset);
                                        ppc_lfsx (code, ins->dreg, ins->inst_destbasereg, ppc_r0);
@@ -4509,6 +4522,16 @@ mono_arch_register_lowlevel_calls (void)
 }
 
 #ifdef __mono_ppc64__
+#ifdef _LITTLE_ENDIAN
+#define patch_load_sequence(ip,val) do {\
+               guint16 *__load = (guint16*)(ip);       \
+               g_assert (sizeof (val) == sizeof (gsize)); \
+               __load [0] = (((guint64)(gsize)(val)) >> 48) & 0xffff;  \
+               __load [2] = (((guint64)(gsize)(val)) >> 32) & 0xffff;  \
+               __load [6] = (((guint64)(gsize)(val)) >> 16) & 0xffff;  \
+               __load [8] =  ((guint64)(gsize)(val))        & 0xffff;  \
+       } while (0)
+#elif defined _BIG_ENDIAN
 #define patch_load_sequence(ip,val) do {\
                guint16 *__load = (guint16*)(ip);       \
                g_assert (sizeof (val) == sizeof (gsize)); \
@@ -4518,6 +4541,9 @@ mono_arch_register_lowlevel_calls (void)
                __load [9] =  ((guint64)(gsize)(val))        & 0xffff;  \
        } while (0)
 #else
+#error huh?  No endianess defined by compiler
+#endif
+#else
 #define patch_load_sequence(ip,val) do {\
                guint16 *__lis_ori = (guint16*)(ip);    \
                __lis_ori [1] = (((gulong)(val)) >> 16) & 0xffff;       \
@@ -4728,12 +4754,12 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                        code = save_registers (cfg, code, alloc_size - pos, ppc_sp, method->save_lmf, cfg->used_int_regs, cfa_offset);
                } else {
                        if (pos)
-                               ppc_addi (code, ppc_r11, ppc_sp, -pos);
+                               ppc_addi (code, ppc_r12, ppc_sp, -pos);
                        ppc_load (code, ppc_r0, -alloc_size);
                        ppc_str_update_indexed (code, ppc_sp, ppc_sp, ppc_r0);
                        cfa_offset = alloc_size;
                        mono_emit_unwind_op_def_cfa_offset (cfg, code, alloc_size);
-                       code = save_registers (cfg, code, 0, ppc_r11, method->save_lmf, cfg->used_int_regs, cfa_offset);
+                       code = save_registers (cfg, code, 0, ppc_r12, method->save_lmf, cfg->used_int_regs, cfa_offset);
                }
        }
        if (cfg->frame_reg != ppc_sp) {
@@ -4779,8 +4805,8 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                if (ppc_is_imm16 (inst->inst_offset)) {
                        ppc_stptr (code, ainfo->reg, inst->inst_offset, inst->inst_basereg);
                } else {
-                       ppc_load (code, ppc_r11, inst->inst_offset);
-                       ppc_stptr_indexed (code, ainfo->reg, ppc_r11, inst->inst_basereg);
+                       ppc_load (code, ppc_r12, inst->inst_offset);
+                       ppc_stptr_indexed (code, ainfo->reg, ppc_r12, inst->inst_basereg);
                }
        }
 
@@ -4797,8 +4823,8 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                        else if (ainfo->regtype == RegTypeFP)
                                ppc_fmr (code, inst->dreg, ainfo->reg);
                        else if (ainfo->regtype == RegTypeBase) {
-                               ppc_ldr (code, ppc_r11, 0, ppc_sp);
-                               ppc_ldptr (code, inst->dreg, ainfo->offset, ppc_r11);
+                               ppc_ldr (code, ppc_r12, 0, ppc_sp);
+                               ppc_ldptr (code, inst->dreg, ainfo->offset, ppc_r12);
                        } else
                                g_assert_not_reached ();
 
@@ -4813,11 +4839,11 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_stb (code, ainfo->reg, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_stb (code, ainfo->reg, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_stb (code, ainfo->reg, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_stbx (code, ainfo->reg, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_stbx (code, ainfo->reg, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
@@ -4826,11 +4852,11 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_sth (code, ainfo->reg, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_sth (code, ainfo->reg, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_sth (code, ainfo->reg, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_sthx (code, ainfo->reg, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_sthx (code, ainfo->reg, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
@@ -4840,11 +4866,11 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_stw (code, ainfo->reg, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_stw (code, ainfo->reg, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_stw (code, ainfo->reg, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_stwx (code, ainfo->reg, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_stwx (code, ainfo->reg, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
@@ -4852,8 +4878,8 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                        if (ppc_is_imm16 (inst->inst_offset)) {
                                                ppc_str (code, ainfo->reg, inst->inst_offset, inst->inst_basereg);
                                        } else {
-                                               ppc_load (code, ppc_r11, inst->inst_offset);
-                                               ppc_str_indexed (code, ainfo->reg, ppc_r11, inst->inst_basereg);
+                                               ppc_load (code, ppc_r12, inst->inst_offset);
+                                               ppc_str_indexed (code, ainfo->reg, ppc_r12, inst->inst_basereg);
                                        }
                                        break;
 #else
@@ -4862,10 +4888,10 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_stw (code, ainfo->reg, inst->inst_offset, inst->inst_basereg);
                                                ppc_stw (code, ainfo->reg + 1, inst->inst_offset + 4, inst->inst_basereg);
                                        } else {
-                                               ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                               ppc_addi (code, ppc_r11, ppc_r11, inst->inst_offset);
-                                               ppc_stw (code, ainfo->reg, 0, ppc_r11);
-                                               ppc_stw (code, ainfo->reg + 1, 4, ppc_r11);
+                                               ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                               ppc_addi (code, ppc_r12, ppc_r12, inst->inst_offset);
+                                               ppc_stw (code, ainfo->reg, 0, ppc_r12);
+                                               ppc_stw (code, ainfo->reg + 1, 4, ppc_r12);
                                        }
                                        break;
 #endif
@@ -4874,31 +4900,31 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_stptr (code, ainfo->reg, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_stptr (code, ainfo->reg, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_stptr (code, ainfo->reg, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_stptr_indexed (code, ainfo->reg, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_stptr_indexed (code, ainfo->reg, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
                                }
                        } else if (ainfo->regtype == RegTypeBase) {
                                g_assert (ppc_is_imm16 (ainfo->offset));
-                               /* load the previous stack pointer in r11 */
-                               ppc_ldr (code, ppc_r11, 0, ppc_sp);
-                               ppc_ldptr (code, ppc_r0, ainfo->offset, ppc_r11);
+                               /* load the previous stack pointer in r12 */
+                               ppc_ldr (code, ppc_r12, 0, ppc_sp);
+                               ppc_ldptr (code, ppc_r0, ainfo->offset, ppc_r12);
                                switch (ainfo->size) {
                                case 1:
                                        if (ppc_is_imm16 (inst->inst_offset)) {
                                                ppc_stb (code, ppc_r0, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_stb (code, ppc_r0, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_stb (code, ppc_r0, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_stbx (code, ppc_r0, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_stbx (code, ppc_r0, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
@@ -4907,11 +4933,11 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_sth (code, ppc_r0, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_sth (code, ppc_r0, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_sth (code, ppc_r0, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_sthx (code, ppc_r0, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_sthx (code, ppc_r0, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
@@ -4921,11 +4947,11 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_stw (code, ppc_r0, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_stw (code, ppc_r0, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_stw (code, ppc_r0, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_stwx (code, ppc_r0, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_stwx (code, ppc_r0, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
@@ -4933,8 +4959,8 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                        if (ppc_is_imm16 (inst->inst_offset)) {
                                                ppc_str (code, ppc_r0, inst->inst_offset, inst->inst_basereg);
                                        } else {
-                                               ppc_load (code, ppc_r11, inst->inst_offset);
-                                               ppc_str_indexed (code, ppc_r0, ppc_r11, inst->inst_basereg);
+                                               ppc_load (code, ppc_r12, inst->inst_offset);
+                                               ppc_str_indexed (code, ppc_r0, ppc_r12, inst->inst_basereg);
                                        }
                                        break;
 #else
@@ -4942,15 +4968,15 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                        g_assert (ppc_is_imm16 (ainfo->offset + 4));
                                        if (ppc_is_imm16 (inst->inst_offset + 4)) {
                                                ppc_stw (code, ppc_r0, inst->inst_offset, inst->inst_basereg);
-                                               ppc_lwz (code, ppc_r0, ainfo->offset + 4, ppc_r11);
+                                               ppc_lwz (code, ppc_r0, ainfo->offset + 4, ppc_r12);
                                                ppc_stw (code, ppc_r0, inst->inst_offset + 4, inst->inst_basereg);
                                        } else {
-                                               /* use r12 to load the 2nd half of the long before we clobber r11.  */
-                                               ppc_lwz (code, ppc_r12, ainfo->offset + 4, ppc_r11);
-                                               ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                               ppc_addi (code, ppc_r11, ppc_r11, inst->inst_offset);
-                                               ppc_stw (code, ppc_r0, 0, ppc_r11);
-                                               ppc_stw (code, ppc_r12, 4, ppc_r11);
+                                               /* use r11 to load the 2nd half of the long before we clobber r12.  */
+                                               ppc_lwz (code, ppc_r11, ainfo->offset + 4, ppc_r12);
+                                               ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                               ppc_addi (code, ppc_r12, ppc_r12, inst->inst_offset);
+                                               ppc_stw (code, ppc_r0, 0, ppc_r12);
+                                               ppc_stw (code, ppc_r11, 4, ppc_r12);
                                        }
                                        break;
 #endif
@@ -4959,11 +4985,11 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                ppc_stptr (code, ppc_r0, inst->inst_offset, inst->inst_basereg);
                                        } else {
                                                if (ppc_is_imm32 (inst->inst_offset)) {
-                                                       ppc_addis (code, ppc_r11, inst->inst_basereg, ppc_ha(inst->inst_offset));
-                                                       ppc_stptr (code, ppc_r0, inst->inst_offset, ppc_r11);
+                                                       ppc_addis (code, ppc_r12, inst->inst_basereg, ppc_ha(inst->inst_offset));
+                                                       ppc_stptr (code, ppc_r0, inst->inst_offset, ppc_r12);
                                                } else {
-                                                       ppc_load (code, ppc_r11, inst->inst_offset);
-                                                       ppc_stptr_indexed (code, ppc_r0, inst->inst_basereg, ppc_r11);
+                                                       ppc_load (code, ppc_r12, inst->inst_offset);
+                                                       ppc_stptr_indexed (code, ppc_r0, inst->inst_basereg, ppc_r12);
                                                }
                                        }
                                        break;
@@ -5022,39 +5048,39 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                        /* FIXME: we need to do the shifting here, too */
                                        if (ainfo->bytes)
                                                NOT_IMPLEMENTED;
-                                       /* load the previous stack pointer in r11 (r0 gets overwritten by the memcpy) */
-                                       ppc_ldr (code, ppc_r11, 0, ppc_sp);
+                                       /* load the previous stack pointer in r12 (r0 gets overwritten by the memcpy) */
+                                       ppc_ldr (code, ppc_r12, 0, ppc_sp);
                                        if ((size & MONO_PPC_32_64_CASE (3, 7)) != 0) {
                                                code = emit_memcpy (code, size - soffset,
                                                        inst->inst_basereg, doffset,
-                                                       ppc_r11, ainfo->offset + soffset);
+                                                       ppc_r12, ainfo->offset + soffset);
                                        } else {
                                                code = emit_memcpy (code, ainfo->vtsize * sizeof (gpointer),
                                                        inst->inst_basereg, doffset,
-                                                       ppc_r11, ainfo->offset + soffset);
+                                                       ppc_r12, ainfo->offset + soffset);
                                        }
                                }
                        } else if (ainfo->regtype == RegTypeStructByAddr) {
                                /* if it was originally a RegTypeBase */
                                if (ainfo->offset) {
-                                       /* load the previous stack pointer in r11 */
-                                       ppc_ldr (code, ppc_r11, 0, ppc_sp);
-                                       ppc_ldptr (code, ppc_r11, ainfo->offset, ppc_r11);
+                                       /* load the previous stack pointer in r12 */
+                                       ppc_ldr (code, ppc_r12, 0, ppc_sp);
+                                       ppc_ldptr (code, ppc_r12, ainfo->offset, ppc_r12);
                                } else {
-                                       ppc_mr (code, ppc_r11, ainfo->reg);
+                                       ppc_mr (code, ppc_r12, ainfo->reg);
                                }
 
                                if (cfg->tailcall_valuetype_addrs) {
                                        MonoInst *addr = cfg->tailcall_valuetype_addrs [tailcall_struct_index];
 
                                        g_assert (ppc_is_imm16 (addr->inst_offset));
-                                       ppc_stptr (code, ppc_r11, addr->inst_offset, addr->inst_basereg);
+                                       ppc_stptr (code, ppc_r12, addr->inst_offset, addr->inst_basereg);
 
                                        tailcall_struct_index++;
                                }
 
                                g_assert (ppc_is_imm16 (inst->inst_offset));
-                               code = emit_memcpy (code, ainfo->vtsize, inst->inst_basereg, inst->inst_offset, ppc_r11, 0);
+                               code = emit_memcpy (code, ainfo->vtsize, inst->inst_basereg, inst->inst_offset, ppc_r12, 0);
                                /*g_print ("copy in %s: %d bytes from %d to offset: %d\n", method->name, ainfo->vtsize, ainfo->reg, inst->inst_offset);*/
                        } else
                                g_assert_not_reached ();
@@ -5075,8 +5101,8 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                        mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, 
                                     (gpointer)"mono_get_lmf_addr");
                        if ((FORCE_INDIR_CALL || cfg->method->dynamic) && !cfg->compile_aot) {
-                               ppc_load_func (code, ppc_r0, 0);
-                               ppc_mtlr (code, ppc_r0);
+                               ppc_load_func (code, PPC_CALL_REG, 0);
+                               ppc_mtlr (code, PPC_CALL_REG);
                                ppc_blrl (code);
                        } else {
                                ppc_bl (code, 0);
@@ -5086,25 +5112,25 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                /* lmf_offset is the offset from the previous stack pointer,
                 * alloc_size is the total stack space allocated, so the offset
                 * of MonoLMF from the current stack ptr is alloc_size - lmf_offset.
-                * The pointer to the struct is put in ppc_r11 (new_lmf).
+                * The pointer to the struct is put in ppc_r12 (new_lmf).
                 * The callee-saved registers are already in the MonoLMF structure
                 */
-               ppc_addi (code, ppc_r11, ppc_sp, alloc_size - lmf_offset);
+               ppc_addi (code, ppc_r12, ppc_sp, alloc_size - lmf_offset);
                /* ppc_r3 is the result from mono_get_lmf_addr () */
-               ppc_stptr (code, ppc_r3, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r11);
+               ppc_stptr (code, ppc_r3, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r12);
                /* new_lmf->previous_lmf = *lmf_addr */
                ppc_ldptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r3);
-               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r11);
-               /* *(lmf_addr) = r11 */
-               ppc_stptr (code, ppc_r11, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r3);
+               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r12);
+               /* *(lmf_addr) = r12 */
+               ppc_stptr (code, ppc_r12, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r3);
                /* save method info */
                if (cfg->compile_aot)
                        // FIXME:
                        ppc_load (code, ppc_r0, 0);
                else
                        ppc_load_ptr (code, ppc_r0, method);
-               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, method), ppc_r11);
-               ppc_stptr (code, ppc_sp, G_STRUCT_OFFSET(MonoLMF, ebp), ppc_r11);
+               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, method), ppc_r12);
+               ppc_stptr (code, ppc_sp, G_STRUCT_OFFSET(MonoLMF, ebp), ppc_r12);
                /* save the current IP */
                if (cfg->compile_aot) {
                        ppc_bl (code, 1);
@@ -5117,7 +5143,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                        ppc_load_sequence (code, ppc_r0, (gulong)0x01010101L);
 #endif
                }
-               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, eip), ppc_r11);
+               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, eip), ppc_r12);
        }
 
        if (tracing)
@@ -5169,21 +5195,21 @@ mono_arch_emit_epilog (MonoCompile *cfg)
                lmf_offset = pos;
                /* save the frame reg in r8 */
                ppc_mr (code, ppc_r8, cfg->frame_reg);
-               ppc_addi (code, ppc_r11, cfg->frame_reg, cfg->stack_usage - lmf_offset);
+               ppc_addi (code, ppc_r12, cfg->frame_reg, cfg->stack_usage - lmf_offset);
                /* r5 = previous_lmf */
-               ppc_ldptr (code, ppc_r5, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r11);
+               ppc_ldptr (code, ppc_r5, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r12);
                /* r6 = lmf_addr */
-               ppc_ldptr (code, ppc_r6, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r11);
+               ppc_ldptr (code, ppc_r6, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r12);
                /* *(lmf_addr) = previous_lmf */
                ppc_stptr (code, ppc_r5, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r6);
                /* FIXME: speedup: there is no actual need to restore the registers if
                 * we didn't actually change them (idea from Zoltan).
                 */
                /* restore iregs */
-               ppc_ldr_multiple (code, ppc_r13, G_STRUCT_OFFSET(MonoLMF, iregs), ppc_r11);
+               ppc_ldr_multiple (code, ppc_r13, G_STRUCT_OFFSET(MonoLMF, iregs), ppc_r12);
                /* restore fregs */
                /*for (i = 14; i < 32; i++) {
-                       ppc_lfd (code, i, G_STRUCT_OFFSET(MonoLMF, fregs) + ((i-14) * sizeof (gdouble)), ppc_r11);
+                       ppc_lfd (code, i, G_STRUCT_OFFSET(MonoLMF, fregs) + ((i-14) * sizeof (gdouble)), ppc_r12);
                }*/
                g_assert (ppc_is_imm16 (cfg->stack_usage + PPC_RET_ADDR_OFFSET));
                /* use the saved copy of the frame reg in r8 */
@@ -5198,8 +5224,8 @@ mono_arch_emit_epilog (MonoCompile *cfg)
                        if (ppc_is_imm16 (return_offset)) {
                                ppc_ldr (code, ppc_r0, return_offset, cfg->frame_reg);
                        } else {
-                               ppc_load (code, ppc_r11, return_offset);
-                               ppc_ldr_indexed (code, ppc_r0, cfg->frame_reg, ppc_r11);
+                               ppc_load (code, ppc_r12, return_offset);
+                               ppc_ldr_indexed (code, ppc_r0, cfg->frame_reg, ppc_r12);
                        }
                        ppc_mtlr (code, ppc_r0);
                }
@@ -5210,7 +5236,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
                                        offset -= sizeof (mgreg_t);
                        }
                        if (cfg->frame_reg != ppc_sp)
-                               ppc_mr (code, ppc_r11, cfg->frame_reg);
+                               ppc_mr (code, ppc_r12, cfg->frame_reg);
                        /* note r31 (possibly the frame register) is restored last */
                        for (i = 13; i <= 31; i++) {
                                if (cfg->used_int_regs & (1 << i)) {
@@ -5219,22 +5245,22 @@ mono_arch_emit_epilog (MonoCompile *cfg)
                                }
                        }
                        if (cfg->frame_reg != ppc_sp)
-                               ppc_addi (code, ppc_sp, ppc_r11, cfg->stack_usage);
+                               ppc_addi (code, ppc_sp, ppc_r12, cfg->stack_usage);
                        else
                                ppc_addi (code, ppc_sp, ppc_sp, cfg->stack_usage);
                } else {
-                       ppc_load32 (code, ppc_r11, cfg->stack_usage);
+                       ppc_load32 (code, ppc_r12, cfg->stack_usage);
                        if (cfg->used_int_regs) {
-                               ppc_add (code, ppc_r11, cfg->frame_reg, ppc_r11);
+                               ppc_add (code, ppc_r12, cfg->frame_reg, ppc_r12);
                                for (i = 31; i >= 13; --i) {
                                        if (cfg->used_int_regs & (1 << i)) {
                                                pos += sizeof (mgreg_t);
-                                               ppc_ldr (code, i, -pos, ppc_r11);
+                                               ppc_ldr (code, i, -pos, ppc_r12);
                                        }
                                }
-                               ppc_mr (code, ppc_sp, ppc_r11);
+                               ppc_mr (code, ppc_sp, ppc_r12);
                        } else {
-                               ppc_add (code, ppc_sp, cfg->frame_reg, ppc_r11);
+                               ppc_add (code, ppc_sp, cfg->frame_reg, ppc_r12);
                        }
                }
 
@@ -5385,8 +5411,8 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
                        patch_info->data.name = "mono_arch_throw_corlib_exception";
                        patch_info->ip.i = code - cfg->native_code;
                        if (FORCE_INDIR_CALL || cfg->method->dynamic) {
-                               ppc_load_func (code, ppc_r0, 0);
-                               ppc_mtctr (code, ppc_r0);
+                               ppc_load_func (code, PPC_CALL_REG, 0);
+                               ppc_mtctr (code, PPC_CALL_REG);
                                ppc_bcctr (code, PPC_BR_ALWAYS, 0);
                        } else {
                                ppc_bl (code, 0);
@@ -5621,15 +5647,15 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
        start = code;
 
        /*
-        * We need to save and restore r11 because it might be
+        * We need to save and restore r12 because it might be
         * used by the caller as the vtable register, so
         * clobbering it will trip up the magic trampoline.
         *
-        * FIXME: Get rid of this by making sure that r11 is
+        * FIXME: Get rid of this by making sure that r12 is
         * not used as the vtable register in interface calls.
         */
-       ppc_stptr (code, ppc_r11, PPC_RET_ADDR_OFFSET, ppc_sp);
-       ppc_load (code, ppc_r11, (gsize)(& (vtable->vtable [0])));
+       ppc_stptr (code, ppc_r12, PPC_RET_ADDR_OFFSET, ppc_sp);
+       ppc_load (code, ppc_r12, (gsize)(& (vtable->vtable [0])));
 
        for (i = 0; i < count; ++i) {
                MonoIMTCheckItem *item = imt_entries [i];
@@ -5645,8 +5671,8 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
                                if (item->has_target_code) {
                                        ppc_load_ptr (code, ppc_r0, item->value.target_code);
                                } else {
-                                       ppc_ldptr (code, ppc_r0, (sizeof (gpointer) * item->value.vtable_slot), ppc_r11);
-                                       ppc_ldptr (code, ppc_r11, PPC_RET_ADDR_OFFSET, ppc_sp);
+                                       ppc_ldptr (code, ppc_r0, (sizeof (gpointer) * item->value.vtable_slot), ppc_r12);
+                                       ppc_ldptr (code, ppc_r12, PPC_RET_ADDR_OFFSET, ppc_sp);
                                }
                                ppc_mtctr (code, ppc_r0);
                                ppc_bcctr (code, PPC_BR_ALWAYS, 0);
@@ -5678,8 +5704,8 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
                                        item->jmp_code = code;
                                        ppc_bc (code, PPC_BR_FALSE, PPC_BR_EQ, 0);
 #endif
-                                       ppc_ldptr (code, ppc_r0, (sizeof (gpointer) * item->value.vtable_slot), ppc_r11);
-                                       ppc_ldptr (code, ppc_r11, PPC_RET_ADDR_OFFSET, ppc_sp);
+                                       ppc_ldptr (code, ppc_r0, (sizeof (gpointer) * item->value.vtable_slot), ppc_r12);
+                                       ppc_ldptr (code, ppc_r12, PPC_RET_ADDR_OFFSET, ppc_sp);
                                        ppc_mtctr (code, ppc_r0);
                                        ppc_bcctr (code, PPC_BR_ALWAYS, 0);
 #if ENABLE_WRONG_METHOD_CHECK
@@ -5804,17 +5830,17 @@ mono_arch_emit_load_got_addr (guint8 *start, guint8 *code, MonoCompile *cfg, Mon
  *   Emit code to load the contents of the GOT slot identified by TRAMP_TYPE and
  * TARGET from the mscorlib GOT in full-aot code.
  * On PPC, the GOT address is assumed to be in r30, and the result is placed into 
- * r11.
+ * r12.
  */
 guint8*
 mono_arch_emit_load_aotconst (guint8 *start, guint8 *code, MonoJumpInfo **ji, int tramp_type, gconstpointer target)
 {
        /* Load the mscorlib got address */
-       ppc_ldptr (code, ppc_r11, sizeof (gpointer), ppc_r30);
+       ppc_ldptr (code, ppc_r12, sizeof (gpointer), ppc_r30);
        *ji = mono_patch_info_list_prepend (*ji, code - start, tramp_type, target);
        /* arch_emit_got_access () patches this */
        ppc_load32 (code, ppc_r0, 0);
-       ppc_ldptr_indexed (code, ppc_r11, ppc_r11, ppc_r0);
+       ppc_ldptr_indexed (code, ppc_r12, ppc_r12, ppc_r0);
 
        return code;
 }
@@ -5837,8 +5863,8 @@ mono_arch_set_breakpoint (MonoJitInfo *ji, guint8 *ip)
        guint8 *code = ip;
        guint8 *orig_code = code;
 
-       ppc_load_sequence (code, ppc_r11, (gsize)bp_trigger_page);
-       ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+       ppc_load_sequence (code, ppc_r12, (gsize)bp_trigger_page);
+       ppc_ldptr (code, ppc_r12, 0, ppc_r12);
 
        g_assert (code - orig_code == BREAKPOINT_SIZE);
 
index 4b39b7ac2230065934bde90bf523b94f52998571..2a9af123de4d3d816136fb52c5d504b2e09c7517 100644 (file)
@@ -68,7 +68,13 @@ typedef struct MonoCompileArch {
 #ifdef __mono_ppc64__
 #define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
 #define MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS
+
+/* ELFv2 ABI doesn't use function descriptors.  */
+#if _CALL_ELF == 2
+#undef PPC_USES_FUNCTION_DESCRIPTOR
+#else
 #define PPC_USES_FUNCTION_DESCRIPTOR
+#endif
 
 #ifndef __mono_ilp32__
 #define MONO_ARCH_HAVE_TLS_GET 1
@@ -93,11 +99,10 @@ typedef struct MonoCompileArch {
 
 #define MONO_ARCH_EMULATE_LCONV_TO_R8_UN 1
 #define MONO_ARCH_EMULATE_FREM 1
-#define MONO_ARCH_BIGMUL_INTRINS 1
 #define MONO_ARCH_GC_MAPS_SUPPORTED 1
 
 /* Parameters used by the register allocator */
-#define MONO_ARCH_CALLEE_REGS ((0xff << ppc_r3) | (1 << ppc_r11) | (1 << ppc_r12))
+#define MONO_ARCH_CALLEE_REGS ((0xff << ppc_r3) | (1 << ppc_r12) | (1 << ppc_r11))
 #define MONO_ARCH_CALLEE_SAVED_REGS (0xfffff << ppc_r13) /* ppc_13 - ppc_31 */
 
 #if defined(__APPLE__) || defined(__mono_ppc64__)
@@ -147,7 +152,6 @@ typedef struct MonoCompileArch {
 #define PPC_MINIMAL_PARAM_AREA_SIZE 64
 #define PPC_LAST_FPARG_REG ppc_f13
 #define PPC_PASS_STRUCTS_BY_VALUE 1
-#define PPC_SMALL_RET_STRUCT_IN_REG 0
 #define PPC_THREAD_PTR_REG ppc_r13
 #else
 #define PPC_RET_ADDR_OFFSET 4
@@ -156,7 +160,6 @@ typedef struct MonoCompileArch {
 #define PPC_MINIMAL_PARAM_AREA_SIZE 0
 #define PPC_LAST_FPARG_REG ppc_f8
 #define PPC_PASS_STRUCTS_BY_VALUE 0
-#define PPC_SMALL_RET_STRUCT_IN_REG 1
 #define PPC_THREAD_PTR_REG ppc_r2
 #endif
 #define PPC_FIRST_ARG_REG ppc_r3
@@ -164,15 +167,17 @@ typedef struct MonoCompileArch {
 #define PPC_FIRST_FPARG_REG ppc_f1
 #endif
 
+#define PPC_CALL_REG ppc_r12
+
 #if defined(HAVE_WORKING_SIGALTSTACK) && !defined(__APPLE__)
 #define MONO_ARCH_SIGSEGV_ON_ALTSTACK 1
 #define MONO_ARCH_SIGNAL_STACK_SIZE (12 * 1024)
 #endif /* HAVE_WORKING_SIGALTSTACK */
 
 #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
-#define MONO_ARCH_IMT_REG ppc_r12
+#define MONO_ARCH_IMT_REG ppc_r11
 
-#define MONO_ARCH_VTABLE_REG   ppc_r12
+#define MONO_ARCH_VTABLE_REG   ppc_r11
 #define MONO_ARCH_RGCTX_REG    MONO_ARCH_IMT_REG
 
 #define MONO_ARCH_NO_IOV_CHECK 1
@@ -194,7 +199,6 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_HAVE_OP_TAIL_CALL 1
 
 #define PPC_NUM_REG_ARGS (PPC_LAST_ARG_REG-PPC_FIRST_ARG_REG+1)
-#define PPC_NUM_REG_FPARGS (PPC_LAST_FPARG_REG-PPC_FIRST_FPARG_REG+1)
 
 #ifdef MONO_CROSS_COMPILE
 
index d84c87860d1f95b652405201c0823ed719a62097..a1618c932ebf84d95e0989029c0a4cdac80b0637 100644 (file)
@@ -4072,6 +4072,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_NOT_NULL: {
                }
                        break;
+               case OP_IL_SEQ_POINT:
+                       mono_add_seq_point (cfg, bb, ins, code - cfg->native_code);
+                       break;
                case OP_SEQ_POINT: {
                        int i;
 
index b40425c647861be96ad3c1c0c6d9fa5475b8b929..7de88fdf1e2ca5018981c576fb841f1a12df9cf0 100644 (file)
@@ -68,11 +68,6 @@ typedef struct
 #define S390_LAST_ARG_REG              s390_r6
 #define S390_FIRST_FPARG_REG           s390_f0
 #define S390_LAST_FPARG_REG            s390_f6
-#define S390_PASS_STRUCTS_BY_VALUE      1
-#define S390_SMALL_RET_STRUCT_IN_REG    1
-
-#define S390_NUM_REG_ARGS (S390_LAST_ARG_REG-S390_FIRST_ARG_REG+1)
-#define S390_NUM_REG_FPARGS ((S390_LAST_FPARG_REG-S390_FIRST_FPARG_REG)/2)
 
 /*===============================================*/
 /* Definitions used by mini-codegen.c            */
@@ -115,8 +110,6 @@ typedef struct
 #define MONO_ARCH_FRAME_ALIGNMENT 8
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_RETREG1 s390_r2
-
 /*-----------------------------------------------*/
 /* Macros used to generate instructions          */
 /*-----------------------------------------------*/
index ab8e452b70e93292e1bced3f59298445fbc75cd2..2c9d8772f68d2777de68676b49c0092ca5834215 100644 (file)
@@ -57,8 +57,6 @@
 
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_RETREG1 sparc_i0
-
 #ifdef SPARCV9
 #define MONO_SPARC_STACK_BIAS 2047
 #else
index a2c9f49805dbf617c500af6139e3cdf5c9bdc99e..1085cbe0e3fcd3e4151a55978bc28c0d3fdf986e 100644 (file)
@@ -82,11 +82,11 @@ typedef struct {
  */
 
 /* Set cfa to reg+offset */
-#define mono_emit_unwind_op_def_cfa(cfg,ip,reg,offset) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa, (reg), (offset)); (cfg)->cfa_reg = (reg); (cfg)->cfa_offset = (offset); } while (0)
+#define mono_emit_unwind_op_def_cfa(cfg,ip,reg,offset) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa, (reg), (offset)); (cfg)->cur_cfa_reg = (reg); (cfg)->cur_cfa_offset = (offset); } while (0)
 /* Set cfa to reg+existing offset */
-#define mono_emit_unwind_op_def_cfa_reg(cfg,ip,reg) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa_register, (reg), (0)); (cfg)->cfa_reg = (reg); } while (0)
+#define mono_emit_unwind_op_def_cfa_reg(cfg,ip,reg) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa_register, (reg), (0)); (cfg)->cur_cfa_reg = (reg); } while (0)
 /* Set cfa to existing reg+offset */
-#define mono_emit_unwind_op_def_cfa_offset(cfg,ip,offset) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa_offset, (0), (offset)); (cfg)->cfa_offset = (offset); } while (0)
+#define mono_emit_unwind_op_def_cfa_offset(cfg,ip,offset) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa_offset, (0), (offset)); (cfg)->cur_cfa_offset = (offset); } while (0)
 /* Reg is the same as it was on enter to the function */
 #define mono_emit_unwind_op_same_value(cfg,ip,reg) mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_same_value, (reg), 0)
 /* Reg is saved at cfa+offset */
index 77bc6b7241f44bd119e1c9b6c0be98535582e80d..e4415df43fafc31b378379671f8ff6abd6672305 100644 (file)
@@ -2761,6 +2761,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_NOT_REACHED:
                case OP_NOT_NULL:
                        break;
+               case OP_IL_SEQ_POINT:
+                       mono_add_seq_point (cfg, bb, ins, code - cfg->native_code);
+                       break;
                case OP_SEQ_POINT: {
                        int i;
 
@@ -6101,8 +6104,7 @@ get_delegate_invoke_impl (gboolean has_target, guint32 param_count, guint32 *cod
                g_assert ((code - start) < code_reserve);
        }
 
-       nacl_global_codeman_validate(&start, code_reserve, &code);
-       mono_debug_add_delegate_trampoline (start, code - start);
+       nacl_global_codeman_validate (&start, code_reserve, &code);
 
        if (code_len)
                *code_len = code - start;
index f6ddc930427da887278d6b004076d4d0e52e40d5..2d9df6a3495ec9ae3b5f0a74c0a3c70ef6565a91 100644 (file)
@@ -134,9 +134,6 @@ struct sigcontext {
  * reproduceable results for benchmarks */
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_RETREG1 X86_EAX
-#define MONO_ARCH_RETREG2 X86_EDX
-
 /*This is the max size of the locals area of a given frame. I think 1MB is a safe default for now*/
 #define MONO_ARCH_MAX_FRAME_SIZE 0x100000
 
@@ -201,7 +198,6 @@ typedef struct {
 /* Enables OP_LSHL, OP_LSHL_IMM, OP_LSHR, OP_LSHR_IMM, OP_LSHR_UN, OP_LSHR_UN_IMM */
 #define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
 
-#define MONO_ARCH_BIGMUL_INTRINS 1
 #define MONO_ARCH_NEED_DIV_CHECK 1
 #define MONO_ARCH_HAVE_IS_INT_OVERFLOW 1
 #define MONO_ARCH_HAVE_INVALIDATE_METHOD 1
index a93fe7b550c1730c86377e76652fb3456ba57768..f876ce3ea5c5e30c9eff8506e15d0c87eca36806 100755 (executable)
@@ -64,6 +64,7 @@
 #include <mono/utils/mono-threads.h>
 
 #include "mini.h"
+#include "seq-points.h"
 #include "mini-llvm.h"
 #include "tasklets.h"
 #include <string.h>
@@ -76,6 +77,7 @@
 
 #include "mini-gc.h"
 #include "debugger-agent.h"
+#include "seq-points.h"
 
 static gpointer mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoException **ex);
 
@@ -711,10 +713,11 @@ G_GNUC_UNUSED gboolean
 mono_debug_count (void)
 {
        static int count = 0;
-       count ++;
        static gboolean inited;
        static const char *value;
 
+       count ++;
+
        if (!inited) {
                value = g_getenv ("COUNT");
                inited = TRUE;
@@ -3920,159 +3923,6 @@ mono_postprocess_patches (MonoCompile *cfg)
        }
 }
 
-static void
-collect_pred_seq_points (MonoBasicBlock *bb, MonoInst *ins, GSList **next, int depth)
-{
-       int i;
-       MonoBasicBlock *in_bb;
-       GSList *l;
-
-       for (i = 0; i < bb->in_count; ++i) {
-               in_bb = bb->in_bb [i];
-
-               if (in_bb->last_seq_point) {
-                       int src_index = in_bb->last_seq_point->backend.size;
-                       int dst_index = ins->backend.size;
-
-                       /* bb->in_bb might contain duplicates */
-                       for (l = next [src_index]; l; l = l->next)
-                               if (GPOINTER_TO_UINT (l->data) == dst_index)
-                                       break;
-                       if (!l)
-                               next [src_index] = g_slist_append (next [src_index], GUINT_TO_POINTER (dst_index));
-               } else {
-                       /* Have to look at its predecessors */
-                       if (depth < 5)
-                               collect_pred_seq_points (in_bb, ins, next, depth + 1);
-               }
-       }
-}
-
-static void
-mono_save_seq_point_info (MonoCompile *cfg)
-{
-       MonoBasicBlock *bb;
-       GSList *bb_seq_points, *l;
-       MonoInst *last;
-       MonoDomain *domain = cfg->domain;
-       int i;
-       MonoSeqPointInfo *info;
-       GSList **next;
-
-       if (!cfg->seq_points)
-               return;
-
-       info = g_malloc0 (sizeof (MonoSeqPointInfo) + (cfg->seq_points->len * sizeof (SeqPoint)));
-       info->len = cfg->seq_points->len;
-       for (i = 0; i < cfg->seq_points->len; ++i) {
-               SeqPoint *sp = &info->seq_points [i];
-               MonoInst *ins = g_ptr_array_index (cfg->seq_points, i);
-
-               sp->il_offset = ins->inst_imm;
-               sp->native_offset = ins->inst_offset;
-               if (ins->flags & MONO_INST_NONEMPTY_STACK)
-                       sp->flags |= MONO_SEQ_POINT_FLAG_NONEMPTY_STACK;
-
-               /* Used below */
-               ins->backend.size = i;
-       }
-
-       /*
-        * For each sequence point, compute the list of sequence points immediately
-        * following it, this is needed to implement 'step over' in the debugger agent.
-        */ 
-       next = g_new0 (GSList*, cfg->seq_points->len);
-       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-               bb_seq_points = g_slist_reverse (bb->seq_points);
-               last = NULL;
-               for (l = bb_seq_points; l; l = l->next) {
-                       MonoInst *ins = l->data;
-
-                       if (ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET)
-                               /* Used to implement method entry/exit events */
-                               continue;
-                       if (ins->inst_offset == SEQ_POINT_NATIVE_OFFSET_DEAD_CODE)
-                               continue;
-
-                       if (last != NULL) {
-                               /* Link with the previous seq point in the same bb */
-                               next [last->backend.size] = g_slist_append (next [last->backend.size], GUINT_TO_POINTER (ins->backend.size));
-                       } else {
-                               /* Link with the last bb in the previous bblocks */
-                               collect_pred_seq_points (bb, ins, next, 0);
-                       }
-
-                       last = ins;
-               }
-
-               if (bb->last_ins && bb->last_ins->opcode == OP_ENDFINALLY && bb->seq_points) {
-                       MonoBasicBlock *bb2;
-                       MonoInst *endfinally_seq_point = NULL;
-
-                       /*
-                        * The ENDFINALLY branches are not represented in the cfg, so link it with all seq points starting bbs.
-                        */
-                       l = g_slist_last (bb->seq_points);
-                       if (l) {
-                               endfinally_seq_point = l->data;
-
-                               for (bb2 = cfg->bb_entry; bb2; bb2 = bb2->next_bb) {
-                                       GSList *l = g_slist_last (bb2->seq_points);
-
-                                       if (l) {
-                                               MonoInst *ins = l->data;
-
-                                               if (!(ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET) && ins != endfinally_seq_point)
-                                                       next [endfinally_seq_point->backend.size] = g_slist_append (next [endfinally_seq_point->backend.size], GUINT_TO_POINTER (ins->backend.size));
-                                       }
-                               }
-                       }
-               }
-       }
-
-       if (cfg->verbose_level > 2) {
-               printf ("\nSEQ POINT MAP: \n");
-       }
-
-       for (i = 0; i < cfg->seq_points->len; ++i) {
-               SeqPoint *sp = &info->seq_points [i];
-               GSList *l;
-               int j, next_index;
-
-               sp->next_len = g_slist_length (next [i]);
-               sp->next = g_new (int, sp->next_len);
-               j = 0;
-               if (cfg->verbose_level > 2 && next [i]) {
-                       printf ("\tIL0x%x ->", sp->il_offset);
-                       for (l = next [i]; l; l = l->next) {
-                               next_index = GPOINTER_TO_UINT (l->data);
-                               printf (" IL0x%x", info->seq_points [next_index].il_offset);
-                       }
-                       printf ("\n");
-               }
-               for (l = next [i]; l; l = l->next) {
-                       next_index = GPOINTER_TO_UINT (l->data);
-                       sp->next [j ++] = next_index;
-               }
-               g_slist_free (next [i]);
-       }
-       g_free (next);
-
-       cfg->seq_point_info = info;
-
-       // FIXME: dynamic methods
-       if (!cfg->compile_aot) {
-               mono_domain_lock (domain);
-               // FIXME: How can the lookup succeed ?
-               if (!g_hash_table_lookup (domain_jit_info (domain)->seq_points, cfg->method_to_register))
-                       g_hash_table_insert (domain_jit_info (domain)->seq_points, cfg->method_to_register, info);
-               mono_domain_unlock (domain);
-       }
-
-       g_ptr_array_free (cfg->seq_points, TRUE);
-       cfg->seq_points = NULL;
-}
-
 void
 mono_codegen (MonoCompile *cfg)
 {
@@ -4124,6 +3974,8 @@ mono_codegen (MonoCompile *cfg)
 
        cfg->code_len = code - cfg->native_code;
        cfg->prolog_end = cfg->code_len;
+       cfg->cfa_reg = cfg->cur_cfa_reg;
+       cfg->cfa_offset = cfg->cur_cfa_offset;
 
        mono_debug_open_method (cfg);
 
@@ -4647,7 +4499,7 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
 
                        info = mono_jit_info_get_arch_eh_info (jinfo);
                        g_assert (info);
-                       info->epilog_size = cfg->epilog_end - cfg->epilog_begin;
+                       info->epilog_size = cfg->code_len - cfg->epilog_begin;
                }
                jinfo->unwind_info = unwind_desc;
                g_free (unwind_info);
@@ -4998,7 +4850,9 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
        cfg->full_aot = full_aot;
        cfg->skip_visibility = method->skip_visibility;
        cfg->orig_method = method;
-       cfg->gen_seq_points = debug_options.gen_seq_points;
+       cfg->gen_seq_points = TRUE;
+       cfg->gen_seq_points_debug_data = debug_options.gen_seq_points_debug_data;
+
        cfg->explicit_null_checks = debug_options.explicit_null_checks;
        cfg->soft_breakpoints = debug_options.soft_breakpoints;
        cfg->check_pinvoke_callconv = debug_options.check_pinvoke_callconv;
@@ -5431,7 +5285,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
        */
 
 //#define DEBUGSSA "logic_run"
-#define DEBUGSSA_CLASS "Tests"
+//#define DEBUGSSA_CLASS "Tests"
 #ifdef DEBUGSSA
 
        if (!cfg->disable_ssa) {
@@ -7061,7 +6915,7 @@ mini_parse_debug_options (void)
                else if (!strcmp (arg, "explicit-null-checks"))
                        debug_options.explicit_null_checks = TRUE;
                else if (!strcmp (arg, "gen-seq-points"))
-                       debug_options.gen_seq_points = TRUE;
+                       debug_options.gen_seq_points_debug_data = TRUE;
                else if (!strcmp (arg, "init-stacks"))
                        debug_options.init_stacks = TRUE;
                else if (!strcmp (arg, "casts"))
@@ -7091,10 +6945,9 @@ mini_get_debug_options (void)
 static gpointer
 mini_create_ftnptr (MonoDomain *domain, gpointer addr)
 {
-#if !defined(__ia64__) && !defined(__ppc64__) && !defined(__powerpc64__)
+#if !defined(__ia64__) && (!defined(__ppc64__) && !defined(__powerpc64__) || _CALL_ELF == 2)
        return addr;
 #else
-
        gpointer* desc = NULL;
 
        if ((desc = g_hash_table_lookup (domain->ftnptrs_hash, addr)))
@@ -7120,7 +6973,7 @@ mini_create_ftnptr (MonoDomain *domain, gpointer addr)
 static gpointer
 mini_get_addr_from_ftnptr (gpointer descr)
 {
-#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__)
+#if defined(__ia64__) || ((defined(__ppc64__) || defined(__powerpc64__)) && _CALL_ELF != 2)
        return *(gpointer*)descr;
 #else
        return descr;
@@ -7140,6 +6993,7 @@ register_jit_stats (void)
        mono_counters_register ("Allocated vars", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.allocate_var);
        mono_counters_register ("Code reallocs", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.code_reallocs);
        mono_counters_register ("Allocated code size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.allocated_code_size);
+       mono_counters_register ("Allocated seq points size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.allocated_seq_points_size);
        mono_counters_register ("Inlineable methods", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.inlineable_methods);
        mono_counters_register ("Inlined methods", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.inlined_methods);
        mono_counters_register ("Regvars", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.regvars);
@@ -7154,7 +7008,6 @@ register_jit_stats (void)
 }
 
 static void runtime_invoke_info_free (gpointer value);
-static void seq_point_info_free (gpointer value);
 
 static gint
 class_method_pair_equal (gconstpointer ka, gconstpointer kb)
@@ -7225,19 +7078,6 @@ runtime_invoke_info_free (gpointer value)
        g_free (info);
 }
 
-static void seq_point_info_free (gpointer value)
-{
-       int i = 0;
-       MonoSeqPointInfo* info = (MonoSeqPointInfo*)value;
-       
-       for (i = 0; i < info->len; ++i) {
-               SeqPoint *sp = &info->seq_points [i];
-               g_free (sp->next);
-       }
-
-       g_free (info);
-}
-
 static void
 mini_free_jit_domain_info (MonoDomain *domain)
 {
index a5c5484b59a5424ea1b084115943fd111995cfa5..2169a79423f1b5440e27fd30fd9736a56b807dc8 100755 (executable)
 #endif
 
 /* Version number of the AOT file format */
-#define MONO_AOT_FILE_VERSION 103
+#define MONO_AOT_FILE_VERSION 104
 
 //TODO: This is x86/amd64 specific.
 #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6))
 #define printf g_print
 #endif
 
-#if !defined(HAVE_KW_THREAD) || !defined(MONO_ARCH_ENABLE_MONO_LMF_VAR)
-#define MONO_JIT_TLS_DATA_HAS_LMF
-#endif
-
 #define MONO_TYPE_IS_PRIMITIVE(t) ((!(t)->byref && ((((t)->type >= MONO_TYPE_BOOLEAN && (t)->type <= MONO_TYPE_R8) || ((t)->type >= MONO_TYPE_I && (t)->type <= MONO_TYPE_U)))))
 
 /* Constants used to encode different types of methods in AOT */
@@ -333,34 +329,13 @@ typedef struct {
  */
 typedef MonoStackFrameInfo StackFrameInfo;
 
-#define MONO_SEQ_POINT_FLAG_NONEMPTY_STACK 1
-
-typedef struct {
-       int il_offset, native_offset, flags;
-       /* Indexes of successor sequence points */
-       int *next;
-       /* Number of entries in next */
-       int next_len;
-} SeqPoint;
-
-typedef struct {
-       int len;
-       SeqPoint seq_points [MONO_ZERO_LEN_ARRAY];
-} MonoSeqPointInfo;
-
 #if 0
 #define mono_bitset_foreach_bit(set,b,n) \
        for (b = 0; b < n; b++)\
                if (mono_bitset_test_fast(set,b))
-#define mono_bitset_foreach_bit_rev(set,b,n) \
-       for (b = n - 1; b >= 0; b--)\
-               if (mono_bitset_test_fast(set,b))
 #else
 #define mono_bitset_foreach_bit(set,b,n) \
        for (b = mono_bitset_find_start (set); b < n && b >= 0; b = mono_bitset_find_first (set, b))
-#define mono_bitset_foreach_bit_rev(set,b,n) \
-       for (b = mono_bitset_find_last (set, n - 1); b >= 0; b = b ? mono_bitset_find_last (set, b) : -1)
 #endif
 
 /*
@@ -397,11 +372,6 @@ enum {
         (dest)->inst.cil_code = (cfg)->ip;  \
        } while (0)
 
-#define MONO_INST_NEW_CALL_ARG(cfg,dest,op) do {       \
-               (dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoCallArgParm));        \
-               (dest)->ins.opcode = (op);      \
-       } while (0)
-
 #define MONO_ADD_INS(b,inst) do {      \
                if ((b)->last_ins) {    \
                        (b)->last_ins->next = (inst);   \
@@ -1503,6 +1473,7 @@ typedef struct {
        guint            uses_simd_intrinsics : 1;
        guint            keep_cil_nops : 1;
        guint            gen_seq_points : 1;
+       guint            gen_seq_points_debug_data : 1;
        guint            explicit_null_checks : 1;
        guint            compute_gc_maps : 1;
        guint            soft_breakpoints : 1;
@@ -1598,7 +1569,7 @@ typedef struct {
        GPtrArray *seq_points;
 
        /* The encoded sequence point info */
-       MonoSeqPointInfo *seq_point_info;
+       struct MonoSeqPointInfo *seq_point_info;
 
        /* Method headers which need to be freed after compilation */
        GSList *headers_to_free;
@@ -1627,6 +1598,9 @@ typedef struct {
        /* The offsets of the locals area relative to the frame pointer */
        gint locals_min_stack_offset, locals_max_stack_offset;
 
+       /* The current CFA rule */
+       int cur_cfa_reg, cur_cfa_offset;
+
        /* The final CFA rule at the end of the prolog */
        int cfa_reg, cfa_offset;
 
@@ -1678,6 +1652,7 @@ typedef struct {
        gint32 max_code_size_ratio;
        gint32 biggest_method_size;
        gint32 allocated_code_size;
+       gint32 allocated_seq_points_size;
        gint32 inlineable_methods;
        gint32 inlined_methods;
        gint32 basic_blocks;
@@ -1856,7 +1831,11 @@ typedef struct {
        gboolean suspend_on_unhandled;
        gboolean dyn_runtime_invoke;
        gboolean gdb;
-       gboolean gen_seq_points;
+       /*
+        * Whenever data such as next sequence points and flags is required.
+        * Next sequence points and flags are required by the debugger agent.
+        */
+       gboolean gen_seq_points_debug_data;
        gboolean explicit_null_checks;
        /*
         * Fill stack frames with 0x2a in method prologs. This helps with the
@@ -2758,8 +2737,6 @@ enum {
        SIMD_VERSION_INDEX_END = 6 
 };
 
-#define MASK(x) (1 << x)
-
 enum {
        SIMD_COMP_EQ,
        SIMD_COMP_LT,
diff --git a/mono/mini/seq-points.c b/mono/mini/seq-points.c
new file mode 100644 (file)
index 0000000..3162157
--- /dev/null
@@ -0,0 +1,626 @@
+/*
+ * seq-points.c: Sequence Points functions
+ *
+ * Authors:
+ *   Marcos Henrich (marcos.henrich@xamarin.com)
+ *
+ * Copyright 2014 Xamarin, Inc (http://www.xamarin.com)
+ */
+
+#include "mini.h"
+#include "seq-points.h"
+
+typedef struct {
+       guint8 *data;
+       int len;
+       /* When has_debug_data is set to false only il and native deltas are saved */
+       gboolean has_debug_data;
+       /* When alloc_data is set to true data allocation/deallocation is managed by this structure */
+       gboolean alloc_data;
+} SeqPointInfoInflated;
+
+static int
+encode_var_int (guint8 *buf, guint8 **out_buf, int val)
+{
+       guint8 size = 0;
+
+       do {
+               guint8 byte = val & 0x7f;
+               g_assert (size < 4 && "value has more than 28 bits");
+               val >>= 7;
+               if(val) byte |= 0x80;
+               *(buf++) = byte;
+               size++;
+       } while (val);
+
+       if (out_buf)
+               *out_buf = buf;
+
+       return size;
+}
+
+static int
+decode_var_int (guint8* buf, guint8 **out_buf)
+{
+       guint8* p = buf;
+
+       int low;
+       int b;
+       b = *(p++); low   = (b & 0x7f)      ; if(!(b & 0x80)) goto done;
+       b = *(p++); low  |= (b & 0x7f) <<  7; if(!(b & 0x80)) goto done;
+       b = *(p++); low  |= (b & 0x7f) << 14; if(!(b & 0x80)) goto done;
+       b = *(p++); low  |= (b & 0x7f) << 21; if(!(b & 0x80)) goto done;
+
+       g_assert (FALSE && "value has more than 28 bits");
+
+done:
+
+       if (out_buf)
+               *out_buf = p;
+
+       return low;
+}
+
+static guint32
+encode_zig_zag (int val)
+{
+       return (val << 1) ^ (val >> 31);
+}
+
+static int
+decode_zig_zag (guint32 val)
+{
+       int n = val;
+       return (n >> 1) ^ (-(n & 1));
+}
+
+static SeqPointInfoInflated
+seq_point_info_inflate (MonoSeqPointInfo *info)
+{
+       SeqPointInfoInflated info_inflated;
+       guint8 *ptr = (guint8*) info;
+       int value;
+
+       value = decode_var_int (ptr, &ptr);
+
+       info_inflated.len = value >> 2;
+       info_inflated.has_debug_data = (value & 1) != 0;
+       info_inflated.alloc_data = (value & 2) != 0;
+
+       if (info_inflated.alloc_data)
+               info_inflated.data = ptr;
+       else
+               memcpy (&info_inflated.data, ptr, sizeof (guint8*));
+
+       return info_inflated;
+}
+
+static MonoSeqPointInfo*
+seq_point_info_new (int len, gboolean alloc_data, guint8 *data, gboolean has_debug_data)
+{
+       MonoSeqPointInfo *info;
+       guint8 *info_ptr;
+       guint8 buffer[4];
+       int buffer_len;
+       int value;
+       int data_size;
+
+       value = len << 2;
+       if (has_debug_data)
+               value |= 1;
+       if (alloc_data)
+               value |= 2;
+
+       buffer_len = encode_var_int (buffer, NULL, value);
+
+       data_size = buffer_len + (alloc_data? len : sizeof (guint8*));
+       info_ptr = g_new0 (guint8, data_size);
+       info = (MonoSeqPointInfo*) info_ptr;
+
+       memcpy (info_ptr, buffer, buffer_len);
+       info_ptr += buffer_len;
+
+       if (alloc_data)
+               memcpy (info_ptr, data, len);
+       else
+               memcpy (info_ptr, &data, sizeof (guint8*));
+
+       mono_jit_stats.allocated_seq_points_size += data_size;
+
+       return info;
+}
+
+void
+seq_point_info_free (gpointer ptr)
+{
+       MonoSeqPointInfo* info = (MonoSeqPointInfo*) ptr;
+       g_free (info);
+}
+
+static int
+seq_point_read (SeqPoint* seq_point, guint8* ptr, guint8* buffer_ptr, gboolean has_debug_data)
+{
+       int value;
+       guint8* ptr0 = ptr;
+
+       value = decode_var_int (ptr, &ptr);
+       seq_point->il_offset += decode_zig_zag (value);
+
+       value = decode_var_int (ptr, &ptr);
+       seq_point->native_offset += decode_zig_zag (value);
+
+       if (has_debug_data) {
+               value = decode_var_int (ptr, &ptr);
+               seq_point->flags = value;
+
+               if (seq_point->flags & MONO_SEQ_POINT_FLAG_EXIT_IL)
+                       seq_point->il_offset = METHOD_EXIT_IL_OFFSET;
+
+               value = decode_var_int (ptr, &ptr);
+               seq_point->next_len = value;
+
+               if (seq_point->next_len) {
+                       // store next offset and skip it
+                       seq_point->next_offset = ptr - buffer_ptr;
+                       ptr += seq_point->next_len;
+               }
+       }
+
+       return ptr - ptr0;
+}
+
+static gboolean
+seq_point_info_add_seq_point (GByteArray* array, SeqPoint *sp, SeqPoint *last_seq_point, GSList *next, gboolean has_debug_data)
+{
+       int il_delta, native_delta;
+       GSList *l;
+       guint8 buffer[4];
+       guint8 len;
+       int flags;
+
+       if (!has_debug_data &&
+               (sp->il_offset == METHOD_ENTRY_IL_OFFSET || sp->il_offset == METHOD_EXIT_IL_OFFSET))
+               return FALSE;
+
+       il_delta = sp->il_offset - last_seq_point->il_offset;
+       native_delta = sp->native_offset - last_seq_point->native_offset;
+
+       flags = sp->flags;
+
+       if (has_debug_data && sp->il_offset == METHOD_EXIT_IL_OFFSET) {
+               il_delta = 0;
+               flags |= MONO_SEQ_POINT_FLAG_EXIT_IL;
+       }
+
+       len = encode_var_int (buffer, NULL, encode_zig_zag (il_delta));
+       g_byte_array_append (array, buffer, len);
+
+       len = encode_var_int (buffer, NULL, encode_zig_zag (native_delta));
+       g_byte_array_append (array, buffer, len);
+
+       if (has_debug_data) {
+               sp->next_offset = array->len;
+               sp->next_len = g_slist_length (next);
+
+               len = encode_var_int (buffer, NULL, flags);
+               g_byte_array_append (array, buffer, len);
+
+               len = encode_var_int (buffer, NULL, sp->next_len);
+               g_byte_array_append (array, buffer, len);
+
+               for (l = next; l; l = l->next) {
+                       int next_index = GPOINTER_TO_UINT (l->data);
+                       guint8 buffer[4];
+                       int len = encode_var_int (buffer, NULL, next_index);
+                       g_byte_array_append (array, buffer, len);
+               }
+       }
+
+       return TRUE;
+}
+
+static void
+collect_pred_seq_points (MonoBasicBlock *bb, MonoInst *ins, GSList **next, int depth)
+{
+       int i;
+       MonoBasicBlock *in_bb;
+       GSList *l;
+
+       for (i = 0; i < bb->in_count; ++i) {
+               in_bb = bb->in_bb [i];
+
+               if (in_bb->last_seq_point) {
+                       int src_index = in_bb->last_seq_point->backend.size;
+                       int dst_index = ins->backend.size;
+
+                       /* bb->in_bb might contain duplicates */
+                       for (l = next [src_index]; l; l = l->next)
+                               if (GPOINTER_TO_UINT (l->data) == dst_index)
+                                       break;
+                       if (!l)
+                               next [src_index] = g_slist_append (next [src_index], GUINT_TO_POINTER (dst_index));
+               } else {
+                       /* Have to look at its predecessors */
+                       if (depth < 5)
+                               collect_pred_seq_points (in_bb, ins, next, depth + 1);
+               }
+       }
+}
+
+void
+mono_save_seq_point_info (MonoCompile *cfg)
+{
+       MonoBasicBlock *bb;
+       GSList *bb_seq_points, *l;
+       MonoInst *last;
+       MonoDomain *domain = cfg->domain;
+       int i;
+       GSList **next = NULL;
+       SeqPoint* seq_points;
+       GByteArray* array;
+       gboolean has_debug_data = cfg->gen_seq_points_debug_data;
+
+       if (!cfg->seq_points)
+               return;
+
+       seq_points = g_new0 (SeqPoint, cfg->seq_points->len);
+
+       for (i = 0; i < cfg->seq_points->len; ++i) {
+               SeqPoint *sp = &seq_points [i];
+               MonoInst *ins = g_ptr_array_index (cfg->seq_points, i);
+
+               sp->il_offset = ins->inst_imm;
+               sp->native_offset = ins->inst_offset;
+               if (ins->flags & MONO_INST_NONEMPTY_STACK)
+                       sp->flags |= MONO_SEQ_POINT_FLAG_NONEMPTY_STACK;
+
+               /* Used below */
+               ins->backend.size = i;
+       }
+
+       if (has_debug_data) {
+               /*
+                * For each sequence point, compute the list of sequence points immediately
+                * following it, this is needed to implement 'step over' in the debugger agent.
+                */
+               next = g_new0 (GSList*, cfg->seq_points->len);
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+                       bb_seq_points = g_slist_reverse (bb->seq_points);
+                       last = NULL;
+                       for (l = bb_seq_points; l; l = l->next) {
+                               MonoInst *ins = l->data;
+
+                               if (ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET)
+                               /* Used to implement method entry/exit events */
+                                       continue;
+                               if (ins->inst_offset == SEQ_POINT_NATIVE_OFFSET_DEAD_CODE)
+                                       continue;
+
+                               if (last != NULL) {
+                                       /* Link with the previous seq point in the same bb */
+                                       next [last->backend.size] = g_slist_append (next [last->backend.size], GUINT_TO_POINTER (ins->backend.size));
+                               } else {
+                                       /* Link with the last bb in the previous bblocks */
+                                       collect_pred_seq_points (bb, ins, next, 0);
+                               }
+
+                               last = ins;
+                       }
+
+                       if (bb->last_ins && bb->last_ins->opcode == OP_ENDFINALLY && bb->seq_points) {
+                               MonoBasicBlock *bb2;
+                               MonoInst *endfinally_seq_point = NULL;
+
+                               /*
+                                * The ENDFINALLY branches are not represented in the cfg, so link it with all seq points starting bbs.
+                                */
+                               l = g_slist_last (bb->seq_points);
+                               if (l) {
+                                       endfinally_seq_point = l->data;
+
+                                       for (bb2 = cfg->bb_entry; bb2; bb2 = bb2->next_bb) {
+                                               GSList *l = g_slist_last (bb2->seq_points);
+
+                                               if (l) {
+                                                       MonoInst *ins = l->data;
+
+                                                       if (!(ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET) && ins != endfinally_seq_point)
+                                                               next [endfinally_seq_point->backend.size] = g_slist_append (next [endfinally_seq_point->backend.size], GUINT_TO_POINTER (ins->backend.size));
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               if (cfg->verbose_level > 2) {
+                       printf ("\nSEQ POINT MAP: \n");
+
+                       for (i = 0; i < cfg->seq_points->len; ++i) {
+                               SeqPoint *sp = &seq_points [i];
+                               GSList *l;
+
+                               if (!next [i])
+                                       continue;
+
+                               printf ("\tIL0x%x ->", sp->il_offset);
+                               for (l = next [i]; l; l = l->next) {
+                                       int next_index = GPOINTER_TO_UINT (l->data);
+                                       printf (" IL0x%x", seq_points [next_index].il_offset);
+                               }
+                               printf ("\n");
+                       }
+               }
+       }
+
+       array = g_byte_array_new ();
+
+       { /* Add sequence points to seq_point_info */
+               SeqPoint zero_seq_point = {0};
+               SeqPoint* last_seq_point = &zero_seq_point;
+
+               for (i = 0; i < cfg->seq_points->len; ++i) {
+                       SeqPoint *sp = &seq_points [i];
+                       GSList* next_list = NULL;
+
+                       if (has_debug_data)
+                               next_list = next[i];
+
+                       if (seq_point_info_add_seq_point (array, sp, last_seq_point, next_list, has_debug_data))
+                               last_seq_point = sp;
+
+                       if (has_debug_data)
+                               g_slist_free (next [i]);
+               }
+       }
+
+       if (has_debug_data)
+               g_free (next);
+
+       cfg->seq_point_info = seq_point_info_new (array->len, TRUE, array->data, has_debug_data);
+
+       g_byte_array_free (array, TRUE);
+
+       // FIXME: dynamic methods
+       if (!cfg->compile_aot) {
+               mono_domain_lock (domain);
+               // FIXME: How can the lookup succeed ?
+               if (!g_hash_table_lookup (domain_jit_info (domain)->seq_points, cfg->method_to_register))
+                       g_hash_table_insert (domain_jit_info (domain)->seq_points, cfg->method_to_register, cfg->seq_point_info);
+               mono_domain_unlock (domain);
+       }
+
+       g_ptr_array_free (cfg->seq_points, TRUE);
+       cfg->seq_points = NULL;
+}
+
+MonoSeqPointInfo*
+get_seq_points (MonoDomain *domain, MonoMethod *method)
+{
+       MonoSeqPointInfo *seq_points;
+
+       mono_domain_lock (domain);
+       seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, method);
+       if (!seq_points && method->is_inflated) {
+               /* generic sharing + aot */
+               seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, mono_method_get_declaring_generic_method (method));
+               if (!seq_points)
+                       seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, mini_get_shared_method (method));
+       }
+       mono_domain_unlock (domain);
+
+       return seq_points;
+}
+
+static gboolean
+seq_point_find_next_by_native_offset (MonoSeqPointInfo* info, int native_offset, SeqPoint* seq_point)
+{
+       SeqPointIterator it;
+       seq_point_iterator_init (&it, info);
+       while (seq_point_iterator_next (&it)) {
+               if (it.seq_point.native_offset >= native_offset) {
+                       memcpy (seq_point, &it.seq_point, sizeof (SeqPoint));
+                       return TRUE;
+               }
+       }
+
+       return FALSE;
+}
+
+static gboolean
+seq_point_find_prev_by_native_offset (MonoSeqPointInfo* info, int native_offset, SeqPoint* seq_point)
+{
+       SeqPoint prev_seq_point;
+       gboolean  is_first = TRUE;
+       SeqPointIterator it;
+       seq_point_iterator_init (&it, info);
+       while (seq_point_iterator_next (&it) && it.seq_point.native_offset <= native_offset) {
+               memcpy (&prev_seq_point, &it.seq_point, sizeof (SeqPoint));
+               is_first = FALSE;
+       }
+
+       if (!is_first && prev_seq_point.native_offset <= native_offset) {
+               memcpy (seq_point, &prev_seq_point, sizeof (SeqPoint));
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+static gboolean
+seq_point_find_by_il_offset (MonoSeqPointInfo* info, int il_offset, SeqPoint* seq_point)
+{
+       SeqPointIterator it;
+       seq_point_iterator_init (&it, info);
+       while (seq_point_iterator_next (&it)) {
+               if (it.seq_point.il_offset == il_offset) {
+                       memcpy (seq_point, &it.seq_point, sizeof (SeqPoint));
+                       return TRUE;
+               }
+       }
+
+       return FALSE;
+}
+
+/*
+ * find_next_seq_point_for_native_offset:
+ *
+ *   Find the first sequence point after NATIVE_OFFSET.
+ */
+gboolean
+find_next_seq_point_for_native_offset (MonoDomain *domain, MonoMethod *method, gint32 native_offset, MonoSeqPointInfo **info, SeqPoint* seq_point)
+{
+       MonoSeqPointInfo *seq_points;
+
+       seq_points = get_seq_points (domain, method);
+       if (!seq_points) {
+               if (info)
+                       *info = NULL;
+               return FALSE;
+       }
+       if (info)
+               *info = seq_points;
+
+       return seq_point_find_next_by_native_offset (seq_points, native_offset, seq_point);
+}
+
+/*
+ * find_prev_seq_point_for_native_offset:
+ *
+ *   Find the first sequence point before NATIVE_OFFSET.
+ */
+gboolean
+find_prev_seq_point_for_native_offset (MonoDomain *domain, MonoMethod *method, gint32 native_offset, MonoSeqPointInfo **info, SeqPoint* seq_point)
+{
+       MonoSeqPointInfo *seq_points;
+
+       seq_points = get_seq_points (domain, method);
+       if (!seq_points) {
+               if (info)
+                       *info = NULL;
+               return FALSE;
+       }
+       if (info)
+               *info = seq_points;
+
+       return seq_point_find_prev_by_native_offset (seq_points, native_offset, seq_point);
+}
+
+/*
+ * find_seq_point:
+ *
+ *   Find the sequence point corresponding to the IL offset IL_OFFSET, which
+ * should be the location of a sequence point.
+ */
+gboolean
+find_seq_point (MonoDomain *domain, MonoMethod *method, gint32 il_offset, MonoSeqPointInfo **info, SeqPoint *seq_point)
+{
+       MonoSeqPointInfo *seq_points;
+
+       seq_points = get_seq_points (domain, method);
+       if (!seq_points) {
+               if (info)
+                       *info = NULL;
+               return FALSE;
+       }
+       if (info)
+               *info = seq_points;
+
+       return seq_point_find_by_il_offset (seq_points, il_offset, seq_point);
+}
+
+void
+seq_point_init_next (MonoSeqPointInfo* info, SeqPoint sp, SeqPoint* next)
+{
+       int i;
+       guint8* ptr;
+       SeqPointIterator it;
+       GArray* seq_points = g_array_new (FALSE, TRUE, sizeof (SeqPoint));
+       SeqPointInfoInflated info_inflated = seq_point_info_inflate (info);
+
+       g_assert (info_inflated.has_debug_data);
+
+       seq_point_iterator_init (&it, info);
+       while (seq_point_iterator_next (&it))
+               g_array_append_vals (seq_points, &it.seq_point, 1);
+
+       ptr = info_inflated.data + sp.next_offset;
+       for (i = 0; i < sp.next_len; i++) {
+               int next_index;
+               next_index = decode_var_int (ptr, &ptr);
+               g_assert (next_index < seq_points->len);
+               memcpy (&next[i], seq_points->data + next_index * sizeof (SeqPoint), sizeof (SeqPoint));
+       }
+
+       g_array_free (seq_points, TRUE);
+}
+
+gboolean
+seq_point_iterator_next (SeqPointIterator* it)
+{
+       if (it->ptr >= it->end)
+               return FALSE;
+
+       it->ptr += seq_point_read (&it->seq_point, it->ptr, it->begin, it->has_debug_data);
+
+       return TRUE;
+}
+
+void
+seq_point_iterator_init (SeqPointIterator* it, MonoSeqPointInfo* info)
+{
+       SeqPointInfoInflated info_inflated = seq_point_info_inflate (info);
+       it->ptr = info_inflated.data;
+       it->begin = info_inflated.data;
+       it->end = it->begin + info_inflated.len;
+       it->has_debug_data = info_inflated.has_debug_data;
+       memset(&it->seq_point, 0, sizeof(SeqPoint));
+}
+
+int
+seq_point_info_write (MonoSeqPointInfo* info, guint8* buffer)
+{
+       guint8* buffer0 = buffer;
+       SeqPointInfoInflated info_inflated = seq_point_info_inflate (info);
+
+       memcpy (buffer, &info_inflated.has_debug_data, 1);
+       buffer++;
+
+       //Write sequence points
+       encode_var_int (buffer, &buffer, info_inflated.len);
+       memcpy (buffer, info_inflated.data, info_inflated.len);
+       buffer += info_inflated.len;
+
+       return buffer - buffer0;
+}
+
+int
+seq_point_info_read (MonoSeqPointInfo** info, guint8* buffer, gboolean copy)
+{
+       guint8* buffer0 = buffer;
+       int size;
+       gboolean has_debug_data;
+
+       memcpy (&has_debug_data, buffer, 1);
+       buffer++;
+
+       size = decode_var_int (buffer, &buffer);
+       (*info) = seq_point_info_new (size, copy, buffer, has_debug_data);
+       buffer += size;
+
+       return buffer - buffer0;
+}
+
+/*
+ * Returns the maximum size of mono_seq_point_info_write.
+ */
+int
+seq_point_info_get_write_size (MonoSeqPointInfo* info)
+{
+       SeqPointInfoInflated info_inflated = seq_point_info_inflate (info);
+
+       //4 is the maximum size required to store the size of the data.
+       //1 is the byte used to store has_debug_data.
+       int size = 4 + 1 + info_inflated.len;
+
+       return size;
+}
diff --git a/mono/mini/seq-points.h b/mono/mini/seq-points.h
new file mode 100644 (file)
index 0000000..10f3dd3
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 Xamarin Inc
+ */
+#ifndef __MONO_SEQ_POINTS_H__
+#define __MONO_SEQ_POINTS_H__
+
+#define MONO_SEQ_POINT_FLAG_NONEMPTY_STACK 1
+#define MONO_SEQ_POINT_FLAG_EXIT_IL 2
+
+/* IL offsets used to mark the sequence points belonging to method entry/exit events */
+#define METHOD_ENTRY_IL_OFFSET -1
+#define METHOD_EXIT_IL_OFFSET 0xffffff
+
+/* Native offset used to mark seq points in dead code */
+#define SEQ_POINT_NATIVE_OFFSET_DEAD_CODE -1
+
+typedef struct {
+       int il_offset, native_offset, flags;
+       /* Offset of indexes of successor sequence points on the compressed buffer */
+       int next_offset;
+       /* Number of entries in next */
+       int next_len;
+} SeqPoint;
+
+typedef struct MonoSeqPointInfo {
+       int dummy[0];
+} MonoSeqPointInfo;
+
+typedef struct {
+       SeqPoint seq_point;
+       guint8* ptr;
+       guint8* begin;
+       guint8* end;
+       gboolean has_debug_data;
+} SeqPointIterator;
+
+void
+seq_point_info_free (gpointer info);
+
+void
+mono_save_seq_point_info (MonoCompile *cfg);
+
+MonoSeqPointInfo*
+get_seq_points (MonoDomain *domain, MonoMethod *method);
+
+gboolean
+find_next_seq_point_for_native_offset (MonoDomain *domain, MonoMethod *method, gint32 native_offset, MonoSeqPointInfo **info, SeqPoint* seq_point);
+
+gboolean
+find_prev_seq_point_for_native_offset (MonoDomain *domain, MonoMethod *method, gint32 native_offset, MonoSeqPointInfo **info, SeqPoint* seq_point);
+
+gboolean
+find_seq_point (MonoDomain *domain, MonoMethod *method, gint32 il_offset, MonoSeqPointInfo **info, SeqPoint *seq_point);
+
+gboolean
+seq_point_iterator_next (SeqPointIterator* it);
+
+void
+seq_point_iterator_init (SeqPointIterator* it, MonoSeqPointInfo* info);
+
+void
+seq_point_init_next (MonoSeqPointInfo* info, SeqPoint sp, SeqPoint* next);
+
+int
+seq_point_info_write (MonoSeqPointInfo* info, guint8* buffer);
+
+int
+seq_point_info_read (MonoSeqPointInfo** info, guint8* buffer, gboolean copy);
+
+int
+seq_point_info_get_write_size (MonoSeqPointInfo* info);
+
+#endif /* __MONO_SEQ_POINTS_H__ */
\ No newline at end of file
index 160db5fec5701c166d517e5b41a1739574ef52e3..8f804b85c93ee73019f43f97f19fb3b6e6aca8a4 100644 (file)
@@ -20,7 +20,6 @@
 #include <alloca.h>
 #endif
 
-#define USE_ORIGINAL_VARS
 #define CREATE_PRUNED_SSA
 
 //#define DEBUG_SSA 1
index 40c3baae06c777ca0930ff14526b0f4b722cd764..735176dc5683cbddb6f48e838090eb86a0887a94 100644 (file)
@@ -499,7 +499,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
        guint8 *code, *buf, *tramp;
        gpointer *constants;
 #ifndef USE_JUMP_TABLES
-       guint32 short_branch;
+       guint32 short_branch = FALSE;
 #endif
        guint32 size = SPEC_TRAMP_SIZE;
 
index 6fac1a1bcb0d8547183da06ccdcf4c8b479318e8..1b2cc1dfb91f0b043c62cfcef28161ddd6f8880b 100644 (file)
@@ -295,44 +295,44 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
        if (aot) {
                code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_get_lmf_addr");
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
-               ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r11);
-               ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+               ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r12);
+               ppc_ldptr (code, ppc_r12, 0, ppc_r12);
 #endif
-               ppc_mtlr (code, ppc_r11);
+               ppc_mtlr (code, ppc_r12);
                ppc_blrl (code);
        }  else {
-               ppc_load_func (code, ppc_r0, mono_get_lmf_addr);
-               ppc_mtlr (code, ppc_r0);
+               ppc_load_func (code, PPC_CALL_REG, mono_get_lmf_addr);
+               ppc_mtlr (code, PPC_CALL_REG);
                ppc_blrl (code);
        }
        /* we build the MonoLMF structure on the stack - see mini-ppc.h
-        * The pointer to the struct is put in ppc_r11.
+        * The pointer to the struct is put in ppc_r12.
         */
-       ppc_addi (code, ppc_r11, ppc_sp, STACK - sizeof (MonoLMF));
-       ppc_stptr (code, ppc_r3, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r11);
+       ppc_addi (code, ppc_r12, ppc_sp, STACK - sizeof (MonoLMF));
+       ppc_stptr (code, ppc_r3, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r12);
        /* new_lmf->previous_lmf = *lmf_addr */
        ppc_ldptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r3);
-       ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r11);
-       /* *(lmf_addr) = r11 */
-       ppc_stptr (code, ppc_r11, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r3);
+       ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r12);
+       /* *(lmf_addr) = r12 */
+       ppc_stptr (code, ppc_r12, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r3);
        /* save method info (it's stored on the stack, so get it first). */
        if ((tramp_type == MONO_TRAMPOLINE_JIT) || (tramp_type == MONO_TRAMPOLINE_JUMP)) {
                ppc_ldr (code, ppc_r0, GREGS_OFFSET, ppc_r1);
-               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, method), ppc_r11);
+               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, method), ppc_r12);
        } else {
                ppc_load (code, ppc_r0, 0);
-               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, method), ppc_r11);
+               ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, method), ppc_r12);
        }
        /* store the frame pointer of the calling method */
        ppc_addi (code, ppc_r0, ppc_sp, STACK);
-       ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, ebp), ppc_r11);
+       ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, ebp), ppc_r12);
        /* save the IP (caller ip) */
        if (tramp_type == MONO_TRAMPOLINE_JUMP) {
                ppc_li (code, ppc_r0, 0);
        } else {
                ppc_ldr (code, ppc_r0, STACK + PPC_RET_ADDR_OFFSET, ppc_r1);
        }
-       ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, eip), ppc_r11);
+       ppc_stptr (code, ppc_r0, G_STRUCT_OFFSET(MonoLMF, eip), ppc_r12);
 
        /*
         * Now we're ready to call trampoline (mgreg_t *regs, guint8 *code, gpointer value, guint8 *tramp)
@@ -356,15 +356,15 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
        if (aot) {
                code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, g_strdup_printf ("trampoline_func_%d", tramp_type));
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
-               ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r11);
-               ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+               ppc_ldptr (code, ppc_r2, sizeof (gpointer), ppc_r12);
+               ppc_ldptr (code, ppc_r12, 0, ppc_r12);
 #endif
-               ppc_mtlr (code, ppc_r11);
+               ppc_mtlr (code, ppc_r12);
                ppc_blrl (code);
        } else {
                tramp_handler = mono_get_trampoline_func (tramp_type);
-               ppc_load_func (code, ppc_r0, tramp_handler);
-               ppc_mtlr (code, ppc_r0);
+               ppc_load_func (code, PPC_CALL_REG, tramp_handler);
+               ppc_mtlr (code, PPC_CALL_REG);
                ppc_blrl (code);
        }
                
@@ -384,20 +384,20 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
         * Now we restore the MonoLMF (see emit_epilogue in mini-ppc.c)
         * and the rest of the registers, so the method called will see
         * the same state as before we executed.
-        * The pointer to MonoLMF is in ppc_r11.
+        * The pointer to MonoLMF is in ppc_r12.
         */
-       ppc_addi (code, ppc_r11, ppc_r1, STACK - sizeof (MonoLMF));
+       ppc_addi (code, ppc_r12, ppc_r1, STACK - sizeof (MonoLMF));
        /* r5 = previous_lmf */
-       ppc_ldptr (code, ppc_r5, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r11);
+       ppc_ldptr (code, ppc_r5, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r12);
        /* r6 = lmf_addr */
-       ppc_ldptr (code, ppc_r6, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r11);
+       ppc_ldptr (code, ppc_r6, G_STRUCT_OFFSET(MonoLMF, lmf_addr), ppc_r12);
        /* *(lmf_addr) = previous_lmf */
        ppc_stptr (code, ppc_r5, G_STRUCT_OFFSET(MonoLMF, previous_lmf), ppc_r6);
        /* restore iregs */
-       ppc_ldr_multiple (code, ppc_r13, G_STRUCT_OFFSET(MonoLMF, iregs), ppc_r11);
+       ppc_ldr_multiple (code, ppc_r13, G_STRUCT_OFFSET(MonoLMF, iregs), ppc_r12);
        /* restore fregs */
        for (i = 14; i < 32; i++)
-               ppc_lfd (code, i, G_STRUCT_OFFSET(MonoLMF, fregs) + ((i-14) * sizeof (gdouble)), ppc_r11);
+               ppc_lfd (code, i, G_STRUCT_OFFSET(MonoLMF, fregs) + ((i-14) * sizeof (gdouble)), ppc_r12);
 
        /* restore the volatile registers, we skip r1, of course */
        offset = STACK - sizeof (MonoLMF) - (14 * sizeof (double));
@@ -419,8 +419,8 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
         */
        /* Restore stack pointer and LR and jump to the code */
        ppc_ldr  (code, ppc_r1,  0, ppc_r1);
-       ppc_ldr  (code, ppc_r11, PPC_RET_ADDR_OFFSET, ppc_r1);
-       ppc_mtlr (code, ppc_r11);
+       ppc_ldr  (code, ppc_r12, PPC_RET_ADDR_OFFSET, ppc_r1);
+       ppc_mtlr (code, ppc_r12);
        if (MONO_TRAMPOLINE_TYPE_MUST_RETURN (tramp_type))
                ppc_blr (code);
        else
@@ -591,9 +591,9 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info
                code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, g_strdup_printf ("specific_trampoline_lazy_fetch_%u", slot));
                /* Branch to the trampoline */
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
-               ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+               ppc_ldptr (code, ppc_r12, 0, ppc_r12);
 #endif
-               ppc_mtctr (code, ppc_r11);
+               ppc_mtctr (code, ppc_r12);
                ppc_bcctr (code, PPC_BR_ALWAYS, 0);
        } else {
                tramp = mono_arch_create_specific_trampoline (GUINT_TO_POINTER (slot),
@@ -653,9 +653,9 @@ mono_arch_create_generic_class_init_trampoline (MonoTrampInfo **info, gboolean a
                code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "specific_trampoline_generic_class_init");
                /* Branch to the trampoline */
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
-               ppc_ldptr (code, ppc_r11, 0, ppc_r11);
+               ppc_ldptr (code, ppc_r12, 0, ppc_r12);
 #endif
-               ppc_mtctr (code, ppc_r11);
+               ppc_mtctr (code, ppc_r12);
                ppc_bcctr (code, PPC_BR_ALWAYS, 0);
        } else {
                tramp = mono_arch_create_specific_trampoline (NULL, MONO_TRAMPOLINE_GENERIC_CLASS_INIT,
index b0d1e2f77de31eb14d83c4acd3f8a0a841c43b12..2c00ac36c7239d56be0fba8b28b0c88f86d74682 100644 (file)
@@ -69,7 +69,7 @@ PLOG_TESTS_SRC=test-alloc.cs test-busy.cs test-monitor.cs test-excleave.cs \
        test-heapshot.cs test-traces.cs
 PLOG_TESTS=$(PLOG_TESTS_SRC:.cs=.exe)
 
-with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_4_0
+with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_4_5
 
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper
 MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219 -debug
index 882a17f678ef47ec380acd8eed88f1bf683fb5b5..98544578ac6846d427577010d69c3271fab15276 100644 (file)
@@ -2066,10 +2066,12 @@ counters_emit (MonoProfiler *profiler)
        emit_byte (logbuffer, TYPE_SAMPLE_COUNTERS_DESC | TYPE_SAMPLE);
        emit_value (logbuffer, len);
        for (agent = counters; agent; agent = agent->next) {
+               const char *name;
+
                if (agent->emitted)
                        continue;
 
-               const char *name = mono_counter_get_name (agent->counter);
+               name = mono_counter_get_name (agent->counter);
                emit_value (logbuffer, mono_counter_get_section (agent->counter));
                emit_string (logbuffer, name, strlen (name) + 1);
                emit_value (logbuffer, mono_counter_get_type (agent->counter));
@@ -2459,6 +2461,10 @@ new_filename (const char* filename)
 }
 
 #ifndef DISABLE_HELPER_THREAD
+
+//this is exposed by the JIT, but it's not meant to be a supported API for now.
+extern void mono_threads_attach_tools_thread (void);
+
 static void*
 helper_thread (void* arg)
 {
@@ -2468,6 +2474,7 @@ helper_thread (void* arg)
        char buf [64];
        MonoThread *thread = NULL;
 
+       mono_threads_attach_tools_thread ();
        //fprintf (stderr, "Server listening\n");
        command_socket = -1;
        while (1) {
index e1d9cbf8ad991e18cee0d8a156da95db90e4a998..22bd1d415ea790e6cd2cf868197189829553a2d4 100644 (file)
@@ -1,4 +1,4 @@
-with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_4_0
+with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_4_5
 
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper --debug
 MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -debug:full -target:library
index 7ddd59c71b8ec52c7f43d6c844fe88a7f47967b8..2ce4a3c4d78f7e9e00f22a0d81ab57292d22cc48 100644 (file)
@@ -14,20 +14,23 @@ public class Foo  {
 
        public static void CreateFoo (int level)
        {
-               if (level == 0)
-                       Foo.reference = new Foo ();
-               else
+               if (level == 0) {
+                       reference = new Foo ();
+
+                       /* Allocate a MonoThreadsSync for the object */
+                       Monitor.Enter (reference);
+                       Monitor.Exit (reference);
+                       reference = null;
+               } else {
                        CreateFoo (level - 1);
+               }
        }
 
        public static int Main() {
                /* Allocate an object down the stack so it doesn't get pinned */
                CreateFoo (100);
 
-               /* Allocate a MonoThreadsSync for the object */
-               Monitor.Enter (reference);
-               Monitor.Exit (reference);
-               reference = null;
+               Console.WriteLine (".");
 
                /* resurrect obj */
                GC.Collect ();
index 5adc0c99ee895a365e3ac5281782ae6855938d1e..19e745f630c0c54eb46f030dfb5c3e62e7b7de20 100644 (file)
@@ -16,9 +16,6 @@
 #include <mach/thread_act.h>
 #include <mach/thread_status.h>
 
-#include <mono/metadata/appdomain.h>
-#include <mono/metadata/debug-helpers.h>
-#include <mono/metadata/mono-debug.h>
 #include <mono/utils/mono-mmap.h>
 
 #include "mach-support.h"
index d3c41ba44dfe7f456031042397428aaff66d51e4..bad994cc29338cd5bfdc17376e665dfe2a3414b6 100644 (file)
 #include <BaseTsd.h>
 typedef SSIZE_T ssize_t;
 
+/*
+ * SSIZE_MAX is not defined in MSVC, so define it here.
+ *
+ * These values come from MinGW64, and are public domain.
+ *
+ */
+#ifndef SSIZE_MAX
+#ifdef _WIN64
+#define SSIZE_MAX _I64_MAX
+#else
+#define SSIZE_MAX INT_MAX
+#endif
+#endif
+
 #endif /* _MSC_VER */
 
 #if !defined(_MSC_VER) && !defined(PLATFORM_SOLARIS) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(MONOTOUCH) && HAVE_VISIBILITY_HIDDEN
index 1e0840c6b04a7b539d5854aadbd3874edf8afc2d..9c92dfb6ec2414a9dabb677886ac0b2c932ce765 100644 (file)
@@ -360,6 +360,7 @@ cpu_load (int kind)
        FILE *f = fopen ("/proc/loadavg", "r");
        if (f) {
                len = fread (buffer, 1, sizeof (buffer) - 1, f);
+               fclose (f);
                if (len > 0) {
                        buffer [len < 511 ? len : 511] = 0;
                        b = buffer;
@@ -374,7 +375,6 @@ cpu_load (int kind)
                                }
                        }
                }
-               fclose (f);
        }
 #endif
        return 0;
@@ -537,7 +537,10 @@ dump_counter (MonoCounter *counter, FILE *outfile) {
                        fprintf (outfile, ENTRY_FMT "%lld\n", counter->name, *(long long *)buffer);
                break;
        case MONO_COUNTER_ULONG:
-               fprintf (outfile, ENTRY_FMT "%llu\n", counter->name, *(unsigned long long *)buffer);
+               if ((counter->type & MONO_COUNTER_UNIT_MASK) == MONO_COUNTER_TIME)
+                       fprintf (outfile, ENTRY_FMT "%.2f ms\n", counter->name, (double)(*(guint64*)buffer) / 10000.0);
+               else
+                       fprintf (outfile, ENTRY_FMT "%llu\n", counter->name, *(unsigned long long *)buffer);
                break;
        case MONO_COUNTER_WORD:
                fprintf (outfile, ENTRY_FMT "%zd\n", counter->name, *(gssize*)buffer);
@@ -630,12 +633,14 @@ mono_counters_dump (int section_mask, FILE *outfile)
 void
 mono_counters_cleanup (void)
 {
+       MonoCounter *counter;
+
        if (!initialized)
                return;
 
        mono_mutex_lock (&counters_mutex);
 
-       MonoCounter *counter = counters;
+       counter = counters;
        counters = NULL;
        while (counter) {
                MonoCounter *tmp = counter;
index 04e9165b7c09a0dc363e605034ef6e4cd4fa730a..c13c68a042151e52ee55c6082426189fd35270fe 100644 (file)
@@ -64,12 +64,7 @@ static const char suffixes [][4] = {
 #endif  /* RTLD_LAZY */
 
 #define SO_HANDLE_TYPE void*
-#ifdef PLATFORM_ANDROID
-/* Bionic doesn't support NULL filenames */
-#  define LL_SO_OPEN(file,flags) ((file) ? dlopen ((file), (flags)) : NULL)
-#else
-#  define LL_SO_OPEN(file,flags) dlopen ((file), (flags))
-#endif
+#define LL_SO_OPEN(file,flags) dlopen ((file), (flags))
 #define LL_SO_CLOSE(module) dlclose ((module)->handle)
 #define LL_SO_SYMBOL(module, name) dlsym ((module)->handle, (name))
 #define LL_SO_TRFLAGS(flags) convert_flags ((flags))
@@ -337,7 +332,16 @@ mono_dl_open (const char *name, int flags, char **error_msg)
                return NULL;
        }
        module->main_module = name == NULL? TRUE: FALSE;
+
+#ifdef PLATFORM_ANDROID
+       /* Bionic doesn't support NULL filenames */
+       if (!name)
+               lib = NULL;
+       else
+               lib = LL_SO_OPEN (name, lflags);
+#else
        lib = LL_SO_OPEN (name, lflags);
+#endif
        if (!lib) {
                GSList *node;
                for (node = fallback_handlers; node != NULL; node = node->next){
index 869495cb5c516a6cd4c5b667018add3d44dadfd1..205916b6d4bb34f1f67dc8d78b16dc03475f5822 100644 (file)
@@ -4,6 +4,18 @@
 #include "mono/utils/mono-compiler.h"
 #include "mono/utils/mono-dl-fallback.h"
 
+#ifdef TARGET_WIN32
+#define MONO_SOLIB_EXT ".dll"
+#elif defined(__ppc__) && defined(TARGET_MACH)
+#define MONO_SOLIB_EXT ".dylib"
+#elif defined(TARGET_MACH) && defined(TARGET_X86) && !defined(__native_client_codegen__)
+#define MONO_SOLIB_EXT ".dylib"
+#elif defined(TARGET_MACH) && defined(TARGET_AMD64) && !defined(__native_client_codegen__)
+#define MONO_SOLIB_EXT ".dylib"
+#else
+#define MONO_SOLIB_EXT ".so"
+#endif
+
 typedef struct _MonoDl MonoDl;
 
 MonoDl*     mono_dl_open       (const char *name, int flags, char **error_msg) MONO_LLVM_INTERNAL;
index 979bb6037fd21ba9be040c408eca9cba4a265fe2..4304851c11dff8d901d42515452c3932dac9461d 100644 (file)
@@ -6,12 +6,6 @@
 #endif
 #include <errno.h>
 #include <mono/utils/mono-io-portability.h>
-#include <mono/metadata/metadata.h>
-#include <mono/metadata/class.h>
-#include <mono/metadata/class-internals.h>
-#include <mono/metadata/object.h>
-#include <mono/metadata/gc-internal.h>
-#include <mono/metadata/profiler.h>
 #include <mono/metadata/profiler-private.h>
 
 #ifndef DISABLE_PORTABILITY
index efb14f0352bad91156e076f94676c7ff7d4c9756..89c7f1181c7eae948168ab08ad4a791067031f9a 100644 (file)
@@ -66,7 +66,15 @@ Requires the world to be stoped
        MonoLinkedListSetNode *__cur;   \
        for (__cur = (list)->head; __cur; __cur = mono_lls_pointer_unmask (__cur->next)) \
                if (!mono_lls_pointer_get_mark (__cur->next)) { \
-                       (element) = (type)__cur;                        \
+                       (element) = (type)__cur;
+
+
+#define MONO_LLS_FOREACH_FILTERED(list, element, filter_func, type) {\
+       MonoLinkedListSetNode *__cur;   \
+       for (__cur = (list)->head; __cur; __cur = mono_lls_pointer_unmask (__cur->next)) \
+               if (!mono_lls_pointer_get_mark (__cur->next)) { \
+                       (element) = (type)__cur;                        \
+                       if (!filter_func (element)) continue;
 
 #define MONO_LLS_END_FOREACH }}
 
@@ -91,6 +99,18 @@ Provides snapshot iteration
                if (!mono_lls_pointer_get_mark (__next)) {      \
                        (element) = (type)__cur;
 
+#define MONO_LLS_FOREACH_FILTERED_SAFE(list, element, filter_func, type) {\
+       MonoThreadHazardPointers *__hp = mono_hazard_pointer_get ();    \
+       MonoLinkedListSetNode *__cur, *__next;  \
+       for (__cur = mono_lls_pointer_unmask (get_hazardous_pointer ((gpointer volatile*)&(list)->head, __hp, 1)); \
+               __cur;  \
+               __cur = mono_lls_info_step (__next, __hp)) {    \
+               __next = get_hazardous_pointer_with_mask ((gpointer volatile*)&__cur->next, __hp, 0);   \
+               if (!mono_lls_pointer_get_mark (__next)) {      \
+                       (element) = (type)__cur;        \
+                       if (!filter_func (element)) continue;
+
+
 #define MONO_LLS_END_FOREACH_SAFE \
                } \
        }       \
index 6caf9628380f2f3ab8cab48c096dd5a913286e17..ed11c9f1b2874664035bc5d2b4a12be41499fafa 100644 (file)
@@ -645,7 +645,7 @@ mono_shared_area (void)
        header->stats_start = sizeof (SAreaHeader);
        header->stats_end = sizeof (SAreaHeader);
 
-       atexit (mono_shared_area_remove);
+       mono_atexit (mono_shared_area_remove);
        return res;
 }
 
index 2b6f58a668e4e7619ceaa539be756650e8d9b375..81399007ad6c3e4a664262318d8b1bbeca81173f 100644 (file)
@@ -666,3 +666,13 @@ mono_cpu_get_data (int cpu_id, MonoCpuData data, MonoProcessError *error)
        return value;
 }
 
+int
+mono_atexit (void (*func)(void))
+{
+#ifdef PLATFORM_ANDROID
+       /* Some versions of android libc doesn't define atexit () */
+       return 0;
+#else
+       return atexit (func);
+#endif
+}
index bb8a62728e9d652b0c4e38e4cd4f43a3c843a04f..6a8f6bf81f7630f8823e4cfd46d76ea857fc9643 100644 (file)
@@ -53,5 +53,7 @@ int       mono_process_current_pid (void) MONO_INTERNAL;
 int       mono_cpu_count    (void) MONO_INTERNAL;
 gint64    mono_cpu_get_data (int cpu_id, MonoCpuData data, MonoProcessError *error) MONO_INTERNAL;
 
+int       mono_atexit (void (*func)(void)) MONO_INTERNAL;
+
 #endif /* __MONO_PROC_LIB_H__ */
 
index cc1e1364e269c16df0362e4465bb1ea7caf001f7..a418cadeca17dba4b1dd5de93e06c03fbcf3da77 100644 (file)
@@ -49,9 +49,9 @@ typedef unsigned __int64      uint64_t;
 
 #endif /* end of compiler-specific stuff */
 
-#if !defined(MONO_STATIC_BUILD) && defined(MONO_DLL_EXPORT)
+#if defined(MONO_DLL_EXPORT)
        #define MONO_API MONO_API_EXPORT
-#elif !defined(MONO_STATIC_BUILD)
+#elif defined(MONO_DLL_IMPORT)
        #define MONO_API MONO_API_IMPORT
 #else
        #define MONO_API
index 6270c57f1d6c347e300e3da7d0988ba5326eb91b..c0b28a12d8e97de1295be3e7ad1bed653a37dd6a 100644 (file)
@@ -20,9 +20,6 @@
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/hazard-pointer.h>
 #include <mono/utils/mono-mmap.h>
-#include <mono/metadata/gc-internal.h>
-#include <mono/metadata/appdomain.h>
-#include <mono/metadata/threads-types.h>
 
 void
 mono_threads_init_platform (void)
index 377d522d2502b60de9f9498103cffbd79af8d81a..a32f5a9ff9cfca04767515abcbb7c55302ed99b3 100644 (file)
 
 #include <errno.h>
 
-#if defined(PLATFORM_ANDROID)
+#if defined(PLATFORM_ANDROID) && !defined(TARGET_ARM64)
+#define USE_TKILL_ON_ANDROID 1
+#endif
+
+#ifdef USE_TKILL_ON_ANDROID
 extern int tkill (pid_t tid, int signal);
 #endif
 
@@ -267,7 +271,7 @@ mono_threads_core_clear_interruption (void)
 int
 mono_threads_pthread_kill (MonoThreadInfo *info, int signum)
 {
-#if defined (PLATFORM_ANDROID)
+#ifdef USE_TKILL_ON_ANDROID
        int result, old_errno = errno;
        result = tkill (info->native_handle, signum);
        if (result < 0) {
@@ -369,7 +373,7 @@ mono_threads_init_platform (void)
         * FIXME: Use this on all platforms.
         * SIGUSR1 is used by dalvik/art.
         */
-       no_interrupt_signo = SIGUSR2;
+       no_interrupt_signo = SIGWINCH;
        g_assert (abort_signo != no_interrupt_signo);
        mono_posix_add_signal_handler (no_interrupt_signo, suspend_signal_handler, SA_RESTART);
 #endif
index 92b84e31266851a85bce1bed9d7d4b3da490a045..8ae4a3f15d961d6b688ba3621def0768112de41f 100644 (file)
@@ -287,6 +287,31 @@ mono_thread_info_list_head (void)
        return &thread_list;
 }
 
+/**
+ * mono_threads_attach_tools_thread
+ *
+ * Attach the current thread as a tool thread. DON'T USE THIS FUNCTION WITHOUT READING ALL DISCLAIMERS.
+ *
+ * A tools thread is a very special kind of thread that needs access to core runtime facilities but should
+ * not be counted as a regular thread for high order facilities such as executing managed code or accessing
+ * the managed heap.
+ *
+ * This is intended only to tools such as a profiler than needs to be able to use our lock-free support when
+ * doing things like resolving backtraces in their background processing thread.
+ */
+void
+mono_threads_attach_tools_thread (void)
+{
+       int dummy = 0;
+       MonoThreadInfo *info;
+
+       /* Must only be called once */
+       g_assert (!mono_native_tls_get_value (thread_info_key));
+
+       info = mono_thread_info_attach (&dummy);
+       info->tools_thread = TRUE;
+}
+
 MonoThreadInfo*
 mono_thread_info_attach (void *baseptr)
 {
index f2fd1fe94bbdc3a0786555631049b500a335b48a..409c405f7f2cee6564d1bb9d8d07485e166be0c0 100644 (file)
@@ -113,6 +113,9 @@ typedef struct {
        /*Tells if this thread was created by the runtime or not.*/
        gboolean runtime_thread;
 
+       /* Tells if this thread should be ignored or not by runtime services such as GC and profiling */
+       gboolean tools_thread;
+
        /* suspend machinery, fields protected by suspend_semaphore */
        MonoSemType suspend_semaphore;
        int suspend_count;
@@ -200,16 +203,22 @@ typedef struct {
        gboolean (*thread_state_init_from_handle) (MonoThreadUnwindState *tctx, MonoThreadInfo *info);
 } MonoThreadInfoRuntimeCallbacks;
 
+static inline gboolean
+mono_threads_filter_tools_threads (THREAD_INFO_TYPE *info)
+{
+       return !((MonoThreadInfo*)info)->tools_thread;
+}
+
 /*
 Requires the world to be stoped
 */
-#define FOREACH_THREAD(thread) MONO_LLS_FOREACH (mono_thread_info_list_head (), thread, THREAD_INFO_TYPE*)
+#define FOREACH_THREAD(thread) MONO_LLS_FOREACH_FILTERED (mono_thread_info_list_head (), thread, mono_threads_filter_tools_threads, THREAD_INFO_TYPE*)
 #define END_FOREACH_THREAD MONO_LLS_END_FOREACH
 
 /*
 Snapshot iteration.
 */
-#define FOREACH_THREAD_SAFE(thread) MONO_LLS_FOREACH_SAFE (mono_thread_info_list_head (), thread, THREAD_INFO_TYPE*)
+#define FOREACH_THREAD_SAFE(thread) MONO_LLS_FOREACH_FILTERED_SAFE (mono_thread_info_list_head (), thread, mono_threads_filter_tools_threads, THREAD_INFO_TYPE*)
 #define END_FOREACH_THREAD_SAFE MONO_LLS_END_FOREACH_SAFE
 
 #define mono_thread_info_get_tid(info) ((MonoNativeThreadId)((MonoThreadInfo*)info)->node.key)
@@ -349,7 +358,10 @@ mono_threads_add_async_job (THREAD_INFO_TYPE *info, MonoAsyncJob job) MONO_INTER
 
 MonoAsyncJob
 mono_threads_consume_async_jobs (void) MONO_INTERNAL;
-       
+
+void
+mono_threads_attach_tools_thread (void);
+
 
 #if !defined(HOST_WIN32)
 
index f20acdc2498bb31a49f9d81cc5257c381c118ef2..1ba4b7269063810bb510548fa3d01b375d8530c4 100644 (file)
  * #define NO_ERRNO if strtod should not assign errno = ERANGE when
  *     the result overflows to +-Infinity or underflows to 0.
  */
+#if defined __BIG_ENDIAN__ || defined _BIG_ENDIAN
+#   define IEEE_MC68k
+#elif defined __LITTLE_ENDIAN__ || defined _LITTLE_ENDIAN
+#   define IEEE_8087
+#else
+
 #if defined(TARGET_X86) || defined(mips) && defined(MIPSEL) || defined (__arm__) || defined(__aarch64__)
 
 #   define IEEE_8087
 #   define IEEE_MC68k
 
 #else
+#warning byte order unknown, assuming big endian
 #define IEEE_MC68k
 #endif
 
+#endif
+
 #define Long gint32
 #define ULong guint32
 
index cbafcdd6315c429b0d5f1d2edae66277aefca0a1..0829c88f7a3cc5b787db096fcc7e8b43153e097a 100644 (file)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug_SGen|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug_SGen|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Debug|Win32">\r
       <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
@@ -9,6 +17,14 @@
       <Configuration>Debug</Configuration>\r
       <Platform>x64</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_SGen|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_SGen|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Release|Win32">\r
       <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r
-      <Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>\r
+      <Command>winsetup.bat</Command>\r
+    </PreBuildEvent>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
+    <PreBuildEvent>\r
+      <Command>winsetup.bat</Command>\r
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <PreBuildEvent>\r
-      <Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>\r
+      <Command>winsetup.bat</Command>\r
+    </PreBuildEvent>\r
+    <ClCompile>\r
+      <Optimization>MinSpace</Optimization>\r
+      <AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
+    <PreBuildEvent>\r
+      <Command>winsetup.bat</Command>\r
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <PreBuildEvent>\r
-      <Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>\r
+      <Command>winsetup.bat</Command>\r
+    </PreBuildEvent>\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
+    <PreBuildEvent>\r
+      <Command>winsetup.bat</Command>\r
     </PreBuildEvent>\r
     <Midl>\r
       <TargetEnvironment>X64</TargetEnvironment>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
     <PreBuildEvent>\r
-      <Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>\r
+      <Command>winsetup.bat</Command>\r
+    </PreBuildEvent>\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>MinSpace</Optimization>\r
+      <AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
+    <PreBuildEvent>\r
+      <Command>winsetup.bat</Command>\r
     </PreBuildEvent>\r
     <Midl>\r
       <TargetEnvironment>X64</TargetEnvironment>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\eglib\src\garray.c" />\r
+    <ClCompile Include="..\eglib\src\gbytearray.c" />\r
     <ClCompile Include="..\eglib\src\gdate-win32.c" />\r
     <ClCompile Include="..\eglib\src\gdir-win32.c" />\r
     <ClCompile Include="..\eglib\src\gerror.c" />\r
index 34efcacfd5cfb07aa37079b164e13c7d33c1cbef..c247eb42993622908bd301489cc928c804979509 100644 (file)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug_SGen|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug_SGen|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Debug|Win32">\r
       <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
@@ -9,6 +17,14 @@
       <Configuration>Debug</Configuration>\r
       <Platform>x64</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_SGen|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_SGen|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Release|Win32">\r
       <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\bin\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\bin\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\bin\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\bin\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\bin\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\bin\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\bin\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\bin\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r
       <Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
+    <PreBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PreBuildEvent>\r
+    <Midl>\r
+      <TypeLibraryName>.\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb</TypeLibraryName>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <ProjectReference>\r
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>\r
+    </ProjectReference>\r
+    <Link>\r
+      <AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <PreBuildEvent>\r
       <Command>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <ProjectReference>\r
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>\r
+    </ProjectReference>\r
+    <Link>\r
+      <AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
+    <PreBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PreBuildEvent>\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <TypeLibraryName>.\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb</TypeLibraryName>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
+    <PreBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PreBuildEvent>\r
+    <Midl>\r
+      <TypeLibraryName>.\Release/genmdesc.tlb</TypeLibraryName>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <ProjectReference>\r
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>\r
+    </ProjectReference>\r
+    <Link>\r
+      <AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
     <PreBuildEvent>\r
       <Command>\r
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <ProjectReference>\r
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>\r
+    </ProjectReference>\r
+    <Link>\r
+      <AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
+    <PreBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PreBuildEvent>\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <TypeLibraryName>.\Release/genmdesc.tlb</TypeLibraryName>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
+      </PrecompiledHeader>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
+      </PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="..\mono\mini\helpers.c">\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
+      </PrecompiledHeader>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
+      </PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="..\mono\utils\monobitset.c">\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
+      </PrecompiledHeader>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
+      </PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="..\mono\metadata\opcodes.c">\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
       </PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
+      </PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
+      </PrecompiledHeader>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
       </PrecompiledHeader>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
+      </PrecompiledHeader>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
index db5bfab6d469d6bc881f4a50a3b9abcddac667ad..4871cc2e3c2c20063ed31e214c484cb06bf364ec 100644 (file)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug_SGen|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug_SGen|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Debug|Win32">\r
       <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
@@ -9,6 +17,14 @@
       <Configuration>Debug</Configuration>\r
       <Platform>x64</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_SGen|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_SGen|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Release|Win32">\r
       <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+  </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\lib\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\lib\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <BufferSecurityCheck>true</BufferSecurityCheck>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)libgc.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <BufferSecurityCheck>true</BufferSecurityCheck>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)libgc.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
+    <ClCompile>\r
+      <Optimization>MinSpace</Optimization>\r
+      <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <BufferSecurityCheck>true</BufferSecurityCheck>\r
       <PrecompiledHeader>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <BufferSecurityCheck>true</BufferSecurityCheck>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)libgc.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <BufferSecurityCheck>true</BufferSecurityCheck>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)libgc.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>MinSpace</Optimization>\r
+      <AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <BufferSecurityCheck>true</BufferSecurityCheck>\r
       <PrecompiledHeader>\r
index 26b243f2b6a0e2389d422c943ba600962fed7d47..fe4a881401d784425321031974fe010770ad97ef 100644 (file)
@@ -36,6 +36,7 @@
   </ItemGroup>\r
   <Import Project="mono.props" />\r
   <ItemGroup>\r
+    <ClCompile Include="..\mono\metadata\remoting.c" />\r
     <ClCompile Include="..\mono\mini\alias-analysis.c" />\r
     <ClCompile Include="..\mono\mini\exceptions-amd64.c">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
@@ -63,6 +64,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">true</ExcludedFromBuild>\r
     </ClCompile>\r
     <ClCompile Include="..\mono\mini\mini.c" />\r
+    <ClInclude Include="..\mono\metadata\remoting.h" />\r
     <ClInclude Include="..\mono\mini\ir-emit.h" />\r
     <ClCompile Include="..\mono\mini\method-to-ir.c" />\r
     <ClCompile Include="..\mono\mini\decompose.c" />\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">true</ExcludedFromBuild>\r
     </ClInclude>\r
     <ClInclude Include="..\mono\mini\mini.h" />\r
+    <ClInclude Include="..\mono\mini\seq-points.h" />\r
     <ClInclude Include="..\mono\mini\version.h" />\r
     <ClInclude Include="..\mono\mini\optflags-def.h" />\r
     <ClInclude Include="..\mono\mini\jit-icalls.h " />\r
     <ClCompile Include="..\mono\mini\jit-icalls.c " />\r
+    <ClCompile Include="..\mono\mini\seq-points.c" />\r
     <ClCompile Include="..\mono\mini\trace.c" />\r
     <ClInclude Include="..\mono\mini\trace.h" />\r
     <ClInclude Include="..\mono\mini\patch-info.h" />\r
index c65a603ff9f852c35b3c0229bfa5f9671dacfb60..6e8c2d57a4913b6bd97b6671055216e96bcbbe88 100644 (file)
@@ -70,7 +70,6 @@
     <ClCompile Include="..\mono\metadata\mono-basic-block.c" />\r
     <ClCompile Include="..\mono\metadata\mono-config.c" />\r
     <ClCompile Include="..\mono\metadata\mono-cq.c" />\r
-    <ClCompile Include="..\mono\metadata\mono-debug-debugger.c" />\r
     <ClCompile Include="..\mono\metadata\mono-debug.c" />\r
     <ClCompile Include="..\mono\metadata\mono-endian.c" />\r
     <ClCompile Include="..\mono\metadata\mono-hash.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-os-win32.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-pinning-stats.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-pinning.c" />\r
+    <ClCompile Include="..\mono\metadata\sgen-pointer-queue.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-protocol.c" />\r
+    <ClCompile Include="..\mono\metadata\sgen-qsort.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-simple-nursery.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-split-nursery.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c" />\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
+    <PlatformToolset>v120</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file
index 72c3c4c0d7e5ebe05f583e7d51154a258735009d..9b09ffb463838e6dfe5f59903f3e7c485510fce8 100644 (file)
@@ -84,6 +84,7 @@ mono_class_from_mono_type
 mono_class_from_name
 mono_class_from_name_case
 mono_class_from_typeref
+mono_class_from_typeref_checked
 mono_class_get
 mono_class_get_byref_type
 mono_class_get_com_object_class
@@ -161,10 +162,21 @@ mono_context_get
 mono_context_get_desc
 mono_context_init
 mono_context_set
+mono_counter_get_name
+mono_counter_get_section
+mono_counter_get_size
+mono_counter_get_type
+mono_counter_get_unit
+mono_counter_get_variance
 mono_counters_cleanup
 mono_counters_dump
 mono_counters_enable
+mono_counters_foreach
+mono_counters_init
+mono_counters_on_register
 mono_counters_register
+mono_counters_register_with_size
+mono_counters_sample
 mono_custom_attrs_construct
 mono_custom_attrs_free
 mono_custom_attrs_from_assembly
@@ -190,8 +202,6 @@ mono_debug_free_method_jit_info
 mono_debug_free_source_location
 mono_debug_il_offset_from_address
 mono_debug_init
-mono_debug_list_add
-mono_debug_list_remove
 mono_debug_lookup_locals
 mono_debug_lookup_method
 mono_debug_lookup_method_addresses
@@ -209,6 +219,7 @@ mono_debug_symfile_is_loaded
 mono_debug_symfile_lookup_locals
 mono_debug_symfile_lookup_location
 mono_debug_symfile_lookup_method
+mono_debugger_agent_register_transport
 mono_debugger_insert_breakpoint
 mono_debugger_method_has_breakpoint
 mono_debugger_run_finally
@@ -250,6 +261,7 @@ mono_domain_try_unload
 mono_domain_unload
 mono_dwarf_escape_path
 mono_emit_native_call
+mono_enable_debug_domain_unload
 mono_environment_exitcode_get
 mono_environment_exitcode_set
 mono_error_cleanup
@@ -325,6 +337,9 @@ mono_gc_out_of_memory
 mono_gc_reference_queue_add
 mono_gc_reference_queue_free
 mono_gc_reference_queue_new
+mono_gc_register_finalizer_callbacks
+mono_gc_toggleref_add
+mono_gc_toggleref_register_callback
 mono_gc_walk_heap
 mono_gc_wbarrier_arrayref_copy
 mono_gc_wbarrier_generic_nostore
@@ -537,6 +552,7 @@ mono_metadata_guid_heap
 mono_metadata_implmap_from_method
 mono_metadata_init
 mono_metadata_interfaces_from_typedef
+mono_metadata_load_generic_param_constraints_checked
 mono_metadata_load_generic_params
 mono_metadata_locate
 mono_metadata_locate_token
@@ -650,6 +666,7 @@ mono_parse_default_optimizations
 mono_path_canonicalize
 mono_path_resolve_symlinks
 mono_pe_file_open
+mono_perfcounter_foreach
 mono_perfcounters_init
 mono_pmip
 mono_poll
@@ -688,6 +705,7 @@ mono_profiler_install_thread_name
 mono_profiler_install_transition
 mono_profiler_load
 mono_profiler_set_events
+mono_profiler_set_statistical_mode
 mono_property_get_flags
 mono_property_get_get_method
 mono_property_get_name
@@ -704,6 +722,7 @@ mono_property_set_value
 mono_ptr_class_get
 mono_raise_exception
 mono_realloc_native_code
+mono_reflection_assembly_get_assembly
 mono_reflection_free_type_info
 mono_reflection_get_custom_attrs
 mono_reflection_get_custom_attrs_blob
@@ -736,6 +755,7 @@ mono_runtime_resource_check_limit
 mono_runtime_resource_limit
 mono_runtime_resource_set_callback
 mono_runtime_run_main
+mono_runtime_set_main_args
 mono_runtime_set_shutting_down
 mono_security_core_clr_get_options
 mono_security_core_clr_require_elevated_permissions
@@ -748,6 +768,7 @@ mono_sem_wait
 mono_set_assemblies_path
 mono_set_break_policy
 mono_set_config_dir
+mono_set_crash_chaining
 mono_set_defaults
 mono_set_dirs
 mono_set_is_debugger_attached
@@ -776,6 +797,7 @@ mono_signature_vararg_start
 mono_signbit_double
 mono_signbit_float
 mono_stack_walk
+mono_stack_walk_async_safe
 mono_stack_walk_no_il
 mono_store_remote_field
 mono_store_remote_field_new
@@ -783,6 +805,7 @@ mono_string_chars
 mono_string_equal
 mono_string_from_bstr
 mono_string_from_utf16
+mono_string_from_utf32
 mono_string_hash
 mono_string_intern
 mono_string_is_interned
@@ -791,8 +814,10 @@ mono_string_new
 mono_string_new_len
 mono_string_new_size
 mono_string_new_utf16
+mono_string_new_utf32
 mono_string_new_wrapper
 mono_string_to_utf16
+mono_string_to_utf32
 mono_string_to_utf8
 mono_string_to_utf8_checked
 mono_stringify_assembly_name
@@ -802,9 +827,20 @@ mono_thread_cleanup
 mono_thread_create
 mono_thread_current
 mono_thread_detach
+mono_thread_detach_if_exiting
 mono_thread_exit
 mono_thread_get_main
 mono_thread_get_undeniable_exception
+mono_thread_info_clear_interruption
+mono_thread_info_exit
+mono_thread_info_finish_interrupt
+mono_thread_info_get_stack_bounds
+mono_thread_info_interrupt
+mono_thread_info_open_handle
+mono_thread_info_prepare_interrupt
+mono_thread_info_self_interrupt
+mono_thread_info_tls_get
+mono_thread_info_tls_set
 mono_thread_init
 mono_thread_is_foreign
 mono_thread_manage
@@ -812,13 +848,22 @@ mono_thread_new_init
 mono_thread_set_main
 mono_thread_set_manage_callback
 mono_thread_stop
+mono_threads_attach_tools_thread
+mono_threads_core_clear_interruption
+mono_threads_core_finish_interrupt
+mono_threads_core_prepare_interrupt
+mono_threads_core_self_interrupt
+mono_threads_create_thread
 mono_threads_get_default_stacksize
 mono_threads_request_thread_dump
 mono_threads_set_default_stacksize
 mono_tls_key_get_offset
 mono_tls_key_set_offset
 mono_trace_set_level_string
+mono_trace_set_log_handler
 mono_trace_set_mask_string
+mono_trace_set_print_handler
+mono_trace_set_printerr_handler
 mono_type_create_from_typespec
 mono_type_full_name
 mono_type_generic_inst_is_valuetype
@@ -844,7 +889,6 @@ mono_type_to_unmanaged
 mono_unhandled_exception
 mono_unicode_from_external
 mono_unicode_to_external
-mono_upgrade_remote_class_wrapper
 mono_utf8_from_external
 mono_utf8_validate_and_len
 mono_utf8_validate_and_len_with_bounds
index f771bbb15e1a10d340eb81ed65169c80584bf6d7..04d54d9ffb026359d4d0ba3fd5b2d90eb2f58388 100644 (file)
@@ -83,7 +83,7 @@
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\eglib\src;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;_WIN32_WINNT=0x0502;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
index 2c7a641e8a7392e9b03dabf1f4a5a54ca99f5cb4..49103508eed04ee762c3628d4466a63371b36647 100644 (file)
@@ -84,6 +84,7 @@ mono_class_from_mono_type
 mono_class_from_name
 mono_class_from_name_case
 mono_class_from_typeref
+mono_class_from_typeref_checked
 mono_class_get
 mono_class_get_byref_type
 mono_class_get_com_object_class
@@ -161,10 +162,21 @@ mono_context_get
 mono_context_get_desc
 mono_context_init
 mono_context_set
+mono_counter_get_name
+mono_counter_get_section
+mono_counter_get_size
+mono_counter_get_type
+mono_counter_get_unit
+mono_counter_get_variance
 mono_counters_cleanup
 mono_counters_dump
 mono_counters_enable
+mono_counters_foreach
+mono_counters_init
+mono_counters_on_register
 mono_counters_register
+mono_counters_register_with_size
+mono_counters_sample
 mono_custom_attrs_construct
 mono_custom_attrs_free
 mono_custom_attrs_from_assembly
@@ -190,8 +202,6 @@ mono_debug_free_method_jit_info
 mono_debug_free_source_location
 mono_debug_il_offset_from_address
 mono_debug_init
-mono_debug_list_add
-mono_debug_list_remove
 mono_debug_lookup_locals
 mono_debug_lookup_method
 mono_debug_lookup_method_addresses
@@ -251,6 +261,7 @@ mono_domain_try_unload
 mono_domain_unload
 mono_dwarf_escape_path
 mono_emit_native_call
+mono_enable_debug_domain_unload
 mono_environment_exitcode_get
 mono_environment_exitcode_set
 mono_error_cleanup
@@ -327,7 +338,7 @@ mono_gc_reference_queue_add
 mono_gc_reference_queue_free
 mono_gc_reference_queue_new
 mono_gc_register_bridge_callbacks
-mono_gc_scan_for_specific_ref
+mono_gc_register_finalizer_callbacks
 mono_gc_toggleref_add
 mono_gc_toggleref_register_callback
 mono_gc_wait_for_bridge_processing
@@ -543,7 +554,7 @@ mono_metadata_guid_heap
 mono_metadata_implmap_from_method
 mono_metadata_init
 mono_metadata_interfaces_from_typedef
-mono_metadata_load_generic_param_constraints
+mono_metadata_load_generic_param_constraints_checked
 mono_metadata_load_generic_params
 mono_metadata_locate
 mono_metadata_locate_token
@@ -657,6 +668,7 @@ mono_parse_default_optimizations
 mono_path_canonicalize
 mono_path_resolve_symlinks
 mono_pe_file_open
+mono_perfcounter_foreach
 mono_perfcounters_init
 mono_pmip
 mono_poll
@@ -695,6 +707,7 @@ mono_profiler_install_thread_name
 mono_profiler_install_transition
 mono_profiler_load
 mono_profiler_set_events
+mono_profiler_set_statistical_mode
 mono_property_get_flags
 mono_property_get_get_method
 mono_property_get_name
@@ -711,6 +724,7 @@ mono_property_set_value
 mono_ptr_class_get
 mono_raise_exception
 mono_realloc_native_code
+mono_reflection_assembly_get_assembly
 mono_reflection_free_type_info
 mono_reflection_get_custom_attrs
 mono_reflection_get_custom_attrs_blob
@@ -743,6 +757,7 @@ mono_runtime_resource_check_limit
 mono_runtime_resource_limit
 mono_runtime_resource_set_callback
 mono_runtime_run_main
+mono_runtime_set_main_args
 mono_runtime_set_shutting_down
 mono_security_core_clr_get_options
 mono_security_core_clr_require_elevated_permissions
@@ -755,6 +770,7 @@ mono_sem_wait
 mono_set_assemblies_path
 mono_set_break_policy
 mono_set_config_dir
+mono_set_crash_chaining
 mono_set_defaults
 mono_set_dirs
 mono_set_is_debugger_attached
@@ -783,6 +799,7 @@ mono_signature_vararg_start
 mono_signbit_double
 mono_signbit_float
 mono_stack_walk
+mono_stack_walk_async_safe
 mono_stack_walk_no_il
 mono_store_remote_field
 mono_store_remote_field_new
@@ -790,6 +807,7 @@ mono_string_chars
 mono_string_equal
 mono_string_from_bstr
 mono_string_from_utf16
+mono_string_from_utf32
 mono_string_hash
 mono_string_intern
 mono_string_is_interned
@@ -798,8 +816,10 @@ mono_string_new
 mono_string_new_len
 mono_string_new_size
 mono_string_new_utf16
+mono_string_new_utf32
 mono_string_new_wrapper
 mono_string_to_utf16
+mono_string_to_utf32
 mono_string_to_utf8
 mono_string_to_utf8_checked
 mono_stringify_assembly_name
@@ -809,9 +829,20 @@ mono_thread_cleanup
 mono_thread_create
 mono_thread_current
 mono_thread_detach
+mono_thread_detach_if_exiting
 mono_thread_exit
 mono_thread_get_main
 mono_thread_get_undeniable_exception
+mono_thread_info_clear_interruption
+mono_thread_info_exit
+mono_thread_info_finish_interrupt
+mono_thread_info_get_stack_bounds
+mono_thread_info_interrupt
+mono_thread_info_open_handle
+mono_thread_info_prepare_interrupt
+mono_thread_info_self_interrupt
+mono_thread_info_tls_get
+mono_thread_info_tls_set
 mono_thread_init
 mono_thread_is_foreign
 mono_thread_manage
@@ -819,13 +850,22 @@ mono_thread_new_init
 mono_thread_set_main
 mono_thread_set_manage_callback
 mono_thread_stop
+mono_threads_attach_tools_thread
+mono_threads_core_clear_interruption
+mono_threads_core_finish_interrupt
+mono_threads_core_prepare_interrupt
+mono_threads_core_self_interrupt
+mono_threads_create_thread
 mono_threads_get_default_stacksize
 mono_threads_request_thread_dump
 mono_threads_set_default_stacksize
 mono_tls_key_get_offset
 mono_tls_key_set_offset
 mono_trace_set_level_string
+mono_trace_set_log_handler
 mono_trace_set_mask_string
+mono_trace_set_print_handler
+mono_trace_set_printerr_handler
 mono_type_create_from_typespec
 mono_type_full_name
 mono_type_generic_inst_is_valuetype
index 33a72f6b1bd8d7e0611fda19d337a2080e62eaed..f67a854569327dcbd8fb0d344ea2ed97de89c1f3 100755 (executable)
@@ -1,6 +1,9 @@
 @echo off
 cd ..
+if exist config.h if not exist cygconfig.h copy config.h cygconfig.h
+if exist eglib\config.h if not exist eglib\cygconfig.h copy eglib\config.h eglib\cygconfig.h
 copy winconfig.h config.h
+copy eglib\winconfig.h eglib\config.h
 goto end
 :error
 echo fatal error: the VSDepenancies directory was not found in the "mono" directory
index 7e5a019b82327daeef91eff2322b36b168ce450a..45740ef16b37f488560e77f49d77433ee1747877 100644 (file)
@@ -5,7 +5,7 @@ noinst_SCRIPTS = mono-wrapper monodis-wrapper
 etctmp = etc
 symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
 
-if INSTALL_4_0
+if INSTALL_4_5
 symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
 endif
 
@@ -33,18 +33,8 @@ build_profiles = xammac
 else
 build_profiles = 
 
-if INSTALL_2_0
-build_profiles += net_2_0 net_3_5
-al_profile = net_2_0
-endif
-
-if INSTALL_4_0
-build_profiles += net_4_0
-al_profile = net_4_0
-endif
-
 if INSTALL_4_5
-build_profiles += net_4_5 xbuild_12 xbuild_14
+build_profiles += net_4_0 net_4_5 xbuild_12 xbuild_14
 al_profile = net_4_5
 endif
 
@@ -99,13 +89,6 @@ endif BUILD_MCS
 
 TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al
 
-# now a misnomer, but it'll go away soon enough.
-if ENABLE_NUNIT_TESTS
-test_select =
-else
-test_select = ONLY_CENTUM_TESTS=yes
-endif
-
 mcs-do-test-profiles:
        cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
 
@@ -127,16 +110,14 @@ endif
 
 # Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
 # TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
-# Skip net 4.0 assemblies because the contain metadata only
+# Skip net 4.0 assemblies because they contain metadata only
 mcs-compileall: mono-wrapper etc/mono/config
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(test_profiles); do \
          if [ "net_4_0" = "$$profile" ]; then \
           continue; \
       fi; \
-         if [ "net_3_5" = "$$profile" ]; then \
-                 MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
-         elif [ "xbuild_12" = "$$profile" ]; then \
+         if [ "xbuild_12" = "$$profile" ]; then \
                  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
          elif [ "xbuild_14" = "$$profile" ]; then \
                  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
@@ -159,7 +140,7 @@ if NACL_CODEGEN
 check-local:
 else
 check-local: mcs-compileall mcs-do-test-profiles
-       $(MAKE) $(test_select) mcs-do-run-test-profiles
+       $(MAKE) ONLY_CENTUM_TESTS=yes mcs-do-run-test-profiles
 endif
 
 # Compile all mcs tests
index be62dd633ef71d23c7a1d6007d0af53db5f3dcbc..6862045d240c13401f9fcf6f6f2769bd9277eb7e 100644 (file)
@@ -40,12 +40,9 @@ bin_SCRIPTS = \
        mono-heapviz            \
        $(scripts_mono_configuration_crypto)
 
-if INSTALL_4_0
+if INSTALL_4_5
 bin_SCRIPTS += $(scripts_4_0)
 bin_SCRIPTS += dmcs
-endif
-
-if INSTALL_4_5
 bin_SCRIPTS += xbuild
 endif
 
@@ -196,14 +193,6 @@ REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
 if INSTALL_4_5
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.5,g'
 REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.5,g'
-else 
-if INSTALL_4_0
-REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.0,g'
-REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.0,g'
-else
-REWRITE4 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
-REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
-endif
 endif
 
 peverify: peverify.in Makefile
@@ -231,7 +220,7 @@ mono-service2: mono-service.in Makefile
        mv -f $@.tmp $@
 
 nunit-console$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
-       $(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+       $(REWRITE4_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
        mv -f $@.tmp $@
 
 nunit-console2$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
@@ -264,7 +253,7 @@ $(scripts_defaults): $(SCRIPT_IN) Makefile
 
 $(scripts_2_0): $(SCRIPT_IN) Makefile
        n=`echo $@ | sed 's,$(COMPAT_2_0_SUFFIX)$$,,'`; \
-       $(REWRITE2) -e "s,@""exe_name@,$$n,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+       $(REWRITE4) -e "s,@""exe_name@,$$n,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
        mv -f $@.tmp $@
 
 $(scripts_4_0): $(SCRIPT_IN) Makefile
index e59bacf91a8155db165b513f5de609e5e9b47a7e..d254e29c7b718a3b696585551f7a8ce2c9aea9a7 100755 (executable)
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.5/mcs.exe -sdk:4 "$@"
+exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.5/mcs.exe "$@"
index 64005f5c09f627b5c751d6fc4d374d385aab2751..d254e29c7b718a3b696585551f7a8ce2c9aea9a7 100755 (executable)
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.5/mcs.exe -sdk:2 "$@"
+exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.5/mcs.exe "$@"
index 87d3e64d4ed3e22c38c5dbe3dc19c5a0246bdeec..52f0ab26ee3557c0b070fe2456c780d454bb5ebb 100755 (executable)
@@ -39,81 +39,222 @@ if len (files) != 1:
     sys.exit (1)
 
 data = []
-minor_pausetimes = []
-major_pausetimes = []
+
+class Event:
+    def __init__(self, **kwargs):
+        self.minor_work = kwargs['minor_work']
+        self.major_work = kwargs['major_work']
+        self.start = kwargs['start']
+        self.stop = kwargs['stop']
+        self.gc_type = kwargs['gc_type']
+    def __repr__(self):
+        return 'Event(minor_work={}, major_work={}, start={}, stop={}, gc_type={})'.format(
+            self.minor_work,
+            self.major_work,
+            self.start,
+            self.stop,
+            self.gc_type,
+        )
 
 grep_input = open (files [0])
 proc = subprocess.Popen ([sgen_grep_path, '--pause-times'], stdin = grep_input, stdout = subprocess.PIPE)
 for line in iter (proc.stdout.readline, ''):
-    m = re.match ('^pause-time (\d+) (\d+) (\d+) (\d+)', line)
+    m = re.match ('^pause-time (\d+) (\d+) (\d+) (\d+) (\d+)', line)
     if m:
+        minor_work = major_work = False
         generation = int (m.group (1))
-        concurrent = int (m.group (2))
-        msecs = int (m.group (3)) / 10.0 / 1000.0
-        start = int (m.group (4)) / 10.0 / 1000.0
-        if generation == 0:
-            generation = "minor"
-            minor_pausetimes.append (msecs)
-        else:
-            generation = "major"
-            major_pausetimes.append (msecs)
-        if concurrent == 1:
+        concurrent = int (m.group (2)) != 0
+        finish = int (m.group (3)) != 0
+        msecs = int (m.group (4)) / 10.0 / 1000.0
+        start = int (m.group (5)) / 10.0 / 1000.0
+
+        if concurrent:
             kind = "CONC"
         else:
             kind = "SYNC"
-        rec = (generation, start, start + msecs, kind)
+
+        if generation == 0:
+            minor_work = True
+            if concurrent:
+                major_work = True
+                gc_type = "nursery+update"
+            else:
+                gc_type = "nursery"
+        else:
+            major_work = True
+            if concurrent:
+                if finish:
+                    minor_work = True
+                    gc_type = "nursery+finish"
+                else:
+                    gc_type = "start"
+            else:
+                gc_type = "full"
+
+        rec = Event(
+            minor_work=minor_work,
+            major_work=major_work,
+            start=start,
+            stop=start + msecs,
+            kind=kind,
+            gc_type=gc_type,
+        )
         print rec
         data.append (rec)
 
+class MajorGCEventGroup:
+    pass
+
+class FullMajorGCEventGroup(MajorGCEventGroup):
+    def __init__(self, event):
+        self.event = event
+    def __repr__(self):
+        return 'FullMajorGCEventGroup({})'.format(
+            self.event,
+        )
+
+class ConcurrentMajorGCEventGroup(MajorGCEventGroup):
+    def __init__(self, start, updates, finish):
+        self.start = start
+        self.updates = updates
+        self.finish = finish
+    def __repr__(self):
+        return 'ConcurrentMajorEventGroup({}, {}, {})'.format(
+            self.start,
+            self.updates,
+            self.finish,
+        )
+
+# ([Event], int) -> (MajorGCEventGroup, int) | None
+def parse_next_major_gc(data, i):
+    assert i >= 0
+    # Find start or full event.
+    while i < len(data) and data[i].gc_type not in ['start', 'full']:
+        i += 1
+    if i == len(data):
+        return None
+    # If full event, done.
+    if data[i].gc_type == 'full':
+        return (FullMajorGCEventGroup(data[i]), i + 1)
+    start_event = data[i]
+    update_events = []
+    # Filter update events and find finish event.
+    while i < len(data) and data[i].gc_type != 'nursery+finish':
+        if data[i].gc_type == 'nursery+update':
+            update_events.append(data[i])
+        i += 1
+    if i == len(data):
+        return None
+    finish_event = data[i]
+    i += 1
+    return (ConcurrentMajorGCEventGroup(start_event, update_events, finish_event), i)
+
+# [Event] -> [MajorGCEventGroup]
+def parse_major_gcs(data):
+    major_gc_events = []
+    i = 0
+    while True:
+        maybe_event_group = parse_next_major_gc(data, i)
+        if maybe_event_group is None:
+            return major_gc_events
+        event_group, i = maybe_event_group
+        major_gc_events.append(event_group)
+
 if show_histogram:
+    minor_pausetimes = []
+    major_pausetimes = []
+
+    for rec in data:
+        pause = rec.stop - rec.start
+        if rec.minor_work and rec.major_work and show_minor and show_major:
+            major_pausetimes.append (pause)
+        else:
+            if rec.minor_work:
+                minor_pausetimes.append (pause)
+            if rec.major_work:
+                major_pausetimes.append (pause)
+
     pausetimes = []
+    colors = []
     if show_minor:
-        pausetimes += minor_pausetimes
+        pausetimes.append(minor_pausetimes)
+        colors.append('blue')
     if show_major:
-        pausetimes += major_pausetimes
-    plt.hist (pausetimes, 100)
+        pausetimes.append(major_pausetimes)
+        colors.append('red')
+
+    plt.hist (pausetimes, 100, stacked=True, log=True, color=colors)
     plt.xlabel ('Pause time in msec')
 else:
-    data = np.array (data, dtype = [('caption', '|S20'), ('start', int), ('stop', int), ('kind', '|S20')])
-    cap, start, stop=data['caption'], data['start'], data['stop']
-
-    #Check the status, because we paint all lines with the same color
-    #together
-    is_sync= (data['kind']=='SYNC')
-    not_sync=np.logical_not(is_sync)
-
-    #Get unique captions and there indices and the inverse mapping
-    captions, unique_idx, caption_inv=np.unique(cap, 1,1)
-    print captions
-
-    #Build y values from the number of unique captions.
-    y=(caption_inv+1)/float(len(captions)+1)
-
-    #Plot function
-    def timelines(y, xstart, xstop,color='b'):
-        """Plot timelines at y from xstart to xstop with given color."""
-        plt.hlines(y,xstart,xstop,color,lw=4)
-        plt.vlines(xstart, y+0.03,y-0.03,color,lw=2)
-        plt.vlines(xstop, y+0.03,y-0.03,color,lw=2)
-
-    #Plot ok tl black
-    timelines(y[is_sync],start[is_sync],stop[is_sync],'r')
-    #Plot fail tl red
-    timelines(y[not_sync],start[not_sync],stop[not_sync],'k')
-
-    #Setup the plot
-    ax=plt.gca()
-    #ax.xaxis_date()
-    #myFmt = DateFormatter('%H:%M:%S')
-    #ax.xaxis.set_major_formatter(myFmt)
-    #ax.xaxis.set_major_locator(SecondLocator(0,interval=20))
-
-    #To adjust the xlimits a timedelta is needed.
-    delta=(stop.max()-start.min())/10
-
-    plt.yticks(y[unique_idx],captions)
-    plt.ylim(0,1)
-    plt.xlim(start.min()-delta, stop.max()+delta)
-    plt.xlabel('Time')
+    major_gc_event_groups = parse_major_gcs(data)
+
+    def bar(**kwargs):
+        indices = kwargs['indices']
+        pauses = kwargs['pauses']
+        color = kwargs['color']
+        if 'bottom' in kwargs:
+            bottom = kwargs['bottom']
+        else:
+            bottom = 0
+        plt.bar(
+            [index for index in indices if pauses[index] is not None],
+            np.array([pause for pause in pauses if pause is not None]),
+            color=color,
+            bottom=bottom,
+        )
+
+    indices = np.arange(len(major_gc_event_groups))
+    start_pauses = [
+        event_group.start.stop - event_group.start.start
+        if isinstance(event_group, ConcurrentMajorGCEventGroup) else None
+        for event_group in major_gc_event_groups
+    ]
+    bar(
+        indices=indices,
+        pauses=start_pauses,
+        color='red',
+    )
+    update_pauses = [
+        sum([
+            update_event.stop - update_event.start
+            for update_event in event_group.updates
+        ]) if isinstance(event_group, ConcurrentMajorGCEventGroup) else None
+        for event_group in major_gc_event_groups
+    ]
+    bar(
+        indices=indices,
+        pauses=update_pauses,
+        color='green',
+        bottom=[pause for pause in start_pauses if pause is not None],
+    )
+    finish_pauses = [
+        event_group.finish.stop - event_group.finish.start
+        if isinstance(event_group, ConcurrentMajorGCEventGroup) else None
+        for event_group in major_gc_event_groups
+    ]
+    start_update_pauses = [
+        a + b
+        for a, b in zip(start_pauses, update_pauses)
+        if a is not None and b is not None
+    ]
+    bar(
+        indices=indices,
+        pauses=finish_pauses,
+        color='blue',
+        bottom=start_update_pauses,
+    )
+    full_pauses = [
+        event_group.event.stop - event_group.event.start
+        if isinstance(event_group, FullMajorGCEventGroup) else None
+        for event_group in major_gc_event_groups
+    ]
+    bar(
+        indices=indices,
+        pauses=full_pauses,
+        color='black',
+    )
+
+    plt.ylabel("Pause Time (ms)")
+    plt.xlabel("Collection")
 
 plt.show()
index 757773156889314f0fd41e281c6c21b77804db39..984f3a23993e04e53dde8237dd1fcc7b619e4eb1 100644 (file)
@@ -23,10 +23,11 @@ read_entry (FILE *in, void **data)
                return SGEN_PROTOCOL_EOF;
        switch (TYPE (type)) {
        case SGEN_PROTOCOL_COLLECTION_FORCE: size = sizeof (SGenProtocolCollectionForce); break;
-       case SGEN_PROTOCOL_COLLECTION_BEGIN: size = sizeof (SGenProtocolCollection); break;
-       case SGEN_PROTOCOL_COLLECTION_END: size = sizeof (SGenProtocolCollection); break;
+       case SGEN_PROTOCOL_COLLECTION_BEGIN: size = sizeof (SGenProtocolCollectionBegin); break;
+       case SGEN_PROTOCOL_COLLECTION_END: size = sizeof (SGenProtocolCollectionEnd); break;
        case SGEN_PROTOCOL_CONCURRENT_START: size = 0; break;
-       case SGEN_PROTOCOL_CONCURRENT_UPDATE_FINISH: size = 0; break;
+       case SGEN_PROTOCOL_CONCURRENT_UPDATE: size = 0; break;
+       case SGEN_PROTOCOL_CONCURRENT_FINISH: size = 0; break;
        case SGEN_PROTOCOL_WORLD_STOPPING: size = sizeof (SGenProtocolWorldStopping); break;
        case SGEN_PROTOCOL_WORLD_STOPPED: size = sizeof (SGenProtocolWorldStopped); break;
        case SGEN_PROTOCOL_WORLD_RESTARTING: size = sizeof (SGenProtocolWorldRestarting); break;
@@ -40,6 +41,7 @@ read_entry (FILE *in, void **data)
        case SGEN_PROTOCOL_MARK: size = sizeof (SGenProtocolMark); break;
        case SGEN_PROTOCOL_SCAN_BEGIN: size = sizeof (SGenProtocolScanBegin); break;
        case SGEN_PROTOCOL_SCAN_VTYPE_BEGIN: size = sizeof (SGenProtocolScanVTypeBegin); break;
+       case SGEN_PROTOCOL_SCAN_PROCESS_REFERENCE: size = sizeof (SGenProtocolScanProcessReference); break;
        case SGEN_PROTOCOL_WBARRIER: size = sizeof (SGenProtocolWBarrier); break;
        case SGEN_PROTOCOL_GLOBAL_REMSET: size = sizeof (SGenProtocolGlobalRemset); break;
        case SGEN_PROTOCOL_PTR_UPDATE: size = sizeof (SGenProtocolPtrUpdate); break;
@@ -82,7 +84,8 @@ is_always_match (int type)
        case SGEN_PROTOCOL_COLLECTION_BEGIN:
        case SGEN_PROTOCOL_COLLECTION_END:
        case SGEN_PROTOCOL_CONCURRENT_START:
-       case SGEN_PROTOCOL_CONCURRENT_UPDATE_FINISH:
+       case SGEN_PROTOCOL_CONCURRENT_UPDATE:
+       case SGEN_PROTOCOL_CONCURRENT_FINISH:
        case SGEN_PROTOCOL_WORLD_STOPPING:
        case SGEN_PROTOCOL_WORLD_STOPPED:
        case SGEN_PROTOCOL_WORLD_RESTARTING:
@@ -94,8 +97,6 @@ is_always_match (int type)
        case SGEN_PROTOCOL_CEMENT_RESET:
        case SGEN_PROTOCOL_DOMAIN_UNLOAD_BEGIN:
        case SGEN_PROTOCOL_DOMAIN_UNLOAD_END:
-       case SGEN_PROTOCOL_GRAY_ENQUEUE:
-       case SGEN_PROTOCOL_GRAY_DEQUEUE:
                return TRUE;
        default:
                return FALSE;
@@ -117,21 +118,27 @@ print_entry (int type, void *data)
                break;
        }
        case SGEN_PROTOCOL_COLLECTION_BEGIN: {
-               SGenProtocolCollection *entry = data;
+               SGenProtocolCollectionBegin *entry = data;
                printf ("collection begin %d generation %d\n", entry->index, entry->generation);
                break;
        }
        case SGEN_PROTOCOL_COLLECTION_END: {
-               SGenProtocolCollection *entry = data;
-               printf ("collection end %d generation %d\n", entry->index, entry->generation);
+               SGenProtocolCollectionEnd *entry = data;
+               long long scanned = entry->num_scanned_objects;
+               long long unique = entry->num_unique_scanned_objects;
+               printf ("collection end %d generation %d scanned %lld unique %lld %0.2f%%\n", entry->index, entry->generation, scanned, unique, unique ? 100.0 * (double) scanned / (double) unique : 0.0);
                break;
        }
        case SGEN_PROTOCOL_CONCURRENT_START: {
                printf ("concurrent start\n");
                break;
        }
-       case SGEN_PROTOCOL_CONCURRENT_UPDATE_FINISH: {
-               printf ("concurrent update or finish\n");
+       case SGEN_PROTOCOL_CONCURRENT_UPDATE: {
+               printf ("concurrent update\n");
+               break;
+       }
+       case SGEN_PROTOCOL_CONCURRENT_FINISH: {
+               printf ("concurrent finish\n");
                break;
        }
        case SGEN_PROTOCOL_WORLD_STOPPING: {
@@ -203,6 +210,11 @@ print_entry (int type, void *data)
                printf ("scan_vtype_begin obj %p size %d\n", entry->obj, entry->size);
                break;
        }
+       case SGEN_PROTOCOL_SCAN_PROCESS_REFERENCE: {
+               SGenProtocolScanProcessReference *entry = data;
+               printf ("scan_process_reference obj %p ptr %p value %p\n", entry->obj, entry->ptr, entry->value);
+               break;
+       }
        case SGEN_PROTOCOL_WBARRIER: {
                SGenProtocolWBarrier *entry = data;
                printf ("wbarrier ptr %p value %p value_vtable %p\n", entry->ptr, entry->value, entry->value_vtable);
@@ -357,6 +369,10 @@ is_match (gpointer ptr, int type, void *data)
                SGenProtocolScanVTypeBegin *entry = data;
                return matches_interval (ptr, entry->obj, entry->size);
        }
+       case SGEN_PROTOCOL_SCAN_PROCESS_REFERENCE: {
+               SGenProtocolScanProcessReference *entry = data;
+               return ptr == entry->obj || ptr == entry->ptr || ptr == entry->value;
+       }
        case SGEN_PROTOCOL_WBARRIER: {
                SGenProtocolWBarrier *entry = data;
                return ptr == entry->ptr || ptr == entry->value;
@@ -484,6 +500,7 @@ main (int argc, char *argv[])
        gboolean pause_times = FALSE;
        gboolean pause_times_stopped = FALSE;
        gboolean pause_times_concurrent = FALSE;
+       gboolean pause_times_finish = FALSE;
        long long pause_times_ts = 0;
 
        for (i = 0; i < num_args; ++i) {
@@ -513,20 +530,24 @@ main (int argc, char *argv[])
                                SGenProtocolWorldStopping *entry = data;
                                assert (!pause_times_stopped);
                                pause_times_concurrent = FALSE;
+                               pause_times_finish = FALSE;
                                pause_times_ts = entry->timestamp;
                                pause_times_stopped = TRUE;
                                break;
                        }
+                       case SGEN_PROTOCOL_CONCURRENT_FINISH:
+                               pause_times_finish = TRUE;
                        case SGEN_PROTOCOL_CONCURRENT_START:
-                       case SGEN_PROTOCOL_CONCURRENT_UPDATE_FINISH:
+                       case SGEN_PROTOCOL_CONCURRENT_UPDATE:
                                pause_times_concurrent = TRUE;
                                break;
                        case SGEN_PROTOCOL_WORLD_RESTARTED: {
                                SGenProtocolWorldRestarted *entry = data;
                                assert (pause_times_stopped);
-                               printf ("pause-time %d %d %lld %lld\n",
+                               printf ("pause-time %d %d %d %lld %lld\n",
                                                entry->generation,
                                                pause_times_concurrent,
+                                               pause_times_finish,
                                                entry->timestamp - pause_times_ts,
                                                pause_times_ts);
                                pause_times_stopped = FALSE;
index b6d74e1cb41832b4768000939b1050afb14e7b50..21cc0d506d76c94167459d5f961d950b1ab269a8 100644 (file)
@@ -1,6 +1,10 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+#ifndef _MSC_VER
+#include "cygconfig.h"
+#else
+
 /* The architecture this is running on */
 #if defined(_M_IA64)
 #define ARCHITECTURE "ia64"
 /* #undef USE_MONO_MUTEX */
 
 /* Version number of package */
-#define VERSION "2.11"
+#define VERSION "3.12.1"
+#endif